Adjust budget payment logic for 6.0

Liquid369 · Liquid369 · commit f5278bd5ee36 · 2023-02-06T07:00:18.000-06:00
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -341,13 +341,13 @@ void FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTransaction& txCoin
         return FillBlockPayee_legacy(txCoinbase, txCoinstake, pindexPrev, fProofOfStake);
     }
 
-    // Add masternode payment
-    masternodePayments.FillBlockPayee(txCoinbase, txCoinstake, pindexPrev, fProofOfStake);
-
     // Add budget payments (if superblock, and SPORK_13 is active)
-    if (sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS)) {
+    if (sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) && g_budgetman.FillBlockPayee(txCoinbase, txCoinstake, pindexPrev->nHeight + 1, fProofOfStake)) {
         g_budgetman.FillBlockPayees(txCoinbase, height);
     }
+
+    // Add masternode payment
+    masternodePayments.FillBlockPayee(txCoinbase, txCoinstake, pindexPrev, fProofOfStake);
 }
 
 std::string GetRequiredPaymentsString(int nBlockHeight)

Original file line number	Diff line number	Diff line change
`@@ -341,13 +341,13 @@ void FillBlockPayee(CMutableTransaction& txCoinbase, CMutableTransaction& txCoin`
`341`	`341`	`return FillBlockPayee_legacy(txCoinbase, txCoinstake, pindexPrev, fProofOfStake);`
`342`	`342`	`}`
`343`	`343`
`344`		`- // Add masternode payment`
`345`		`- masternodePayments.FillBlockPayee(txCoinbase, txCoinstake, pindexPrev, fProofOfStake);`
`346`		`-`
`347`	`344`	`// Add budget payments (if superblock, and SPORK_13 is active)`
`348`		`- if (sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS)) {`
	`345`	`+ if (sporkManager.IsSporkActive(SPORK_13_ENABLE_SUPERBLOCKS) && g_budgetman.FillBlockPayee(txCoinbase, txCoinstake, pindexPrev->nHeight + 1, fProofOfStake)) {`
`349`	`346`	`g_budgetman.FillBlockPayees(txCoinbase, height);`
`350`	`347`	`}`
	`348`	`+`
	`349`	`+ // Add masternode payment`
	`350`	`+ masternodePayments.FillBlockPayee(txCoinbase, txCoinstake, pindexPrev, fProofOfStake);`
`351`	`351`	`}`
`352`	`352`
`353`	`353`	`std::string GetRequiredPaymentsString(int nBlockHeight)`