diff options
| author | Patrick Lodder <[email protected]> | 2021-02-13 17:21:20 +0100 |
|---|---|---|
| committer | Patrick Lodder <[email protected]> | 2021-02-13 17:24:55 +0100 |
| commit | 0c600d7f9d832836a9389bf77918472beeb23907 (patch) | |
| tree | e9fbb3dd6b74b34a58e0854fdf3c329cd2e13e0a /src/chainparams.cpp | |
| parent | Merge pull request #1705 from rnicoll/block-download-timeout (diff) | |
| download | discoin-0c600d7f9d832836a9389bf77918472beeb23907.tar.xz discoin-0c600d7f9d832836a9389bf77918472beeb23907.zip | |
Fixate BIP65 softfork heights
- Re-introduce Params.BIP65Height
- Fixate block 1854705 for testnet
- Fixate block 3464751 for mainnet
- Fixate block 1351 for regtest
- Stop using IsSuperMajority() in validation for BIP65
- Simplify RPC SoftForkMajorityDesc
Diffstat (limited to 'src/chainparams.cpp')
| -rw-r--r-- | src/chainparams.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index 38435f897..c9b3d3dc7 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -82,7 +82,7 @@ public: // BIP34 is never enforced in Dogecoin v2 blocks, so we enforce from v3 consensus.BIP34Height = 1034383; consensus.BIP34Hash = uint256S("0x80d1364201e5df97e696c03bdd24dc885e8617b9de51e453c10a4f629b1e797a"); - // consensus.BIP65Height = 1032483; // Not enabled in Doge yet + consensus.BIP65Height = 3464751; // 34cd2cbba4ba366f47e5aa0db5f02c19eba2adf679ceb6653ac003bdc9a0ef1f - first v4 block after the last v3 block consensus.BIP66Height = 1034383; // 80d1364201e5df97e696c03bdd24dc885e8617b9de51e453c10a4f629b1e797a - this is the last block that could be v2, 1900 blocks past the last v2 block consensus.powLimit = uint256S("0x00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20; consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours @@ -237,7 +237,7 @@ public: // BIP34 is never enforced in Dogecoin v2 blocks, so we enforce from v3 consensus.BIP34Height = 708658; consensus.BIP34Hash = uint256S("0x21b8b97dcdb94caa67c7f8f6dbf22e61e0cfe0e46e1fff3528b22864659e9b38"); - // consensus.BIP65Height = 581885; // 00000000007f6655f22f98e72ed80d8b06dc761d5da09df0fa1dc4be4f861eb6 + consensus.BIP65Height = 1854705; // 955bd496d23790aba1ecfacb722b089a6ae7ddabaedf7d8fb0878f48308a71f9 consensus.BIP66Height = 708658; // 21b8b97dcdb94caa67c7f8f6dbf22e61e0cfe0e46e1fff3528b22864659e9b38 - this is the last block that could be v2, 1900 blocks past the last v2 block consensus.powLimit = uint256S("0x00000fffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 20; consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours @@ -372,7 +372,7 @@ public: consensus.nMajorityWindow = 1000; consensus.BIP34Height = 100000000; // BIP34 has not activated on regtest (far in the future so block v1 are not rejected in tests) consensus.BIP34Hash = uint256(); - // consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in rpc activation tests) + consensus.BIP65Height = 1351; // BIP65 activated on regtest (Used in rpc activation tests) consensus.BIP66Height = 1251; // BIP66 activated on regtest (Used in rpc activation tests) consensus.powLimit = uint256S("0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"); // ~uint256(0) >> 1; consensus.nPowTargetTimespan = 4 * 60 * 60; // pre-digishield: 4 hours |