[29.x] More backports #32810

pull fanquake wants to merge 8 commits into bitcoin:29.x from fanquake:even_more_29_backports changing 8 files +61 −7

fanquake commented at 10:41 AM on June 25, 2025: member
Backports:
- #32530
- #32742
- #32798
- #32805
- #32814
- #32833
Fixes #31009.

build: add root dir to CMAKE_PREFIX_PATH

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:
https://github.com/bitcoin/bitcoin/issues/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: #32798
Rebased-From: e27a94596f2a1f5e04722a16165717cc6e891d36

e37a70bf71

fanquake added this to the milestone 29.1 on Jun 25, 2025
DrahtBot added the label Backport on Jun 25, 2025
DrahtBot commented at 10:41 AM on June 25, 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/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.

<sup>drahtbot_id_4_m</sup>

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

test: fix catchup loop in outbound eviction functional test

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: #32742
Rebased-From: dd8447f70faf6419b4617da3c1b57098e9cd66a6

5987c1b6ab

fanquake force-pushed on Jun 26, 2025
josibake commented at 10:56 AM on June 26, 2025: member

ACK e96d360

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

cmake: Use `HINTS` instead of `PATHS` in `find_*` commands

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: #32805
Rebased-From: ead44687483e9c936ba970de890c01d5e7ad3485

a990c1002b

fanquake force-pushed on Jun 26, 2025

cmake: Explicitly specify `Boost_ROOT` for Homebrew's package

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: #32814
Rebased-From: 8800b5acc1ef7abe6c5260ae0be5386b1d593a19

a3c1939d6e

fanquake force-pushed on Jun 26, 2025
Sjors commented at 2:16 PM on June 26, 2025: member

Tested on M4 macOS 15.5 that with 5987c1b6abaefad61d8d2cca605349354432398a 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 approved
hebasto commented at 3:41 PM on June 26, 2025: member

ACK fe8034b09c53f49d02b54f4e55cfe11bbd113fed. I've backported all mentioned PRs locally and got zero diff with this branch.
DrahtBot requested review from josibake on Jun 26, 2025

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

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: #32530
Rebased-From: 2c43b6adebbfabb3c8dd82fe821ce0a5d6173b3b

eafea2393d

node: cap -dbcache to 1GiB on 32-bit architectures

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: #32530
Rebased-From: 9f8e7b0b3b787b873045a4a8194e77d0b0a2b3b6

1c0e19b93a

fanquake force-pushed on Jun 26, 2025
DrahtBot added the label CI failed on Jun 26, 2025
fanquake force-pushed on Jun 27, 2025
DrahtBot removed the label CI failed on Jun 27, 2025

test: Add msgtype to msg_generic slots

Github-Pull: #32833
Rebased-From: 7dc43ea503a2c145ffd4fe14b794300bfc2bcdee

4b656e2023

doc: update release notes for 29.x ef2a013e31
fanquake force-pushed on Jun 30, 2025
Ahz9619 commented at 12:34 PM on June 30, 2025: none

#น้อมรับ
pinheadmz approved

pinheadmz commented at 7:47 PM on July 2, 2025: member

ACK ef2a013e31cf6fbded5735a998b4c992c176493d

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.

<details><summary>Show Signature</summary>

pinheadmz's public key is on openpgp.org

</details>

DrahtBot requested review from hebasto on Jul 2, 2025
fanquake marked this as ready for review on Jul 3, 2025
fanquake commented at 10:34 AM on July 3, 2025: member

@josibake / @hebasto want to re-review?
hebasto approved
hebasto commented at 10:44 AM on July 3, 2025: member

re-ACK ef2a013e31cf6fbded5735a998b4c992c176493d.

Missed credits to @darosior and @ryanofsky?
willcl-ark approved
willcl-ark commented at 10:48 AM on July 3, 2025: member

ACK ef2a013e31cf6fbded5735a998b4c992c176493d

...modulo hebasto's comments.

Backports all look correct.
fanquake commented at 10:56 AM on July 3, 2025: member

There's going to be another branch, so any credits can be fixed up there.
fanquake merged this on Jul 3, 2025
fanquake closed this on Jul 3, 2025
fanquake deleted the branch on Jul 3, 2025