use block height from caller

Github-Pull: PIVX-Project#2772 Rebased-From: a50ba7e
Fuzzbawls · Nov 22, 2022 · d285af0 · d285af0
1 parent b221c7f
commit d285af0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -568,7 +568,7 @@ void CMasternodePayments::AddWinningMasternode(CMasternodePaymentWinner& winnerI
     mapMasternodeBlocks[winnerIn.nBlockHeight].AddPayee(winnerIn.payee, 1);
 }
 
-bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew)
+bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew, int nBlockHeight)
 {
     LOCK(cs_vecPayments);
 
@@ -582,8 +582,7 @@ bool CMasternodeBlockPayees::IsTransactionValid(const CTransaction& txNew)
     if (nMaxSignatures < MNPAYMENTS_SIGNATURES_REQUIRED) return true;
 
     std::string strPayeesPossible = "";
-    int nHeight = mnodeman.GetBestHeight();
-    CAmount requiredMasternodePayment = GetMasternodePayment(nHeight);
+    CAmount requiredMasternodePayment = GetMasternodePayment(nBlockHeight);
 
     for (CMasternodePayee& payee : vecPayments) {
         bool found = false;
@@ -671,7 +670,7 @@ bool CMasternodePayments::IsTransactionValid(const CTransaction& txNew, const CB
     LOCK(cs_mapMasternodeBlocks);
 
     if (mapMasternodeBlocks.count(nBlockHeight)) {
-        return mapMasternodeBlocks[nBlockHeight].IsTransactionValid(txNew);
+        return mapMasternodeBlocks[nBlockHeight].IsTransactionValid(txNew, nBlockHeight);
     }
 
     return true;

diff --git a/src/masternode-payments.h b/src/masternode-payments.h
@@ -142,7 +142,7 @@ class CMasternodeBlockPayees
         return false;
     }
 
-    bool IsTransactionValid(const CTransaction& txNew);
+    bool IsTransactionValid(const CTransaction& txNew, int nBlockHeight);
     std::string GetRequiredPaymentsString();
 
     SERIALIZE_METHODS(CMasternodeBlockPayees, obj) { READWRITE(obj.nBlockHeight, obj.vecPayments); }