Merge #15429: Update assumevalid, minimumchainwork, and getchaintxstats to height 563378

a083f75ba7 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
This commit is contained in:
Wladimir J. van der Laan 2019-02-18 10:47:07 +01:00
commit f5a623eb66
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D

View file

@ -91,10 +91,10 @@ public:
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017. consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017.
// The best chain should have at least this much work. // 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. // 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. * The message start string is designed to be unlikely to occur in normal data.
@ -162,10 +162,10 @@ public:
}; };
chainTxData = ChainTxData{ chainTxData = ChainTxData{
// Data from rpc: getchaintxstats 4096 0000000000000000002e63058c023a9a1de233554f28c7b21380b6c9003f36a8 // Data from rpc: getchaintxstats 4096 0000000000000000000f1c54590ee18d15ec70e68c8cd4cfbadb1b4f11697eee
/* nTime */ 1532884444, /* nTime */ 1550374134,
/* nTxCount */ 331282217, /* nTxCount */ 383732546,
/* dTxRate */ 2.4 /* dTxRate */ 3.685496590998308
}; };
/* disable fallback fee on mainnet */ /* disable fallback fee on mainnet */