diff options
author | Johnson Lau <jl2012@xbt.hk> | 2016-09-23 13:06:45 +0800 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-13 20:01:45 +0200 |
commit | 0027672c8075d063f376c8c84e1cce77d572d353 (patch) | |
tree | 4b6daa82632013d74d4bf0e5a3d2b22497fa1cf2 /src/script/interpreter.h | |
parent | 633c4a1f3690152bdda4b0ac7bcfde22c237183e (diff) | |
download | bitcoin-0027672c8075d063f376c8c84e1cce77d572d353.tar.xz |
Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH
Github-Pull: #8526
Rebased-From: c72c5b1e3bd42e84465677e94aa83316ff3d9a14
Diffstat (limited to 'src/script/interpreter.h')
-rw-r--r-- | src/script/interpreter.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/interpreter.h b/src/script/interpreter.h index e5d7865cd3..2ce4b23e54 100644 --- a/src/script/interpreter.h +++ b/src/script/interpreter.h @@ -94,6 +94,10 @@ enum // Making v1-v16 witness program non-standard // SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM = (1U << 12), + + // Segwit script only: Require the argument of OP_IF/NOTIF to be exactly 0x01 or empty vector + // + SCRIPT_VERIFY_MINIMALIF = (1U << 13), }; bool CheckSignatureEncoding(const std::vector<unsigned char> &vchSig, unsigned int flags, ScriptError* serror); |