cryptogera/dogecoin
1
0
Fork 0
mirror of https://github.com/dogecoin/dogecoin.git synced 2026-01-31 10:30:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Disable safe mode around AuxPoW switchover."

Browse Source 
This reverts commit 72b3139becc463f49aef23034397c23aaadafecd.
This commit is contained in:
langerhans 2014-08-24 17:12:33 +02:00
parent 65228644e1
commit 8a5286e147
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main.cpp
View File

@ -1434,9 +1434,6 @@ bool fLargeWorkForkFound = false;
bool fLargeWorkInvalidChainFound = false; bool fLargeWorkInvalidChainFound = false;
CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL; CBlockIndex *pindexBestForkTip = NULL, *pindexBestForkBase = NULL;
// Temporarily declare this here so CheckForkWarningConditions() knows it exists
int GetAuxPowStartBlock();
void CheckForkWarningConditions() void CheckForkWarningConditions()
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
@ -1444,22 +1441,6 @@ void CheckForkWarningConditions()
// (we assume we don't get stuck on a fork before the last checkpoint) // (we assume we don't get stuck on a fork before the last checkpoint)
if (IsInitialBlockDownload()) if (IsInitialBlockDownload())
return; 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) // If our best fork is no longer within 360 blocks (+/- 6 hours if no one mines it)
// of our head, drop it // of our head, drop it