wallet: WalletBatch->WriteVersion respect argument #36008

pull fanquake wants to merge 1 commits into bitcoin:master from fanquake:commit_from_34490 changing 1 files +8 −2

fanquake commented at 8:39 AM on August 18, 2026: member

Previously would use global CLIENT_VERSION no matter what, but this is one sense a refactor since all of the places where WriteVersion is called currently call it with CLIENT_VERSION anyways. The client_version argument is kept since future test code may want to write other versions.

Addresses a review comment from #32636:

This was originally pointed out in #32636 (review), and the followup (#34490) was never merged. However I think it's confusing to have functions that take arguments but ignore them (and it's dead code), so I've cherry-picked the fix up from #34490.

wallet: WalletBatch->WriteVersion respect argument.

Previously would use global `CLIENT_VERSION` no matter what, but this is
one sense a refactor since all of the places where WriteVersion is
called currently call it with `CLIENT_VERSION` anyways. The
`client_version` argument is kept since future test code may want to
write other versions.

Addresses a review comment from #32636:

https://github.com/bitcoin/bitcoin/pull/32636#discussion_r2356299627

ec5d19665b

DrahtBot added the label Wallet on Aug 18, 2026
fanquake renamed this:
~~wallet: WalletBatch->WriteVersion respect argument.~~
wallet: WalletBatch->WriteVersion respect argument
on Aug 18, 2026
DrahtBot commented at 8:39 AM on August 18, 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/36008.



Reviews

See the guideline and AI policy for information on the review process.

Type Reviewers

ACK pablomartin4btc, w0xlt, achow101

If your review is incorrectly listed, please copy-paste <code></code> into the comment that the bot should ignore.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #35998 (wallet: Handle or explicitly ignore WalletBatch write failures by achow101)
- #32895 (wallet: Prepare for future upgrades by recording versions of last client to open and decrypt by achow101)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
pablomartin4btc commented at 7:19 PM on August 18, 2026: member

ACK ec5d19665b8935eabac36df4ec1ba2e19ee05c25
w0xlt commented at 8:53 PM on August 18, 2026: contributor

ACK ec5d19665b8935eabac36df4ec1ba2e19ee05c25
achow101 commented at 10:37 PM on August 18, 2026: member

ACK ec5d19665b8935eabac36df4ec1ba2e19ee05c25
achow101 merged this on Aug 18, 2026
achow101 closed this on Aug 18, 2026
davidgumberg commented at 11:14 PM on August 18, 2026: contributor

post-merge crACK https://github.com/bitcoin/bitcoin/commit/ec5d19665b8935eabac36df4ec1ba2e19ee05c25
fanquake deleted the branch on Aug 19, 2026