[BUG] Miner not paying valid finalized budget if <20 active masternodes

random-zebra · random-zebra · commit 16455e0796f3 · 2020-12-20T02:50:40.000+01:00
Verifier: (`CheckBlock` --&gt; `IsBlockPayeeValid` --&gt;
`IsBudgetPaymentBlock`) expects a payment to a budget even with the case
of N&lt;20 active masternodes on the network, provided that all N voted on
the finalized budget (the threshold is N-1).

Also remove the extra call to `IsBudgetPaymentBlock` directly from
`FillBlockPayee` (it is already called by
`CBudgetManager::FillBlockPayee` --&gt; `GetPayeeAndAmount`).
diff --git a/src/budget/budgetmanager.cpp b/src/budget/budgetmanager.cpp
@@ -401,17 +401,12 @@ int CBudgetManager::GetHighestVoteCount(int chainHeight) const
 
 bool CBudgetManager::GetPayeeAndAmount(int chainHeight, CScript& payeeRet, CAmount& nAmountRet) const
 {
-    const CFinalizedBudget* pfb = GetBudgetWithHighestVoteCount(chainHeight);
-    if (!pfb) return false;
-
-    // Check that there are enough votes
-    int mnCount = mnodeman.CountEnabled(ActiveProtocol());
-    int nFivePercent = mnCount / 20;
-    if ((nFivePercent == 0 && !(Params().IsRegTestNet() && mnCount > 0) ) ||
-        pfb->GetVoteCount() < nFivePercent)
+    int nCountThreshold;
+    if (!IsBudgetPaymentBlock(chainHeight, nCountThreshold))
         return false;
 
-    return pfb->GetPayeeAndAmount(chainHeight, payeeRet, nAmountRet);
+    const CFinalizedBudget* pfb = GetBudgetWithHighestVoteCount(chainHeight);
+    return pfb && pfb->GetPayeeAndAmount(chainHeight, payeeRet, nAmountRet) && pfb->GetVoteCount() > nCountThreshold;
 }
 
 bool CBudgetManager::FillBlockPayee(CMutableTransaction& txNew, const int nHeight, bool fProofOfStake) const
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -295,10 +295,9 @@ void FillBlockPayee(CMutableTransaction& txNew, const int nHeight, bool fProofOf
 {
     if (nHeight == 0) return;
 
-    if (!sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) ||  // if superblocks are not enabled
-            !g_budgetman.IsBudgetPaymentBlock(nHeight) || // or this is not a superblock
-            !g_budgetman.FillBlockPayee(txNew, nHeight, fProofOfStake) ) {    // or there's no budget with enough votes
-        // pay a masternode
+    if (!sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) ||           // if superblocks are not enabled
+            !g_budgetman.FillBlockPayee(txNew, nHeight, fProofOfStake) ) {    // or this is not a superblock,
+        // ... or there's no budget with enough votes, then pay a masternode
         masternodePayments.FillBlockPayee(txNew, nHeight, fProofOfStake);
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -295,10 +295,9 @@ void FillBlockPayee(CMutableTransaction& txNew, const int nHeight, bool fProofOf`
`295`	`295`	`{`
`296`	`296`	`if (nHeight == 0) return;`
`297`	`297`
`298`		`- if (!sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) \|\| // if superblocks are not enabled`
`299`		`- !g_budgetman.IsBudgetPaymentBlock(nHeight) \|\| // or this is not a superblock`
`300`		`- !g_budgetman.FillBlockPayee(txNew, nHeight, fProofOfStake) ) { // or there's no budget with enough votes`
`301`		`- // pay a masternode`
	`298`	`+ if (!sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) \|\| // if superblocks are not enabled`
	`299`	`+ !g_budgetman.FillBlockPayee(txNew, nHeight, fProofOfStake) ) { // or this is not a superblock,`
	`300`	`+ // ... or there's no budget with enough votes, then pay a masternode`
`302`	`301`	`masternodePayments.FillBlockPayee(txNew, nHeight, fProofOfStake);`
`303`	`302`	`}`
`304`	`303`	`}`