diff options
| author | Peter Todd <pete@petertodd.org> | 2015-06-28 14:30:50 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2015-10-08 17:51:01 +0200 |
| commit | 41372485ce2ebd172ba067d401f24259b014fad5 (patch) | |
| tree | 48022076c88ab291cebe3bde095864f732da61e6 /src/script/bitcoinconsensus.h | |
| parent | 0e01d0f89d4f24eac7c8a21a6779e7956ad13a87 (diff) | |
| download | bitcoin-41372485ce2ebd172ba067d401f24259b014fad5.tar.xz | |
Add CHECKLOCKTIMEVERIFY (BIP65) soft-fork logic
Based on the earlier BIP66 soft-fork logic implemented by Pieter
Wuille's 5a47811da5158df763aa2fca09ce646ee0c51e7b
Rebased-From: 287f54fc90c29301faede8d4ac2ea24a91441917
Diffstat (limited to 'src/script/bitcoinconsensus.h')
| -rw-r--r-- | src/script/bitcoinconsensus.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/script/bitcoinconsensus.h b/src/script/bitcoinconsensus.h index c57d8b3cc5..70daae85ae 100644 --- a/src/script/bitcoinconsensus.h +++ b/src/script/bitcoinconsensus.h @@ -44,9 +44,10 @@ typedef enum bitcoinconsensus_error_t /** Script verification flags */ 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 + 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 + bitcoinconsensus_SCRIPT_FLAGS_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), // enable CHECKLOCKTIMEVERIFY (BIP65) }; /// Returns 1 if the input nIn of the serialized transaction pointed to by |