Skip to content

backport: bitcoin#25284, bitcoin#28470, bitcoin#28473, bitcoin#27784 - #7865

Merged
PastaPastaPasta merged 5 commits into
dashpay:developfrom
thepastaclaw:backport-0.26-b063-misc
Oct 15, 2026
Merged

PastaPastaPasta merged 5 commits into
dashpay:developfrom
thepastaclaw:backport-0.26-b063-misc

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Oct 12, 2026 •

Copy link
Copy Markdown
Collaborator

🔎 Needs a careful look. Commits are ordered by how much they were adapted: 🔴 heavy first, then 🟡 light (at most two invented lines), then 🟢 faithful (identical to upstream apart from context).

Issue being fixed or feature implemented

Backports 4 Bitcoin Core v0.26 pull request(s) that the Dash queue selected, including any discovered prerequisites: bitcoin#25284, bitcoin#28470, bitcoin#28473, bitcoin#27784.

What was done?

upstream commit review gates notes
— (Dash prep) 6286992392 🟡 Dash-only — refactor: use HashVerifier in the evo snapshot decoder, so bitcoin#25284 can drop CHashVerifier as upstream does
bitcoin#25284 1f76e265da 🔴 heavy build:pass mech:warn pick:pass tests:warn tree:pass verify:pass This backports bitcoin#25284 (serialization parameters, AsBase, Action* rename, CAddress/CNetAddr SerParams re
bitcoin#28470 41f0ea6993 🟢 faithful build:pass mech:pass pick:pass tests:warn tree:pass verify:pass clean cherry-pick
bitcoin#28473 4a68ef76dc 🟢 faithful build:pass mech:pass pick:pass tests:pass tree:pass verify:pass This commit backports bitcoin#28473 in full: the serialize.h changes, the SER_PARAMS_OPFUNC shorthand and ever
bitcoin#27784 babb533cbe 🟢 faithful build:pass ci_fork:pass ci_upstream:pass mech:pass pick:pass tests:pass tree:pass verify:pass Backports bitcoin#27784, which adds a sync_blocks call so the pruned node catches up before more blocks are ge

