Skip to content

Commit f5a623e

Browse files
committed
Merge #15429: Update assumevalid, minimumchainwork, and getchaintxstats to height 563378
a083f75 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
2 parents b72c787 + a083f75 commit f5a623e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/chainparams.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,10 @@ class CMainParams : public CChainParams {
9191
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
9292

9393
// The best chain should have at least this much work.
94-
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000028822fef1c230963535a90d");
94+
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000051dc8b82f450202ecb3d471");
9595

9696
// By default assume that the signatures in ancestors of this block are valid.
97-
consensus.defaultAssumeValid = uint256S("0x0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8"); //534292
97+
consensus.defaultAssumeValid = uint256S("0x0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee"); //563378
9898

9999
/**
100100
* The message start string is designed to be unlikely to occur in normal data.
@@ -162,10 +162,10 @@ class CMainParams : public CChainParams {
162162
};
163163

164164
chainTxData = ChainTxData{
165-
// Data from rpc: getchaintxstats 4096 0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8
166-
/* nTime */ 1532884444,
167-
/* nTxCount */ 331282217,
168-
/* dTxRate */ 2.4
165+
// Data from rpc: getchaintxstats 4096 0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee
166+
/* nTime */ 1550374134,
167+
/* nTxCount */ 383732546,
168+
/* dTxRate */ 3.685496590998308
169169
};
170170

171171
/* disable fallback fee on mainnet */

0 commit comments

Comments
 (0)