diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 7c7e22937..609a4c3cc 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -75,7 +75,6 @@ class CMainParams : public CChainParams { CMainParams() { strNetworkID = "main"; - // Blocks 0 - 144999 are conventional difficulty calculation consensus.nSubsidyHalvingInterval = 100000; consensus.nMajorityEnforceBlockUpgrade = 1500; consensus.nMajorityRejectBlockOutdated = 1900; @@ -123,7 +122,7 @@ class CMainParams : public CChainParams { consensus.nHeightEffective = 0; consensus.fSimplifiedRewards = true; - // Blocks 1000 - 37,999 are Digishield without AuxPoW + // Blocks 1000 - 41,999 are Digishield without AuxPoW digishieldConsensus = consensus; digishieldConsensus.nHeightEffective = 1000; digishieldConsensus.fSimplifiedRewards = true; @@ -131,10 +130,10 @@ class CMainParams : public CChainParams { digishieldConsensus.nPowTargetTimespan = 60; // post-digishield: 1 minute digishieldConsensus.nCoinbaseMaturity = 240; - // Blocks 38,000+ are AuxPoW + // Blocks 42,000+ are AuxPoW // Some tests from Dogecoin expect non-auxpow blocks. This allows those tests to pass. auxpowConsensus = digishieldConsensus; - auxpowConsensus.nHeightEffective = 38000; + auxpowConsensus.nHeightEffective = 42000; auxpowConsensus.fAllowLegacyBlocks = false; // Assemble the binary search tree of consensus parameters @@ -199,7 +198,6 @@ class CTestNetParams : public CChainParams { CTestNetParams() { strNetworkID = "test"; - // Blocks 0 - 144999 are pre-Digishield consensus.nSubsidyHalvingInterval = 100000; consensus.nMajorityEnforceBlockUpgrade = 501; consensus.nMajorityRejectBlockOutdated = 750; @@ -256,15 +254,15 @@ class CTestNetParams : public CChainParams { digishieldConsensus.fPowAllowMinDifficultyBlocks = false; digishieldConsensus.nCoinbaseMaturity = 240; - // Blocks 1250 - 37,999 are Digishield with minimum difficulty on all blocks + // Blocks 1250 - 41,999 are Digishield with minimum difficulty on all blocks minDifficultyConsensus = digishieldConsensus; minDifficultyConsensus.nHeightEffective = 1250; minDifficultyConsensus.fPowAllowDigishieldMinDifficultyBlocks = true; minDifficultyConsensus.fPowAllowMinDifficultyBlocks = true; - // Enable AuxPoW at 38,000 + // Enable AuxPoW at 42,000 auxpowConsensus = minDifficultyConsensus; - auxpowConsensus.nHeightEffective = 38000; + auxpowConsensus.nHeightEffective = 42000; auxpowConsensus.fPowAllowDigishieldMinDifficultyBlocks = true; auxpowConsensus.fAllowLegacyBlocks = false; diff --git a/src/test/pepecoin_tests.cpp b/src/test/pepecoin_tests.cpp index 331b4eda7..c6ec0d2a9 100644 --- a/src/test/pepecoin_tests.cpp +++ b/src/test/pepecoin_tests.cpp @@ -188,13 +188,13 @@ BOOST_AUTO_TEST_CASE(hardfork_parameters) BOOST_CHECK_EQUAL(digishieldParams.fAllowLegacyBlocks, true); BOOST_CHECK_EQUAL(digishieldParams.fDigishieldDifficultyCalculation, true); - const Consensus::Params& digishieldParamsEnd = Params().GetConsensus(37999); + const Consensus::Params& digishieldParamsEnd = Params().GetConsensus(41999); BOOST_CHECK_EQUAL(digishieldParamsEnd.nPowTargetTimespan, 60); BOOST_CHECK_EQUAL(digishieldParamsEnd.fAllowLegacyBlocks, true); BOOST_CHECK_EQUAL(digishieldParamsEnd.fDigishieldDifficultyCalculation, true); - const Consensus::Params& auxpowParams = Params().GetConsensus(38000);//PEPE TODO Magic number - BOOST_CHECK_EQUAL(auxpowParams.nHeightEffective, 38000);//PEPE TODO Magic number + const Consensus::Params& auxpowParams = Params().GetConsensus(42000);//PEPE TODO Magic number + BOOST_CHECK_EQUAL(auxpowParams.nHeightEffective, 42000);//PEPE TODO Magic number BOOST_CHECK_EQUAL(auxpowParams.nPowTargetTimespan, 60); BOOST_CHECK_EQUAL(auxpowParams.fAllowLegacyBlocks, false); BOOST_CHECK_EQUAL(auxpowParams.fDigishieldDifficultyCalculation, true);