Squashed 'libbitcoinkernel-sys/bitcoin/' changes from 5991a69ee00..29f05b91cf8

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: 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

Author: TheCharlatan

.cirrus.yml

@@ -96,21 +96,15 @@ task:
   name: 'lint'
   << : *BASE_TEMPLATE
   container:
-    image: debian:bookworm
+    dockerfile: ci/lint_imagefile
     cpu: 1
     memory: 1G
   # For faster CI feedback, immediately schedule the linters
   << : *CREDITS_TEMPLATE
-  test_runner_cache:
-    folder: "/lint_test_runner"
-    fingerprint_script: echo $CIRRUS_TASK_NAME $(git rev-parse HEAD:test/lint/test_runner)
-  python_cache:
-    folder: "/python_build"
-    fingerprint_script: cat .python-version /etc/os-release
   unshallow_script:
     - git fetch --unshallow --no-tags
   lint_script:
-    - ./ci/lint_run_all.sh
+    - ./ci/lint_run.sh
 
 task:
   name: 'tidy'

ci/lint_run.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+#
+# Copyright (c) The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+export LC_ALL=C.UTF-8
+set -o errexit -o pipefail -o xtrace
+
+# Only used in .cirrus.yml. Refer to test/lint/README.md on how to run locally.
+export PATH="/python_build/bin:${PATH}"
+export LINT_RUNNER_PATH="/lint_test_runner"
+./ci/lint/06_script.sh

ci/lint_run_all.sh

@@ -6,7 +6,8 @@
 
 export LC_ALL=C.UTF-8
 
-# Only used in .cirrus.yml. Refer to test/lint/README.md on how to run locally.
+# Only used in .cirrus.yml for stale re-runs of old pull request tasks. This
+# file can be removed in September 2025.
 
 cp "./ci/retry/retry" "/ci_retry"
 cp "./.python-version" "/.python-version"

ci/test/00_setup_env_native_asan.sh

@@ -29,7 +29,7 @@ export BITCOIN_CONFIG="\
  -DCMAKE_C_COMPILER=clang-${APT_LLVM_V} \
  -DCMAKE_CXX_COMPILER=clang++-${APT_LLVM_V} \
  -DCMAKE_C_FLAGS='-ftrivial-auto-var-init=pattern' \
- -DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern -Wno-error=deprecated-declarations' \
+ -DCMAKE_CXX_FLAGS='-ftrivial-auto-var-init=pattern' \
  -DAPPEND_CXXFLAGS='-std=c++23' \
  -DAPPEND_CPPFLAGS='-DARENA_DEBUG -DDEBUG_LOCKORDER' \
 "

ci/test/00_setup_env_native_tidy.sh

@@ -20,7 +20,6 @@ export RUN_TIDY=true
 export GOAL="install"
 export BITCOIN_CONFIG="\
  -DWITH_ZMQ=ON -DBUILD_GUI=ON -DBUILD_BENCH=ON -DWITH_USDT=ON -DWITH_BDB=ON -DWARN_INCOMPATIBLE_BDB=OFF \
- -DENABLE_HARDENING=OFF \
  -DCMAKE_C_COMPILER=clang-${TIDY_LLVM_V} \
  -DCMAKE_CXX_COMPILER=clang++-${TIDY_LLVM_V} \
  -DCMAKE_C_FLAGS_RELWITHDEBINFO='-O0 -g0' \

cmake/module/Maintenance.cmake

@@ -44,6 +44,14 @@ endfunction()
 
 function(add_windows_deploy_target)
   if(MINGW AND TARGET bitcoin-qt AND TARGET bitcoind AND TARGET bitcoin-cli AND TARGET bitcoin-tx AND TARGET bitcoin-wallet AND TARGET bitcoin-util AND TARGET test_bitcoin)
+    find_program(MAKENSIS_EXECUTABLE makensis)
+    if(NOT MAKENSIS_EXECUTABLE)
+      add_custom_target(deploy
+        COMMAND ${CMAKE_COMMAND} -E echo "Error: NSIS not found"
+      )
+      return()
+    endif()
+
     # TODO: Consider replacing this code with the CPack NSIS Generator.
     #       See https://cmake.org/cmake/help/latest/cpack_gen/nsis.html
     include(GenerateSetupNsi)
@@ -58,7 +66,7 @@ function(add_windows_deploy_target)
       COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-wallet> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-wallet>
       COMMAND ${CMAKE_STRIP} $<TARGET_FILE:bitcoin-util> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:bitcoin-util>
       COMMAND ${CMAKE_STRIP} $<TARGET_FILE:test_bitcoin> -o ${PROJECT_BINARY_DIR}/release/$<TARGET_FILE_NAME:test_bitcoin>
