From ec40df46b50f1e1a21682208a9b3a1802db9002a Mon Sep 17 00:00:00 2001 From: Ross Nicoll Date: Mon, 8 Jan 2018 19:32:01 +0000 Subject: Check only the base block version (#1411) Check only the base block version when looking for unexpected version numbers --- src/validation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/validation.cpp') diff --git a/src/validation.cpp b/src/validation.cpp index 1eebf3c71..990323923 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2174,7 +2174,7 @@ void static UpdateTip(CBlockIndex *pindexNew, const CChainParams& chainParams) { for (int i = 0; i < 100 && pindex != NULL; i++) { int32_t nExpectedVersion = ComputeBlockVersion(pindex->pprev, chainParams.GetConsensus(pindex->nHeight)); - if (pindex->nVersion > VERSIONBITS_LAST_OLD_BLOCK_VERSION && (pindex->nVersion & ~nExpectedVersion) != 0) + if (pindex->GetBaseVersion() > VERSIONBITS_LAST_OLD_BLOCK_VERSION && (pindex->GetBaseVersion() & ~nExpectedVersion) != 0) ++nUpgraded; pindex = pindex->pprev; } @@ -3297,7 +3297,7 @@ static bool IsSuperMajority(int minVersion, const CBlockIndex* pstart, unsigned unsigned int nFound = 0; for (int i = 0; i < consensusParams.nMajorityWindow && nFound < nRequired && pstart != NULL; i++) { - if ((pstart->nVersion % CPureBlockHeader::VERSION_AUXPOW) >= minVersion) + if (pstart->GetBaseVersion() >= minVersion) ++nFound; pstart = pstart->pprev; } -- cgit v1.2.3