[29.x] More backports by fanquake · Pull Request #32810 · bitcoin/bitcoin

fanquake · 2025-06-25T10:41:11Z

Backports:

Nix patches cmake to remove the root directory `/` from `CMAKE_SYSTEM_PREFIX_PATH`: https://github.com/NixOS/nixpkgs/blob/428b49b28ebc8938a6d9f6c540d32d7a06713972/pkgs/by-name/cm/cmake/001-search-path.diff#L10 Without this, and when using the toolchain for depends builds, cmake's `find_path()` and `find_package()` do not know where to find dependencies, causing issues like: bitcoin#32428 Adding this path back via CMAKE_PREFIX_PATH is harmless on other systems, and fixes the toolchain for Nix users. We append the `/` dir a maximum of once, as the toolchain may be called repeatedly during builds. Co-authored-by: Russell Yanofsky <russ@yanofsky.org> Co-authored-by: josibake <josibake@protonmail.com> Github-Pull: bitcoin#32798 Rebased-From: e27a945

DrahtBot · 2025-06-25T10:41:17Z

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/32810.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	pinheadmz, hebasto, willcl-ark
Stale ACK	josibake

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

LLM Linter (✨ experimental)

Possible typos and grammar issues:

"peers is" -> "peer is" [subject–verb agreement makes the sentence clear]

No other typos were found.

^{drahtbot_id_4_m}

The catchup loop in the outbound eviction functional test currently has a small flaw, as the contained waiting for a `getheaders` message just waits for any such message instead of one with the intended block hash. The reason is that the `prev_prev_hash` variable is set incorrectly, since the `tip_header` instance is not updated and its field `.hash` is None. Fix that by updating `tip_header` and use the correct field -- we want the tip header's previous hash (`.hashPrevBlock`). Github-Pull: bitcoin#32742 Rebased-From: dd8447f

josibake · 2025-06-26T10:56:25Z

ACK e96d360

Verified that the correct commits are being pulled in and the release notes.

According to the CMake documentation, `HINTS` "should be paths computed by system introspection, such as a hint provided by the location of another item already found", which is precisely the case in the `FindQRencode` module. Entries in `HINTS` are searched before those in `PATHS`. On macOS, Homebrew’s `libqrencode` will therefore be located at its real path rather than via the symlink in the default prefix. Github-Pull: bitcoin#32805 Rebased-From: ead4468

On macOS, this change ensures that the Boost package is located at its real path rather than via the symlink in the default prefix. Github-Pull: bitcoin#32814 Rebased-From: 8800b5a

Sjors · 2025-06-26T14:16:15Z

Tested on M4 macOS 15.5 that with 5987c1b having qt5 and qt6 (qt@5 and qt via Homebrew) leads to the issues described in #31009, but with fe8034b09c53f49d02b54f4e55cfe11bbd113fed it's happy.

Will test on Intel later.

The fix also works on Intel with macOS 13.7.6

hebasto

ACK fe8034b09c53f49d02b54f4e55cfe11bbd113fed. I've backported all mentioned PRs locally and got zero diff with this branch.

32-bit architecture is limited to 4GiB, so it doesn't make sense to set a too high value. 500 MB is chosen as an arbitrary maximum value that seems reasonable. Github-Pull: bitcoin#32530 Rebased-From: 2c43b6a

32-bit architecture is limited to 4GiB, so it doesn't make sense to set a too high value. Since this setting is performance critical, pick an arbitrary value higher than for -maxmempool but still reasonable. Github-Pull: bitcoin#32530 Rebased-From: 9f8e7b0

Github-Pull: bitcoin#32833 Rebased-From: 7dc43ea

pinheadmz

ACK ef2a013

Build on macos/arm64 after experiencing issues locally building a checked-out v29.0 GUI with only qt 6 installed. Can confirm these backports solve that problem and GUI runs fine. Did not test the other backports.

Show Signature

pinheadmz's public key is on openpgp.org

fanquake · 2025-07-03T10:34:17Z

@josibake / @hebasto want to re-review?

hebasto

re-ACK ef2a013.

Missed credits to @darosior and @ryanofsky?

willcl-ark

ACK ef2a013

...modulo hebasto's comments.

Backports all look correct.

fanquake · 2025-07-03T10:56:18Z

There's going to be another branch, so any credits can be fixed up there.

ee5b2b9 doc: update release notes for 29.x (fanquake) 73a977c test: Add msgtype to msg_generic slots (dergoegge) 2099559 node: cap -dbcache to 1GiB on 32-bit architectures (Antoine Poinsot) 640428c init: cap -maxmempool to 500 MB on 32-bit systems (Antoine Poinsot) 5583681 cmake: Explicitly specify `Boost_ROOT` for Homebrew's package (Hennadii Stepanov) 62ef58e cmake: Use `HINTS` instead of `PATHS` in `find_*` commands (Hennadii Stepanov) b1b302d test: fix catchup loop in outbound eviction functional test (Sebastian Falbesoner) 2ba2bdb build: add root dir to CMAKE_PREFIX_PATH (will) Pull request description: Backports: * bitcoin#32530 * bitcoin#32742 * bitcoin#32798 * bitcoin#32805 * bitcoin#32814 * bitcoin#32833 Fixes bitcoin#31009. ACKs for top commit: pinheadmz: ACK ee5b2b9 hebasto: re-ACK ee5b2b9. willcl-ark: ACK ee5b2b9 Tree-SHA512: 936ccf732f9fa49acc90de8af0ebf7134aa54dbaf9533c8dfbe08cd178b87a3a091c837d5bb84d61869a69c3c7d499a565b33237b14330a6c66d9c8456d5a261

