Skip to content

backport: Merge bitcoin#28755, 28865, 31225, 31718#7364

Open
vijaydasmp wants to merge 4 commits into
dashpay:developfrom
vijaydasmp:June_2026_5
Open

backport: Merge bitcoin#28755, 28865, 31225, 31718#7364
vijaydasmp wants to merge 4 commits into
dashpay:developfrom
vijaydasmp:June_2026_5

Conversation

@vijaydasmp

@vijaydasmp vijaydasmp commented Jun 13, 2026

Copy link
Copy Markdown

bitcoin back ports

@github-actions

github-actions Bot commented Jun 13, 2026 •
edited
Loading

Copy link
Copy Markdown

⚠️ Potential Merge Conflicts Detected

This PR has potential conflicts with the following open PRs:

Please coordinate with the authors of these PRs to avoid merge conflicts.

@vijaydasmp vijaydasmp changed the title backport : Merge bitcoin#28755, 28865, 28966, 27884 backport: Merge bitcoin#28755, 28865, 28966, 27884 Jun 14, 2026
fanquake added 2 commits June 14, 2026 07:36
@fanquake @vijaydasmp
Merge bitcoin#28755: build: remove duplicate -lminiupnpc linking
7676cb6 
b74e449 build: remove potential for duplciate natpmp linking (fanquake)
4e95096 build: remove duplicate -lminiupnpc linking (fanquake)

Pull request description:

  Having the link check in the header check loop means we get `-lminiupnpc -lminiupnpc -lminiupnpc` on the link line.
  This is unnecessary, and results in warnings, i.e:
  ```bash
  ld: warning: ignoring duplicate libraries: '-levent', '-lminiupnpc'
  ld: warning: ignoring duplicate libraries: '-levent', '-lminiupnpc'
  ld: warning: ignoring duplicate libraries: '-levent', '-lminiupnpc'
  ```

  These warnings have been occurring since the new macOS linker released with Xcode 15, and also came up in hebasto#34.

  There are other duplicate lib issues, i.e with `-levent` + `-levent_pthreads -levent`, but those are less straight forward to solve, and won't be included here.

ACKs for top commit:
  jonatack:
    ACK b74e449
  hebasto:
    ACK b74e449, it fixes one issue mentioned in hebasto#34 (comment).
  TheCharlatan:
    ACK b74e449
  theuni:
    ACK b74e449

Tree-SHA512: 987a56ef17cbaf273cb672c41016f3f615b16889317325a9e88135d0c41f01af3840ad44a6f811a7df97f5873c9cd957e60aaa1b99bd408b17b4b1ffe2c68f36
@fanquake @vijaydasmp
Merge bitcoin#28865: test: migrate to some per-symbol ubsan suppressions
73add31 
fd30e96 test: migrate to some per-symbol ubsan suppressions (fanquake)

