Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-29 05:22:30 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 28976 via fix_wallet_migrate_blank-26

Browse Source
This commit is contained in:
Luke Dashjr 2024-03-25 17:26:53 +00:00
commit c6906c5a12
2 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/wallet/wallet.cpp
View File

@ -3858,7 +3858,11 @@ std::optional<MigrationData> CWallet::GetDescriptorsForLegacy(bilingual_str& err
AssertLockHeld(cs_wallet); AssertLockHeld(cs_wallet);
LegacyScriptPubKeyMan* legacy_spkm = GetLegacyScriptPubKeyMan(); LegacyScriptPubKeyMan* legacy_spkm = GetLegacyScriptPubKeyMan();
assert(legacy_spkm); if (!Assume(legacy_spkm)) {
// This shouldn't happen
error = Untranslated(STR_INTERNAL_BUG("Error: Legacy wallet data missing"));
return std::nullopt;
}
std::optional<MigrationData> res = legacy_spkm->MigrateToDescriptor(); std::optional<MigrationData> res = legacy_spkm->MigrateToDescriptor();
if (res == std::nullopt) { if (res == std::nullopt) {
@ -3873,8 +3877,9 @@ bool CWallet::ApplyMigrationData(MigrationData& data, bilingual_str& error)
AssertLockHeld(cs_wallet); AssertLockHeld(cs_wallet);
LegacyScriptPubKeyMan* legacy_spkm = GetLegacyScriptPubKeyMan(); LegacyScriptPubKeyMan* legacy_spkm = GetLegacyScriptPubKeyMan();
if (!legacy_spkm) { if (!Assume(legacy_spkm)) {
error = _("Error: This wallet is already a descriptor wallet"); // This shouldn't happen
error = Untranslated(STR_INTERNAL_BUG("Error: Legacy wallet data missing"));
return false; return false;
} }
@ -4223,7 +4228,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")};
} }
@ -4256,8 +4261,14 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
// First change to using SQLite // First change to using SQLite
if (!local_wallet->MigrateToSQLite(error)) return util::Error{error}; if (!local_wallet->MigrateToSQLite(error)) return util::Error{error};
// Do the migration, and cleanup if it fails // Do the migration of keys and scripts for non-blank wallets, and cleanup if it fails
success = DoMigration(*local_wallet, context, error, res); 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);
}
} }
// In case of reloading failure, we need to remember the wallet dirs to remove // In case of reloading failure, we need to remember the wallet dirs to remove

13
test/functional/wallet_migration.py
View File

@ -53,13 +53,12 @@ class WalletMigrationTest(BitcoinTestFramework):
assert_equal(file_magic, b'SQLite format 3\x00') assert_equal(file_magic, b'SQLite format 3\x00')
assert_equal(self.nodes[0].get_wallet_rpc(wallet_name).getwalletinfo()["format"], "sqlite") assert_equal(self.nodes[0].get_wallet_rpc(wallet_name).getwalletinfo()["format"], "sqlite")
def create_legacy_wallet(self, wallet_name, disable_private_keys=False): def create_legacy_wallet(self, wallet_name, **kwargs):
self.nodes[0].createwallet(wallet_name=wallet_name, descriptors=False, disable_private_keys=disable_private_keys) self.nodes[0].createwallet(wallet_name=wallet_name, descriptors=False, **kwargs)
wallet = self.nodes[0].get_wallet_rpc(wallet_name) wallet = self.nodes[0].get_wallet_rpc(wallet_name)
info = wallet.getwalletinfo() info = wallet.getwalletinfo()
assert_equal(info["descriptors"], False) assert_equal(info["descriptors"], False)
assert_equal(info["format"], "bdb") assert_equal(info["format"], "bdb")
assert_equal(info["private_keys_enabled"], not disable_private_keys)
return wallet return wallet
def assert_addr_info_equal(self, addr_info, addr_info_old): def assert_addr_info_equal(self, addr_info, addr_info_old):
@ -877,6 +876,13 @@ class WalletMigrationTest(BitcoinTestFramework):
_, _, magic = struct.unpack("QII", data) _, _, magic = struct.unpack("QII", data)
assert_equal(magic, BTREE_MAGIC) assert_equal(magic, BTREE_MAGIC)
def test_blank(self):
self.log.info("Test that a blank wallet is migrated")
wallet = self.create_legacy_wallet("blank", blank=True)
assert_equal(wallet.getwalletinfo()["blank"], True)
wallet.migratewallet()
assert_equal(wallet.getwalletinfo()["blank"], True)
assert_equal(wallet.getwalletinfo()["descriptors"], True)
def run_test(self): def run_test(self):
self.generate(self.nodes[0], 101) self.generate(self.nodes[0], 101)
@ -897,6 +903,7 @@ class WalletMigrationTest(BitcoinTestFramework):
self.test_conflict_txs() self.test_conflict_txs()
self.test_hybrid_pubkey() self.test_hybrid_pubkey()
self.test_failed_migration_cleanup() self.test_failed_migration_cleanup()
self.test_blank()
if __name__ == '__main__': if __name__ == '__main__':
WalletMigrationTest().main() WalletMigrationTest().main()