Masternode cache fix (#1010)

* Optimize MN lists cache (#3506)
firoorg · Mar 24, 2021 · b39fa5f · b39fa5f
1 parent 362d499
commit b39fa5f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 3 deletions.
diff --git a/src/evo/deterministicmns.cpp b/src/evo/deterministicmns.cpp
@@ -988,7 +988,7 @@ bool CDeterministicMNManager::IsDIP3Enforced(int nHeight)
 
 void CDeterministicMNManager::CleanupCache(int nHeight)
 {
-    AssertLockHeld(cs);
+    LOCK(cs);
 
     std::vector<uint256> toDelete;
     for (const auto& p : mnListsCache) {

diff --git a/src/evo/deterministicmns.h b/src/evo/deterministicmns.h
@@ -664,7 +664,7 @@ class CDeterministicMNManager
     void UpgradeDBIfNeeded();
     static bool IsDIP3Active(int height);
 
-private:
+public:
     void CleanupCache(int nHeight);
 };
 

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -247,6 +247,14 @@ bool CMasternodePayments::GetBlockTxOuts(int nBlockHeight, CAmount blockReward,
     return true;
 }
 
+bool CMasternodePayments::GetBlockTxOutsWipeCache(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const
+{
+    bool result = GetBlockTxOuts(nBlockHeight, blockReward, voutMasternodePaymentsRet);
+    AssertLockHeld(cs_main);
+    deterministicMNManager->CleanupCache(chainActive.Height());
+    return result;
+}
+
 // Is this masternode scheduled to get paid soon?
 // -- Only look ahead up to 8 blocks to allow for propagation of the latest 2 blocks of votes
 bool CMasternodePayments::IsScheduled(const CDeterministicMNCPtr& dmnIn, int nNotBlockHeight) const

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -32,6 +32,7 @@ class CMasternodePayments
 {
 public:
     bool GetBlockTxOuts(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const;
+    bool GetBlockTxOutsWipeCache(int nBlockHeight, CAmount blockReward, std::vector<CTxOut>& voutMasternodePaymentsRet) const;
     bool IsTransactionValid(const CTransaction& txNew, int nBlockHeight, CAmount blockReward) const;
     bool IsScheduled(const CDeterministicMNCPtr& dmn, int nNotBlockHeight) const;
 

diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
@@ -1553,7 +1553,7 @@ void ListTransactions(CWallet * const pwallet, const CWalletTx& wtx, const strin
                     int txHeight = chainActive.Height() - wtx.GetDepthInMainChain();
 
                     std::vector<CTxOut> voutMasternodePaymentsRet;
-                    mnpayments.GetBlockTxOuts(txHeight, CAmount(), voutMasternodePaymentsRet);
+                    mnpayments.GetBlockTxOutsWipeCache(txHeight, CAmount(), voutMasternodePaymentsRet);
                     //compare address of payee to addr.
 
                     bool its_znode_payment = false;