Merge 93e10cab5d into merged_master (Bitcoin PR bitcoin/bitcoin#29367)

This commit is contained in:
Byron Hambly 2025-11-29 14:43:31 +02:00
commit c34920f56a
No known key found for this signature in database
GPG key ID: DE8F6EA20A661697
2 changed files with 4 additions and 1 deletions

View file

@ -5069,6 +5069,9 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
success = local_wallet->IsWalletFlagSet(WALLET_FLAG_BLANK_WALLET);
if (!success) {
success = DoMigration(*local_wallet, context, error, res);
} else {
// Make sure that descriptors flag is actually set
local_wallet->SetWalletFlag(WALLET_FLAG_DESCRIPTORS);
}
}