Each commit keeps the upstream subject (partial Merge … only where a hunk is deferred to a prerequisite still to be backported, named in the commit body; a hunk Dash intentionally never wants is recorded in the commit body or the reviewer's note above and does not make the backport partial). Conflicts were resolved commit by commit; commits that needed no resolution were cherry-picked unchanged.

How Has This Been Tested?

Recorded per commit, at that commit's own sha, not once for the branch:

  • built at each commit, reusing the worktree build cache
  • the test suites touched by each diff run at that commit, where the diff selected one
  • a mechanical diff-of-diffs against the upstream patch (every upstream hunk present, no added line without an upstream counterpart, no Dash-specific line dropped)
  • an independent verification pass on 4 commit(s) that needed adaptation
  • CI green on the fork gate PR backport: v0.26 bitcoin#25284, bitcoin#28470, bitcoin#28473, bitcoin#27784 thepastaclaw/dash#83 at babb533cbe, which is this branch's head

Gates that did not come back clean — please weigh these:

Breaking Changes

None beyond the upstream changes themselves.

Checklist:

Left for the reviewer; backportsys does not tick boxes on its own behalf.

  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated relevant unit/integration/functional/e2e tests
  • I have made corresponding changes to the documentation
  • I have assigned this pull request to a milestone

Maintainer controls

Tick a box and backportsys acts on it within a few minutes, then clears the box. For anything else — a hunk to drop, a resolution to redo, a question — just leave a review comment; nothing here needs a box.

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

🔒 On hold: hands off, by PastaPastaPasta on #7865 at 2026-10-13T17:32:51Z. backportsys will not touch this branch again.

Maintainer follow-up (2026-10-13)

Branch updated by hand with backportsys on hold. Final tree diff against the previous head 980ae7aac8: 7 files, +20/−64.

  • New first commit 6286992392 moves src/evo/snapshot.h (SnapshotBoundedInput, ReadMinedQuorumCommitment) from the legacy CHashVerifier to HashVerifier. The decoder keeps GetType()/GetVersion() for the MN serializers, now taken from the underlying stream. The verifiers compute the same double-SHA256 over the same bytes.
  • net: Use serialization parameters for CAddress serialization bitcoin/bitcoin#25284 now deletes CHashVerifier from src/hash.h exactly as upstream fa626af3 does, so that upstream commit lands in full. With NetInfoEntry no longer wrapping its stream in OverrideStream, the snapshot-local ReadCompactSize(OverrideStream<SnapshotBoundedInput>&) overload had no callers and is removed in the same commit. Its budgeted-string test now reads through SnapshotBoundedInput directly, which is the path DomainPort strings take. The decode budget is unchanged: addrv2 address lengths go through CompactSizeFormatter, which never reached that overload.
  • refactor: Serialization parameter cleanups bitcoin/bitcoin#28473 also converts the Dash-only WithParams(CNetAddr::V1/V2, x) calls (src/evo/netinfo.h, src/netfulfilledman.h, src/test/evo_netinfo_tests.cpp) to the CNetAddr::V1(x) shorthand. As upstream does, WithParams stays where the parameter is a variable.
  • No wire or disk format changes. NetInfoEntry stays V2, and MnNetInfo, netfulfilled.dat, ProTx payloads and the VERSION message stay V1. The unique-property hash keeps its V1/V2 split on IsAddrV1Compatible().
  • Verified locally: debug build with -Werror; unit suites evo_snapshot, evo_netinfo, serialize, streams, net, netbase, addrman, hash, llmq_snapshot and evo_deterministicmns all pass (151 cases); the new first commit and the net: Use serialization parameters for CAddress serialization bitcoin/bitcoin#25284 commit compile on their own for the affected objects; whitespace, include and circular-dependency lints pass. fuzz: Rework addr fuzzing bitcoin/bitcoin#28470 and test: fix intermittent error in getblockfrompeer.py bitcoin/bitcoin#27784 are byte-identical cherry-picks of the previous commits.

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 12, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-13T18:01:27.969655Z babb533 New commits
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@coderabbitai

coderabbitai Bot commented Oct 12, 2026 •

Copy link
Copy Markdown

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Repository UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: 2fb20224-77d1-4cfa-a1dd-2e17cbf973cc
📥 Commits

Reviewing files that changed from the base of the PR and between 980ae7a and babb533.

📒 Files selected for processing (7)
  • src/evo/netinfo.h
  • src/evo/snapshot.cpp
  • src/evo/snapshot.h
  • src/hash.h
  • src/netfulfilledman.h
  • src/test/evo_netinfo_tests.cpp
  • src/test/evo_snapshot_tests.cpp

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

Walkthrough

Serialization now supports explicit parameters that select formats without relying on protocol-version flags. Address serialization and deserialization use V1 or V2 parameters across storage, network messages, and auxiliary structures. Tests and fuzz targets use the parameterized APIs, and serialization tests cover parameter-aware base and derived types.

Priority: ⚪ Not assessed

Estimated code review effort: 4 (Complex) | ~50 minutes

Merge Risk: ⚪ Minimal · up to babb5

No concrete issue has been established that prevents merging. Nested snapshot size accounting remains unverified.

Pre-merge checks · Passed 4 · Failed 1

Failed Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage Warning Docstring coverage is 15.05% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 93 functions across 34 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
Passed Passed checks (4 passed)
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.
Description check Passed The description clearly explains that the pull request backports four Bitcoin Core changes, summarizes the serialization and synchronization updates, and documents testing and adaptations.
Title check Passed The title concisely identifies the pull request as a backport of the four changes implemented in the diff.
  • Fix all pre-merge checks with AI
✨ 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

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

@thepastaclaw

thepastaclaw commented Oct 12, 2026 •

Copy link
Copy Markdown
Collaborator

✅ Final review complete — no blockers (commit babb533) · triage: critical

@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

Static verification of the complete PR range at 980ae7a found no actionable in-scope defects. Comparison with all four upstream patches confirms that the backported changes and tests are present, with justified Dash adaptations preserving address encodings, masternode property hashes, handshake extensions, persisted formats, and snapshot hash verification. No builds or tests were run locally; the supplied CI snapshot shows successful dependency builds and ClangFormat, with source-build and lint checks still pending.

Review provenance

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

  • Triage: critical by gpt-6.1-sol (effort low) — This intricate, cross-cutting serialization refactor changes peer-facing network deserialization in CNetAddr::Unserialize in src/netaddress.h and CAddress serialization in src/protocol.h, including how address encoding parameters propagate through streams.
  • 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 below 15% reserve: weekly 14% left, 5h 100% left), glm-5.3-flash (not used above high effort; tier asks max)
  • Single stage: Phase 1 and Phase 2 reviewed this head side by side, with no blocker gate between them (triage tier)
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort xhigh); agent phase2-reviewer

@thepastaclaw thepastaclaw added the pastaclaw:approved thepastaclaw's latest review approved this PR label Oct 12, 2026
PastaPastaPasta and others added 5 commits October 13, 2026 12:40
SnapshotBoundedInput and ReadMinedQuorumCommitment are the last Dash-only users
of the legacy CHashVerifier, which bitcoin#25284 removes along with its
remaining upstream users. Both only need the
hash of the bytes they consume, so the version-free HashVerifier is enough.
SnapshotBoundedInput still exposes GetType()/GetVersion() for the
CDeterministicMN serializers, now taken from the underlying stream instead
of the verifier.

