Skip to content

backport: bitcoin#30143, bitcoin#30502, bitcoin#29154 - #8164

Merged
PastaPastaPasta merged 3 commits into
dashpay:developfrom
thepastaclaw:backport-0.28-b005-doc
Nov 16, 2026
Merged

PastaPastaPasta merged 3 commits into
dashpay:developfrom
thepastaclaw:backport-0.28-b005-doc

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Nov 15, 2026 •

Copy link
Copy Markdown
Collaborator

Issue being fixed or feature implemented

Backports 3 Bitcoin Core v0.28 pull request(s) to Dash.

What was done?

How Has This Been Tested?

Breaking Changes

None beyond the upstream changes themselves.

Checklist:

  • I have performed a self-review of my own code
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone (for repository code-owners and collaborators only)

@DCG-Claude

DCG-Claude commented Nov 15, 2026 •

Copy link
Copy Markdown
Collaborator Author

Maintainer controls

Tick a box; backportsys acts within a few minutes, then clears it. For other requests, leave a review comment.

  • 🔒 Hands off — stop every automated update to this branch
  • 🔄 Rebase onto current develop
  • ❌ Close — abandon this batch and release its items

Hands off persists after its box clears: no automated branch updates until operator release (not tracker Release hold). Close abandons the batch and releases its items.

Review effort

🟢 trivial overall (3 trivial).

🟢 identical to upstream, or small declared differences in docs, tests or build scripts · 🟡 a few lines of Dash code differ or were placed differently, upstream code skipped as not needed, an undeclared omission, or release plumbing (depends, guix, workflows, test framework) differs · 🔴 larger code differences, any difference in consensus, key or Dash-subsystem code, or a decision below. The adapting lane's explanations are in the PR description and each commit body.

Upstream Effort Where it differs from upstream
bitcoin#30143 🟢 trivial docs/tests/build differ in doc/build-netbsd.md
bitcoin#30502 🟢 trivial docs/tests/build differ in doc/tor.md; skips upstream hunks as not needed in Dash: doc/release-notes-22729.md
bitcoin#29154 🟢 trivial docs/tests/build differ in doc/descriptors.md, test/functional/wallet_multisig_descriptor_psbt.py

Needs maintainer input

Nothing. Reviewing means checking the differences listed above.

Fork gate: thepastaclaw#137 at 4166c98 (CI green).

@coderabbitai

coderabbitai Bot commented Nov 15, 2026 •

Copy link
Copy Markdown

Explain Change →

No actionable comments were generated in the recent review.

Walkthrough

The NetBSD and OpenBSD build guides now document updated packages and optional features. The descriptor guide adds a 2-of-3 multisig example and clarifies external and internal descriptor requirements. The multisig functional test now uses separate external and internal key expressions. The Tor setup example specifies an onion-interface bind.

Estimated code review effort: 2 (Simple) | ~15 minutes

Suggested reviewers: kwvg

Merge Risk: Minimal · up to 2af84

This PR updates build guides, a descriptor example, a Tor bind example, and a multisig test. It has no runtime impact on production code, and no actionable merge-blocking risk remains. Set a milestone on the PR to satisfy the milestone check.

Pre-merge checks: Passed 4

