maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #622 from rnicoll/1.8-dev-safemode

Browse source 
Disable safe mode around AuxPoW switchover
This commit is contained in:
langerhans 2014-08-24 16:58:48 +02:00
parent 33f35041a0 72b3139bec
commit 4642b01f90
1 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main.cpp
View file

@ -1434,6 +1434,9 @@ bool fLargeWorkForkFound = false;
bool fLargeWorkInvalidChainFound = false;
CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL;
// Temporarily declare this here so CheckForkWarningConditions() knows it exists
int GetAuxPowStartBlock();
void CheckForkWarningConditions()
{
AssertLockHeld(cs_main);
@ -1441,6 +1444,22 @@ void CheckForkWarningConditions()
// (we assume we don't get stuck on a fork before the last checkpoint)
if (IsInitialBlockDownload())
return;
// For an hour before, and a day after the AuxPoW hard fork, disable
// warnings.
int proximityToAuxPoWFork = chainActive.Height() - GetAuxPowStartBlock();
if (proximityToAuxPoWFork < 0) {
// One hour of one-minute blocks
if (proximityToAuxPoWFork >= -60) {
return;
}
} else {
// 1440 is 24 * 60 (24 hours of one-minute blocks)
if (proximityToAuxPoWFork < 1440) {
return;
}
}
// If our best fork is no longer within 360 blocks (+/- 6 hours if no one mines it)
// of our head, drop it