Both verifiers compute the same double-SHA256 over the same bytes, so the
canonical-encoding checks are unchanged.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…erialization

fa626af Remove unused legacy CHashVerifier (MarcoFalke)
fafa3fc test: add tests that exercise WithParams() (MarcoFalke)
fac81af Use serialization parameters for CAddress serialization (MarcoFalke)
faec591 Support for serialization parameters (MarcoFalke)
fac42e9 Rename CSerAction* to Action* (MarcoFalke)
aaaa3fa Replace READWRITEAS macro with AsBase wrapping function (MarcoFalke)

Pull request description:

  It seems confusing that picking a wrong value for `ADDRV2_FORMAT` could have effects on consensus. (See the docstring of `ADDRV2_FORMAT`).

  Fix this by implementing bitcoin#19477 (comment) .

  This may also help with libbitcoinkernel, see bitcoin#28327

ACKs for top commit:
  TheCharlatan:
    ACK fa626af
  ajtowns:
    ACK fa626af

Tree-SHA512: 229d379da27308890de212b1fd2b85dac13f3f768413cb56a4b0c2da708f28344d04356ffd75bfcbaa4cabf0b6cc363c4f812a8f1648cff9e436811498278318

Dash adaptations:
- src/net_processing.cpp: PushNodeVersion keeps Dash's nProtocolVersion (-pushversion), mnauthChallenge and m_masternode_connection fields; only addr_you/CService{} are wrapped in WithParams(CNetAddr::V1, ...) as upstream does
- src/addrdb.cpp: DumpPeerAddresses/LoadAddrman keep Dash's gArgs.GetDataDirNet() (Dash's existing difference from upstream's args.) and drop the CLIENT_VERSION argument as upstream does
- src/serialize.h: Dash's HAVE_CONFIG_H/config include kept; upstream's new #include <attributes.h> added after it
- src/version.h: upstream edits a comment in Bitcoin's version list that Dash does not have; Dash's own line 'Make sure that none of the values above collide with `ADDRV2_FORMAT`' is removed because ADDRV2_FORMAT no longer exists; all Dash protocol-version constants kept
- src/test/netbase_tests.cpp: the caddress_(un)serialize_v1/v2 tests are at a different place in Dash's file; upstream's edits (DataStream + WithParams(CAddress::V1_NETWORK/V2_NETWORK, ...)) applied to Dash's existing copies; Dash's LookupSubNet(...).IsValid() checks kept
- src/test/serialize_tests.cpp: upstream's new params tests (Base/Derived/WithParams) appended after Dash's LIMITED_VECTOR tests; upstream's added #include <string> left out because Dash's include block already has it
- src/test/fuzz/deserialize.cpp: Dash's '*/' that ends the commented-out block_filter_deserialize target kept before upstream's new addr_info_deserialize FUZZ_TARGET; Dash's script/sign.h and util/system.h includes kept
- src/evo/netinfo.h (Dash-only): NetInfoEntry used OverrideStream with |ADDRV2_FORMAT, which upstream removed; it now uses WithParams(CNetAddr::V2, service). MnNetInfo (de)serialized CService on streams without ADDRV2_FORMAT and now uses WithParams(CNetAddr::V1, ...), including the CSizeComputer size override. Wire and disk bytes are unchanged
- src/evo/deterministicmns.h (Dash-only): GetUniquePropertyHash<CService> switched from ser_version |= ADDRV2_FORMAT to WithParams(IsAddrV1Compatible() ? CNetAddr::V1 : CNetAddr::V2, v), with non-CService types in an else branch of the if constexpr; the hash input bytes are identical, so the unique-property map stays compatible. CSerAction{Serialize,Unserialize} renamed to Action{Serialize,Unserialize} (upstream rename) in the immer-map SerReadWrite overloads and CDeterministicMNList
- src/llmq/snapshot.h (Dash-only): CSerAction{Serialize,Unserialize} -> Action{Serialize,Unserialize} (upstream rename) in CQuorumSnapshot and CQuorumRotationInfo
- src/evo/snapshot.h, src/evo/snapshot.cpp, src/test/evo_snapshot_tests.cpp (Dash-only): with NetInfoEntry no longer wrapping its stream in OverrideStream, the snapshot-local ReadCompactSize(OverrideStream<SnapshotBoundedInput>&) overload has no callers; removed, along with the comment mentioning it, and its budgeted-string test now reads through SnapshotBoundedInput directly, which is the path DomainPort strings take. The budget accounting is unchanged: addrv2 address lengths are read through CompactSizeFormatter, which never reached that overload
- src/netfulfilledman.h (Dash-only): the netfulfilled.dat store serializes std::map<CService,...> keys; it now uses READWRITE(WithParams(CNetAddr::V1, ...)), which matches the old no-ADDRV2_FORMAT stream, so the on-disk format is unchanged

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
fad52ba fuzz: Rework addr fuzzing (MarcoFalke)
fa5b6d2 fuzz: Drop unused params from serialize helpers (MarcoFalke)

