8000 cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets by hebasto · Pull Request #32019 · bitcoin/bitcoin · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

cmake: Check for makensis and zip tools before using them for optional deploy targets #32019

New issue 8000

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 18, 2025

Conversation

hebasto
Copy link
Member
@hebasto hebasto commented Mar 7, 2025

For x86_64-w64-mingw32 and *-apple-darwin targets, the optional deploy target requires dedicated tools: makensis and zip, respectively.

This PR introduces a uniform checks for those tools when attempting to build the deploy target, ensuring they are not required for configuring and building any other targets.

Here is an example of workflow for x86_64-w64-mingw32:

$ # `nsis` is not installed
$ cmake -B build -G "GNU Makefiles" --toolchain depends/x86_64-w64-mingw32/toolchain.cmake
$ cmake --build build -j $(nproc)
$ cmake --build build -t deploy

Error: NSIS not found.
Please install NSIS and/or ensure that its executable is accessible to the find_program() command—
for example, by setting the MAKENSIS_EXECUTABLE variable or another relevant CMake variable.
Then re-run cmake to regenerate the build system.

Built target deploy
$ sudo apt install nsis
$ cmake -B build
$ cmake --build build -t deploy
...
[100%] Generating bitcoin-win64-setup.exe
[100%] Built target deploy

Fixes #32018.

@DrahtBot
Copy link
Contributor
DrahtBot commented Mar 7, 2025

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/32019.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hodlinator, fanquake
Stale ACK laanwj, mabu44

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

Conflicts

Reviewers, this pull request conflicts with the following ones:

  • #31375 (multiprocess: Add bitcoin wrapper executable by ryanofsky)

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.

Copy link
Contributor
@hodlinator hodlinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tACK deea098

Tested on WSL.

Without:

$ cmake --build build --target deploy -j16
...
[100%] Generating bitcoin-win64-setup.exe
gmake[3]: makensis: No such file or directory
gmake[3]: *** [CMakeFiles/deploy.dir/build.make:81: bitcoin-win64-setup.exe] Error 127
gmake[2]: *** [CMakeFiles/Makefile2:530: CMakeFiles/deploy.dir/all] Error 2
gmake[1]: *** [CMakeFiles/Makefile2:537: CMakeFiles/deploy.dir/rule] Error 2
gmake: *** [Makefile:244: deploy] Error 2

With PR (but still no nsis installed):

$ cmake --build build --target deploy -j16
...
CMake Error at cmake/module/Maintenance.cmake:49 (find_program):
  Could not find MAKENSIS_EXECUTABLE using the following names: makensis
Call Stack (most recent call first):
  CMakeLists.txt:628 (add_windows_deploy_target)

Works after installing nsis.

Copy link
Member
@laanwj laanwj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code review ACK deea098

@mabu44
Copy link
mabu44 commented Mar 8, 2025

tACK deea098

Got same result as @hodlinator on Debian.

@fanquake
Copy link
Member
fanquake commented Mar 9, 2025

Now that nsis is required, the docs about installing nsis in build-windows.md should be updated.

@hebasto
Copy link
Member Author
hebasto commented Mar 9, 2025

Now that nsis is required, the docs about installing nsis in build-windows.md should be updated.

Thanks for pointing this out!

Since the deploy target is optional, the NSIS tool shouldn't be a strict requirement for a successful configuration.

I've reworked this PR so that the error message "Error: NSIS not found" is only printed when attempting to build the deploy target.

@hebasto hebasto marked this pull request as draft March 9, 2025 16:35
@hebasto hebasto marked this pull request as ready for review March 9, 2025 16:39
@fanquake
Copy link
Member
fanquake commented Mar 9, 2025

the NSIS tool shouldn't be a strict requirement for a successful configuration.

Then the same should be done for macOS and zip, otherwise it's still inconsistent.

@DrahtBot DrahtBot removed the CI failed label Mar 9, 2025
@hebasto hebasto changed the title cmake: Check for makensis tool before using it cmake: Check for makensis and zip tools before using them for optional deploy targets Mar 9, 2025
@hebasto
Copy link
Member Author
hebasto commented Mar 9, 2025

the NSIS tool shouldn't be a strict requirement for a successful configuration.

Then the same should be done for macOS and zip, otherwise it's still inconsistent.

Sure thing! Added.

The PR description has been updated.

Copy link
Contributor
@hodlinator hodlinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-ACK 0ecd2e0

Good that nsis and zip could be made optional unless deploying.

Only re-tested Windows-side, but Mac side diff looks equivalent.

Without nsis:

/mnt/c/Users/hodlinator/bitcoin$ cmake --build build --target deploy
Error: NSIS not found
Built target deploy

