fork heights for testnet

This commit is contained in:
jc 2018-02-23 21:01:49 -05:00
parent ab0886aaa4
commit d71c8b64cf
No known key found for this signature in database
GPG Key ID: E87FC0C8A375F3CF
3 changed files with 7 additions and 1 deletions

View File

@ -301,6 +301,9 @@ public:
*/
};
assert(vFoundersRewardAddress.size() <= consensus.GetLastFoundersRewardBlockHeight());
nForkStartHeight = 10;
nForkHeightRange = 300;
}
};
static CTestNetParams testNetParams;

View File

@ -1475,6 +1475,9 @@ bool IsInitialBlockDownload()
return true;
if (fCheckpointsEnabled && chainActive.Height() < Checkpoints::GetTotalBlocksEstimate(chainParams.Checkpoints()))
return true;
if (chainActive.Height() < chainParams.ForkStartHeight() + chainParams.ForkHeightRange())
return true;
static bool lockIBDState = false;
if (lockIBDState)
return false;

View File

@ -729,7 +729,7 @@ void static BitcoinMiner()
LOCK(cs_vNodes);
fvNodesEmpty = vNodes.empty();
}
if (!fvNodesEmpty) // && !IsInitialBlockDownload())
if (!fvNodesEmpty && !IsInitialBlockDownload())
break;
MilliSleep(1000);
} while (true);