diff options
| author | fanquake <fanquake@gmail.com> | 2020-09-03 12:22:22 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2020-09-03 12:47:01 +0800 |
| commit | 68f0ab26bca825edf7e48a69176c38b04e3158d0 (patch) | |
| tree | b9f924daafc259fe3390e0face4bd7751768d77c /src/wallet/walletdb.h | |
| parent | 136fe4c5e9fbaff1b461571c5f67d4fafe12c4ea (diff) | |
| parent | 0bbe26a1af2aab2287b18048f80b3f70e63e0044 (diff) | |
| download | bitcoin-68f0ab26bca825edf7e48a69176c38b04e3158d0.tar.xz | |
Merge #19805: wallet: Avoid deserializing unused records when salvaging
0bbe26a1af2aab2287b18048f80b3f70e63e0044 wallet: filter for keys only before record deser in salvage (Andrew Chow)
544e12a4e81633d222574eec253a1ff292d3c4a5 walletdb: Add KeyFilterFn to ReadKeyValue (Andrew Chow)
Pull request description:
When salvaging a wallet, the only things that matter are the private keys. It is not necessary to attempt to deserialize any other records, especially if those records are corrupted too.
This PR adds a `KeyFilterFn` function callback to `ReadKeyValue` that salvage uses to filter for only the records that it wants. Of course doing it this way also lets us do other filters in the future from other places should we so desire.
ACKs for top commit:
ryanofsky:
Code review ACK 0bbe26a1af2aab2287b18048f80b3f70e63e0044. Looks great! This should make the recovery code more robust. Normally it'd be good to have a test case for the problem this fixes, but Marco already wrote one in #19078, so I think we're covered
laanwj:
Code review ACK 0bbe26a1af2aab2287b18048f80b3f70e63e0044
Tree-SHA512: 8e3ee283a22a79273915711c4fb751f3c9b02ce94e6bf08dc468f1cfdf9fac35c693bbfd2435ce43c3a06c601b9b0a67e209621f6814bedfe3bc7a7ccc37bb01
Diffstat (limited to 'src/wallet/walletdb.h')
| -rw-r--r-- | src/wallet/walletdb.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/wallet/walletdb.h b/src/wallet/walletdb.h index c13de01319..2548c17508 100644 --- a/src/wallet/walletdb.h +++ b/src/wallet/walletdb.h @@ -279,8 +279,11 @@ private: //! Compacts BDB state so that wallet.dat is self-contained (if there are changes) void MaybeCompactWalletDB(); +//! Callback for filtering key types to deserialize in ReadKeyValue +using KeyFilterFn = std::function<bool(const std::string&)>; + //! Unserialize a given Key-Value pair and load it into the wallet -bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, std::string& strType, std::string& strErr); +bool ReadKeyValue(CWallet* pwallet, CDataStream& ssKey, CDataStream& ssValue, std::string& strType, std::string& strErr, const KeyFilterFn& filter_fn = nullptr); /** Return whether a wallet database is currently loaded. */ bool IsWalletLoaded(const fs::path& wallet_path); |