diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-20 15:23:05 +0100 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2014-11-20 15:27:39 +0100 |
| commit | 3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8 (patch) | |
| tree | 0e5d1d4782c4405ff5d7a9cb806853e5428a1f1b /src/script/script_error.h | |
| parent | cf9c4887f176634c9f39305ad70657d9fff3962d (diff) | |
| parent | 03914234b3c9c35d66b51d580fe727a0707394ca (diff) | |
| download | bitcoin-3ba5ebc065ce9fceba8f9de7579debc5b49c3ba8.tar.xz | |
Merge pull request #5000
0391423 Discourage NOPs reserved for soft-fork upgrades (Peter Todd)
Diffstat (limited to 'src/script/script_error.h')
| -rw-r--r-- | src/script/script_error.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/script/script_error.h b/src/script/script_error.h index ae6626b257..21153f1bd1 100644 --- a/src/script/script_error.h +++ b/src/script/script_error.h @@ -43,6 +43,9 @@ typedef enum ScriptError_t SCRIPT_ERR_SIG_HIGH_S, SCRIPT_ERR_SIG_NULLDUMMY, + /* softfork safeness */ + SCRIPT_ERR_DISCOURAGE_UPGRADABLE_NOPS, + SCRIPT_ERR_ERROR_COUNT } ScriptError; |