I needed to re-run cmake -B build --toolchain depends/x86_64-w64-mingw32/toolchain.cmake for the build to pick up that makensis was available. It would be good if we could invalidate the cache upon failure, or indicate in the error message that one has to regenerate the build config.

@DrahtBot DrahtBot requested a review from laanwj March 10, 2025 12:59
@hebasto
Copy link
Member Author
hebasto commented Mar 10, 2025

re-ACK 0ecd2e0

Good that nsis and zip could be made optional unless deploying.

Only re-tested Windows-side, but Mac side diff looks equivalent.

Without nsis:

/mnt/c/Users/hodlinator/bitcoin$ cmake --build build --target deploy
Error: NSIS not found
Built target deploy

I needed to re-run cmake -B build --toolchain depends/x86_64-w64-mingw32/toolchain.cmake for the build to pick up that makensis was available. It would be good if we could invalidate the cache upon failure

I had exactly the same idea while working on this implementation (also see a discussion in #31942). But the configuration step should be re-run after installing a dependency to let the deploy target choose another implementation.

Perhaps @purpleKarrot could suggest a better approach?

or indicate in the error message that one has to regenerate the build config.

Agree. Mind suggesting a wording for the error message?

@hodlinator
Copy link
Contributor

or indicate in the error message that one has to regenerate the build config.

Agree. Mind suggesting a wording for the error message?

Felt I was going out on a limb using the term "build config", was thinking something like:

Error: NSIS not found. Install it (make it available to find_program()) and regenerate the build config.

@hebasto
Copy link
Member Author
hebasto commented Mar 10, 2025

Addressed the feedback from @hodlinator. Thank you!

@Sjors
Copy link
Member
Sjors commented Mar 10, 2025

Tested on macOS 15.3.1 that cmake --build build --target deploy still works. It's impossible (?) to test the missing condition, because/usr/bin/zip comes with the OS and not even sudo can delete it. Seems fine to check though, because who knows what Apple does in their next OS upgrade. And I guess this also covers cross and guix compiling?

@Sjors
Copy link
Member
Sjors commented Mar 10, 2025

Oh this code path isn't used at all when building natively? E.g. on macOS I can do ZIP_EXECUTABLE=$HOME/temp/zip2 cmake --build build --target deploy which doesn't fail.

@hebasto
Copy link
Member Author
hebasto commented Mar 10, 2025

Oh this code path isn't used at all when building natively?

Correct.

@laanwj
Copy link
Member
laanwj commented Mar 10, 2025

Tested windows path without NSIS

$ ninja -j4
[224/224] Linking CXX executable src/test/test_bitcoin.exe (successful build)
$ ninja deploy
[1/1] cd /home/user/src/bitcoin-windows/build && /usr/bin/cmake -E echo && /usr/bin/cm... -E echo "Then re-run cmake to regenerate the build system." && /usr/bin/cmake -E echo

Error: NSIS not found.
Please install NSIS and/or ensure that its executable is accessible to the find_program() command—
for example, by setting the MAKENSIS_EXECUTABLE variable or another relevant CMake variable.
Then re-run cmake to regenerate the build system.

Configuration and build succeeds, but deploy fails with a message. This is the expected behavior.

@purpleKarrot
Copy link
Contributor

Perhaps @purpleKarrot could suggest a better approach?

CPack?

find_program(MAKENSIS_EXECUTABLE makensis)
if(NOT MAKENSIS_EXECUTABLE)
add_custom_target(deploy
COMMAND ${CMAKE_COMMAND} -E echo
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0~ This seems far too verbose/exposing implementation details, and we don't do this for any other dep.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the code is noisy, but like that the text is precise, could skip the example though. Tried to make the code less noisy too but best I could come up with while still using echo was:

        COMMAND ${CMAKE_COMMAND} -E echo &&
                ${CMAKE_COMMAND} -E echo "Error: NSIS not found." &&
                ${CMAKE_COMMAND} -E echo "Please install NSIS and/or ensure that its executable is accessible to the find_program() command." &&
                ${CMAKE_COMMAND} -E echo "Then re-run cmake to regenerate the build system." &&
                ${CMAKE_COMMAND} -E echo

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems far too verbose...

Having an optional dependency, the absence of which is revealed during the configuration stage, is quite unusual and requires better communication to the user.

This seems ... exposing implementation details

MAKENSIS_EXECUTABLE is a cache variable that the user is expected to set when necessary, like any other cache variable. It cannot be considered as "implementation details".

we don't do this for any other dep

Other deps are handled during the configuration step, which differs from this scenario with optional dependencies.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

find_program() command.

Details like this are completely unnecessary.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We also don't do this for other similar targets, like docs. Where we just print "Error: Doxygen not found".

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i kind of liked the mention of MAKENSIS_EXECUTABLE, it is my experience that it can be frustrating to find out what exact environment variable to set to point the build system at the right locations if you don't have everything installed in standard locations.

But yes maybe error messages aren't the best place for documentation.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Reworked.

@hebasto
Copy link
Member Author
hebasto commented Mar 11, 2025

Perhaps @purpleKarrot could suggest a better approach?

CPack?

# TODO: Consider replacing this code with the CPack NSIS Generator.
# See https://cmake.org/cmake/help/latest/cpack_gen/nsis.html
:)

Copy link
Contributor
@hodlinator hodlinator left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

re-ACK b86eb5f

Would prefer something a bit more terse as mentioned in #32019 (comment), but not a blocker for me.

@hebasto
Copy link
Member Author
hebasto commented Mar 13, 2025

The recent feedback regarding verbosity has been addressed.

All error messages about a missed optional executable are now consistent.

Rebased on top of #31161.

@hodlinator
Copy link
Contributor

re-ACK 1f9b2e1

We're back to an exact copy of 0ecd2e0, only rebased, which I previously ACKed.

If you retouch and have remaining patience I would still prefer:

Error: NSIS not found
Satisfy the dependency and re-run CMake to regenerate the build system.

Tried to figure out a way to get cmake to return an error code after printing the error, but without success.

@fanquake fanquake added this to the 29.0 milestone Mar 14, 2025
Copy link
Member
@fanquake fanquake left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 1f9b2e1

@fanquake fanquake merged commit d61a847 into bitcoin:master Mar 18, 2025
18 checks passed
@hebasto hebasto deleted the 250307-makensis branch March 18, 2025 09:17
stickies-v added a commit to stickies-v/py-bitcoinkernel that referenced this pull request Mar 21, 2025
29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate
b7733085a90 kernel: Add functions to get the block hash from a block
a4f79616064 kernel: Add block index utility functions to C header
0a0062b85a7 kernel: Add function to read block undo data from disk to C header
e49808a42d3 kernel: Add functions to read block from disk to C header
2f54bd53745 kernel: Add function for copying block data to C header
c34ecbefbd8 kernel: Add functions for the block validation state to C header
0b46337ebe3 kernel: Add validation interface to C header
4c7a81a030e kernel: Add interrupt function to C header
edf1d56fc05 kernel: Add import blocks function to C header
894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header
157de0eccd3 kernel: Add options for reindexing in C header
bdff17958b1 kernel: Add block validation to C header
c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager
031a96dc6b7 kernel: Add chainstate manager option for setting worker threads
c2f03a11251 kernel: Add chainstate manager object to C header
18ec1cc195b kernel: Add notifications context option to C header
e3b03745f93 kernel: Add chain params context option to C header
ef426234c07 kernel: Add kernel library context object
2c5e6b55922 kernel: Add logging to kernel library C header
20f1f67de07 kernel: Introduce initial kernel C header API
998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths
aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span
ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit
7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes
780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than
e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4
e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest
387385ba1ed test: replace assert with assert_equal and assert_greater_than
d190f0facc8 test, contrib: Fix signer/miner command line escaping
223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments
0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths
d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets
cec14ee47d7 test: switch wallet_crosschain.py to signet
9c2951541c2 test: drop testnet4 from wallet_crosschain.py
14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction
ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy
c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache
6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets`
257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful
6f9f415a4fa doc: shallow clone qa-assets
db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes
c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN
24fd0235e45 Update leveldb subtree to latest upstream
a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086
a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17)
5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions
52482cb2440 test: Check datadir cleanup after assumeutxo was successful
7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes
cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py
70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py
54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux
83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive
ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping
ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders
51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation
fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit
fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast
20fe41e9e83 test: avoid disk space warning for non-regtest
2819c514825 test: Use rpc_deprecated only for testing deprecation
7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy
9157d9e4498 build: use make < 3.82 syntax for define directive
36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py
fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping
fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping
02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py
1f9b2e150ce cmake: Require `zip` only for `deploy` target
0aeff299513 cmake: Check for `makensis` tool before using it
fa3b4427158 ci: Use Cirrus dockerfile cache
ffff4a293ad bench: Update span-serialize comment
fa4d6ec97bc refactor: Avoid false-positive gcc warning
fa942332b40 scripted-diff: Bump copyright headers after std::span changes
fa0c6b7179c refactor: Remove unused Span alias
fade0b5e5e6 scripted-diff: Use std::span over Span
fadccc26c03 refactor: Make Span an alias of std::span
fa27e36717e test: Fix broken span_tests
fadf02ef8bf refactor: Return std::span from MakeUCharSpan
fa720b94be1 refactor: Return std::span from MakeByteSpan
3301d2cbe8c qa: Wait for txindex to avoid race condition
9bfb0d75ba1 qa: Remove unnecessary -txindex args
7ac281c19cd qa: Add missing coverage of corrupt indexes
d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often
bad1433ef2b fuzz: Always restrict base conversion input lengths
21e9d39a372 docs: add release notes for 31603
a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys
c7afca3d62c test: descriptor: check whitespace into keys
cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner
4cd95a29218 refactor: modernize remaining outdated trait patterns
ab2b67fce20 scripted-diff: modernize outdated trait patterns - values
8327889f358 scripted-diff: modernize outdated trait patterns - types
50856695ef6 test: fix descriptors in `ismine_tests`
REVERT: 2dc27e2860b kernel: Add pure kernel bitcoin-chainstate
REVERT: 338126c048f kernel: Add functions to get the block hash from a block
REVERT: 56345a77968 kernel: Add block index utility functions to C header
REVERT: 9530f65d19b kernel: Add function to read block undo data from disk to C header
REVERT: f63860169fb kernel: Add functions to read block from disk to C header
REVERT: f3aa1f9bf0c kernel: Add function for copying block data to C header
REVERT: a70be77c908 kernel: Add functions for the block validation state to C header
REVERT: e4e3dc585a3 kernel: Add validation interface to C header
REVERT: d3c48b2bdc6 kernel: Add interrupt function to C header
REVERT: 7afbc516054 kernel: Add import blocks function to C header
REVERT: bad89c8b30b kernel: Add chainstate load options for in-memory dbs in C header
REVERT: 1dcedf3da97 kernel: Add options for reindexing in C header
REVERT: aeb68c7f022 kernel: Add block validation to C header
REVERT: 99136eb1656 kernel: Add chainstate loading when instantiating a ChainstateManager
REVERT: 0a2117ed501 kernel: Add chainstate manager option for setting worker threads
REVERT: 599dc235e98 kernel: Add chainstate manager object to C header
REVERT: f280a5f3ab8 kernel: Add notifications context option to C header
REVERT: 6701d12b017 kernel: Add chain params context option to C header
REVERT: f40f037a9cd kernel: Add kernel library context object
REVERT: 7a6c5c7abf2 kernel: Add logging to kernel library C header
REVERT: 4d663446de1 kernel: Introduce initial kernel C header API

git-subtree-dir: depend/bitcoin
git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
stickies-v added a commit to stickies-v/py-bitcoinkernel that referenced this pull request Mar 21, 2025
29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate
b7733085a90 kernel: Add functions to get the block hash from a block
a4f79616064 kernel: Add block index utility functions to C header
0a0062b85a7 kernel: Add function to read block undo data from disk to C header
e49808a42d3 kernel: Add functions to read block from disk to C header
2f54bd53745 kernel: Add function for copying block data to C header
c34ecbefbd8 kernel: Add functions for the block validation state to C header
0b46337ebe3 kernel: Add validation interface to C header
4c7a81a030e kernel: Add interrupt function to C header
edf1d56fc05 kernel: Add import blocks function to C header
894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header
157de0eccd3 kernel: Add options for reindexing in C header
bdff17958b1 kernel: Add block validation to C header
c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager
031a96dc6b7 kernel: Add chainstate manager option for setting worker threads
c2f03a11251 kernel: Add chainstate manager object to C header
18ec1cc195b kernel: Add notifications context option to C header
e3b03745f93 kernel: Add chain params context option to C header
ef426234c07 kernel: Add kernel library context object
2c5e6b55922 kernel: Add logging to kernel library C header
20f1f67de07 kernel: Introduce initial kernel C header API
998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths
aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span
ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit
7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes
780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than
e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4
e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest
387385ba1ed test: replace assert with assert_equal and assert_greater_than
d190f0facc8 test, contrib: Fix signer/miner command line escaping
223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments
0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths
d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets
cec14ee47d7 test: switch wallet_crosschain.py to signet
9c2951541c2 test: drop testnet4 from wallet_crosschain.py
14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction
ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy
c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache
6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets`
257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful
6f9f415a4fa doc: shallow clone qa-assets
db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes
c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN
24fd0235e45 Update leveldb subtree to latest upstream
a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086
a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17)
5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions
52482cb2440 test: Check datadir cleanup after assumeutxo was successful
7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes
cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py
70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py
54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux
83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive
ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping
ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders
51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation
fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit
fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast
20fe41e9e83 test: avoid disk space warning for non-regtest
2819c514825 test: Use rpc_deprecated only for testing deprecation
7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy
9157d9e4498 build: use make < 3.82 syntax for define directive
36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py
fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping
fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping
02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py
1f9b2e150ce cmake: Require `zip` only for `deploy` target
0aeff299513 cmake: Check for `makensis` tool before using it
fa3b4427158 ci: Use Cirrus dockerfile cache
ffff4a293ad bench: Update span-serialize comment
fa4d6ec97bc refactor: Avoid false-positive gcc warning
fa942332b40 scripted-diff: Bump copyright headers after std::span changes
fa0c6b7179c refactor: Remove unused Span alias
fade0b5e5e6 scripted-diff: Use std::span over Span
fadccc26c03 refactor: Make Span an alias of std::span
fa27e36717e test: Fix broken span_tests
fadf02ef8bf refactor: Return std::span from MakeUCharSpan
fa720b94be1 refactor: Return std::span from MakeByteSpan
3301d2cbe8c qa: Wait for txindex to avoid race condition
9bfb0d75ba1 qa: Remove unnecessary -txindex args
7ac281c19cd qa: Add missing coverage of corrupt indexes
d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often
bad1433ef2b fuzz: Always restrict base conversion input lengths
21e9d39a372 docs: add release notes for 31603
a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys
c7afca3d62c test: descriptor: check whitespace into keys
cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner
4cd95a29218 refactor: modernize remaining outdated trait patterns
ab2b67fce20 scripted-diff: modernize outdated trait patterns - values
8327889f358 scripted-diff: modernize outdated trait patterns - types
50856695ef6 test: fix descriptors in `ismine_tests`
REVERT: 2dc27e2860b kernel: Add pure kernel bitcoin-chainstate
REVERT: 338126c048f kernel: Add functions to get the block hash from a block
REVERT: 56345a77968 kernel: Add block index utility functions to C header
REVERT: 9530f65d19b kernel: Add function to read block undo data from disk to C header
REVERT: f63860169fb kernel: Add functions to read block from disk to C header
REVERT: f3aa1f9bf0c kernel: Add function for copying block data to C header
REVERT: a70be77c908 kernel: Add functions for the block validation state to C header
REVERT: e4e3dc585a3 kernel: Add validation interface to C header
REVERT: d3c48b2bdc6 kernel: Add interrupt function to C header
REVERT: 7afbc516054 kernel: Add import blocks function to C header
REVERT: bad89c8b30b kernel: Add chainstate load options for in-memory dbs in C header
REVERT: 1dcedf3da97 kernel: Add options for reindexing in C header
REVERT: aeb68c7f022 kernel: Add block validation to C header
REVERT: 99136eb1656 kernel: Add chainstate loading when instantiating a ChainstateManager
REVERT: 0a2117ed501 kernel: Add chainstate manager option for setting worker threads
REVERT: 599dc235e98 kernel: Add chainstate manager object to C header
REVERT: f280a5f3ab8 kernel: Add notifications context option to C header
REVERT: 6701d12b017 kernel: Add chain params context option to C header
REVERT: f40f037a9cd kernel: Add kernel library context object
REVERT: 7a6c5c7abf2 kernel: Add logging to kernel library C header
REVERT: 4d663446de1 kernel: Introduce initial kernel C header API

