mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-27 08:31:00 +01:00
Code Issues Projects Releases Packages Wiki Activity
9031 commits 3 branches 150 tags 4.1 GiB
Commit graph

803 commits

Author SHA1 Message Date
Manfred Karrer
a6eedf97c5
Add TODO 2018-12-02 14:53:57 +01:00
Manfred Karrer
83190fb237
Merge branch 'release-candidate-0.9.0' into persist-selected-account-at-takeoffer 2018-11-25 23:54:23 +01:00
Manfred Karrer
880a8412fc
Merge pull request #1957 from j3ko/release-candidate-0.9.0 
Add advanced cash payment method
 2018-11-24 12:09:04 +01:00
Jeffrey Ko
4cd2ac8d40
Add advanced cash payment method 2018-11-23 20:50:03 +07:00
Manfred Karrer
15c776874e
Merge branch 'master' into release-candidate-0.9.0 
# Conflicts:
#	.editorconfig
 2018-11-23 11:24:07 +01:00
Chris Beams
b3d20b5b5f
Remove Utilities.removeCryptographyRestrictions 
This code is no longer necessary after the recent move to JDK10, and
removing it entirely avoids spending unnecessary cycles and eliminates
the confusing "Cryptography restrictions removal not needed" message in
console output.
 2018-11-23 06:09:59 +01:00
sqrrm
e815c4b105
Use lockup txid to track confiscation 
1. Every bond is defined by its lockup transaction. To make it easy to
track which bonds are confiscated it's easier to track them by only one
txid instead of using a map with a mix of lockup txoutputs and unlock
txoutputs.

To check if a txoutput has been confiscated it has to be checked against
the originiating lockup txid.

2. Minor fixes of naming lockedup -> lockup and comments.
 2018-11-17 23:13:13 +01:00
Manfred Karrer
3157e86f8b
Persist last selected payment account at take offer 
The last selected payment account gets persisted so that at the next
take offer attempt that same account is selected in the combo box in
case there are multiple accounts for that currency.
 2018-11-17 13:29:52 -05:00
Manfred Karrer
dd638bf6bc
Add util method for setting isDaoActivated 2018-11-13 21:16:11 -05:00
Manfred Karrer
87efe89662
Add proof of burn feature to dao 2018-11-11 12:56:54 -05:00
Manfred Karrer
d8bae356ff
Complete asset listing fee feature 2018-11-09 20:24:17 -05:00
Manfred Karrer
ca4a4a47ce
Add asset listing fee and proof of burn domain and views (WIP) 2018-11-08 16:44:58 -05:00
Manfred Karrer
c5630eec0f
Add support for confiscation of bonds 2018-11-06 00:42:17 -05:00
Manfred Karrer
6218da0623
Support state update for unconfirmed reputation bond txs. 2018-11-05 20:22:57 -05:00
Manfred Karrer
7bf5c819cd
Implements bonded reputation 
Still WIP with many areas...
 2018-11-05 18:35:30 -05:00
Manfred Karrer
15b8f02c67
Work on bonded reputation (WIP) 2018-11-02 19:31:31 -05:00
Manfred Karrer
2575a0aa90
Rename BondedRoleProposal and service 2018-11-01 15:29:07 -05:00
Manfred Karrer
e41be44e9c
Remove mutable data from BondedRole 
Use BondedRoleState to hold the mutable data. Store the BondedRoleState
in a local map.
 2018-11-01 15:20:35 -05:00
Manfred Karrer
dbddb46bf6
Remove BondedRoleList 
- We store the bonded roles in the evaluated proposals in the dao state.
From there we can get the bonded role object as it is part of the
bonded role proposal. Though we need to take that data immutable
(next commit will handle that)
 2018-11-01 13:58:49 -05:00
Manfred Karrer
a8b833c285
Merge branch 'bonded-reputation' of https://github.com/sqrrm/bisq-desktop into sqrrm-bonded-reputation 
# Conflicts:
#	common/src/main/proto/pb.proto
#	core/src/main/java/bisq/core/app/misc/AppSetupWithP2PAndDAO.java
#	core/src/main/java/bisq/core/dao/DaoFacade.java
#	core/src/main/java/bisq/core/dao/governance/role/BondedRole.java
#	desktop/src/main/java/bisq/desktop/main/dao/bonding/lockup/LockupView.java
 2018-10-31 13:17:57 -05:00
