Skip to content

backport: v0.26 bitcoin#28168 - #74

Closed
DCG-Claude wants to merge 1 commit into
developfrom
backport-0.26-b031-src-wallet
Closed

DCG-Claude wants to merge 1 commit into
developfrom
backport-0.26-b031-src-wallet

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-b031-src-wallet.

upstream commit gates notes
bitcoin#28168 efaa387959 pick:pass build:pass tests:pass mech:warn tree:pass verify:pass ci_fork:pass Backports bitcoin#28168, which removes UniValue's raw-pointer read overloads and turns the generated json_tests test-dat

Skipped in this batch:

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.

@github-actions

Copy link
Copy Markdown

This pull request has conflicts, please rebase.

@DCG-Claude DCG-Claude changed the title backport: v0.26 bitcoin#26690 backport: v0.26 bitcoin#26690, bitcoin#28168 Sep 24, 2026
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

tracker#3148 closed by a human

…from univalue

fa940f4 Remove unused raw-pointer read helper from univalue (MarcoFalke)

Pull request description:

  The helpers are unused outside of tests and redundant with the existing `bool read(std::string_view raw);`.

  Fix both issues by removing them.

  Also, simplify the tests code by removing a `std::string` constructor where possible.

ACKs for top commit:
  stickies-v:
    utACK fa940f4
  TheCharlatan:
    tACK fa940f4

Tree-SHA512: 60c154c1046f01551335af79bf820a6104844f63e89977271b4336b3cd06ac3bab1379e18b7bc61d12bef7446029e91c16541ddecf9e88bc8bc897fc1f6ee2c8

Dash adaptations:
- src/test/script_tests.cpp: kept Dash's side (no witness comment block, no taproot/asset tests); applied only the two read_json(json_tests::script_tests) simplifications in script_build and script_json_test
- src/test/evo_trivialvalidation.cpp: Dash-only call sites built std::string(json_tests::trivially_{valid,invalid}, ... + sizeof(...)); json_tests symbols are now std::string (Makefile.test.include change), so rewritten to `const std::string& json{json_tests::...}`
- src/test/governance_validators_tests.cpp: Dash-only read_json(std::string(json_tests::proposals_{valid,invalid}, ... sizeof ...)) rewritten to read_json(json_tests::proposals_{valid,invalid}) to match the new generated std::string type
- src/wallet/test/bip39_tests.cpp: Dash-only read_json(std::string(json_tests::bip39_vectors, ... sizeof ...)) rewritten to read_json(json_tests::bip39_vectors) for the same reason
- build_msvc/test_bitcoin/test_bitcoin.vcxproj: modify/delete conflict resolved by keeping the deletion; Dash has no build_msvc/ tree (the old MSVC build system was removed), and Dash has no other MSVC project that generates json headers

Not applicable to Dash (intentionally omitted):
- build_msvc/test_bitcoin/test_bitcoin.vcxproj: Dash's tree contains no build_msvc/ at all (MSVC build system removed); the equivalent generator change (json.h -> std::string) is applied in Dash's only generator, src/Makefile.test.include
- src/test/script_standard_tests.cpp: hunk edits bip341_spk_test_vectors (TaprootBuilder test); Dash has no taproot and neither that test nor bip341_wallet_vectors.json exists in Dash
- src/test/script_tests.cpp: the bip341_keypath_test_vectors hunk edits a taproot sighash test Dash does not have (no bip341_wallet_vectors.json); the other two script_tests.cpp hunks are applied
@DCG-Claude DCG-Claude changed the title backport: v0.26 bitcoin#26690, bitcoin#28168 backport: v0.26 bitcoin#28168 Oct 18, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b031-src-wallet branch from dad37c6 to efaa387 Compare October 18, 2026 17:12
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

Branch rewritten at efaa387959 (1 backport(s)).


🤖 backportsys, on behalf of the Dash backport pipeline.

@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

folded into backport-0.26-b202-misc: its commits ship there

@DCG-Claude DCG-Claude closed this Oct 18, 2026
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.

2 participants