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

Fix incorrect start height for block request

Browse source 
We added 1 as with the lite monitor mode we persist the most recent block,
thus we request with the start height for the next block.
But that cause a problem at a DAO full mode which has lite monitor mode set
as then the block parsing would not be triggered.

We refactor it so that we take the chainHeight from the dao state
directly and add 1 at the requests.
We add a check if we are at chain tip, and if so we skip requests
and call the onParseBlockChainComplete directly.
This commit is contained in:
chimp1984 2021-11-28 00:27:04 +01:00 • committed by Christoph Atteneder
parent 1a1dcf1d6f
commit 84cd67f54d
No known key found for this signature in database
GPG key ID: CD5DC1C529CDFD3B
3 changed files with 15 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/src/main/java/bisq/core/dao/node/BsqNode.java
View file

@ -182,26 +182,6 @@ public abstract class BsqNode implements DaoSetupService {
p2PService.removeP2PServiceListener(p2PServiceListener);
}
@SuppressWarnings("WeakerAccess")
protected int getStartBlockHeight() {
int chainHeight = daoStateService.getChainHeight();
int startBlockHeight = chainHeight;
if (chainHeight > genesisBlockHeight)
startBlockHeight = chainHeight + 1;
log.info("getStartBlockHeight:\n" +
" Start block height={}\n" +
" Genesis txId={}\n" +
" Genesis block height={}\n" +
" Block height={}\n",
startBlockHeight,
genesisTxId,
genesisBlockHeight,
chainHeight);
return startBlockHeight;
}
protected abstract void startParseBlocks();
protected void onParseBlockChainComplete() {

3
core/src/main/java/bisq/core/dao/node/full/FullNode.java
View file

@ -107,8 +107,7 @@ public class FullNode extends BsqNode {
@Override
protected void startParseBlocks() {
int startBlockHeight = getStartBlockHeight();
int startBlockHeight = daoStateService.getChainHeight();
log.info("startParseBlocks: startBlockHeight={}", startBlockHeight);
rpcService.requestChainHeadHeight(chainHeight -> {
// If our persisted block is equal to the chain height we have startBlockHeight 1 block higher,

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

@ -182,7 +182,14 @@ public class LiteNode extends BsqNode {
// First we request the blocks from a full node
@Override
protected void startParseBlocks() {
liteNodeNetworkService.requestBlocks(getStartBlockHeight());
if (daoStateChainHeightBelowWalletChainHeight()) {
liteNodeNetworkService.requestBlocks(daoStateService.getChainHeight() + 1);
} else {
log.info("No block request needed as we have already the most recent block. " +
"daoStateService.getChainHeight()={}, bsqWalletService.getBestChainHeight()={}",
daoStateService.getChainHeight(), bsqWalletService.getBestChainHeight());
onParseBlockChainComplete();
}
}
@ -221,9 +228,8 @@ public class LiteNode extends BsqNode {
MathUtils.roundDouble(duration / blockList.size(), 2));
// We only request again if wallet is synced, otherwise we would get repeated calls we want to avoid.
// We deal with that case at the setupWalletBestBlockListener method above.
if (walletsSetup.isDownloadComplete() &&
daoStateService.getChainHeight() < bsqWalletService.getBestChainHeight()) {
liteNodeNetworkService.requestBlocks(getStartBlockHeight());
if (daoStateChainHeightBelowWalletChainHeight()) {
liteNodeNetworkService.requestBlocks(daoStateService.getChainHeight() + 1);
} else {
onParsingComplete.run();
onParseBlockChainComplete();
@ -266,4 +272,8 @@ public class LiteNode extends BsqNode {
maybeExportToJson();
}
private boolean daoStateChainHeightBelowWalletChainHeight() {
return walletsSetup.isDownloadComplete() && daoStateService.getChainHeight() < bsqWalletService.getBestChainHeight();
}
}