Auto merge of #887 - str4d:mining-slow-start, r=ebfull

Implement mining slow start Closes #762.
2016-05-27 02:15:24 +00:00
parent fc8c101acf 068e2f1a09
commit b1f699660f
5 changed files with 188 additions and 133 deletions
--- a/src/chainparams.cpp
+++ b/src/chainparams.cpp
@@ -31,6 +31,7 @@ class CMainParams : public CChainParams {
 public:
    CMainParams() {
        strNetworkID = "main";
+        consensus.nSubsidySlowStartInterval = 5000;
        consensus.nSubsidyHalvingInterval = 210000;
        consensus.nMajorityEnforceBlockUpgrade = 750;
        consensus.nMajorityRejectBlockOutdated = 950;
@@ -209,6 +210,7 @@ class CRegTestParams : public CTestNetParams {
 public:
    CRegTestParams() {
        strNetworkID = "regtest";
+        consensus.nSubsidySlowStartInterval = 0;
        consensus.nSubsidyHalvingInterval = 150;
        consensus.nMajorityEnforceBlockUpgrade = 750;
        consensus.nMajorityRejectBlockOutdated = 950;