mirror of
https://github.com/ElementsProject/elements.git
synced 2026-08-17 13:07:54 +02:00
Merge 93e10cab5d into merged_master (Bitcoin PR bitcoin/bitcoin#29367)
This commit is contained in:
commit
c34920f56a
2 changed files with 4 additions and 1 deletions
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue