Merge bitcoin/bitcoin#35924: Wallet, refactor: Remove orphaned EraseWatchOnly function
What the developer wrote
Authored by merge-script
Merge bitcoin/bitcoin#35924: Wallet, refactor: Remove orphaned EraseWatchOnly function
6304789a18f9391ff70bf8eed649bdecf176a086 Wallet, refactor: Remove orphaned EraseWatchOnly function (vicjuma)
Pull request description:
**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.
ACKs for top commit:
jeanpablojp:
ACK 6304789a18f9391ff70bf8eed649bdecf176a086
pablomartin4btc:
ACK 6304789a18f9391ff70bf8eed649bdecf176a086
Tree-SHA512: 48546b3fa9155d6f9549ce8e77d9fe34cbfc738e6814ac9cd256b85668d0fa325e51404f962d491c6d4989baefd03815c680578bfcc73741cf9c4e65b141f92e
What changed, and why it matters
This commit removes an unused function called EraseWatchOnly from the Bitcoin Core wallet code. It is a routine cleanup with no functional change and no security relevance.
No action needed. This is a benign code-cleanup refactor.
Security signals we found
No strong security signals were identified.
Evidence from the diff
The commit deletes the WalletBatch::EraseWatchOnly method and its declaration. The function had no remaining callers after a prior refactor (PR #28710), so this change only removes dead code. There is no logic change, no bug fix, and no security behavior alteration.
Changed components
src/wallet/walletdb.cppsrc/wallet/walletdb.hInspect captured patch +0 / −9
### src/wallet/walletdb.cpp
@@ -179,14 +179,6 @@ bool WalletBatch::WriteWatchOnly(const CScript &dest, const CKeyMetadata& keyMet
return WriteIC(std::make_pair(DBKeys::WATCHS, dest), uint8_t{'1'});
}
-bool WalletBatch::EraseWatchOnly(const CScript &dest)
-{
- if (!EraseIC(std::make_pair(DBKeys::WATCHMETA, dest))) {
- return false;
- }
- return EraseIC(std::make_pair(DBKeys::WATCHS, dest));
-}
-
bool WalletBatch::WriteBestBlock(const CBlockLocator& locator)
{
WriteIC(DBKeys::BESTBLOCK, CBlockLocator()); // Write empty block locator so versions that require a merkle branch automatically rescan
### src/wallet/walletdb.h
@@ -241,7 +241,6 @@ class WalletBatch
bool EraseMasterKey(unsigned int id);
bool WriteWatchOnly(const CScript &script, const CKeyMetadata &keymeta);
- bool EraseWatchOnly(const CScript &script);
bool WriteBestBlock(const CBlockLocator& locator);
bool ReadBestBlock(CBlockLocator& locator);Why this scored 15/100
Community notes
Notes can correct, qualify, or add evidence to the AI analysis. Every note shown here has been validated by a human moderator.
The AI analysis stands alone for now. Submit a note if you can add evidence or important context.