mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2024-11-20 10:22:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
6,914 Commits 4 Branches 148 Tags 4.3 GiB
c1768592a6
Commit Graph

2245 Commits

Author SHA1 Message Date
Christoph Atteneder
9740a97bbf
Add missing translations for market provider info 2018-10-19 16:51:50 +02:00
Manfred Karrer
29ae886ed8
Merge pull request #1778 from ManfredKarrer/Dao-UI-improvements 
Persitence of DAO state
 2018-10-18 16:15:28 -05:00
Manfred Karrer
b47678d865
Add DAO resync option to preferences 2018-10-17 22:10:40 -05:00
Manfred Karrer
10fcd622e5
Remove BREAK4 2018-10-17 17:45:02 -05:00
Manfred Karrer
15177e6537
Add comment 2018-10-17 14:21:31 -05:00
Manfred Karrer
dbe5cf6f85
Replace double quote with single 
Double quotes are only needed when a placeholder ({0}) is used in the text. Otherwise it would show 2 quotes.
 2018-10-17 11:02:34 -05:00
Manfred Karrer
4d30fcb46d
Merge branch 'master' into Dao-UI-improvements 2018-10-17 10:59:05 -05:00
Steve Jain
227eefc4b3
Refine shutdown message to warn about open offers 2018-10-17 11:05:03 -04:00
Manfred Karrer
6d18a9ea78
Rename BsqState to DaoState 2018-10-17 00:13:42 -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
8e46b1760f
Add new storage type to p2p library 
- We introduce a new basic storage type for reading from a resource file
if available and reading initial db file if available. That is required
for the snapshots of the DaoState which will be shipped with the source
code.

- We separate the support for maps to MapStoreService
 2018-10-16 23:16:52 -05:00
Manfred Karrer
d33298d087
Add more tests 2018-10-16 13:53:58 -05:00
Christoph Atteneder
95fa81361e
Merge branch 'master' of github.com:bisq-network/bisq into redesign 2018-10-16 19:45:50 +02:00
Manfred Karrer
dabe6907e1
Fix missing sorting 2018-10-16 12:40:10 -05:00
Christoph Atteneder
29adc6b472
Merge branch 'master' of github.com:bisq-network/bisq into redesign 
# Conflicts:
#	core/src/main/resources/i18n/displayStrings.properties
#	desktop/src/main/java/bisq/desktop/main/account/content/arbitratorselection/ArbitratorSelectionView.java
#	desktop/src/main/java/bisq/desktop/main/offer/offerbook/OfferBookView.java
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
 2018-10-16 19:38:16 +02:00
Christoph Atteneder
dd568111a5
Update translations without colons 2018-10-16 19:35:05 +02:00
Manfred Karrer
254059b411
Fix typo 2018-10-16 11:57:50 -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
Christoph Atteneder
0edbb1733c
Merge branch 'master' of github.com:bisq-network/bisq-desktop into redesign 
# Conflicts:
#	desktop/src/main/java/bisq/desktop/main/settings/preferences/PreferencesView.java
#	desktop/src/main/java/bisq/desktop/util/FormBuilder.java
 2018-10-16 10:09:37 +02:00
Manfred Karrer
5879dd98df
Change log level for printing asset trade stats 2018-10-10 15:34:02 -05:00
Manfred Karrer
62a824653d
Update comments 2018-10-10 15:33:01 -05:00
Manfred Karrer
c3f508e24c
Adjust DAO params 2018-10-10 15:20:17 -05:00
Manfred Karrer
aeebae9297
Support trade fees defined DAO params 
- Use DAO Params to get the trade fees
- Rename existing params
- Add min fee values
 2018-10-10 15:02:38 -05:00
Manfred Karrer
048767af1a
Make ProposalConsensus and CompensationConsensus methods static 2018-10-10 14:28:49 -05:00
Manfred Karrer
4b9073ce8a
Rename support for other base currencies in getDefaultMinFeePerByte 2018-10-10 14:28:03 -05:00
Manfred Karrer
965d741657
Rename fields and params 2018-10-10 14:21:11 -05:00
Manfred Karrer
8e22916914
Adjust comments 2018-10-10 14:18:56 -05:00
Manfred Karrer
923aaf6cdc
Remove other base currencies from FeeService 2018-10-10 14:06:24 -05:00
Manfred Karrer
c8f0098b2b
Add comments, cleanups 2018-10-10 14:03:53 -05:00
Manfred Karrer
280af36fc5
Reduce default btc miner fee from 200 to 50 sat/byte 2018-10-10 13:47:26 -05:00
Manfred Karrer
e99d733642
Remove PHASE_BREAK4, adjust phase periods and fees 2018-10-10 13:39:51 -05:00
Manfred Karrer
db3cd329b9
Add VoteResultExceptionHandler 2018-10-09 23:31:43 -05: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
d279dae032
Rename chainHeadHeight to chainHeight 2018-10-08 11:22:57 -05:00
Manfred Karrer
57355f2b19
Merge branch 'Dao-UI-improvements' 2018-10-08 11:18:42 -05:00
Manfred Karrer
d87bbf9318
Merge pull request #1763 from ManfredKarrer/tx-broadcaster-fix 
Tx broadcaster fix
 2018-10-08 07:10:52 -05:00
