[30.x] More backports #34283

pull fanquake wants to merge 15 commits into bitcoin:30.x from fanquake:30_3_backports changing 12 files +127 −99

fanquake commented at 1:32 pm on January 14, 2026: member
Backports:
- #32513
- #34185
- #34272
- #34252
- #34281
- #34282
- #34344
- #34358
- #34390
- #34413

doc: add 433 (Pay to Anchor) to bips.md

Github-Pull: #34252
Rebased-From: 44b12cdb11f0fd3264f24f537a5d6989e4fe96a9

22bd00651a

psbt: Fix `PSBTInputSignedAndVerified` bounds `assert`

The previous `assert` used `>=`, allowing `input_index == psbt.inputs.size()` and out-of-bounds access in `psbt.inputs[input_index]`.

Found during review: https://github.com/bitcoin/bitcoin/pull/31650#discussion_r2685892867

Github-Pull: #34272
Rebased-From: 2f5b1c5f80590ffa6b5a5bcfb21fddb1dc22e852

7e1090f5e8

fanquake added this to the milestone 30.3 on Jan 14, 2026
DrahtBot added the label Backport on Jan 14, 2026
DrahtBot commented at 1:32 pm on January 14, 2026: contributor

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

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/34283.

Reviews

See the guideline for information on the review process.

Type Reviewers

ACK willcl-ark, marcofleon

If your review is incorrectly listed, please copy-paste <!–meta-tag:bot-skip–> into the comment that the bot should ignore.

Type	Reviewers
ACK	willcl-ark, marcofleon

test: fix feature_pruning when built without wallet

Github-Pull: #34185
Rebased-From: 9b57c8d2bd15a414e08a9e43367d8d3d82c25fe4

4431a60f9c

test: check wallet rescan properly in feature_pruning

Github-Pull: #34185
Rebased-From: 8fb5e5f41ddf550a78b1253184d79a107097815a

311da7fee3

fanquake force-pushed on Jan 15, 2026

qa: Fix Windows logging bug

The regex `(.*)` was capturing `\r` from subprocess output on Windows,
causing the closing parenthesis in logs to wrap to the next line.

Stripping whitespace from the regex match fixes the formatting.

Github-Pull: #34282
Rebased-From: 979d41bfab248990d7d520873d17fe52daa8d402

de79f7d01c

fanquake force-pushed on Jan 15, 2026

chore: Update outdated GitHub Actions versions

Github-Pull: #34344
Rebased-From: 9482f00df0b05e8ef710a7f0fac3262855ce335f

810c75b9b1

fanquake force-pushed on Jan 23, 2026

test: allow overriding tar in get_previous_releases

Facilitate use on distros that might have 'tar' as something else, such
as 'gtar', i.e Chimera.

Github-Pull: #34390
Rebased-From: be2b48b9f3e56b672e391e18a09f2d5f4e78d74e

33195bdd9e

fanquake force-pushed on Jan 27, 2026
build: Temporarily remove confusing and brittle -fdebug-prefix-map
Github-Pull: #34281 Rebased-From: fa37928536e0048a262260baf998ead026b14bb9
c294b66126
fanquake force-pushed on Jan 27, 2026

doc: Remove outdated -fdebug-prefix-map section in dev notes

The section claims to be for ccache builds, however those are already
fixed after commit 1cc58d3a0c653ac30df04d1010a3cf84c6bc307a.

If there are still any build or debug problems after that commit,
dedicated instructions can be added back, along with exact steps to
reproduce and test.

Github-Pull: #34413
Rebased-From: fa06cd4ba7303bd3036467cf00d12f36c94bcaff

eda6c979bd

build: Remove outdated comment about -ffile-prefix-map

The -ffile-prefix-map option is no longer used and it seems fine to
remove the warning about it possibly breaking coverage builds.

If this needs documentation, the dev notes seem like a better place,
because it also affects other places, such as depends. C.f. commit
407062f2ac93624f350e9e8a4f641c882a2aaf2f

Github-Pull: #34413
Rebased-From: fa2e1b85dd6b263a77294566bd361d7873731045

4deda48fa4

fanquake force-pushed on Jan 28, 2026

wallet: fix removeprunedfunds bug with conflicting transactions

removeprunedfunds removes all entries from mapTxSpends for the
inputs of the pruned tx. However, this is incorrect, because there could be
multiple entries from conflicting transactions (that shouldn't be
removed as well). This could lead to the wallet creating invalid
transactions, trying to double spend utxos.
The bug persists when the conflicting tx was mined, because
the wallet trusts its internal accounting instead of calling
AddToSpends again.

Github-Pull: #34358
Rebased-From: 1f60ca360eb83fa7982b1aac402eaaf477294197

290526bc6d

fanquake force-pushed on Jan 29, 2026

ci: remove 3rd party js from windows dll gha job

We can use vswhere.exe directly to create a vs developer
prompt and so can remove this third party dependency.

Co-authored-by: David Gumberg <davidzgumberg@gmail.com>

Github-Pull: #32513
Rebased-From: 7ae0497eef8f5b37fc1184897a5bbc9f023dfa67

aa93758932

ci: use a more generic way of finding mt.exe

This sets up a vs developer command prompt and should hopefully should
be more resilient to upstream changes

Co-authored-by: David Gumberg <davidzgumberg@gmail.com>

Github-Pull: #32513
Rebased-From: e1a1b14c9359751a4d0117a27a303d1f1d3ed30f

4664621abe

ci: Check windows manifests for all executables

The other executables have manifests and these should be checked in
addition to bitcoind. Skipping fuzz.exe, bench_bitcoin.exe and
test_bitcoin-qt.exe as they do not have manifests.

Github-Pull: #32513
Rebased-From: 156927903d64297500dd73380908c654b07bfb1a

0f01a4c245

doc: update release notes for v30.x 624c745e49
fanquake force-pushed on Jan 29, 2026
fanquake marked this as ready for review on Jan 29, 2026
fanquake requested review from marcofleon on Jan 29, 2026
willcl-ark approved
willcl-ark commented at 2:34 pm on January 29, 2026: member

ACK 624c745e4917306198443fc9fb3465e1d6f8f214

Backports are all clean (except #34344) and are listed in the release notes.
marcofleon approved
marcofleon commented at 3:35 pm on January 29, 2026: contributor

ACK 624c745e4917306198443fc9fb3465e1d6f8f214
fanquake merged this on Jan 29, 2026
fanquake closed this on Jan 29, 2026
fanquake deleted the branch on Jan 29, 2026

Contributors
fanquake DrahtBot willcl-ark marcofleon

Labels
Backport

Milestone
30.3

[30.x] More backports #34283

Code Coverage & Benchmarks

Reviews