Create (MANDATORY|STANDARD)_SCRIPT_VERIFY_FLAGS constants

This commit is contained in:
Peter Todd
2014-03-10 17:31:46 -04:00
parent d4ffe4e425
commit 68f7d1d7af
6 changed files with 20 additions and 5 deletions

View File

@@ -276,8 +276,11 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn)
if (nBlockSigOps + nTxSigOps >= MAX_BLOCK_SIGOPS)
continue;
// 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.
CValidationState state;
if (!CheckInputs(tx, state, view, true, SCRIPT_VERIFY_P2SH))
if (!CheckInputs(tx, state, view, true, MANDATORY_SCRIPT_VERIFY_FLAGS))
continue;
CTxUndo txundo;