mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-11-12 23:18:14 +01:00
Merge bitcoin/bitcoin#24914: wallet: Load database records in a particular order
3c83b1d884doc: Add release note for wallet loading changes (Andrew Chow)2636844f53walletdb: Remove loading code where the database is iterated (Andrew Chow)cd211b3b99walletdb: refactor decryption key loading (Andrew Chow)31c033e5cawalletdb: refactor defaultkey and wkey loading (Andrew Chow)c978c6d39cwalletdb: refactor active spkm loading (Andrew Chow)6fabb7fc99walletdb: refactor tx loading (Andrew Chow)abcc13dd24walletdb: refactor address book loading (Andrew Chow)405b4d9147walletdb: Refactor descriptor wallet records loading (Andrew Chow)30ab11c497walletdb: Refactor legacy wallet record loading into its own function (Andrew Chow)9e077d9b42salvage: Remove use of ReadKeyValue in salvage (Andrew Chow)ad779e9ecewalletdb: Refactor hd chain loading to its own function (Andrew Chow)72c2a54ebbwalletdb: Refactor encryption key loading to its own function (Andrew Chow)3ccde4599bwalletdb: Refactor crypted key loading to its own function (Andrew Chow)7be10adff3walletdb: Refactor key reading and loading to its own function (Andrew Chow)52932c5adbwalletdb: Refactor wallet flags loading (Andrew Chow)01b35b55a1walletdb: Refactor minversion loading (Andrew Chow) Pull request description: Currently when we load a wallet, we just iterate through all of the records in the database and add them completely statelessly. However we have some records which do rely on other records being loaded before they are. To deal with this, we use `CWalletScanState` to hold things temporarily until all of the records have been read and then we load the stateful things. However this can be slow, and with some future improvements, can cause some pretty drastic slowdowns to retain this pattern. So this PR changes the way we load records by choosing to load the records in a particular order. This lets us do things such as loading a descriptor record, then finding and loading that descriptor's cache and key records. In the future, this will also let us use `IsMine` when loading transactions as then `IsMine` will actually be working as we now always load keys and descriptors before transactions. In order to get records of a specific type, this PR includes some refactors to how we do database cursors. Functionality is also added to retrieve a cursor that will give us records beginning with a specified prefix. Lastly, one thing that iterating the entire database let us do was to find unknown records. However even if unknown records were found, we would not do anything with this information except output a number in a log line. With this PR, we would no longer be aware of any unknown records. This does not change functionality as we don't do anything with unknown records, and having unknown records is not an error. Now we would just not be aware that unknown records even exist. ACKs for top commit: MarcoFalke: re-ACK3c83b1d884🍤 furszy: reACK3c83b1d8ryanofsky: Code review ACK3c83b1d884. Just Marco's suggested error handling fixes since last review Tree-SHA512: 15fa56332fb2ce4371db468a0c674ee7a3a8889c8cee9f428d06a7d1385d17a9bf54bcb0ba885c87736841fe6a5c934594bcf4476a473616510ee47862ef30b4
This commit is contained in:
@@ -2929,7 +2929,7 @@ std::shared_ptr<CWallet> CWallet::Create(WalletContext& context, const std::stri
|
||||
else if (nLoadWalletRet == DBErrors::NONCRITICAL_ERROR)
|
||||
{
|
||||
warnings.push_back(strprintf(_("Error reading %s! All keys read correctly, but transaction data"
|
||||
" or address book entries might be missing or incorrect."),
|
||||
" or address metadata may be missing or incorrect."),
|
||||
walletFile));
|
||||
}
|
||||
else if (nLoadWalletRet == DBErrors::TOO_NEW) {
|
||||
|
||||
Reference in New Issue
Block a user