flag renamed

Author: knst

src/evo/deterministicmns.cpp

@@ -183,10 +183,10 @@ CDeterministicMNCPtr CDeterministicMNList::GetMNPayee(const CBlockIndex* pIndex)
     }
 
     bool isv19Active = llmq::utils::IsV19Active(pIndex);
-    bool isMNRRActive = llmq::utils::IsMNRewardReallocationActive(pIndex);
+    bool isMNRewardReallocated = llmq::utils::IsMNRewardReallocationActive(pIndex);
     CDeterministicMNCPtr best{nullptr};
     // Starting from v19 and until v20 (Platform release), HPMN will be rewarded 4 blocks in a row
-    if (isv19Active && !isMNRRActive) {
+    if (isv19Active && !isMNRewardReallocated) {
         ForEachMNShared(true, [&](const CDeterministicMNCPtr& dmn) {
             if (dmn->pdmnState->nLastPaidHeight == nHeight) {
                 // We found the last MN Payee.
@@ -224,11 +224,12 @@ std::vector<CDeterministicMNCPtr> CDeterministicMNList::GetProjectedMNPayees(int
 
     auto remaining_hpmn_payments = 0;
     CDeterministicMNCPtr hpmn_to_be_skipped = nullptr;
+    bool isMNRewardReallocated = llmq::utils::IsMNRewardReallocationActive(pIndex);
     ForEachMNShared(true, [&](const CDeterministicMNCPtr& dmn) {
         if (dmn->pdmnState->nLastPaidHeight == nHeight) {
             // We found the last MN Payee.
             // If the last payee is a HPMN, we need to check its consecutive payments and pay him again if needed
-            if (dmn->nType == MnType::HighPerformance && dmn->pdmnState->nConsecutivePayments < dmn_types::HighPerformance.voting_weight) {
+            if (!isMNRewardReallocated && dmn->nType == MnType::HighPerformance && dmn->pdmnState->nConsecutivePayments < dmn_types::HighPerformance.voting_weight) {
                 remaining_hpmn_payments = dmn_types::HighPerformance.voting_weight - dmn->pdmnState->nConsecutivePayments;
                 for ([[maybe_unused]] auto _ : irange::range(remaining_hpmn_payments)) {
                     result.emplace_back(dmn);
@@ -722,7 +723,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
     DecreasePoSePenalties(newList);
 
     bool isv19Active = llmq::utils::IsV19Active(pindexPrev);
-    bool isMNRRActive = llmq::utils::IsMNRewardReallocationActive(pindexPrev);
+    bool isMNRewardReallocated = llmq::utils::IsMNRewardReallocationActive(pindexPrev);
 
     // we skip the coinbase
     for (int i = 1; i < (int)block.vtx.size(); i++) {
@@ -944,7 +945,7 @@ bool CDeterministicMNManager::BuildNewListFromBlock(const CBlock& block, const C
         // Starting from v19 and until v20, HPMN will be paid 4 blocks in a row
         // No need to check if v19 is active, since HPMN ProRegTx are allowed only after v19 activation
         // Note: If the payee wasn't found in the current block that's fine
-        if (dmn->nType == MnType::HighPerformance && !isMNRRActive) {
+        if (dmn->nType == MnType::HighPerformance && !isMNRewardReallocated) {
             ++newState->nConsecutivePayments;
             if (debugLogs) {
                 LogPrint(BCLog::MNPAYMENTS, "CDeterministicMNManager::%s -- MN %s is a HPMN, bumping nConsecutivePayments to %d\n",