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/standard.h | |
| parent | cf9c4887f176634c9f39305ad70657d9fff3962d (diff) | |
| parent | 03914234b3c9c35d66b51d580fe727a0707394ca (diff) | |
Merge pull request #5000
0391423 Discourage NOPs reserved for soft-fork upgrades (Peter Todd)
Diffstat (limited to 'src/script/standard.h')
| -rw-r--r-- | src/script/standard.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/script/standard.h b/src/script/standard.h index f3dcc75fdc..c4b82b4c45 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -47,7 +47,8 @@ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH; static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS | SCRIPT_VERIFY_STRICTENC | SCRIPT_VERIFY_MINIMALDATA | - SCRIPT_VERIFY_NULLDUMMY; + SCRIPT_VERIFY_NULLDUMMY | + SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS; /** For convenience, standard but not mandatory verify flags. */ static const unsigned int STANDARD_NOT_MANDATORY_VERIFY_FLAGS = STANDARD_SCRIPT_VERIFY_FLAGS & ~MANDATORY_SCRIPT_VERIFY_FLAGS; |