Skip to content

backport: v0.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#29521, bitcoin#30199, bitcoin#28167 - #147

Merged
DCG-Claude merged 9 commits into
developfrom
backport-0.28-b033-easy
Nov 16, 2026
Merged

DCG-Claude merged 9 commits into
developfrom
backport-0.28-b033-easy

Conversation

@DCG-Claude

@DCG-Claude DCG-Claude commented Nov 16, 2026 •

Copy link
Copy Markdown
Collaborator

Automated Bitcoin Core v0.28 backports, batch backport-0.28-b033-easy.

upstream commit gates notes
bitcoin#30268 ffb7275b65 pick:pass build:pass tests:pass mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#30551 7cf73bebfe pick:pass build:pass tests:warn mech:pass tree:pass verify:pass Backports the OpenBSD build doc additions for the optional libqrencode (QR codes in the GUI) and ZeroMQ (notifications)
bitcoin#30216 d6ab4b9348 pick:pass build:pass tests:warn mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#30596 11a7bb3d8e pick:pass build:pass tests:pass mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#30098 e01580ce19 pick:pass build:pass tests:warn mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#30218 7509990855 pick:pass build:pass tests:pass mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#29521 fb2483ac4b pick:pass build:pass tests:pass mech:pass tree:pass verify:pass clean cherry-pick
bitcoin#30199 c88f6d6bb5 pick:pass build:pass tests:warn mech:pass tree:pass verify:pass Backports bitcoin#30199 by adding bugprone-move-forwarding-reference to src/.clang-tidy's enabled checks, the
bitcoin#28167 654b9798df pick:pass build:pass tests:pass mech:pass tree:pass verify:pass Backports bitcoin#28167, adding the -rpccookieperms option and the PermsToSymbolicString/InterpretPermString helpers so
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.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#30230, bitcoin#29521, bitcoin#30199 backport: [easy] v0.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#30230, bitcoin#29521, bitcoin#30199, bitcoin#28167 Nov 16, 2026
@DCG-Claude DCG-Claude changed the title backport: [easy] v0.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#30230, bitcoin#29521, bitcoin#30199, bitcoin#28167 backport: v0.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#30230, bitcoin#29521, bitcoin#30199, bitcoin#28167 Nov 16, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.28-b033-easy branch from e31a952 to e7ed3e1 Compare November 16, 2026 00:53
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

CI failed at e31a952 on thepastaclaw/dash: win64-build / Build source, linux64_fuzz-build / Build source, linux64-build / Build source, linux64_nowallet-buil

The backport of bitcoin#28167 changed GenerateAuthCookie in src/rpc/request.h to take a std::optional<fs::perms> parameter. Upstream's version of that header already includes <optional>, but Dash's didn't, so every build job failed with the same error. I added #include <optional> to the header; a standalone syntax check of the header now passes, but I haven't run a full build because the tree isn't configured. (folded into the bitcoin#28167 commit)


🤖 backportsys, on behalf of the Dash backport pipeline.

f51da34 utils: add missing include (Cory Fields)

Pull request description:

  Noticed when testing `VecDeque` with no other includes.

  For libc++, need type_traits for `std::is_trivially_destructible_v`.

ACKs for top commit:
  maflcko:
    ACK f51da34
  glozow:
    ACK f51da34
  sipa:
    utACK f51da34

Tree-SHA512: bf96910abe9aaddd8586e6cc8f68a9bbac4c26d976ebeebcfa86b86c0da5783c1cbdbc7fa09b62cdcfde19e6442eb65a66bf1e2e80408d68e9dd9689dc22b0fa
…q) in OpenBSD build docs

903def1 doc: mention optional dependencies (qrencode, zmq) in OpenBSD build docs (Sebastian Falbesoner)

Pull request description:

  The wording is taken from the FreeBSD build docs.

  Tested on OpenBSD 7.5. See the following links for the package names:
  - https://openbsd.app/?search=libqrencode
  - https://openbsd.app/?search=zeromq

  Thanks to hebasto for noticing that this was missing.

ACKs for top commit:
  maflcko:
    review ACK 903def1
  hebasto:
    ACK 903def1, I can successfully build with the `libqrencode` and `zeromq` packages on my OpenBSD 7.5 installation.

