Refactor dao monitor handling

core/src/main/java/bisq/core/dao/monitoring/DaoStateMonitoringService.java

@@ -170,6 +170,8 @@ public void start() {
     @Override
     public void onParseBlockChainComplete() {
         parseBlockChainComplete = true;
+        daoStateService.getLastBlock().ifPresent(this::checkUtxos);
+
         if (!preferences.isUseDaoMonitor()) {
             return;
         }
@@ -193,16 +195,9 @@ public void onParseBlockChainComplete() {
 
     @Override
     public void onDaoStateChanged(Block block) {
-        long genesisTotalSupply = daoStateService.getGenesisTotalSupply().value;
-        long compensationIssuance = daoStateService.getTotalIssuedAmount(IssuanceType.COMPENSATION);
-        long reimbursementIssuance = daoStateService.getTotalIssuedAmount(IssuanceType.REIMBURSEMENT);
-        long totalAmountOfBurntBsq = daoStateService.getTotalAmountOfBurntBsq();
-        // confiscated funds are still in the utxo set
-        long sumUtxo = daoStateService.getUnspentTxOutputMap().values().stream().mapToLong(BaseTxOutput::getValue).sum();
-        long sumBsq = genesisTotalSupply + compensationIssuance + reimbursementIssuance - totalAmountOfBurntBsq;
-
-        if (sumBsq != sumUtxo) {
-            utxoMismatches.add(new UtxoMismatch(block.getHeight(), sumUtxo, sumBsq));
+        // During syncing we do not call checkUtxos as its a bit slow (about 4 ms)
+        if (parseBlockChainComplete) {
+            checkUtxos(block);
         }
     }
 
@@ -409,6 +404,20 @@ else if (this.isInConflictWithNonSeedNode)
         return changed.get();
     }
 
+    private void checkUtxos(Block block) {
+        long genesisTotalSupply = daoStateService.getGenesisTotalSupply().value;
+        long compensationIssuance = daoStateService.getTotalIssuedAmount(IssuanceType.COMPENSATION);
+        long reimbursementIssuance = daoStateService.getTotalIssuedAmount(IssuanceType.REIMBURSEMENT);
+        long totalAmountOfBurntBsq = daoStateService.getTotalAmountOfBurntBsq();
+        // confiscated funds are still in the utxo set
+        long sumUtxo = daoStateService.getUnspentTxOutputMap().values().stream().mapToLong(BaseTxOutput::getValue).sum();
+        long sumBsq = genesisTotalSupply + compensationIssuance + reimbursementIssuance - totalAmountOfBurntBsq;
+
+        if (sumBsq != sumUtxo) {
+            utxoMismatches.add(new UtxoMismatch(block.getHeight(), sumUtxo, sumBsq));
+        }
+    }
+
     private void verifyCheckpoints() {
         // Checkpoint
         checkpoints.forEach(checkpoint -> daoStateHashChain.stream()

core/src/main/java/bisq/core/dao/state/DaoStateSnapshotService.java

@@ -68,6 +68,7 @@ public class DaoStateSnapshotService implements DaoSetupService, DaoStateListene
     @Nullable
     private Runnable daoRequiresRestartHandler;
     private boolean requestPersistenceCalled;
+    private boolean isParseBlockChainComplete;
 
 
     ///////////////////////////////////////////////////////////////////////////////////////////
@@ -116,7 +117,35 @@ public void onDaoStateChanged(Block block) {
             // We need to execute first the daoStateMonitoringService.createHashFromBlock to get the hash created
             daoStateMonitoringService.createHashFromBlock(block);
         }
-        maybeCreateSnapshot(block);
+
+        // We only call maybeCreateSnapshot if we are done with parsing or if we have dao monitoring activated.
+        // In that case parsing is anyway slow and we prefer to have at each snapshot height a snapshot. It does not
+        // make syncing much slower by that.
+        if (preferences.isUseDaoMonitor() || isParseBlockChainComplete) {
+            maybeCreateSnapshot(block);
+        }
+    }
+
+    @Override
+    public void onParseBlockChainComplete() {
+        isParseBlockChainComplete = true;
+
+        // In case we have dao monitoring deactivated we create the snapshot after we are completed with parsing.
+        if (!preferences.isUseDaoMonitor()) {
+            // We use a thread to avoid that cloning slows down user thread.
+            new Thread(() -> {
+                Thread.currentThread().setName("Create-snapshot-after-parseBlockChainComplete");
+                long ts = System.currentTimeMillis();
+                daoStateSnapshotCandidate = daoStateService.getClone();
+                daoStateHashChainSnapshotCandidate = new LinkedList<>(daoStateMonitoringService.getDaoStateHashChain());
+                daoStateStorageService.requestPersistence(daoStateSnapshotCandidate,
+                        daoStateHashChainSnapshotCandidate,
+                        () -> {
+                            log.info("Persisted daoState after parsing completed at height {}. Took {} ms",
+                                    daoStateService.getChainHeight(), System.currentTimeMillis() - ts);
+                        });
+            }).start();
+        }
     }