diff options
| author | langerhans <[email protected]> | 2015-07-29 19:41:34 +0200 |
|---|---|---|
| committer | langerhans <[email protected]> | 2015-07-31 20:17:15 +0200 |
| commit | 9b58d319f3d26ef81d491f03d33752b437c1173c (patch) | |
| tree | 9cd94ab8a1c0f66a2ab4922887233e87deec3584 /src/chainparams.cpp | |
| parent | Merge pull request #1215 from rnicoll/1.10-bitcoin-fix (diff) | |
| download | discoin-9b58d319f3d26ef81d491f03d33752b437c1173c.tar.xz discoin-9b58d319f3d26ef81d491f03d33752b437c1173c.zip | |
Make RegTest use simplified rewards for easier test vector setup and use short block times
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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; |