Update snapshot based on height

DeFiCh · Nov 23, 2023 · adc22c6 · adc22c6
1 parent 53d44ec
commit adc22c6
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git a/src/flushablestorage.h b/src/flushablestorage.h
@@ -11,6 +11,7 @@
 #include <functional>
 #include <map>
 #include <memusage.h>
+#include <rpc/resultcache.h>
 
 #include <optional>
 
@@ -370,25 +371,22 @@ class CFlushableStorageKV : public CStorageKV {
     std::pair<MapKV, std::unique_ptr<CStorageLevelDB>> GetSnapshotPair() {
         const auto storageLevelDB = dynamic_cast<CStorageLevelDB*>(&db);
         assert(storageLevelDB);
-        if (blockTipChanged.load()) {
+        const auto currentHeight = GetLastValidatedHeight();
+        if (currentHeight != snapshotHeight) {
             // Lock cs_main when updating from tipSnapshot to avoid
             // race with Dis/ConnectTip.
             LOCK(cs_main);
-            // Double check bool for safety now we are under lock.
-            if (blockTipChanged.load()) {
+            // Double check for safety now we are under lock.
+            if (currentHeight != snapshotHeight) {
                 tipSnapshot = storageLevelDB->GetStorageSnapshot();
                 changedCopy = changed;
-                blockTipChanged.store(false);
+                snapshotHeight = currentHeight;
             }
         }
 
         return {changedCopy, std::make_unique<CStorageLevelDB>(storageLevelDB->GetDB(), tipSnapshot)};
     }
 
-    void BlockTipChanged() {
-        blockTipChanged.store(true);
-    }
-
 private:
     std::unique_ptr<CStorageLevelDB> snapshotDB;
     CStorageKV& db;
@@ -402,7 +400,7 @@ class CFlushableStorageKV : public CStorageKV {
     MapKV changedCopy;
 
     // Used to determine whether the block tip has changed.
-    std::atomic<bool> blockTipChanged{true};
+    int snapshotHeight{std::numeric_limits<int>::max()};
 };
 
 template<typename T>

diff --git a/src/rpc/resultcache.cpp b/src/rpc/resultcache.cpp
@@ -1,6 +1,6 @@
 #include <rpc/resultcache.h>
 #include <rpc/util.h>
-#include <logging.h>
+#include <validation.h>
 
 void RPCResultCache::Init(RPCCacheMode mode) {
     std::unique_lock l{aMutex};

diff --git a/src/rpc/resultcache.h b/src/rpc/resultcache.h
@@ -8,8 +8,9 @@
 #include <optional>
 #include <memory>
 #include <univalue.h>
-#include <dfi/mn_rpc.h>
+#include <dfi/balances.h>
 #include <rpc/request.h>
+#include <uint256.h>
 
 struct CGetBurnInfoResult {
     CAmount burntDFI{};

diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2217,7 +2217,6 @@ DisconnectResult CChainState::DisconnectBlock(const CBlock &block,
     auto prevHeight = pindex->pprev->nHeight;
 
     mnview.SetLastHeight(prevHeight);
-    SetLastValidatedHeight(prevHeight);
 
     return fClean ? DISCONNECT_OK : DISCONNECT_UNCLEAN;
 }
@@ -3466,7 +3465,6 @@ bool CChainState::ConnectBlock(const CBlock &block,
         }
     }
     mnview.SetLastHeight(pindex->nHeight);
-    SetLastValidatedHeight(pindex->nHeight);
 
     auto &checkpoints = chainparams.Checkpoints().mapCheckpoints;
     auto it = checkpoints.lower_bound(pindex->nHeight);
@@ -3818,7 +3816,7 @@ bool CChainState::DisconnectTip(CValidationState &state,
         assert(flushed);
         mnview.GetHistoryWriters().FlushDB();
 
-        pcustomcsview->GetStorage().BlockTipChanged();
+        SetLastValidatedHeight(pindexDelete->pprev->nHeight);
 
         if (!disconnectedConfirms.empty()) {
             for (const auto &confirm : disconnectedConfirms) {
@@ -3997,7 +3995,7 @@ bool CChainState::ConnectTip(CValidationState &state,
         assert(flushed);
         mnview.GetHistoryWriters().FlushDB();
 
-        pcustomcsview->GetStorage().BlockTipChanged();
+        SetLastValidatedHeight(pindexNew->nHeight);
 
         // Delete all other confirms from memory
         if (rewardedAnchors) {