highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-13 14:54:53 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: Check for descriptors flag before migration

Browse Source 
Previously we would check that there is no LegacySPKM in order to
determine whether a wallet is already a descriptor wallet and doesn't
need to be migrated. However blank legacy wallets will also not have a
LegacySPKM, so we need to be checking for the descriptors flag instead.
This commit is contained in:
Andrew Chow
2023-11-30 16:00:06 -05:00
committed by Ava Chow
parent 8c127ff1ed
commit b1d2c771d4
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/wallet.cpp
View File

@ -4213,7 +4213,7 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
} }
// Before anything else, check if there is something to migrate. // Before anything else, check if there is something to migrate.
if (!local_wallet->GetLegacyScriptPubKeyMan()) { if (local_wallet->IsWalletFlagSet(WALLET_FLAG_DESCRIPTORS)) {
return util::Error{_("Error: This wallet is already a descriptor wallet")}; return util::Error{_("Error: This wallet is already a descriptor wallet")};
} }