X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Finit.cpp;h=84e2f3a3ef208aa83409e1315a5664c112adaced;hb=HEAD;hp=9d42a5513e8dc02196afc182d487c5a11b507f4d;hpb=e23488a379ace5a9a2a63ecf6b1c3ccfb6af833b;p=novacoin.git diff --git a/src/init.cpp b/src/init.cpp index 9d42a55..84e2f3a 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -2,18 +2,19 @@ // Copyright (c) 2009-2012 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. +#include "init.h" +#include "wallet.h" +#include "base58.h" #include "txdb-leveldb.h" #include "walletdb.h" #include "bitcoinrpc.h" #include "net.h" -#include "init.h" +#include "random.h" #include "util.h" #include "ipcollector.h" #include "interface.h" #include "checkpoints.h" -#include "wallet.h" -#include #include #include #include @@ -25,9 +26,6 @@ #endif -using namespace std; - - CWallet* pwalletMain; CClientUIInterface uiInterface; std::string strWalletFileName; @@ -233,7 +231,7 @@ bool static Bind(const CService &addr, bool fError = true) { // Core-specific options shared between UI and daemon std::string HelpMessage() { - string strUsage = _("Options:") + "\n" + + std::string strUsage = _("Options:") + "\n" + " -? " + _("This help message") + "\n" + " -conf= " + _("Specify configuration file (default: novacoin.conf)") + "\n" + " -pid= " + _("Specify pid file (default: novacoind.pid)") + "\n" + @@ -264,7 +262,6 @@ std::string HelpMessage() " -bantime= " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" + " -maxreceivebuffer= " + _("Maximum per-connection receive buffer, *1000 bytes (default: 5000)") + "\n" + " -maxsendbuffer= " + _("Maximum per-connection send buffer, *1000 bytes (default: 1000)") + "\n" + - " -detachdb " + _("Detach block and address databases. Increases shutdown time (default: 0)") + "\n" + #ifdef DB_LOG_IN_MEMORY " -memorylog " + _("Use in-memory logging for block index database (default: 1)") + "\n" + @@ -376,7 +373,7 @@ bool AppInit2() fUseMemoryLog = GetBoolArg("-memorylog", true); // Ping and address broadcast intervals - nPingInterval = max(10 * 60, GetArg("-keepalive", 30 * 60)); + nPingInterval = std::max(10 * 60, GetArg("-keepalive", 30 * 60)); CheckpointsMode = Checkpoints::STRICT; std::string strCpMode = GetArg("-cppolicy", "strict"); @@ -455,8 +452,6 @@ bool AppInit2() else fDebugNet = GetBoolArg("-debugnet"); - bitdb.SetDetach(GetBoolArg("-detachdb", false)); - #if !defined(WIN32) && !defined(QT_GUI) fDaemon = GetBoolArg("-daemon"); #else @@ -569,7 +564,7 @@ bool AppInit2() if (!bitdb.Open(GetDataDir())) { - string msg = strprintf(_("Error initializing database environment %s!" + std::string msg = strprintf(_("Error initializing database environment %s!" " To recover, BACKUP THAT DIRECTORY, then remove" " everything from it except for wallet.dat."), strDataDir.c_str()); return InitError(msg); @@ -587,7 +582,7 @@ bool AppInit2() CDBEnv::VerifyResult r = bitdb.Verify(strWalletFileName, CWalletDB::Recover); if (r == CDBEnv::RECOVER_OK) { - string msg = strprintf(_("Warning: wallet.dat corrupt, data salvaged!" + std::string msg = strprintf(_("Warning: wallet.dat corrupt, data salvaged!" " Original wallet.dat saved as wallet.{timestamp}.bak in %s; if" " your balance or transactions are incorrect you should" " restore from a backup."), strDataDir.c_str()); @@ -714,7 +709,7 @@ bool AppInit2() if (mapArgs.count("-externalip")) { - for (string strAddr : mapMultiArgs["-externalip"]) { + for (std::string strAddr : mapMultiArgs["-externalip"]) { CService addrLocal(strAddr, GetListenPort(), fNameLookup); if (!addrLocal.IsValid()) return InitError(strprintf(_("Cannot resolve -externalip address: '%s'"), strAddr.c_str())); @@ -737,14 +732,14 @@ bool AppInit2() InitError(_("Unable to sign checkpoint, wrong checkpointkey?\n")); } - for (string strDest : mapMultiArgs["-seednode"]) + for (std::string strDest : mapMultiArgs["-seednode"]) AddOneShot(strDest); // ********************************************************* Step 7: load blockchain if (!bitdb.Open(GetDataDir())) { - string msg = strprintf(_("Error initializing database environment %s!" + std::string msg = strprintf(_("Error initializing database environment %s!" " To recover, BACKUP THAT DIRECTORY, then remove" " everything from it except for wallet.dat."), strDataDir.c_str()); return InitError(msg); @@ -806,9 +801,9 @@ bool AppInit2() if (mapArgs.count("-printblock")) { - string strMatch = mapArgs["-printblock"]; + std::string strMatch = mapArgs["-printblock"]; int nFound = 0; - for (map::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi) + for (auto mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi) { uint256 hash = (*mi).first; if (strncmp(hash.ToString().c_str(), strMatch.c_str(), strMatch.size()) == 0) @@ -854,7 +849,7 @@ bool AppInit2() strErrors << _("Error loading wallet.dat: Wallet corrupted") << "\n"; else if (nLoadWalletRet == DB_NONCRITICAL_ERROR) { - string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data" + std::string msg(_("Warning: error reading wallet.dat! All keys read correctly, but transaction data" " or address book entries might be missing or incorrect.")); uiInterface.ThreadSafeMessageBox(msg, _("NovaCoin"), CClientUIInterface::OK | CClientUIInterface::ICON_EXCLAMATION | CClientUIInterface::MODAL); } @@ -936,7 +931,7 @@ bool AppInit2() { uiInterface.InitMessage(_("Importing blockchain data file.")); - for (string strFile : mapMultiArgs["-loadblock"]) + for (std::string strFile : mapMultiArgs["-loadblock"]) { FILE *file = fopen(strFile.c_str(), "rb"); if (file) @@ -964,6 +959,7 @@ bool AppInit2() nStart = GetTimeMillis(); { + CAddrDB::SetMessageStart(pchMessageStart); CAddrDB adb; if (!adb.Read(addrman)) printf("Invalid or missing peers.dat; recreating\n");