Summary
This is a follow-up PR for #28710 by achow101 where bool LegacyScriptPubKeyMan::RemoveWatchOnly(const CScript &dest) which was the only remaining caller for the function EraseWatchOnly was removed. This PR is just a cleanup to remove the orphaned function.
Wallet, refactor: Remove orphaned EraseWatchOnly function #35924
pull vicjuma wants to merge 1 commits into bitcoin:master from vicjuma:wallet-remove-erasewatchonly changing 2 files +0 −9-
vicjuma commented at 12:16 AM on August 7, 2026: contributor
-
6304789a18
Wallet, refactor: Remove orphaned EraseWatchOnly function
Removed a function whose caller was removed in a previous merged PR
-
DrahtBot commented at 12:16 AM on August 7, 2026: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--006a51241073e994b41acfe9ec718e94-->
Code Coverage & Benchmarks
For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/35924.
<!--021abf342d371248e50ceaed478a90ca-->
Reviews
See the guideline and AI policy for information on the review process.
Type Reviewers ACK pablomartin4btc, jeanpablojp If your review is incorrectly listed, please copy-paste <code><!--meta-tag:bot-skip--></code> into the comment that the bot should ignore.
<!--5faf32d7da4f0f540f40219e4f7537a3-->
-
pablomartin4btc commented at 3:01 AM on August 7, 2026: member
ACK 6304789a18f9391ff70bf8eed649bdecf176a086
-
jeanpablojp commented at 1:41 AM on August 8, 2026: none
ACK 6304789a18f9391ff70bf8eed649bdecf176a086
I have tested the code.
EraseWatchOnlylost its last caller in 83af1a3cca ("wallet: Delete LegacySPKM", January 2024).WriteWatchOnlyis still called from src/bench/wallet_migration.cpp:76 and the WATCHS and WATCHMETA records are still read on migration, so removing only the erase half is the right split.Built the merge with master (1be0b46297) with wallet, tests and bench enabled: no errors, full unit suite passes.
- fanquake merged this on Aug 11, 2026
- fanquake closed this on Aug 11, 2026