Commit graph

6611 commits

Author SHA1 Message Date
Christoph Atteneder
5c66385834
Merge pull request #1728 from ManfredKarrer/master
Small improvements/fixes
2018-09-27 16:26:22 +02:00
Manfred Karrer
a9e32c0bdd
Move maker classes back to desktop module 2018-09-27 00:16:24 -05:00
Manfred Karrer
29193ad928
Fix failing test 2018-09-26 23:58:58 -05:00
Manfred Karrer
dbe0993fae
Fix nullpointer 2018-09-26 23:58:47 -05:00
Manfred Karrer
8eabd665c7
Fix snapshot handling
- Fix wrong start height
- Improve logging
2018-09-26 22:41:41 -05:00
Manfred Karrer
97479e295c
Fix wrong logging
- If both verifiedOpReturnType and opReturnTypeCandidate are empty we
got an error logged. We change that so that only of both are present
but not matching we log a warning.
2018-09-26 22:40:50 -05:00
Manfred Karrer
2b6cf13e5c
Close notifications onMousePressed event 2018-09-26 21:27:10 -05:00
Manfred Karrer
fc5c0da159
Fix wrong minDecimals for BSQ in trade volume display 2018-09-26 21:04:18 -05:00
Manfred Karrer
fd87ff369c
Refactor and fix asset checks 2018-09-26 18:37:41 -05:00
Manfred Karrer
c231750900
Move classed from desktop to core 2018-09-26 16:03:42 -05:00
Manfred Karrer
4cd26882fe
Merge branch 'master' into DAO-improvements 2018-09-26 15:31:42 -05:00
Manfred Karrer
c11070f7c4
Fixes assetMatchesNetwork method, rename method
- Rename excludeBsqUnlessDaoTradingIsActive to
isNotBsqOrBsqTradingActivated to make it more clear
- Fix wong check with getDefaultBaseCurrencyNetwork (use
getBaseCurrencyNetwork instead)
- Add comment to support network check or Tokens
2018-09-26 15:30:21 -05:00
Manfred Karrer
0bf859e3e3
Add shortcut to toggle tor logging
- If user press cmd+t it switches to DEBUG log level for the tor
network library. If the user press it again it switch back to WARN level.
- If there is a connection startup timeout where we display the Tor
network settings popup we switch log level as well to DEBUG.
2018-09-26 15:26:56 -05:00
Manfred Karrer
a423f205ee
Update Genesis defaults, deactivate SnapshotManager, improve logs 2018-09-26 15:22:23 -05:00
Christoph Atteneder
26e7e3a2d9
Merge pull request #1727 from ManfredKarrer/master
Small improvements
2018-09-26 20:32:30 +02:00
Manfred Karrer
dbfc79e71f
Add null check 2018-09-26 13:18:18 -05:00
Manfred Karrer
b5454b3b92
Persist "show all" state in currency selector in trade charts view 2018-09-26 10:26:06 -05:00
Christoph Atteneder
ede420375f
Merge pull request #1726 from ManfredKarrer/master
Small improvements
2018-09-26 08:30:15 +02:00
Manfred Karrer
b1182e9784
Use GenesisTxInfo instead of option key for genesis block height 2018-09-25 22:43:27 -05:00
Manfred Karrer
82d40782ae
Show N/A if block data is not available at startup 2018-09-25 22:43:02 -05:00
Manfred Karrer
cd8ff29aa5
Add testnet genesis tx 2018-09-25 22:42:34 -05:00
Manfred Karrer
70f6a712f7
Don't use default genesis tx if regtest or testnet 2018-09-25 22:20:22 -05:00
Manfred Karrer
a85bc097a2
Enable DAO if testnet or regtest 2018-09-25 22:06:05 -05:00
Manfred Karrer
f8feec2948
Change testnet seed node to o5qw2hy6l7jsf654 2018-09-25 21:45:30 -05:00
Manfred Karrer
b03aab24b7
Change label for network selector 2018-09-25 21:03:02 -05:00
Manfred Karrer
cf26a33019
Add null check 2018-09-25 21:01:18 -05:00
Manfred Karrer
c616c593ba
Move SystemTray to app directory 2018-09-25 20:59:16 -05:00
Manfred Karrer
74846f0646
Add network selection for btc testnet to preferences
- This should make it easier for users to test the testnet version of
the DAO in the next release
2018-09-25 20:53:45 -05:00
Manfred Karrer
5b70d71580
Add isTestNet method 2018-09-25 20:52:08 -05:00
Manfred Karrer
61c6908a62
Add testnet or regtest suffix to app name title 2018-09-25 20:51:51 -05:00
Manfred Karrer
401418e963
Add GenesisTxInfo to param in test class 2018-09-25 20:01:29 -05:00
Manfred Karrer
3689e4cbf1
Merge remote-tracking branch 'upstream/master'
# Conflicts:
#	core/src/main/java/bisq/core/dao/state/SnapshotManager.java
2018-09-25 19:58:15 -05:00
Manfred Karrer
0bcb96b724
Add checks for snapshot 2018-09-25 19:55:41 -05:00
Manfred Karrer
a8d04d3acc
Add more testnet seed nodes 2018-09-25 19:55:22 -05:00
Christoph Atteneder
5d46a991a8
Merge pull request #1720 from ManfredKarrer/handle-xmr-popup-text
Adjust trade popup text for XMR
2018-09-25 17:27:59 +02:00
Manfred Karrer
b6a4e028c6
Merge pull request #1721 from ManfredKarrer/update-json-for-bsq-explorer
Update json for bsq explorer
2018-09-25 09:50:15 -05:00
Manfred Karrer
d4c622237b
Merge pull request #1722 from ManfredKarrer/fix-parser
Fix bugs with voting
2018-09-25 09:49:06 -05:00
Manfred Karrer
b10948a247
Merge pull request #1724 from ManfredKarrer/master
Update libdohj to d4ace7bc
2018-09-25 00:43:51 -05:00
Manfred Karrer
8414911395
Update libdohj to d4ace7bc 2018-09-25 00:43:19 -05:00
Manfred Karrer
2be68a76fc
Fix issue with not filtered ballots
- When creating the ballot list we used all ballots of all cycles.
We added a new method to get the ballots of the current cycle.

