Skip to content

backport: v0.26 bitcoin#27895, bitcoin#28028, bitcoin#28557, bitcoin#26780 - #89

Merged
DCG-Claude merged 4 commits into
developfrom
backport-0.26-b077-easy
Oct 4, 2026
Merged

DCG-Claude merged 4 commits into
developfrom
backport-0.26-b077-easy

Conversation

@DCG-Claude

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

Copy link
Copy Markdown
Collaborator

Automated Bitcoin Core v0.26 backports, batch backport-0.26-b077-easy.

upstream commit gates notes
bitcoin#27895 4eda3493f9 pick:pass build:pass tests:warn mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#28028 5e002d178c pick:pass build:pass tests:pass mech:warn tree:pass verify:pass This faithfully backports bitcoin#28028: the expected_stderr check moves from stop_node() into is_node_stopped()/wait_un
bitcoin#28557 058184e0a0 pick:pass build:pass tests:warn mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#26780 072d502f21 pick:pass build:pass tests:pass mech:pass tree:pass verify:pass clean cherry-pick
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: [easy] v0.26 bitcoin#27895, bitcoin#28028, bitcoin#28557, bitcoin#26780 backport: v0.26 bitcoin#27895, bitcoin#28028, bitcoin#28557, bitcoin#26780 Oct 4, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b077-easy branch from 6e6424d to 072d502 Compare October 4, 2026 07:45
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at 6e6424d on thepastaclaw/dash: linux64_multiprocess-test / Test source, linux64_tsan-test / Test source, linux64_sqlite-test / Test source, linux

All six jobs fail on rpc_blockchain.py _test_stopatheight. bitcoin#28028 moved the stderr check into wait_until_stopped(), and node0 was restarted pruned, so Dash prints the 'governance validation disabled' warning, which the bare wait_until_stopped() call didn't expect. I now pass expected_stderr=EXPECTED_STDERR_NO_GOV_PRUNE to that call; Dash needs this and upstream doesn't, because only Dash prints the warning. Not run locally (no build in this tree), only syntax-checked. (folded into the bitcoin#28028 commit)


🤖 backportsys, on behalf of the Dash backport pipeline.

6779e6e test: clean up is node stopped (dimitaracev)

Pull request description:

  Fixes bitcoin#27893

  Use f'strings for the message when asserting `expected_ret_code` and `return_code`. Change the `expected_ret_code` from an optional to have a default value of `0`.

  cc MarcoFalke

ACKs for top commit:
  MarcoFalke:
    lgtm ACK 6779e6e
  stickies-v:
    ACK 6779e6e
  brunoerg:
    ACK 6779e6e

Tree-SHA512: af84e7ffe467ced29236dee9206687786a2efb89ab8b039c3ebfb93ea23fc273206cd51f20c9fb6bee4135770e9a649538942571d9c0be83ba9535fa8e59cb28
faf9028 test: Check expected_stderr after stop (MarcoFalke)

Pull request description:

  This fixes a bug where stderr wasn't checked for the shutdown sequence.

  Fix that by waiting for the shutdown to finish and then check stderr.

ACKs for top commit:
  theStack:
    ACK faf9028

Tree-SHA512: a70cd1e6cda84d542782e41e8b59741dbcd472c0d0575bcef5cbfd1418473ce94efe921481d557bae3fbbdd78f1c49c09c48872883c052d87c5c9a9a51492692
d67aa25 bench: drop NO_THREAD_SAFETY_ANALYSIS from disconnected_txs (fanquake)

Pull request description:

  Followup to bitcoin#28385 (comment).

ACKs for top commit:
  MarcoFalke:
    lgtm ACK d67aa25
  hebasto:
    ACK d67aa25, tested on Ubuntu 22.04 with clang 18.0.
  glozow:
    utACK d67aa25

Tree-SHA512: a9a9a8cc70a50d4fbd51779a3203bbc2a29d354b557e8a99cfd649d5998b71ff1087f5bae7170471bed9a917a93c8f3351ae90c9a6e87d88928c35912d007b64
b922f6b rpc: scanblocks, add "completed" flag to the result obj (furszy)
ce50acc rpc: scanblocks, do not traverse the whole chain block by block (furszy)

Pull request description:

  Coming from bitcoin#23549 (review)

  The current `scanblocks` flow walks-through every block in the active chain
  until hits the chain tip or processes 10k blocks, then calls `lookupFilterRange`
  function to obtain all filters from that particular range.

  This is only done to obtain the heights range to look up the block
  filters. Which is unneeded.

  As `scanblocks` only lookup block filters in the active chain, we can
  directly calculate the lookup range heights, by using the chain tip,
  without requiring to traverse the chain block by block.

ACKs for top commit:
  achow101:
    ACK b922f6b
  TheCharlatan:
    ACK b922f6b

Tree-SHA512: 0587e6d9cf87a59184adb2dbc26a4e2bce3a16233594c6c330f69feb49bf7dc63fdacf44fc20308e93441159ebc604c63eb7de19204d3e745a2ff16004892b45
@PastaPastaPasta
PastaPastaPasta force-pushed the backport-0.26-b077-easy branch from 072d502 to 971341b Compare October 4, 2026 15:42
@DCG-Claude
DCG-Claude merged commit fd269cf into develop Oct 4, 2026
74 of 75 checks passed
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.

1 participant