Pull request description:

  Some minor fixups to addr fuzzing

ACKs for top commit:
  dergoegge:
    utACK fad52ba

Tree-SHA512: 6a2b07fb1a65cf855d5e7c0a52bfcb81d46dbc5d4b3e72cef359987cbd28dbfeb2fc54f210e9737cb131b40ac5f88a90e9af284e441e0b37196121590bbaf015
fb6a2ab scripted-diff: use SER_PARAMS_OPFUNC (Anthony Towns)
5e5c8f8 serialize: add SER_PARAMS_OPFUNC (Anthony Towns)
33203f5 serialize: specify type for ParamsWrapper not ref (Anthony Towns)
bf147bf serialize: move ser_action functions out of global namespace (Anthony Towns)

Pull request description:

  Cleanups after bitcoin#25284:

   * ser_action namespacing - bitcoin#25284 (comment)
   * make reference implicit - bitcoin#25284 (comment)
   * function notation - bitcoin#25284 (comment)

ACKs for top commit:
  MarcoFalke:
    lgtm ACK fb6a2ab 💨
  TheCharlatan:
    ACK fb6a2ab

Tree-SHA512: aacca2ee9cfec360ade6b394606e13d1dfe05bc29c5fbdd48a4e6992bd420312d4ed0d32218d95c560646af326e9977728dc2e759990636298e326947f6f9526

Dash adaptations:
- src/net_processing.cpp: PushNodeVersion keeps Dash's nProtocolVersion (-pushversion), the mnauthChallenge and m_masternode_connection fields and Dash's indentation; only the two WithParams(CNetAddr::V1, ...) calls became CNetAddr::V1(...), as upstream did
- src/test/netbase_tests.cpp: the caddress_serialize/unserialize v1/v2 tests and isbadport already exist in Dash earlier in the file (about line 413), so upstream's re-added copy of that block was dropped and its four WithParams -> CAddress::V1_NETWORK/V2_NETWORK(...) changes were made in Dash's existing tests; Dash's LookupSubNet(...).IsValid() checks are kept
- src/evo/netinfo.h, src/netfulfilledman.h, src/test/evo_netinfo_tests.cpp (Dash-only): the WithParams(CNetAddr::V1/V2, x) calls added for bitcoin#25284 now use the CNetAddr::V1(x)/CNetAddr::V2(x) shorthand, as upstream does for its own calls; WithParams stays where the parameter is a variable (GetUniquePropertyHash in src/evo/deterministicmns.h), as upstream keeps it in protocol.h and net_processing.cpp

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
9fe9074 test: add block sync to getblockfrompeer.py (Martin Zumsande)

Pull request description:

  This adds an additional `sync_blocks` call, fixing an intermittent error caused by blocks arriving out of order due to how compact block relay may revert to headers processing when the tip hasn't caught up, and resulting in slightly different pruning behavior.
  Making sure that all blocks from the previous tests are synced before generating more blocks makes this impossible.

  See bitcoin#27749 (comment) and bitcoin#27749 (comment) for a more detailed analysis.

  bitcoin#27770 is a more long-term approach to avoid having to deal with magic pruneheight numbers in the first place, but that PR introduces a new RPC and needs more discussion.

  Fixes bitcoin#27749.

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 9fe9074
  theStack:
    ACK 9fe9074

Tree-SHA512: f3de1ea68725429aeef448c351ea812b805fa216912b112d7db9aceeddb1f2381b705c2577734b0d308e78ec5e0c4d26dc65fc2171f6e21f13061fc71d48216c

Dash adaptations:
- test/functional/rpc_getblockfrompeer.py: added upstream's sync_blocks([nodes[0], pruned_node]) after connect_nodes(0, 2) and moved the 'We need to generate more blocks to be able to prune' comment below it, as upstream does. Dash's generate(..., 900) and its comment about Dash's smaller blocks stay in place of upstream's generate(..., 400).
@PastaPastaPasta
PastaPastaPasta force-pushed the backport-0.26-b063-misc branch from 980ae7a to babb533 Compare October 13, 2026 17:52
@thepastaclaw thepastaclaw removed the pastaclaw:approved thepastaclaw's latest review approved this PR label Oct 13, 2026

@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.

