Skip to content

[29.x] Backports #32292

New issue

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 22 commits into from
May 22, 2025
Merged

[29.x] Backports #32292

merged 22 commits into from
May 22, 2025

Conversation

@DrahtBot
Copy link
Contributor

DrahtBot commented Apr 17, 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/32292.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK willcl-ark

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

@maflcko
Copy link
Member

maflcko commented Apr 17, 2025

Could also add #32184 ?

@fanquake fanquake force-pushed the 29_x_backports branch 2 times, most recently from 9e59b78 to ae2a3fd Compare April 17, 2025 14:13
@DrahtBot
Copy link
Contributor

Guix builds (on x86_64) [untrusted test-only build, possibly unsafe, not for production use]

File commit f490f55
(29.x)
commit c9d6577
(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...

@maflcko
Copy link
Member

maflcko commented Apr 25, 2025

Could also include bitcoin-core/gui#864, possibly?

@hebasto
Copy link
Member

hebasto commented Apr 26, 2025

Could also include bitcoin-core/gui#864, possibly?

+1

@hebasto
Copy link
Member

hebasto commented Apr 28, 2025

It seems #include <QDebug> is missed.

@DrahtBot
Copy link
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.

Hints

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.

laanwj and others added 3 commits May 6, 2025 18:04
This hardware feature is

- rarely supported on SoCs (and broken on like half of the chips that support it in the first place) (bitcoin#31817)
- apparently not compiled into the release binary (bitcoin#31817 (comment))
- hard to test in CI, due to unavailable of hardware

Better to remove it.

This reverts commit aee5404.

Closes bitcoin#31817.

Github-Pull: bitcoin#32248
Rebased-From: 7749d92
This change is necessary for Windows GHA images, which provide
CMake >= 4.0.

Github-Pull: bitcoin#32184
Rebased-From: ef00a28
The mempool_monitor tracing tool is incorrectly reading the reason
as the first argument. Fix this!

Github-Pull: bitcoin#32454
Rebased-From: 31c5ebc
fanquake and others added 2 commits May 12, 2025 14:25
This can alsofail to compile when optimisations are being used, see:
bitcoin#31913.
So disable just ASan for this function under any optimisation level.

Github-Pull: bitcoin#32437
Rebased-From: 4e8ab5e
This change makes the `WITH_DBUS` option available on all Unix-like
systems, not just Linux, thereby fixing a regression that was
overlooked during the migration from Autotools.

Note: Enabling D-Bus support on macOS still makes no sense, since the
`Notificator` class uses the User Notification Center regardless.

Github-Pull: bitcoin#32469
Rebased-From: 5b7ed46
@fanquake fanquake marked this pull request as ready for review May 13, 2025 13:56
@fanquake fanquake requested a review from willcl-ark May 13, 2025 13:56
enirox001 added 2 commits May 14, 2025 10:01
Fix incorrect variable name in comment (nTimes -> nTime) in
feature_pruning.py. This typo caused the test to always reset
mine_large_blocks.nTime to 0, rather than only on the first run
as intended.

Github-Pull: bitcoin#32312
Rebased-From: 772ba7f
After fixing the nTime variable name, the test_pruneheight_undo_presence
test began failing because node 2, which is involved in reorg testing,
could be on a different chain than other nodes. This caused failures
when trying to fetch blocks from other nodes that didn't recognize
node 2's chain.

Switch to using node 5 instead, which is also a pruned node but isn't
involved in reorg testing, ensuring it stays on the same chain as the
other nodes. This allows the block fetching to work as intended in the
test.

Github-Pull: bitcoin#32312
Rebased-From: 2aa63d5
mzumsande added 2 commits May 14, 2025 13:26
There could be a race with outstanding TxAddedToMempool notifications
being applied to the soon-to-be created wallet.

Fixes an intermittent timeout reproducable by adding a sleep to
AddToWallet.

Github-Pull: bitcoin#32483
Rebased-From: 07350e2
During init, the test framework will start using rpc after the
mempool was loaded. It will not wait for postInitProcess or
outstanding transactionAddedToMempool notifications, leading to
a possible race, in which listunspent is being called while the
tx is still in Inactive status. Prevent this by processing
outstanding notifications.

Github-Pull: bitcoin#32483
Rebased-From: e7ad86e
achow101 and others added 4 commits May 20, 2025 12:29
Logging the wallet version before anything has been read from disk results
in the wrong version being logged.

Also split the last client version logging as it may not always be
present to be logged.

Github-Pull: bitcoin#32553
Rebased-From: 359ecd3
Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

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

crACK a0d1f69

Checked all patches were backported cleanly and appear in the release notes.

Did not build/test.

@fanquake fanquake merged commit 589b561 into bitcoin:29.x May 22, 2025
18 checks passed
@fanquake fanquake deleted the 29_x_backports branch May 22, 2025 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.