Tree-SHA512: 955e4892948a7703627d304a41a774f7cca0e4c672bdfa0edf531587d6970444aa49195b0f6f531ce375c8e7c2af6bbfa1a12e0612ae7a65f3e454fb17958672
…illumos

3299abc build: Fix building `fuzz` binary on on SunOS / illumos (Hennadii Stepanov)

Pull request description:

  On master branch @ 457e184, building the `fuzz` binary fails:
  ```
  $ ./autogen.sh
  $ ./configure
  $ gmake -C src test/fuzz/fuzz
  < snip >
    CXX      test/fuzz/fuzz-http_request.o
  test/fuzz/http_request.cpp:13:10: fatal error: event2/buffer.h: No such file or directory
     13 | #include <event2/buffer.h>
        |          ^~~~~~~~~~~~~~~~~
  compilation terminated.
  gmake: *** [Makefile:17138: test/fuzz/fuzz-http_request.o] Error 1
  gmake: Leaving directory '/export/home/hebasto/git/bitcoin/src'
  ```

  The testing system:
  ```
  $ uname -a
  SunOS openindiana 5.11 illumos-82079dec87 i86pc i386 i86pc
  ```

  This PR fixes this issue.

ACKs for top commit:
  maflcko:
    ACK 3299abc

Tree-SHA512: 43048cf0d3db47d71263da179e07225afd901ed2039ee4d17314ff7b581ab36f41282fde3b1210926cecda546320dc573937c564520f61fbb236c2b9914ed0d4
59c0ece fuzz: replace hardcoded numbers for bech32 limits (josibake)

Pull request description:

  Follow-up to bitcoin#30047 to replace a hardcoded value that was missed in the original PR

ACKs for top commit:
  paplorinc:
    ACK 59c0ece
  dergoegge:
    utACK 59c0ece
  marcofleon:
    ACK 59c0ece. Ran the test a bit to be sure, lgtm.
  brunoerg:
    utACK 59c0ece

Tree-SHA512: 89799928feb6752a533259117340b087ff7299f9bf204b165dd87708e15b99a338521f2ac9f9e1fd91dc48b93be839059768d9e68b172e36328232174d1dfa3f
…rintf/Join

12d8281 refactor: simplify `FormatSubVersion` using strprintf/Join (Sebastian Falbesoner)

Pull request description:

  Rather than using std::ostringstream and manually joining the comments, use strprintf and our own `Join` helper.

ACKs for top commit:
  maflcko:
    utACK 12d8281
  TheCharlatan:
    tACK 12d8281
  hebasto:
    ACK 12d8281, I have reviewed the code and it looks OK.
  tdb3:
    ACK for 12d8281.

Tree-SHA512: b9b965c4416a4c0c8727e3c4b40da4be04b14067200220492e9bed4fa35c1907fb5cdec2a30052b9e762f71da3d3cf042f43c96ab1f2523df5bb9920b44ea2a5
8801e31 refactor: remove unused `CKey::Negate` method (Sebastian Falbesoner)

