From 2d1ea2c3076fdb75ce9e32ee6c699f810f342858 Mon Sep 17 00:00:00 2001 From: Patrick Lodder Date: Fri, 8 Aug 2014 12:19:34 +0200 Subject: check block version for aux blocks properly for version warning UpdateTip() was checking block versions against one of two possible AuxPoW versions. Added consts for version checks and IsAuxPowVersion(int nVersion) for use with UpdateTip()'s block version check. --- src/main.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index da1f12cdc..c8d024bab 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1158,6 +1158,11 @@ void CBlockHeader::SetAuxPow(CAuxPow* pow) auxpow.reset(pow); } +bool IsAuxPowVersion(int nVersion) +{ + return (nVersion == BLOCK_VERSION_AUXPOW_WITH_AUX || nVersion == BLOCK_VERSION_AUXPOW_WITHOUT_AUX); +} + uint256 static GetOrphanRoot(const uint256& hash) { map::iterator it = mapOrphanBlocks.find(hash); @@ -2064,10 +2069,9 @@ void static UpdateTip(CBlockIndex *pindexNew) { { int nUpgraded = 0; const CBlockIndex* pindex = chainActive.Tip(); - int nAuxVersion = CBlockHeader::CURRENT_VERSION | (AUXPOW_CHAIN_ID * BLOCK_VERSION_CHAIN_START); for (int i = 0; i < 100 && pindex != NULL; i++) { - if (pindex->nVersion > CBlock::CURRENT_VERSION && pindex->nVersion != nAuxVersion) + if (pindex->nVersion > CBlock::CURRENT_VERSION && !IsAuxPowVersion(pindex->nVersion)) ++nUpgraded; pindex = pindex->pprev; } -- cgit v1.2.3