Update the relevant variables in src/chainparams.cpp for mainnet, testnet, and signet as given here.
To review this PR, check out this guide.
Note: added a 10% overhead to the base value of mainnet in m_assumed_blockchain_size
Update the relevant variables in src/chainparams.cpp for mainnet, testnet, and signet as given here.
To review this PR, check out this guide.
Note: added a 10% overhead to the base value of mainnet in m_assumed_blockchain_size
Note: 10% overhead to the base value of `mainnet` in `m_assumed_blockchain_size`
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415, checked against my node 🌮
<details><summary>Show signature and timestamp</summary>
Signature:
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415, checked against my node 🌮
-----BEGIN PGP SIGNATURE-----
iQGzBAEBCgAdFiEE+rVPoUahrI9sLGYTzit1aX5ppUgFAlwqrYAACgkQzit1aX5p
pUio0Av/T1U3uYofh+177Fxc7FtIiv+Am/nWVIc9dJCZuLH/JD+5dbuRmPJjbPf2
8oQOvABSmIdiUlAC1En9NN7fcwhVnYszzIyJj6ZddstTfJ2amMgzBOJQBFFCG6Jr
Np1bpdYC0DOjJuLjUMFIumBZ9v+zGn9jjMwN2jPbZZmVgqxnmY31b1WGFq/cp0Kb
IfHCX7s+tlc3XE85Pz8xevrzQG7sW4mFYaunTVeOMrF1O1Aiyea5rguO3w/0rFQC
brJIPjeNDKBDA5N4EpKrXEJg5LvzLDFtV4aZlvlMcf0DelzblGwLKkuIPtsr0bwm
cNhDNF3d/PnMbw+78eU7xo1Yd+10/MPeHqkzess/4w49ZsvgNPb6MC1gZqVQCrUg
nfYR9pOobli3LOQTJJLAo1bivil5Oi0t0GS0eGUhNC1hGlIYek+TdpV1lprGvlvf
HlqFLJRUQmkAbtNENu7IDIP/z4cMSCvARIgAXzYoEN5Yaq3mp571GQjM5agYkAMV
swQyDggZ
=JygT
-----END PGP SIGNATURE-----
Timestamp of file with hash 3c7e2e6989616ff21b62fc11616445232fa5732e9be16947454f63900bce377d -
</details>
I checked all networks, to clarify. The unchanged file sizes were still up-to-date.
ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415 (jamesob/ackr/22499.1.sriramdvt.update_assumed_chain_par)
Built locally, verified CMainParams value changes (but not regtest) using
getchaintxstats/getblockheader for block
00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad on my node.
<details><summary>Show signature data</summary> <p>
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415 ([`jamesob/ackr/22499.1.sriramdvt.update_assumed_chain_par`](https://github.com/jamesob/bitcoin/tree/ackr/22499.1.sriramdvt.update_assumed_chain_par))
Built locally, verified `CMainParams` value changes (but not regtest) using
`getchaintxstats`/`getblockheader` for block
`00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad` on my node.
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCgAdFiEEGNRVI1NPYuZCSIrGepNdrbLETwUFAmD12TEACgkQepNdrbLE
TwXGFQ//XYIo/NYpm70jdXp8oHncRFoahF0fb7M0mDRdlemYfaNs0rv+czuRM6oK
/1uCyFI5uveAQ1XxvFhxYqyvz+xvzO1ifhj+N/6Zj/xWGWcLmJaPo6quXNam17PB
3IszwgNPLOUbtmYzwDaA0x2/mSpBGlDW5cXoflOClEAVSzasrUTvSHWyTQFTO2oJ
byipzYF2yN7M+OPpHRSq8XwrcigyzY6LYLmg2xT9+JekH2p0fuPVlgSiJF+wvAzA
yRt5dQGR0nhRgmUZOSlYRCz0XPcBO6yq0s3PBFh31HYwXgPog4fEI+e1f4tQN4Q+
Ux/5ydbDKiiwgjwNrt6BKJXyPgXWZmhPjBNaAA3ygqBKSsURbaiZK0Ywq90CKWfx
OA548wCUJafeSqrfwaszNzvelpynSr8O4kZWs7wdySN5w9U6VNqBF0nYuNo6E5CY
GaC8GmFUMTTMV+oHkH+yJQLKnMdI7YvXnKbrcT43uOfonNd+70PnSjJLNfIB/PJj
XBeTh/sokbiDE0OOhq3nVX0iwrmtM6VpyrHK1wtFKfo0j3bjDR8ksqdgVQvrmJTe
7TFhh37We9mR2ZdTH6w2UH0vobArFEfcPIisoKAoWK4OvCAA6LMoEo8jIM68zKYN
RAx1LgzXIYdc4iRu56PZ83iHBfLofnUgD0hRalo9YjUS7X4guGo=
=u36D
-----END PGP SIGNATURE-----
</p></details>
<details><summary>Show platform data</summary> <p>
Tested on Linux-4.19.0-17-amd64-x86_64-with-glibc2.28
Configured with ./configure LDFLAGS=-L/home/james/src/bitcoin2/db4/lib/ CPPFLAGS=-I/home/james/src/bitcoin2/db4/include/ CXXFLAGS=-fPIE -pipe -O2 -g -Wthread-safety-analysis -Wall -Werror=sign-compare -Wsign-compare -Werror=thread-safety-analysis --enable-wallet --enable-debug --with-daemon --enable-natpmp-default CXX=/usr/local/bin/clang++ CC=/usr/local/bin/clang PYTHONPATH= --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --enable-module-schnorrsig --enable-experimental --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --enable-module-schnorrsig --enable-experimental --no-create --no-recursion
Compiled with /usr/bin/ccache /usr/local/bin/clang++ -std=c++17 -mavx -mavx2 -fPIE -pipe -O2 -g -Wthread-safety-analysis -Wall -Werror=sign-compare -Wsign-compare -Werror=thread-safety-analysis -O0 -g3 -ftrapv -fdebug-prefix-map=$(abs_srcdir)=. -Wstack-protector -fstack-protector-all -fcf-protection=full -fstack-clash-protection -msse4 -msha -msse4.1 -msse4.2 i
Compiler version: Debian clang version 11.1.0-++20210428103820+1fdec59bffc1-1~exp1~20210428204437.162
</p></details>
I verified CMainParams value changes according to this guide using block header
00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad on my node.
I did not verify testnet or signet.
<details> <summary>Click to expand cli output</summary>
$ bitcoin-cli getchaintxstats 4096 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad
{
"time": 1626697539,
"txcount": 656509474,
"window_final_block_hash": "00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad",
"window_final_block_height": 691719,
"window_block_count": 4096,
"window_tx_count": 7217053,
"window_interval": 2976202,
"txrate": 2.424920418708139
}
$ bitcoin-cli getblockheader 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad
{
"hash": "00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad",
"confirmations": 73,
"height": 691719,
"version": 536870916,
"versionHex": "20000004",
"merkleroot": "9ba2c77c80e141c76ea15d9f38973d729eb2d437d9f75f986e50a502ce609b69",
"time": 1626697539,
"mediantime": 1626694708,
"nonce": 1396531224,
"bits": "17149624",
"difficulty": 13672594272814.14,
"chainwork": "00000000000000000000000000000000000000001fa4663bbbe19f82de910280",
"nTx": 133,
"previousblockhash": "0000000000000000000173ead0a321a58ab36b33b0c491283ef6bc09ee47fe49",
"nextblockhash": "0000000000000000000070d93e17d3659cda3daa72c2234e628c45569d2476c0"
}
</details>
ACK eeddd1c - checked against mainnet
$ bitcoin-cli getchaintxstats 4096 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad | jq '{time,txcount,txrate}'
{
"time": 1626697539,
"txcount": 656509474,
"txrate": 2.424920418708139
}
$ bitcoin-cli getblockheader 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad | jq '{hash, height,chainwork}'
{
"hash": "00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad",
"height": 691719,
"chainwork": "00000000000000000000000000000000000000001fa4663bbbe19f82de910280"
}
Code Review ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415
Checked against my node.
ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415 mainnet and testnet
ACK mainnet, testnet, and signet eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415
Did not check the updated m_assumed_blockchain_size and did not run with reindex-chainstate & assumevalid=0 as mentioned in https://github.com/bitcoin/bitcoin/blob/master/doc/release-process.md#before-branch-off:
This update should be reviewed with a reindex-chainstate with assumevalid=0 to catch any defect that causes rejection of blocks in the past history.
assumevalid=0
Assuming that the previous assumevalid was valid, then just syncing to the tip should be sufficient. Obviously running assumevalid=0 is still useful to catch rejection of past blocks, but this seems unrelated to bumping the assumevalid value.
post-merge ACK eeddd1c8fa96cf546b0bf92063cefa4fd8c6b415 ⛓️ checked updated parameters for mainnet, testnet and signet (modulo m_assumed_blockchain_size, as I have currently pruning enabled)
post-merge ACK mainnet eeddd1c
admin@raspberrypi:~ $ bitcoin-cli getchaintxstats 4096 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad | jq '{time,txcount,txrate}'
{
"time": 1626697539,
"txcount": 656509474,
"txrate": 2.424920418708139
}
admin@raspberrypi:~ $ bitcoin-cli getblockheader 00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad | jq '{hash, height,chainwork}'
{
"hash": "00000000000000000008a89e854d57e5667df88f1cdef6fde2fbca1de5b639ad",
"height": 691719,
"chainwork": "00000000000000000000000000000000000000001fa4663bbbe19f82de910280"
}
Milestone
22.0