Skip to content

Commit 3133d93

Browse files
committed
Merge bitcoin/bitcoin#27482: kernel: chainparams updates for 25.x
a2bef80 kernel: update m_assumed_* chain params for 25.x (fanquake) 4128e01 kernel: update chainTxData for 25.x (fanquake) 00b2b11 kernel: update nMinimumChainWork & defaultAssumeValid for 25.x (fanquake) 07fcc0a doc: update references to kernel/chainparams.cpp (fanquake) Pull request description: Update chainparams pre `25.x` branch off. Co-Author in the commits as a PR (#27223) had previously been opened too-early to do the same. Note: Remember that some variance is expected in the `m_assumed_*` sizes. ACKs for top commit: achow101: ACK a2bef80 josibake: ACK bitcoin/bitcoin@a2bef80 gruve-p: ACK bitcoin/bitcoin@a2bef80 dergoegge: ACK a2bef80 on the new mainnet params Tree-SHA512: 0b19c2ef15c6b15863d6a560a1053ee223057c7bfb617ffd3400b1734cee8f75bc6fd7f04d8f8e3f5af6220659a1987951a1b36945d6fe17d06972004fd62610
2 parents b627924 + a2bef80 commit 3133d93

File tree

4 files changed

+24
-24
lines changed

4 files changed

+24
-24
lines changed

contrib/seeds/generate-seeds.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
# Distributed under the MIT software license, see the accompanying
44
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
55
'''
6-
Script to generate list of seed nodes for chainparams.cpp.
6+
Script to generate list of seed nodes for kernel/chainparams.cpp.
77
88
This script expects two text files in the directory that is passed as an
99
argument:

doc/release-process.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Release Process
2929
#### Before branch-off
3030

3131
* Update hardcoded [seeds](/contrib/seeds/README.md), see [this pull request](https://github.com/bitcoin/bitcoin/pull/7415) for an example.
32-
* Update the following variables in [`src/chainparams.cpp`](/src/chainparams.cpp) for mainnet, testnet, and signet:
32+
* Update the following variables in [`src/kernel/chainparams.cpp`](/src/kernel/chainparams.cpp) for mainnet, testnet, and signet:
3333
- `m_assumed_blockchain_size` and `m_assumed_chain_state_size` with the current size plus some overhead (see
3434
[this](#how-to-calculate-assumed-blockchain-and-chain-state-size) for information on how to calculate them).
3535
- The following updates should be reviewed with `reindex-chainstate` and `assumevalid=0` to catch any defect

src/kernel/chainparams.cpp

+21-21
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ class CMainParams : public CChainParams {
103103
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
104104
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 709632; // Approximately November 12th, 2021
105105

106-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000003404ba0801921119f903495e");
107-
consensus.defaultAssumeValid = uint256S("0x00000000000000000009c97098b5295f7e5f183ac811fb5d1534040adb93cabd"); // 751565
106+
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000044a50fe819c39ad624021859");
107+
consensus.defaultAssumeValid = uint256S("0x000000000000000000035c3f0d31e71a5ee24c5aaf3354689f65bd7b07dee632"); // 784000
108108

109109
/**
110110
* The message start string is designed to be unlikely to occur in normal data.
@@ -117,8 +117,8 @@ class CMainParams : public CChainParams {
117117
pchMessageStart[3] = 0xd9;
118118
nDefaultPort = 8333;
119119
nPruneAfterHeight = 100000;
120-
m_assumed_blockchain_size = 496;
121-
m_assumed_chain_state_size = 6;
120+
m_assumed_blockchain_size = 540;
121+
m_assumed_chain_state_size = 7;
122122

123123
genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
124124
consensus.hashGenesisBlock = genesis.GetHash();
@@ -178,10 +178,10 @@ class CMainParams : public CChainParams {
178178
};
179179

180180
chainTxData = ChainTxData{
181-
// Data from RPC: getchaintxstats 4096 00000000000000000009c97098b5295f7e5f183ac811fb5d1534040adb93cabd
182-
.nTime = 1661697692,
183-
.nTxCount = 760120522,
184-
.dTxRate = 2.925802860942233,
181+
// Data from RPC: getchaintxstats 4096 000000000000000000035c3f0d31e71a5ee24c5aaf3354689f65bd7b07dee632
182+
.nTime = 1680665245,
183+
.nTxCount = 820876044,
184+
.dTxRate = 3.672283614033389,
185185
};
186186
}
187187
};
@@ -223,8 +223,8 @@ class CTestNetParams : public CChainParams {
223223
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].nTimeout = 1628640000; // August 11th, 2021
224224
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].min_activation_height = 0; // No activation delay
225225

226-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000076f6e7cbd0beade5d20");
227-
consensus.defaultAssumeValid = uint256S("0x0000000000000004877fa2d36316398528de4f347df2f8a96f76613a298ce060"); // 2344474
226+
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000977edb0244170858d07");
227+
consensus.defaultAssumeValid = uint256S("0x0000000000000021bc50a89cde4870d4a81ffe0153b3c8de77b435a2fd3f6761"); // 2429000
228228

229229
pchMessageStart[0] = 0x0b;
230230
pchMessageStart[1] = 0x11;
@@ -233,7 +233,7 @@ class CTestNetParams : public CChainParams {
233233
nDefaultPort = 18333;
234234
nPruneAfterHeight = 1000;
235235
m_assumed_blockchain_size = 42;
236-
m_assumed_chain_state_size = 2;
236+
m_assumed_chain_state_size = 3;
237237

238238
genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN);
239239
consensus.hashGenesisBlock = genesis.GetHash();
@@ -274,10 +274,10 @@ class CTestNetParams : public CChainParams {
274274
};
275275

276276
chainTxData = ChainTxData{
277-
// Data from RPC: getchaintxstats 4096 0000000000000004877fa2d36316398528de4f347df2f8a96f76613a298ce060
278-
.nTime = 1661705221,
279-
.nTxCount = 63531852,
280-
.dTxRate = 0.1079119341520164,
277+
// Data from RPC: getchaintxstats 4096 0000000000000021bc50a89cde4870d4a81ffe0153b3c8de77b435a2fd3f6761
278+
.nTime = 1681542696,
279+
.nTxCount = 65345929,
280+
.dTxRate = 0.09855282814711661,
281281
};
282282
}
283283
};
@@ -300,15 +300,15 @@ class SigNetParams : public CChainParams {
300300
vSeeds.emplace_back("178.128.221.177");
301301
vSeeds.emplace_back("v7ajjeirttkbnt32wpy3c6w3emwnfr3fkla7hpxcfokr3ysd3kqtzmqd.onion:38333");
302302

303-
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000001291fc22898");
304-
consensus.defaultAssumeValid = uint256S("0x000000d1a0e224fa4679d2fb2187ba55431c284fa1b74cbc8cfda866fd4d2c09"); // 105495
303+
consensus.nMinimumChainWork = uint256S("0x000000000000000000000000000000000000000000000000000001899d8142b0");
304+
consensus.defaultAssumeValid = uint256S("0x0000004429ef154f7e00b4f6b46bfbe2d2678ecd351d95bbfca437ab9a5b84ec"); // 138000
305305
m_assumed_blockchain_size = 1;
306306
m_assumed_chain_state_size = 0;
307307
chainTxData = ChainTxData{
308-
// Data from RPC: getchaintxstats 4096 000000d1a0e224fa4679d2fb2187ba55431c284fa1b74cbc8cfda866fd4d2c09
309-
.nTime = 1661702566,
310-
.nTxCount = 1903567,
311-
.dTxRate = 0.02336701143027275,
308+
// Data from RPC: getchaintxstats 4096 0000004429ef154f7e00b4f6b46bfbe2d2678ecd351d95bbfca437ab9a5b84ec
309+
.nTime = 1681127428,
310+
.nTxCount = 2226359,
311+
.dTxRate = 0.006424463050600656,
312312
};
313313
} else {
314314
bin = *options.challenge;

src/test/validation_tests.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ BOOST_AUTO_TEST_CASE(test_assumeutxo)
127127
const auto params = CreateChainParams(*m_node.args, CBaseChainParams::REGTEST);
128128

129129
// These heights don't have assumeutxo configurations associated, per the contents
130-
// of chainparams.cpp.
130+
// of kernel/chainparams.cpp.
131131
std::vector<int> bad_heights{0, 100, 111, 115, 209, 211};
132132

133133
for (auto empty : bad_heights) {

0 commit comments

Comments
 (0)