From 8a5286e147c2cd25804c0fa48ff0dc99f81bcce0 Mon Sep 17 00:00:00 2001 From: langerhans Date: Sun, 24 Aug 2014 17:12:33 +0200 Subject: [PATCH] Revert "Disable safe mode around AuxPoW switchover." This reverts commit 72b3139becc463f49aef23034397c23aaadafecd. --- src/main.cpp | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/src/main.cpp b/src/main.cpp index f6e709365..3395395d1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1434,9 +1434,6 @@ 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); @@ -1444,22 +1441,6 @@ 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