diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-02-18 10:47:07 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2019-02-18 10:53:25 +0100 |
| commit | f5a623eb66c81d9d7b11206d574430af0127546d (patch) | |
| tree | 2e80915817cdf5f2a515ea3f2d94aa4a3efca805 | |
| parent | b72c787dc8f77dfeeab3774e9d84f03a066ff32e (diff) | |
| parent | a083f75ba79d465f15fddba7b00ca02e31bb3d40 (diff) | |
| download | bitcoin-f5a623eb66c81d9d7b11206d574430af0127546d.tar.xz | |
Merge #15429: Update assumevalid, minimumchainwork, and getchaintxstats to height 563378
a083f75ba79d465f15fddba7b00ca02e31bb3d40 Update assumevalid, minimumchainwork, and getchaintxstats to height 563378. (Gregory Maxwell)
Pull request description:
m_assumed_blockchain_size/m_assumed_chain_state_size were still accurate.
Tree-SHA512: 9b08a5d6023c0e24ab3d8c43c0978181eb853f15c4db9bc69e72efc94c89600780bc73d9f46dbaf5241d28b135546dd30e7abd50a89096b5fd3f7252308491cc
| -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 97b0e05b20..b8e0ea23dd 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -91,10 +91,10 @@ public: consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017. // The best chain should have at least this much work. - consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000028822fef1c230963535a90d"); + consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000051dc8b82f450202ecb3d471"); // By default assume that the signatures in ancestors of this block are valid. - consensus.defaultAssumeValid = uint256S("0x0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8"); //534292 + consensus.defaultAssumeValid = uint256S("0x0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee"); //563378 /** * The message start string is designed to be unlikely to occur in normal data. @@ -162,10 +162,10 @@ public: }; chainTxData = ChainTxData{ - // Data from rpc: getchaintxstats 4096 0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8 - /* nTime */ 1532884444, - /* nTxCount */ 331282217, - /* dTxRate */ 2.4 + // Data from rpc: getchaintxstats 4096 0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee + /* nTime */ 1550374134, + /* nTxCount */ 383732546, + /* dTxRate */ 3.685496590998308 }; /* disable fallback fee on mainnet */ |