diff options
| author | Ross Nicoll <[email protected]> | 2015-07-31 20:45:56 +0100 |
|---|---|---|
| committer | Ross Nicoll <[email protected]> | 2015-07-31 20:45:56 +0100 |
| commit | d988dc7ba0eecf4bdefb38287ddc0e2b49031fc6 (patch) | |
| tree | 3b2c3ecf53e68f96056a30146b12bb758a32d143 /src/chainparams.cpp | |
| parent | Merge pull request #1204 from rnicoll/1.10-fees (diff) | |
| parent | Move COINBASE_MATURITY to the consensus parameters (diff) | |
| download | discoin-d988dc7ba0eecf4bdefb38287ddc0e2b49031fc6.tar.xz discoin-d988dc7ba0eecf4bdefb38287ddc0e2b49031fc6.zip | |
Merge pull request #1213 from langerhans/1.10-dev-maturity
Minor fixes to concensus relevant parameters
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 94bf5b33f..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; @@ -285,9 +288,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 +300,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; |