diff options
| author | Max K. <[email protected]> | 2015-08-06 20:17:18 +0200 |
|---|---|---|
| committer | Max K. <[email protected]> | 2015-08-06 20:17:18 +0200 |
| commit | daa8f84d03cbed305da64fb996689fc57fad0cc4 (patch) | |
| tree | 6b61b052a2e757fecfd04e662f7efeeb975e9363 /src/chainparams.cpp | |
| parent | Merge pull request #1221 from langerhans/1.10-dev-tests (diff) | |
| parent | Update time-based constants (diff) | |
| download | discoin-daa8f84d03cbed305da64fb996689fc57fad0cc4.tar.xz discoin-daa8f84d03cbed305da64fb996689fc57fad0cc4.zip | |
Merge pull request #1225 from rnicoll/1.10-constants
Update time-based constants
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index c98a4b7e4..3720dc6c7 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -37,9 +37,9 @@ public: // Blocks 0 - 144999 are conventional difficulty calculation consensus.nSubsidyHalvingInterval = 100000; - consensus.nMajorityEnforceBlockUpgrade = 750; - consensus.nMajorityRejectBlockOutdated = 950; - consensus.nMajorityWindow = 1000; + consensus.nMajorityEnforceBlockUpgrade = 1500; + consensus.nMajorityRejectBlockOutdated = 1900; + consensus.nMajorityWindow = 2000; consensus.powLimit = uint256S("0x00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20; consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours consensus.nPowTargetSpacing = 60; // 1 minute @@ -181,9 +181,9 @@ public: consensus.fDigishieldDifficultyCalculation = false; consensus.fPowAllowMinDifficultyBlocks = true; consensus.fPowAllowDigishieldMinDifficultyBlocks = false; - consensus.nMajorityEnforceBlockUpgrade = 51; - consensus.nMajorityRejectBlockOutdated = 75; - consensus.nMajorityWindow = 100; + consensus.nMajorityEnforceBlockUpgrade = 501; + consensus.nMajorityRejectBlockOutdated = 750; + consensus.nMajorityWindow = 1000; consensus.fStrictChainId = false; consensus.nHeightEffective = 0; consensus.fAllowLegacyBlocks = true; |