Check if applySnapshot was called >= 3 times with the same snapshot h…

…eight and if so call resyncDaoStateFromResources

Signed-off-by: HenrikJannsen <[email protected]>

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

@@ -41,6 +41,7 @@
 import java.io.File;
 import java.io.IOException;
 
+import java.util.ArrayList;
 import java.util.LinkedList;
 import java.util.List;
 
@@ -81,7 +82,7 @@ public class DaoStateSnapshotService implements DaoSetupService, DaoStateListene
     private int daoRequiresRestartHandlerAttempts = 0;
     private boolean readyForPersisting = true;
     private boolean isParseBlockChainComplete;
-
+    private final List<Integer> heightsOfLastAppliedSnapshots = new ArrayList<>();
 
     ///////////////////////////////////////////////////////////////////////////////////////////
     // Constructor
@@ -278,7 +279,6 @@ public void applyPersistedSnapshot() {
         applySnapshot(true);
     }
 
-    //TODO check if we get repeated trys with same snapshot failing. Could be an edge case with reorgs
     public void revertToLastSnapshot() {
         applySnapshot(false);
     }
@@ -290,6 +290,19 @@ private void applySnapshot(boolean fromInitialize) {
             return;
         }
 
+        int chainHeightOfPersistedDaoState = persistedDaoState.getChainHeight();
+        int numSameAppliedSnapshots = (int) heightsOfLastAppliedSnapshots.stream()
+                .filter(height -> height == chainHeightOfPersistedDaoState)
+                .count();
+        if (numSameAppliedSnapshots >= 3) {
+            log.warn("We got called applySnapshot the 3rd time with the same snapshot height. " +
+                    "We abort and call resyncDaoStateFromResources.");
+            resyncDaoStateFromResources();
+            return;
+        }
+
+        heightsOfLastAppliedSnapshots.add(chainHeightOfPersistedDaoState);
+
         if (persistedDaoState.getBlocks().isEmpty()) {
             if (fromInitialize) {
                 log.info("No Bsq blocks in DaoState. Expected if no data are provided yet from resources or persisted data.");
@@ -308,7 +321,6 @@ private void applySnapshot(boolean fromInitialize) {
             return;
         }
 
-        int chainHeightOfPersistedDaoState = persistedDaoState.getChainHeight();
         if (!isHeightAtLeastGenesisHeight(chainHeightOfPersistedDaoState)) {
             log.error("heightOfPersistedLastBlock is below genesis height. This should never happen.");
             return;