diff options
| author | fanquake <fanquake@gmail.com> | 2023-04-20 11:21:33 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-04-20 11:23:13 +0100 |
| commit | 3133d935ce95c9576856b0b4350cbcdf23df31c4 (patch) | |
| tree | 2a26ef012713124bde88c15b0a4fa2e997476384 /contrib | |
| parent | b6279243002a4bca2c87bd366dc908747aa5b513 (diff) | |
| parent | a2bef805c11a4ab391f4ea635bfde7dd2ec9ce81 (diff) | |
Merge bitcoin/bitcoin#27482: kernel: chainparams updates for 25.x
a2bef805c11a4ab391f4ea635bfde7dd2ec9ce81 kernel: update m_assumed_* chain params for 25.x (fanquake)
4128e01dbaa630396b0e7576ee8a1987267f77b9 kernel: update chainTxData for 25.x (fanquake)
00b2b114b442835c863e7772348cb1d1881ba0f2 kernel: update nMinimumChainWork & defaultAssumeValid for 25.x (fanquake)
07fcc0a82cfd08c991f61c2340630f0c4659a3a0 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 a2bef805c11a4ab391f4ea635bfde7dd2ec9ce81
josibake:
ACK https://github.com/bitcoin/bitcoin/pull/27482/commits/a2bef805c11a4ab391f4ea635bfde7dd2ec9ce81
gruve-p:
ACK https://github.com/bitcoin/bitcoin/pull/27482/commits/a2bef805c11a4ab391f4ea635bfde7dd2ec9ce81
dergoegge:
ACK a2bef805c11a4ab391f4ea635bfde7dd2ec9ce81 on the new mainnet params
Tree-SHA512: 0b19c2ef15c6b15863d6a560a1053ee223057c7bfb617ffd3400b1734cee8f75bc6fd7f04d8f8e3f5af6220659a1987951a1b36945d6fe17d06972004fd62610
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/seeds/generate-seeds.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/seeds/generate-seeds.py b/contrib/seeds/generate-seeds.py index a6f435af0d..e921757802 100755 --- a/contrib/seeds/generate-seeds.py +++ b/contrib/seeds/generate-seeds.py @@ -3,7 +3,7 @@ # Distributed under the MIT software license, see the accompanying # file COPYING or http://www.opensource.org/licenses/mit-license.php. ''' -Script to generate list of seed nodes for chainparams.cpp. +Script to generate list of seed nodes for kernel/chainparams.cpp. This script expects two text files in the directory that is passed as an argument: |