Skip to content

backport: v0.26 bitcoin#28404, bitcoin#27759 - #70

Open
DCG-Claude wants to merge 2 commits into
developfrom
backport-0.26-b015-src
Open

DCG-Claude wants to merge 2 commits into
developfrom
backport-0.26-b015-src

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Sep 20, 2026 •

Copy link
Copy Markdown
Collaborator

Automated Bitcoin Core v0.26 backports, batch backport-0.26-b015-src.

upstream commit gates notes
bitcoin#28404 779f819121 pick:pass build:pass tests:warn mech:warn tree:pass verify:pass This commit is an exact copy of upstream's libsecp256k1 subtree update to release 0.4.0: its diff matches upstream's byt
bitcoin#27759 45969d6760 pick:pass build:pass tests:pass mech:warn tree:pass verify:pass Moves the MigrationData struct from walletutil.h to scriptpubkeyman.h and adds the include fixes from bitcoin#27759, car
Provenance

Each commit passed: cherry-pick (adapted by an Opus lane only where conflicts existed), build, touched tests, a mechanical diff-of-diffs check (every upstream hunk landed; no added line without an upstream counterpart), and an independent Opus verification lane where anything was adapted. Gate rows and lane artifacts are in the backportsys DB.

@DCG-Claude DCG-Claude changed the title backport: v0.26 bitcoin#28404 backport: v0.26 bitcoin#28404, bitcoin#27469, bitcoin#27786 Sep 22, 2026
@DCG-Claude DCG-Claude changed the title backport: v0.26 bitcoin#28404, bitcoin#27469, bitcoin#27786 backport: v0.26 bitcoin#28404, bitcoin#27469, bitcoin#27786, bitcoin#27759 Oct 2, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b015-src branch from f523d50 to 2696840 Compare October 4, 2026 01:54
@github-actions

github-actions Bot commented Oct 8, 2026

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@DCG-Claude DCG-Claude changed the title backport: v0.26 bitcoin#28404, bitcoin#27469, bitcoin#27786, bitcoin#27759 backport: v0.26 bitcoin#28404, bitcoin#27759 Oct 9, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b015-src branch from 2696840 to 858ef94 Compare October 9, 2026 02:42
c0da4f6 Squashed 'src/secp256k1/' changes from c545fdc..199d27c (Pieter Wuille)

Pull request description:

  We had previously pulled in a non-released commit along with bitcoin#27479. The necessary changes have now been released in version 0.4.0, so update to that.

ACKs for top commit:
  hebasto:
    ACK 0e0fc18, having a zero diff with my local branch that updates the `secp256k1` subtree up to v0.4.0.
  fanquake:
    ACK 0e0fc18

Tree-SHA512: 8b771e7da89b9cdb7a680b9dd4eb99a6f737b32914b0b62c485b3c484e5438f9f60942030d3072243aaa196da22d2b1fdb3b6a668d75a46e6ac78c9d86b4bd8b
1f97572 Fix `#include`s in `src/wallet` (Hennadii Stepanov)

Pull request description:

  This PR is a minimum required changes to fix bitcoin#27571 (comment).

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 1f97572

Tree-SHA512: de885210076d23f3394c42ca50e6ae2470c0ae6523399a2fa3ebb7c06383bdacef9c26166fa19747200396bed796c8772165e24416eb30ed8edd024e3394b2fe

Dash adaptations:
- src/wallet/scriptpubkeyman.h: adds <logging.h> next to Dash's <outputtype.h>, which upstream had already removed
- src/wallet/scriptpubkeyman.h: the moved MigrationData keeps Dash's mnemonic, passphrase and chain-counter fields
- src/wallet/wallet.cpp: adds <wallet/scriptpubkeyman.h> among Dash's includes; upstream's <wallet/fees.h> context line is not brought in
- src/wallet/walletutil.h: drops the forward declarations and MigrationData as upstream does; Dash's WalletDescriptor is unchanged

Not applicable to Dash (intentionally omitted):
- ci/test/06_script_b.sh: only drops a walletutil exclusion from upstream's tidy filter; Dash removed this script and ci/dash/lint-tidy.sh has no such filter
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b015-src branch from 290b27d to 45969d6 Compare October 10, 2026 00:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant