diff --git a/src/headerssync.cpp b/src/headerssync.cpp index 04034fd51c58..308cc8410e35 100644 --- a/src/headerssync.cpp +++ b/src/headerssync.cpp @@ -13,11 +13,11 @@ // contrib/devtools/headerssync-params.py. //! Store one header commitment per HEADER_COMMITMENT_PERIOD blocks. -constexpr size_t HEADER_COMMITMENT_PERIOD{632}; +constexpr size_t HEADER_COMMITMENT_PERIOD{641}; //! Only feed headers to validation once this many headers on top have been //! received and validated against commitments. -constexpr size_t REDOWNLOAD_BUFFER_SIZE{15009}; // 15009/632 = ~23.7 commitments +constexpr size_t REDOWNLOAD_BUFFER_SIZE{15218}; // 15218/641 = ~23.7 commitments // Our memory analysis assumes 48 bytes for a CompressedHeader (so we should // re-calculate parameters if we compress further) diff --git a/src/kernel/chainparams.cpp b/src/kernel/chainparams.cpp index 47fe82fa91fa..d2065b74f565 100644 --- a/src/kernel/chainparams.cpp +++ b/src/kernel/chainparams.cpp @@ -117,8 +117,8 @@ class CMainParams : public CChainParams { consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021 consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 709632; // Approximately November 12th, 2021 - consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000dee8e2a309ad8a9820433c68"}; - consensus.defaultAssumeValid = uint256{"00000000000000000000611fd22f2df7c8fbd0688745c3a6c3bb5109cc2a12cb"}; // 912683 + consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000001128750f82f4c366153a3a030"}; + consensus.defaultAssumeValid = uint256{"00000000000000000000ccebd6d74d9194d8dcdc1d177c478e094bfad51ba5ac"}; // 938343 /** * The message start string is designed to be unlikely to occur in normal data. @@ -131,7 +131,7 @@ class CMainParams : public CChainParams { pchMessageStart[3] = 0xd9; nDefaultPort = 8333; nPruneAfterHeight = 100000; - m_assumed_blockchain_size = 810; + m_assumed_blockchain_size = 856; m_assumed_chain_state_size = 14; genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN); @@ -229,14 +229,20 @@ class CMainParams : public CChainParams { .hash_serialized = AssumeutxoHash{uint256{"4daf8a17b4902498c5787966a2b51c613acdab5df5db73f196fa59a4da2f1568"}}, .m_chain_tx_count = 1226586151, .blockhash = consteval_ctor(uint256{"0000000000000000000108970acb9522ffd516eae17acddcb1bd16469194a821"}), + }, + { + .height = 935'000, + .hash_serialized = AssumeutxoHash{uint256{"e4b90ef9eae834f56c4b64d2d50143cee10ad87994c614d7d04125e2a6025050"}}, + .m_chain_tx_count = 1305397408, + .blockhash = consteval_ctor(uint256{"0000000000000000000147034958af1652b2b91bba607beacc5e72a56f0fb5ee"}), } }; chainTxData = ChainTxData{ - // Data from RPC: getchaintxstats 4096 00000000000000000000611fd22f2df7c8fbd0688745c3a6c3bb5109cc2a12cb - .nTime = 1756722903, - .tx_count = 1235299397, - .dTxRate = 6.721086701157182, // held back due to present abnormal tx rate + // Data from RPC: getchaintxstats 4096 00000000000000000000ccebd6d74d9194d8dcdc1d177c478e094bfad51ba5ac + .nTime = 1772055173, + .tx_count = 1315805869, + .dTxRate = 5.40111006496122, }; } };