Merge branch 'dev' into duke

2024-02-15 10:11:52 -05:00
parent acee1c8cf5 b14070d15b
commit 8f2350fd84
4 changed files with 118 additions and 25 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1222,8 +1222,6 @@ bool ContextualCheckTransaction(int32_t slowflag,const CBlock *block, CBlockInde
 {
    const bool overwinterActive = nHeight >=1 ? true : false; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_OVERWINTER);
    const bool saplingActive    = nHeight >=1 ? true : false; //NetworkUpgradeActive(nHeight, Params().GetConsensus(), Consensus::UPGRADE_SAPLING);
-
-    /*
    const bool isSprout         = false; //!overwinterActive;

    // If Sprout rules apply, reject transactions which are intended for Overwinter and beyond