mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wallet: Avoid multiple BerkeleyBatch in DelAddressBook

Browse Source
This commit is contained in:
João Barbosa committed 2020-09-06 10:59:01 +01:00
1 parent 0368931702
commit abac436760
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
src/wallet/wallet.cpp
+5 -3
View File
@@ -2346,6 +2346,7 @@ std::map<CTxDestination, std::vector<COutput>> CWallet::ListCoins() const
const CTxOut& CWallet::FindNonChangeParentOutput(const CTransaction& tx, int output) const const CTxOut& CWallet::FindNonChangeParentOutput(const CTransaction& tx, int output) const
{ {
AssertLockHeld(cs_wallet);
const CTransaction* ptx = &tx; const CTransaction* ptx = &tx;
int n = output; int n = output;
while (IsChange(ptx->vout[n]) && ptx->vin.size() > 0) { while (IsChange(ptx->vout[n]) && ptx->vin.size() > 0) {
@@ -3264,6 +3265,7 @@ bool CWallet::SetAddressBook(const CTxDestination& address, const std::string& s
bool CWallet::DelAddressBook(const CTxDestination& address) bool CWallet::DelAddressBook(const CTxDestination& address)
{ {
bool is_mine; bool is_mine;
WalletBatch batch(*database);
{ {
LOCK(cs_wallet); LOCK(cs_wallet);
// If we want to delete receiving addresses, we need to take care that DestData "used" (and possibly newer DestData) gets preserved (and the "deleted" address transformed into a change entry instead of actually being deleted) // If we want to delete receiving addresses, we need to take care that DestData "used" (and possibly newer DestData) gets preserved (and the "deleted" address transformed into a change entry instead of actually being deleted)
@@ -3277,7 +3279,7 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
std::string strAddress = EncodeDestination(address); std::string strAddress = EncodeDestination(address);
for (const std::pair<const std::string, std::string> &item : m_address_book[address].destdata) for (const std::pair<const std::string, std::string> &item : m_address_book[address].destdata)
{ {
WalletBatch(*database).EraseDestData(strAddress, item.first); batch.EraseDestData(strAddress, item.first);
} }
m_address_book.erase(address); m_address_book.erase(address);
is_mine = IsMine(address) != ISMINE_NO; is_mine = IsMine(address) != ISMINE_NO;
@@ -3285,8 +3287,8 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
NotifyAddressBookChanged(this, address, "", is_mine, "", CT_DELETED); NotifyAddressBookChanged(this, address, "", is_mine, "", CT_DELETED);
WalletBatch(*database).ErasePurpose(EncodeDestination(address)); batch.ErasePurpose(EncodeDestination(address));
return WalletBatch(*database).EraseName(EncodeDestination(address)); return batch.EraseName(EncodeDestination(address));
} }
size_t CWallet::KeypoolCountExternalKeys() const size_t CWallet::KeypoolCountExternalKeys() const