Merge pull request #81 from jc23424/fork-testnet

fork heights for testnet

src/chainparams.cpp

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

src/main.cpp

@@ -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;

src/miner.cpp

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