std::string strWalletFileName;
bool fConfChange;
unsigned int nNodeLifespan;
-unsigned int nMinerSleep;
bool fUseFastIndex;
bool fUseMemoryLog;
enum Checkpoints::CPMode CheckpointsMode;
// Ping and address broadcast intervals
extern int64_t nPingInterval;
extern int64_t nBroadcastInterval;
+extern int64_t nReserveBalance;
//////////////////////////////////////////////////////////////////////////////
//
nNodeLifespan = (unsigned int)(GetArg("-addrlifespan", 7));
fUseFastIndex = GetBoolArg("-fastindex", true);
fUseMemoryLog = GetBoolArg("-memorylog", true);
- nMinerSleep = (unsigned int)(GetArg("-minersleep", 500));
// Ping and address broadcast intervals
nPingInterval = max<int64_t>(10 * 60, GetArg("-keepalive", 30 * 60));
// ********************************************************* Step 3: parameter-to-internal-flags
// -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency
- nScriptCheckThreads = (int)(GetArg("-par", 0));
+ nScriptCheckThreads = GetArgInt("-par", 0);
if (nScriptCheckThreads == 0)
nScriptCheckThreads = boost::thread::hardware_concurrency();
if (nScriptCheckThreads <= 1)
if (mapArgs.count("-timeout"))
{
- int nNewTimeout = (int)(GetArg("-timeout", 5000));
+ int nNewTimeout = GetArgInt("-timeout", 5000);
if (nNewTimeout > 0 && nNewTimeout < 600000)
nConnectTimeout = nNewTimeout;
}
- // Continue to put "/P2SH/" in the coinbase to monitor
- // BIP16 support.
- // This can be removed eventually...
- const char* pszP2SH = "/P2SH/";
- COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
-
+ // Put client version data into coinbase flags.
+ COINBASE_FLAGS << PROTOCOL_VERSION << DISPLAY_VERSION_MAJOR << DISPLAY_VERSION_MINOR << DISPLAY_VERSION_REVISION;
if (mapArgs.count("-paytxfee"))
{
int64_t nStart;
-#ifdef USE_SSE2
- scrypt_detect_sse2();
-#endif
// ********************************************************* Step 5: verify database integrity
uiInterface.InitMessage(_("Verifying database integrity..."));
// ********************************************************* Step 6: network initialization
- int nSocksVersion = (int)(GetArg("-socks", 5));
+ int nSocksVersion = GetArgInt("-socks", 5);
if (nSocksVersion != 4 && nSocksVersion != 5)
return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion));
CService addrProxy;
bool fProxy = false;
if (mapArgs.count("-proxy")) {
- addrProxy = CService(mapArgs["-proxy"], 9050);
+ addrProxy = CService(mapArgs["-proxy"], nSocksDefault);
if (!addrProxy.IsValid())
return InitError(strprintf(_("Invalid -proxy address: '%s'"), mapArgs["-proxy"].c_str()));
if (!mapArgs.count("-tor"))
addrOnion = addrProxy;
else
- addrOnion = CService(mapArgs["-tor"], 9050);
+ addrOnion = CService(mapArgs["-tor"], nSocksDefault);
if (!addrOnion.IsValid())
return InitError(strprintf(_("Invalid -tor address: '%s'"), mapArgs["-tor"].c_str()));
SetProxy(NET_TOR, addrOnion, 5);
if (mapArgs.count("-reservebalance")) // ppcoin: reserve balance amount
{
- int64_t nReserveBalance = 0;
if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance))
{
InitError(_("Invalid amount for -reservebalance=<amount>"));
if (GetBoolArg("-upgradewallet", fFirstRun))
{
- int nMaxVersion = (int)(GetArg("-upgradewallet", 0));
+ int nMaxVersion = GetArgInt("-upgradewallet", 0);
if (nMaxVersion == 0) // the -upgradewallet without argument case
{
printf("Performing wallet upgrade to %i\n", FEATURE_LATEST);