Page MenuHomePhabricator
Files F13115705

D1044.id2755.diff
No OneTemporary
Actions

D1044.id2755.diff
View Options

diff --git a/src/bitcoin-cli.cpp b/src/bitcoin-cli.cpp
--- a/src/bitcoin-cli.cpp
+++ b/src/bitcoin-cli.cpp
@@ -97,13 +97,13 @@
//
// Parameters
//
- ParseParameters(argc, argv);
- if (argc < 2 || IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help") ||
- IsArgSet("-version")) {
+ gArgs.ParseParameters(argc, argv);
+ if (argc < 2 || gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") ||
+ gArgs.IsArgSet("-help") || gArgs.IsArgSet("-version")) {
std::string strUsage =
strprintf(_("%s RPC client version"), _(PACKAGE_NAME)) + " " +
FormatFullVersion() + "\n";
- if (!IsArgSet("-version")) {
+ if (!gArgs.IsArgSet("-version")) {
strUsage +=
"\n" + _("Usage:") + "\n" +
" bitcoin-cli [options] <command> [params] " +
@@ -129,11 +129,11 @@
if (!fs::is_directory(GetDataDir(false))) {
fprintf(stderr,
"Error: Specified data directory \"%s\" does not exist.\n",
- GetArg("-datadir", "").c_str());
+ gArgs.GetArg("-datadir", "").c_str());
return EXIT_FAILURE;
}
try {
- ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
+ gArgs.ReadConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));
} catch (const std::exception &e) {
fprintf(stderr, "Error reading configuration file: %s\n", e.what());
return EXIT_FAILURE;
@@ -146,7 +146,7 @@
fprintf(stderr, "Error: %s\n", e.what());
return EXIT_FAILURE;
}
- if (GetBoolArg("-rpcssl", false)) {
+ if (gArgs.GetBoolArg("-rpcssl", false)) {
fprintf(stderr,
"Error: SSL mode for RPC (-rpcssl) is no longer supported.\n");
return EXIT_FAILURE;
@@ -215,8 +215,8 @@
#endif
UniValue CallRPC(const std::string &strMethod, const UniValue &params) {
- std::string host = GetArg("-rpcconnect", DEFAULT_RPCCONNECT);
- int port = GetArg("-rpcport", BaseParams().RPCPort());
+ std::string host = gArgs.GetArg("-rpcconnect", DEFAULT_RPCCONNECT);
+ int port = gArgs.GetArg("-rpcport", BaseParams().RPCPort());
// Obtain event base
raii_event_base base = obtain_event_base();
@@ -225,7 +225,8 @@
raii_evhttp_connection evcon =
obtain_evhttp_connection_base(base.get(), host, port);
evhttp_connection_set_timeout(
- evcon.get(), GetArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT));
+ evcon.get(),
+ gArgs.GetArg("-rpcclienttimeout", DEFAULT_HTTP_CLIENT_TIMEOUT));
HTTPReply response;
raii_evhttp_request req =
@@ -237,7 +238,7 @@
// Get credentials
std::string strRPCUserColonPass;
- if (GetArg("-rpcpassword", "") == "") {
+ if (gArgs.GetArg("-rpcpassword", "") == "") {
// Try fall back to cookie-based authentication if no password is
// provided
if (!GetAuthCookie(&strRPCUserColonPass)) {
@@ -245,13 +246,13 @@
_("Could not locate RPC credentials. No authentication cookie "
"could be found, and no rpcpassword is set in the "
"configuration file (%s)"),
- GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME))
+ GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME))
.string()
.c_str()));
}
} else {
- strRPCUserColonPass =
- GetArg("-rpcuser", "") + ":" + GetArg("-rpcpassword", "");
+ strRPCUserColonPass = gArgs.GetArg("-rpcuser", "") + ":" +
+ gArgs.GetArg("-rpcpassword", "");
}
struct evkeyvalq *output_headers =
@@ -273,7 +274,7 @@
// check if we should use a special wallet endpoint
std::string endpoint = "/";
- std::string walletName = GetArg("-usewallet", "");
+ std::string walletName = gArgs.GetArg("-usewallet", "");
if (!walletName.empty()) {
char *encodedURI =
evhttp_uriencode(walletName.c_str(), walletName.size(), false);
@@ -336,7 +337,7 @@
}
std::vector<std::string> args =
std::vector<std::string>(&argv[1], &argv[argc]);
- if (GetBoolArg("-stdin", false)) {
+ if (gArgs.GetBoolArg("-stdin", false)) {
// Read one arg per line from stdin and append
std::string line;
while (std::getline(std::cin, line)) {
@@ -352,14 +353,14 @@
args.erase(args.begin());
UniValue params;
- if (GetBoolArg("-named", DEFAULT_NAMED)) {
+ if (gArgs.GetBoolArg("-named", DEFAULT_NAMED)) {
params = RPCConvertNamedValues(strMethod, args);
} else {
params = RPCConvertValues(strMethod, args);
}
// Execute and handle connection failures with -rpcwait
- const bool fWait = GetBoolArg("-rpcwait", false);
+ const bool fWait = gArgs.GetBoolArg("-rpcwait", false);
do {
try {
const UniValue reply = CallRPC(strMethod, params);
diff --git a/src/bitcoin-tx.cpp b/src/bitcoin-tx.cpp
--- a/src/bitcoin-tx.cpp
+++ b/src/bitcoin-tx.cpp
@@ -39,7 +39,7 @@
//
// Parameters
//
- ParseParameters(argc, argv);
+ gArgs.ParseParameters(argc, argv);
// Check for -testnet or -regtest parameter (Params() calls are only valid
// after this clause)
@@ -50,9 +50,10 @@
return EXIT_FAILURE;
}
- fCreateBlank = GetBoolArg("-create", false);
+ fCreateBlank = gArgs.GetBoolArg("-create", false);
- if (argc < 2 || IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help")) {
+ if (argc < 2 || gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") ||
+ gArgs.IsArgSet("-help")) {
// First part of help message is specific to this utility
std::string strUsage =
strprintf(_("%s bitcoin-tx utility version"), _(PACKAGE_NAME)) +
@@ -773,9 +774,9 @@
}
static void OutputTx(const CTransaction &tx) {
- if (GetBoolArg("-json", false)) {
+ if (gArgs.GetBoolArg("-json", false)) {
OutputTxJSON(tx);
- } else if (GetBoolArg("-txid", false)) {
+ } else if (gArgs.GetBoolArg("-txid", false)) {
OutputTxHash(tx);
} else {
OutputTxHex(tx);
diff --git a/src/bitcoind.cpp b/src/bitcoind.cpp
--- a/src/bitcoind.cpp
+++ b/src/bitcoind.cpp
@@ -79,16 +79,16 @@
//
// If Qt is used, parameters/bitcoin.conf are parsed in qt/bitcoin.cpp's
// main()
- ParseParameters(argc, argv);
+ gArgs.ParseParameters(argc, argv);
// Process help and version before taking care about datadir
- if (IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help") ||
- IsArgSet("-version")) {
+ if (gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") ||
+ gArgs.IsArgSet("-help") || gArgs.IsArgSet("-version")) {
std::string strUsage = strprintf(_("%s Daemon"), _(PACKAGE_NAME)) +
" " + _("version") + " " + FormatFullVersion() +
"\n";
- if (IsArgSet("-version")) {
+ if (gArgs.IsArgSet("-version")) {
strUsage += FormatParagraph(LicenseInfo());
} else {
strUsage += "\n" + _("Usage:") + "\n" +
@@ -106,11 +106,11 @@
if (!fs::is_directory(GetDataDir(false))) {
fprintf(stderr,
"Error: Specified data directory \"%s\" does not exist.\n",
- GetArg("-datadir", "").c_str());
+ gArgs.GetArg("-datadir", "").c_str());
return false;
}
try {
- ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
+ gArgs.ReadConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));
} catch (const std::exception &e) {
fprintf(stderr, "Error reading configuration file: %s\n", e.what());
return false;
@@ -139,7 +139,7 @@
}
// -server defaults to true for bitcoind but not for the GUI so do this
// here
- SoftSetBoolArg("-server", true);
+ gArgs.SoftSetBoolArg("-server", true);
// Set this early so that parameter interactions go to console
InitLogging();
InitParameterInteraction();
@@ -158,7 +158,7 @@
// up on console
exit(1);
}
- if (GetBoolArg("-daemon", false)) {
+ if (gArgs.GetBoolArg("-daemon", false)) {
#if HAVE_DECL_DAEMON
fprintf(stdout, "Bitcoin server starting\n");
diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp
--- a/src/chainparamsbase.cpp
+++ b/src/chainparamsbase.cpp
@@ -83,8 +83,8 @@
}
std::string ChainNameFromCommandLine() {
- bool fRegTest = GetBoolArg("-regtest", false);
- bool fTestNet = GetBoolArg("-testnet", false);
+ bool fRegTest = gArgs.GetBoolArg("-regtest", false);
+ bool fTestNet = gArgs.GetBoolArg("-testnet", false);
if (fTestNet && fRegTest)
throw std::runtime_error(
diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp
--- a/src/dbwrapper.cpp
+++ b/src/dbwrapper.cpp
@@ -117,7 +117,7 @@
dbwrapper_private::HandleError(status);
LogPrintf("Opened LevelDB successfully\n");
- if (GetBoolArg("-forcecompactdb", false)) {
+ if (gArgs.GetBoolArg("-forcecompactdb", false)) {
LogPrintf("Starting database compaction of %s\n", path.string());
pdb->CompactRange(nullptr, nullptr);
LogPrintf("Finished database compaction of %s\n", path.string());
diff --git a/src/httprpc.cpp b/src/httprpc.cpp
--- a/src/httprpc.cpp
+++ b/src/httprpc.cpp
@@ -219,7 +219,7 @@
}
static bool InitRPCAuthentication() {
- if (GetArg("-rpcpassword", "") == "") {
+ if (gArgs.GetArg("-rpcpassword", "") == "") {
LogPrintf("No rpcpassword set - using random cookie authentication\n");
if (!GenerateAuthCookie(&strRPCUserColonPass)) {
// Same message as AbortNode.
@@ -234,8 +234,8 @@
"deprecated. Locally-run instances may remove rpcuser to use "
"cookie-based auth, or may be replaced with rpcauth. Please "
"see share/rpcuser for rpcauth auth generation.\n");
- strRPCUserColonPass =
- GetArg("-rpcuser", "") + ":" + GetArg("-rpcpassword", "");
+ strRPCUserColonPass = gArgs.GetArg("-rpcuser", "") + ":" +
+ gArgs.GetArg("-rpcpassword", "");
}
return true;
}
diff --git a/src/httpserver.cpp b/src/httpserver.cpp
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -301,15 +301,15 @@
/** Bind HTTP server to specified addresses */
static bool HTTPBindAddresses(struct evhttp *http) {
- int defaultPort = GetArg("-rpcport", BaseParams().RPCPort());
+ int defaultPort = gArgs.GetArg("-rpcport", BaseParams().RPCPort());
std::vector<std::pair<std::string, uint16_t>> endpoints;
// Determine what addresses to bind to
- if (!IsArgSet("-rpcallowip")) {
+ if (!gArgs.IsArgSet("-rpcallowip")) {
// Default to loopback if not allowing external IPs.
endpoints.push_back(std::make_pair("::1", defaultPort));
endpoints.push_back(std::make_pair("127.0.0.1", defaultPort));
- if (IsArgSet("-rpcbind")) {
+ if (gArgs.IsArgSet("-rpcbind")) {
LogPrintf("WARNING: option -rpcbind was ignored because "
"-rpcallowip was not specified, refusing to allow "
"everyone to connect\n");
@@ -372,7 +372,7 @@
if (!InitHTTPAllowList()) return false;
- if (GetBoolArg("-rpcssl", false)) {
+ if (gArgs.GetBoolArg("-rpcssl", false)) {
uiInterface.ThreadSafeMessageBox(
"SSL mode for RPC (-rpcssl) is no longer supported.", "",
CClientUIInterface::MSG_ERROR);
@@ -413,7 +413,7 @@
}
evhttp_set_timeout(
- http, GetArg("-rpcservertimeout", DEFAULT_HTTP_SERVER_TIMEOUT));
+ http, gArgs.GetArg("-rpcservertimeout", DEFAULT_HTTP_SERVER_TIMEOUT));
evhttp_set_max_headers_size(http, MAX_HEADERS_SIZE);
evhttp_set_max_body_size(http, MAX_SIZE);
evhttp_set_gencb(http, http_request_cb, &config);
@@ -426,8 +426,8 @@
}
LogPrint(BCLog::HTTP, "Initialized HTTP server\n");
- int workQueueDepth =
- std::max((long)GetArg("-rpcworkqueue", DEFAULT_HTTP_WORKQUEUE), 1L);
+ int workQueueDepth = std::max(
+ (long)gArgs.GetArg("-rpcworkqueue", DEFAULT_HTTP_WORKQUEUE), 1L);
LogPrintf("HTTP: creating work queue of depth %d\n", workQueueDepth);
workQueue = new WorkQueue<HTTPClosure>(workQueueDepth);
@@ -442,7 +442,7 @@
bool StartHTTPServer() {
LogPrint(BCLog::HTTP, "Starting HTTP server\n");
int rpcThreads =
- std::max((long)GetArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1L);
+ std::max((long)gArgs.GetArg("-rpcthreads", DEFAULT_HTTP_THREADS), 1L);
LogPrintf("HTTP: starting %d worker threads\n", rpcThreads);
std::packaged_task<bool(event_base *, evhttp *)> task(ThreadHTTP);
threadResult = task.get_future();
diff --git a/src/init.cpp b/src/init.cpp
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -206,7 +206,7 @@
StopTorControl();
UnregisterNodeSignals(GetNodeSignals());
if (fDumpMempoolLater &&
- GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
+ gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
DumpMempool();
}
@@ -304,14 +304,14 @@
// Observe safe mode.
std::string strWarning = GetWarnings("rpc");
if (strWarning != "" &&
- !GetBoolArg("-disablesafemode", DEFAULT_DISABLE_SAFEMODE) &&
+ !gArgs.GetBoolArg("-disablesafemode", DEFAULT_DISABLE_SAFEMODE) &&
!cmd.okSafeMode)
throw JSONRPCError(RPC_FORBIDDEN_BY_SAFE_MODE,
std::string("Safe mode: ") + strWarning);
}
std::string HelpMessage(HelpMessageMode mode) {
- const bool showDebug = GetBoolArg("-help-debug", false);
+ const bool showDebug = gArgs.GetBoolArg("-help-debug", false);
// When adding new options to the categories, please keep and ensure
// alphabetical ordering. Do not translate _(...) -help-debug options, Many
@@ -921,7 +921,7 @@
const CBlockIndex *pBlockIndex) {
if (initialSync || !pBlockIndex) return;
- std::string strCmd = GetArg("-blocknotify", "");
+ std::string strCmd = gArgs.GetArg("-blocknotify", "");
boost::replace_all(strCmd, "%s", pBlockIndex->GetBlockHash().GetHex());
boost::thread t(runCommand, strCmd); // thread runs free
@@ -1059,12 +1059,13 @@
StartShutdown();
}
- if (GetBoolArg("-stopafterblockimport", DEFAULT_STOPAFTERBLOCKIMPORT)) {
+ if (gArgs.GetBoolArg("-stopafterblockimport",
+ DEFAULT_STOPAFTERBLOCKIMPORT)) {
LogPrintf("Stopping after block import\n");
StartShutdown();
}
} // End scope of CImportingNow
- if (GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
+ if (gArgs.GetArg("-persistmempool", DEFAULT_PERSIST_MEMPOOL)) {
LoadMempool(config);
fDumpMempoolLater = !fRequestShutdown;
}
@@ -1100,7 +1101,8 @@
if (!InitHTTPServer(config)) return false;
if (!StartRPC()) return false;
if (!StartHTTPRPC()) return false;
- if (GetBoolArg("-rest", DEFAULT_REST_ENABLE) && !StartREST()) return false;
+ if (gArgs.GetBoolArg("-rest", DEFAULT_REST_ENABLE) && !StartREST())
+ return false;
if (!StartHTTPServer()) return false;
return true;
}
@@ -1109,14 +1111,14 @@
void InitParameterInteraction() {
// when specifying an explicit binding address, you want to listen on it
// even when -connect or -proxy is specified.
- if (IsArgSet("-bind")) {
- if (SoftSetBoolArg("-listen", true))
+ if (gArgs.IsArgSet("-bind")) {
+ if (gArgs.SoftSetBoolArg("-listen", true))
LogPrintf(
"%s: parameter interaction: -bind set -> setting -listen=1\n",
__func__);
}
- if (IsArgSet("-whitebind")) {
- if (SoftSetBoolArg("-listen", true))
+ if (gArgs.IsArgSet("-whitebind")) {
+ if (gArgs.SoftSetBoolArg("-listen", true))
LogPrintf("%s: parameter interaction: -whitebind set -> setting "
"-listen=1\n",
__func__);
@@ -1125,65 +1127,65 @@
if (gArgs.IsArgSet("-connect")) {
// when only connecting to trusted nodes, do not seed via DNS, or listen
// by default.
- if (SoftSetBoolArg("-dnsseed", false))
+ if (gArgs.SoftSetBoolArg("-dnsseed", false))
LogPrintf("%s: parameter interaction: -connect set -> setting "
"-dnsseed=0\n",
__func__);
- if (SoftSetBoolArg("-listen", false))
+ if (gArgs.SoftSetBoolArg("-listen", false))
LogPrintf("%s: parameter interaction: -connect set -> setting "
"-listen=0\n",
__func__);
}
- if (IsArgSet("-proxy")) {
+ if (gArgs.IsArgSet("-proxy")) {
// to protect privacy, do not listen by default if a default proxy
// server is specified.
- if (SoftSetBoolArg("-listen", false))
+ if (gArgs.SoftSetBoolArg("-listen", false))
LogPrintf(
"%s: parameter interaction: -proxy set -> setting -listen=0\n",
__func__);
// to protect privacy, do not use UPNP when a proxy is set. The user may
// still specify -listen=1 to listen locally, so don't rely on this
// happening through -listen below.
- if (SoftSetBoolArg("-upnp", false))
+ if (gArgs.SoftSetBoolArg("-upnp", false))
LogPrintf(
"%s: parameter interaction: -proxy set -> setting -upnp=0\n",
__func__);
// to protect privacy, do not discover addresses by default
- if (SoftSetBoolArg("-discover", false))
+ if (gArgs.SoftSetBoolArg("-discover", false))
LogPrintf("%s: parameter interaction: -proxy set -> setting "
"-discover=0\n",
__func__);
}
- if (!GetBoolArg("-listen", DEFAULT_LISTEN)) {
+ if (!gArgs.GetBoolArg("-listen", DEFAULT_LISTEN)) {
// do not map ports or try to retrieve public IP when not listening
// (pointless)
- if (SoftSetBoolArg("-upnp", false))
+ if (gArgs.SoftSetBoolArg("-upnp", false))
LogPrintf(
"%s: parameter interaction: -listen=0 -> setting -upnp=0\n",
__func__);
- if (SoftSetBoolArg("-discover", false))
+ if (gArgs.SoftSetBoolArg("-discover", false))
LogPrintf(
"%s: parameter interaction: -listen=0 -> setting -discover=0\n",
__func__);
- if (SoftSetBoolArg("-listenonion", false))
+ if (gArgs.SoftSetBoolArg("-listenonion", false))
LogPrintf("%s: parameter interaction: -listen=0 -> setting "
"-listenonion=0\n",
__func__);
}
- if (IsArgSet("-externalip")) {
+ if (gArgs.IsArgSet("-externalip")) {
// if an explicit public IP is specified, do not try to find others
- if (SoftSetBoolArg("-discover", false))
+ if (gArgs.SoftSetBoolArg("-discover", false))
LogPrintf("%s: parameter interaction: -externalip set -> setting "
"-discover=0\n",
__func__);
}
// disable whitelistrelay in blocksonly mode
- if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
- if (SoftSetBoolArg("-whitelistrelay", false))
+ if (gArgs.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY)) {
+ if (gArgs.SoftSetBoolArg("-whitelistrelay", false))
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting "
"-whitelistrelay=0\n",
__func__);
@@ -1191,8 +1193,8 @@
// Forcing relay from whitelisted hosts implies we will accept relays from
// them in the first place.
- if (GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
- if (SoftSetBoolArg("-whitelistrelay", true))
+ if (gArgs.GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY)) {
+ if (gArgs.SoftSetBoolArg("-whitelistrelay", true))
LogPrintf("%s: parameter interaction: -whitelistforcerelay=1 -> "
"setting -whitelistrelay=1\n",
__func__);
@@ -1205,10 +1207,10 @@
}
void InitLogging() {
- fPrintToConsole = GetBoolArg("-printtoconsole", false);
- fLogTimestamps = GetBoolArg("-logtimestamps", DEFAULT_LOGTIMESTAMPS);
- fLogTimeMicros = GetBoolArg("-logtimemicros", DEFAULT_LOGTIMEMICROS);
- fLogIPs = GetBoolArg("-logips", DEFAULT_LOGIPS);
+ fPrintToConsole = gArgs.GetBoolArg("-printtoconsole", false);
+ fLogTimestamps = gArgs.GetBoolArg("-logtimestamps", DEFAULT_LOGTIMESTAMPS);
+ fLogTimeMicros = gArgs.GetBoolArg("-logtimemicros", DEFAULT_LOGTIMEMICROS);
+ fLogIPs = gArgs.GetBoolArg("-logips", DEFAULT_LOGIPS);
LogPrintf("\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n");
LogPrintf("%s version %s\n", CLIENT_NAME, FormatFullVersion());
@@ -1265,7 +1267,7 @@
if (!SetupNetworking()) return InitError("Initializing networking failed");
#ifndef WIN32
- if (!GetBoolArg("-sysperms", false)) {
+ if (!gArgs.GetBoolArg("-sysperms", false)) {
umask(077);
}
@@ -1301,15 +1303,15 @@
// also see: InitParameterInteraction()
// if using block pruning, then disallow txindex
- if (GetArg("-prune", 0)) {
- if (GetBoolArg("-txindex", DEFAULT_TXINDEX))
+ if (gArgs.GetArg("-prune", 0)) {
+ if (gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX))
return InitError(_("Prune mode is incompatible with -txindex."));
}
// if space reserved for high priority transactions is misconfigured
// stop program execution and warn the user with a proper error message
- const int64_t blkprio =
- GetArg("-blockprioritypercentage", DEFAULT_BLOCK_PRIORITY_PERCENTAGE);
+ const int64_t blkprio = gArgs.GetArg("-blockprioritypercentage",
+ DEFAULT_BLOCK_PRIORITY_PERCENTAGE);
if (!config.SetBlockPriorityPercentage(blkprio)) {
return InitError(_("Block priority percentage has to belong to the "
"[0..100] interval."));
@@ -1322,7 +1324,7 @@
: 0),
size_t(1));
nUserMaxConnections =
- GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
+ gArgs.GetArg("-maxconnections", DEFAULT_MAX_PEER_CONNECTIONS);
nMaxConnections = std::max(nUserMaxConnections, 0);
// Trim requested connection counts, to fit into system limitations
@@ -1377,46 +1379,47 @@
}
// Check for -debugnet
- if (GetBoolArg("-debugnet", false))
+ if (gArgs.GetBoolArg("-debugnet", false))
InitWarning(
_("Unsupported argument -debugnet ignored, use -debug=net."));
// Check for -socks - as this is a privacy risk to continue, exit here
- if (IsArgSet("-socks"))
+ if (gArgs.IsArgSet("-socks"))
return InitError(
_("Unsupported argument -socks found. Setting SOCKS version isn't "
"possible anymore, only SOCKS5 proxies are supported."));
// Check for -tor - as this is a privacy risk to continue, exit here
- if (GetBoolArg("-tor", false))
+ if (gArgs.GetBoolArg("-tor", false))
return InitError(_("Unsupported argument -tor found, use -onion."));
- if (GetBoolArg("-benchmark", false))
+ if (gArgs.GetBoolArg("-benchmark", false))
InitWarning(
_("Unsupported argument -benchmark ignored, use -debug=bench."));
- if (GetBoolArg("-whitelistalwaysrelay", false))
+ if (gArgs.GetBoolArg("-whitelistalwaysrelay", false))
InitWarning(_("Unsupported argument -whitelistalwaysrelay ignored, use "
"-whitelistrelay and/or -whitelistforcerelay."));
- if (IsArgSet("-blockminsize"))
+ if (gArgs.IsArgSet("-blockminsize"))
InitWarning("Unsupported argument -blockminsize ignored.");
// Checkmempool and checkblockindex default to true in regtest mode
int ratio = std::min<int>(
- std::max<int>(GetArg("-checkmempool",
- chainparams.DefaultConsistencyChecks() ? 1 : 0),
- 0),
+ std::max<int>(
+ gArgs.GetArg("-checkmempool",
+ chainparams.DefaultConsistencyChecks() ? 1 : 0),
+ 0),
1000000);
if (ratio != 0) {
mempool.setSanityCheck(1.0 / ratio);
}
- fCheckBlockIndex =
- GetBoolArg("-checkblockindex", chainparams.DefaultConsistencyChecks());
+ fCheckBlockIndex = gArgs.GetBoolArg("-checkblockindex",
+ chainparams.DefaultConsistencyChecks());
fCheckpointsEnabled =
- GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED);
+ gArgs.GetBoolArg("-checkpoints", DEFAULT_CHECKPOINTS_ENABLED);
hashAssumeValid = uint256S(
- GetArg("-assumevalid",
- chainparams.GetConsensus().defaultAssumeValid.GetHex()));
+ gArgs.GetArg("-assumevalid",
+ chainparams.GetConsensus().defaultAssumeValid.GetHex()));
if (!hashAssumeValid.IsNull())
LogPrintf("Assuming ancestors of block %s have valid signatures.\n",
hashAssumeValid.GetHex());
@@ -1425,26 +1428,27 @@
// mempool limits
int64_t nMempoolSizeMax =
- GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
int64_t nMempoolSizeMin =
- GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) * 1000 *
- 40;
+ gArgs.GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) *
+ 1000 * 40;
if (nMempoolSizeMax < 0 || nMempoolSizeMax < nMempoolSizeMin)
return InitError(strprintf(_("-maxmempool must be at least %d MB"),
std::ceil(nMempoolSizeMin / 1000000.0)));
// Incremental relay fee sets the minimimum feerate increase necessary for
// BIP 125 replacement in the mempool and the amount the mempool min fee
// increases above the feerate of txs evicted due to mempool limiting.
- if (IsArgSet("-incrementalrelayfee")) {
+ if (gArgs.IsArgSet("-incrementalrelayfee")) {
Amount n(0);
- if (!ParseMoney(GetArg("-incrementalrelayfee", ""), n))
- return InitError(AmountErrMsg("incrementalrelayfee",
- GetArg("-incrementalrelayfee", "")));
+ if (!ParseMoney(gArgs.GetArg("-incrementalrelayfee", ""), n))
+ return InitError(
+ AmountErrMsg("incrementalrelayfee",
+ gArgs.GetArg("-incrementalrelayfee", "")));
incrementalRelayFee = CFeeRate(n);
}
// -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency
- nScriptCheckThreads = GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS);
+ nScriptCheckThreads = gArgs.GetArg("-par", DEFAULT_SCRIPTCHECK_THREADS);
if (nScriptCheckThreads <= 0) nScriptCheckThreads += GetNumCores();
if (nScriptCheckThreads <= 1)
nScriptCheckThreads = 0;
@@ -1453,7 +1457,7 @@
// Configure excessive block size.
const uint64_t nProposedExcessiveBlockSize =
- GetArg("-excessiveblocksize", DEFAULT_MAX_BLOCK_SIZE);
+ gArgs.GetArg("-excessiveblocksize", DEFAULT_MAX_BLOCK_SIZE);
if (!config.SetMaxBlockSize(nProposedExcessiveBlockSize)) {
return InitError(
_("Excessive block size must be > 1,000,000 bytes (1MB)"));
@@ -1461,7 +1465,7 @@
// Check blockmaxsize does not exceed maximum accepted block size.
const uint64_t nProposedMaxGeneratedBlockSize =
- GetArg("-blockmaxsize", DEFAULT_MAX_GENERATED_BLOCK_SIZE);
+ gArgs.GetArg("-blockmaxsize", DEFAULT_MAX_GENERATED_BLOCK_SIZE);
if (nProposedMaxGeneratedBlockSize > config.GetMaxBlockSize()) {
auto msg = _("Max generated block size (blockmaxsize) cannot exceed "
"the excessive block size (excessiveblocksize)");
@@ -1470,7 +1474,7 @@
// block pruning; get the amount of disk space (in MiB) to allot for block &
// undo files
- int64_t nPruneArg = GetArg("-prune", 0);
+ int64_t nPruneArg = gArgs.GetArg("-prune", 0);
if (nPruneArg < 0) {
return InitError(
_("Prune cannot be configured with a negative value."));
@@ -1501,19 +1505,19 @@
RegisterDumpRPCCommands(tableRPC);
#endif
- nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
+ nConnectTimeout = gArgs.GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
if (nConnectTimeout <= 0) nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
// Fee-per-kilobyte amount considered the same as "free". If you are mining,
// be careful setting this: if you set it to zero then a transaction spammer
// can cheaply fill blocks using 1-satoshi-fee transactions. It should be
// set above the real cost to you of processing a transaction.
- if (IsArgSet("-minrelaytxfee")) {
+ if (gArgs.IsArgSet("-minrelaytxfee")) {
Amount n(0);
- auto parsed = ParseMoney(GetArg("-minrelaytxfee", ""), n);
+ auto parsed = ParseMoney(gArgs.GetArg("-minrelaytxfee", ""), n);
if (!parsed || Amount(0) == n)
- return InitError(
- AmountErrMsg("minrelaytxfee", GetArg("-minrelaytxfee", "")));
+ return InitError(AmountErrMsg("minrelaytxfee",
+ gArgs.GetArg("-minrelaytxfee", "")));
// High fee check is done afterward in CWallet::ParameterInteraction()
::minRelayTxFee = CFeeRate(n);
} else if (incrementalRelayFee > ::minRelayTxFee) {
@@ -1527,45 +1531,47 @@
// Sanity check argument for min fee for including tx in block
// TODO: Harmonize which arguments need sanity checking and where that
// happens.
- if (IsArgSet("-blockmintxfee")) {
+ if (gArgs.IsArgSet("-blockmintxfee")) {
Amount n(0);
- if (!ParseMoney(GetArg("-blockmintxfee", ""), n))
- return InitError(
- AmountErrMsg("blockmintxfee", GetArg("-blockmintxfee", "")));
+ if (!ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n))
+ return InitError(AmountErrMsg("blockmintxfee",
+ gArgs.GetArg("-blockmintxfee", "")));
}
// Feerate used to define dust. Shouldn't be changed lightly as old
// implementations may inadvertently create non-standard transactions.
- if (IsArgSet("-dustrelayfee")) {
+ if (gArgs.IsArgSet("-dustrelayfee")) {
Amount n(0);
- auto parsed = ParseMoney(GetArg("-dustrelayfee", ""), n);
+ auto parsed = ParseMoney(gArgs.GetArg("-dustrelayfee", ""), n);
if (!parsed || Amount(0) == n)
- return InitError(
- AmountErrMsg("dustrelayfee", GetArg("-dustrelayfee", "")));
+ return InitError(AmountErrMsg("dustrelayfee",
+ gArgs.GetArg("-dustrelayfee", "")));
dustRelayFee = CFeeRate(n);
}
fRequireStandard =
- !GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
+ !gArgs.GetBoolArg("-acceptnonstdtxn", !chainparams.RequireStandard());
if (chainparams.RequireStandard() && !fRequireStandard)
return InitError(
strprintf("acceptnonstdtxn is not currently supported for %s chain",
chainparams.NetworkIDString()));
- nBytesPerSigOp = GetArg("-bytespersigop", nBytesPerSigOp);
+ nBytesPerSigOp = gArgs.GetArg("-bytespersigop", nBytesPerSigOp);
#ifdef ENABLE_WALLET
if (!CWallet::ParameterInteraction()) return false;
#endif
fIsBareMultisigStd =
- GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG);
- fAcceptDatacarrier = GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER);
- nMaxDatacarrierBytes = GetArg("-datacarriersize", nMaxDatacarrierBytes);
+ gArgs.GetBoolArg("-permitbaremultisig", DEFAULT_PERMIT_BAREMULTISIG);
+ fAcceptDatacarrier =
+ gArgs.GetBoolArg("-datacarrier", DEFAULT_ACCEPT_DATACARRIER);
+ nMaxDatacarrierBytes =
+ gArgs.GetArg("-datacarriersize", nMaxDatacarrierBytes);
// Option to startup with mocktime set (used for regression testing):
- SetMockTime(GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
+ SetMockTime(gArgs.GetArg("-mocktime", 0)); // SetMockTime(0) is a no-op
- if (GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
+ if (gArgs.GetBoolArg("-peerbloomfilters", DEFAULT_PEERBLOOMFILTERS))
nLocalServices = ServiceFlags(nLocalServices | NODE_BLOOM);
// Signal Bitcoin Cash support.
@@ -1573,7 +1579,7 @@
// to differentiate the network nodes.
nLocalServices = ServiceFlags(nLocalServices | NODE_BITCOIN_CASH);
- nMaxTipAge = GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
+ nMaxTipAge = gArgs.GetArg("-maxtipage", DEFAULT_MAX_TIP_AGE);
if (gArgs.IsArgSet("-bip9params")) {
// Allow overriding BIP9 parameters for testing
@@ -1690,7 +1696,7 @@
#ifndef WIN32
CreatePidFile(GetPidFile(), getpid());
#endif
- if (GetBoolArg("-shrinkdebugfile", logCategories != BCLog::NONE)) {
+ if (gArgs.GetBoolArg("-shrinkdebugfile", logCategories != BCLog::NONE)) {
// Do this first since it both loads a bunch of debug.log into memory,
// and because this needs to happen before any other debug.log printing.
ShrinkDebugFile();
@@ -1706,8 +1712,9 @@
}
LogPrintf("Default data directory %s\n", GetDefaultDataDir().string());
LogPrintf("Using data directory %s\n", GetDataDir().string());
- LogPrintf("Using config file %s\n",
- GetConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
+ LogPrintf(
+ "Using config file %s\n",
+ GetConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME)).string());
LogPrintf("Using at most %i automatic connections (%i file descriptors "
"available)\n",
nMaxConnections, nFD);
@@ -1734,7 +1741,7 @@
* that the server is there and will be ready later). Warmup mode will
* be disabled when initialisation is finished.
*/
- if (GetBoolArg("-server", false)) {
+ if (gArgs.GetBoolArg("-server", false)) {
uiInterface.InitMessage.connect(SetRPCWarmupStatus);
if (!AppInitServers(config, threadGroup)) {
return InitError(
@@ -1793,11 +1800,12 @@
}
}
- bool proxyRandomize = GetBoolArg("-proxyrandomize", DEFAULT_PROXYRANDOMIZE);
+ bool proxyRandomize =
+ gArgs.GetBoolArg("-proxyrandomize", DEFAULT_PROXYRANDOMIZE);
// -proxy sets a proxy for all outgoing network traffic
// -noproxy (or -proxy=0) as well as the empty string can be used to not set
// a proxy, this is the default
- std::string proxyArg = GetArg("-proxy", "");
+ std::string proxyArg = gArgs.GetArg("-proxy", "");
SetLimited(NET_TOR);
if (proxyArg != "" && proxyArg != "0") {
CService resolved(LookupNumeric(proxyArg.c_str(), 9050));
@@ -1820,7 +1828,7 @@
// -noonion (or -onion=0) disables connecting to .onion entirely. An empty
// string is used to not override the onion proxy (in which case it defaults
// to -proxy set above, or none)
- std::string onionArg = GetArg("-onion", "");
+ std::string onionArg = gArgs.GetArg("-onion", "");
if (onionArg != "") {
if (onionArg == "0") { // Handle -noonion/-onion=0
SetLimited(NET_TOR); // set onions as unreachable
@@ -1837,10 +1845,10 @@
}
// see Step 2: parameter interactions for more information about these
- fListen = GetBoolArg("-listen", DEFAULT_LISTEN);
- fDiscover = GetBoolArg("-discover", true);
- fNameLookup = GetBoolArg("-dns", DEFAULT_NAME_LOOKUP);
- fRelayTxes = !GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);
+ fListen = gArgs.GetBoolArg("-listen", DEFAULT_LISTEN);
+ fDiscover = gArgs.GetBoolArg("-discover", true);
+ fNameLookup = gArgs.GetBoolArg("-dns", DEFAULT_NAME_LOOKUP);
+ fRelayTxes = !gArgs.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY);
if (fListen) {
bool fBound = false;
@@ -1914,25 +1922,26 @@
uint64_t nMaxOutboundLimit = 0;
uint64_t nMaxOutboundTimeframe = MAX_UPLOAD_TIMEFRAME;
- if (IsArgSet("-maxuploadtarget")) {
+ if (gArgs.IsArgSet("-maxuploadtarget")) {
nMaxOutboundLimit =
- GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET) * 1024 * 1024;
+ gArgs.GetArg("-maxuploadtarget", DEFAULT_MAX_UPLOAD_TARGET) * 1024 *
+ 1024;
}
// Step 7: load block chain
- fReindex = GetBoolArg("-reindex", false);
- bool fReindexChainState = GetBoolArg("-reindex-chainstate", false);
+ fReindex = gArgs.GetBoolArg("-reindex", false);
+ bool fReindexChainState = gArgs.GetBoolArg("-reindex-chainstate", false);
// cache size calculations
- int64_t nTotalCache = (GetArg("-dbcache", nDefaultDbCache) << 20);
+ int64_t nTotalCache = (gArgs.GetArg("-dbcache", nDefaultDbCache) << 20);
// total cache cannot be less than nMinDbCache
nTotalCache = std::max(nTotalCache, nMinDbCache << 20);
// total cache cannot be greater than nMaxDbcache
nTotalCache = std::min(nTotalCache, nMaxDbCache << 20);
int64_t nBlockTreeDBCache = nTotalCache / 8;
nBlockTreeDBCache = std::min(nBlockTreeDBCache,
- (GetBoolArg("-txindex", DEFAULT_TXINDEX)
+ (gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX)
? nMaxBlockDBAndTxIndexCache
: nMaxBlockDBCache)
<< 20);
@@ -1946,7 +1955,7 @@
// the rest goes to in-memory cache
nCoinCacheUsage = nTotalCache;
int64_t nMempoolSizeMax =
- GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
LogPrintf("Cache configuration:\n");
LogPrintf("* Using %.1fMiB for block index database\n",
nBlockTreeDBCache * (1.0 / 1024 / 1024));
@@ -2015,7 +2024,7 @@
}
// Check for changed -txindex state
- if (fTxIndex != GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
+ if (fTxIndex != gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX)) {
strLoadError = _("You need to rebuild the database using "
"-reindex-chainstate to change -txindex");
break;
@@ -2054,7 +2063,7 @@
uiInterface.InitMessage(_("Verifying blocks..."));
if (fHavePruned &&
- GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) >
+ gArgs.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS) >
MIN_BLOCKS_TO_KEEP) {
LogPrintf("Prune: pruned datadir may not have more than %d "
"blocks; only checking available blocks",
@@ -2079,8 +2088,8 @@
if (!CVerifyDB().VerifyDB(
config, pcoinsdbview,
- GetArg("-checklevel", DEFAULT_CHECKLEVEL),
- GetArg("-checkblocks", DEFAULT_CHECKBLOCKS))) {
+ gArgs.GetArg("-checklevel", DEFAULT_CHECKLEVEL),
+ gArgs.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS))) {
strLoadError = _("Corrupted block database detected");
break;
}
@@ -2137,7 +2146,7 @@
// Encoded addresses using cashaddr instead of base58
// Activates by default on Jan, 14
config.SetCashAddrEncoding(
- GetBoolArg("-usecashaddr", GetAdjustedTime() > 1515900000));
+ gArgs.GetBoolArg("-usecashaddr", GetAdjustedTime() > 1515900000));
// Step 8: load wallet
#ifdef ENABLE_WALLET
@@ -2174,7 +2183,7 @@
fHaveGenesis = true;
}
- if (IsArgSet("-blocknotify")) {
+ if (gArgs.IsArgSet("-blocknotify")) {
uiInterface.NotifyBlockTip.connect(BlockNotifyCallback);
}
@@ -2202,14 +2211,14 @@
//// debug print
LogPrintf("mapBlockIndex.size() = %u\n", mapBlockIndex.size());
LogPrintf("nBestHeight = %d\n", chainActive.Height());
- if (GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) {
+ if (gArgs.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) {
StartTorControl(threadGroup, scheduler);
}
Discover(threadGroup);
// Map ports with UPnP
- MapPort(GetBoolArg("-upnp", DEFAULT_UPNP));
+ MapPort(gArgs.GetBoolArg("-upnp", DEFAULT_UPNP));
std::string strNodeError;
CConnman::Options connOptions;
@@ -2223,9 +2232,9 @@
connOptions.nBestHeight = chainActive.Height();
connOptions.uiInterface = &uiInterface;
connOptions.nSendBufferMaxSize =
- 1000 * GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
+ 1000 * gArgs.GetArg("-maxsendbuffer", DEFAULT_MAXSENDBUFFER);
connOptions.nReceiveFloodSize =
- 1000 * GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
+ 1000 * gArgs.GetArg("-maxreceivebuffer", DEFAULT_MAXRECEIVEBUFFER);
connOptions.nMaxOutboundTimeframe = nMaxOutboundTimeframe;
connOptions.nMaxOutboundLimit = nMaxOutboundLimit;
diff --git a/src/miner.cpp b/src/miner.cpp
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -87,9 +87,9 @@
// If only one is given, only restrict the specified resource.
// If both are given, restrict both.
uint64_t nMaxGeneratedBlockSize = DEFAULT_MAX_GENERATED_BLOCK_SIZE;
- if (IsArgSet("-blockmaxsize")) {
+ if (gArgs.IsArgSet("-blockmaxsize")) {
nMaxGeneratedBlockSize =
- GetArg("-blockmaxsize", DEFAULT_MAX_GENERATED_BLOCK_SIZE);
+ gArgs.GetArg("-blockmaxsize", DEFAULT_MAX_GENERATED_BLOCK_SIZE);
}
// Limit size to between 1K and MaxBlockSize-1K for sanity:
@@ -102,9 +102,9 @@
BlockAssembler::BlockAssembler(const Config &_config) : config(&_config) {
- if (IsArgSet("-blockmintxfee")) {
+ if (gArgs.IsArgSet("-blockmintxfee")) {
Amount n(0);
- ParseMoney(GetArg("-blockmintxfee", ""), n);
+ ParseMoney(gArgs.GetArg("-blockmintxfee", ""), n);
blockMinFeeRate = CFeeRate(n);
} else {
blockMinFeeRate = CFeeRate(DEFAULT_BLOCK_MIN_TX_FEE);
@@ -169,7 +169,7 @@
// -regtest only: allow overriding block.nVersion with
// -blockversion=N to test forking scenarios
if (chainparams.MineBlocksOnDemand()) {
- pblock->nVersion = GetArg("-blockversion", pblock->nVersion);
+ pblock->nVersion = gArgs.GetArg("-blockversion", pblock->nVersion);
}
pblock->nTime = GetAdjustedTime();
@@ -342,7 +342,8 @@
nFees += iter->GetFee();
inBlock.insert(iter);
- bool fPrintPriority = GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY);
+ bool fPrintPriority =
+ gArgs.GetBoolArg("-printpriority", DEFAULT_PRINTPRIORITY);
if (fPrintPriority) {
double dPriority = iter->GetPriority(nHeight);
Amount dummy;
diff --git a/src/net.cpp b/src/net.cpp
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -91,7 +91,7 @@
}
unsigned short GetListenPort() {
- return (unsigned short)(GetArg("-port", Params().GetDefaultPort()));
+ return (unsigned short)(gArgs.GetArg("-port", Params().GetDefaultPort()));
}
// find 'best' local address for a particular peer
@@ -493,7 +493,7 @@
CBanEntry banEntry(GetTime());
banEntry.banReason = banReason;
if (bantimeoffset <= 0) {
- bantimeoffset = GetArg("-bantime", DEFAULT_MISBEHAVING_BANTIME);
+ bantimeoffset = gArgs.GetArg("-bantime", DEFAULT_MISBEHAVING_BANTIME);
sinceUnixEpoch = false;
}
banEntry.nBanUntil = (sinceUnixEpoch ? 0 : GetTime()) + bantimeoffset;
@@ -1653,7 +1653,7 @@
// creating fewer identifying DNS requests, reduces trust by giving seeds
// less influence on the network topology, and reduces traffic to the seeds.
if ((addrman.size() > 0) &&
- (!GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) {
+ (!gArgs.GetBoolArg("-forcednsseed", DEFAULT_FORCEDNSSEED))) {
if (!interruptNet.sleep_for(std::chrono::seconds(11))) {
return;
}
@@ -2437,7 +2437,7 @@
&TraceThread<std::function<void()>>, "net",
std::function<void()>(std::bind(&CConnman::ThreadSocketHandler, this)));
- if (!GetBoolArg("-dnsseed", true)) {
+ if (!gArgs.GetBoolArg("-dnsseed", true)) {
LogPrintf("DNS seeding disabled\n");
} else {
threadDNSAddressSeed =
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -690,8 +690,8 @@
//
void AddToCompactExtraTransactions(const CTransactionRef &tx) {
- size_t max_extra_txn = GetArg("-blockreconstructionextratxn",
- DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN);
+ size_t max_extra_txn = gArgs.GetArg("-blockreconstructionextratxn",
+ DEFAULT_BLOCK_RECONSTRUCTION_EXTRA_TXN);
if (max_extra_txn <= 0) {
return;
}
@@ -832,7 +832,7 @@
}
state->nMisbehavior += howmuch;
- int banscore = GetArg("-banscore", DEFAULT_BANSCORE_THRESHOLD);
+ int banscore = gArgs.GetArg("-banscore", DEFAULT_BANSCORE_THRESHOLD);
if (state->nMisbehavior >= banscore &&
state->nMisbehavior - howmuch < banscore) {
LogPrintf(
@@ -1385,8 +1385,8 @@
const std::atomic<bool> &interruptMsgProc) {
LogPrint(BCLog::NET, "received: %s (%u bytes) peer=%d\n",
SanitizeString(strCommand), vRecv.size(), pfrom->id);
- if (IsArgSet("-dropmessagestest") &&
- GetRand(GetArg("-dropmessagestest", 0)) == 0) {
+ if (gArgs.IsArgSet("-dropmessagestest") &&
+ GetRand(gArgs.GetArg("-dropmessagestest", 0)) == 0) {
LogPrintf("dropmessagestest DROPPING RECV MESSAGE\n");
return true;
}
@@ -1761,7 +1761,7 @@
// Allow whitelisted peers to send data other than blocks in blocks only
// mode if whitelistrelay is true
if (pfrom->fWhitelisted &&
- GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)) {
+ gArgs.GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY)) {
fBlocksOnly = false;
}
@@ -2042,7 +2042,7 @@
// whitelistrelay is off
if (!fRelayTxes &&
(!pfrom->fWhitelisted ||
- !GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY))) {
+ !gArgs.GetBoolArg("-whitelistrelay", DEFAULT_WHITELISTRELAY))) {
LogPrint(BCLog::NET,
"transaction sent in violation of protocol peer=%d\n",
pfrom->id);
@@ -2178,7 +2178,8 @@
// unbounded
unsigned int nMaxOrphanTx = (unsigned int)std::max(
int64_t(0),
- GetArg("-maxorphantx", DEFAULT_MAX_ORPHAN_TRANSACTIONS));
+ gArgs.GetArg("-maxorphantx",
+ DEFAULT_MAX_ORPHAN_TRANSACTIONS));
unsigned int nEvicted = LimitOrphanTxSize(nMaxOrphanTx);
if (nEvicted > 0) {
LogPrint(BCLog::MEMPOOL,
@@ -2206,8 +2207,8 @@
}
if (pfrom->fWhitelisted &&
- GetBoolArg("-whitelistforcerelay",
- DEFAULT_WHITELISTFORCERELAY)) {
+ gArgs.GetBoolArg("-whitelistforcerelay",
+ DEFAULT_WHITELISTFORCERELAY)) {
// Always relay transactions received from whitelisted peers,
// even if they were already in the mempool or rejected from it
// due to policy, allowing the node to function as a gateway for
@@ -3781,13 +3782,15 @@
// We don't want white listed peers to filter txs to us if we have
// -whitelistforcerelay
if (pto->nVersion >= FEEFILTER_VERSION &&
- GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
+ gArgs.GetBoolArg("-feefilter", DEFAULT_FEEFILTER) &&
!(pto->fWhitelisted &&
- GetBoolArg("-whitelistforcerelay", DEFAULT_WHITELISTFORCERELAY))) {
+ gArgs.GetBoolArg("-whitelistforcerelay",
+ DEFAULT_WHITELISTFORCERELAY))) {
Amount currentFilter =
mempool
- .GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
- 1000000)
+ .GetMinFee(
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
+ 1000000)
.GetFeePerK();
int64_t timeNow = GetTimeMicros();
if (timeNow > pto->nextSendTimeFeeFilter) {
@@ -3797,7 +3800,7 @@
Amount filterToSend = filterRounder.round(currentFilter);
// If we don't allow free transactions, then we always have a fee
// filter of at least minRelayTxFee
- if (GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) {
+ if (gArgs.GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) {
filterToSend =
std::max(filterToSend, ::minRelayTxFee.GetFeePerK());
}
diff --git a/src/policy/fees.cpp b/src/policy/fees.cpp
--- a/src/policy/fees.cpp
+++ b/src/policy/fees.cpp
@@ -507,7 +507,7 @@
// If mempool is limiting txs , return at least the min feerate from the
// mempool
Amount minPoolFee =
- pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
+ pool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
1000000)
.GetFeePerK();
if (minPoolFee > Amount(0) && minPoolFee > Amount(int64_t(median))) {
@@ -534,7 +534,7 @@
// If mempool is limiting txs, no priority txs are allowed
Amount minPoolFee =
- pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
+ pool.GetMinFee(gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
1000000)
.GetFeePerK();
if (minPoolFee > Amount(0)) {
diff --git a/src/qt/bitcoin.cpp b/src/qt/bitcoin.cpp
--- a/src/qt/bitcoin.cpp
+++ b/src/qt/bitcoin.cpp
@@ -109,8 +109,8 @@
if (!lang_territory_qsettings.isEmpty())
lang_territory = lang_territory_qsettings;
// 3) -lang command line argument
- lang_territory =
- QString::fromStdString(GetArg("-lang", lang_territory.toStdString()));
+ lang_territory = QString::fromStdString(
+ gArgs.GetArg("-lang", lang_territory.toStdString()));
return lang_territory;
}
@@ -333,7 +333,7 @@
// This must be done inside the BitcoinApplication constructor, or after it,
// because PlatformStyle::instantiate requires a QApplication.
std::string platformName;
- platformName = GetArg("-uiplatform", BitcoinGUI::DEFAULT_UIPLATFORM);
+ platformName = gArgs.GetArg("-uiplatform", BitcoinGUI::DEFAULT_UIPLATFORM);
platformStyle =
PlatformStyle::instantiate(QString::fromStdString(platformName));
// Fall back to "other" if specified name not found.
@@ -504,7 +504,7 @@
#endif
// If -min option passed, start window minimized.
- if (GetBoolArg("-min", false)) {
+ if (gArgs.GetBoolArg("-min", false)) {
window->showMinimized();
} else {
window->show();
@@ -594,7 +594,7 @@
/// 1. Parse command-line options. These take precedence over anything else.
// Command-line options take precedence:
- ParseParameters(argc, argv);
+ gArgs.ParseParameters(argc, argv);
// Do not refer to data directory yet, this can be overridden by
// Intro::pickDataDirectory
@@ -669,9 +669,9 @@
// Show help message immediately after parsing command-line options (for
// "-lang") and setting locale, but before showing splash screen.
- if (IsArgSet("-?") || IsArgSet("-h") || IsArgSet("-help") ||
- IsArgSet("-version")) {
- HelpMessageDialog help(nullptr, IsArgSet("-version"));
+ if (gArgs.IsArgSet("-?") || gArgs.IsArgSet("-h") ||
+ gArgs.IsArgSet("-help") || gArgs.IsArgSet("-version")) {
+ HelpMessageDialog help(nullptr, gArgs.IsArgSet("-version"));
help.showOrPrint();
return EXIT_SUCCESS;
}
@@ -687,11 +687,11 @@
0, QObject::tr(PACKAGE_NAME),
QObject::tr(
"Error: Specified data directory \"%1\" does not exist.")
- .arg(QString::fromStdString(GetArg("-datadir", ""))));
+ .arg(QString::fromStdString(gArgs.GetArg("-datadir", ""))));
return EXIT_FAILURE;
}
try {
- ReadConfigFile(GetArg("-conf", BITCOIN_CONF_FILENAME));
+ gArgs.ReadConfigFile(gArgs.GetArg("-conf", BITCOIN_CONF_FILENAME));
} catch (const std::exception &e) {
QMessageBox::critical(
0, QObject::tr(PACKAGE_NAME),
@@ -770,7 +770,7 @@
// Allow parameter interaction before we create the options model
app.parameterSetup();
// Load GUI settings from QSettings
- app.createOptionsModel(IsArgSet("-resetguisettings"));
+ app.createOptionsModel(gArgs.IsArgSet("-resetguisettings"));
// Subscribe to global signals from core
uiInterface.InitMessage.connect(InitMessage);
@@ -778,8 +778,8 @@
// Get global config
Config &config = const_cast<Config &>(GetConfig());
- if (GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) &&
- !GetBoolArg("-min", false))
+ if (gArgs.GetBoolArg("-splash", DEFAULT_SPLASHSCREEN) &&
+ !gArgs.GetBoolArg("-min", false))
app.createSplashScreen(networkStyle.data());
try {
diff --git a/src/qt/guiutil.cpp b/src/qt/guiutil.cpp
--- a/src/qt/guiutil.cpp
+++ b/src/qt/guiutil.cpp
@@ -673,8 +673,8 @@
QString strArgs = "-min";
// Set -testnet /-regtest options
strArgs += QString::fromStdString(strprintf(
- " -testnet=%d -regtest=%d", GetBoolArg("-testnet", false),
- GetBoolArg("-regtest", false)));
+ " -testnet=%d -regtest=%d", gArgs.GetBoolArg("-testnet", false),
+ gArgs.GetBoolArg("-regtest", false)));
#ifdef UNICODE
boost::scoped_array<TCHAR> args(new TCHAR[strArgs.length() + 1]);
@@ -781,8 +781,8 @@
optionFile << strprintf("Name=Bitcoin (%s)\n", chain);
optionFile << "Exec=" << pszExePath
<< strprintf(" -min -testnet=%d -regtest=%d\n",
- GetBoolArg("-testnet", false),
- GetBoolArg("-regtest", false));
+ gArgs.GetBoolArg("-testnet", false),
+ gArgs.GetBoolArg("-regtest", false));
optionFile << "Terminal=false\n";
optionFile << "Hidden=false\n";
optionFile.close();
diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp
--- a/src/qt/intro.cpp
+++ b/src/qt/intro.cpp
@@ -113,7 +113,7 @@
ui->setupUi(this);
ui->welcomeLabel->setText(ui->welcomeLabel->text().arg(tr(PACKAGE_NAME)));
ui->storageLabel->setText(ui->storageLabel->text().arg(tr(PACKAGE_NAME)));
- uint64_t pruneTarget = std::max<int64_t>(0, GetArg("-prune", 0));
+ uint64_t pruneTarget = std::max<int64_t>(0, gArgs.GetArg("-prune", 0));
requiredSpace = BLOCK_CHAIN_SIZE;
if (pruneTarget) {
uint64_t prunedGBs = std::ceil(pruneTarget * 1024 * 1024.0 / GB_BYTES);
@@ -159,16 +159,16 @@
QSettings settings;
/* If data directory provided on command line, no need to look at settings
or show a picking dialog */
- if (!GetArg("-datadir", "").empty()) return true;
+ if (!gArgs.GetArg("-datadir", "").empty()) return true;
/* 1) Default data directory for operating system */
QString dataDir = getDefaultDataDirectory();
/* 2) Allow QSettings to override default dir */
dataDir = settings.value("strDataDir", dataDir).toString();
if (!fs::exists(GUIUtil::qstringToBoostPath(dataDir)) ||
- GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR) ||
+ gArgs.GetBoolArg("-choosedatadir", DEFAULT_CHOOSE_DATADIR) ||
settings.value("fReset", false).toBool() ||
- GetBoolArg("-resetguisettings", false)) {
+ gArgs.GetBoolArg("-resetguisettings", false)) {
/* If current default data directory does not exist, let the user choose
* one */
Intro intro;
@@ -203,7 +203,8 @@
*/
if (dataDir != getDefaultDataDirectory()) {
// use OS locale for path setting
- SoftSetArg("-datadir", GUIUtil::qstringToBoostPath(dataDir).string());
+ gArgs.SoftSetArg("-datadir",
+ GUIUtil::qstringToBoostPath(dataDir).string());
}
return true;
}
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -34,9 +34,9 @@
}
void OptionsModel::addOverriddenOption(const std::string &option) {
- strOverriddenByCommandLine += QString::fromStdString(option) + "=" +
- QString::fromStdString(GetArg(option, "")) +
- " ";
+ strOverriddenByCommandLine +=
+ QString::fromStdString(option) + "=" +
+ QString::fromStdString(gArgs.GetArg(option, "")) + " ";
}
// Writes all missing QSettings with their default values
@@ -94,14 +94,15 @@
//
// If setting doesn't exist create it with defaults.
//
- // If SoftSetArg() or SoftSetBoolArg() return false we were overridden
+ // If gArgs.SoftSetArg() or gArgs.SoftSetBoolArg() return false we were
+ // overridden
// by command-line and show this in the UI.
// Main
if (!settings.contains("nDatabaseCache")) {
settings.setValue("nDatabaseCache", (qint64)nDefaultDbCache);
}
- if (!SoftSetArg(
+ if (!gArgs.SoftSetArg(
"-dbcache",
settings.value("nDatabaseCache").toString().toStdString())) {
addOverriddenOption("-dbcache");
@@ -110,7 +111,7 @@
if (!settings.contains("nThreadsScriptVerif")) {
settings.setValue("nThreadsScriptVerif", DEFAULT_SCRIPTCHECK_THREADS);
}
- if (!SoftSetArg(
+ if (!gArgs.SoftSetArg(
"-par",
settings.value("nThreadsScriptVerif").toString().toStdString())) {
addOverriddenOption("-par");
@@ -125,8 +126,9 @@
if (!settings.contains("bSpendZeroConfChange")) {
settings.setValue("bSpendZeroConfChange", true);
}
- if (!SoftSetBoolArg("-spendzeroconfchange",
- settings.value("bSpendZeroConfChange").toBool())) {
+ if (!gArgs.SoftSetBoolArg(
+ "-spendzeroconfchange",
+ settings.value("bSpendZeroConfChange").toBool())) {
addOverriddenOption("-spendzeroconfchange");
}
#endif
@@ -135,14 +137,14 @@
if (!settings.contains("fUseUPnP")) {
settings.setValue("fUseUPnP", DEFAULT_UPNP);
}
- if (!SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool())) {
+ if (!gArgs.SoftSetBoolArg("-upnp", settings.value("fUseUPnP").toBool())) {
addOverriddenOption("-upnp");
}
if (!settings.contains("fListen")) {
settings.setValue("fListen", DEFAULT_LISTEN);
}
- if (!SoftSetBoolArg("-listen", settings.value("fListen").toBool())) {
+ if (!gArgs.SoftSetBoolArg("-listen", settings.value("fListen").toBool())) {
addOverriddenOption("-listen");
}
@@ -154,11 +156,11 @@
}
// Only try to set -proxy, if user has enabled fUseProxy
if (settings.value("fUseProxy").toBool() &&
- !SoftSetArg("-proxy",
- settings.value("addrProxy").toString().toStdString())) {
+ !gArgs.SoftSetArg(
+ "-proxy", settings.value("addrProxy").toString().toStdString())) {
addOverriddenOption("-proxy");
} else if (!settings.value("fUseProxy").toBool() &&
- !GetArg("-proxy", "").empty()) {
+ !gArgs.GetArg("-proxy", "").empty()) {
addOverriddenOption("-proxy");
}
@@ -170,12 +172,12 @@
}
// Only try to set -onion, if user has enabled fUseSeparateProxyTor
if (settings.value("fUseSeparateProxyTor").toBool() &&
- !SoftSetArg(
+ !gArgs.SoftSetArg(
"-onion",
settings.value("addrSeparateProxyTor").toString().toStdString())) {
addOverriddenOption("-onion");
} else if (!settings.value("fUseSeparateProxyTor").toBool() &&
- !GetArg("-onion", "").empty()) {
+ !gArgs.GetArg("-onion", "").empty()) {
addOverriddenOption("-onion");
}
@@ -183,8 +185,8 @@
if (!settings.contains("language")) {
settings.setValue("language", "");
}
- if (!SoftSetArg("-lang",
- settings.value("language").toString().toStdString())) {
+ if (!gArgs.SoftSetArg(
+ "-lang", settings.value("language").toString().toStdString())) {
addOverriddenOption("-lang");
}
diff --git a/src/qt/paymentrequestplus.cpp b/src/qt/paymentrequestplus.cpp
--- a/src/qt/paymentrequestplus.cpp
+++ b/src/qt/paymentrequestplus.cpp
@@ -150,8 +150,8 @@
// This option is just shown in the UI options, if -help-debug is
// enabled.
if (!(error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT &&
- GetBoolArg("-allowselfsignedrootcertificates",
- DEFAULT_SELFSIGNED_ROOTCERTS))) {
+ gArgs.GetBoolArg("-allowselfsignedrootcertificates",
+ DEFAULT_SELFSIGNED_ROOTCERTS))) {
throw SSLVerifyError(X509_verify_cert_error_string(error));
} else {
qDebug() << "PaymentRequestPlus::getMerchant: Allowing self "
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp
--- a/src/qt/paymentserver.cpp
+++ b/src/qt/paymentserver.cpp
@@ -127,7 +127,7 @@
// -rootcertificates="" and get 'I don't like X.509 certificates, don't
// trust anybody' behavior:
QString certFile =
- QString::fromStdString(GetArg("-rootcertificates", "-system-"));
+ QString::fromStdString(gArgs.GetArg("-rootcertificates", "-system-"));
// Empty store
if (certFile.isEmpty()) {
diff --git a/src/qt/test/rpcnestedtests.cpp b/src/qt/test/rpcnestedtests.cpp
--- a/src/qt/test/rpcnestedtests.cpp
+++ b/src/qt/test/rpcnestedtests.cpp
@@ -46,7 +46,7 @@
(int)(GetRand(100000)));
QDir dir(QString::fromStdString(path));
dir.mkpath(".");
- ForceSetArg("-datadir", path);
+ gArgs.ForceSetArg("-datadir", path);
// mempool.setSanityCheck(1.0);
pblocktree = new CBlockTreeDB(1 << 20, true);
pcoinsdbview = new CCoinsViewDB(1 << 23, true);
diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp
--- a/src/qt/utilitydialog.cpp
+++ b/src/qt/utilitydialog.cpp
@@ -79,7 +79,7 @@
cursor.insertBlock();
std::string strUsage = HelpMessage(HMM_BITCOIN_QT);
- const bool showDebug = GetBoolArg("-help-debug", false);
+ const bool showDebug = gArgs.GetBoolArg("-help-debug", false);
strUsage += HelpMessageGroup(tr("UI Options:").toStdString());
if (showDebug) {
strUsage += HelpMessageOpt(
diff --git a/src/qt/walletmodel.cpp b/src/qt/walletmodel.cpp
--- a/src/qt/walletmodel.cpp
+++ b/src/qt/walletmodel.cpp
@@ -669,7 +669,7 @@
}
bool WalletModel::isWalletEnabled() {
- return !GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
+ return !gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET);
}
bool WalletModel::hdEnabled() const {
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
--- a/src/rpc/blockchain.cpp
+++ b/src/rpc/blockchain.cpp
@@ -1120,8 +1120,8 @@
}
UniValue verifychain(const Config &config, const JSONRPCRequest &request) {
- int nCheckLevel = GetArg("-checklevel", DEFAULT_CHECKLEVEL);
- int nCheckDepth = GetArg("-checkblocks", DEFAULT_CHECKBLOCKS);
+ int nCheckLevel = gArgs.GetArg("-checklevel", DEFAULT_CHECKLEVEL);
+ int nCheckDepth = gArgs.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS);
if (request.fHelp || request.params.size() > 2) {
throw std::runtime_error(
"verifychain ( checklevel nblocks )\n"
@@ -1469,7 +1469,7 @@
ret.push_back(Pair("bytes", (int64_t)mempool.GetTotalTxSize()));
ret.push_back(Pair("usage", (int64_t)mempool.DynamicMemoryUsage()));
size_t maxmempool =
- GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
ret.push_back(Pair("maxmempool", (int64_t)maxmempool));
ret.push_back(
Pair("mempoolminfee",
diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp
--- a/src/rpc/mining.cpp
+++ b/src/rpc/mining.cpp
@@ -250,9 +250,10 @@
obj.push_back(Pair("currentblocksize", uint64_t(nLastBlockSize)));
obj.push_back(Pair("currentblocktx", uint64_t(nLastBlockTx)));
obj.push_back(Pair("difficulty", double(GetDifficulty(chainActive.Tip()))));
- obj.push_back(Pair("blockprioritypercentage",
- uint8_t(GetArg("-blockprioritypercentage",
- DEFAULT_BLOCK_PRIORITY_PERCENTAGE))));
+ obj.push_back(
+ Pair("blockprioritypercentage",
+ uint8_t(gArgs.GetArg("-blockprioritypercentage",
+ DEFAULT_BLOCK_PRIORITY_PERCENTAGE))));
obj.push_back(Pair("errors", GetWarnings("statusbar")));
obj.push_back(Pair("networkhashps", getnetworkhashps(config, request)));
obj.push_back(Pair("pooledtx", uint64_t(mempool.size())));
diff --git a/src/rpc/protocol.cpp b/src/rpc/protocol.cpp
--- a/src/rpc/protocol.cpp
+++ b/src/rpc/protocol.cpp
@@ -66,7 +66,7 @@
static const std::string COOKIEAUTH_FILE = ".cookie";
fs::path GetAuthCookieFile() {
- fs::path path(GetArg("-rpccookiefile", COOKIEAUTH_FILE));
+ fs::path path(gArgs.GetArg("-rpccookiefile", COOKIEAUTH_FILE));
if (!path.is_complete()) path = GetDataDir() / path;
return path;
}
diff --git a/src/script/scriptcache.cpp b/src/script/scriptcache.cpp
--- a/src/script/scriptcache.cpp
+++ b/src/script/scriptcache.cpp
@@ -20,8 +20,9 @@
// nMaxCacheSize is unsigned. If -maxscriptcachesize is set to zero,
// setup_bytes creates the minimum possible cache (2 elements).
size_t nMaxCacheSize =
- std::min(std::max(int64_t(0), GetArg("-maxscriptcachesize",
- DEFAULT_MAX_SCRIPT_CACHE_SIZE)),
+ std::min(std::max(int64_t(0),
+ gArgs.GetArg("-maxscriptcachesize",
+ DEFAULT_MAX_SCRIPT_CACHE_SIZE)),
MAX_MAX_SCRIPT_CACHE_SIZE) *
(size_t(1) << 20);
size_t nElems = scriptExecutionCache.setup_bytes(nMaxCacheSize);
diff --git a/src/script/sigcache.cpp b/src/script/sigcache.cpp
--- a/src/script/sigcache.cpp
+++ b/src/script/sigcache.cpp
@@ -70,8 +70,9 @@
// nMaxCacheSize is unsigned. If -maxsigcachesize is set to zero,
// setup_bytes creates the minimum possible cache (2 elements).
size_t nMaxCacheSize =
- std::min(std::max(int64_t(0), GetArg("-maxsigcachesize",
- DEFAULT_MAX_SIG_CACHE_SIZE)),
+ std::min(std::max(int64_t(0),
+ gArgs.GetArg("-maxsigcachesize",
+ DEFAULT_MAX_SIG_CACHE_SIZE)),
MAX_MAX_SIG_CACHE_SIZE) *
(size_t(1) << 20);
size_t nElems = signatureCache.setup_bytes(nMaxCacheSize);
diff --git a/src/test/DoS_tests.cpp b/src/test/DoS_tests.cpp
--- a/src/test/DoS_tests.cpp
+++ b/src/test/DoS_tests.cpp
@@ -86,7 +86,7 @@
connman->ClearBanned();
// because 11 is my favorite number.
- ForceSetArg("-banscore", "111");
+ gArgs.ForceSetArg("-banscore", "111");
CAddress addr1(ip(0xa0b0c001), NODE_NONE);
CNode dummyNode1(id++, NODE_NETWORK, 0, INVALID_SOCKET, addr1, 3, 1, "",
true);
@@ -103,7 +103,7 @@
Misbehaving(dummyNode1.GetId(), 1, "");
SendMessages(config, &dummyNode1, *connman, interruptDummy);
BOOST_CHECK(connman->IsBanned(addr1));
- ForceSetArg("-banscore", std::to_string(DEFAULT_BANSCORE_THRESHOLD));
+ gArgs.ForceSetArg("-banscore", std::to_string(DEFAULT_BANSCORE_THRESHOLD));
}
BOOST_AUTO_TEST_CASE(DoS_bantime) {
diff --git a/src/test/getarg_tests.cpp b/src/test/getarg_tests.cpp
--- a/src/test/getarg_tests.cpp
+++ b/src/test/getarg_tests.cpp
@@ -28,133 +28,133 @@
vecChar.push_back(s.c_str());
}
- ParseParameters(vecChar.size(), &vecChar[0]);
+ gArgs.ParseParameters(vecChar.size(), &vecChar[0]);
}
BOOST_AUTO_TEST_CASE(boolarg) {
ResetArgs("-foo");
- BOOST_CHECK(GetBoolArg("-foo", false));
- BOOST_CHECK(GetBoolArg("-foo", true));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", true));
- BOOST_CHECK(!GetBoolArg("-fo", false));
- BOOST_CHECK(GetBoolArg("-fo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-fo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-fo", true));
- BOOST_CHECK(!GetBoolArg("-fooo", false));
- BOOST_CHECK(GetBoolArg("-fooo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-fooo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-fooo", true));
ResetArgs("-foo=0");
- BOOST_CHECK(!GetBoolArg("-foo", false));
- BOOST_CHECK(!GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
ResetArgs("-foo=1");
- BOOST_CHECK(GetBoolArg("-foo", false));
- BOOST_CHECK(GetBoolArg("-foo", true));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", true));
// New 0.6 feature: auto-map -nosomething to !-something:
ResetArgs("-nofoo");
- BOOST_CHECK(!GetBoolArg("-foo", false));
- BOOST_CHECK(!GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
ResetArgs("-nofoo=1");
- BOOST_CHECK(!GetBoolArg("-foo", false));
- BOOST_CHECK(!GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
// -nofoo should win
ResetArgs("-foo -nofoo");
- BOOST_CHECK(!GetBoolArg("-foo", false));
- BOOST_CHECK(!GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
// -nofoo should win
ResetArgs("-foo=1 -nofoo=1");
- BOOST_CHECK(!GetBoolArg("-foo", false));
- BOOST_CHECK(!GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
// -nofoo=0 should win
ResetArgs("-foo=0 -nofoo=0");
- BOOST_CHECK(GetBoolArg("-foo", false));
- BOOST_CHECK(GetBoolArg("-foo", true));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", true));
// New 0.6 feature: treat -- same as -:
ResetArgs("--foo=1");
- BOOST_CHECK(GetBoolArg("-foo", false));
- BOOST_CHECK(GetBoolArg("-foo", true));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", true));
ResetArgs("--nofoo=1");
- BOOST_CHECK(!GetBoolArg("-foo", false));
- BOOST_CHECK(!GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
}
BOOST_AUTO_TEST_CASE(stringarg) {
ResetArgs("");
- BOOST_CHECK_EQUAL(GetArg("-foo", ""), "");
- BOOST_CHECK_EQUAL(GetArg("-foo", "eleven"), "eleven");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", "eleven"), "eleven");
ResetArgs("-foo -bar");
- BOOST_CHECK_EQUAL(GetArg("-foo", ""), "");
- BOOST_CHECK_EQUAL(GetArg("-foo", "eleven"), "");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", "eleven"), "");
ResetArgs("-foo=");
- BOOST_CHECK_EQUAL(GetArg("-foo", ""), "");
- BOOST_CHECK_EQUAL(GetArg("-foo", "eleven"), "");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", "eleven"), "");
ResetArgs("-foo=11");
- BOOST_CHECK_EQUAL(GetArg("-foo", ""), "11");
- BOOST_CHECK_EQUAL(GetArg("-foo", "eleven"), "11");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "11");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", "eleven"), "11");
ResetArgs("-foo=eleven");
- BOOST_CHECK_EQUAL(GetArg("-foo", ""), "eleven");
- BOOST_CHECK_EQUAL(GetArg("-foo", "eleven"), "eleven");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "eleven");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", "eleven"), "eleven");
}
BOOST_AUTO_TEST_CASE(intarg) {
ResetArgs("");
- BOOST_CHECK_EQUAL(GetArg("-foo", 11), 11);
- BOOST_CHECK_EQUAL(GetArg("-foo", 0), 0);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", 11), 11);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", 0), 0);
ResetArgs("-foo -bar");
- BOOST_CHECK_EQUAL(GetArg("-foo", 11), 0);
- BOOST_CHECK_EQUAL(GetArg("-bar", 11), 0);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", 11), 0);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-bar", 11), 0);
ResetArgs("-foo=11 -bar=12");
- BOOST_CHECK_EQUAL(GetArg("-foo", 0), 11);
- BOOST_CHECK_EQUAL(GetArg("-bar", 11), 12);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", 0), 11);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-bar", 11), 12);
ResetArgs("-foo=NaN -bar=NotANumber");
- BOOST_CHECK_EQUAL(GetArg("-foo", 1), 0);
- BOOST_CHECK_EQUAL(GetArg("-bar", 11), 0);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", 1), 0);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-bar", 11), 0);
}
BOOST_AUTO_TEST_CASE(doubledash) {
ResetArgs("--foo");
- BOOST_CHECK_EQUAL(GetBoolArg("-foo", false), true);
+ BOOST_CHECK_EQUAL(gArgs.GetBoolArg("-foo", false), true);
ResetArgs("--foo=verbose --bar=1");
- BOOST_CHECK_EQUAL(GetArg("-foo", ""), "verbose");
- BOOST_CHECK_EQUAL(GetArg("-bar", 0), 1);
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-foo", ""), "verbose");
+ BOOST_CHECK_EQUAL(gArgs.GetArg("-bar", 0), 1);
}
BOOST_AUTO_TEST_CASE(boolargno) {
ResetArgs("-nofoo");
- BOOST_CHECK(!GetBoolArg("-foo", true));
- BOOST_CHECK(!GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
ResetArgs("-nofoo=1");
- BOOST_CHECK(!GetBoolArg("-foo", true));
- BOOST_CHECK(!GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
ResetArgs("-nofoo=0");
- BOOST_CHECK(GetBoolArg("-foo", true));
- BOOST_CHECK(GetBoolArg("-foo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", true));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
// --nofoo should win
ResetArgs("-foo --nofoo");
- BOOST_CHECK(!GetBoolArg("-foo", true));
- BOOST_CHECK(!GetBoolArg("-foo", false));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", true));
+ BOOST_CHECK(!gArgs.GetBoolArg("-foo", false));
// foo always wins:
ResetArgs("-nofoo -foo");
- BOOST_CHECK(GetBoolArg("-foo", true));
- BOOST_CHECK(GetBoolArg("-foo", false));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", true));
+ BOOST_CHECK(gArgs.GetBoolArg("-foo", false));
}
BOOST_AUTO_TEST_SUITE_END()
diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
--- a/src/test/miner_tests.cpp
+++ b/src/test/miner_tests.cpp
@@ -701,7 +701,7 @@
uint64_t expected) {
GlobalConfig config;
- ForceSetArg("-blockmaxsize", std::to_string(size));
+ gArgs.ForceSetArg("-blockmaxsize", std::to_string(size));
BlockAssembler ba(config);
BOOST_CHECK_EQUAL(ba.GetMaxGeneratedBlockSize(), expected);
@@ -760,7 +760,7 @@
// If the parameter is not specified, we use
// DEFAULT_MAX_GENERATED_BLOCK_SIZE
{
- ClearArg("-blockmaxsize");
+ gArgs.ClearArg("-blockmaxsize");
BlockAssembler ba(config);
BOOST_CHECK_EQUAL(ba.GetMaxGeneratedBlockSize(),
DEFAULT_MAX_GENERATED_BLOCK_SIZE);
diff --git a/src/test/net_tests.cpp b/src/test/net_tests.cpp
--- a/src/test/net_tests.cpp
+++ b/src/test/net_tests.cpp
@@ -191,7 +191,7 @@
"very very very very very very very very very "
"very very very very very very very very very "
"very very very very very very long comment";
- ForceSetMultiArg("-uacomment", long_uacomment);
+ gArgs.ForceSetMultiArg("-uacomment", long_uacomment);
BOOST_CHECK_EQUAL(userAgent(config).size(), MAX_SUBVERSION_LENGTH);
BOOST_CHECK_EQUAL(userAgent(config),
diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
--- a/src/test/test_bitcoin.cpp
+++ b/src/test/test_bitcoin.cpp
@@ -77,7 +77,7 @@
(unsigned long)GetTime(),
(int)(InsecureRandRange(100000)));
fs::create_directories(pathTemp);
- ForceSetArg("-datadir", pathTemp.string());
+ gArgs.ForceSetArg("-datadir", pathTemp.string());
mempool.setSanityCheck(1.0);
pblocktree = new CBlockTreeDB(1 << 20, true);
pcoinsdbview = new CCoinsViewDB(1 << 23, true);
diff --git a/src/timedata.cpp b/src/timedata.cpp
--- a/src/timedata.cpp
+++ b/src/timedata.cpp
@@ -77,8 +77,9 @@
std::vector<int64_t> vSorted = vTimeOffsets.sorted();
// Only let other nodes change our time by so much
if (abs64(nMedian) <=
- std::max<int64_t>(
- 0, GetArg("-maxtimeadjustment", DEFAULT_MAX_TIME_ADJUSTMENT))) {
+ std::max<int64_t>(0,
+ gArgs.GetArg("-maxtimeadjustment",
+ DEFAULT_MAX_TIME_ADJUSTMENT))) {
nTimeOffset = nMedian;
} else {
nTimeOffset = 0;
diff --git a/src/torcontrol.cpp b/src/torcontrol.cpp
--- a/src/torcontrol.cpp
+++ b/src/torcontrol.cpp
@@ -486,7 +486,7 @@
// Now that we know Tor is running setup the proxy for onion addresses
// if -onion isn't set to something else.
- if (GetArg("-onion", "") == "") {
+ if (gArgs.GetArg("-onion", "") == "") {
CService resolved(LookupNumeric("127.0.0.1", 9050));
proxyType addrOnion = proxyType(resolved, true);
SetProxy(NET_TOR, addrOnion);
@@ -623,7 +623,7 @@
* cookie: hex-encoded ~/.tor/control_auth_cookie
* password: "password"
*/
- std::string torpassword = GetArg("-torpassword", "");
+ std::string torpassword = gArgs.GetArg("-torpassword", "");
if (!torpassword.empty()) {
if (methods.count("HASHEDPASSWORD")) {
LogPrint(BCLog::TOR,
@@ -734,7 +734,7 @@
boost::thread torControlThread;
static void TorControlThread() {
- TorController ctrl(base, GetArg("-torcontrol", DEFAULT_TOR_CONTROL));
+ TorController ctrl(base, gArgs.GetArg("-torcontrol", DEFAULT_TOR_CONTROL));
event_base_dispatch(base);
}
diff --git a/src/txdb.cpp b/src/txdb.cpp
--- a/src/txdb.cpp
+++ b/src/txdb.cpp
@@ -10,8 +10,8 @@
#include "hash.h"
#include "init.h"
#include "pow.h"
-#include "ui_interface.h"
#include "random.h"
+#include "ui_interface.h"
#include "uint256.h"
#include "util.h"
@@ -82,8 +82,9 @@
CDBBatch batch(db);
size_t count = 0;
size_t changed = 0;
- size_t batch_size = (size_t)GetArg("-dbbatchsize", nDefaultDbBatchSize);
- int crash_simulate = GetArg("-dbcrashratio", 0);
+ size_t batch_size =
+ (size_t)gArgs.GetArg("-dbbatchsize", nDefaultDbBatchSize);
+ int crash_simulate = gArgs.GetArg("-dbcrashratio", 0);
assert(!hashBlock.IsNull());
uint256 old_tip = GetBestBlock();
diff --git a/src/util.h b/src/util.h
--- a/src/util.h
+++ b/src/util.h
@@ -238,55 +238,6 @@
extern ArgsManager gArgs;
-// wrappers using the global ArgsManager:
-static inline void ParseParameters(int argc, const char *const argv[]) {
- gArgs.ParseParameters(argc, argv);
-}
-
-static inline void ReadConfigFile(const std::string &confPath) {
- gArgs.ReadConfigFile(confPath);
-}
-
-static inline bool SoftSetArg(const std::string &strArg,
- const std::string &strValue) {
- return gArgs.SoftSetArg(strArg, strValue);
-}
-
-static inline void ForceSetArg(const std::string &strArg,
- const std::string &strValue) {
- gArgs.ForceSetArg(strArg, strValue);
-}
-
-static inline void ForceSetMultiArg(const std::string &strArg,
- const std::string &strValue) {
- gArgs.ForceSetMultiArg(strArg, strValue);
-}
-
-static inline void ClearArg(const std::string &strArg) {
- gArgs.ClearArg(strArg);
-}
-
-static inline bool IsArgSet(const std::string &strArg) {
- return gArgs.IsArgSet(strArg);
-}
-
-static inline std::string GetArg(const std::string &strArg,
- const std::string &strDefault) {
- return gArgs.GetArg(strArg, strDefault);
-}
-
-static inline int64_t GetArg(const std::string &strArg, int64_t nDefault) {
- return gArgs.GetArg(strArg, nDefault);
-}
-
-static inline bool GetBoolArg(const std::string &strArg, bool fDefault) {
- return gArgs.GetBoolArg(strArg, fDefault);
-}
-
-static inline bool SoftSetBoolArg(const std::string &strArg, bool fValue) {
- return gArgs.SoftSetBoolArg(strArg, fValue);
-}
-
/**
* Format a string to be used as group of options in help messages.
*
diff --git a/src/util.cpp b/src/util.cpp
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -539,8 +539,8 @@
// value so we don't have to do memory allocations after that.
if (!path.empty()) return path;
- if (IsArgSet("-datadir")) {
- path = fs::system_complete(GetArg("-datadir", ""));
+ if (gArgs.IsArgSet("-datadir")) {
+ path = fs::system_complete(gArgs.GetArg("-datadir", ""));
if (!fs::is_directory(path)) {
path = "";
return path;
@@ -602,7 +602,7 @@
#ifndef WIN32
fs::path GetPidFile() {
- fs::path pathPidFile(GetArg("-pid", BITCOIN_PID_FILENAME));
+ fs::path pathPidFile(gArgs.GetArg("-pid", BITCOIN_PID_FILENAME));
if (!pathPidFile.is_complete()) pathPidFile = GetDataDir() / pathPidFile;
return pathPidFile;
}
diff --git a/src/validation.cpp b/src/validation.cpp
--- a/src/validation.cpp
+++ b/src/validation.cpp
@@ -645,8 +645,9 @@
STANDARD_LOCKTIME_VERIFY_FLAGS);
// Re-limit mempool size, in case we added any transactions
LimitMempoolSize(
- mempool, GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000,
- GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60);
+ mempool,
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000,
+ gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60);
}
// Used to avoid mempool polluting consensus critical paths if CCoinsViewMempool
@@ -867,8 +868,9 @@
}
Amount mempoolRejectFee =
- pool.GetMinFee(GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
- 1000000)
+ pool.GetMinFee(
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) *
+ 1000000)
.GetFee(nSize);
if (mempoolRejectFee > Amount(0) && nModifiedFees < mempoolRejectFee) {
return state.DoS(0, false, REJECT_INSUFFICIENTFEE,
@@ -876,7 +878,7 @@
strprintf("%d < %d", nFees, mempoolRejectFee));
}
- if (GetBoolArg("-relaypriority", DEFAULT_RELAYPRIORITY) &&
+ if (gArgs.GetBoolArg("-relaypriority", DEFAULT_RELAYPRIORITY) &&
nModifiedFees < ::minRelayTxFee.GetFee(nSize) &&
!AllowFree(entry.GetPriority(chainActive.Height() + 1))) {
// Require that free transactions have sufficient priority to be
@@ -903,7 +905,8 @@
// -limitfreerelay unit is thousand-bytes-per-minute
// At default rate it would take over a month to fill 1GB
if (dFreeCount + nSize >=
- GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) * 10 * 1000) {
+ gArgs.GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) * 10 *
+ 1000) {
return state.DoS(0, false, REJECT_INSUFFICIENTFEE,
"rate limited free transaction");
}
@@ -921,13 +924,15 @@
// Calculate in-mempool ancestors, up to a limit.
CTxMemPool::setEntries setAncestors;
size_t nLimitAncestors =
- GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
+ gArgs.GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
size_t nLimitAncestorSize =
- GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT) * 1000;
+ gArgs.GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT) *
+ 1000;
size_t nLimitDescendants =
- GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
+ gArgs.GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
size_t nLimitDescendantSize =
- GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) *
+ gArgs.GetArg("-limitdescendantsize",
+ DEFAULT_DESCENDANT_SIZE_LIMIT) *
1000;
std::string errString;
if (!pool.CalculateMemPoolAncestors(
@@ -940,7 +945,7 @@
uint32_t scriptVerifyFlags = STANDARD_SCRIPT_VERIFY_FLAGS;
if (!Params().RequireStandard()) {
scriptVerifyFlags =
- GetArg("-promiscuousmempoolflags", scriptVerifyFlags);
+ gArgs.GetArg("-promiscuousmempoolflags", scriptVerifyFlags);
}
// Check against previous transactions. This is done last to help
@@ -1008,8 +1013,10 @@
// Trim mempool and check if tx was trimmed.
if (!fOverrideMempoolLimit) {
LimitMempoolSize(
- pool, GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000,
- GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60);
+ pool,
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000,
+ gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 *
+ 60);
if (!pool.exists(txid)) {
return state.DoS(0, false, REJECT_INSUFFICIENTFEE,
"mempool full");
@@ -1224,7 +1231,7 @@
static void AlertNotify(const std::string &strMessage) {
uiInterface.NotifyAlertChanged();
- std::string strCmd = GetArg("-alertnotify", "");
+ std::string strCmd = gArgs.GetArg("-alertnotify", "");
if (strCmd.empty()) return;
// Alert text should be plain ascii coming from a trusted source, but to be
@@ -1927,8 +1934,7 @@
if (it->second->GetAncestor(pindex->nHeight) == pindex &&
pindexBestHeader->GetAncestor(pindex->nHeight) == pindex &&
pindexBestHeader->nChainWork >=
- UintToArith256(
- consensusParams.nMinimumChainWork)) {
+ UintToArith256(consensusParams.nMinimumChainWork)) {
// This block is a member of the assumed verified chain and an
// ancestor of the best header. The equivalent time check
// discourages hashpower from extorting the network via DOS
@@ -1993,9 +1999,10 @@
pindex->pprev->GetAncestor(consensusParams.BIP34Height);
// Only continue to enforce if we're below BIP34 activation height or the
// block hash at that height doesn't correspond.
- fEnforceBIP30 = fEnforceBIP30 && (!pindexBIP34height ||
- !(pindexBIP34height->GetBlockHash() ==
- consensusParams.BIP34Hash));
+ fEnforceBIP30 =
+ fEnforceBIP30 &&
+ (!pindexBIP34height ||
+ !(pindexBIP34height->GetBlockHash() == consensusParams.BIP34Hash));
if (fEnforceBIP30) {
for (const auto &tx : block.vtx) {
@@ -2245,7 +2252,7 @@
nLastSetChain = nNow;
}
int64_t nMempoolSizeMax =
- GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
+ gArgs.GetArg("-maxmempool", DEFAULT_MAX_MEMPOOL_SIZE) * 1000000;
int64_t cacheSize = pcoinsTip->DynamicMemoryUsage();
int64_t nTotalSpace =
nCoinCacheUsage +
@@ -2369,8 +2376,8 @@
const CBlockIndex *pindex = chainActive.Tip();
for (int bit = 0; bit < VERSIONBITS_NUM_BITS; bit++) {
WarningBitsConditionChecker checker(bit);
- ThresholdState state = checker.GetStateFor(
- pindex, consensusParams, warningcache[bit]);
+ ThresholdState state =
+ checker.GetStateFor(pindex, consensusParams, warningcache[bit]);
if (state == THRESHOLD_ACTIVE || state == THRESHOLD_LOCKED_IN) {
if (state == THRESHOLD_ACTIVE) {
std::string strWarning =
@@ -2416,18 +2423,18 @@
}
}
}
- LogPrintf(
- "%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu "
- "date='%s' progress=%f cache=%.1fMiB(%utxo)",
- __func__, chainActive.Tip()->GetBlockHash().ToString(),
- chainActive.Height(), chainActive.Tip()->nVersion,
- log(chainActive.Tip()->nChainWork.getdouble()) / log(2.0),
- (unsigned long)chainActive.Tip()->nChainTx,
- DateTimeStrFormat("%Y-%m-%d %H:%M:%S",
- chainActive.Tip()->GetBlockTime()),
- GuessVerificationProgress(config.GetChainParams().TxData(), chainActive.Tip()),
- pcoinsTip->DynamicMemoryUsage() * (1.0 / (1 << 20)),
- pcoinsTip->GetCacheSize());
+ LogPrintf("%s: new best=%s height=%d version=0x%08x log2_work=%.8g tx=%lu "
+ "date='%s' progress=%f cache=%.1fMiB(%utxo)",
+ __func__, chainActive.Tip()->GetBlockHash().ToString(),
+ chainActive.Height(), chainActive.Tip()->nVersion,
+ log(chainActive.Tip()->nChainWork.getdouble()) / log(2.0),
+ (unsigned long)chainActive.Tip()->nChainTx,
+ DateTimeStrFormat("%Y-%m-%d %H:%M:%S",
+ chainActive.Tip()->GetBlockTime()),
+ GuessVerificationProgress(config.GetChainParams().TxData(),
+ chainActive.Tip()),
+ pcoinsTip->DynamicMemoryUsage() * (1.0 / (1 << 20)),
+ pcoinsTip->GetCacheSize());
if (!warningMessages.empty())
LogPrintf(" warning='%s'",
boost::algorithm::join(warningMessages, ", "));
@@ -2943,7 +2950,7 @@
return false;
}
- int nStopAtHeight = GetArg("-stopatheight", DEFAULT_STOPATHEIGHT);
+ int nStopAtHeight = gArgs.GetArg("-stopatheight", DEFAULT_STOPATHEIGHT);
if (nStopAtHeight && pindexNewTip &&
pindexNewTip->nHeight >= nStopAtHeight) {
StartShutdown();
@@ -3606,8 +3613,9 @@
}
assert(pindexPrev);
- if (fCheckpointsEnabled && !CheckIndexAgainstCheckpoint(
- pindexPrev, state, chainparams, hash)) {
+ if (fCheckpointsEnabled &&
+ !CheckIndexAgainstCheckpoint(pindexPrev, state, chainparams,
+ hash)) {
return error("%s: CheckIndexAgainstCheckpoint(): %s", __func__,
state.GetRejectReason().c_str());
}
@@ -4584,7 +4592,7 @@
}
// Use the provided setting for -txindex in the new database
- fTxIndex = GetBoolArg("-txindex", DEFAULT_TXINDEX);
+ fTxIndex = gArgs.GetBoolArg("-txindex", DEFAULT_TXINDEX);
pblocktree->WriteFlag("txindex", fTxIndex);
LogPrintf("Initializing databases...\n");
@@ -5110,7 +5118,7 @@
bool LoadMempool(const Config &config) {
int64_t nExpiryTimeout =
- GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
+ gArgs.GetArg("-mempoolexpiry", DEFAULT_MEMPOOL_EXPIRY) * 60 * 60;
FILE *filestr = fsbridge::fopen(GetDataDir() / "mempool.dat", "rb");
CAutoFile file(filestr, SER_DISK, CLIENT_VERSION);
if (file.IsNull()) {
diff --git a/src/wallet/db.cpp b/src/wallet/db.cpp
--- a/src/wallet/db.cpp
+++ b/src/wallet/db.cpp
@@ -81,7 +81,7 @@
pathErrorFile.string());
unsigned int nEnvFlags = 0;
- if (GetBoolArg("-privdb", DEFAULT_WALLET_PRIVDB)) {
+ if (gArgs.GetBoolArg("-privdb", DEFAULT_WALLET_PRIVDB)) {
nEnvFlags |= DB_PRIVATE;
}
@@ -457,7 +457,8 @@
}
env->dbenv->txn_checkpoint(
- nMinutes ? GetArg("-dblogsize", DEFAULT_WALLET_DBLOGSIZE) * 1024 : 0,
+ nMinutes ? gArgs.GetArg("-dblogsize", DEFAULT_WALLET_DBLOGSIZE) * 1024
+ : 0,
nMinutes, 0);
}
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
--- a/src/wallet/rpcdump.cpp
+++ b/src/wallet/rpcdump.cpp
@@ -1321,7 +1321,7 @@
// clang-format on
void RegisterDumpRPCCommands(CRPCTable &t) {
- if (GetBoolArg("-disablewallet", false)) {
+ if (gArgs.GetBoolArg("-disablewallet", false)) {
return;
}
diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp
--- a/src/wallet/rpcwallet.cpp
+++ b/src/wallet/rpcwallet.cpp
@@ -3536,7 +3536,7 @@
// clang-format on
void RegisterWalletRPCCommands(CRPCTable &t) {
- if (GetBoolArg("-disablewallet", false)) {
+ if (gArgs.GetBoolArg("-disablewallet", false)) {
return;
}
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
--- a/src/wallet/wallet.cpp
+++ b/src/wallet/wallet.cpp
@@ -516,7 +516,7 @@
}
bool CWallet::Verify() {
- if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
+ if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
return true;
}
@@ -560,7 +560,7 @@
return InitError(strError);
}
- if (GetBoolArg("-salvagewallet", false)) {
+ if (gArgs.GetBoolArg("-salvagewallet", false)) {
// Recover readable keypairs:
CWallet dummyWallet;
std::string backup_filename;
@@ -1015,7 +1015,7 @@
// Notify an external script when a wallet transaction comes in or is
// updated.
- std::string strCmd = GetArg("-walletnotify", "");
+ std::string strCmd = gArgs.GetArg("-walletnotify", "");
if (!strCmd.empty()) {
boost::replace_all(strCmd, "%s", wtxIn.GetId().GetHex());
@@ -2453,11 +2453,11 @@
}
}
- size_t nMaxChainLength =
- std::min(GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT),
- GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT));
- bool fRejectLongChains = GetBoolArg("-walletrejectlongchains",
- DEFAULT_WALLET_REJECT_LONG_CHAINS);
+ size_t nMaxChainLength = std::min(
+ gArgs.GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT),
+ gArgs.GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT));
+ bool fRejectLongChains = gArgs.GetBoolArg(
+ "-walletrejectlongchains", DEFAULT_WALLET_REJECT_LONG_CHAINS);
bool res =
nTargetValue <= nValueFromPresetInputs ||
@@ -2940,21 +2940,23 @@
}
}
- if (GetBoolArg("-walletrejectlongchains",
- DEFAULT_WALLET_REJECT_LONG_CHAINS)) {
+ if (gArgs.GetBoolArg("-walletrejectlongchains",
+ DEFAULT_WALLET_REJECT_LONG_CHAINS)) {
// Lastly, ensure this tx will pass the mempool's chain limits.
LockPoints lp;
CTxMemPoolEntry entry(wtxNew.tx, Amount(0), 0, 0, 0, Amount(0), false,
0, lp);
CTxMemPool::setEntries setAncestors;
size_t nLimitAncestors =
- GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
+ gArgs.GetArg("-limitancestorcount", DEFAULT_ANCESTOR_LIMIT);
size_t nLimitAncestorSize =
- GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT) * 1000;
+ gArgs.GetArg("-limitancestorsize", DEFAULT_ANCESTOR_SIZE_LIMIT) *
+ 1000;
size_t nLimitDescendants =
- GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
+ gArgs.GetArg("-limitdescendantcount", DEFAULT_DESCENDANT_LIMIT);
size_t nLimitDescendantSize =
- GetArg("-limitdescendantsize", DEFAULT_DESCENDANT_SIZE_LIMIT) *
+ gArgs.GetArg("-limitdescendantsize",
+ DEFAULT_DESCENDANT_SIZE_LIMIT) *
1000;
std::string errString;
if (!mempool.CalculateMemPoolAncestors(
@@ -3260,8 +3262,8 @@
if (kpSize > 0) {
nTargetSize = kpSize;
} else {
- nTargetSize =
- std::max(GetArg("-keypool", DEFAULT_KEYPOOL_SIZE), int64_t(0));
+ nTargetSize = std::max(gArgs.GetArg("-keypool", DEFAULT_KEYPOOL_SIZE),
+ int64_t(0));
}
// count amount of available keys (internal, external)
@@ -4048,7 +4050,7 @@
// Needed to restore wallet transaction meta data after -zapwallettxes
std::vector<CWalletTx> vWtx;
- if (GetBoolArg("-zapwallettxes", false)) {
+ if (gArgs.GetBoolArg("-zapwallettxes", false)) {
uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
std::unique_ptr<CWalletDBWrapper> dbw(
@@ -4102,8 +4104,8 @@
}
}
- if (GetBoolArg("-upgradewallet", fFirstRun)) {
- int nMaxVersion = GetArg("-upgradewallet", 0);
+ if (gArgs.GetBoolArg("-upgradewallet", fFirstRun)) {
+ int nMaxVersion = gArgs.GetArg("-upgradewallet", 0);
// The -upgradewallet without argument case
if (nMaxVersion == 0) {
LogPrintf("Performing wallet upgrade to %i\n", FEATURE_LATEST);
@@ -4124,7 +4126,7 @@
if (fFirstRun) {
// Create new keyUser and set as default key.
- if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) &&
+ if (gArgs.GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) &&
!walletInstance->IsHDEnabled()) {
// Ensure this wallet.dat can only be opened by clients supporting
@@ -4150,8 +4152,8 @@
}
walletInstance->SetBestChain(chainActive.GetLocator());
- } else if (IsArgSet("-usehd")) {
- bool useHD = GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET);
+ } else if (gArgs.IsArgSet("-usehd")) {
+ bool useHD = gArgs.GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET);
if (walletInstance->IsHDEnabled() && !useHD) {
InitError(strprintf(_("Error loading %s: You can't disable HD on a "
"already existing HD wallet"),
@@ -4172,7 +4174,7 @@
RegisterValidationInterface(walletInstance);
CBlockIndex *pindexRescan = chainActive.Tip();
- if (GetBoolArg("-rescan", false)) {
+ if (gArgs.GetBoolArg("-rescan", false)) {
pindexRescan = chainActive.Genesis();
} else {
CWalletDB walletdb(*walletInstance->dbw);
@@ -4216,8 +4218,8 @@
walletInstance->dbw->IncrementUpdateCounter();
// Restore wallet transaction metadata after -zapwallettxes=1
- if (GetBoolArg("-zapwallettxes", false) &&
- GetArg("-zapwallettxes", "1") != "2") {
+ if (gArgs.GetBoolArg("-zapwallettxes", false) &&
+ gArgs.GetArg("-zapwallettxes", "1") != "2") {
CWalletDB walletdb(*walletInstance->dbw);
for (const CWalletTx &wtxOld : vWtx) {
@@ -4241,7 +4243,7 @@
}
walletInstance->SetBroadcastTransactions(
- GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST));
+ gArgs.GetBoolArg("-walletbroadcast", DEFAULT_WALLETBROADCAST));
LOCK(walletInstance->cs_wallet);
LogPrintf("setKeyPool.size() = %u\n", walletInstance->GetKeyPoolSize());
@@ -4253,7 +4255,7 @@
}
bool CWallet::InitLoadWallet() {
- if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
+ if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
LogPrintf("Wallet disabled!\n");
return true;
}
@@ -4283,22 +4285,22 @@
}
bool CWallet::ParameterInteraction() {
- SoftSetArg("-wallet", DEFAULT_WALLET_DAT);
+ gArgs.SoftSetArg("-wallet", DEFAULT_WALLET_DAT);
const bool is_multiwallet = gArgs.GetArgs("-wallet").size() > 1;
- if (GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
+ if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET)) {
return true;
}
- if (GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) &&
- SoftSetBoolArg("-walletbroadcast", false)) {
+ if (gArgs.GetBoolArg("-blocksonly", DEFAULT_BLOCKSONLY) &&
+ gArgs.SoftSetBoolArg("-walletbroadcast", false)) {
LogPrintf("%s: parameter interaction: -blocksonly=1 -> setting "
"-walletbroadcast=0\n",
__func__);
}
- if (GetBoolArg("-salvagewallet", false) &&
- SoftSetBoolArg("-rescan", true)) {
+ if (gArgs.GetBoolArg("-salvagewallet", false) &&
+ gArgs.SoftSetBoolArg("-rescan", true)) {
if (is_multiwallet) {
return InitError(
strprintf("%s is only allowed with a single wallet file",
@@ -4311,8 +4313,8 @@
}
// -zapwallettx implies a rescan
- if (GetBoolArg("-zapwallettxes", false) &&
- SoftSetBoolArg("-rescan", true)) {
+ if (gArgs.GetBoolArg("-zapwallettxes", false) &&
+ gArgs.SoftSetBoolArg("-rescan", true)) {
if (is_multiwallet) {
return InitError(
strprintf("%s is only allowed with a single wallet file",
@@ -4324,19 +4326,19 @@
}
if (is_multiwallet) {
- if (GetBoolArg("-upgradewallet", false)) {
+ if (gArgs.GetBoolArg("-upgradewallet", false)) {
return InitError(
strprintf("%s is only allowed with a single wallet file",
"-upgradewallet"));
}
}
- if (GetBoolArg("-sysperms", false)) {
+ if (gArgs.GetBoolArg("-sysperms", false)) {
return InitError("-sysperms is not allowed in combination with enabled "
"wallet functionality");
}
- if (GetArg("-prune", 0) && GetBoolArg("-rescan", false)) {
+ if (gArgs.GetArg("-prune", 0) && gArgs.GetBoolArg("-rescan", false)) {
return InitError(
_("Rescans are not possible in pruned mode. You will need to use "
"-reindex which will download the whole blockchain again."));
@@ -4348,11 +4350,12 @@
_("The wallet will avoid paying less than the minimum relay fee."));
}
- if (IsArgSet("-mintxfee")) {
+ if (gArgs.IsArgSet("-mintxfee")) {
Amount n(0);
- auto parsed = ParseMoney(GetArg("-mintxfee", ""), n);
+ auto parsed = ParseMoney(gArgs.GetArg("-mintxfee", ""), n);
if (!parsed || Amount(0) == n) {
- return InitError(AmountErrMsg("mintxfee", GetArg("-mintxfee", "")));
+ return InitError(
+ AmountErrMsg("mintxfee", gArgs.GetArg("-mintxfee", "")));
}
if (n > HIGH_TX_FEE_PER_KB) {
@@ -4364,12 +4367,12 @@
CWallet::minTxFee = CFeeRate(n);
}
- if (IsArgSet("-fallbackfee")) {
+ if (gArgs.IsArgSet("-fallbackfee")) {
Amount nFeePerK(0);
- if (!ParseMoney(GetArg("-fallbackfee", ""), nFeePerK)) {
+ if (!ParseMoney(gArgs.GetArg("-fallbackfee", ""), nFeePerK)) {
return InitError(
strprintf(_("Invalid amount for -fallbackfee=<amount>: '%s'"),
- GetArg("-fallbackfee", "")));
+ gArgs.GetArg("-fallbackfee", "")));
}
if (nFeePerK > HIGH_TX_FEE_PER_KB) {
@@ -4381,10 +4384,11 @@
CWallet::fallbackFee = CFeeRate(nFeePerK);
}
- if (IsArgSet("-paytxfee")) {
+ if (gArgs.IsArgSet("-paytxfee")) {
Amount nFeePerK(0);
- if (!ParseMoney(GetArg("-paytxfee", ""), nFeePerK)) {
- return InitError(AmountErrMsg("paytxfee", GetArg("-paytxfee", "")));
+ if (!ParseMoney(gArgs.GetArg("-paytxfee", ""), nFeePerK)) {
+ return InitError(
+ AmountErrMsg("paytxfee", gArgs.GetArg("-paytxfee", "")));
}
if (nFeePerK > HIGH_TX_FEE_PER_KB) {
@@ -4395,17 +4399,18 @@
payTxFee = CFeeRate(nFeePerK, 1000);
if (payTxFee < ::minRelayTxFee) {
- return InitError(
- strprintf(_("Invalid amount for -paytxfee=<amount>: '%s' (must "
- "be at least %s)"),
- GetArg("-paytxfee", ""), ::minRelayTxFee.ToString()));
+ return InitError(strprintf(
+ _("Invalid amount for -paytxfee=<amount>: '%s' (must "
+ "be at least %s)"),
+ gArgs.GetArg("-paytxfee", ""), ::minRelayTxFee.ToString()));
}
}
- if (IsArgSet("-maxtxfee")) {
+ if (gArgs.IsArgSet("-maxtxfee")) {
Amount nMaxFee(0);
- if (!ParseMoney(GetArg("-maxtxfee", ""), nMaxFee)) {
- return InitError(AmountErrMsg("maxtxfee", GetArg("-maxtxfee", "")));
+ if (!ParseMoney(gArgs.GetArg("-maxtxfee", ""), nMaxFee)) {
+ return InitError(
+ AmountErrMsg("maxtxfee", gArgs.GetArg("-maxtxfee", "")));
}
if (nMaxFee > HIGH_MAX_TX_FEE) {
@@ -4415,22 +4420,23 @@
maxTxFee = nMaxFee;
if (CFeeRate(maxTxFee, 1000) < ::minRelayTxFee) {
- return InitError(
- strprintf(_("Invalid amount for -maxtxfee=<amount>: '%s' (must "
- "be at least the minrelay fee of %s to prevent "
- "stuck transactions)"),
- GetArg("-maxtxfee", ""), ::minRelayTxFee.ToString()));
+ return InitError(strprintf(
+ _("Invalid amount for -maxtxfee=<amount>: '%s' (must "
+ "be at least the minrelay fee of %s to prevent "
+ "stuck transactions)"),
+ gArgs.GetArg("-maxtxfee", ""), ::minRelayTxFee.ToString()));
}
}
- nTxConfirmTarget = GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
+ nTxConfirmTarget =
+ gArgs.GetArg("-txconfirmtarget", DEFAULT_TX_CONFIRM_TARGET);
bSpendZeroConfChange =
- GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
- fSendFreeTransactions =
- GetBoolArg("-sendfreetransactions", DEFAULT_SEND_FREE_TRANSACTIONS);
+ gArgs.GetBoolArg("-spendzeroconfchange", DEFAULT_SPEND_ZEROCONF_CHANGE);
+ fSendFreeTransactions = gArgs.GetBoolArg("-sendfreetransactions",
+ DEFAULT_SEND_FREE_TRANSACTIONS);
if (fSendFreeTransactions &&
- GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) {
+ gArgs.GetArg("-limitfreerelay", DEFAULT_LIMITFREERELAY) <= 0) {
return InitError("Creation of free transactions with their relay "
"disabled is not supported.");
}
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
--- a/src/wallet/walletdb.cpp
+++ b/src/wallet/walletdb.cpp
@@ -569,7 +569,7 @@
fNoncriticalErrors = true;
if (strType == "tx") {
// Rescan if there is a bad transaction record:
- SoftSetBoolArg("-rescan", true);
+ gArgs.SoftSetBoolArg("-rescan", true);
}
}
}
@@ -758,7 +758,7 @@
if (fOneThread.exchange(true)) {
return;
}
- if (!GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET)) {
+ if (!gArgs.GetBoolArg("-flushwallet", DEFAULT_FLUSHWALLET)) {
return;
}
diff --git a/src/warnings.cpp b/src/warnings.cpp
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -53,7 +53,7 @@
"do not use for mining or merchant applications");
}
- if (GetBoolArg("-testsafemode", DEFAULT_TESTSAFEMODE))
+ if (gArgs.GetBoolArg("-testsafemode", DEFAULT_TESTSAFEMODE))
strStatusBar = strRPC = strGUI = "testsafemode enabled";
// Misc warnings like out of disk space and clock is wrong
diff --git a/src/zmq/zmqnotificationinterface.cpp b/src/zmq/zmqnotificationinterface.cpp
--- a/src/zmq/zmqnotificationinterface.cpp
+++ b/src/zmq/zmqnotificationinterface.cpp
@@ -44,9 +44,9 @@
factories.begin();
i != factories.end(); ++i) {
std::string arg("-zmq" + i->first);
- if (IsArgSet(arg)) {
+ if (gArgs.IsArgSet(arg)) {
CZMQNotifierFactory factory = i->second;
- std::string address = GetArg(arg, "");
+ std::string address = gArgs.GetArg(arg, "");
CZMQAbstractNotifier *notifier = factory();
notifier->SetType(i->first);
notifier->SetAddress(address);
diff --git a/test/functional/multiwallet.py b/test/functional/multiwallet.py
--- a/test/functional/multiwallet.py
+++ b/test/functional/multiwallet.py
@@ -11,7 +11,6 @@
from test_framework.test_framework import BitcoinTestFramework
from test_framework.util import assert_equal, assert_raises_jsonrpc
-
class MultiWalletTest(BitcoinTestFramework):
def __init__(self):

File Metadata

Mime Type
text/plain
Expires
Sat, Mar 1, 11:47 (6 h, 2 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5187696
Default Alt Text
D1044.id2755.diff (108 KB)

Event Timeline