From c34a019a310b0f7acf4305e37ca95c68f36e272a Mon Sep 17 00:00:00 2001
From: chimp1984 <chimp1984@gmx.com>
Date: Fri, 3 Dec 2021 20:09:47 -0500
Subject: [PATCH] Fixes https://github.com/bisq-network/bisq/issues/5882

When syncing from genesis the number of blocks are limited so we get the
`onParseBlockCompleteAfterBatchProcessing` called each time when the received
 blocks are processed, and as we are not at wallet height we repeat requesting
 blocks. But the new check for the BTC recipient triggers a resync from resource call.
We add now a check that we do this check only once the wallet is synced and our
block height from dao state matches wallet blockheight.
---
 .../bisq/core/dao/state/DaoStateSnapshotService.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java b/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java
index 877880be65..7e455158c8 100644
--- a/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java
+++ b/core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java
@@ -17,6 +17,8 @@
 
 package bisq.core.dao.state;
 
+import bisq.core.btc.setup.WalletsSetup;
+import bisq.core.btc.wallet.BsqWalletService;
 import bisq.core.dao.DaoSetupService;
 import bisq.core.dao.governance.param.Param;
 import bisq.core.dao.monitoring.DaoStateMonitoringService;
@@ -63,6 +65,8 @@ public class DaoStateSnapshotService implements DaoSetupService, DaoStateListene
     private final GenesisTxInfo genesisTxInfo;
     private final DaoStateStorageService daoStateStorageService;
     private final DaoStateMonitoringService daoStateMonitoringService;
+    private final WalletsSetup walletsSetup;
+    private final BsqWalletService bsqWalletService;
     private final Preferences preferences;
     private final Config config;
     private final File storageDir;
@@ -88,6 +92,8 @@ public class DaoStateSnapshotService implements DaoSetupService, DaoStateListene
                                    GenesisTxInfo genesisTxInfo,
                                    DaoStateStorageService daoStateStorageService,
                                    DaoStateMonitoringService daoStateMonitoringService,
+                                   WalletsSetup walletsSetup,
+                                   BsqWalletService bsqWalletService,
                                    Preferences preferences,
                                    Config config,
                                    @Named(Config.STORAGE_DIR) File storageDir) {
@@ -95,6 +101,8 @@ public class DaoStateSnapshotService implements DaoSetupService, DaoStateListene
         this.genesisTxInfo = genesisTxInfo;
         this.daoStateStorageService = daoStateStorageService;
         this.daoStateMonitoringService = daoStateMonitoringService;
+        this.walletsSetup = walletsSetup;
+        this.bsqWalletService = bsqWalletService;
         this.preferences = preferences;
         this.config = config;
         this.storageDir = storageDir;
@@ -121,7 +129,9 @@ public class DaoStateSnapshotService implements DaoSetupService, DaoStateListene
 
     @Override
     public void onParseBlockCompleteAfterBatchProcessing(Block block) {
-        if (config.baseCurrencyNetwork.isMainnet()) {
+        if (config.baseCurrencyNetwork.isMainnet() &&
+                walletsSetup.isDownloadComplete() &&
+                daoStateService.getChainHeight() == bsqWalletService.getBestChainHeight()) {
             // In case the DAO state is invalid we might get an outdated RECIPIENT_BTC_ADDRESS. In that case we trigger
             // a dao resync from resources.
             String address = daoStateService.getParamValue(Param.RECIPIENT_BTC_ADDRESS, daoStateService.getChainHeight());