diff options
author | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-04-02 15:43:44 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@protonmail.com> | 2020-04-02 15:43:49 +0200 |
commit | b83565625e32b22395e28c1965b2e42fc17f04d7 (patch) | |
tree | 4da89ff005be3c3597ccdbcfbc95b5e599732c7c | |
parent | 6bdd515ccf1b0d3ec5990467db87b9f7963b9b51 (diff) | |
parent | 222253e37d9702181fe754d776177962d6794f30 (diff) |
Merge #18500: chainparams: Bump assumed valid hash
222253e37d9702181fe754d776177962d6794f30 chainparams: Bump assumed valid hash (MarcoFalke)
Pull request description:
See https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-branch-off
ACKs for top commit:
fanquake:
ACK 222253e37d9702181fe754d776177962d6794f30 - matches output on my node. Also have 3.8GB for the chainstate dir. If anyone wants to know what commands they should run / what to check; I have some docs on [assumevalid updates](https://github.com/fanquake/core-review/blob/master/update-assumevalid.md).
elichai:
ACK 222253e37d9702181fe754d776177962d6794f30
theStack:
ACK https://github.com/bitcoin/bitcoin/pull/18500/commits/222253e37d9702181fe754d776177962d6794f30
instagibbs:
ACK https://github.com/bitcoin/bitcoin/pull/18500/commits/222253e37d9702181fe754d776177962d6794f30 all mainnet params, did not check testnet
Tree-SHA512: 856e75f0c6663ab478768d80618f11ac109ef30058661f58ed7f2a3a615dd5fb8f8d648c996eff77949036c1633119085b25cd4c25250a0850c943c02cddf3d7
-rw-r--r-- | src/chainparams.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index a9183ac970..f8f2d41138 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -84,10 +84,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000008ea3cf107ae0dec57f03fe8"); + consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000e1ab5ec9348e9f4b8eb8154"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000000000000000005f8920febd3925f8272a6a71237563d78c2edfdd09ddf"); // 597379 + consensus.defaultAssumeValid = uint256S("0x0000000000000000000f2adce67e49b0b6bdeb9de8b7c3d7e93b21e7fc1e819d"); // 623950 /** * The message start string is designed to be unlikely to occur in normal data. @@ -100,7 +100,7 @@ public: pchMessageStart[3] = 0xd9; nDefaultPort = 8333; nPruneAfterHeight = 100000; - m_assumed_blockchain_size = 280; + m_assumed_blockchain_size = 320; m_assumed_chain_state_size = 4; genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN); @@ -156,10 +156,10 @@ public: }; chainTxData = ChainTxData{ - // Data from RPC: getchaintxstats 4096 00000000000000000005f8920febd3925f8272a6a71237563d78c2edfdd09ddf - /* nTime */ 1569926786, - /* nTxCount */ 460596047, - /* dTxRate */ 3.77848885073875, + // Data from RPC: getchaintxstats 4096 0000000000000000000f2adce67e49b0b6bdeb9de8b7c3d7e93b21e7fc1e819d + /* nTime */ 1585764811, + /* nTxCount */ 517186863, + /* dTxRate */ 3.305709665792344, }; } }; @@ -192,10 +192,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008 // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000012b2a3a62424f21c918"); + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000001495c1d5a01e2af8a23"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x00000000000000b7ab6ce61eb6d571003fbe5fe892da4c9b740c49a07542462d"); // 1580000 + consensus.defaultAssumeValid = uint256S("0x000000000000056c49030c174179b52a928c870e6e8a822c75973b7970cfbd01"); // 1692000 pchMessageStart[0] = 0x0b; pchMessageStart[1] = 0x11; @@ -203,7 +203,7 @@ public: pchMessageStart[3] = 0x07; nDefaultPort = 18333; nPruneAfterHeight = 1000; - m_assumed_blockchain_size = 30; + m_assumed_blockchain_size = 40; m_assumed_chain_state_size = 2; genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN); @@ -241,10 +241,10 @@ public: }; chainTxData = ChainTxData{ - // Data from RPC: getchaintxstats 4096 00000000000000b7ab6ce61eb6d571003fbe5fe892da4c9b740c49a07542462d - /* nTime */ 1569741320, - /* nTxCount */ 52318009, - /* dTxRate */ 0.1517002392872353, + // Data from RPC: getchaintxstats 4096 000000000000056c49030c174179b52a928c870e6e8a822c75973b7970cfbd01 + /* nTime */ 1585561140, + /* nTxCount */ 13483, + /* dTxRate */ 0.08523187013249722, }; } }; |