diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2012-11-13 23:03:25 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2012-11-15 23:00:16 +0100 |
| commit | 99d0d0f356c3237ad1ef416f179c45797cecb89b (patch) | |
| tree | 72c34c5fe86b95be861f02fdfe5e497f24b56117 /src/main.h | |
| parent | 6caffb5358b1e403b293846b3c832433fa928e46 (diff) | |
| download | bitcoin-99d0d0f356c3237ad1ef416f179c45797cecb89b.tar.xz | |
Introduce script verification flags
These flags select features to be enabled/disabled during script
evaluation/checking, instead of several booleans passed along.
Currently these flags are defined:
* SCRIPT_VERIFY_P2SH: enable BIP16-style subscript evaluation
* SCRIPT_VERIFY_STRICTENC: enforce strict adherence to pubkey/sig encoding standards.
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index 0ef192f901..622875d4a9 100644 --- a/src/main.h +++ b/src/main.h @@ -625,7 +625,7 @@ public: // Check whether all inputs of this transaction are valid (no double spends, scripts & sigs, amounts) // This does not modify the UTXO set - bool CheckInputs(CCoinsViewCache &view, enum CheckSig_mode csmode, bool fStrictPayToScriptHash=true, bool fStrictEncodings=true) const; + bool CheckInputs(CCoinsViewCache &view, enum CheckSig_mode csmode, unsigned int flags = SCRIPT_VERIFY_P2SH | SCRIPT_VERIFY_STRICTENC) const; // Apply the effects of this transaction on the UTXO set represented by view bool UpdateCoins(CCoinsViewCache &view, CTxUndo &txundo, int nHeight, const uint256 &txhash) const; |