diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2015-01-19 18:37:21 -0500 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2015-02-01 17:51:24 -0400 |
| commit | 5a47811da5158df763aa2fca09ce646ee0c51e7b (patch) | |
| tree | b94bdd9ae683fa5e449e37ab78b7419b8d9f409b /src/script | |
| parent | 092e9fe5fb61ff7ce38dc2820938106fc0f0081d (diff) | |
BIP66 changeover logic
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/bitcoinconsensus.h | 1 | ||||
| -rw-r--r-- | src/script/standard.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index 9d9c266435..0320577797 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -46,6 +46,7 @@ enum { bitcoinconsensus_SCRIPT_FLAGS_VERIFY_NONE = 0, bitcoinconsensus_SCRIPT_FLAGS_VERIFY_P2SH = (1U << 0), // evaluate P2SH (BIP16) subscripts + bitcoinconsensus_SCRIPT_FLAGS_VERIFY_DERSIG = (1U << 2), // enforce strict DER (BIP66) compliance }; /// Returns 1 if the input nIn of the serialized transaction pointed to by 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 | |