Commit graph

2099 commits

Author SHA1 Message Date
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
Manfred Karrer
0508489191
Add comment, cleanup 2018-09-27 21:26:21 -05:00
Manfred Karrer
19f1d2b565
Add log 2018-09-27 20:17:53 -05:00
Manfred Karrer
774b2b3c51
Add missing scriptType enum 2018-09-27 20:16:57 -05:00
Devin Bileck
3663d6cf14
Fix last update timestamp in price feed service 2018-09-27 12:55:02 -07: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
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
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
Manfred Karrer
b1182e9784
Use GenesisTxInfo instead of option key for genesis block height 2018-09-25 22:43:27 -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
5b70d71580
Add isTestNet method 2018-09-25 20:52:08 -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
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
Manfred Karrer
e47c160a27
Merge branch 'master' into fix-multiple-btc-peers 2018-09-24 12:11:58 -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
sqrrm
5dffe7159e
Check for multiple opReturns before processing txOutputs 2018-09-24 19:04:46 +02:00
sqrrm
f31bf0d5cf
Process opReturn txOutput before remaining outputs 2018-09-24 19:04:46 +02:00
sqrrm
a623fd3852
Extract opreturn post processing functions 2018-09-24 19:04:46 +02:00
sqrrm
e8b9466516
Rename processOpReturnCandidate -> isOpReturnCandidate 2018-09-24 19:04:46 +02:00
sqrrm
dc1964bda2
Parse opreturn before other outputs
Since the effects of opreturn act on the BSQ outputs it makes more sense
to parse the opreturn before parsing the remaining outputs.

Put the lock time in the LOCKUP txOutput. It makes more logical sense to
keep it there.
2018-09-24 19:04:46 +02:00
Christoph Atteneder
95f42fed21
Merge pull request #1716 from ManfredKarrer/small-improvements
Small improvements
2018-09-24 06:31:57 +02:00