From 7b22fe1ffae24a5cf8d0137ef6b75a7d1c46b704 Mon Sep 17 00:00:00 2001 From: lucas Date: Tue, 13 Feb 2024 13:04:08 +0000 Subject: [PATCH 1/2] Revert "resets SPORK113 and variables in masternode-payments.cpp" This reverts commit 3a2bf5651950201735bc6e615943fea9f0140ae0. --- src/masternode-payments.cpp | 6 ------ src/spork.cpp | 1 - src/sporkid.h | 1 - 3 files changed, 8 deletions(-) diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index d8937427f..871d055a0 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -21,9 +21,6 @@ /** Object for who's going to get paid on which blocks */ CMasternodePayments masternodePayments; -uint64_t reconsiderWindowMin = 0; -uint64_t reconsiderWindowTime = 0; - RecursiveMutex cs_vecPayments; RecursiveMutex cs_mapMasternodeBlocks; RecursiveMutex cs_mapMasternodePayeeVotes; @@ -307,9 +304,6 @@ bool IsBlockPayeeValid(const CBlock& block, int nBlockHeight) LogPrint(BCLog::MASTERNODE,"Masternode payment enforcement reconsidered, accepting block\n"); return true; } - - LogPrint(BCLog::MASTERNODE,"Masternode payment enforcement is disabled, accepting block\n"); - return true; } void FillBlockPayee(CMutableTransaction& txNew, const CBlockIndex* pindexPrev, bool fProofOfStake) diff --git a/src/spork.cpp b/src/spork.cpp index a497b89ba..724fa5de6 100644 --- a/src/spork.cpp +++ b/src/spork.cpp @@ -30,7 +30,6 @@ std::vector sporkDefs = { MAKE_SPORK_DEF(SPORK_110_FORCE_ENABLED_MASTERNODE_PAYMENT, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_111_ALLOW_DUPLICATE_MN_IPS, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_112_MASTERNODE_LAST_PAID_V2, 4070908800ULL), // OFF - MAKE_SPORK_DEF(SPORK_113_RECONSIDER_WINDOW_ENFORCEMENT, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_114_MN_PAYMENT_V2, 4070908800ULL), // OFF MAKE_SPORK_DEF(SPORK_115_MN_COLLATERAL_WINDOW, 4070908800ULL), // OFF diff --git a/src/sporkid.h b/src/sporkid.h index de83b1724..14ad9b566 100644 --- a/src/sporkid.h +++ b/src/sporkid.h @@ -28,7 +28,6 @@ enum SporkId : int32_t { SPORK_110_FORCE_ENABLED_MASTERNODE_PAYMENT = 10109, SPORK_111_ALLOW_DUPLICATE_MN_IPS = 10110, SPORK_112_MASTERNODE_LAST_PAID_V2 = 10111, - SPORK_113_RECONSIDER_WINDOW_ENFORCEMENT = 10112, SPORK_114_MN_PAYMENT_V2 = 10113, SPORK_115_MN_COLLATERAL_WINDOW = 10114, From 409c888945577489d6c17bd21d54ee5b97997c15 Mon Sep 17 00:00:00 2001 From: lucas Date: Tue, 13 Feb 2024 13:08:11 +0000 Subject: [PATCH 2/2] removes code associated to SPORK113 --- src/masternode-payments.cpp | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp index 871d055a0..dc517484a 100644 --- a/src/masternode-payments.cpp +++ b/src/masternode-payments.cpp @@ -252,17 +252,6 @@ bool IsBlockPayeeValid(const CBlock& block, int nBlockHeight) const bool isPoSActive = Params().GetConsensus().NetworkUpgradeActive(nBlockHeight, Consensus::UPGRADE_POS); const CTransaction& txNew = (isPoSActive ? block.vtx[1] : block.vtx[0]); - auto t = GetTime(); - - if((t - reconsiderWindowTime) > HOUR_IN_SECONDS) { // shift the reconsider window at each hour - reconsiderWindowMin = GetRand() % 10; // choose randomly from minute 0 to minute 9 - reconsiderWindowTime = t; - - for (auto it = mapRejectedBlocks.cbegin(); it != mapRejectedBlocks.cend();) { // clean up old entries - it = (GetAdjustedTime() - (*it).second) > DAY_IN_SECONDS ? mapRejectedBlocks.erase(it) : std::next(it); - } - } - // if it's the mint block then verify if exists an output with the right amount and address if (consensus.nMintHeight == nBlockHeight) { LogPrint(BCLog::MASTERNODE, "masternode", "IsBlockPayeeValid: Check mint reward\n"); @@ -291,17 +280,9 @@ bool IsBlockPayeeValid(const CBlock& block, int nBlockHeight) // fails if spork 8 is enabled and // spork 113 is disabled or current time is outside the reconsider window if (sporkManager.IsSporkActive(SPORK_8_MASTERNODE_PAYMENT_ENFORCEMENT)) { - if (!sporkManager.IsSporkActive(SPORK_113_RECONSIDER_WINDOW_ENFORCEMENT)) - { - return false; - } - - if ((t / MINUTE_IN_SECONDS) % 10 != reconsiderWindowMin) - { - return false; - } - - LogPrint(BCLog::MASTERNODE,"Masternode payment enforcement reconsidered, accepting block\n"); + return false; + } else { + LogPrint(BCLog::MASTERNODE,"Masternode payment enforcement is disabled, accepting block\n"); return true; } }