Re-review — Final validation — Phase 1 + Phase 2

Reviewed the complete 35-file diff and found no actionable in-scope defects; the inspected Dash adaptations preserve address encodings, unique-property hash inputs, and snapshot hash verification. The reported stale comment exists, but it is unchanged upstream documentation rather than a Dash adaptation defect and is excluded under the backport review policy. Validation was static only: git diff --check passed, no builds or tests were run, and the supplied CI snapshot still has pending main, ARM64, formatting, title, and merge checks, with conflict prediction cancelled.

🔴 0 blocking | 🟡 0 suggestion(s) | 💬 0 nitpick(s)

Review provenance

Source: reviewer 1: gpt-6.1-sol (agent: phase2-reviewer, role: general); reviewer 2: gpt-6.1-sol (agent: phase2-reviewer, role: backport-reviewer); reviewer 3: gpt-6.1-sol (agent: phase2-reviewer, role: dash-core-commit-history); reviewer 4: muse-spark-1.3-contributor (agent: phase1-reviewer, role: general); 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: critical by gpt-6.1-sol (effort low) — The intricate, cross-cutting serialization refactor directly changes peer-facing address deserialization in src/protocol.h (CAddress) and src/netaddress.h (CNetAddr), including how network encoding parameters propagate through streams.
  • 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 below 15% reserve: weekly 14% left, 5h 100% left), glm-5.3-flash (not used above high effort; tier asks max)
  • Single stage: Phase 1 and Phase 2 reviewed this head side by side, with no blocker gate between them (triage tier)
  • Fresh final gate: an independent Phase-2 review ran after iterative findings were reconciled
  • Fresh verifier: gpt-6.1-sol — final-verifier; agent sol-verifier
  • Phase 2 reviewers: gpt-6.1-sol — general (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — general (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — backport-reviewer (completed, effort xhigh); agent phase2-reviewer, gpt-6.1-sol — dash-core-commit-history (completed, effort xhigh); agent phase2-reviewer
🤖 Prompt for all review comments with AI agents
These findings are from an automated code review. Verify the current code and confirm that no unresolved issues remain.

No unresolved findings remain from the prior review on this head.

@thepastaclaw thepastaclaw added the pastaclaw:approved thepastaclaw's latest review approved this PR label Oct 13, 2026
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

batch backport-0.26-b063-misc is over: tracker#3507 closed by a human

@DCG-Claude DCG-Claude closed this Oct 13, 2026
@thepastaclaw thepastaclaw removed the pastaclaw:approved thepastaclaw's latest review approved this PR label Oct 13, 2026
@PastaPastaPasta

Copy link
Copy Markdown
Member

Reopening: this was closed by mistake. A cleanup script of mine closed the batch's tracker issue, which made backportsys treat the batch as abandoned. The batch is being restored as it was.


🤖 Posted autonomously by Claude on behalf of pasta.

@PastaPastaPasta PastaPastaPasta 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.

approved

@PastaPastaPasta
PastaPastaPasta merged commit d7fad73 into dashpay:develop Oct 15, 2026
81 of 98 checks passed

@knst knst 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.

post-utACK babb533

PastaPastaPasta added a commit that referenced this pull request Oct 17, 2026
6c02b2b ci: let DEPENDS_ARCH override the machine arch for multiprocess and tsan (pasta)
ce5dbf3 Merge #7888: fix(consensus): canonical ExtNetInfo encoding and strict netInfo decoding (pasta)
54cba5c Merge #7537: fix: data races and check-then-act races in the CoinJoin server (pasta)
08d8bca Merge #7909: feat(mining): build the masternode list incrementally during block assembly (pasta)
5633761 Merge #7895: test: cover retroactive provider tx refusal, fix wording (pasta)
cbb9500 Merge #7846: fix: treat pending owner keys and Platform node IDs as one conflict namespace (pasta)
8efdf5e Merge #7857: fix: mine a pending ProUpServTx before a key change of its masternode (pasta)
e56e6ae Merge #7842: fix(wallet): reject mnemonic passphrases that seed derivation truncates (pasta)
79480ff test: follow-up for #7821: check if wallet is locked after failed upgrade instead creating brand-new scenario (Konstantin Akimov)
a56ed47 fix(net): announce sporks to new peers instead of requesting them during mnsync (pasta)
cdaea5f Merge #7894: fix: due to logical conflicts feature_pruning.py had been broken while (pasta)
98d92f6 Merge #7817: backport: partial bitcoin#34156 restore cleanup ownership (pasta)
35e6d18 Merge #7858: fix: do not InstantSend-lock provider transactions (pasta)
904d73d Merge #7881: fix: refuse to sign shared registrar updates that move the funder's coins (pasta)
95982f5 Merge #7782: fix(wallet): persist pending-observation coin locks once the record becomes readable (pasta)
cdf65d0 Merge #7836: backport: partial bitcoin#25812, bitcoin#29855 (pasta)
cc5716f Merge #7824: fix: retain initialized DKG sessions during inventory reads (pasta)
588e458 Merge #7827: backport: partial bitcoin#35984 (pasta)
795c6f1 Merge #7839: fix: release InstantSend tracking after mempool eviction (pasta)
dc1a6b2 Merge #7875: docs(rpc): clarify getchainlockbyheight availability (pasta)
e4798ff Merge #7876: fix(consensus): capture operator key scheme changes with unchanged bytes in state diffs (pasta)
fe68ecb Merge #7871: backport!: Merge bitcoin#27217: wallet: Replace use of purpose strings with an enum (pasta)
8348d22 Merge #7867: fix: refuse masternode list RPCs for blocks outside the active chain (pasta)
861a579 Merge #7866: fix: stop `masternode payments` at the genesis block (pasta)
efcef71 Merge #7521: fix: update masternode rate limit on failed governance trigger path (pasta)
0623182 Merge #7831: fix: bound governance object signatures and reset the governance cache (pasta)
b230657 Merge #7841: fix: authenticate cached InstantSend proof bytes (pasta)
a1f37ea Merge #7820: fix: hold chainstate lock during CoinJoin input validation (pasta)
50a5617 Merge #7829: fix: preserve wallet permissions when changing passphrases (pasta)
2ff0103 Merge #7818: fix: return REST errors for unavailable deployment data (pasta)
cb39369 Merge #7834: fix: validate Electrum import input boundaries (pasta)
e7e3daa Merge #7821: fix: relock encrypted wallets after HD upgrade failures (pasta)
2fea45f Merge #7792: fix: treat missing snapshots during evodb repair as repair errors (pasta)
3c5c039 Merge #7838: fix(wallet): authenticate unlock deadline extensions (pasta)
0bf80f8 Merge #7810: fix(rpc): handle unavailable masternode payment inputs (pasta)
bcefee4 Merge #7822: fix: reject malformed detached quorum share batches (pasta)
86a7737 Merge #7828: fix: omit recovery words from invalid mnemonic errors (pasta)
886d5c4 Merge #7816: fix: check credit pool amount accumulation (pasta)
00fc3b9 Merge #7851: fix(rpc): correct masternode status help for top-level service field (pasta)
0e75c22 Merge #7814: fix(qt): restore HTML escaping of send confirmation recipients (pasta)

Pull request description:

  ## Issue being fixed or feature implemented

  Backports for v24.0.0-rc.4, on top of `v24.0.x` at the v24.0.0-rc.3 tag (0364ed6, #7808).

  ## What was done?

  Cherry-picked (`git cherry-pick -m1 -x`) every develop merge since rc.3 that carries `backport-candidate-24.0.x`, plus eight unlabeled fixes picked after an audit of every other develop merge since rc.3 (marked † below). They are in develop merge order:

  - #7814 fix(qt): restore HTML escaping of send confirmation recipients †
  - #7851 fix(rpc): correct masternode status help for top-level service field
  - #7816 fix: check credit pool amount accumulation
  - #7828 fix: omit recovery words from invalid mnemonic errors †
  - #7822 fix: reject malformed detached quorum share batches †
  - #7810 fix(rpc): handle unavailable masternode payment inputs †
  - #7838 fix(wallet): authenticate unlock deadline extensions
  - #7792 fix: treat missing snapshots during evodb repair as repair errors
  - #7821 fix: relock encrypted wallets after HD upgrade failures
  - #7834 fix: validate Electrum import input boundaries
  - #7818 fix: return REST errors for unavailable deployment data
  - #7829 fix: preserve wallet permissions when changing passphrases
  - #7820 fix: hold chainstate lock during CoinJoin input validation
  - #7841 fix: authenticate cached InstantSend proof bytes
  - #7831 fix: bound governance object signatures and reset the governance cache
  - #7521 fix: update masternode rate limit on failed governance trigger path
  - #7866 fix: stop `masternode payments` at the genesis block
  - #7867 fix: refuse masternode list RPCs for blocks outside the active chain †
  - #7871 backport!: bitcoin#27217: wallet: Replace use of purpose strings with an enum
  - #7876 fix(consensus): capture operator key scheme changes with unchanged bytes in state diffs
  - #7875 docs(rpc): clarify getchainlockbyheight availability †
  - #7839 fix: release InstantSend tracking after mempool eviction
  - #7827 backport: partial bitcoin#35984
  - #7824 fix: retain initialized DKG sessions during inventory reads
  - #7836 backport: partial bitcoin#25812, bitcoin#29855
  - #7782 fix(wallet): persist pending-observation coin locks once the record becomes readable
  - #7881 fix: refuse to sign shared registrar updates that move the funder's coins †
  - #7858 fix: do not InstantSend-lock provider transactions
  - #7817 backport: partial bitcoin#34156 restore cleanup ownership
  - #7894 test: fix feature_pruning.py restart arguments † (needed because #7792 makes the evodb repair fatal, which the old restart arguments trip)
  - #7893 fix(net): announce sporks to new peers instead of requesting them during mnsync
  - 4a19742 (from #7859) test: follow-up for #7821: check if wallet is locked after failed upgrade instead creating brand-new scenario. Test-only, picked as its commit. Without it, #7821's `test_failed_upgrade()` expects RPC error -1 for a 257-byte mnemonic passphrase, which #7842's new precheck rejects with -8 first, so `wallet_upgradetohd.py --legacy-wallet` fails. On develop, #7859 replaced that scenario before #7842 merged. The rest of #7859 is test cleanup and docs and is left out.
  - #7842 fix(wallet): reject mnemonic passphrases that seed derivation truncates
  - #7857 fix: mine a pending ProUpServTx before a key change of its masternode
  - #7846 fix: treat pending owner keys and Platform node IDs as one conflict namespace
  - #7895 test: cover retroactive provider tx refusal, fix wording
  - #7909 feat(mining): build the masternode list incrementally during block assembly
  - #7537 fix: data races and check-then-act races in the CoinJoin server
  - #7888 fix(consensus): canonical ExtNetInfo encoding and strict netInfo decoding

  34 of the 39 picks change exactly the same lines as their develop merges. #7888 and #7782 needed test-only changes (see testing), and three others needed adaptation, described in their commit messages:

  - **#7893** was merged to develop twice: f99212b with an earlier revision of its commit, then 72a5997 with the final one, so develop now announces sporks twice in the VERACK handler (a develop fix is open separately). Here the PR's final commit 45acdf3 is picked once instead of either merge. In `src/node/sync_manager.cpp`, this branch still sent `GETSPORKS` from the mnsync tick on every network, because #7847, which limited it to test chains, is not included. The request is removed entirely, as on develop. Mainnet spork values are hardcoded in `CSporkManager::GetSporkValue`, so the mainnet request had no effect.
  - **#7857** and **#7909**: develop folded `CChainstateHelper` into `Chainstate` (d5c1bd7), which is not on this branch, so the new code goes through `ChainHelper().special_tx` / `m_chain_helper.special_tx` instead of `m_special_tx`. The neighbouring develop-only `CSpecialTxProcessor::GetDeterministicMNListHash` is left out.

  #7888 tightens consensus rules for ExtAddr provider transactions behind V24, so I checked it against testnet. V24 is not active there yet (the tip's CbTx is still version 3), so the chain has no ExtAddr ProTxs the new rules could reject. rc.3's own serializer always writes canonical, sorted purposes, so every ProTx it builds passes the new rules. Mixed rc.3/rc.4 networks could only split on a hand-crafted non-canonical ExtAddr ProTx mined after V24 activates. So testnet miners and masternodes should move to rc.4 before V24 is signalled.

  Unlabeled develop fixes since rc.3 that were audited and left out:
  - Worth considering before the final release: #7869 (startup block replay after an unclean shutdown asserts on a quorum commitment, so recovery needs `-reindex-chainstate`; not a v24 regression), #7833 (gate signing intake before quorum retrieval, DoS hardening), #7682 (intermittent `relic_conf.h` parallel-build failure).
  - Left for 24.1: #7812, #7826, #7844, #7847, #7850, #7868, plus the routine upstream backports (#7780, #7806, #7830, #7855, #7856, #7862, #7863, #7865, #7883, #7884, #7898, #7906), refactors (#7805, #7878, #7880), and CI, docs and test-only changes.

  One CI-only commit comes last. It takes only the `ci/test` hunks of 6f71fa5 (#7901), which make `ci/test/00_setup_env_native_{multiprocess,tsan}.sh` honor `DEPENDS_ARCH`. Pull requests into `v24.0.x` run develop's workflow files (`pull_request_target`), and since #7901 those check the depends cache on x86_64 runners and pass the aarch64 build arch in `DEPENDS_ARCH`. Without the hunks, `linux64_multiprocess / Build depends` fails on any depends cache miss (`Build runner computes HOST=aarch64-linux-gnu but check-cache used x86_64-pc-linux-gnu`). Without `DEPENDS_ARCH` the scripts still use `uname -m`, so this branch's own push CI is unchanged.

  No version change is needed. `configure.ac` is already 24.0.0 with `CLIENT_VERSION_IS_RELEASE` false, so the build takes its version string from the `v24.0.0-rc.4` tag.

  ## How Has This Been Tested?

  Built and tested at 6c02b2b on macOS arm64 against depends, with `--enable-debug --enable-werror --disable-hardening`.

  - `make check`: all unit test suites pass, including `test_dash-qt`.
  - Functional tests, all passing: `feature_evo_shares_activation.py`, `feature_governance_objects.py`, `feature_llmq_signing.py` (plain and `--spork21`), `feature_masternode_shares.py`, `feature_sporks.py`, `interface_rest.py`, `p2p_instantsend.py`, `p2p_quorum_data.py`, `rpc_masternode.py`, `rpc_psbt.py`, `rpc_quorum.py`, `wallet_backup.py`, `wallet_dump.py`, `wallet_encryption.py`, `wallet_labels.py` and `wallet_upgradetohd.py`, each with `--descriptors` and `--legacy-wallet` where it supports them.

  - Each pick's changed lines were compared with its develop merge (or, for #7893, its PR commit). They are identical except for the #7893, #7857 and #7909 adaptations above, and the #7888 test adaptation below.
  - A local macOS arm64 debug build (`--enable-debug --enable-werror`) compiled most of the tree and stopped on a single error in `src/test/evo_netinfo_tests.cpp`. #7888's new test used `CNetAddr::V2()`, the serialization-parameter API from bitcoin#25284, which this branch lacks. The pick now writes that entry through an `OverrideStream` with `ADDRV2_FORMAT`, the way `NetInfoEntry::Serialize` does on this branch (see its commit message).
  - #7782's new unit test reloads the wallet with develop's three-argument `CWallet` constructor. On this branch the constructor still takes the CoinJoin loader and an `ArgsManager`, so the test passes them the way its fixture already does (see the commit message).
  - With both test fixes, a full local `make` (`dashd`, `dash-qt`, `test_dash`, `test_dash-qt`) completes with no errors.
  - `feature_pruning.py` is an extended test that CI does not run. #7894 is included because #7792 makes its restart path fail.

  ## Breaking Changes

  Carried over from the picked PRs:

  - #7876: rc.1 to rc.3 nodes that connected an affected block stored a wrong masternode list diff for it. Those nodes need `-reindex`; `-reindex-chainstate` is not enough for nodes that already marked the following block invalid.
  - #7888: stricter ExtAddr `netInfo` decoding and validation behind V24 (see above). The RFC1918 check now applies even with `-allowprivatenet`.
  - #7858: provider transactions no longer get InstantSend locks. Software that waits for an islock on a ProTx should wait for a ChainLock or confirmations instead.
  - #7857: a `ProUpServTx` spending an output of a pending operator key change, asset lock, asset unlock or MNHF signal is rejected from the mempool until that transaction confirms.
  - #7831: governance object signatures over 96 bytes are rejected, and the governance cache is discarded and re-synced on first start (`doc/release-notes-7831.md`).
  - #7871: address purposes are limited to `send`, `receive` and `refund`. Wallets with other purpose strings load with warnings, and `listlabels` errors on an unknown purpose (`doc/release-notes-27217.md`).
  - #7842: creating an HD wallet with a mnemonic passphrase over 248 bytes fails unless `-allow-deprecated-long-mnemonics` is set, and over 256 bytes always fails (`doc/release-notes-7842.md`).
  - #7792: a node whose evodb is missing a masternode list snapshot now stops at startup and asks for `-reindex`, and `evodb repair` reports it in `repairErrors`.
  - #7867: `protx info <proTxHash> <blockHash>`, `protx listdiff` and `masternode payments <blockHash>` return an error for blocks outside the active chain.
  - #7881: `protx shared_combine` on a `ProUpSharedRegTx` is refused unless its inputs are unlocked coins of a single address of the calling wallet, change returns to that address, and the fee is within `-maxtxfee`.
  - #7836: PSBTs referencing nonexistent previous outputs fail to deserialize (RPC error -22).
  - #7834: negative Electrum-import rescan indices are rejected.
  - #7893: on this branch, mainnet nodes no longer send `GETSPORKS` during mnsync (no effect, mainnet spork values are hardcoded).

  ## Checklist:
  - [x] 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

  🤖 Generated with [Claude Code](https://claude.com/claude-code)

Top commit has no ACKs.

Tree-SHA512: 7de9535ca51620f4ddf5a46df2c3341a5e5fdd2263606f83f7db6b576c31ff7b82e1b285bf66988ac4b2729a9060513c45710135f61d7fd5c147b670d5f405dc
@PastaPastaPasta PastaPastaPasta added this to the 24.1 milestone Oct 30, 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.

4 participants