diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-27 16:54:23 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-09-27 17:10:15 +0200 |
| commit | 5a4f6d72e6154d21eb34fbbc8d7c099532569966 (patch) | |
| tree | da3536b7b6583537822e61fdec235eebe8d7b706 /src/script/interpreter.h | |
| parent | e9d5f6fec8fcbd45a1b38e73e96710d7858ddbb3 (diff) | |
| parent | c72c5b1e3bd42e84465677e94aa83316ff3d9a14 (diff) | |
| download | bitcoin-5a4f6d72e6154d21eb34fbbc8d7c099532569966.tar.xz | |
Merge #8526: Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH
c72c5b1 Make non-minimal OP_IF/NOTIF argument non-standard for P2WSH (Johnson Lau)
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); |