Manfred Karrer
dbbbf1717b
Merge branch 'release-candidate-0.9.0' into make-param-value-string 2018-10-29 21:43:11 -05:00
Manfred Karrer
ea33899123
Add BTC recipient address to params 
- Change type of param value from long to string for more flexibility
- Add BTC recipient address param
- Add validation, refactor param value formatter and param value parser
 2018-10-29 21:32:16 -05:00
Manfred Karrer
509c3d1e10
Add trade fee display to take offer screen 
As take offer screen is WIP the fee display is also just a raw draft.
For the DAO state we should add a new group for the fee selection as
it is a bit lost in between the other fields...
 2018-10-28 17:01:44 -05:00
Manfred Karrer
ac11888ec0
Add non-DAO version for fee display 2018-10-28 15:29:49 -05:00
Alexey Zagarin
0b8f6c17e2 Add PromptPay (Thailand) 
Closes https://github.com/bisq-network/payment-methods/issues/6.
 2018-10-28 20:25:37 +07:00
Manfred Karrer
6b0a54bb0e
Add support for reimbursement requests 2018-10-24 12:30:18 -05:00
Manfred Karrer
168a15b5a1
Add full node mode and rpc data to settings 
- Change FULL_DAO_NODE option from boolean to string to be able to detect not set values
- isFullDaoNode, rpcUser and rpcPw can be set in the UI. If prog ars are
available they will overwrite the UI data.
 2018-10-19 23:43:07 -05:00
Manfred Karrer
4fd641fd51
Improve UI 2018-10-19 21:00:50 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Manfred Karrer
e6f44ff1ae
Comment out BsqState in PB definitions 2018-10-16 23:22:50 -05:00
Manfred Karrer
a308469ac6
Support for persisted bsqState as resource file 
- Move DecryptedBallotsWithMerits list and EvaluatedProposal list to
BsqState

- Use StoreService for handling persistence of snapshots
 2018-10-16 23:21:11 -05:00
Manfred Karrer
ce5a8b4f19
Merge branch 'arbitration-system-improvements' of https://github.com/ManfredKarrer/bisq into ManfredKarrer-arbitration-system-improvements 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
 2018-10-16 11:48:11 -05:00
Manfred Karrer
dc6c25ed81
Merge branch 'master' into arbitration-system-improvements 2018-10-16 11:32:07 -05:00
sqrrm
b3c8610f10
Add bonded reputation service, storage 2018-10-16 17:11:40 +02:00
sqrrm
7b72f10eb2
Add bonded reputation 2018-10-14 12:51:36 +02:00
Manfred Karrer
9b40306d9a
Add handling for missing proposal data 2018-10-09 22:32:03 -05:00
Manfred Karrer
5141806509
Add handling for missing blindVote data 2018-10-09 22:00:02 -05:00
Manfred Karrer
58e6db0a25
Persist DecryptedBallotsWithMeritsList 2018-10-08 20:13:22 -05:00
Manfred Karrer
4cc17feace
Persist EvaluatedProposalList 2018-10-08 19:47:54 -05:00
Manfred Karrer
2d593ee88f
Merge branch 'master' into arbitration-system-improvements 2018-10-05 15:21:41 -05:00
Manfred Karrer
4770ac9ef5
Remove asset from comboBoxes if it was removed by voting 2018-10-05 00:46:03 -05:00
Manfred Karrer
3e7eba8f04
Add Generic- and removeAsset proposals 2018-10-04 23:24:14 -05:00
Manfred Karrer
248c5546be
Refactor parser classes 
- Move unlockBlockHeight field from Tx to TxOutput
 2018-10-03 21:31:26 -05:00
Manfred Karrer
e11e2b3c9e
Fix PB enum 
As PB handles enums globally there must not be same entries in 2 diff.
enums. Therefore I postfixed with _OUTPUT 3 entries in TxOutputType.
 2018-10-03 17:32:34 -05:00
Manfred Karrer
48fa9e75c9
Fix incorrect TxType entries in PB definitions 2018-10-03 17:28:44 -05:00
Manfred Karrer
7d045f028f
Fix incorrect/missing TxOutputType entries in PB definitions 2018-10-03 17:12:51 -05:00
Manfred Karrer
b2fd120eff
Add arbitrator_node_address to PB 2018-10-02 22:27:01 -05:00
Manfred Karrer
8bcefaa135
Implement new arbitrator selection rule 2018-10-02 22:09:15 -05:00
Manfred Karrer
1e7dc5e95f
Add arbitrator to OfferAvailabilityResponse 2018-10-02 18:17:15 -05:00
Manfred Karrer
8eabd665c7
Fix snapshot handling 
- Fix wrong start height
- Improve logging
 2018-09-26 22:41:41 -05:00