diff options
| author | Pieter Wuille <[email protected]> | 2014-11-20 15:23:05 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2014-11-20 15:27:39 +0100 |
| commit | 3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8 (patch) | |
| tree | 0e5d1d4782c4405ff5d7a9cb806853e5428a1f1b /src/script/script_error.cpp | |
| parent | Merge pull request #5324 (diff) | |
| parent | Discourage NOPs reserved for soft-fork upgrades (diff) | |
| download | discoin-3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8.tar.xz discoin-3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8.zip | |
Merge pull request #5000
0391423 Discourage NOPs reserved for soft-fork upgrades (Peter Todd)
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 4a3df268e..793fc0da4 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -59,6 +59,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_DISCOURAGE_UPGRADABLE_NOPS: + return "NOPx reserved for soft-fork upgrades"; case SCRIPT_ERR_UNKNOWN_ERROR: case SCRIPT_ERR_ERROR_COUNT: default: break; |