- Add check if optionalTx.isPresent() in isTxInPhaseAndCycle
2018-09-24 21:23:03 -05:00
Manfred Karrer
ff796b3e6c
Add toString methods, add better logging 2018-09-24 19:15:19 -05:00
Manfred Karrer
d9cada9ec0
Fix issue with wrong merit
- We need to ignore the compensationProposal from the current cycle
when creating the merit list
2018-09-24 19:14:44 -05:00
Manfred Karrer
ee1317c64a
Fix issue causing invalid vote reveal tx
- Set PHASE_VOTE_REVEAL duration to 2 blocks as 1 block would cause an
invalid state (confirmation block is one block after phase)
- Rename getStateBuilder to getBsqStateBuilder
2018-09-24 18:30:05 -05:00
Manfred Karrer
835db24e53
Fix threading issues with ExportJsonFilesService
- Rename JsonBlockChainExporter to ExportJsonFilesService
- Remove getBlocksFromState method
- Add ExportJsonFilesService to DaoSetup and implement DaoSetupService
- Add json dir for all json sub dirs
- Move access to bsqStateService out from thread in ExportJsonFilesService
- Only do write to disk in thread
- Sync model files
2018-09-24 17:39:23 -05:00
Manfred Karrer
aefa986467
Fix threading issues with ExportJsonFilesService
- Rename JsonBlockChainExporter to ExportJsonFilesService
- Remove getBlocksFromState method
- Add ExportJsonFilesService to DaoSetup and implement DaoSetupService
- Add json dir for all json sub dirs
- Move access to bsqStateService out from thread in ExportJsonFilesService
- Only do write to disk in thread
2018-09-24 14:03:10 -05:00
Manfred Karrer
86086c1e09
Adjust trade popup text for XMR
Fixes https://github.com/bisq-network/bisq/issues/1555
2018-09-24 13:01:33 -05:00
Christoph Atteneder
ff4e22d5f5
Merge pull request #1719 from ManfredKarrer/fix-multiple-btc-peers
Refactoring of Btc package
2018-09-24 19:26:42 +02:00
Manfred Karrer
e47c160a27
Merge branch 'master' into fix-multiple-btc-peers 2018-09-24 12:11:58 -05:00
Manfred Karrer
0b97d4f746
Merge pull request #1717 from ManfredKarrer/master
Update to libdohj 411a920e
2018-09-24 12:10:18 -05:00
sqrrm
3f87460b57
Wait to commit BSQ txOutputs to bsqStateService until after parsing
If a transaction is considered invalid it should consider all the
txOutputs to be invalid. To avoid counting a txOutput as valid it's
better to commit to stateservice only after checking the validity of the
transaction.
2018-09-24 19:04:46 +02:00