diff options
| author | John Newbery <john@johnnewbery.com> | 2019-05-20 14:59:07 -0400 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2019-08-14 15:52:52 -0400 |
| commit | 0328dcdcfcb56dc8918697716d7686be048ad0b3 (patch) | |
| tree | c4c4bed225e5d08d9af5f007941ab5261147e256 /src/validation.h | |
| parent | 1c93b9b31c2ab7358f9d55f52dd46340397c906d (diff) | |
| download | bitcoin-0328dcdcfcb56dc8918697716d7686be048ad0b3.tar.xz | |
[Consensus] Bury segwit deployment
Hardcode segwit deployment height to 481824 for mainnet.
Diffstat (limited to 'src/validation.h')
| -rw-r--r-- | src/validation.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/validation.h b/src/validation.h index d747fdbf27..585a42849d 100644 --- a/src/validation.h +++ b/src/validation.h @@ -383,12 +383,10 @@ bool CheckBlock(const CBlock& block, CValidationState& state, const Consensus::P /** Check a block is completely valid from start to finish (only works on top of our current best block) */ bool TestBlockValidity(CValidationState& state, const CChainParams& chainparams, const CBlock& block, CBlockIndex* pindexPrev, bool fCheckPOW = true, bool fCheckMerkleRoot = true) EXCLUSIVE_LOCKS_REQUIRED(cs_main); -/** Check whether witness commitments are required for block. */ +/** Check whether witness commitments are required for a block, and whether to enforce NULLDUMMY (BIP 147) rules. + * Note that transaction witness validation rules are always enforced when P2SH is enforced. */ bool IsWitnessEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params); -/** Check whether NULLDUMMY (BIP 147) has activated. */ -bool IsNullDummyEnabled(const CBlockIndex* pindexPrev, const Consensus::Params& params); - /** When there are blocks in the active chain with missing data, rewind the chainstate and remove them from the block index */ bool RewindBlockIndex(const CChainParams& params) LOCKS_EXCLUDED(cs_main); |