Skip to content

[28.x] backports and 28.4rc2#34620

Merged
fanquake merged 9 commits intobitcoin:28.xfrom
achow101:28.4rc2-backports
Mar 4, 2026
Merged

[28.x] backports and 28.4rc2#34620
fanquake merged 9 commits intobitcoin:28.xfrom
achow101:28.4rc2-backports

Conversation

@achow101
Copy link
Member

@achow101 achow101 commented Feb 19, 2026

…allet

If any other files exist in the directory, we cannot assume the sharable files are exclusively for this wallet.
But if they are, this also cleans up other log.* files

Github-Pull: bitcoin#34370
Rebased-From: 7475d13
…ils, log the correct wallet name in error message

Github-Pull: bitcoin#34370
Rebased-From: 60f5290
…eason

Since we no longer delete the wallet directory, there's no need to vacate it
The moving only served to risk errors by crossing filesystem boundaries (which fs::rename can't handle)

Github-Pull: 34370
Rebased-From: cef01d0
…ating from non-directory

While 30.x+ keep backup files in walletdir, 29.x places them in the migrated wallet directory

Github-Pull: bitcoin#34370
Rebased-From: 69a6b9b
…et, but not with a shared db environment

Github-Pull: bitcoin#34370
Rebased-From: 6517394
@DrahtBot
Copy link
Contributor

DrahtBot commented Feb 19, 2026

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 willcl-ark

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

@fanquake
Copy link
Member

Needs a bump to the version in the release-notes.

@fanquake fanquake added this to the 28.4 milestone Feb 19, 2026
@achow101
Copy link
Member Author

Needs a bump to the version in the release-notes.

Done

@fanquake
Copy link
Member

Can pull #34671 in here too.

Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

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

ACK bfaec08

These all look good to me. Only conflict looks like the MigrateLegacyToDescriptor signature.

Release notes look good too. Can re-review if you add 34671

MarcoFalke and others added 4 commits February 26, 2026 10:03
@achow101
Copy link
Member Author

Backported #34671

Copy link
Member

@willcl-ark willcl-ark left a comment

Choose a reason for hiding this comment

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

ACK 44e6dda

Addition of 931f12d cleanly.

@fanquake fanquake merged commit ed80bb2 into bitcoin:28.x Mar 4, 2026
17 checks passed
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.

5 participants