highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2026-01-20 15:19:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: init, don't error out when loading legacy wallets

Browse Source 
Instead of failing during initialization when encountering a legacy wallet, skip
loading the wallet and notify the user accordingly.

This allows users to access migration functionalities without needing to manually
remove the wallet from settings.json or resort to using the bitcoin-wallet utility.

This means that GUI users will be able to use the migration button, and bitcoin-cli
users will be able to call the migratewallet RPC directly after init.
This commit is contained in:
furszy
2025-05-08 11:54:47 -04:00
parent 66c968b4b4
commit 9f94de5bb5
5 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/wallet/load.cpp
View File

@@ -99,6 +99,10 @@ bool VerifyWallets(WalletContext& context)
if (!MakeWalletDatabase(wallet_file, options, status, error_string)) {
if (status == DatabaseStatus::FAILED_NOT_FOUND) {
chain.initWarning(Untranslated(strprintf("Skipping -wallet path that doesn't exist. %s", error_string.original)));
} else if (status == DatabaseStatus::FAILED_LEGACY_DISABLED) {
// Skipping legacy wallets as they will not be loaded.
// This will be properly communicated to the user during the loading process.
continue;
} else {
chain.initError(error_string);
return false;
@@ -132,8 +136,13 @@ bool LoadWallets(WalletContext& context)
bilingual_str error;
std::vector<bilingual_str> warnings;
std::unique_ptr<WalletDatabase> database = MakeWalletDatabase(name, options, status, error);
if (!database && status == DatabaseStatus::FAILED_NOT_FOUND) {
continue;
if (!database) {
if (status == DatabaseStatus::FAILED_NOT_FOUND) continue;
if (status == DatabaseStatus::FAILED_LEGACY_DISABLED) {
// Inform user that legacy wallet is not loaded and suggest upgrade options
chain.initWarning(error);
continue;
}
}
chain.initMessage(_("Loading wallet…"));
std::shared_ptr<CWallet> pwallet = database ? CWallet::Create(context, name, std::move(database), options.create_flags, error, warnings) : nullptr;