Skip to content

Commit 0eb3eae

Browse files
committed
Merge bitcoin/bitcoin#33274: kernel: chainparams & headersync updates for 30.0
755152a kernel: add testnet4 assumeutxo param at height 90'000 (fanquake) a651268 kernel: add mainnet assumeutxo param at height 910'000 (fanquake) 943de66 kernel: update headersync params (fanquake) 66fb962 kernel: update chainTxData (fanquake) c3cb26e kernel: update assumevalid and minimumChainWork (fanquake) b4adae7 kernel: update assumed blockchain & chainstate sizes (fanquake) Pull request description: Also adds assumeutxo params for mainnet at `910'000` & testnet4 & `90'000`. ACKs for top commit: Sjors: re-ACK 755152a achow101: ACK 755152a w0xlt: ACK bitcoin/bitcoin@755152a hodlinator: ACK 755152a Tree-SHA512: d26b023b1fdbb72e81c3879aa274e3900742f015d77c1bb3cde00b3b882642c6b35a6268c6ccf35fa9243b58b5a1ebe6eba3eb7f58678eee5bd8a6d6e7518a6f
2 parents 4636958 + 755152a commit 0eb3eae

File tree

3 files changed

+46
-35
lines changed

3 files changed

+46
-35
lines changed

contrib/devtools/headerssync-params.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@
1212
# Parameters:
1313

1414
# Aim for still working fine at some point in the future. [datetime]
15-
TIME = datetime(2027, 10, 6)
15+
TIME = datetime(2028, 4, 2)
1616

1717
# Expected block interval. [timedelta]
1818
BLOCK_INTERVAL = timedelta(seconds=600)
1919

2020
# The number of headers corresponding to the minchainwork parameter. [headers]
21-
MINCHAINWORK_HEADERS = 886157
21+
MINCHAINWORK_HEADERS = 912683
2222

2323
# Combined processing bandwidth from all attackers to one victim. [bit/s]
2424
# 6 Gbit/s is approximately the speed at which a single thread of a Ryzen 5950X CPU thread can hash

src/headerssync.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
// contrib/devtools/headerssync-params.py.
1414

1515
//! Store one header commitment per HEADER_COMMITMENT_PERIOD blocks.
16-
constexpr size_t HEADER_COMMITMENT_PERIOD{624};
16+
constexpr size_t HEADER_COMMITMENT_PERIOD{632};
1717

1818
//! Only feed headers to validation once this many headers on top have been
1919
//! received and validated against commitments.
20-
constexpr size_t REDOWNLOAD_BUFFER_SIZE{14827}; // 14827/624 = ~23.8 commitments
20+
constexpr size_t REDOWNLOAD_BUFFER_SIZE{15009}; // 15009/632 = ~23.7 commitments
2121

2222
// Our memory analysis assumes 48 bytes for a CompressedHeader (so we should
2323
// re-calculate parameters if we compress further)

src/kernel/chainparams.cpp

