[31.x] Backports #34942

pull fanquake wants to merge 5 commits into bitcoin:31.x from fanquake:31_x_more_backports changing 9 files +53 −17

fanquake commented at 4:34 AM on March 28, 2026: member
Backports:
- #34918
- #34939
- #34944
- #34956
- #34982
fanquake added this to the milestone 31.0 on Mar 28, 2026
DrahtBot added the label Backport on Mar 28, 2026
DrahtBot commented at 4:35 AM on March 28, 2026: contributor



The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Reviews

See the guideline for information on the review process.

Type Reviewers

ACK marcofleon, w0xlt

If your review is incorrectly listed, please copy-paste <code></code> into the comment that the bot should ignore.
fanquake renamed this:
~~fuzz: Remove unused g_setup pointers~~
[31.x] Backports
on Mar 28, 2026

Type	Reviewers
ACK	marcofleon, w0xlt

fuzz: Remove unused g_setup pointers

These are unused and removing them avoids clang warnings like:

src/test/fuzz/deserialize.cpp:42:26: error: variable g_setup set but not used [-Werror,-Wunused-but-set-variable]

Github-Pull: #34918
Rebased-From: fabbfec3b00c138a28034a4f5594305d2220b9bb

98551a0efd

fuzz: Use CAmount for storing best_waste

Waste is a CAmount, which is an int64_t. This will overflow an int, so
`best_waste` should also be a `CAmount`.

Github-Pull: #34939
Rebased-From: 890a09b1e49925315a5636f29cc5af36928fe092

f3b64aa405

depends, qt: Fix build on aarch64 macOS 26.4

Github-Pull: #34956
Rebased-From: 3aeccb7d739c7e9a82c95fbc8f5647ea85a79635

56cdeab8b5

fanquake force-pushed on Apr 1, 2026
DrahtBot added the label CI failed on Apr 1, 2026
DrahtBot removed the label CI failed on Apr 1, 2026
achow101 commented at 6:35 PM on April 1, 2026: member

#34982?

kernel: Remove NONNULL annotation from destroy method

No other *_destroy function in the Kernel API carries this annotation.
Following the convention set by free(), destroy functions should accept
null pointers.

Github-Pull: #34982
Rebased-From: 75608547b469b72caa890c8b356d0d3284998701

f0e1014c39

guix: Clean up module list in manifest

These modules are no longer in use:
1. `cmake-build-system` since bitcoin/bitcoin#34550.
2. `gnu-build-system` since bitcoin/bitcoin#34627.
3. `download` since bitcoin/bitcoin#34550.
4. `cc-for-target` from `utils` since bitcoin/bitcoin#34627.

Github-Pull: #34944
Rebased-From: 325f743eedd25be268f74b9cf91198f50d2b3cf0

ef10b2ec65

fanquake commented at 5:40 AM on April 3, 2026: member

#34982?

Added.
stickies-v commented at 7:57 AM on April 4, 2026: contributor

What's the rationale for backporting #34982? It's not part of any release binaries and the interface is experimental?
achow101 commented at 5:57 PM on April 4, 2026: member

What's the rationale for backporting #34982? It's not part of any release binaries and the interface is experimental?

So that people who want to build against 31.x has it. We still distribute the source, and it's still important if the only way to use the interface requires compiling it yourself.
fanquake marked this as ready for review on Apr 7, 2026
fanquake requested review from marcofleon on Apr 7, 2026
marcofleon approved
marcofleon commented at 1:35 PM on April 7, 2026: contributor

ACK ef10b2ec6573a35f5ef71133ae444b09b3040e33

Backports are clean.
w0xlt commented at 10:50 PM on April 7, 2026: contributor

ACK ef10b2ec6573a35f5ef71133ae444b09b3040e33
fanquake merged this on Apr 8, 2026
fanquake closed this on Apr 8, 2026
fanquake deleted the branch on Apr 8, 2026

in contrib/guix/manifest.scm:30 in ef10b2ec65

  21 | @@ -22,17 +22,14 @@
  22 |               ((gnu packages python-xyz) #:select (python-pydantic-2))
  23 |               ((gnu packages tls) #:select (openssl))
  24 |               ((gnu packages version-control) #:select (git-minimal))
  25 | -             (guix build-system cmake)
  26 | -             (guix build-system gnu)
  27 |               (guix build-system python)
  28 |               (guix build-system pyproject)
  29 |               (guix build-system trivial)
  30 | -             (guix download)

achow101 commented at 6:49 PM on April 8, 2026:

The time-machine update that removes this is not in 31.x

in contrib/guix/manifest.scm:25 in ef10b2ec65

  21 | @@ -22,17 +22,14 @@
  22 |               ((gnu packages python-xyz) #:select (python-pydantic-2))
  23 |               ((gnu packages tls) #:select (openssl))
  24 |               ((gnu packages version-control) #:select (git-minimal))
  25 | -             (guix build-system cmake)

achow101 commented at 6:51 PM on April 8, 2026:

The time-machine update that removes this is not in 31.x

Contributors

Labels

Milestone
31.0

Linked (view graph)

#34918 fuzz: [refactor] Remove unused g_setup pointers #34939 fuzz: Use CAmount for storing best_waste #34944 guix: Clean up module list in manifest #34956 depends, qt: Fix build on aarch64 macOS 26.4 #34982 kernel: Remove NONNULL annotation from destroy method

[31.x] Backports #34942

Reviews