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/script_error.cpp | |
| 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/script_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index cef807edcf..9969c232fc 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -63,6 +63,8 @@ const char* ScriptErrorString(const ScriptError serror) return "Non-canonical signature: S value is unnecessarily high"; case SCRIPT_ERR_SIG_NULLDUMMY: return "Dummy CHECKMULTISIG argument must be zero"; + case SCRIPT_ERR_MINIMALIF: + return "OP_IF/NOTIF argument must be minimal"; case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS: return "NOPx reserved for soft-fork upgrades"; case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM: |