GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-14 12:43:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

3
src/wallet/wallet.cpp
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);
}
}

2
test/functional/wallet_migration.py
View file

@ -890,7 +890,7 @@ class WalletMigrationTest(BitcoinTestFramework):
assert_equal(wallet.getwalletinfo()["blank"], True)
wallet.migratewallet()
assert_equal(wallet.getwalletinfo()["blank"], True)
assert_equal(wallet.getwalletinfo()["descriptors"], True)
def test_avoidreuse(self):
self.log.info("Test that avoidreuse persists after migration")