From 0bedcbafdfaa0e980ad91c0ba4b9039575017f0e Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Sun, 17 Feb 2019 17:28:04 -1000 Subject: Use a single wallet batch for UpgradeKeyMetadata --- src/wallet/wallet.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'src/wallet') diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index d174e308f0..388422bec8 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -371,6 +371,8 @@ void CWallet::UpgradeKeyMetadata() return; } + std::unique_ptr batch = MakeUnique(*database); + size_t cnt = 0; for (auto& meta_pair : mapKeyMetadata) { CKeyMetadata& meta = meta_pair.second; if (!meta.hd_seed_id.IsNull() && !meta.has_key_origin && meta.hdKeypath != "s") { // If the hdKeypath is "s", that's the seed and it doesn't have a key origin @@ -392,10 +394,15 @@ void CWallet::UpgradeKeyMetadata() // Write meta to wallet CPubKey pubkey; if (GetPubKey(meta_pair.first, pubkey)) { - WriteKeyMetadata(meta, pubkey, true); + batch->WriteKeyMetadata(meta, pubkey, true); + if (++cnt % 1000 == 0) { + // avoid creating overlarge in-memory batches in case the wallet contains large amounts of keys + batch.reset(new WalletBatch(*database)); + } } } } + batch.reset(); //write before setting the flag SetWalletFlag(WALLET_FLAG_KEY_ORIGIN_METADATA); } -- cgit v1.2.3