Backports for 29.x
:
[29.x] Backports #32292
pull fanquake wants to merge 13 commits into bitcoin:29.x from fanquake:29_x_backports changing 17 files +97 −316-
fanquake commented at 10:55 am on April 17, 2025: member
-
DrahtBot commented at 10:55 am on April 17, 2025: contributor
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/32292.
Reviews
See the guideline for information on the review process. A summary of reviews will appear here.
-
DrahtBot added the label Backport on Apr 17, 2025
-
maflcko added the label DrahtBot Guix build requested on Apr 17, 2025
-
maflcko added this to the milestone 29.1 on Apr 17, 2025
-
fanquake force-pushed on Apr 17, 2025
-
in .github/workflows/ci.yml:202 in 57254e7541 outdated
197@@ -198,6 +198,8 @@ jobs: 198 Set-Location "$env:VCPKG_INSTALLATION_ROOT" 199 Add-Content -Path "triplets\x64-windows.cmake" -Value "set(VCPKG_BUILD_TYPE release)" 200 Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)" 201+ # Workaround for libevent, which requires CMake 3.1 but is incompatible with CMake >= 4.0. 202+ sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
hebasto commented at 1:49 pm on April 17, 2025:bash
has to be used to runsed
:0--- a/.github/workflows/ci.yml 1+++ b/.github/workflows/ci.yml 2@@ -194,10 +194,10 @@ jobs: 3 Write-Host "PowerShell version $($PSVersionTable.PSVersion.ToString())" 4 5 - name: Using vcpkg with MSBuild 6+ shell: bash 7 run: | 8- Set-Location "$env:VCPKG_INSTALLATION_ROOT" 9- Add-Content -Path "triplets\x64-windows.cmake" -Value "set(VCPKG_BUILD_TYPE release)" 10- Add-Content -Path "triplets\x64-windows-static.cmake" -Value "set(VCPKG_BUILD_TYPE release)" 11+ echo "set(VCPKG_BUILD_TYPE release)" >> "${VCPKG_INSTALLATION_ROOT}/triplets/x64-windows.cmake" 12+ echo "set(VCPKG_BUILD_TYPE release)" >> "${VCPKG_INSTALLATION_ROOT}/triplets/x64-windows-static.cmake" 13 # Workaround for libevent, which requires CMake 3.1 but is incompatible with CMake >= 4.0. 14 sed -i '1s/^/set(ENV{CMAKE_POLICY_VERSION_MINIMUM} 3.5)\n/' "${VCPKG_INSTALLATION_ROOT}/scripts/ports.cmake"
See: f8619196ceb5c6a58125506d276d9515837f043a
fanquake force-pushed on Apr 17, 2025fanquake force-pushed on Apr 17, 2025DrahtBot commented at 3:21 am on April 21, 2025: contributorGuix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]
File commit f490f5562d4b20857ef8d042c050763795fd43da(29.x) commit c9d6577a2bcfb52fb9c4e4113526404c29c1d3a8(pull/32292/merge) *-aarch64-linux-gnu-debug.tar.gz 3a12bf542167f638...
3fb0b2021135a444...
*-aarch64-linux-gnu.tar.gz 3c5687d46cfe233d...
b13812eb43b28d4f...
*-arm-linux-gnueabihf-debug.tar.gz 831911040a5a5c35...
b0136701d7fd3380...
*-arm-linux-gnueabihf.tar.gz f2b9896cf3167464...
9a502e95e664144a...
*-arm64-apple-darwin-codesigning.tar.gz 4ca3ffedce0ddecb...
80cb212484bb0572...
*-arm64-apple-darwin-unsigned.tar.gz 0de90429a574b3a0...
06761dbf0b3d62f7...
*-arm64-apple-darwin-unsigned.zip b3912c74207cb471...
c0e4973b077b4264...
*-powerpc64-linux-gnu-debug.tar.gz 5448afb9c335c9a2...
79f726b222a74fbd...
*-powerpc64-linux-gnu.tar.gz a86a681cf332bf92...
55fa3b39bb6e53d9...
*-riscv64-linux-gnu-debug.tar.gz 6d23e95d99022338...
3efe4eb545f2fa38...
*-riscv64-linux-gnu.tar.gz ff100cc06dfb6595...
4276b71192d16f1c...
*-x86_64-apple-darwin-codesigning.tar.gz f2a1a76ca4f6e302...
49095a8cab28ea3b...
*-x86_64-apple-darwin-unsigned.tar.gz ad6d1144306cd363...
825e00f4d2c40212...
*-x86_64-apple-darwin-unsigned.zip 21e508364c42ec2e...
28e0f0d906166633...
*-x86_64-linux-gnu-debug.tar.gz 11e2224c0dbc69dc...
89ab8dcbdbfc9e97...
*-x86_64-linux-gnu.tar.gz b56b18f05dd78948...
93723d6107f56b32...
*.tar.gz 3aceb86638b0d9a4...
3588107a3e37db15...
SHA256SUMS.part e89c53476caef076...
77c08e99c36e5da0...
guix_build.log ac748453988d5eec...
89e923ae9305ddc7...
guix_build.log.diff b911fc48c11baf76...
DrahtBot removed the label DrahtBot Guix build requested on Apr 21, 2025fanquake force-pushed on Apr 24, 2025maflcko commented at 7:29 am on April 25, 2025: memberCould also include https://github.com/bitcoin-core/gui/pull/864, possibly?hebasto commented at 12:49 pm on April 26, 2025: memberCould also include bitcoin-core/gui#864, possibly?
+1
fanquake force-pushed on Apr 28, 2025fanquake force-pushed on Apr 28, 2025hebasto commented at 10:08 am on April 28, 2025: memberIt seems
#include <QDebug>
is missed.fanquake force-pushed on Apr 28, 2025DrahtBot added the label CI failed on Apr 28, 2025DrahtBot commented at 10:10 am on April 28, 2025: contributor🚧 At least one of the CI tasks failed. Task
multiprocess, i686, DEBUG
: https://github.com/bitcoin/bitcoin/runs/41263344251 LLM reason (✨ experimental): The CI failure is caused by compile errors due to incomplete handling of QDebug in sendcoinsdialog.cpp.Try to run the tests locally, according to the documentation. However, a CI failure may still 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.
DrahtBot removed the label CI failed on Apr 28, 2025fanquake force-pushed on May 1, 2025Remove support for RNDR/RNDRRS for aarch64 on Linux
This hardware feature is - rarely supported on SoCs (and broken on like half of the chips that support it in the first place) (#31817) - apparently not compiled into the release binary (https://github.com/bitcoin/bitcoin/issues/31817#issuecomment-2795885962) - hard to test in CI, due to unavailable of hardware Better to remove it. This reverts commit aee5404e02e203a256c1a97b629b9b107cc8bb07. Closes #31817. Github-Pull: #32248 Rebased-From: 7749d929a0d9dfe71541a22e557ea41e01df28ce
test: Handle empty string returned by CLI as None in RPC tests
Github-Pull: #32286 Rebased-From: a4041c77f0e20d004524868e70ff12508832c9eb
ci: Add workaround for vcpkg's libevent package
This change is necessary for Windows GHA images, which provide CMake >= 4.0. Github-Pull: #32184 Rebased-From: ef00a28414daed2dd026b458082ed03fe9508074
refactor: Remove spurious virtual from final ~CZMQNotificationInterface
Github-Pull: #32187 Rebased-From: fa69c42fdf0aeec0546e951bc6132ab630edb9d4
test: Add imports for util bpf_cflags
This is required for the next commit. Github-Pull: #32336 Rebased-From: fa0c1baaf89805182de56d6a2e8eed2265a94b40
scripted-diff: Use bpf_cflags
-BEGIN VERIFY SCRIPT- ren() { sed --regexp-extended -i "s/$1/$2/g" $( git grep --extended-regexp -l "$1" ) ; } ren 'cflags=\["-Wno-error=implicit-function-declaration"\]' 'cflags=bpf_cflags()' -END VERIFY SCRIPT- Github-Pull: #32336 Rebased-From: facb9b327b9da39ce1e09ed56199be9efb19b5b8
gui: crash fix, disconnect numBlocksChanged() signal during shutdown
The crash stems from the order of the shutdown procedure: We first unset the client model, then destroy the wallet controller—but we leave the internal wallet models ('m_wallets') untouched for a brief period. As a result, there’s a point in time where views still have connected signals and access to wallet models that are not connected to any wallet controller. Now.. since the clientModel is only replaced with nullptr locally and not destroyed yet, signals like numBlocksChanged can still emit. Thus, when wallet views receive them, they see a non-null wallet model ptr, and proceed to call backend functions from a model that is being torn down. As the shutdown procedure begins by unsetting clientModel from all views. It’s safe to ignore events when clientModel is nullptr. Github-Pull: gui#864 Rebased-From: 71656bdfaa6bfe08ce9651246a3ef606f923351b
qt: Replace stray tfm::format to cerr with qWarning
GUI warnings should go to the log, not to the console (which may not be connected at all). Github-Pull: gui#868 Rebased-From: edd46566bd66cea7d7f4116429fe1c11d2187ba2
doc: Fix fuzz test_runner.py path
This commit fixes the path listed in the documentation for the fuzz testing test_runner.py. Previously the --help option worked but running fuzz tests from the documented path did not. Github-Pull: #32353 Rebased-From: 61f238e84ac6d24d8f420c2eabcbb2980d7fcb1e
doc: Fix test_bitcoin path
This commit fixes a couple command paths for interacting with the test_bitcoin binary within the Unit Test documentation. Github-Pull: #32389 Rebased-From: 6cbc28b8dd629062950f195facc009fd8ba86310
fanquake force-pushed on May 6, 2025cmake: Respect user-provided configuration-specific flags
Github-Pull: #32356 Rebased-From: edde96376a2961dec3730331b3d171ddf972589f
fanquake force-pushed on May 8, 2025tracing: fix invalid argument in mempool_monitor
The mempool_monitor tracing tool is incorrectly reading the reason as the first argument. Fix this! Github-Pull: #32454 Rebased-From: 31c5ebc4007884b655f2f90ca09e36e0b9ada4da
doc: update release notes for 29.x 81abe1dbb1fanquake force-pushed on May 9, 2025
This is a metadata mirror of the GitHub repository bitcoin/bitcoin. This site is not affiliated with GitHub. Content is generated from a GitHub metadata backup.
generated: 2025-05-11 18:12 UTC
More mirrored repositories can be found on mirror.b10c.me