Skip to content

backport: v0.26 bitcoin#27656, bitcoin#27996, bitcoin#28083 - #37

Merged
DCG-Claude merged 3 commits into
developfrom
backport-0.26-b001-other
Sep 22, 2026
Merged

DCG-Claude merged 3 commits into
developfrom
backport-0.26-b001-other

Conversation

@thepastaclaw

@thepastaclaw thepastaclaw commented Sep 11, 2026 •

Copy link
Copy Markdown
Owner

Automated Bitcoin Core v0.26 backports, batch backport-0.26-b001-other.

upstream commit gates notes
bitcoin#27656 cb83f1f229 pick:pass build:pass tests:warn mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#27996 32d1bfcd70 pick:pass build:pass tests:warn mech:warn tree:pass verify:pass Faithful backport of the .bear-tidy-config subtree exclusions: the commit adds upstream's two new entries (src/crc32c, s
bitcoin#28083 974574847f pick:pass build:pass tests:warn mech:warn tree:pass verify:pass The commit lands the full DOCKER_BUILDKIT lint-image restructure: ci/lint/Dockerfile deleted in favour of ci/lint_imagef
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.

@thepastaclaw thepastaclaw changed the title backport: v0.26 bitcoin#27656, partial bitcoin#27724 backport: v0.26 partial bitcoin#27724, bitcoin#27656 Sep 11, 2026
@thepastaclaw

Copy link
Copy Markdown
Owner Author

The TSAN failure is unrelated to this PR's changes; this PR is proper as-is with respect to the reported failure and needs no branch modification.

Failing job: feature_protx_version.py exhausts its three attempts. The final attempt loses node2 during DKG contribution signing because TSAN reports a read/write race on the global ep2_curve_get_s3(bn_st*)::s3: bn_copy in one DKG thread races bn_read_str in another. The vendored BLS helper uses an unsynchronized static initialization flag. This is an existing concurrency defect, not a build/lint failure or merely a test timeout.

Only configure.ac changes here (a comment and removal of debug/fuzz Boost.MultiIndex safe mode); the BLS/DKG source and test are unchanged from base 02c72bec7c356a8ee22330753d77ee05efc35212. The TSAN configuration does not enable debug/fuzz. An independent TSAN job on the identical head c0e65a01eccfe5d4ddc814a47bd5a36544ee93c1 passed this test and the entire run, consistent with the race's schedule dependence.

Filed dashpay#7674 with the stack, source diagnosis, and reproduction guidance (this fork has issues disabled). No commits, amendments, rebases, pushes, or CI reruns were made. Maintainers can rerun CI if concerned.

@thepastaclaw

thepastaclaw commented Sep 15, 2026 •

Copy link
Copy Markdown
Owner Author

🕓 Queued for automated review — 25th in line, estimated start in ~10 h (commit c0e65a0)
Estimated review time once started: ~50 min (two-phase automated review; median of recent runs).

  • Request priority review — click to move this review to the front of the queue.

@DCG-Claude DCG-Claude changed the title backport: v0.26 partial bitcoin#27724, bitcoin#27656 backport: v0.26 partial bitcoin#27724, bitcoin#27656, partial bitcoin#27996, partial bitcoin#28083 Sep 18, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b001-other branch from 7ac9a0a to 3556d56 Compare September 19, 2026 18:08
@DCG-Claude DCG-Claude changed the title backport: v0.26 partial bitcoin#27724, bitcoin#27656, partial bitcoin#27996, partial bitcoin#28083 backport: v0.26 bitcoin#27724, bitcoin#27656, bitcoin#27996, bitcoin#28083 Sep 20, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b001-other branch from 3556d56 to 830c127 Compare September 21, 2026 03:45
@DCG-Claude DCG-Claude changed the title backport: v0.26 bitcoin#27724, bitcoin#27656, bitcoin#27996, bitcoin#28083 backport: v0.26 bitcoin#27656, bitcoin#27996, bitcoin#28083 Sep 22, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.26-b001-other branch from 830c127 to 9745748 Compare September 22, 2026 04:08
@DCG-Claude

Copy link
Copy Markdown
Collaborator

CI failed at 9745748 on thepastaclaw/dash: linux64_tsan-test / Test source

The captured log contains no compiler, test or script error — only the post-job teardown (git config probes, container stop/remove, network rm, orphan-process cleanup), which is the signature of an infrastructure/runner abort rather than a source failure. None of the three commits touches anything the tsan job consumes: 27656 changes only a build comment, 27996 filters subtrees out of clang-tidy output, and 28083 only sets DOCKER_BUILDKIT for the separate lint image. Please rerun linux64_tsan-test.


🤖 backportsys, on behalf of the Dash backport pipeline.

3ece0eb build, doc: Adjust comment after PR27254 (Hennadii Stepanov)

Pull request description:

  This is a follow up for bitcoin#27254.

ACKs for top commit:
  TheCharlatan:
    ACK 3ece0eb

Tree-SHA512: 36c627524304f0ea964383488acb9b16d0b553cc9cf3bce7a12aec65a7905b13e4582b7b7ec6d1efa32cd3c623969bc00f805ff31d9e6eec86a614e75796c8ff
62633b5 ci: filter all subtrees from tidy output (fanquake)

