From 9b58d319f3d26ef81d491f03d33752b437c1173c Mon Sep 17 00:00:00 2001 From: langerhans Date: Wed, 29 Jul 2015 19:41:34 +0200 Subject: Make RegTest use simplified rewards for easier test vector setup and use short block times --- src/chainparams.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/chainparams.cpp') diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 94bf5b33f..b8131b771 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -285,9 +285,11 @@ public: consensus.nMajorityRejectBlockOutdated = 950; consensus.nMajorityWindow = 1000; consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours + consensus.nPowTargetSpacing = 1; // regtest: 1 second blocks consensus.powLimit = uint256S("0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1; consensus.fStrictChainId = true; consensus.fAllowLegacyBlocks = false; // Never allow legacy blocks on RegTest + consensus.fSimplifiedRewards = true; // Reset links before we copy parameters consensus.pLeft = NULL; @@ -295,7 +297,7 @@ public: digishieldConsensus = consensus; digishieldConsensus.nHeightEffective = 10; - digishieldConsensus.nPowTargetTimespan = 60; // post-digishield: 1 minute + digishieldConsensus.nPowTargetTimespan = 1; // // regtest: also retarget every second in digishield mode, for conformity digishieldConsensus.fDigishieldDifficultyCalculation = true; auxpowConsensus = digishieldConsensus; -- cgit v1.2.3 From 38a83007e827b4585e04f23f838bbf1eef4bf7a6 Mon Sep 17 00:00:00 2001 From: langerhans Date: Fri, 31 Jul 2015 21:23:27 +0200 Subject: Move COINBASE_MATURITY to the consensus parameters --- src/chainparams.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/chainparams.cpp') diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b8131b771..ea38b6eea 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -51,6 +51,7 @@ public: consensus.fAllowLegacyBlocks = true; consensus.nHeightEffective = 0; consensus.fDigishieldDifficultyCalculation = false; + consensus.nCoinbaseMaturity = 30; // Blocks 145000 - 371336 are Digishield without AuxPoW digishieldConsensus = consensus; @@ -58,6 +59,7 @@ public: digishieldConsensus.fSimplifiedRewards = true; digishieldConsensus.fDigishieldDifficultyCalculation = true; digishieldConsensus.nPowTargetTimespan = 60; // post-digishield: 1 minute + digishieldConsensus.nCoinbaseMaturity = 240; // Blocks 371337+ are AuxPoW auxpowConsensus = digishieldConsensus; @@ -203,6 +205,7 @@ public: digishieldConsensus.fDigishieldDifficultyCalculation = true; digishieldConsensus.fSimplifiedRewards = true; digishieldConsensus.fPowAllowMinDifficultyBlocks = false; + digishieldConsensus.nCoinbaseMaturity = 240; // Blocks 157500 - 158099 are Digishield with minimum difficulty on all blocks minDifficultyConsensus = digishieldConsensus; -- cgit v1.2.3