Skip to content

[29.x] Backports#33344

Merged
glozow merged 11 commits into
bitcoin:29.xfrom
fanquake:29_2_backports
Sep 17, 2025
Merged

[29.x] Backports#33344
glozow merged 11 commits into
bitcoin:29.xfrom
fanquake:29_2_backports

Conversation

The `SHA256AutoDetect` return output is used, among other use cases, to
name benchmarks. Using a comma breaks the CSV output.

This change replaces the comma with a semicolon, which fixes the issue.

Github-Pull: bitcoin#33340
Rebased-From: 790b440
@fanquake fanquake added this to the 29.2 milestone Sep 9, 2025
@DrahtBot

DrahtBot commented Sep 9, 2025

Copy link
Copy Markdown
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/33344.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK darosior, mzumsande

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

Rather than trying to match the apt installed clang version, which is
prone to intermittent issues. i.e bitcoin#33345.

Github-Pull: bitcoin#33364
Rebased-From: b736052
instagibbs and others added 4 commits September 12, 2025 15:43
Since bitcoin#29412, we have not allowed mutated blocks to continue
being processed immediately the block is received, but this
is only done for the legacy BLOCK message.

Extend these checks as belt-and-suspenders to not allow
similar mutation strategies to affect relay by honest peers
by applying the check inside
PartiallyDownloadedBlock::FillBlock, immediately before
returning READ_STATUS_OK.

This also removes the extraneous CheckBlock call.

Github-Pull: bitcoin#32646
Rebased-From: bac9ee4
Previously in debug builds, this would cause an Assume crash if
FillBlock had been called previously. This could happen when multiple
blocktxn messages were received.

Co-Authored-By: Greg Sanders <gsanders87@gmail.com>

Github-Pull: bitcoin#33296
Rebased-From: 5e585a0
Add test_multiple_blocktxn_response that checks that the peer is
disconnected.

Github-Pull: bitcoin#33296
Rebased-From: 8b62647
@instagibbs

Copy link
Copy Markdown
Member

#32646 and #33296 backports look correct

@Crypt-iQ

Copy link
Copy Markdown
Contributor

Checked that #32646 and #33296 backports are correct and ran p2p_compactblocks.py just to be sure.

Tor inbound connections do not reveal the peer's actual network address.
Therefore do not apply whitelist permissions to them.

Co-authored-by: Vasil Dimov <vd@FreeBSD.org>

Github-Pull: bitcoin#33395
Rebased-From: f563ce9
@fanquake fanquake force-pushed the 29_2_backports branch 2 times, most recently from be76435 to 6adce94 Compare September 17, 2025 13:21
@fanquake fanquake marked this pull request as ready for review September 17, 2025 13:54

@darosior darosior left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

utACK f2bd79f

@mzumsande mzumsande left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

utACK f2bd79f

I mostly looked at the p2p backports (#32646, #33296, #33395), the rest looked correct too but I didn't check very deeply.

@glozow glozow merged commit 7e1eca4 into bitcoin:29.x Sep 17, 2025
18 checks passed
@fanquake fanquake deleted the 29_2_backports branch September 17, 2025 18:06
@glozow glozow mentioned this pull request Oct 9, 2025
14 tasks
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
0a16d2c doc: update manual pages for v29.2rc1 (fanquake)
61cef88 build: bump version to v29.2rc1 (fanquake)
f0fddcc doc: update release notes for 29.x (fanquake)
224d51f net: Do not apply whitelist permission to onion inbounds (Martin Zumsande)
a898b24 test: send duplicate blocktxn message in p2p_compactblocks.py (Eugene Siegel)
811c49a net: check for empty header before calling FillBlock (Eugene Siegel)
549ef1c p2p: remove vestigial READ_STATUS_CHECKBLOCK_FAILED (Greg Sanders)
646d645 p2p: Add witness mutation check inside FillBlock (Greg Sanders)
d5f9992 trace: Workaround GCC bug compiling with old systemtap (Luke Dashjr)
e918dee ci: always use tag for LLVM checkout (fanquake)
f7f635c Fix benchmark CSV output (Hennadii Stepanov)

Pull request description:

  Backports:
  * bitcoin#32646
  * bitcoin#33296
  * bitcoin#33310
  * bitcoin#33340
  * bitcoin#33364
  * bitcoin#33395

  Plus changes for 29.2rc1.

ACKs for top commit:
  darosior:
    utACK 0a16d2c
  mzumsande:
    utACK 0a16d2c

Tree-SHA512: 346a92032b7a069e2941056c6273ff65e360c5834832b106350a9cd42b634518cc75b807da6e51a6292e3a33342bb7b145777d3538a2792e03c63962d747a025
ivanlele added a commit to ivanlele/elements that referenced this pull request Jul 14, 2026
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.

9 participants