mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-27 03:33:27 -03:00
69f1ee1922
173cc9b7be
test: walettool create descriptors (Ivan Metlushko)345e88eecf
wallettool: add param to create descriptors wallet (Ivan Metlushko)6d3af3ab62
wallettool: pass in DatabaseOptions into MakeWallet (Ivan Metlushko) Pull request description: Rationale: expose and promote descriptor wallets in more places; make cli tool more consistent with `createwallet` rpc. Add `-descriptors` parameter which is off by default. When specified it will create a new descriptors wallet with sqlite backend, which is consistent with `createwallet` rpc. This PR is based on a suggestion from **ryanofsky** https://github.com/bitcoin/bitcoin/pull/19137#discussion_r516779603 Example: ``` $ ./src/bitcoin-wallet -wallet=fewty -descriptors create Topping up keypool... Wallet info =========== Name: fewty Format: sqlite Descriptors: yes Encrypted: no HD (hd seed available): yes Keypool Size: 6000 Transactions: 0 Address Book: 0 ``` ``` $ ./src/bitcoin-wallet -wallet=fewty create Topping up keypool... Wallet info =========== Name: fewty Format: bdb Descriptors: no Encrypted: no HD (hd seed available): yes Keypool Size: 2000 Transactions: 0 Address Book: 0 ``` ACKs for top commit: achow101: ACK173cc9b7be
ryanofsky: Code review ACK173cc9b7be
. This seems pretty nicely implemented now, with opportunities to clean up more and dedup later MarcoFalke: Concept ACK173cc9b7be
🌠 Tree-SHA512: cc32ba336ff709de2707ee15f495b4617908e8700ede8401a58e894f44cda485c544d644023c9a6604d88a62db9d92152383ee2e8abf691688c25cf6e222c622
123 lines
5 KiB
C++
123 lines
5 KiB
C++
// Copyright (c) 2016-2020 The Bitcoin Core developers
|
|
// Distributed under the MIT software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#if defined(HAVE_CONFIG_H)
|
|
#include <config/bitcoin-config.h>
|
|
#endif
|
|
|
|
#include <chainparams.h>
|
|
#include <chainparamsbase.h>
|
|
#include <logging.h>
|
|
#include <util/system.h>
|
|
#include <util/translation.h>
|
|
#include <util/url.h>
|
|
#include <wallet/wallettool.h>
|
|
|
|
#include <functional>
|
|
|
|
const std::function<std::string(const char*)> G_TRANSLATION_FUN = nullptr;
|
|
UrlDecodeFn* const URL_DECODE = nullptr;
|
|
|
|
static void SetupWalletToolArgs(ArgsManager& argsman)
|
|
{
|
|
SetupHelpOptions(argsman);
|
|
SetupChainParamsBaseOptions(argsman);
|
|
|
|
argsman.AddArg("-version", "Print version and exit", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
|
|
argsman.AddArg("-datadir=<dir>", "Specify data directory", ArgsManager::ALLOW_ANY, OptionsCategory::OPTIONS);
|
|
argsman.AddArg("-wallet=<wallet-name>", "Specify wallet name", ArgsManager::ALLOW_ANY | ArgsManager::NETWORK_ONLY, OptionsCategory::OPTIONS);
|
|
argsman.AddArg("-debug=<category>", "Output debugging information (default: 0).", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
|
|
argsman.AddArg("-descriptors", "Create descriptors wallet. Only for create", ArgsManager::ALLOW_BOOL, OptionsCategory::OPTIONS);
|
|
argsman.AddArg("-printtoconsole", "Send trace/debug info to console (default: 1 when no -debug is true, 0 otherwise).", ArgsManager::ALLOW_ANY, OptionsCategory::DEBUG_TEST);
|
|
|
|
argsman.AddArg("info", "Get wallet info", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
|
|
argsman.AddArg("create", "Create new wallet file", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
|
|
argsman.AddArg("salvage", "Attempt to recover private keys from a corrupt wallet. Warning: 'salvage' is experimental.", ArgsManager::ALLOW_ANY, OptionsCategory::COMMANDS);
|
|
}
|
|
|
|
static bool WalletAppInit(int argc, char* argv[])
|
|
{
|
|
SetupWalletToolArgs(gArgs);
|
|
std::string error_message;
|
|
if (!gArgs.ParseParameters(argc, argv, error_message)) {
|
|
tfm::format(std::cerr, "Error parsing command line arguments: %s\n", error_message);
|
|
return false;
|
|
}
|
|
if (argc < 2 || HelpRequested(gArgs) || gArgs.IsArgSet("-version")) {
|
|
std::string strUsage = strprintf("%s bitcoin-wallet version", PACKAGE_NAME) + " " + FormatFullVersion() + "\n";
|
|
if (!gArgs.IsArgSet("-version")) {
|
|
strUsage += "\n"
|
|
"bitcoin-wallet is an offline tool for creating and interacting with " PACKAGE_NAME " wallet files.\n"
|
|
"By default bitcoin-wallet will act on wallets in the default mainnet wallet directory in the datadir.\n"
|
|
"To change the target wallet, use the -datadir, -wallet and -testnet/-regtest arguments.\n\n"
|
|
"Usage:\n"
|
|
" bitcoin-wallet [options] <command>\n";
|
|
strUsage += "\n" + gArgs.GetHelpMessage();
|
|
}
|
|
tfm::format(std::cout, "%s", strUsage);
|
|
return false;
|
|
}
|
|
|
|
// check for printtoconsole, allow -debug
|
|
LogInstance().m_print_to_console = gArgs.GetBoolArg("-printtoconsole", gArgs.GetBoolArg("-debug", false));
|
|
|
|
if (!CheckDataDirOption()) {
|
|
tfm::format(std::cerr, "Error: Specified data directory \"%s\" does not exist.\n", gArgs.GetArg("-datadir", ""));
|
|
return false;
|
|
}
|
|
// Check for chain settings (Params() calls are only valid after this clause)
|
|
SelectParams(gArgs.GetChainName());
|
|
|
|
return true;
|
|
}
|
|
|
|
int main(int argc, char* argv[])
|
|
{
|
|
#ifdef WIN32
|
|
util::WinCmdLineArgs winArgs;
|
|
std::tie(argc, argv) = winArgs.get();
|
|
#endif
|
|
SetupEnvironment();
|
|
RandomInit();
|
|
try {
|
|
if (!WalletAppInit(argc, argv)) return EXIT_FAILURE;
|
|
} catch (const std::exception& e) {
|
|
PrintExceptionContinue(&e, "WalletAppInit()");
|
|
return EXIT_FAILURE;
|
|
} catch (...) {
|
|
PrintExceptionContinue(nullptr, "WalletAppInit()");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
std::string method {};
|
|
for(int i = 1; i < argc; ++i) {
|
|
if (!IsSwitchChar(argv[i][0])) {
|
|
if (!method.empty()) {
|
|
tfm::format(std::cerr, "Error: two methods provided (%s and %s). Only one method should be provided.\n", method, argv[i]);
|
|
return EXIT_FAILURE;
|
|
}
|
|
method = argv[i];
|
|
}
|
|
}
|
|
|
|
if (method.empty()) {
|
|
tfm::format(std::cerr, "No method provided. Run `bitcoin-wallet -help` for valid methods.\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
// A name must be provided when creating a file
|
|
if (method == "create" && !gArgs.IsArgSet("-wallet")) {
|
|
tfm::format(std::cerr, "Wallet name must be provided when creating a new wallet.\n");
|
|
return EXIT_FAILURE;
|
|
}
|
|
|
|
std::string name = gArgs.GetArg("-wallet", "");
|
|
|
|
ECCVerifyHandle globalVerifyHandle;
|
|
ECC_Start();
|
|
if (!WalletTool::ExecuteWalletToolFunc(method, name))
|
|
return EXIT_FAILURE;
|
|
ECC_Stop();
|
|
return EXIT_SUCCESS;
|
|
}
|