diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2017-06-28 15:49:13 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2017-06-30 16:14:13 -0700 |
| commit | 2851b77312b55c8868acd4cd2c118e5a034606b7 (patch) | |
| tree | a0dcb9dd740bf3f0a277bbf43e6fc9e9445a11ba /src/script/interpreter.cpp | |
| parent | 2935b469ae96a3203bb997a6eddc098903b336ce (diff) | |
| download | bitcoin-2851b77312b55c8868acd4cd2c118e5a034606b7.tar.xz | |
Make all script verification flags softforks
Diffstat (limited to 'src/script/interpreter.cpp')
| -rw-r--r-- | src/script/interpreter.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/script/interpreter.cpp b/src/script/interpreter.cpp index 7149c938fc..d90abdaf57 100644 --- a/src/script/interpreter.cpp +++ b/src/script/interpreter.cpp @@ -349,9 +349,6 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& { if (!(flags & SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY)) { // not enabled; treat as a NOP2 - if (flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS) { - return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS); - } break; } @@ -391,9 +388,6 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& { if (!(flags & SCRIPT_VERIFY_CHECKSEQUENCEVERIFY)) { // not enabled; treat as a NOP3 - if (flags & SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS) { - return set_error(serror, SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS); - } break; } |