mirrors/bisq
1
0
Fork 0
mirror of https://github.com/bisq-network/bisq.git synced 2025-02-25 07:27:18 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove "hack" for removal of blockDownloadListener

Browse source 
Rename params
Cleanups
This commit is contained in:
chimp1984 2020-12-28 13:17:06 -05:00
parent 357c980390
commit fe44a343d0
No known key found for this signature in database
GPG key ID: 9801B4EC591F90E3
1 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
core/src/main/java/bisq/core/dao/node/lite/LiteNode.java
View file

@ -81,6 +81,12 @@ public class LiteNode extends BsqNode {
this.liteNodeNetworkService = liteNodeNetworkService; this.liteNodeNetworkService = liteNodeNetworkService;
this.bsqWalletService = bsqWalletService; this.bsqWalletService = bsqWalletService;
this.walletsSetup = walletsSetup; this.walletsSetup = walletsSetup;
blockDownloadListener = (observable, oldValue, newValue) -> {
if ((double) newValue == 1) {
setupWalletBestBlockListener();
}
};
} }
@ -94,22 +100,18 @@ public class LiteNode extends BsqNode {
liteNodeNetworkService.start(); liteNodeNetworkService.start();
// We wait until the wallet is synced before using it trigger requests // We wait until the wallet is synced before using it for triggering requests
if (walletsSetup.isDownloadComplete()) { if (walletsSetup.isDownloadComplete()) {
setupWalletBestBlockListener(); setupWalletBestBlockListener();
} else if (blockDownloadListener == null) { } else {
blockDownloadListener = (observable, oldValue, newValue) -> {
if ((double) newValue == 1) {
setupWalletBestBlockListener();
UserThread.execute(() -> walletsSetup.downloadPercentageProperty().removeListener(blockDownloadListener));
}
};
walletsSetup.downloadPercentageProperty().addListener(blockDownloadListener); walletsSetup.downloadPercentageProperty().addListener(blockDownloadListener);
} }
} }
private void setupWalletBestBlockListener() { private void setupWalletBestBlockListener() {
bsqWalletService.addNewBestBlockListener(btcBlock -> { walletsSetup.downloadPercentageProperty().removeListener(blockDownloadListener);
bsqWalletService.addNewBestBlockListener(blockFromWallet -> {
// Check if we are done with parsing // Check if we are done with parsing
if (!daoStateService.isParseBlockChainComplete()) if (!daoStateService.isParseBlockChainComplete())
return; return;
@ -119,14 +121,14 @@ public class LiteNode extends BsqNode {
checkForBlockReceivedTimer.stop(); checkForBlockReceivedTimer.stop();
} }
int btcWalletHeight = btcBlock.getHeight(); int walletBlockHeight = blockFromWallet.getHeight();
log.info("New block at height {} from bsqWalletService", btcWalletHeight); log.info("New block at height {} from bsqWalletService", walletBlockHeight);
// We expect to receive the new BSQ block from the network shortly after BitcoinJ has been aware of it. // We expect to receive the new BSQ block from the network shortly after BitcoinJ has been aware of it.
// If we don't receive it we request it manually from seed nodes // If we don't receive it we request it manually from seed nodes
checkForBlockReceivedTimer = UserThread.runAfter(() -> { checkForBlockReceivedTimer = UserThread.runAfter(() -> {
int daoChainHeight = daoStateService.getChainHeight(); int daoChainHeight = daoStateService.getChainHeight();
if (daoChainHeight < btcWalletHeight) { if (daoChainHeight < walletBlockHeight) {
log.warn("We did not receive a block from the network {} seconds after we saw the new block in BitcoinJ. " + log.warn("We did not receive a block from the network {} seconds after we saw the new block in BitcoinJ. " +
"We request from our seed nodes missing blocks from block height {}.", "We request from our seed nodes missing blocks from block height {}.",
CHECK_FOR_BLOCK_RECEIVED_DELAY_SEC, daoChainHeight + 1); CHECK_FOR_BLOCK_RECEIVED_DELAY_SEC, daoChainHeight + 1);
@ -254,7 +256,8 @@ public class LiteNode extends BsqNode {
// We received a new block // We received a new block
private void onNewBlockReceived(RawBlock block) { private void onNewBlockReceived(RawBlock block) {
int blockHeight = block.getHeight(); int blockHeight = block.getHeight();
log.info("onNewBlockReceived: block at height {}, hash={}. Our DAO chainHeight={}", blockHeight, block.getHash(), chainTipHeight); log.info("onNewBlockReceived: block at height {}, hash={}. Our DAO chainHeight={}",
blockHeight, block.getHash(), chainTipHeight);
// We only update chainTipHeight if we get a newer block // We only update chainTipHeight if we get a newer block
if (blockHeight > chainTipHeight) { if (blockHeight > chainTipHeight) {