Skip to content

[32.x] Backports - #44

Merged
bit-aloo merged 11 commits into
2140-dev:32.xfrom
plebhash:2026/10/32.x-backports
Oct 23, 2026
Merged

bit-aloo merged 11 commits into
2140-dev:32.xfrom
plebhash:2026/10/32.x-backports

Conversation

@plebhash

Copy link
Copy Markdown
Collaborator

Backports test, CI and doc changes from master to 32.x. No schema changes, so the published 0.3.0 crate is unaffected and no new release is needed.

Backported

Each commit keeps its original author and carries Github-Pull: / Rebased-From: trailers, as RELEASE_POLICY.md requires. Commits pushed directly to master only have Rebased-From:.

Conflicts

  • 94b2b73 (RELEASE_POLICY.md): took master's version, so the file is now identical on both branches.
  • a80fd45 (ci.yml): kept the 32.x push/pull_request triggers and the Bitcoin Core 32.x checkout.

Skipped b32b3ad (map 32.x to 0.3.x), already done in #43.

After this, 32.x differs from master only in those CI branch lines and the crate version.

Testing

21/21 tests pass via contrib/run-tests.sh against Bitcoin Core built from the v32.0 tag.

Sjors and others added 11 commits October 23, 2026 10:36
Document how maintenance branches are created and what they may receive:
only backports and branch specific fixes, never a fast-forward to
master. The latter happened to 31.x, which as a result picked up
submitBlock() (not part of Bitcoin Core 31.x) and lost its CI
configuration, see 2140-dev#35.

Github-Pull: 2140-dev#36
Rebased-From: 94b2b73
nproc is not available on macOS. Use getconf instead and pass the job
count via --parallel. A bare --parallel is avoided because it means
unlimited jobs with the Makefile generator.

Rebased-From: ee5128b
Zero the stats restored with the cache, so the numbers reflect only
this run.

Rebased-From: 92eec7f
v4 targets the deprecated Node.js 20 runtime.

Rebased-From: b718ae9
v4 targets the deprecated Node.js 20 runtime.

Rebased-From: 70f15da
The uptime RPC returns whole seconds, so it is 0 when the test runs
within a second of node startup. This happens more often now that
contrib/run-tests.sh starts the node right before the tests.

Fixes 2140-dev#37

Github-Pull: 2140-dev#38
Rebased-From: 8fc3c8b
`mining_check_block_and_interrupt` calls interrupt() while nothing
is waiting, so it only checks that the call doesn't fail. Rename it
to `mining_check_block`.

Github-Pull: 2140-dev#41
Rebased-From: 909aed9
Call `waitTipChanged` and `waitNext` with no timeout, let them block
in a local task, then check that `interrupt` and `interruptWait`
unblock them.

Github-Pull: 2140-dev#41
Rebased-From: f3f1f8f
run-tests.sh started the node on the default datadir, so it reused
whatever regtest state was already there and left its own behind.
Start it on a fresh `/tmp/capnp-type-tests` instad, recreated on
every run, and pass it to the tests as `BITCOIN_DATADIR`.

Github-Pull: 2140-dev#40
Rebased-From: 369245b
@plebhash
plebhash changed the base branch from master to 32.x October 23, 2026 13:44
@plebhash plebhash closed this Oct 23, 2026
@plebhash plebhash reopened this Oct 23, 2026

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

Cool! Thanks. ACK

@bit-aloo
bit-aloo merged commit 3da5adc into 2140-dev:32.x Oct 23, 2026
1 check 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.

5 participants