Pull request description:

  This method was introduced as a pre-requirement for the v2 transport protocol back then (see PR bitcoin#14047, commit 463921b), when it was still BIP151. With the replacement BIP324, this is not needed anymore, and it's also unlikely that for any other proposal we'd ever need to negate private keys at this abstraction level. I'd argue that this operation is usually something that should happen within a secp256k1 module (like e.g. done in MuSig2, Silent Payments...).

  (If there is really demand in the future, it's also trivial to reintroduce the method.)

ACKs for top commit:
  laanwj:
    ACK 8801e31
  sipa:
    ACK 8801e31
  achow101:
    ACK 8801e31

Tree-SHA512: 7bc1566399635c5c6e4940a2724c865d5443eb190024379099330c023c516f1e4f423ed9e8c42bc93413b723a5464ec79d3f879f58c0e598fe24f495238df4ec
24bc46c cli: Add warning for duplicate port definition (tdb3)
e208fb5 cli: Sanitize ports in rpcconnect and rpcport (tdb3)

Pull request description:

  Adds invalid port detection to bitcoin-cli for -rpcconnect and -rpcport.

  In addition to detecting malformed/invalid ports (e.g. those outside of the 16-bit port range, not numbers, etc.), bitcoin-cli also now considers usage of port 0 to be invalid.  bitcoin-cli previously considered port 0 to be valid and attempted to use it to reach bitcoind.

  Functional tests were added for invalid port detection as well as port prioritization.
  Additionally, a warning is provided when a port is specified in both -rpcconnect and -rpcport.

  This PR is an alternate approach to PR bitcoin#27820 (e.g. SplitHostPort is unmodified).

  Considered an alternative to 127.0.0.1 being specified in functional tests, but at first glance, this might need an update to test_framework/util.py (e.g.  rpc_url), which might be left to a future PR.

ACKs for top commit:
  S3RK:
    light code review ACK 24bc46c
  achow101:
    ACK 24bc46c
  cbergqvist:
    re ACK 24bc46c

Tree-SHA512: c83ab6a30a08dd1ac8b368a7dcc2b4f23170f0b61dd67ffcad7bcda05096d333bcb9821fba11018151f55b2929c0a333bfec15b8bb863d83f41fc1974c6efca5
…nce` check

88cdb59 clang-tidy: Add `bugprone-move-forwarding-reference` check (Hennadii Stepanov)

Pull request description:

  This PR adds [`bugprone-move-forwarding-reference`](https://clang.llvm.org/extra/clang-tidy/checks/bugprone/move-forwarding-reference.html) to the clang-tidy checks.

ACKs for top commit:
  maflcko:
    utACK 88cdb59

Tree-SHA512: 8366c895085d0656a4491035aa8863c9dca12885c2bdf0392bebc63d6f6f5473ec263594e5fde70a3c211e95d19b9cd98e2c574ced91b4c970cce0edce40bceb
…ace 26088)

73f0a6c doc: detail -rpccookieperms option (willcl-ark)
d2afa26 test: add rpccookieperms test (willcl-ark)
f467aed init: add option for rpccookie permissions (willcl-ark)
7df03f1 util: add perm string helper functions (willcl-ark)

Pull request description:

  This PR picks up bitcoin#26088 by aureleoules which adds a bitcoind launch option `-rpccookieperms` to set the file permissions of the cookie generated by bitcoin core.

  Example usage to make the generated cookie group-readable: `./src/bitcoind -rpccookieperms=group`.

  Accepted values for `-rpccookieperms` are `[owner|group|all]`. We let `fs::perms` handle platform-specific permissions changes.

ACKs for top commit:
  achow101:
    ACK 73f0a6c
  ryanofsky:
    Code review ACK 73f0a6c. Main change since last review is no longer throwing a skip exception in the rpc test on windows, so other checks can run after it, and overall test result is passing, not skipped. Also were clarifying renames and documentation improvements.
  tdb3:
    cr ACK 73f0a6c

Tree-SHA512: e800d59a44aca10e1c58ca69bf3fdde9f6ccf5eab4b7b962645af6d6bc0cfa3a357701e409c8c60d8d7744fcd33a91e77ada11790aa88cd7811ef60fab86ab11

Dash adaptations:
- src/init.cpp: -rpccookieperms registered between -rpccookiefile and Dash's -rpcexternaluser/-rpcexternalworkqueue args, keeping the alphabetical order
@DCG-Claude DCG-Claude changed the title backport: v0.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#30230, bitcoin#29521, bitcoin#30199, bitcoin#28167 backport: v0.28 bitcoin#30268, bitcoin#30551, bitcoin#30216, bitcoin#30596, bitcoin#30098, bitcoin#30218, bitcoin#29521, bitcoin#30199, bitcoin#28167 Nov 16, 2026
@DCG-Claude
DCG-Claude force-pushed the backport-0.28-b033-easy branch from e7ed3e1 to 654b979 Compare November 16, 2026 02:54
@DCG-Claude
DCG-Claude merged commit d86ff00 into develop Nov 16, 2026
70 checks passed
@DCG-Claude

Copy link
Copy Markdown
Collaborator Author

merged as dashpay#8166

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