git-subtree-dir: depend/bitcoin
git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
stickies-v added a commit to stickies-v/py-bitcoinkernel that referenced this pull request Mar 21, 2025
29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate
b7733085a90 kernel: Add functions to get the block hash from a block
a4f79616064 kernel: Add block index utility functions to C header
0a0062b85a7 kernel: Add function to read block undo data from disk to C header
e49808a42d3 kernel: Add functions to read block from disk to C header
2f54bd53745 kernel: Add function for copying block data to C header
c34ecbefbd8 kernel: Add functions for the block validation state to C header
0b46337ebe3 kernel: Add validation interface to C header
4c7a81a030e kernel: Add interrupt function to C header
edf1d56fc05 kernel: Add import blocks function to C header
894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header
157de0eccd3 kernel: Add options for reindexing in C header
bdff17958b1 kernel: Add block validation to C header
c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager
031a96dc6b7 kernel: Add chainstate manager option for setting worker threads
c2f03a11251 kernel: Add chainstate manager object to C header
18ec1cc195b kernel: Add notifications context option to C header
e3b03745f93 kernel: Add chain params context option to C header
ef426234c07 kernel: Add kernel library context object
2c5e6b55922 kernel: Add logging to kernel library C header
20f1f67de07 kernel: Introduce initial kernel C header API
998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths
aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span
ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit
7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes
780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than
e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4
e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest
387385ba1ed test: replace assert with assert_equal and assert_greater_than
d190f0facc8 test, contrib: Fix signer/miner command line escaping
223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments
0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths
d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets
cec14ee47d7 test: switch wallet_crosschain.py to signet
9c2951541c2 test: drop testnet4 from wallet_crosschain.py
14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction
ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy
c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache
6245c235046 Merge bitcoin/bitcoin#32083: doc: shallow clone `qa-assets`
257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful
6f9f415a4fa doc: shallow clone qa-assets
db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes
c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN
24fd0235e45 Update leveldb subtree to latest upstream
a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086
a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17)
5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions
52482cb2440 test: Check datadir cleanup after assumeutxo was successful
7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes
cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py
70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py
54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux
83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive
ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping
ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders
51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation
fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit
fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast
20fe41e9e83 test: avoid disk space warning for non-regtest
2819c514825 test: Use rpc_deprecated only for testing deprecation
7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy
9157d9e4498 build: use make < 3.82 syntax for define directive
36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py
fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping
fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping
02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py
1f9b2e150ce cmake: Require `zip` only for `deploy` target
0aeff299513 cmake: Check for `makensis` tool before using it
fa3b4427158 ci: Use Cirrus dockerfile cache
ffff4a293ad bench: Update span-serialize comment
fa4d6ec97bc refactor: Avoid false-positive gcc warning
fa942332b40 scripted-diff: Bump copyright headers after std::span changes
fa0c6b7179c refactor: Remove unused Span alias
fade0b5e5e6 scripted-diff: Use std::span over Span
fadccc26c03 refactor: Make Span an alias of std::span
fa27e36717e test: Fix broken span_tests
fadf02ef8bf refactor: Return std::span from MakeUCharSpan
fa720b94be1 refactor: Return std::span from MakeByteSpan
3301d2cbe8c qa: Wait for txindex to avoid race condition
9bfb0d75ba1 qa: Remove unnecessary -txindex args
7ac281c19cd qa: Add missing coverage of corrupt indexes
d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often
bad1433ef2b fuzz: Always restrict base conversion input lengths
21e9d39a372 docs: add release notes for 31603
a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys
c7afca3d62c test: descriptor: check whitespace into keys
cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner
4cd95a29218 refactor: modernize remaining outdated trait patterns
ab2b67fce20 scripted-diff: modernize outdated trait patterns - values
8327889f358 scripted-diff: modernize outdated trait patterns - types
50856695ef6 test: fix descriptors in `ismine_tests`
REVERT: 2dc27e2860b kernel: Add pure kernel bitcoin-chainstate
REVERT: 338126c048f kernel: Add functions to get the block hash from a block
REVERT: 56345a77968 kernel: Add block index utility functions to C header
REVERT: 9530f65d19b kernel: Add function to read block undo data from disk to C header
REVERT: f63860169fb kernel: Add functions to read block from disk to C header
REVERT: f3aa1f9bf0c kernel: Add function for copying block data to C header
REVERT: a70be77c908 kernel: Add functions for the block validation state to C header
REVERT: e4e3dc585a3 kernel: Add validation interface to C header
REVERT: d3c48b2bdc6 kernel: Add interrupt function to C header
REVERT: 7afbc516054 kernel: Add import blocks function to C header
REVERT: bad89c8b30b kernel: Add chainstate load options for in-memory dbs in C header
REVERT: 1dcedf3da97 kernel: Add options for reindexing in C header
REVERT: aeb68c7f022 kernel: Add block validation to C header
REVERT: 99136eb1656 kernel: Add chainstate loading when instantiating a ChainstateManager
REVERT: 0a2117ed501 kernel: Add chainstate manager option for setting worker threads
REVERT: 599dc235e98 kernel: Add chainstate manager object to C header
REVERT: f280a5f3ab8 kernel: Add notifications context option to C header
REVERT: 6701d12b017 kernel: Add chain params context option to C header
REVERT: f40f037a9cd kernel: Add kernel library context object
REVERT: 7a6c5c7abf2 kernel: Add logging to kernel library C header
REVERT: 4d663446de1 kernel: Introduce initial kernel C header API