-      COMMAND makensis -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
+      COMMAND ${MAKENSIS_EXECUTABLE} -V2 ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.nsi
       VERBATIM
     )
     add_custom_target(deploy DEPENDS ${PROJECT_BINARY_DIR}/bitcoin-win64-setup.exe)
@@ -112,16 +120,22 @@ function(add_macos_deploy_target)
         DEPENDS ${PROJECT_BINARY_DIR}/dist/${macos_app}/Contents/MacOS/Bitcoin-Qt
       )
 
-      find_program(ZIP_COMMAND zip REQUIRED)
-      add_custom_command(
-        OUTPUT ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
-        WORKING_DIRECTORY dist
-        COMMAND ${PROJECT_SOURCE_DIR}/cmake/script/macos_zip.sh ${ZIP_COMMAND} ${osx_volname}.zip
-        VERBATIM
-      )
-      add_custom_target(deploy
-        DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
-      )
+      find_program(ZIP_EXECUTABLE zip)
+      if(NOT ZIP_EXECUTABLE)
+        add_custom_target(deploy
+          COMMAND ${CMAKE_COMMAND} -E echo "Error: ZIP not found"
+        )
+      else()
+        add_custom_command(
+          OUTPUT ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
+          WORKING_DIRECTORY dist
+          COMMAND ${PROJECT_SOURCE_DIR}/cmake/script/macos_zip.sh ${ZIP_EXECUTABLE} ${osx_volname}.zip
+          VERBATIM
+        )
+        add_custom_target(deploy
+          DEPENDS ${PROJECT_BINARY_DIR}/dist/${osx_volname}.zip
+        )
+      endif()
     endif()
     add_dependencies(deploydir bitcoin-qt)
     add_dependencies(deploy deploydir)

contrib/signet/miner

@@ -9,7 +9,7 @@ import logging
 import math
 import os
 import re
-import struct
+import shlex
 import sys
 import time
 import subprocess
@@ -86,7 +86,7 @@ def finish_block(block, signet_solution, grind_cmd):
         block.solve()
     else:
         headhex = CBlockHeader.serialize(block).hex()
-        cmd = grind_cmd.split(" ") + [headhex]
+        cmd = shlex.split(grind_cmd) + [headhex]
         newheadhex = subprocess.run(cmd, stdout=subprocess.PIPE, input=b"", check=True).stdout.strip()
         newhead = from_hex(CBlockHeader(), newheadhex.decode('utf8'))
         block.nNonce = newhead.nNonce
@@ -479,7 +479,7 @@ def do_calibrate(args):
         header.nTime = i
         header.nNonce = 0
         headhex = header.serialize().hex()
-        cmd = args.grind_cmd.split(" ") + [headhex]
+        cmd = shlex.split(args.grind_cmd) + [headhex]
         newheadhex = subprocess.run(cmd, stdout=subprocess.PIPE, input=b"", check=True).stdout.strip()
 
     avg = (time.time() - start) * 1.0 / TRIALS
@@ -549,7 +549,7 @@ def main():
 
     args = parser.parse_args(sys.argv[1:])
 
-    args.bcli = lambda *a, input=b"", **kwargs: bitcoin_cli(args.cli.split(" "), list(a), input=input, **kwargs)
+    args.bcli = lambda *a, input=b"", **kwargs: bitcoin_cli(shlex.split(args.cli), list(a), input=input, **kwargs)
 
     if hasattr(args, "address") and hasattr(args, "descriptor"):
         args.derived_addresses = {}

depends/packages/capnp.mk

@@ -6,7 +6,7 @@ $(package)_file_name=$(native_$(package)_file_name)
 $(package)_sha256_hash=$(native_$(package)_sha256_hash)
 $(package)_patches=abi_placement_new.patch
 
-define $(package)_set_vars :=
+define $(package)_set_vars
   $(package)_config_opts := -DBUILD_TESTING=OFF
   $(package)_config_opts += -DWITH_OPENSSL=OFF
   $(package)_config_opts += -DWITH_ZLIB=OFF

depends/packages/libmultiprocess.mk

@@ -8,7 +8,7 @@ ifneq ($(host),$(build))
 $(package)_dependencies += native_capnp
 endif
 
-define $(package)_set_vars :=
+define $(package)_set_vars
 ifneq ($(host),$(build))
 $(package)_config_opts := -DCAPNP_EXECUTABLE="$$(native_capnp_prefixbin)/capnp"
 $(package)_config_opts += -DCAPNPC_CXX_EXECUTABLE="$$(native_capnp_prefixbin)/capnpc-c++"

doc/build-osx.md

@@ -141,7 +141,7 @@ brew install python
 #### Deploy Dependencies
 
 You can [deploy](#3-deploy-optional) a `.zip` containing the Bitcoin Core application.
-It is required that you have `python` installed.
+It is required that you have `python` and `zip` installed.
 
 ## Building Bitcoin Core