From fdb3e8f8b27e3b0b2f88c32915975c6e4c299b1e Mon Sep 17 00:00:00 2001 From: Anthony Towns Date: Fri, 6 Sep 2019 00:28:52 +1000 Subject: Ignore old versionbit activations Adds a hardcoded height to the consensus chain parameters for ignoring versionbit activations prior to a fixed height. --- src/validation.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/validation.cpp') diff --git a/src/validation.cpp b/src/validation.cpp index cbf8c9039..349891519 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -1625,7 +1625,8 @@ public: bool Condition(const CBlockIndex* pindex, const Consensus::Params& params) const override { - return ((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) && + return pindex->nHeight >= params.MinBIP9WarningHeight && + ((pindex->nVersion & VERSIONBITS_TOP_MASK) == VERSIONBITS_TOP_BITS) && ((pindex->nVersion >> bit) & 1) != 0 && ((ComputeBlockVersion(pindex->pprev, params) >> bit) & 1) == 0; } -- cgit v1.2.3