Manfred Karrer
8232eeecd8
Deactivate OKPay as it does not exist anymore 
OkPay seems to have rebranded to Weezzo.
The OkPay webpage is offline but some links go to Weezzo.
Seems pretty unprofessional hwo they did the move...
Seems they have been involved with BTC-e…
https://bitcointalk.to/index.php?topic=2094721.0
 2018-10-07 21:54:00 -05:00
Manfred Karrer
be1f177fc7
Increase timeout to 30 sec 2018-10-07 17:40:44 -05:00
Manfred Karrer
85c80bcd5c
Remove the maybeCommitTx call at timeout 2018-10-07 17:40:01 -05:00
Manfred Karrer
fbbec72eb0
Merge branch 'master' into arbitration-system-improvements 2018-10-07 00:47:42 -05:00
Manfred Karrer
5dfbb6d596
Merge branch 'master' into Dao-UI-improvements 2018-10-07 00:46:48 -05:00
Manfred Karrer
2d593ee88f
Merge branch 'master' into arbitration-system-improvements 2018-10-05 15:21:41 -05:00
Manfred Karrer
8c85a1bab5
Merge branch 'master' into small-fixes 2018-10-05 15:21:14 -05:00
Manfred Karrer
f4cfeef2cd
Add checkTradeActivity method, remove ConvertToTradeStatistics2 2018-10-05 02:36:20 -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
072cedc29b
Improve param change selection (WIP) 
- Show current formatted value
- Parse input to correct domain value
- Add validation (WIP)
- Add boundary checks (WIP)
 2018-10-04 21:36:17 -05:00
Manfred Karrer
ccdac8e20b
Add new items to Param 
- Add COMPENSATION_REQUEST_MIN_AMOUNT and COMPENSATION_REQUEST_MAX_AMOUNT
As BSQ based validation values can change over time if BSQ value
rise we need to support that in the Params as well.

- Add validateParamValue to ChangeParamValidator
 2018-10-04 20:28:17 -05:00
Manfred Karrer
6299411a2f
Fix/add comments 2018-10-04 18:15:00 -05:00
Manfred Karrer
c6c617e4b6
Improve comment 2018-10-04 15:06:44 -05:00
Manfred Karrer
281e156449
Rename AvoidStandbyMode to AvoidStandbyModeService 2018-10-04 11:36:29 -05:00
Manfred Karrer
0728d04b02
Improve logs, don't show popups in dev mode 2018-10-04 11:33:44 -05:00
Manfred Karrer
1b8863652c
Merge branch 'master' into DAO-improvements 2018-10-04 10:40:42 -05:00
Manfred Karrer
fcc333cd89
Merge pull request #1747 from fotispap/fotispap/remove-age-altcoin-accounts 
Remove age from limitations of altcoin accounts
 2018-10-04 10:09:57 -05:00
Manfred Karrer
3ed70f76be
Fix wrong log 2018-10-04 00:51:30 -05:00
Manfred Karrer
ba876d8884
Refactor parsing of genesis tx 
- Extract genesis parsing to GenesisTxParser
- Cleanups
 2018-10-04 00:38:21 -05:00
Manfred Karrer
40177dd52c
Refactor parser classes 
- Use commitUTXOCandidates for processGenesisTxOutput
- Cleanup
 2018-10-03 23:30:19 -05:00
Manfred Karrer
886272d6ce
Refactor parser classes 
- Add check for opReturn in processTxOutput
- Handle burntBondValue
- Check for TxOutputType.INVALID_OUTPUT in isTxInvalid
 2018-10-03 23:11:49 -05:00
Manfred Karrer
56b8a3986b
Refactor parser classes 
- Remove tempTx from TxOutputParser
- Renamings
- Add isOpReturnOutput method to TempTxOuput
 2018-10-03 22:28:31 -05:00
Manfred Karrer
c0d776e536
Fix wrong check for isVoteRevealInputValid 2018-10-03 21:45:49 -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
097fa66c99
Refactor parser classes 
- Add isUnLockInputValid to TxInputParser
- Continue to refactor to make methods more testable
- Clean up
 2018-10-03 20:55:25 -05:00
Manfred Karrer
5df40f7e1f
Refactor parser classes 
- Continue to refactor to make methods more testable
 2018-10-03 20:13:16 -05:00
