diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-01-08 12:00:19 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-01-08 12:01:22 +0100 |
| commit | 48e1765e2781541c0f8b0893b26d02f27eb5c444 (patch) | |
| tree | 112a2d69a7b1bd0f60d088e90696e294a9a84861 /src/script/standard.h | |
| parent | Merge pull request #5612 (diff) | |
| parent | Make SCRIPT_VERIFY_CLEANSTACK a standardness requirement (diff) | |
| download | discoin-48e1765e2781541c0f8b0893b26d02f27eb5c444.tar.xz discoin-48e1765e2781541c0f8b0893b26d02f27eb5c444.zip | |
Merge pull request #5143
da918ac Make SCRIPT_VERIFY_CLEANSTACK a standardness requirement (Pieter Wuille)
b6e03cc Add SCRIPT_VERIFY_CLEANSTACK (BIP62 rule 6) (Pieter Wuille)
ae4151b No semantic change: reuse stack variable in P2SH evaluation (Pieter Wuille)
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 dbeeace4d..ac8019377 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -48,7 +48,8 @@ static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY SCRIPT_VERIFY_STRICTENC | SCRIPT_VERIFY_MINIMALDATA | SCRIPT_VERIFY_NULLDUMMY | - SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS; + SCRIPT_VERIFY_DISCOURAGE_UPGRADABLE_NOPS | + SCRIPT_VERIFY_CLEANSTACK; /** 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; |