Check name Status Explanation
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.
Title check Passed The title names three upstream Bitcoin Core backports (bitcoin#30143, bitcoin#30502, bitcoin#29154), and the changeset touches the NetBSD build guide, tor.md, descriptors.md, and the multisig descript…
Description check Passed The description is related to the changeset. It explains that the PR backports three Bitcoin Core v0.28 changes to Dash: the NetBSD build guide (bitcoin#30143), the Tor bind example in doc/tor.md (bit…
Full details: Title check

Explanation

The title names three upstream Bitcoin Core backports (bitcoin#30143, bitcoin#30502, bitcoin#29154), and the changeset touches the NetBSD build guide, tor.md, descriptors.md, and the multisig descriptor PSBT test that those PRs cover. The title is specific about what is backported, but it lists PR numbers only and does not say what each change does, so it is only partially descriptive.

Full details: Description check

Explanation

The description is related to the changeset. It explains that the PR backports three Bitcoin Core v0.28 changes to Dash: the NetBSD build guide (bitcoin#30143), the Tor bind example in doc/tor.md (bitcoin#30502), and the wallet multisig descriptor test and docs (bitcoin#29154). It also lists the Dash-specific adaptations, such as keeping zstd, python312, sh(sortedmulti(...)) instead of wsh, and port 9996. The raw summary matches these files and changes. The description does not match the PR objectives, which also mention bitcoin#30551 (OpenBSD docs) and a different fork CI commit. That mismatch is noted for review, but the check is lenient and the description is on-topic.

Finishing Touches

Generate unit tests (beta)

  • Create a new PR
  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

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

Recent review info

Run configuration

  • Source mode: Auto
  • Repository: Unavailable
  • Branch: Unavailable
  • File: No configuration file from this repository applied
  • Commit: Unavailable
  • Layers: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 49aefff3-0a34-4a68-bfd3-65528654bdc3
Commits

Reviewing files that changed from the base of the PR and between ebbd1c2 and 2af84da.

Files selected for processing: 5

  • doc/build-netbsd.md
  • doc/build-openbsd.md
  • doc/descriptors.md
  • doc/tor.md
  • test/functional/wallet_multisig_descriptor_psbt.py

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 3 remain after this review.

@thepastaclaw

thepastaclaw commented Nov 15, 2026 •

Copy link
Copy Markdown
Collaborator

✅ Final review complete — no blockers (commit 4166c98)

85e480a doc: Update NetBSD Build Guide (Hennadii Stepanov)

Pull request description:

  This PR updates the NetBSD Build Guide to reflect:
  - the recent NetBSD Release
  - GCC minimum supported version update (bitcoin#28348 and bitcoin#29091)
  - Python minimum supported version update (bitcoin#28211)

  Also a smaller package set has been suggested:
  - `boost-headers` instead of the full `boost`
  - `qt5-qtbase qt5-qttools` instead of the full `qt5` (similar to bitcoin#29932 and bitcoin#29947).

ACKs for top commit:
  maflcko:
    utACK 85e480a

Tree-SHA512: 0848b6f169a00f2da78eea452fd116193aece853680f4e615ba1df654246ec2a9d1600a4cfb238eb9305b72bbe4b2873519bf1e2987eaaf48aba900c64e85a48

Dash adaptations:
- doc/build-netbsd.md: takes upstream's boost-headers package but keeps Dash's extra zstd dependency in the pkgin install line
- doc/build-netbsd.md: keeps Dash Core branding in the reworded GUI sentence ('To compile the GUI, Qt 5 is required.')
- doc/build-netbsd.md: keeps Dash's python312 instead of upstream's python39, because Dash's guide requires Python 3.10+
- doc/build-netbsd.md: the gcc9→gcc12 hunk is a no-op; Dash's guide already recommends gcc12 for C++20
6d33e13 doc: tor.md: use -bind=127.0.0.1:8334=onion for the Tor bind (David Gumberg)
a7f5d18 doc: add release notes for bitcoin#22729 (Vasil Dimov)

Pull request description:

  Add release notes for bitcoin#22729.

ACKs for top commit:
  davidgumberg:
    reACK bitcoin@6d33e13
  willcl-ark:
    ACK 6d33e13

Tree-SHA512: 9d7e66ee1d0bb1d75b8273707d30f20915d5040a768c2c5cd47c84997df2645c8bec35db6c09dc77ab917836622411b924373816cbc83c4be38e2e9156a139d8

Dash adaptations:
- doc/tor.md: uses Dash's mainnet onion bind port 9996 (BaseParams().OnionServiceTargetPort()) instead of Bitcoin's 8334

Not applicable to Dash (intentionally omitted):
- doc/release-notes-22729.md: Dash already covered bitcoin#22729 in its v24.0.0 notes, and the upstream text is wrong for Dash: -bind still adds the default onion bind unless -listenonion=0 (dash#7786/dashpay#8003)
…nd docs

d93b794 tests: improve wallet multisig descriptor test and docs (Michael Dietz)

Pull request description:

  It is best to store all key origin information
  (master key fingerprint and all derivation steps)
  in the multisig descriptor. Being explicit with
  this information should be beneficial if this approach is used with other wallets/signers (whether hardware or software). There is no harm including all of this with xpubs (if anything it simplifies the test code) and makes this example/docs more complete and safer incase it is referenced by others.

ACKs for top commit:
  S3RK:
    Code Review ACK d93b794
  achow101:
    ACK d93b794

Tree-SHA512: 0e5c4d13f060489405e6cf50c8a09911f5a0cee71023649235afd80a5e3aae38d52c6e12ad4660205b9357b09f45596941391bdcf6fceccbe07c4e5a1592a482

Dash adaptations:
- test/functional/wallet_multisig_descriptor_psbt.py: the multisig descriptors keep Dash's sh(sortedmulti(...)) instead of upstream's wsh(...) because Dash has no segwit
- doc/descriptors.md: the new 2-of-3 example uses sh(sortedmulti(...)) with its checksum recomputed (#6adrlqpw) instead of upstream's wsh(...)#av0kxgw0, because Dash has no segwit
@DCG-Claude
DCG-Claude force-pushed the backport-0.28-b005-doc branch from 2af84da to 4166c98 Compare November 16, 2026 00:06
@DCG-Claude DCG-Claude changed the title backport: bitcoin#30551, bitcoin#30143, bitcoin#30502, bitcoin#29154 backport: bitcoin#30143, bitcoin#30502, bitcoin#29154 Nov 16, 2026
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

Branch rewritten at 4166c982c1 (3 backport(s)).


🤖 backportsys, on behalf of the Dash backport pipeline.

@thepastaclaw thepastaclaw left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Final validation — Phase 1 + Phase 2

The backport is otherwise correct and limited to documentation and functional-test adaptations. The multisig procedure still tells Dash users to import unsupported wsh() descriptors, while the parser, new example, and adapted test require sh(); completed code/build/lint checks pass, with only non-code milestone checks failing and some sanitizer/multiprocess jobs still pending.

🟡 1 suggestion(s)

Approved: nothing here blocks the merge. The non-blocking findings are optional: fix them forward, in this PR or a follow-up, without waiting for another review round.

Review provenance

Source: reviewer 1: muse-spark-1.3-contributor (agent: phase1-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 4: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); reviewer 5: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 6: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 7: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); final verifier: gpt-6.1-sol (agent: sol-verifier, role: final-verifier)

  • Triage: normal by gpt-6.1-sol (effort low) — This is a contained backport spanning documentation and a wallet functional test, with no production behavior, consensus, funds, cryptography, or key-handling changes in the diff itself.
  • Phase 1 reviewers: muse-spark-1.3-contributor — general (completed, effort xhigh); agent phase1-reviewer
  • Phase 1 model: muse-spark-1.3-contributor — not quota-gated; passed over gemini-3.8-flash-high (antigravity quota lookup failed), glm-5.3-flash (not used above high effort; tier asks max)
  • Second Phase-2 pass: on this first full review every Phase-2 reviewer also ran a second, independent time, and the verifier weighed both sets
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — general (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort high); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort high); agent phase2-reviewer
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review (PastaClaw). How to work through them:
- Verify each finding against the code; fix only what is real, as narrowly as the finding.
- If a finding is wrong, decline it on its thread in one or two sentences; the bot answers once and stops.
- To defer one, link a tracking issue on its thread (or reply asking the bot to file one).
- Suggestions don't block the merge, but most are worth fixing in this PR; judge each on its merits.
- Keep the PR's scope; don't grow it to satisfy hardening suggestions.
- Carried items were raised in an earlier round: read the thread first, and don't re-fix what you already fixed, declined or deferred there. Disputed and deferred items are already handled and are not listed.

In `doc/descriptors.md`:
- [SUGGESTION] doc/descriptors.md:142-144: Multisig instructions still use unsupported wsh() descriptors
  The updated multisig procedure still instructs users to import `wsh(sortedmulti(...))` descriptors. Dash's descriptor parser has no `wsh()` branch and rejects it as an invalid descriptor function, whereas the new example and adapted functional test correctly use `sh()` because Dash has no SegWit support. Following this procedure therefore fails when the descriptors are passed to `getdescriptorinfo`; both wrappers in step 2 should be changed to `sh()`.

Comment thread doc/descriptors.md
Comment on lines +142 to +144
2. Create a watch-only descriptor wallet (blank, private keys disabled). Now the multisig is created by importing the external and internal descriptors:
`wsh(sortedmulti(<M>,XPUB1/0/*,XPUB2/0/*,…,XPUBN/0/*))` and `wsh(sortedmulti(<M>,XPUB1/1/*,XPUB2/1/*,…,XPUBN/1/*))`
(one descriptor w/ `0` for receiving addresses and another w/ `1` for change). Every participant does this
(one descriptor w/ `0` for receiving addresses and another w/ `1` for change). Every participant does this. All key origin information (master key fingerprint and all derivation steps) should be included with xpubs for proper support of hardware devices / external signers

@thepastaclaw thepastaclaw Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

⏸️ Needs a tracking issue (not yet deferred) at 4166c982; see the replies below.

🟡 Suggestion: Multisig instructions still use unsupported wsh() descriptors

The updated multisig procedure still instructs users to import wsh(sortedmulti(...)) descriptors. Dash's descriptor parser has no wsh() branch and rejects it as an invalid descriptor function, whereas the new example and adapted functional test correctly use sh() because Dash has no SegWit support. Following this procedure therefore fails when the descriptors are passed to getdescriptorinfo; both wrappers in step 2 should be changed to sh().

Suggested change
2. Create a watch-only descriptor wallet (blank, private keys disabled). Now the multisig is created by importing the external and internal descriptors:
`wsh(sortedmulti(<M>,XPUB1/0/*,XPUB2/0/*,…,XPUBN/0/*))` and `wsh(sortedmulti(<M>,XPUB1/1/*,XPUB2/1/*,…,XPUBN/1/*))`
(one descriptor w/ `0` for receiving addresses and another w/ `1` for change). Every participant does this
(one descriptor w/ `0` for receiving addresses and another w/ `1` for change). Every participant does this. All key origin information (master key fingerprint and all derivation steps) should be included with xpubs for proper support of hardware devices / external signers
`sh(sortedmulti(<M>,XPUB1/0/*,XPUB2/0/*,…,XPUBN/0/*))` and `sh(sortedmulti(<M>,XPUB1/1/*,XPUB2/1/*,…,XPUBN/1/*))`

source: muse-spark-1.3-contributor (phase1-reviewer: general); gpt-6.1-sol (phase2-reviewer: general, backport-reviewer, dash-core-commit-history); fresh:general

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

The wsh(sortedmulti(...)) line in step 2 was already in Dash before this backport: the bitcoin#29154 diff leaves it as unchanged context and only edits the lines around it, exactly as upstream does. The bot is right that Dash can't parse wsh(), but this commit didn't cause that, and its own new example and test already use sh(). Switching step 2 to sh() should go in a separate Dash-only doc fix, not in this backport.


🤖 backportsys, on behalf of the Dash backport pipeline.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I verified that the wsh(sortedmulti(...)) instructions predate this backport and are unchanged by it; the current line is still technically invalid for Dash, but I agree that correcting it belongs in a separate Dash documentation fix. Before I mark this deferred, please link the follow-up issue or PR, or say so and I’ll file it in dashpay/dash.

Not deferred yet: a deferral needs a tracking issue for the follow-up; until then the finding stands.

@thepastaclaw thepastaclaw added the pastaclaw:approved thepastaclaw's latest review approved this PR label Nov 16, 2026
@PastaPastaPasta PastaPastaPasta added this to the 24.1 milestone Nov 16, 2026
@PastaPastaPasta
PastaPastaPasta merged commit 0117263 into dashpay:develop Nov 16, 2026
52 of 55 checks passed
@thepastaclaw thepastaclaw removed the pastaclaw:approved thepastaclaw's latest review approved this PR label Nov 16, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants