aboutsummaryrefslogtreecommitdiff
path: root/src/script/standard.h
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-02-03 10:34:42 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2015-02-03 10:34:53 +0100
commit41e6e4caba9899ce7c165b0784461c55c867ee24 (patch)
tree04ee66c394416e33cc3e665cea99bc61716976c4 /src/script/standard.h
parent9c4a5a506787130a17f59277ca140bcfdd263e36 (diff)
parentbf6cdebdc5b750cea6121095dcbbbf720b726bb9 (diff)
downloadbitcoin-41e6e4caba9899ce7c165b0784461c55c867ee24.tar.xz
Merge pull request #5713
bf6cdeb Increase coverage of DERSIG edge cases (Pieter Wuille) 819bcf9 Add RPC test for DERSIG BIP switchover logic (Pieter Wuille) 5a47811 BIP66 changeover logic (Pieter Wuille) 092e9fe Example unit tests from BIP66 (Pieter Wuille) 80ad135 Change IsDERSignature to BIP66 implementation (Pieter Wuille)
Diffstat (limited to 'src/script/standard.h')
-rw-r--r--src/script/standard.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/script/standard.h b/src/script/standard.h
index ac80193773..92e2c27c13 100644
--- a/src/script/standard.h
+++ b/src/script/standard.h
@@ -45,6 +45,7 @@ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH;
* blocks and we must accept those blocks.
*/
static const unsigned int STANDARD_SCRIPT_VERIFY_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS |
+ SCRIPT_VERIFY_DERSIG |
SCRIPT_VERIFY_STRICTENC |
SCRIPT_VERIFY_MINIMALDATA |
SCRIPT_VERIFY_NULLDUMMY |