From 12102e4e98f7a968eb9757c2f61ddbae2ccb2e6b Mon Sep 17 00:00:00 2001 From: "Wladimir J. van der Laan" Date: Tue, 4 Oct 2016 12:14:43 +0200 Subject: [PATCH] Merge #8848: Add NULLDUMMY verify flag in bitcoinconsensus.h 2fa0063 Add NULLDUMMY verify flag in bitcoinconsensus.h (Johnson Lau) --- doc/shared-libraries.md | 3 +++ src/script/dashconsensus.h | 1 + 2 files changed, 4 insertions(+) diff --git a/doc/shared-libraries.md b/doc/shared-libraries.md index 696ead74f8..6db5f8d14b 100644 --- a/doc/shared-libraries.md +++ b/doc/shared-libraries.md @@ -30,6 +30,9 @@ The interface is defined in the C header `dashconsensus.h` located in `src/scri - `dashconsensus_SCRIPT_FLAGS_VERIFY_NONE` - `dashconsensus_SCRIPT_FLAGS_VERIFY_P2SH` - Evaluate P2SH ([BIP16](https://github.com/bitcoin/bips/blob/master/bip-0016.mediawiki)) subscripts - `dashconsensus_SCRIPT_FLAGS_VERIFY_DERSIG` - Enforce strict DER ([BIP66](https://github.com/bitcoin/bips/blob/master/bip-0066.mediawiki)) compliance +- `dashconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY` - Enforce NULLDUMMY ([BIP147](https://github.com/bitcoin/bips/blob/master/bip-0147.mediawiki)) +- `dashconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY` - Enable CHECKLOCKTIMEVERIFY ([BIP65](https://github.com/bitcoin/bips/blob/master/bip-0065.mediawiki)) +- `dashconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY` - Enable CHECKSEQUENCEVERIFY ([BIP112](https://github.com/bitcoin/bips/blob/master/bip-0112.mediawiki)) ##### Errors - `dashconsensus_ERR_OK` - No errors with input parameters *(see the return value of `dashconsensus_verify_script` for the verification status)* diff --git a/src/script/dashconsensus.h b/src/script/dashconsensus.h index 7ac497d154..5b90c3f18d 100644 --- a/src/script/dashconsensus.h +++ b/src/script/dashconsensus.h @@ -47,6 +47,7 @@ enum dashconsensus_SCRIPT_FLAGS_VERIFY_NONE = 0, dashconsensus_SCRIPT_FLAGS_VERIFY_P2SH = (1U << 0), // evaluate P2SH (BIP16) subscripts dashconsensus_SCRIPT_FLAGS_VERIFY_DERSIG = (1U << 2), // enforce strict DER (BIP66) compliance + dashconsensus_SCRIPT_FLAGS_VERIFY_NULLDUMMY = (1U << 4), // enforce NULLDUMMY (BIP147) dashconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65) dashconsensus_SCRIPT_FLAGS_VERIFY_CHECKSEQUENCEVERIFY = (1U << 10), // enable CHECKSEQUENCEVERIFY (BIP112) };