Pull request description:

  Now that the symbolizer should be hanging around (bitcoin#28814), migrate some file-wide suppressions to be symbol specific. Should assist in catching new issues that may otherwise go unnoticed due to file-wide suppression.

  Only tested (so far) on aarch64 using the native ASAN & FUZZ CI.

ACKs for top commit:
  maflcko:
    lgtm ACK fd30e96
  dergoegge:
    utACK fd30e96 (if CI is green)

Tree-SHA512: fbc44464d22813969dd4d1cdeab00042fa45f0af9bf1aed4fd3b688dc7b3c377a7c0f5f0c0a37ba65b649cfb5c7ff8ab2774500fe182d702c4340ca19f08479f
@vijaydasmp vijaydasmp force-pushed the June_2026_5 branch 6 times, most recently from 983388d to a0cb8c5 Compare June 14, 2026 17:51
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28755, 28865, 28966, 27884 backport: Merge bitcoin#28755, 28865, 28966 Jun 14, 2026
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28755, 28865, 28966 backport: Merge bitcoin#28755, 28865 Jun 14, 2026
fanquake added 2 commits June 15, 2026 08:57
@fanquake @vijaydasmp
Merge bitcoin#31225: doc: Fix grammatical errors in multisig-tutorial.md
55f6674 
ac286e0 doc: Fix grammatical errors in multisig-tutorial.md (secp512k2)

Pull request description:

  This pull request fixes grammatical errors in the `multisig-tutorial.md` document.

ACKs for top commit:
  Abdulkbk:
    ACK ac286e0

Tree-SHA512: 684fe16e802431109957b9cde441353edeb16ffffde4282310c1a6f104adffc53347d00a2cf3a5969a78803f3177d6056ca37d3b7e8be52c2ec43ec0b9fcf4d9
@fanquake @vijaydasmp
Merge bitcoin#31718: Docs: fix typos in documentation files
cad4245 
81b9800 fix typos (wgyt)

Pull request description:

ACKs for top commit:
  maflcko:
    lgtm ACK 81b9800

Tree-SHA512: 6a4f718c0afb0e3bf80ab7fa7fed32f882614c60b6e4972f54584aecac2f19384d781232e923a47b72d76229af907ebf7717d7b34f9be6c00394ce5d7ed0b8d4
@vijaydasmp vijaydasmp changed the title backport: Merge bitcoin#28755, 28865 backport: Merge bitcoin#28755, 28865, 31225, 31718 Jun 15, 2026
@vijaydasmp vijaydasmp marked this pull request as ready for review June 15, 2026 08:10
@thepastaclaw

thepastaclaw commented Jun 15, 2026 •
edited
Loading

Copy link
Copy Markdown

✅ Review complete (commit cad4245)

@coderabbitai

coderabbitai Bot commented Jun 15, 2026

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: 3c04dee3-7982-4fbe-b532-2053f714505c

📥 Commits

Reviewing files that changed from the base of the PR and between 7fcc54a and cad4245.

📒 Files selected for processing (7)
  • ci/README.md
  • configure.ac
  • contrib/guix/README.md
  • contrib/tracing/README.md
  • contrib/tracing/log_raw_p2p_msgs.py
  • doc/multisig-tutorial.md
  • test/sanitizer_suppressions/ubsan

Walkthrough

This pull request makes several independent improvements: documentation typos and wording are corrected across ci/README.md, contrib/guix/README.md, contrib/tracing/README.md, contrib/tracing/log_raw_p2p_msgs.py, and doc/multisig-tutorial.md. In configure.ac, the optional UPnP (miniupnpc) and NAT-PMP (natpmp) library detection is refactored from a combined header-and-library check into a two-step flow: header availability is checked first, and only on success is the library symbol checked. The test/sanitizer_suppressions/ubsan file replaces broad, file-based UBSan suppression entries with more targeted, symbol-scoped suppressions for unsigned-integer-overflow, implicit-integer-sign-change, and shift-base categories.

Estimated code review effort

🎯 2 (Simple) | ⏱️ ~10 minutes

Suggested reviewers

  • PastaPastaPasta
  • knst
  • UdjinM6
🚥 Pre-merge checks | ✅ 3 | ❌ 2

❌ Failed checks (1 warning, 1 inconclusive)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 0.00% which is insufficient. The required threshold is 80.00%. Write docstrings for the functions missing them to satisfy the coverage threshold.
Description check ❓ Inconclusive The description 'bitcoin back ports' is vague and generic, using non-descriptive terms that don't convey meaningful information about which specific changes or commits are being backported. Expand the description to briefly mention the key changes being backported, such as the build system fix, testing improvements, and documentation corrections.
✅ Passed checks (3 passed)
Check name Status Explanation
Title check ✅ Passed The title references specific Bitcoin commit numbers being backported, which accurately reflects the main purpose of the changeset.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

thepastaclaw
thepastaclaw approved these changes Jun 15, 2026
View reviewed changes

@thepastaclaw thepastaclaw left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Code Review

Faithful backport of four small upstream PRs: typo/grammar doc fixes (bitcoin#31718, bitcoin#31225), configure.ac restructure for miniupnpc (bitcoin#28755), and per-symbol UBSan suppressions migration (bitcoin#28865). All agent findings were verified against upstream diffs and current source; none represent defects introduced by the Dash adaptation. The flagged 'incomplete' UBSan migration for policy/fees.cpp is in fact a faithful match of upstream — that line was intentionally not migrated in bitcoin#28865 (the narrowing to TxConfirmStats::removeTx happened in the later, unbackported bitcoin#28966). The packages.md/tracing-script notes are upstream prerequisite gaps that do not affect this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@thepastaclaw thepastaclaw thepastaclaw approved these changes

Reviewers whose approvals may not affect merge requirements

At least 2 approving reviews are required to merge this pull request.

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@vijaydasmp @thepastaclaw @fanquake