phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 23:09:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

wallet: migration bugfix, clone 'send' record label to all wallets

Browse source
This commit is contained in:
furszy 2023-02-26 21:02:34 -03:00
parent c325f0fbae
commit 1b64f6498c
No known key found for this signature in database
GPG key ID: 5DD23CCC686AA623
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/wallet/wallet.cpp
View file

@ -4031,7 +4031,7 @@ bool CWallet::ApplyMigrationData(MigrationData& data, bilingual_str& error)
return false; return false;
} }
} else { } else {
// Labels for everything else (send) should be cloned to all // Labels for everything else ("send") should be cloned to all
if (data.watchonly_wallet) { if (data.watchonly_wallet) {
LOCK(data.watchonly_wallet->cs_wallet); LOCK(data.watchonly_wallet->cs_wallet);
// Add to the watchonly. Preserve the labels, purpose, and change-ness // Add to the watchonly. Preserve the labels, purpose, and change-ness
@ -4040,7 +4040,6 @@ bool CWallet::ApplyMigrationData(MigrationData& data, bilingual_str& error)
if (!addr_pair.second.IsChange()) { if (!addr_pair.second.IsChange()) {
data.watchonly_wallet->m_address_book[addr_pair.first].SetLabel(label); data.watchonly_wallet->m_address_book[addr_pair.first].SetLabel(label);
} }
continue;
} }
if (data.solvable_wallet) { if (data.solvable_wallet) {
LOCK(data.solvable_wallet->cs_wallet); LOCK(data.solvable_wallet->cs_wallet);
@ -4050,7 +4049,6 @@ bool CWallet::ApplyMigrationData(MigrationData& data, bilingual_str& error)
if (!addr_pair.second.IsChange()) { if (!addr_pair.second.IsChange()) {
data.solvable_wallet->m_address_book[addr_pair.first].SetLabel(label); data.solvable_wallet->m_address_book[addr_pair.first].SetLabel(label);
} }
continue;
} }
} }
} }