Skip to content

Conversation

brunoerg and others added 6 commits July 3, 2025 11:58
Some ambiguous uses of "we" referring to either the node or the peer are replaced with clearer phrasing.

Also rephrase some comments for consistency and readability.

Applies to all relevant outbound eviction tests in p2p_eviction_logic.py.

Github-Pull: bitcoin#32823
Rebased-From: 26598ed
Ensure that tip_header.rehash() is used instead of tip_header.hash, which is None when the header is deserialized from hex.

This avoids depending on wait_for_getheaders() falling back to any received message, making the test more explicit and robust.

Github-Pull: bitcoin#32823
Rebased-From: ec004cd
When building depends on FreeBSD/OpenBSD `aarch64`, the host compilers
default to `default_host_{CC,CXX}`, which resolves to `gcc`/`g++`. This
is incorrect on these systems, where Clang is the default system
compiler.

Github-Pull: bitcoin#32716
Rebased-From: 4f10a57
Currently if the version 3 is selected for an otherwise
standard spender, the test will fail. It's unlikely but
possible, so change the test to update expectations and
sample more aggressively on border values to instigate
failures much quicker in the future if another version is
made standard.

Github-Pull: bitcoin#32841
Rebased-From: 4be81e9
@fanquake fanquake added this to the 29.1 milestone Jul 3, 2025
@DrahtBot
Copy link
Contributor

DrahtBot commented Jul 3, 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/32863.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK hebasto, glozow

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:

  • defintions -> definitions [spelling error]

drahtbot_id_4_m

Also, capitalized the comments in build-unix.md for uniformity
with the docs on other targets.

Github-Pull: bitcoin#32846
Rebased-From: 0e9f409
- Update `check_smart_estimates` to calculate the fee rate ceiling
   by taking the maximum of fees seen, minrelaytxfee, and mempoolminfee.
- Improve the subtest name and comments.

Github-Pull: bitcoin#32463
Rebased-From: 5c1236f
- Increase block weight by 4000 for all nodes with custom -blockmaxweight.
  Prior to this commit, we generated blocks with 4000 weight units less worth of transactions.
  See bitcoin#32461 (comment) for details.
  This commit fixes it by increasing the block weight by 4000.

Github-Pull: bitcoin#32463
Rebased-From: 9b75cfd
Github-Pull: bitcoin#32826
Rebased-From: 6967e8e
@fanquake fanquake force-pushed the probably_final_29_backports branch from 950f710 to 8ec282b Compare July 4, 2025 15:39
@fanquake fanquake marked this pull request as ready for review July 7, 2025 15:18
When using CMake policies 3.14 and below, the `export(PACKAGE)` command
by default populates the user package registry, which is stored outside
the build tree. Setting the `CMAKE_EXPORT_NO_PACKAGE_REGISTRY` variable
disables this side effect.

In CMake 3.15 and later, this behavior is disabled by default, and the
variable has no effect.

Github-Pull: bitcoin#32943
Rebased-From: 44f3bae
hebasto and others added 3 commits July 16, 2025 13:31
Starting with version 13.x, the mingw headers will define the value of
NTDDI_VERSION, based on the value of _WIN32_WINNT, if that version is <
Windows 10. Given that libevent was undefining our _WIN32_WINNT, and
redefining it to a value < Windows 10 (0x0501), NTDDI_VERSION was also
being defined to that value, leading to functions not being exposed in
the mingw-w64 headers; see here:
https://github.com/mingw-w64/mingw-w64/blob/9c2668ef77e75ea4d8a6c7d100b14643269caec3/mingw-w64-headers/include/iphlpapi.h#L36-L41.

Imports a commit from usptream (a14ff91254f40cf36e0fee199e26fb11260fab49).

Fixes bitcoin#32707.

Github-Pull: bitcoin#32837
Rebased-From: f5647c6
Copy link
Member

@hebasto hebasto left a comment

Choose a reason for hiding this comment

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

ACK 5300295, I've backported all listed PRs locally (had 3 conflicts to resolve), and got zero diff with this PR.

The last commit also addresses #32810 (review).

Copy link
Member

@glozow glozow left a comment

Choose a reason for hiding this comment

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

ACK 5300295

@glozow glozow merged commit ef380a4 into bitcoin:29.x Jul 18, 2025
18 checks passed
@fanquake fanquake deleted the probably_final_29_backports branch July 19, 2025 09:59
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.

10 participants