aboutsummaryrefslogtreecommitdiff
path: root/src/main.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-10-01 14:11:54 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-10-01 14:11:56 +0200
commit4899a04c24b927166048a74999992d216a543c23 (patch)
treed0a993cdb666e2c00734e6b05334c6763923215f /src/main.cpp
parent8a86d53bd5705712bebd74a037ec702bf17b83bc (diff)
parente761d7a94ff8b9f638b65b16f5c4ffab6573884a (diff)
downloadbitcoin-4899a04c24b927166048a74999992d216a543c23.tar.xz
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)
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index e8a6edc225..5cfb05b0d2 100644
--- 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;