phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-26 03:03:22 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

wallet: migration, consolidate main wallet db writes

Browse source 
Perform a single db write operation for the entire
migration procedure.
This commit is contained in:
furszy 2024-02-13 12:34:16 -03:00
parent 9ef20e86d7
commit 7c9076a2d2
No known key found for this signature in database
GPG key ID: 5DD23CCC686AA623
2 changed files with 14 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/wallet/wallet.cpp
View file

@ -4068,7 +4068,7 @@ std::optional<MigrationData> CWallet::GetDescriptorsForLegacy(bilingual_str& err
return res; return res;
} }
util::Result<void> CWallet::ApplyMigrationData(MigrationData& data) util::Result<void> CWallet::ApplyMigrationData(WalletBatch& local_wallet_batch, MigrationData& data)
{ {
AssertLockHeld(cs_wallet); AssertLockHeld(cs_wallet);
@ -4096,7 +4096,7 @@ util::Result<void> CWallet::ApplyMigrationData(MigrationData& data)
} }
// Remove the LegacyScriptPubKeyMan from disk // Remove the LegacyScriptPubKeyMan from disk
if (!legacy_spkm->DeleteRecords()) { if (!legacy_spkm->DeleteRecordsWithDB(local_wallet_batch)) {
return util::Error{_("Error: cannot remove legacy wallet records")}; return util::Error{_("Error: cannot remove legacy wallet records")};
} }
@ -4106,9 +4106,8 @@ util::Result<void> CWallet::ApplyMigrationData(MigrationData& data)
m_internal_spk_managers.clear(); m_internal_spk_managers.clear();
// Setup new descriptors // Setup new descriptors
SetWalletFlag(WALLET_FLAG_DESCRIPTORS); SetWalletFlagWithDB(local_wallet_batch, WALLET_FLAG_DESCRIPTORS);
if (!IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) { if (!IsWalletFlagSet(WALLET_FLAG_DISABLE_PRIVATE_KEYS)) {
WalletBatch local_wallet_batch(GetDatabase());
// Use the existing master key if we have it // Use the existing master key if we have it
if (data.master_key.key.IsValid()) { if (data.master_key.key.IsValid()) {
SetupDescriptorScriptPubKeyMans(local_wallet_batch, data.master_key); SetupDescriptorScriptPubKeyMans(local_wallet_batch, data.master_key);
@ -4120,7 +4119,7 @@ util::Result<void> CWallet::ApplyMigrationData(MigrationData& data)
// Get best block locator so that we can copy it to the watchonly and solvables // Get best block locator so that we can copy it to the watchonly and solvables
CBlockLocator best_block_locator; CBlockLocator best_block_locator;
if (!WalletBatch(GetDatabase()).ReadBestBlock(best_block_locator)) { if (!local_wallet_batch.ReadBestBlock(best_block_locator)) {
return util::Error{_("Error: Unable to read wallet's best block locator record")}; return util::Error{_("Error: Unable to read wallet's best block locator record")};
} }
@ -4179,7 +4178,7 @@ util::Result<void> CWallet::ApplyMigrationData(MigrationData& data)
watchonly_batch.reset(); // Flush watchonly_batch.reset(); // Flush
// Do the removes // Do the removes
if (txids_to_delete.size() > 0) { if (txids_to_delete.size() > 0) {
if (auto res = RemoveTxs(txids_to_delete); !res) { if (auto res = RemoveTxs(local_wallet_batch, txids_to_delete); !res) {
return util::Error{_("Error: Could not delete watchonly transactions. ") + util::ErrorString(res)}; return util::Error{_("Error: Could not delete watchonly transactions. ") + util::ErrorString(res)};
} }
} }
@ -4253,8 +4252,6 @@ util::Result<void> CWallet::ApplyMigrationData(MigrationData& data)
} }
// Remove the things to delete in this wallet // Remove the things to delete in this wallet
WalletBatch local_wallet_batch(GetDatabase());
local_wallet_batch.TxnBegin();
if (dests_to_delete.size() > 0) { if (dests_to_delete.size() > 0) {
for (const auto& dest : dests_to_delete) { for (const auto& dest : dests_to_delete) {
if (!DelAddressBookWithDB(local_wallet_batch, dest)) { if (!DelAddressBookWithDB(local_wallet_batch, dest)) {
@ -4262,9 +4259,6 @@ util::Result<void> CWallet::ApplyMigrationData(MigrationData& data)
} }
} }
} }
local_wallet_batch.TxnCommit();
WalletLogPrintf("Wallet migration complete.\n");
return {}; // all good return {}; // all good
} }
@ -4377,11 +4371,14 @@ bool DoMigration(CWallet& wallet, WalletContext& context, bilingual_str& error,
} }
// Add the descriptors to wallet, remove LegacyScriptPubKeyMan, and cleanup txs and address book data // Add the descriptors to wallet, remove LegacyScriptPubKeyMan, and cleanup txs and address book data
if (auto res_migration = wallet.ApplyMigrationData(*data); !res_migration) { return RunWithinTxn(wallet.GetDatabase(), /*process_desc=*/"apply migration process", [&](WalletBatch& batch) EXCLUSIVE_LOCKS_REQUIRED(wallet.cs_wallet){
error = util::ErrorString(res_migration); if (auto res_migration = wallet.ApplyMigrationData(batch, *data); !res_migration) {
return false; error = util::ErrorString(res_migration);
} return false;
return true; }
wallet.WalletLogPrintf("Wallet migration complete.\n");
return true;
});
} }
util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context) util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& wallet_name, const SecureString& passphrase, WalletContext& context)

2
src/wallet/wallet.h
View file

@ -1051,7 +1051,7 @@ public:
//! Adds the ScriptPubKeyMans given in MigrationData to this wallet, removes LegacyScriptPubKeyMan, //! Adds the ScriptPubKeyMans given in MigrationData to this wallet, removes LegacyScriptPubKeyMan,
//! and where needed, moves tx and address book entries to watchonly_wallet or solvable_wallet //! and where needed, moves tx and address book entries to watchonly_wallet or solvable_wallet
util::Result<void> ApplyMigrationData(MigrationData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); util::Result<void> ApplyMigrationData(WalletBatch& local_wallet_batch, MigrationData& data) EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
//! Whether the (external) signer performs R-value signature grinding //! Whether the (external) signer performs R-value signature grinding
bool CanGrindR() const; bool CanGrindR() const;