Merge branch 'BIR-develop' of https://github.com/decenomy/DSW

decenomy · Feb 13, 2024 · cdf725f · cdf725f
2 parents fb15bb6 + 3a2bf56
commit cdf725f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/src/masternode-payments.cpp b/src/masternode-payments.cpp
@@ -21,6 +21,9 @@
 /** 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;
@@ -304,6 +307,9 @@ 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
@@ -30,6 +30,7 @@ std::vector<CSporkDef> 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
@@ -28,6 +28,7 @@ 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,