FillBlockPayee: reworked to not require chainActive.Tip redundant acc…

…ess.
KolbyML · Sep 2, 2020 · 377f87e · 377f87e
1 parent 920652b
commit 377f87e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/src/masternode-budget.cpp b/src/masternode-budget.cpp
@@ -532,12 +532,10 @@ void CBudgetManager::CheckAndRemove()
 
 }
 
-void CBudgetManager::FillBlockPayee(CMutableTransaction& txNew, bool fProofOfStake)
+void CBudgetManager::FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake)
 {
-    LOCK(cs);
-
-    CBlockIndex* pindexPrev = chainActive.Tip();
     if (!pindexPrev) return;
+    LOCK(cs);
 
     int nHighestCount = 0;
     CScript payee;

diff --git a/src/masternode-budget.h b/src/masternode-budget.h
@@ -239,7 +239,7 @@ class CBudgetManager
     bool PropExists(uint256 nHash);
     TrxValidationStatus IsTransactionValid(const CTransaction& txNew, int nBlockHeight);
     std::string GetRequiredPaymentsString(int nBlockHeight);
-    void FillBlockPayee(CMutableTransaction& txNew, bool fProofOfStake);
+    void FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake);
 
     void CheckOrphanVotes();
     void Clear()

diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -322,15 +322,14 @@ bool IsBlockPayeeValid(const CBlock& block, int nBlockHeight)
 }
 
 
-void FillBlockPayee(CMutableTransaction& txNew, bool fProofOfStake, bool fZPIVStake)
+void FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake, bool fZPIVStake)
 {
-    CBlockIndex* pindexPrev = chainActive.Tip();
     if (!pindexPrev) return;
 
     if (sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) && budget.IsBudgetPaymentBlock(pindexPrev->nHeight + 1)) {
-        budget.FillBlockPayee(txNew, fProofOfStake);
+        budget.FillBlockPayee(txNew, pindexPrev, fProofOfStake);
     } else {
-        masternodePayments.FillBlockPayee(txNew, fProofOfStake, fZPIVStake);
+        masternodePayments.FillBlockPayee(txNew, pindexPrev, fProofOfStake, fZPIVStake);
     }
 }
 
@@ -343,9 +342,8 @@ std::string GetRequiredPaymentsString(int nBlockHeight)
     }
 }
 
-void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, bool fProofOfStake, bool fZPIVStake)
+void CMasternodePayments::FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake, bool fZPIVStake)
 {
-    CBlockIndex* pindexPrev = chainActive.Tip();
     if (!pindexPrev) return;
 
     bool hasPayment = true;

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -28,7 +28,7 @@ void ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDa
 bool IsBlockPayeeValid(const CBlock& block, int nBlockHeight);
 std::string GetRequiredPaymentsString(int nBlockHeight);
 bool IsBlockValueValid(const CBlock& block, CAmount nExpectedValue, CAmount nMinted);
-void FillBlockPayee(CMutableTransaction& txNew, bool fProofOfStake, bool fZPIVStake);
+void FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake, bool fZPIVStake);
 
 void DumpMasternodePayments();
 
@@ -279,7 +279,7 @@ class CMasternodePayments
     int GetMinMasternodePaymentsProto();
     void ProcessMessageMasternodePayments(CNode* pfrom, std::string& strCommand, CDataStream& vRecv);
     std::string GetRequiredPaymentsString(int nBlockHeight);
-    void FillBlockPayee(CMutableTransaction& txNew, bool fProofOfStake, bool fZPIVStake);
+    void FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake, bool fZPIVStake);
     std::string ToString() const;
     int GetOldestBlock();
     int GetNewestBlock();

diff --git a/src/miner.cpp b/src/miner.cpp
@@ -207,7 +207,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn, CWallet* pwallet,
         txNew.vout[0].scriptPubKey = scriptPubKeyIn;
 
         //Masternode and general budget payments
-        FillBlockPayee(txNew, fProofOfStake, false);
+        FillBlockPayee(txNew, pindexPrev, fProofOfStake, false);
 
         txNew.vin[0].scriptSig = CScript() << nHeight << OP_0;
         //Make payee

diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2822,7 +2822,7 @@ bool CWallet::CreateCoinStake(
             return error("%s : exceeded coinstake size limit", __func__);
 
         // Masternode payment
-        FillBlockPayee(txNew, true, false);
+        FillBlockPayee(txNew, pindexPrev, true, false);
 
         uint256 hashTxOut = txNew.GetHash();
         CTxIn in;