mirror of
https://github.com/bitcoin/bitcoin.git
synced 2026-03-10 15:45:36 +01:00
3eb6f8b2e6wallet (not for backport): improve upgradewallet error messages (Jon Atack)ca8cd893bbwallet: fix and improve upgradewallet error responses (Jon Atack)99d56e3571wallet: fix and improve upgradewallet result responses (Jon Atack)2498b04ce8Don't upgrade to HD split if it is already supported (Andrew Chow)c46c18b788wallet: refactor GetClosestWalletFeature() (Jon Atack) Pull request description: This follows up on #18836 and #20282 to fix and improve the as-yet unreleased `upgradewallet` feature and also implement review follow-up in https://github.com/bitcoin/bitcoin/pull/18836#discussion_r519328607. This PR fixes 4 upgradewallet issues: - this bug: https://github.com/bitcoin/bitcoin/pull/20403#discussion_r526063920 - it returns nothing in the absence of an RPC error, which isn't reassuring for users - it returns the same thing both in the case of a successful upgrade and when no upgrade took place - the error message object is currently dead code This PR fixes the above and provides: ...user feedback to not silently return without upgrading ``` { "wallet_name": "disable private keys", "previous_version": 169900, "current_version": 169900, "result": "Already at latest version. Wallet version unchanged." } ``` ...better feedback after successfully upgrading ``` { "wallet_name": "watch-only", "previous_version": 159900, "current_version": 169900, "result": "Wallet upgraded successfully from version 159900 to version 169900." } ``` ...helpful error responses ``` { "wallet_name": "blank", "previous_version": 169900, "current_version": 169900, "error": "Cannot downgrade wallet from version 169900 to version 159900. Wallet version unchanged." } { "wallet_name": "blank", "previous_version": 130000, "current_version": 130000, "error": "Cannot upgrade a non HD split wallet from version 130000 to version 169899 without upgrading to support pre-split keypool. Please use version 169900 or no version specified." } ``` updated help: ``` upgradewallet ( version ) Upgrade the wallet. Upgrades to the latest version if no version number is specified. New keys may be generated and a new wallet backup will need to be made. Arguments: 1. version (numeric, optional, default=169900) The version number to upgrade to. Default is the latest wallet version. Result: { (json object) "wallet_name" : "str", (string) Name of wallet this operation was performed on "previous_version" : n, (numeric) Version of wallet before this operation "current_version" : n, (numeric) Version of wallet after this operation "result" : "str", (string, optional) Description of result, if no error "error" : "str" (string, optional) Error message (if there is one) } ``` ACKs for top commit: achow101: ACK3eb6f8bMarcoFalke: review ACK3eb6f8b2e6🛡 Tree-SHA512: b767314069e26b5933b123acfea6aa40708507f504bdb22884da020a4ca1332af38a7072b061e36281533af9f4e236d94d3c129daf6fe5b55241127537038eed
100 lines
3.6 KiB
C++
100 lines
3.6 KiB
C++
// Copyright (c) 2017-2019 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include <wallet/walletutil.h>
|
|
|
|
#include <logging.h>
|
|
#include <util/system.h>
|
|
|
|
#ifdef USE_BDB
|
|
bool ExistsBerkeleyDatabase(const fs::path& path);
|
|
#else
|
|
# define ExistsBerkeleyDatabase(path) (false)
|
|
#endif
|
|
#ifdef USE_SQLITE
|
|
bool ExistsSQLiteDatabase(const fs::path& path);
|
|
#else
|
|
# define ExistsSQLiteDatabase(path) (false)
|
|
#endif
|
|
|
|
fs::path GetWalletDir()
|
|
{
|
|
fs::path path;
|
|
|
|
if (gArgs.IsArgSet("-walletdir")) {
|
|
path = gArgs.GetArg("-walletdir", "");
|
|
if (!fs::is_directory(path)) {
|
|
// If the path specified doesn't exist, we return the deliberately
|
|
// invalid empty string.
|
|
path = "";
|
|
}
|
|
} else {
|
|
path = GetDataDir();
|
|
// If a wallets directory exists, use that, otherwise default to GetDataDir
|
|
if (fs::is_directory(path / "wallets")) {
|
|
path /= "wallets";
|
|
}
|
|
}
|
|
|
|
return path;
|
|
}
|
|
|
|
std::vector<fs::path> ListWalletDir()
|
|
{
|
|
const fs::path wallet_dir = GetWalletDir();
|
|
const size_t offset = wallet_dir.string().size() + 1;
|
|
std::vector<fs::path> paths;
|
|
boost::system::error_code ec;
|
|
|
|
for (auto it = fs::recursive_directory_iterator(wallet_dir, ec); it != fs::recursive_directory_iterator(); it.increment(ec)) {
|
|
if (ec) {
|
|
LogPrintf("%s: %s %s\n", __func__, ec.message(), it->path().string());
|
|
continue;
|
|
}
|
|
|
|
try {
|
|
// Get wallet path relative to walletdir by removing walletdir from the wallet path.
|
|
// This can be replaced by boost::filesystem::lexically_relative once boost is bumped to 1.60.
|
|
const fs::path path = it->path().string().substr(offset);
|
|
|
|
if (it->status().type() == fs::directory_file &&
|
|
(ExistsBerkeleyDatabase(it->path()) || ExistsSQLiteDatabase(it->path()))) {
|
|
// Found a directory which contains wallet.dat btree file, add it as a wallet.
|
|
paths.emplace_back(path);
|
|
} else if (it.level() == 0 && it->symlink_status().type() == fs::regular_file && ExistsBerkeleyDatabase(it->path())) {
|
|
if (it->path().filename() == "wallet.dat") {
|
|
// Found top-level wallet.dat btree file, add top level directory ""
|
|
// as a wallet.
|
|
paths.emplace_back();
|
|
} else {
|
|
// Found top-level btree file not called wallet.dat. Current bitcoin
|
|
// software will never create these files but will allow them to be
|
|
// opened in a shared database environment for backwards compatibility.
|
|
// Add it to the list of available wallets.
|
|
paths.emplace_back(path);
|
|
}
|
|
}
|
|
} catch (const std::exception& e) {
|
|
LogPrintf("%s: Error scanning %s: %s\n", __func__, it->path().string(), e.what());
|
|
it.no_push();
|
|
}
|
|
}
|
|
|
|
return paths;
|
|
}
|
|
|
|
bool IsFeatureSupported(int wallet_version, int feature_version)
|
|
{
|
|
return wallet_version >= feature_version;
|
|
}
|
|
|
|
WalletFeature GetClosestWalletFeature(int version)
|
|
{
|
|
const std::array<WalletFeature, 8> wallet_features{{FEATURE_LATEST, FEATURE_PRE_SPLIT_KEYPOOL, FEATURE_NO_DEFAULT_KEY, FEATURE_HD_SPLIT, FEATURE_HD, FEATURE_COMPRPUBKEY, FEATURE_WALLETCRYPT, FEATURE_BASE}};
|
|
for (const WalletFeature& wf : wallet_features) {
|
|
if (version >= wf) return wf;
|
|
}
|
|
return static_cast<WalletFeature>(0);
|
|
}
|