Skip to content

Commit ca18860

Browse files
laanwjlaanwj
committed
Merge bitcoin#20263: Update assumed chain params
fa90ba3 Update assumed chain params (MarcoFalke) Pull request description: > Oh, by the way, the same procedure as last year, Miss Sophie? > Same procedure as every year, James. See https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-branch-off ACKs for top commit: jonatack: ACK fa90ba3 per `git diff fa0c1b5 fa90ba3` and re-running getblockheader/getblockhash/getchaintxstats on the signet chain dergoegge: ACK bitcoin@fa90ba3 - mainnet and testnet data matches my node. theStack: re-ACK fa90ba3 ✔️ darosior: re-ACK fa90ba3 for mainnet and testnet. Tree-SHA512: 83044cc59d9fc873cb29f13008d00b54cb4bb4646c1ca53ab4f429e7333a32402becb888d3be117d390c1297c2f7d083f77ae12ac8633265edceb3cfefac087f
2 parents ef4c7c4 + fa90ba3 commit ca18860

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

‎src/chainparams.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ class CMainParams : public CChainParams {
9191
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1199145601; // January 1, 2008
9292
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1230767999; // December 31, 2008
9393

94-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000e1ab5ec9348e9f4b8eb8154");
95-
consensus.defaultAssumeValid = uint256S("0x0000000000000000000f2adce67e49b0b6bdeb9de8b7c3d7e93b21e7fc1e819d"); // 623950
94+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000001533efd8d716a517fe2c5008");
95+
consensus.defaultAssumeValid = uint256S("0x0000000000000000000b9d2ec5a352ecba0592946514a92f14319dc2b367fc72"); // 654683
9696

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

111111
genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
112112
consensus.hashGenesisBlock = genesis.GetHash();
@@ -162,10 +162,10 @@ class CMainParams : public CChainParams {
162162
};
163163

164164
chainTxData = ChainTxData{
165-
// Data from RPC: getchaintxstats 4096 0000000000000000000f2adce67e49b0b6bdeb9de8b7c3d7e93b21e7fc1e819d
166-
/* nTime */ 1585764811,
167-
/* nTxCount */ 517186863,
168-
/* dTxRate */ 3.305709665792344,
165+
// Data from RPC: getchaintxstats 4096 0000000000000000000b9d2ec5a352ecba0592946514a92f14319dc2b367fc72
166+
/* nTime */ 1603995752,
167+
/* nTxCount */ 582083445,
168+
/* dTxRate */ 3.508976121410527,
169169
};
170170
}
171171
};
@@ -204,8 +204,8 @@ class CTestNetParams : public CChainParams {
204204
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nStartTime = 1199145601; // January 1, 2008
205205
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1230767999; // December 31, 2008
206206

207-
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000001495c1d5a01e2af8a23");
208-
consensus.defaultAssumeValid = uint256S("0x000000000000056c49030c174179b52a928c870e6e8a822c75973b7970cfbd01"); // 1692000
207+
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000001db6ec4ac88cf2272c6");
208+
consensus.defaultAssumeValid = uint256S("0x000000000000006433d1efec504c53ca332b64963c425395515b01977bd7b3b0"); // 1864000
209209

210210
pchMessageStart[0] = 0x0b;
211211
pchMessageStart[1] = 0x11;
@@ -251,10 +251,10 @@ class CTestNetParams : public CChainParams {
251251
};
252252

253253
chainTxData = ChainTxData{
254-
// Data from RPC: getchaintxstats 4096 000000000000056c49030c174179b52a928c870e6e8a822c75973b7970cfbd01
255-
/* nTime */ 1585561140,
256-
/* nTxCount */ 13483,
257-
/* dTxRate */ 0.08523187013249722,
254+
// Data from RPC: getchaintxstats 4096 000000000000006433d1efec504c53ca332b64963c425395515b01977bd7b3b0
255+
/* nTime */ 1603359686,
256+
/* nTxCount */ 58090238,
257+
/* dTxRate */ 0.1232886622799463,
258258
};
259259
}
260260
};
@@ -274,15 +274,15 @@ class SigNetParams : public CChainParams {
274274
vSeeds.emplace_back("2a01:7c8:d005:390::5");
275275
vSeeds.emplace_back("ntv3mtqw5wt63red.onion:38333");
276276

277-
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000d145533ce");
278-
consensus.defaultAssumeValid = uint256S("0x00000128807d9175c494e24d805fc7854f7d79aa965cbb128342ad8b70cecfa5"); // 5348
277+
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000000000000019fd16269a");
278+
consensus.defaultAssumeValid = uint256S("0x0000002a1de0f46379358c1fd09906f7ac59adf3712323ed90eb59e4c183c020"); // 9434
279279
m_assumed_blockchain_size = 1;
280280
m_assumed_chain_state_size = 0;
281281
chainTxData = ChainTxData{
282-
// Data from RPC: getchaintxstats 4096 00000128807d9175c494e24d805fc7854f7d79aa965cbb128342ad8b70cecfa5
283-
/* nTime */ 1601382000,
284-
/* nTxCount */ 5435,
285-
/* dTxRate */ 0.001898346323372538,
282+
// Data from RPC: getchaintxstats 4096 0000002a1de0f46379358c1fd09906f7ac59adf3712323ed90eb59e4c183c020
283+
/* nTime */ 1603986000,
284+
/* nTxCount */ 9582,
285+
/* dTxRate */ 0.00159272030651341,
286286
};
287287
} else {
288288
const auto signet_challenge = args.GetArgs("-signetchallenge");

0 commit comments

Comments
 (0)