IsInitialBlockDownload no longer uses header-only timestamps.

This avoids a corner case (mostly visible on testnet) where bogus
 headers can keep nodes in IsInitialBlockDownload.
This commit is contained in:
Gregory Maxwell 2016-11-01 00:37:54 +00:00
parent 2082b5574c
commit e141beb6a9

View file

@ -1744,11 +1744,10 @@ bool IsInitialBlockDownload()
return true; return true;
if (chainActive.Tip()->nChainWork < UintToArith256(chainParams.GetConsensus().nMinimumChainWork)) if (chainActive.Tip()->nChainWork < UintToArith256(chainParams.GetConsensus().nMinimumChainWork))
return true; return true;
bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 || if (chainActive.Tip()->GetBlockTime() < (GetTime() - nMaxTipAge))
std::max(chainActive.Tip()->GetBlockTime(), pindexBestHeader->GetBlockTime()) < GetTime() - nMaxTipAge); return true;
if (!state) latchToFalse.store(true, std::memory_order_relaxed);
latchToFalse.store(true, std::memory_order_relaxed); return false;
return state;
} }
bool fLargeWorkForkFound = false; bool fLargeWorkForkFound = false;