fanquake added this to the 29.1 milestone Jun 25, 2025

DrahtBot added the Backport label Jun 25, 2025

fanquake mentioned this pull request Jun 25, 2025

build: add root dir to CMAKE_PREFIX_PATH in toolchain #32798

Merged

fanquake force-pushed the even_more_29_backports branch from 3d052fa to e96d360 Compare June 26, 2025 10:25

fanquake mentioned this pull request Jun 26, 2025

test: fix catchup loop in outbound eviction functional test #32742

Merged

fanquake force-pushed the even_more_29_backports branch from e96d360 to 89b8c5f Compare June 26, 2025 11:11

fanquake mentioned this pull request Jun 26, 2025

cmake: Use HINTS instead of PATHS in find_* commands #32805

Merged

cmake: Explicitly specify Boost_ROOT for Homebrew's package

a3c1939

On macOS, this change ensures that the Boost package is located at its real path rather than via the symlink in the default prefix. Github-Pull: bitcoin#32814 Rebased-From: 8800b5a

fanquake force-pushed the even_more_29_backports branch from 89b8c5f to fe8034b Compare June 26, 2025 14:02

This was referenced Jun 26, 2025

cmake: Explicitly specify Boost_ROOT for Homebrew's package #32814

Merged

Fix build on macOS when qt@6 is installed #32804

Closed

29.x Having qt(@6) breaks build for qt@5 on macOS 15.0 and 13.7 #31009

Closed

hebasto approved these changes Jun 26, 2025

View reviewed changes

DrahtBot requested a review from josibake June 26, 2025 15:41

darosior added 2 commits June 26, 2025 17:36

init: cap -maxmempool to 500 MB on 32-bit systems

eafea23

32-bit architecture is limited to 4GiB, so it doesn't make sense to set a too high value. 500 MB is chosen as an arbitrary maximum value that seems reasonable. Github-Pull: bitcoin#32530 Rebased-From: 2c43b6a

fanquake mentioned this pull request Jun 26, 2025

node: cap -maxmempool and -dbcache values for 32-bit #32530

Merged

fanquake force-pushed the even_more_29_backports branch from fe8034b to 2909207 Compare June 26, 2025 16:38

DrahtBot added the CI failed label Jun 26, 2025

fanquake force-pushed the even_more_29_backports branch from 2909207 to c368c1a Compare June 27, 2025 11:09

DrahtBot removed the CI failed label Jun 27, 2025

dergoegge and others added 2 commits June 30, 2025 13:28

test: Add msgtype to msg_generic slots

4b656e2

Github-Pull: bitcoin#32833 Rebased-From: 7dc43ea

doc: update release notes for 29.x

ef2a013

fanquake force-pushed the even_more_29_backports branch from c368c1a to ef2a013 Compare June 30, 2025 12:29

fanquake mentioned this pull request Jun 30, 2025

test: Add msgtype to msg_generic slots #32833

Merged

pinheadmz approved these changes Jul 2, 2025

View reviewed changes

DrahtBot requested a review from hebasto July 2, 2025 19:47

fanquake marked this pull request as ready for review July 3, 2025 09:22

hebasto approved these changes Jul 3, 2025

View reviewed changes

willcl-ark approved these changes Jul 3, 2025

View reviewed changes

fanquake merged commit d360a6e into bitcoin:29.x Jul 3, 2025
18 checks passed

fanquake deleted the even_more_29_backports branch July 3, 2025 10:58

hebasto mentioned this pull request Jul 17, 2025

[29.x] Backports #32863

Merged

ivanlele added a commit to ivanlele/elements that referenced this pull request Jul 13, 2026

Merge d360a6e into merged_master (Bitcoin PR bitcoin/bitcoin#32810)

d2bfcaa

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[29.x] More backports#32810

[29.x] More backports#32810
fanquake merged 8 commits into
bitcoin:29.xfrom
fanquake:even_more_29_backports

fanquake commented Jun 25, 2025 •

edited

Loading

Uh oh!

DrahtBot commented Jun 25, 2025 •

edited

Loading

Uh oh!

josibake commented Jun 26, 2025

Uh oh!

Sjors commented Jun 26, 2025 •

edited

Loading

Uh oh!

hebasto left a comment

Uh oh!

pinheadmz left a comment

Uh oh!

fanquake commented Jul 3, 2025

Uh oh!

hebasto left a comment •

edited

Loading

Uh oh!

willcl-ark left a comment

Uh oh!

fanquake commented Jul 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

fanquake commented Jun 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Jun 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage & Benchmarks

Reviews

LLM Linter (✨ experimental)

Uh oh!

josibake commented Jun 26, 2025

Uh oh!

Sjors commented Jun 26, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

hebasto left a comment

Choose a reason for hiding this comment

Uh oh!

pinheadmz left a comment

Choose a reason for hiding this comment

Uh oh!

fanquake commented Jul 3, 2025

Uh oh!

hebasto left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

willcl-ark left a comment

Choose a reason for hiding this comment

Uh oh!

fanquake commented Jul 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

fanquake commented Jun 25, 2025 •

edited

Loading

DrahtBot commented Jun 25, 2025 •

edited

Loading

Sjors commented Jun 26, 2025 •

edited

Loading

hebasto left a comment •

edited

Loading