Lines changed: 42 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ class CMainParams : public CChainParams {
118118
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1815; // 90%
119119
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
120120

121-
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000b1f3b93b65b16d035a82be84"};
122-
consensus.defaultAssumeValid = uint256{"00000000000000000001b658dd1120e82e66d2790811f89ede9742ada3ed6d77"}; // 886157
121+
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000dee8e2a309ad8a9820433c68"};
122+
consensus.defaultAssumeValid = uint256{"00000000000000000000611fd22f2df7c8fbd0688745c3a6c3bb5109cc2a12cb"}; // 912683
123123

124124
/**
125125
* The message start string is designed to be unlikely to occur in normal data.
@@ -132,7 +132,7 @@ class CMainParams : public CChainParams {
132132
pchMessageStart[3] = 0xd9;
133133
nDefaultPort = 8333;
134134
nPruneAfterHeight = 100000;
135-
m_assumed_blockchain_size = 720;
135+
m_assumed_blockchain_size = 810;
136136
m_assumed_chain_state_size = 14;
137137

138138
genesis = CreateGenesisBlock(1231006505, 2083236893, 0x1d00ffff, 1, 50 * COIN);
@@ -180,14 +180,20 @@ class CMainParams : public CChainParams {
180180
.hash_serialized = AssumeutxoHash{uint256{"dbd190983eaf433ef7c15f78a278ae42c00ef52e0fd2a54953782175fbadcea9"}},
181181
.m_chain_tx_count = 1145604538,
182182
.blockhash = consteval_ctor(uint256{"000000000000000000010b17283c3c400507969a9c2afd1dcf2082ec5cca2880"}),
183+
},
184+
{
185+
.height = 910'000,
186+
.hash_serialized = AssumeutxoHash{uint256{"4daf8a17b4902498c5787966a2b51c613acdab5df5db73f196fa59a4da2f1568"}},
187+
.m_chain_tx_count = 1226586151,
188+
.blockhash = consteval_ctor(uint256{"0000000000000000000108970acb9522ffd516eae17acddcb1bd16469194a821"}),
183189
}
184190
};
185191

186192
chainTxData = ChainTxData{
187-
// Data from RPC: getchaintxstats 4096 00000000000000000001b658dd1120e82e66d2790811f89ede9742ada3ed6d77
188-
.nTime = 1741017141,
189-
.tx_count = 1161875261,
190-
.dTxRate = 4.620728156243148,
193+
// Data from RPC: getchaintxstats 4096 00000000000000000000611fd22f2df7c8fbd0688745c3a6c3bb5109cc2a12cb
194+
.nTime = 1756722903,
195+
.tx_count = 1235299397,
196+
.dTxRate = 5.456290459519495,
191197
};
192198
}
193199
};
@@ -232,16 +238,16 @@ class CTestNetParams : public CChainParams {
232238
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1512; // 75%
233239
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
234240

235-
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000015f5e0c9f13455b0eb17"};
236-
consensus.defaultAssumeValid = uint256{"00000000000003fc7967410ba2d0a8a8d50daedc318d43e8baf1a9782c236a57"}; // 3974606
241+
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000016dd270dd94fac1d7632"};
242+
consensus.defaultAssumeValid = uint256{"0000000000000065c6c38258e201971a3fdfcc2ceee0dd6e85a6c022d45dee34"}; // 4550000
237243

238244
pchMessageStart[0] = 0x0b;
239245
pchMessageStart[1] = 0x11;
240246
pchMessageStart[2] = 0x09;
241247
pchMessageStart[3] = 0x07;
242248
nDefaultPort = 18333;
243249
nPruneAfterHeight = 1000;
244-
m_assumed_blockchain_size = 200;
250+
m_assumed_blockchain_size = 240;
245251
m_assumed_chain_state_size = 19;
246252

247253
genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN);
@@ -281,10 +287,10 @@ class CTestNetParams : public CChainParams {
281287
};
282288

283289
chainTxData = ChainTxData{
284-
// Data from RPC: getchaintxstats 4096 00000000000003fc7967410ba2d0a8a8d50daedc318d43e8baf1a9782c236a57
285-
.nTime = 1741042082,
286-
.tx_count = 475477615,
287-
.dTxRate = 17.15933950357594,
290+
// Data from RPC: getchaintxstats 4096 0000000000000065c6c38258e201971a3fdfcc2ceee0dd6e85a6c022d45dee34
291+
.nTime = 1751816758,
292+
.tx_count = 508468699,
293+
.dTxRate = 7.172978845985714,
288294
};
289295
}
290296
};
@@ -328,17 +334,17 @@ class CTestNet4Params : public CChainParams {
328334
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].threshold = 1512; // 75%
329335
consensus.vDeployments[Consensus::DEPLOYMENT_TAPROOT].period = 2016;
330336

331-
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000001d6dce8651b6094e4c1"};
332-
consensus.defaultAssumeValid = uint256{"0000000000003ed4f08dbdf6f7d6b271a6bcffce25675cb40aa9fa43179a89f3"}; // 72600
337+
consensus.nMinimumChainWork = uint256{"00000000000000000000000000000000000000000000034a4690fe592dc49c7c"};
338+
consensus.defaultAssumeValid = uint256{"000000000000000180a58e7fa3b0db84b5ea76377524894f53660d93ac839d9b"}; // 91000
333339

334340
pchMessageStart[0] = 0x1c;
335341
pchMessageStart[1] = 0x16;
336342
pchMessageStart[2] = 0x3f;
337343
pchMessageStart[3] = 0x28;
338344
nDefaultPort = 48333;
339345
nPruneAfterHeight = 1000;
340-
m_assumed_blockchain_size = 11;
341-
m_assumed_chain_state_size = 1;
346+
m_assumed_blockchain_size = 22;
347+
m_assumed_chain_state_size = 2;
342348

343349
const char* testnet4_genesis_msg = "03/May/2024 000000000000000000001ebd58c244970b3aa9d783bb001011fbe8ea8e98e00e";
344350
const CScript testnet4_genesis_script = CScript() << "000000000000000000000000000000000000000000000000000000000000000000"_hex << OP_CHECKSIG;
@@ -373,14 +379,19 @@ class CTestNet4Params : public CChainParams {
373379
m_is_mockable_chain = false;
374380

375381
m_assumeutxo_data = {
376-
{}
382+
{
383+
.height = 90'000,
384+
.hash_serialized = AssumeutxoHash{uint256{"784fb5e98241de66fdd429f4392155c9e7db5c017148e66e8fdbc95746f8b9b5"}},
385+
.m_chain_tx_count = 11347043,
386+
.blockhash = consteval_ctor(uint256{"0000000002ebe8bcda020e0dd6ccfbdfac531d2f6a81457191b99fc2df2dbe3b"}),
387+
}
377388
};
378389

379390
chainTxData = ChainTxData{
380-
// Data from RPC: getchaintxstats 4096 0000000000003ed4f08dbdf6f7d6b271a6bcffce25675cb40aa9fa43179a89f3
381-
.nTime = 1741070246,
382-
.tx_count = 7653966,
383-
.dTxRate = 1.239174414591965,
391+
// Data from RPC: getchaintxstats 4096 000000000000000180a58e7fa3b0db84b5ea76377524894f53660d93ac839d9b
392+
.nTime = 1752470331,
393+
.tx_count = 11414302,
394+
.dTxRate = 0.2842619757327476,
384395
};
385396
}
386397
};
@@ -402,15 +413,15 @@ class SigNetParams : public CChainParams {
402413
vSeeds.emplace_back("seed.signet.bitcoin.sprovoost.nl.");
403414
vSeeds.emplace_back("seed.signet.achownodes.xyz."); // Ava Chow, only supports x1, x5, x9, x49, x809, x849, xd, x400, x404, x408, x448, xc08, xc48, x40c
404415

405-
consensus.nMinimumChainWork = uint256{"000000000000000000000000000000000000000000000000000002b517f3d1a1"};
406-
consensus.defaultAssumeValid = uint256{"000000895a110f46e59eb82bbc5bfb67fa314656009c295509c21b4999f5180a"}; // 237722
407-
m_assumed_blockchain_size = 9;
408-
m_assumed_chain_state_size = 1;
416+
consensus.nMinimumChainWork = uint256{"0000000000000000000000000000000000000000000000000000067d328e681a"};
417+
consensus.defaultAssumeValid = uint256{"000000128586e26813922680309f04e1de713c7542fee86ed908f56368aefe2e"}; // 267665
418+
m_assumed_blockchain_size = 20;
419+
m_assumed_chain_state_size = 4;
409420
chainTxData = ChainTxData{
410-
// Data from RPC: getchaintxstats 4096 000000895a110f46e59eb82bbc5bfb67fa314656009c295509c21b4999f5180a
411-
.nTime = 1741019645,
412-
.tx_count = 16540736,
413-
.dTxRate = 1.064918879911595,
421+
// Data from RPC: getchaintxstats 4096 000000128586e26813922680309f04e1de713c7542fee86ed908f56368aefe2e
422+
.nTime = 1756723017,
423+
.tx_count = 26185472,
424+
.dTxRate = 0.7452721495389969,
414425
};
415426
} else {
416427
bin = *options.challenge;

0 commit comments

Comments
 (0)