Merge pull request #6256

65b9454 Use best header chain timestamps to detect partitioning (Gavin Andresen)
This commit is contained in:
Wladimir J. van der Laan 2015-06-12 16:41:21 +02:00
commit 8ccc07c077
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
4 changed files with 16 additions and 14 deletions

View file

@ -1425,7 +1425,7 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
// Monitor the chain, and alert if we get blocks much quicker or slower than expected
int64_t nPowTargetSpacing = Params().GetConsensus().nPowTargetSpacing;
CScheduler::Function f = boost::bind(&PartitionCheck, &IsInitialBlockDownload,
boost::ref(cs_main), boost::cref(chainActive), nPowTargetSpacing);
boost::ref(cs_main), boost::cref(pindexBestHeader), nPowTargetSpacing);
scheduler.scheduleEvery(f, nPowTargetSpacing);
#ifdef ENABLE_WALLET