Consensus: Refactor: Introduce Consensus::GetFlags

jtimon · jtimon · commit 9ba7d0641019 · 2015-04-20T01:17:33.000+02:00
and use it instead of MANDATORY_SCRIPT_VERIFY_FLAGS in miner::CreateNewBlock()
diff --git a/src/consensus/blockverify.cpp b/src/consensus/blockverify.cpp
@@ -8,6 +8,7 @@
 #include "arith_uint256.h"
 #include "consensus/validation.h"
 #include "primitives/block.h"
+#include "script/interpreter.h"
 #include "tinyformat.h"
 
 #include <algorithm>  
@@ -134,6 +135,17 @@ bool Consensus::CheckBlockHeader(const CBlockHeader& block, CValidationState& st
     return true;
 }
 
+unsigned Consensus::GetFlags(const CBlock& block, const Consensus::Params& consensusParams, CBlockIndexBase* pindex, PrevIndexGetter indexGetter)
+{
+    int64_t nBIP16SwitchTime = 1333238400;
+    bool fStrictPayToScriptHash = ((int64_t)pindex->nTime >= nBIP16SwitchTime);
+    unsigned int flags = fStrictPayToScriptHash ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE;
+
+    if (block.nVersion >= 3 && IsSuperMajority(3, indexGetter(pindex), consensusParams.nMajorityEnforceBlockUpgrade, consensusParams, indexGetter))
+        flags |= SCRIPT_VERIFY_DERSIG;
+    return flags;
+}
+
 bool Consensus::ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, const Consensus::Params& consensusParams, const CBlockIndexBase* pindexPrev, PrevIndexGetter indexGetter)
 {
     // Check proof of work
diff --git a/src/consensus/consensus.h b/src/consensus/consensus.h
@@ -65,6 +65,14 @@ bool ContextualCheckBlockHeader(const CBlockHeader&, CValidationState&, const Co
 bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::Params& params, int64_t nTime, bool fCheckPOW = true, bool fCheckMerkleRoot = true);
 bool ContextualCheckBlock(const CBlock&, CValidationState&, const Consensus::Params&, const CBlockIndexBase*, PrevIndexGetter);
 
+/** Block validation utilities */
+
+/**
+ * BIP16 didn't become active until Apr 1 2012
+ * Starts enforcing the DERSIG (BIP66) rules, for block.nVersion=3 blocks, when 75% of the network has upgraded
+ */
+unsigned int GetFlags(const CBlock&, const Consensus::Params&, CBlockIndexBase*, PrevIndexGetter indexGetter);
+
 } // namespace Consensus
 
 /** Transaction validation utility functions */
diff --git a/src/main.cpp b/src/main.cpp
@@ -1612,22 +1612,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
                                  REJECT_INVALID, "bad-txns-BIP30");
         }
     }
-
-    // BIP16 didn't become active until Apr 1 2012
-    int64_t nBIP16SwitchTime = 1333238400;
-    bool fStrictPayToScriptHash = (pindex->GetBlockTime() >= nBIP16SwitchTime);
-
-    unsigned int flags = fStrictPayToScriptHash ? SCRIPT_VERIFY_P2SH : SCRIPT_VERIFY_NONE;
-
-    // Start enforcing the DERSIG (BIP66) rules, for block.nVersion=3 blocks, when 75% of the network has upgraded:
-    if (block.nVersion >= 3 && IsSuperMajority(3, pindex->pprev, chainparams.GetConsensus().nMajorityEnforceBlockUpgrade, chainparams.GetConsensus(), GetPrevIndex)) {
-        flags |= SCRIPT_VERIFY_DERSIG;
-    }
-
     CBlockUndo blockundo;
 
     CCheckQueueControl<CScriptCheck> control(fScriptChecks && nScriptCheckThreads ? &scriptcheckqueue : NULL);
 
+    unsigned int flags = Consensus::GetFlags(block, chainparams.GetConsensus(), pindex, GetPrevIndex);
     int64_t nTimeStart = GetTimeMicros();
     CAmount nFees = 0;
     int nInputs = 0;
diff --git a/src/miner.cpp b/src/miner.cpp
@@ -242,6 +242,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
 
         TxPriorityCompare comparer(fSortedByFee);
         std::make_heap(vecPriority.begin(), vecPriority.end(), comparer);
+        unsigned int flags = Consensus::GetFlags(*pblock, chainparams.GetConsensus(), pindexPrev, GetPrevIndex);
 
         while (!vecPriority.empty())
         {
@@ -288,7 +289,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
             // Note that flags: we don't want to set mempool/IsStandard()
             // policy here, but we still have to ensure that the block we
             // create only contains transactions that are valid in new blocks.
-            if (!Consensus::CheckTxInputsScripts(tx, state, view, MANDATORY_SCRIPT_VERIFY_FLAGS, true))
+            if (!Consensus::CheckTxInputsScripts(tx, state, view, flags, true))
                 continue;
 
             CAmount nTxFees = view.GetValueIn(tx)-tx.GetValueOut();
