diff options
| author | Peter Todd <pete@petertodd.org> | 2014-03-10 17:31:46 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2014-05-05 05:35:27 -0400 |
| commit | 68f7d1d7af39a8ea6510f888e8e058e8e8faa007 (patch) | |
| tree | abde758379143e5fb5df4c8fbc9dc83678c4d447 /src/miner.cpp | |
| parent | d4ffe4e425b5a3f6fe4ff0ce7297608dfe6c7417 (diff) | |
| download | bitcoin-68f7d1d7af39a8ea6510f888e8e058e8e8faa007.tar.xz | |
Create (MANDATORY|STANDARD)_SCRIPT_VERIFY_FLAGS constants
Diffstat (limited to 'src/miner.cpp')
| -rw-r--r-- | src/miner.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 3351908e65..12a5e7f845 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -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; |