This PR is a small follow-up for #28052, adding support for the block linearization script to handle XORed blocksdir *.dat files. Note that if no xor.dat file exists, the XOR pattern is set to all-zeros, in order to still support blockdirs that have been created with versions earlier than 28.x.
Partly fixes issue #30599.
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
For detailed information about the code coverage, see the test coverage report.
See the guideline for information on the review process.
| Type | Reviewers |
|---|---|
| ACK | tdb3, hodlinator, achow101 |
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.
Partly fixes issue #30599.
🚧 At least one of the CI tasks failed. Debug: https://github.com/bitcoin/bitcoin/runs/28486114479
Make sure to run all tests locally, according to the documentation.
The failure may happen due to a number of reasons, for example:
Possibly due to a silent merge conflict (the changes in this pull request being incompatible with the current code in the target branch). If so, make sure to rebase on the latest commit of the target branch.
A sanitizer issue, which can only be found by compiling with the sanitizer and running the affected test.
An intermittent issue.
Leave a comment here, if you need help tracking down a confusing failure.
ACK 77ff0ec1f185b818b30877de2bedc1750319e6c4 Nice work. Simplifies the test and enhances chain archive capability.
In addition to running unit/functionals locally (passed) and light code review, performed some sanity checks:
linearize-data.py (successful)-loadblock=/path/to/bootstrap.dat -blocksxor=0 (successful restore), then stopped bitcoindxor.dat from the regtest/blocks/linearize-data.py (successful)-loadblock=/path/to/bootstrap.dat (successful restore), then stopped bitcoind
ACK 77ff0ec1f185b818b30877de2bedc1750319e6c4
Good to see follow-up work for #28052 being carried out.
1cbc5ae87a8efe44226080ceaaaf10c5575d629d explains purpose of linearize-scripts (as it was not immediately apparent to me). Could be cherry-picked into this PR, or left for a further follow-up.
bitcoind -regtest &bitcoin-cli -regtest getblockcount returns height=120.contrib/linearize/linearize-hashes.py contrib/linearize/example-linearize.cfg > hashlist.txt (with modified .cfg).pkill bitcoindcontrib/linearize/linearize-data.py contrib/linearize/example-linearize.cfgmv ~/.bitcoin/regtest/ ~/regtest_oldbitcoind -regtest &bitcoin-cli -regtest getblockcount returns height=0.pkill bitcoindbitcoind -regtest -loadblock=/home/hodlinator/bootstrap.datbitcoin-cli -regtest getblockcount returns the original height=120.Edit: Also passed unit & functional tests locally.
