Skip to content

[30.x] More backports#34283

Merged
fanquake merged 15 commits into
bitcoin:30.xfrom
fanquake:30_3_backports
Jan 29, 2026
Merged

[30.x] More backports#34283
fanquake merged 15 commits into
bitcoin:30.xfrom
fanquake:30_3_backports

Conversation

theStack and others added 2 commits January 14, 2026 12:18
The previous `assert` used `>=`, allowing `input_index == psbt.inputs.size()` and out-of-bounds access in `psbt.inputs[input_index]`.

Found during review: bitcoin#31650 (comment)

Github-Pull: bitcoin#34272
Rebased-From: 2f5b1c5
@fanquake fanquake added this to the 30.3 milestone Jan 14, 2026
@DrahtBot

DrahtBot commented Jan 14, 2026

Copy link
Copy Markdown
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.

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: bitcoin#34282
Rebased-From: 979d41b
Facilitate use on distros that might have 'tar' as something else, such
as 'gtar', i.e Chimera.

Github-Pull: bitcoin#34390
Rebased-From: be2b48b
MarcoFalke added 2 commits January 28, 2026 14:24
The section claims to be for ccache builds, however those are already
fixed after commit 1cc58d3.

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: bitcoin#34413
Rebased-From: fa06cd4
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
407062f

Github-Pull: bitcoin#34413
Rebased-From: fa2e1b8
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: bitcoin#34358
Rebased-From: 1f60ca3
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: bitcoin#32513
Rebased-From: 7ae0497
m3dwards and others added 3 commits January 29, 2026 14:07
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: bitcoin#32513
Rebased-From: e1a1b14
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: bitcoin#32513
Rebased-From: 1569279
@fanquake fanquake marked this pull request as ready for review January 29, 2026 14:10
@fanquake fanquake requested a review from marcofleon January 29, 2026 14:19

@willcl-ark willcl-ark left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 624c745

Backports are all clean (except #34344) and are listed in the release notes.

@marcofleon marcofleon left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 624c745

@fanquake fanquake merged commit 3761863 into bitcoin:30.x Jan 29, 2026
20 checks passed
@fanquake fanquake deleted the 30_3_backports branch January 29, 2026 15:51
morozow pushed a commit to morozow/bitcoin_rd that referenced this pull request May 8, 2026
5516cdf doc: update release notes for v30.x (fanquake)
ed0f9d9 ci: Check windows manifests for all executables (Max Edwards)
1ea51a4 ci: use a more generic way of finding mt.exe (Max Edwards)
4ef0eb9 ci: remove 3rd party js from windows dll gha job (Max Edwards)
7d298bf wallet: fix removeprunedfunds bug with conflicting transactions (Martin Zumsande)
f4957df build: Remove outdated comment about -ffile-prefix-map (MarcoFalke)
2d36935 doc: Remove outdated -fdebug-prefix-map section in dev notes (MarcoFalke)
a9ff62b build: Temporarily remove confusing and brittle -fdebug-prefix-map (MarcoFalke)
d529f01 test: allow overriding tar in get_previous_releases (fanquake)
72272fe chore: Update outdated GitHub Actions versions (Padraic Slattery)
500618b qa: Fix Windows logging bug (Hennadii Stepanov)
397a371 test: check wallet rescan properly in feature_pruning (brunoerg)
c2fbc8c test: fix feature_pruning when built without wallet (brunoerg)
74f9b2c psbt: Fix `PSBTInputSignedAndVerified` bounds `assert` (Lőrinc)
7995038 doc: add 433 (Pay to Anchor) to bips.md (Sebastian Falbesoner)

Pull request description:

  Backports:
  * bitcoin#32513
  * bitcoin#34185
  * bitcoin#34272
  * bitcoin#34252
  * bitcoin#34281
  * bitcoin#34282
  * bitcoin#34344
  * bitcoin#34358
  * bitcoin#34390
  * bitcoin#34413

ACKs for top commit:
  willcl-ark:
    ACK 5516cdf
  marcofleon:
    ACK 5516cdf

Tree-SHA512: 65f413419b50784d2661d89f2044acd5196eacd50841bb93d7437b83bd23ce535565168cd4c53f96ba485863a911f5a1ea5476b22955d6b931b65e87f78b9a17
@fanquake fanquake mentioned this pull request Jun 3, 2026
sedited added a commit that referenced this pull request Jun 23, 2026
d52747d doc: update manual pages for v30.3rc1 (fanquake)
a1406d6 build: bump version to v30.3rc1 (fanquake)
1bdd2b1 doc: update release notes for v30.3rc1 (fanquake)
e7c6d39 fuzz: Remove unused g_setup pointers (MarcoFalke)
b7c7d1e coins: compact chainstate in background (Lőrinc)
992b1dd validation: randomly compact chainstate (Lőrinc)
55ead70 coins: test chainstate flush baseline (Lőrinc)
d09bd0f lint: disable leveldb subtree check (fanquake)

Pull request description:

  Backports:
  * #34918
  * #35465

  Final changes for v`30.3rc1`.

  Backports since `30.2`:
  * #34283
  * #34459
  * #34689
  * #34754
  * #34805
  * #34856
  * #35211
  * #35232

ACKs for top commit:
  sedited:
    ACK d52747d
  marcofleon:
    ACK d52747d

Tree-SHA512: 75fb64f744a0689a9bc4f5a25128bf2aaad7459d7a430f552200b995498428d89de28820f477780f95e7e8485eea9f657ad5fdeae253940df4f29bf51346b4ff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.