Manfred Karrer
7d14ab8376
Refactor parser classes 
- Remove voteRevealInputState and replace with isVoteRevealInputInValid
in TxInputParser
- Rename optionalVerifiedOpReturnType to optionalOpReturnType
- Replace if checks with checkNotNull if case must not happen
- Remove unused isLastOutput param
- Inline handleOpReturnOutput code to processOpReturnOutput
- Remove class fields remainingInputValue and use a local var instead
- Rename getOptionalVerifiedOpReturnType to getOptionalOpReturnType
 2018-10-03 19:03:43 -05:00
Manfred Karrer
744f0cc516
Refactor TxOutputParser 
- Remove unneeded isLastOutput
- Rename bsqOutputs to tempTxOutputs
- Rename commitTxOutputs to commitTxOutputsForValidTx
 2018-10-03 17:59:34 -05:00
Manfred Karrer
0c8d475c24
Improve string 2018-10-03 17:58:01 -05:00
Manfred Karrer
69210d9125
Fix missing updates of enum entries 2018-10-03 17:50:36 -05:00
Manfred Karrer
294c941512
Fix missing updates of enum entries 2018-10-03 17:34:40 -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
275286690b
Improve logs 2018-10-03 17:28:54 -05:00
Manfred Karrer
126d279e6e
Merge pull request #1718 from sqrrm/refactor-dao-parser 
[WIP] Refactor dao parser
 2018-10-03 17:10:13 -05:00
fotispap
c305a3cb03 Remove age from limitations of altcoin accounts 2018-10-03 22:26:50 +02:00
sqrrm
bc262460a1
Merge remote-tracking branch 'origin/master' into refactor-dao-parser 2018-10-03 10:51:49 +02:00
Manfred Karrer
32bfe0eb8e
Set activation date, add logs 2018-10-02 22:58:38 -05:00
Manfred Karrer
984c305b77
Remove isAutoSelectArbitrators and hasMatchingLanguage check 2018-10-02 22:48:07 -05:00
Manfred Karrer
cb17b008a3
Remove arbitrator selection view 2018-10-02 22:35:16 -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
78a298cb13
Add ARBITRATOR_ADDRESS to extra map in trade statistics 2018-10-02 18:16:34 -05:00
Manfred Karrer
f2e289d0a6
Add ArbitratorSelection based on tradestatistics 2018-10-02 18:15:47 -05:00
Manfred Karrer
d68f9b5474
Fix wrong validation checks on proposals and ballots 
- We cannot validate the txType at startup as the blockchain is nto ready at that moment. So we cannot apply that validation when we receive the payloads. We do the validation instead at the access to the lists.
- We fix a glitch with missing cycle start time in ResultsOfCycle
- Cleanup in VoteResultView
 2018-10-01 21:19:12 -05:00
Manfred Karrer
2de9c7282e
Make DaoFacade implement DaoSetupService 
- Fixes a bug that the phaseProperty was not set in DaoFacade as the
class was instantiated on demand and missed updates.
 2018-10-01 21:16:02 -05:00
Manfred Karrer
030dc0209b
Change btcd-cli4j to 3864e1c4 2018-10-01 12:17:40 -05:00
Manfred Karrer
b981737775
Change log msg with update to new btcd-cli4j 2018-10-01 12:17:28 -05:00
Manfred Karrer
7ac2a02279
Fix startHeight, handle errors 2018-10-01 11:39:45 -05:00
Manfred Karrer
6873d03216
Merge pull request #1735 from ManfredKarrer/master 
Fixes and improvements
 2018-09-29 12:27:04 -05:00
Manfred Karrer
012dab9ad2
Add isUnspent to JsonTxOutput 2018-09-28 19:58:03 -05:00
Manfred Karrer
3de2746834
Rename outputIndex 2018-09-28 19:49:36 -05:00
Manfred Karrer
54fc96a5d7
Update json classes for BSQ explorer 2018-09-28 19:34:08 -05:00
Manfred Karrer
dcd0ff5efd
Add tx validation for proposals 2018-09-28 14:53:27 -05:00
Manfred Karrer
1760094286
Handle reorgs 2018-09-28 14:52:59 -05:00
Manfred Karrer
2b5731ce7f
Add buyers payment account name to trade screen 
In case the buyer has setup multiple accounts for a payment method
we show the used payment account for that offer in the trade screen.

See: https://github.com/bisq-network/bisq/issues/1733
 2018-09-28 12:04:09 -05:00
Manfred Karrer
2f8172f704
Apply rounding or fiat volume to trade statistics 2018-09-28 10:46:25 -05:00
Christoph Atteneder
a07f984e7e
Adapt Offer Book View 2018-09-28 17:27:22 +02:00
Manfred Karrer
0508489191
Add comment, cleanup 2018-09-27 21:26:21 -05:00