git-subtree-dir: depend/bitcoin
git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
TheCharlatan added a commit to TheCharlatan/rust-bitcoinkernel that referenced this pull request Mar 24, 2025
…f05b91cf8

29f05b91cf8 kernel: Add pure kernel bitcoin-chainstate
b7733085a90 kernel: Add functions to get the block hash from a block
a4f79616064 kernel: Add block index utility functions to C header
0a0062b85a7 kernel: Add function to read block undo data from disk to C header
e49808a42d3 kernel: Add functions to read block from disk to C header
2f54bd53745 kernel: Add function for copying block data to C header
c34ecbefbd8 kernel: Add functions for the block validation state to C header
0b46337ebe3 kernel: Add validation interface to C header
4c7a81a030e kernel: Add interrupt function to C header
edf1d56fc05 kernel: Add import blocks function to C header
894b9c20447 kernel: Add chainstate load options for in-memory dbs in C header
157de0eccd3 kernel: Add options for reindexing in C header
bdff17958b1 kernel: Add block validation to C header
c52ca9447fc kernel: Add chainstate loading when instantiating a ChainstateManager
031a96dc6b7 kernel: Add chainstate manager option for setting worker threads
c2f03a11251 kernel: Add chainstate manager object to C header
18ec1cc195b kernel: Add notifications context option to C header
e3b03745f93 kernel: Add chain params context option to C header
ef426234c07 kernel: Add kernel library context object
2c5e6b55922 kernel: Add logging to kernel library C header
20f1f67de07 kernel: Introduce initial kernel C header API
998386d4462 Merge bitcoin/bitcoin#31866: test, refactor: Add TestNode.binaries to hold binary paths
aa87e0b4460 Merge bitcoin/bitcoin#31519: refactor: Use std::span over Span
ef525e8b7c1 Merge bitcoin/bitcoin#31457: fuzz: Speed up *_package_eval fuzz targets a bit
7d76c9725ca Merge bitcoin/bitcoin#31766: leveldb: pull upstream C++23 changes
780bcf80b5d Merge bitcoin/bitcoin#32091: test: replace assert with assert_equal and assert_greater_than
e568c1dd134 Merge bitcoin/bitcoin#32088: test: switch wallet_crosschain.py to signet and drop testnet4
e8f6a48e310 Merge bitcoin/bitcoin#32057: test: avoid disk space warning for non-regtest
387385ba1ed test: replace assert with assert_equal and assert_greater_than
d190f0facc8 test, contrib: Fix signer/miner command line escaping
223fc24c4eb Merge bitcoin/bitcoin#31603: descriptor: check whitespace in keys within fragments
0d2eefca8bf test, refactor: Add TestNode.binaries to hold binary paths
d61a847af0b Merge bitcoin/bitcoin#32019: cmake: Check for `makensis` and `zip` tools before using them for optional `deploy` targets
cec14ee47d7 test: switch wallet_crosschain.py to signet
9c2951541c2 test: drop testnet4 from wallet_crosschain.py
14fec6380dd Merge bitcoin/bitcoin#32059: test: Update coverage.cpp to drop linux restriction
ece0b41da6d Merge bitcoin/bitcoin#32087: ci: Drop ENABLE_HARDENING=OFF from clang-tidy
c9b633d1190 Merge bitcoin/bitcoin#31948: ci: [lint] Use Cirrus dockerfile cache
6245c235046 Merge bitco
3D11
in/bitcoin#32083: doc: shallow clone `qa-assets`
257fd27e4bb Merge bitcoin/bitcoin#32033: test: Check datadir cleanup after assumeutxo was successful
6f9f415a4fa doc: shallow clone qa-assets
db2c57ae9ee Merge bitcoin-core/gui#858: qt: doc: adapt outdated binary paths to CMake changes
c8fab356171 ci: remove -Wno-error=deprecated-declarations from ASAN
24fd0235e45 Update leveldb subtree to latest upstream
a130bbd154d Squashed 'src/leveldb/' changes from 04b5790928..4188247086
a799415d84d Merge bitcoin/bitcoin#31904: refactor: modernize outdated trait patterns using helper aliases (C++14/C++17)
5f4422d68dc Merge bitcoin/bitcoin#32010: qa: Fix TxIndex race conditions
52482cb2440 test: Check datadir cleanup after assumeutxo was successful
7ebc458a8cb qt: doc: adapt outdated binary paths to CMake changes
cd8089c20ba Merge bitcoin/bitcoin#32069: test: fix intermittent failure in wallet_reorgsrestore.py
70a0ee89c67 Merge bitcoin/bitcoin#32063: test: fix intermittent failure in p2p_orphan_handling.py
54e6eacc1fc test: Enable ResetCoverageCounters beyond Linux
83a9e55ae16 Merge bitcoin/bitcoin#32070: build: use make < 3.82 syntax for define directive
ca05b28710a Merge bitcoin/bitcoin#31859: test: Rename send_message to send_without_ping
ab2df1726ed Merge bitcoin/bitcoin#31917: fuzz: provide more realistic values to the base58(check) decoders
51a20e56c2f Merge bitcoin/bitcoin#31977: test: Use rpc_deprecated only for testing deprecation
fac3d93c2ba fuzz: Speed up *_package_eval fuzz targets a bit
fa40fd043ab fuzz: [refactor] Avoid confusing c-style cast
20fe41e9e83 test: avoid disk space warning for non-regtest
2819c514825 test: Use rpc_deprecated only for testing deprecation
7d34c19853e ci: Drop ENABLE_HARDENING=OFF from clang-tidy
9157d9e4498 build: use make < 3.82 syntax for define directive
36b0713edc4 test: fix intermittent failure in wallet_reorgsrestore.py
fa9cf38ab66 scripted-diff: test: Rename send_message to send_without_ping
fa4356717d6 test: Prefer send_and_ping over send_message+sync_with_ping
02942056fd8 test: fix intermittent failure in p2p_orphan_handling.py
1f9b2e150ce cmake: Require `zip` only for `deploy` target
0aeff299513 cmake: Check for `makensis` tool before using it
fa3b4427158 ci: Use Cirrus dockerfile cache
ffff4a293ad bench: Update span-serialize comment
fa4d6ec97bc refactor: Avoid false-positive gcc warning
fa942332b40 scripted-diff: Bump copyright headers after std::span changes
fa0c6b7179c refactor: Remove unused Span alias
fade0b5e5e6 scripted-diff: Use std::span over Span
fadccc26c03 refactor: Make Span an alias of std::span
fa27e36717e test: Fix broken span_tests
fadf02ef8bf refactor: Return std::span from MakeUCharSpan
fa720b94be1 refactor: Return std::span from MakeByteSpan
3301d2cbe8c qa: Wait for txindex to avoid race condition
9bfb0d75ba1 qa: Remove unnecessary -txindex args
7ac281c19cd qa: Add missing coverage of corrupt indexes
d5537c18a90 fuzz: make sure DecodeBase58(Check) is called with valid values more often
bad1433ef2b fuzz: Always restrict base conversion input lengths
21e9d39a372 docs: add release notes for 31603
a8b548d75d9 test: `getdescriptorinfo`/`importdescriptors` with whitespace in pubkeys
c7afca3d62c test: descriptor: check whitespace into keys
cb722a3cea1 descriptor: check whitespace in ParsePubkeyInner
4cd95a29218 refactor: modernize remaining outdated trait patterns
ab2b67fce20 scripted-diff: modernize outdated trait patterns - values
8327889f358 scripted-diff: modernize outdated trait patterns - types
50856695ef6 test: fix descriptors in `ismine_tests`
REVERT: 5991a69ee00 kernel: Add pure kernel bitcoin-chainstate
REVERT: 05b7d136684 kernel: Add functions to get the block hash from a block
REVERT: f18c792d843 kernel: Add block index utility functions to C header
REVERT: 89f5bf04673 kernel: Add function to read block undo data from disk to C header
REVERT: b4f71fc64e7 kernel: Add functions to read block from disk to C header
REVERT: 41306f081ad kernel: Add function for copying  block data to C header
REVERT: 9385d9fc87e kernel: Add functions for the block validation state to C header
REVERT: 0bd9a710358 kernel: Add validation interface to C header
REVERT: 432710f3fc3 kernel: Add interrupt function to C header
REVERT: cb164ae1eb2 kernel: Add import blocks function to C header
REVERT: abd67fd93d0 kernel: Add chainstate load options for in-memory dbs in C header
REVERT: b98c2748e94 kernel: Add options for reindexing in C header
REVERT: 9d0efe1fc86 kernel: Add block validation to C header
REVERT: 87e364fc1ec kernel: Add chainstate loading when instantiating a ChainstateManager
REVERT: df1599b2d2a kernel: Add chainstate manager option for setting worker threads
REVERT: fb767002e97 kernel: Add chainstate manager object to C header
REVERT: 10b0fad2fd3 kernel: Add notifications context option to C header
REVERT: 39e7ad8d0dc kernel: Add chain params context option to C header
REVERT: 6285c353b89 kernel: Add kernel library context object
REVERT: 98d10160b6a kernel: Add logging to kernel library C header
REVERT: 4d663446de1 kernel: Introduce initial kernel C header API

git-subtree-dir: libbitcoinkernel-sys/bitcoin
git-subtree-split: 29f05b91cf8a479e403b0322afeb5ff1133da221
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cmake: makensis isn't checked-for before use
8 participants
0