Merge pull request #5987

e761d7a Bugfix: Allow mining on top of old tip blocks for testnet (fixes testnet-in-a-box use case) (Luke Dashjr)
2015-10-01 14:11:54 +02:00
parent 8a86d53bd5 e761d7a94f
commit 4899a04c24
3 changed files with 6 additions and 1 deletions
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1112,7 +1112,7 @@ bool IsInitialBlockDownload()
    if (lockIBDState)
        return false;
    bool state = (chainActive.Height() < pindexBestHeader->nHeight - 24 * 6 ||
-            pindexBestHeader->GetBlockTime() < GetTime() - 24 * 60 * 60);
+            pindexBestHeader->GetBlockTime() < GetTime() - chainParams.MaxTipAge());
    if (!state)
        lockIBDState = true;
    return state;