Skip to content

Commit 42af959

Browse files
committed
Merge bitcoin#22499: Update assumed chain params
eeddd1c Update assumed chain params (Sriram) Pull request description: Update the relevant variables in `src/chainparams.cpp` for `mainnet`, `testnet`, and `signet` as given [here](https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-branch-off). To review this PR, check out [this guide](https://github.com/fanquake/core-review/blob/master/update-assumevalid.md). Note: added a 10% overhead to the base value of `mainnet` in `m_assumed_blockchain_size` ACKs for top commit: MarcoFalke: ACK eeddd1c, checked against my node 🌮 bfolkens: ACK eeddd1c - checked against `mainnet` achow101: Code Review ACK eeddd1c 0xB10C: ACK mainnet, testnet, and signet eeddd1c jamesob: ACK eeddd1c ([`jamesob/ackr/22499.1.sriramdvt.update_assumed_chain_par`](https://github.com/jamesob/bitcoin/tree/ackr/22499.1.sriramdvt.update_assumed_chain_par)) darosior: ACK eeddd1c mainnet and testnet Tree-SHA512: 0ab19d2acc6a854c6aa38fba199d61c68cec40f005d1d54341ea32b59aae9b7d1aabfd21d7c0bc79f54be99d3e71d1d727196cab88f370259fd2c6e002d3e43c
2 parents 539023a + eeddd1c commit 42af959

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

src/chainparams.cpp

+19-19
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class CMainParams : public CChainParams {
9191
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
9292
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 709632; // Approximately November 12th, 2021
9393

94-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000001533efd8d716a517fe2c5008");
95-
consensus.defaultAssumeValid = uint256S("0x0000000000000000000b9d2ec5a352ecba0592946514a92f14319dc2b367fc72"); // 654683
94+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000001fa4663bbbe19f82de910280");
95+
consensus.defaultAssumeValid = uint256S("0x00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad"); // 691719
9696

9797
/**
9898
* The message start string is designed to be unlikely to occur in normal data.
@@ -105,7 +105,7 @@ class CMainParams : public CChainParams {
105105
pchMessageStart[3] = 0xd9;
106106
nDefaultPort = 8333;
107107
nPruneAfterHeight = 100000;
108-
m_assumed_blockchain_size = 350;
108+
m_assumed_blockchain_size = 420;
109109
m_assumed_chain_state_size = 6;
110110

111111
genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
@@ -166,10 +166,10 @@ class CMainParams : public CChainParams {
166166
};
167167

168168
chainTxData = ChainTxData{
169-
// Data from RPC: getchaintxstats 4096 0000000000000000000b9d2ec5a352ecba0592946514a92f14319dc2b367fc72
170-
/* nTime */ 1603995752,
171-
/* nTxCount */ 582083445,
172-
/* dTxRate */ 3.508976121410527,
169+
// Data from RPC: getchaintxstats 4096 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad
170+
/* nTime */ 1626697539,
171+
/* nTxCount */ 656509474,
172+
/* dTxRate */ 2.424920418708139,
173173
};
174174
}
175175
};
@@ -210,8 +210,8 @@ class CTestNetParams : public CChainParams {
210210
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
211211
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
212212

213-
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000001db6ec4ac88cf2272c6");
214-
consensus.defaultAssumeValid = uint256S("0x000000000000006433d1efec504c53ca332b64963c425395515b01977bd7b3b0"); // 1864000
213+
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000005180c3bd8290da33a1a");
214+
consensus.defaultAssumeValid = uint256S("0x0000000000004ae2f3896ca8ecd41c460a35bf6184e145d91558cece1c688a76"); // 2010000
215215

216216
pchMessageStart[0] = 0x0b;
217217
pchMessageStart[1] = 0x11;
@@ -261,10 +261,10 @@ class CTestNetParams : public CChainParams {
261261
};
262262

263263
chainTxData = ChainTxData{
264-
// Data from RPC: getchaintxstats 4096 000000000000006433d1efec504c53ca332b64963c425395515b01977bd7b3b0
265-
/* nTime */ 1603359686,
266-
/* nTxCount */ 58090238,
267-
/* dTxRate */ 0.1232886622799463,
264+
// Data from RPC: getchaintxstats 4096 0000000000004ae2f3896ca8ecd41c460a35bf6184e145d91558cece1c688a76
265+
/* nTime */ 1625727096,
266+
/* nTxCount */ 60408943,
267+
/* dTxRate */ 0.08379062270367649,
268268
};
269269
}
270270
};
@@ -284,15 +284,15 @@ class SigNetParams : public CChainParams {
284284
vSeeds.emplace_back("2a01:7c8:d005:390::5");
285285
vSeeds.emplace_back("v7ajjeirttkbnt32wpy3c6w3emwnfr3fkla7hpxcfokr3ysd3kqtzmqd.onion:38333");
286286

287-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000019fd16269a");
288-
consensus.defaultAssumeValid = uint256S("0x0000002a1de0f46379358c1fd09906f7ac59adf3712323ed90eb59e4c183c020"); // 9434
287+
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000008546553c03");
288+
consensus.defaultAssumeValid = uint256S("0x000000187d4440e5bff91488b700a140441e089a8aaea707414982460edbfe54"); // 47200
289289
m_assumed_blockchain_size = 1;
290290
m_assumed_chain_state_size = 0;
291291
chainTxData = ChainTxData{
292-
// Data from RPC: getchaintxstats 4096 0000002a1de0f46379358c1fd09906f7ac59adf3712323ed90eb59e4c183c020
293-
/* nTime */ 1603986000,
294-
/* nTxCount */ 9582,
295-
/* dTxRate */ 0.00159272030651341,
292+
// Data from RPC: getchaintxstats 4096 000000187d4440e5bff91488b700a140441e089a8aaea707414982460edbfe54
293+
/* nTime */ 1626696658,
294+
/* nTxCount */ 387761,
295+
/* dTxRate */ 0.04035946932424404,
296296
};
297297
} else {
298298
const auto signet_challenge = args.GetArgs("-signetchallenge");

0 commit comments

Comments
 (0)