mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 21:12:48 +01:00
dd80977ebb
804ac106313eb52d3a86f42c681b42acf90974c8 remove unnecessary newline from initWarning() argument (Larry Ruane) Pull request description: Run: `src/bitcoind -wallet=nosuchfile` Without this patch, `debug.log` contains: ``` 2021-03-23T21:19:16Z init message: Verifying wallet(s)... 2021-03-23T21:19:16Z Warning: Skipping -wallet path that doesn't exist. Failed to load database path '/home/larry/.bitcoin/wallets/nosuchfile'. Path does not exist. 2021-03-23T21:19:16Z init message: Loading banlist... ``` With this patch, the empty line isn't present. This PR fixes a similar problem with `src/bitcoind -conf=nosuchfile` ACKs for top commit: practicalswift: cr ACK 804ac106313eb52d3a86f42c681b42acf90974c8: patch looks correct! jarolrod: tACK 804ac106313eb52d3a86f42c681b42acf90974c8, nice catch! theStack: Code-review ACK 804ac106313eb52d3a86f42c681b42acf90974c8 Tree-SHA512: dfcbaaa72ca24ac40233ac56840cfba8827853711d3df6e229ce940686f2ebf8bf0560bafcaa73a4d82d179a5050af0d3cabdc47b3b1dfd6aaadf718a6635f11
170 lines
6.1 KiB
C++
170 lines
6.1 KiB
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2018 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/load.h>
|
|
|
|
#include <coinjoin/client.h>
|
|
#include <coinjoin/options.h>
|
|
#include <fs.h>
|
|
#include <net.h>
|
|
#include <interfaces/chain.h>
|
|
#include <scheduler.h>
|
|
#include <util/string.h>
|
|
#include <util/system.h>
|
|
#include <util/translation.h>
|
|
#include <wallet/wallet.h>
|
|
#include <wallet/walletdb.h>
|
|
|
|
#include <univalue.h>
|
|
|
|
bool VerifyWallets(interfaces::Chain& chain)
|
|
{
|
|
if (gArgs.IsArgSet("-walletdir")) {
|
|
fs::path wallet_dir = gArgs.GetArg("-walletdir", "");
|
|
boost::system::error_code error;
|
|
// The canonical path cleans the path, preventing >1 Berkeley environment instances for the same directory
|
|
fs::path canonical_wallet_dir = fs::canonical(wallet_dir, error);
|
|
if (error || !fs::exists(wallet_dir)) {
|
|
chain.initError(strprintf(_("Specified -walletdir \"%s\" does not exist"), wallet_dir.string()));
|
|
return false;
|
|
} else if (!fs::is_directory(wallet_dir)) {
|
|
chain.initError(strprintf(_("Specified -walletdir \"%s\" is not a directory"), wallet_dir.string()));
|
|
return false;
|
|
// The canonical path transforms relative paths into absolute ones, so we check the non-canonical version
|
|
} else if (!wallet_dir.is_absolute()) {
|
|
chain.initError(strprintf(_("Specified -walletdir \"%s\" is a relative path"), wallet_dir.string()));
|
|
return false;
|
|
}
|
|
gArgs.ForceSetArg("-walletdir", canonical_wallet_dir.string());
|
|
}
|
|
|
|
LogPrintf("Using wallet directory %s\n", GetWalletDir().string());
|
|
|
|
chain.initMessage(_("Verifying wallet(s)...").translated);
|
|
|
|
// For backwards compatibility if an unnamed top level wallet exists in the
|
|
// wallets directory, include it in the default list of wallets to load.
|
|
if (!gArgs.IsArgSet("wallet")) {
|
|
DatabaseOptions options;
|
|
DatabaseStatus status;
|
|
bilingual_str error_string;
|
|
options.require_existing = true;
|
|
options.verify = false;
|
|
if (MakeWalletDatabase("", options, status, error_string)) {
|
|
gArgs.LockSettings([&](util::Settings& settings) {
|
|
util::SettingsValue wallets(util::SettingsValue::VARR);
|
|
wallets.push_back(""); // Default wallet name is ""
|
|
settings.rw_settings["wallet"] = wallets;
|
|
});
|
|
}
|
|
}
|
|
|
|
// Keep track of each wallet absolute path to detect duplicates.
|
|
std::set<fs::path> wallet_paths;
|
|
|
|
for (const auto& wallet_file : gArgs.GetArgs("-wallet")) {
|
|
const fs::path path = fs::absolute(wallet_file, GetWalletDir());
|
|
|
|
if (!wallet_paths.insert(path).second) {
|
|
chain.initWarning(strprintf(_("Ignoring duplicate -wallet %s."), wallet_file));
|
|
continue;
|
|
}
|
|
|
|
DatabaseOptions options;
|
|
DatabaseStatus status;
|
|
options.require_existing = true;
|
|
options.verify = true;
|
|
bilingual_str error_string;
|
|
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 {
|
|
chain.initError(error_string);
|
|
return false;
|
|
}
|
|
}
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
bool LoadWallets(interfaces::Chain& chain)
|
|
{
|
|
try {
|
|
std::set<fs::path> wallet_paths;
|
|
for (const std::string& name : gArgs.GetArgs("-wallet")) {
|
|
if (!wallet_paths.insert(name).second) {
|
|
continue;
|
|
}
|
|
DatabaseOptions options;
|
|
DatabaseStatus status;
|
|
options.require_existing = true;
|
|
options.verify = false; // No need to verify, assuming verified earlier in VerifyWallets()
|
|
bilingual_str error_string;
|
|
std::vector<bilingual_str> warnings;
|
|
std::unique_ptr<WalletDatabase> database = MakeWalletDatabase(name, options, status, error_string);
|
|
if (!database && status == DatabaseStatus::FAILED_NOT_FOUND) {
|
|
continue;
|
|
}
|
|
std::shared_ptr<CWallet> pwallet = database ? CWallet::Create(chain, name, std::move(database), options.create_flags, error_string, warnings) : nullptr;
|
|
if (!warnings.empty()) chain.initWarning(Join(warnings, Untranslated("\n")));
|
|
if (!pwallet) {
|
|
chain.initError(error_string);
|
|
return false;
|
|
}
|
|
AddWallet(pwallet);
|
|
}
|
|
return true;
|
|
} catch (const std::runtime_error& e) {
|
|
chain.initError(Untranslated(e.what()));
|
|
return false;
|
|
}
|
|
}
|
|
|
|
void StartWallets(CScheduler& scheduler, const ArgsManager& args)
|
|
{
|
|
for (const std::shared_ptr<CWallet>& pwallet : GetWallets()) {
|
|
pwallet->postInitProcess();
|
|
}
|
|
|
|
// Schedule periodic wallet flushes and tx rebroadcasts
|
|
if (args.GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET)) {
|
|
scheduler.scheduleEvery(MaybeCompactWalletDB, std::chrono::milliseconds{500});
|
|
}
|
|
scheduler.scheduleEvery(MaybeResendWalletTxs, std::chrono::milliseconds{1000});
|
|
}
|
|
|
|
void FlushWallets()
|
|
{
|
|
for (const std::shared_ptr<CWallet>& pwallet : GetWallets()) {
|
|
if (CCoinJoinClientOptions::IsEnabled()) {
|
|
// Stop CoinJoin, release keys
|
|
auto it = coinJoinClientManagers.find(pwallet->GetName());
|
|
it->second->ResetPool();
|
|
it->second->StopMixing();
|
|
}
|
|
pwallet->Flush();
|
|
}
|
|
}
|
|
|
|
void StopWallets()
|
|
{
|
|
for (const std::shared_ptr<CWallet>& pwallet : GetWallets()) {
|
|
pwallet->Close();
|
|
}
|
|
}
|
|
|
|
void UnloadWallets()
|
|
{
|
|
auto wallets = GetWallets();
|
|
while (!wallets.empty()) {
|
|
auto wallet = wallets.back();
|
|
wallets.pop_back();
|
|
std::vector<bilingual_str> warnings;
|
|
RemoveWallet(wallet, std::nullopt, warnings);
|
|
UnloadWallet(std::move(wallet));
|
|
}
|
|
}
|