Pull request description:

  We are currently dumping output for some. i.e:
  ```bash
  diff --git a/src/minisketch/src/fields/clmul_1byte.cpp b/src/minisketch/src/fields/clmul_1byte.cpp
  index 8826af9..7fd6f2a 100644
  --- a/src/minisketch/src/fields/clmul_1byte.cpp
  +++ b/src/minisketch/src/fields/clmul_1byte.cpp
  @@ -4,21 +4,16 @@
    * file LICENSE or http://www.opensource.org/licenses/mit-license.php.*
    **********************************************************************/

  -/* This file was substantially auto-generated by doc/gen_params.sage. */
  -#include "../fielddefines.h"
  -
  +class Sketch;
   #if defined(ENABLE_FIELD_BYTES_INT_1)
  ```

ACKs for top commit:
  hebasto:
    re-ACK 62633b5

Tree-SHA512: fd0a17af6b37fc7641547dab329c2d14ec784941c4d100db1e80d232aff39e45ad9c588982810a2cfc54b4fe820bfe0d50638b53209fec6774fd556b9b0ae180

Dash adaptations:
- src/.bear-tidy-config: upstream's final list was already largely present in Dash HEAD, so only the genuinely-missing entries were added — `src/crypto/ctaes` new, and `src/crc32` corrected to upstream's `src/crc32c` (Dash's subtree is `src/crc32c`; `src/crc32` matched nothing); Dash-only subtree exclusions (crypto/x11, dashbls, gsl, immer, univalue, bench/nanobench.*) retained
- ci/test/06_script_b.sh: file does not exist in Dash (Dash uses ci/dash/build_src.sh + ci/dash/lint-tidy.sh); the cherry-pick's re-added upstream copy was removed so the file stays absent

Not applicable to Dash (intentionally omitted):
- ci/test/06_script_b.sh: Dash has no ci/test/06_script_b.sh; its tidy/IWYU driver ci/dash/lint-tidy.sh uses an explicit iwyu_tool.py path list and a cstyle-cast compile DB, and contains no jq filter over compile_commands.json, so there is no `src/secp256k1/src/` regex term to remove
fa2f18a ci: Use DOCKER_BUILDKIT for lint image (MarcoFalke)

Pull request description:

  Currently the lint docker/podman image has many issues:

  * It relies on an EOL debian version.
  * It relies on a debian version different from the one used in the CI lint task.
  * It relies on the legacy docker build command, which requires the user to make `cd ./ci/lint/` before the build step.
  * It doesn't use the `.python-version` file, but a hardcoded version.

  Fix all issues by using the recommended `DOCKER_BUILDKIT=1` to generate the image.

  Also:
  * Rename `/tmp/python` to `/python_build`.
  * Compress all `pip install` commands into one.
  * Bump `.python-version`.

ACKs for top commit:
  jamesob:
    ACK bitcoin@fa2f18a

Tree-SHA512: 804b384904ad753845667998841cc7825f4229933ca2c42af021384713486ec3cca80ba58612d37557fba7ee1921439dacca5e1236aac0557dd75bd9a2f1875d

Dash adaptations:
- ci/lint/04_install.sh: adopted upstream's single multi-line `pip3 install` invocation but kept Dash's pinned versions (codespell 2.2.1, flake8 5.0.4, mypy 0.981, pyzmq 24.0.1) and Dash's `# NOTE: BUMP ALSO contrib/containers/ci/ci-slim.Dockerfile` comment; upstream's version bumps come from a separate commit Dash has not backported and are out of scope here.
- .python-version: left at Dash's 3.10.19 rather than taking upstream's 3.8.16->3.8.17 bump; Dash is already ahead of upstream on this file.
- ci/lint/Dockerfile: Dash's copy differed from upstream (FROM python:3.10.19-bookworm instead of python:3.8-buster), but upstream deletes the file wholesale in favour of ci/lint_imagefile, so the Dash variant was removed too.
- .dockerignore: Dash's root .dockerignore is `**` plus an allowlist of four container Dockerfiles (upstream has no .dockerignore). The new ci/lint_imagefile COPYs .python-version and ci/lint/* from the repository root, which that file excludes, so the documented `docker build --file ./ci/lint_imagefile ./` failed with "not found". Allowlisted `.python-version` and `ci/lint/` so the lint image builds as upstream's does.
- ci/lint_imagefile: taken verbatim from upstream, including `WORKDIR /bitcoin`; Dash's existing lint tooling (docker-entrypoint.sh safe.directory, test/lint/README.md mount path and `bitcoin-linter` tag) already uses /bitcoin, and upstream's commit does not rename it, so no rebranding was applied.

Not applicable to Dash (intentionally omitted):
- .cirrus.yml: Dash deleted .cirrus.yml from its tree (it uses GitHub Actions / GitLab CI, not Cirrus). The cherry-pick re-introduced upstream's whole file as a delete/modify conflict; resolved by keeping it deleted, so the python_cache folder change /tmp/python -> /python_build has no home in Dash.
@knst
knst force-pushed the backport-0.26-b001-other branch from 9745748 to 4ebbc42 Compare September 22, 2026 11:54
@DCG-Claude
DCG-Claude merged commit 88bf452 into develop Sep 22, 2026
52 checks passed
@DCG-Claude

Copy link
Copy Markdown
Collaborator

merged as dashpay#7695

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.

2 participants