X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Finit.cpp;h=4b64d358f0607a67c9d774e96364dc21a432fafb;hb=8ba3ee467d792328984c6a26c8a08ead8ebbf1e0;hp=34cb698c6a059dea04f56b1331f11e9ff80840ba;hpb=881c78620a35fbc93d3491c381f82f957a9f83f1;p=novacoin.git diff --git a/src/init.cpp b/src/init.cpp index 34cb698..4b64d35 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -8,9 +8,9 @@ #include "net.h" #include "init.h" #include "util.h" +#include "ipcollector.h" #include "ui_interface.h" #include "checkpoints.h" -#include #include #include #include @@ -31,15 +31,13 @@ CClientUIInterface uiInterface; std::string strWalletFileName; bool fConfChange; unsigned int nNodeLifespan; -unsigned int nMinerSleep; bool fUseFastIndex; -bool fUseFastStakeMiner; bool fUseMemoryLog; enum Checkpoints::CPMode CheckpointsMode; // Ping and address broadcast intervals extern int64_t nPingInterval; -extern int64_t nBroadcastInterval; +extern int64_t nReserveBalance; ////////////////////////////////////////////////////////////////////////////// // @@ -82,10 +80,11 @@ void Shutdown(void* parg) fTaken = true; } } - static bool fExit; + volatile static bool fExit; if (fFirstThread) { fShutdown = true; + fRequestShutdown = true; nTransactionsUpdated++; // CTxDB().Close(); bitdb.Flush(false); @@ -190,12 +189,11 @@ bool AppInit(int argc, char* argv[]) extern void noui_connect(); int main(int argc, char* argv[]) { - bool fRet = false; // Connect bitcoind signal handlers noui_connect(); - fRet = AppInit(argc, argv); + bool fRet = AppInit(argc, argv); if (fRet && fDaemon) return 0; @@ -241,9 +239,9 @@ std::string HelpMessage() " -dbcache= " + _("Set database cache size in megabytes (default: 25)") + "\n" + " -dblogsize= " + _("Set database disk log size in megabytes (default: 100)") + "\n" + " -timeout= " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" + - " -proxy= " + _("Connect through socks proxy") + "\n" + - " -socks= " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" + + " -proxy= " + _("Connect through socks5 proxy") + "\n" + " -tor= " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n" + " -torname= " + _("Send the specified hidden service name when connecting to Tor nodes (default: none)") + "\n" " -dns " + _("Allow DNS lookups for -addnode, -seednode and -connect") + "\n" + " -port= " + _("Listen for connections on (default: 7777 or testnet: 17777)") + "\n" + " -maxconnections= " + _("Maintain at most connections to peers (default: 125)") + "\n" + @@ -251,7 +249,7 @@ std::string HelpMessage() " -connect= " + _("Connect only to the specified node(s)") + "\n" + " -seednode= " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n" + " -externalip= " + _("Specify your own public address") + "\n" + - " -onlynet= " + _("Only connect to nodes in network (IPv4, IPv6 or Tor)") + "\n" + + " -onlynet= " + _("Only connect to nodes in network (IPv4, IPv6 or Onion)") + "\n" + " -discover " + _("Discover own IP address (default: 1 when listening and no -externalip)") + "\n" + " -irc " + _("Find peers using internet relay chat (default: 1)") + "\n" + " -listen " + _("Accept connections from outside (default: 1 if no -proxy or -connect)") + "\n" + @@ -262,21 +260,14 @@ 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" + -#ifdef USE_UPNP -#if USE_UPNP - " -upnp " + _("Use UPnP to map the listening port (default: 1 when listening)") + "\n" + -#else - " -upnp " + _("Use UPnP to map the listening port (default: 0)") + "\n" + -#endif -#endif " -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" + + " -memorylog " + _("Use in-memory logging for block index database (default: 1)") + "\n" + #endif " -paytxfee= " + _("Fee per KB to add to transactions you send") + "\n" + - " -mininput= " + str(boost::format(_("When creating transactions, ignore inputs with value less than this (default: %s)")) % FormatMoney(MIN_TXOUT_AMOUNT)) + "\n" + + " -mininput= " + ((string)("When creating transactions, ignore inputs with value less than this (default: ") + FormatMoney(MIN_TXOUT_AMOUNT) + ")") + "\n" + #ifdef QT_GUI " -server " + _("Accept command line and JSON-RPC commands") + "\n" + #endif @@ -299,12 +290,14 @@ std::string HelpMessage() " -rpcconnect= " + _("Send commands to node running on (default: 127.0.0.1)") + "\n" + " -blocknotify= " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" + " -walletnotify= " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" + + " -peercollector= " + _("Execute command to collect peer addresses") + "\n" + " -confchange " + _("Require a confirmations for change (default: 0)") + "\n" + " -upgradewallet " + _("Upgrade wallet to latest format") + "\n" + " -keypool= " + _("Set key pool size to (default: 100)") + "\n" + " -rescan " + _("Rescan the block chain for missing wallet transactions") + "\n" + + " -zapwallettxes " + _("Clear list of wallet transactions (diagnostic tool; implies -rescan)") + "\n" + " -salvagewallet " + _("Attempt to recover private keys from a corrupt wallet.dat") + "\n" + - " -checkblocks= " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" + + " -checkblocks= " + _("How many blocks to check at startup (default: 192, 0 = all)") + "\n" + " -checklevel= " + _("How thorough the block verification is (0-6, default: 1)") + "\n" + " -par=N " + _("Set the number of script verification threads (1-16, 0=auto, default: 0)") + "\n" + " -loadblock= " + _("Imports blocks from external blk000?.dat file") + "\n" + @@ -323,9 +316,39 @@ std::string HelpMessage() return strUsage; } -/** Initialize bitcoin. - * @pre Parameters should be parsed and config file should be read. - */ +bool DropBlockIndex() +{ + try + { +#ifdef USE_LEVELDB + filesystem::path directory = GetDataDir() / "txleveldb"; + filesystem::remove_all(directory); // remove directory +#else + filesystem::path indexFile = GetDataDir() / "blkindex.dat"; + filesystem::remove(indexFile); // remove index file +#endif + + unsigned int nFile = 1; + for ( ; ; ) + { + filesystem::path strBlockFile = GetDataDir() / strprintf("blk%04u.dat", nFile); + // Break if no such file + if( !filesystem::exists( strBlockFile ) ) + break; + filesystem::remove(strBlockFile); + nFile++; + } + return true; + } + catch(const std::exception&) + { + // TODO: report error here + return false; + } +} + +// Initialize bitcoin. +// @pre Parameters should be parsed and config file should be read. bool AppInit2() { // ********************************************************* Step 1: setup @@ -350,6 +373,14 @@ bool AppInit2() typedef BOOL (WINAPI *PSETPROCDEPPOL)(DWORD); PSETPROCDEPPOL setProcDEPPol = (PSETPROCDEPPOL)GetProcAddress(GetModuleHandleA("Kernel32.dll"), "SetProcessDEPPolicy"); if (setProcDEPPol != NULL) setProcDEPPol(PROCESS_DEP_ENABLE); + + // Initialize Windows Sockets + WSADATA wsadata; + int ret = WSAStartup(MAKEWORD(2,2), &wsadata); + if (ret != NO_ERROR) + { + return InitError(strprintf("Error: TCP/IP socket library failed to start (WSAStartup returned error %d)", ret)); + } #endif #ifndef WIN32 umask(077); @@ -372,29 +403,26 @@ bool AppInit2() // ********************************************************* Step 2: parameter interactions - nNodeLifespan = GetArg("-addrlifespan", 7); + nNodeLifespan = GetArgUInt("-addrlifespan", 7); fUseFastIndex = GetBoolArg("-fastindex", true); fUseMemoryLog = GetBoolArg("-memorylog", true); - nMinerSleep = GetArg("-minersleep", 500); // Ping and address broadcast intervals nPingInterval = max(10 * 60, GetArg("-keepalive", 30 * 60)); - nBroadcastInterval = max(6 * 60 * 60, GetArg("-addrsetlifetime", 24 * 60 * 60)); - - CheckpointsMode = Checkpoints::STRICT; - std::string strCpMode = GetArg("-cppolicy", "strict"); + CheckpointsMode = Checkpoints::CP_STRICT; + auto strCpMode = GetArg("-cppolicy", "strict"); if(strCpMode == "strict") { - CheckpointsMode = Checkpoints::STRICT; + CheckpointsMode = Checkpoints::CP_STRICT; } if(strCpMode == "advisory") { - CheckpointsMode = Checkpoints::ADVISORY; + CheckpointsMode = Checkpoints::CP_ADVISORY; } if(strCpMode == "permissive") { - CheckpointsMode = Checkpoints::PERMISSIVE; + CheckpointsMode = Checkpoints::CP_PERMISSIVE; } fTestNet = GetBoolArg("-testnet"); @@ -421,7 +449,6 @@ bool AppInit2() if (!GetBoolArg("-listen", true)) { // do not map ports or try to retrieve public IP when not listening (pointless) - SoftSetBoolArg("-upnp", false); SoftSetBoolArg("-discover", false); } @@ -435,10 +462,16 @@ bool AppInit2() SoftSetBoolArg("-rescan", true); } + if (GetBoolArg("-zapwallettxes", false)) { + // -zapwallettx implies a rescan + if (SoftSetBoolArg("-rescan", true)) + printf("AppInit2 : parameter interaction: -zapwallettxes=1 -> setting -rescan=1\n"); + } + // ********************************************************* Step 3: parameter-to-internal-flags // -par=0 means autodetect, but nScriptCheckThreads==0 means no concurrency - nScriptCheckThreads = GetArg("-par", 0); + nScriptCheckThreads = GetArgInt("-par", 0); if (nScriptCheckThreads == 0) nScriptCheckThreads = boost::thread::hardware_concurrency(); if (nScriptCheckThreads <= 1) @@ -477,17 +510,13 @@ bool AppInit2() if (mapArgs.count("-timeout")) { - int nNewTimeout = 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(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")) { @@ -507,7 +536,7 @@ bool AppInit2() // ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log - std::string strDataDir = GetDataDir().string(); + auto strDataDir = GetDataDir().string(); strWalletFileName = GetArg("-wallet", "wallet.dat"); // strWalletFileName must be a plain filename without a directory @@ -553,7 +582,6 @@ bool AppInit2() printf("Startup time: %s\n", DateTimeStrFormat("%x %H:%M:%S", GetTime()).c_str()); printf("Default data directory %s\n", GetDefaultDataDir().string().c_str()); printf("Used data directory %s\n", strDataDir.c_str()); - std::ostringstream strErrors; if (fDaemon) fprintf(stdout, "NovaCoin server starting\n"); @@ -564,8 +592,6 @@ bool AppInit2() NewThread(ThreadScriptCheck, NULL); } - int64_t nStart; - // ********************************************************* Step 5: verify database integrity uiInterface.InitMessage(_("Verifying database integrity...")); @@ -602,14 +628,9 @@ bool AppInit2() // ********************************************************* Step 6: network initialization - int nSocksVersion = GetArg("-socks", 5); - - if (nSocksVersion != 4 && nSocksVersion != 5) - return InitError(strprintf(_("Unknown -socks proxy version requested: %i"), nSocksVersion)); - if (mapArgs.count("-onlynet")) { std::set nets; - BOOST_FOREACH(std::string snet, mapMultiArgs["-onlynet"]) { + for(std::string snet : mapMultiArgs["-onlynet"]) { enum Network net = ParseNetwork(snet); if (net == NET_UNROUTABLE) return InitError(strprintf(_("Unknown network specified in -onlynet: '%s'"), snet.c_str())); @@ -631,19 +652,17 @@ bool AppInit2() 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 (!IsLimited(NET_IPV4)) - SetProxy(NET_IPV4, addrProxy, nSocksVersion); - if (nSocksVersion > 4) { + SetProxy(NET_IPV4, addrProxy); #ifdef USE_IPV6 if (!IsLimited(NET_IPV6)) - SetProxy(NET_IPV6, addrProxy, nSocksVersion); + SetProxy(NET_IPV6, addrProxy); #endif - SetNameProxy(addrProxy, nSocksVersion); - } + SetNameProxy(addrProxy); fProxy = true; } @@ -653,27 +672,32 @@ bool AppInit2() 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); + SetProxy(NET_TOR, addrOnion); SetReachable(NET_TOR); } // see Step 2: parameter interactions for more information about these - fNoListen = !GetBoolArg("-listen", true); - fDiscover = GetBoolArg("-discover", true); - fNameLookup = GetBoolArg("-dns", true); -#ifdef USE_UPNP - fUseUPnP = GetBoolArg("-upnp", USE_UPNP); -#endif + if (!IsLimited(NET_IPV4) || !IsLimited(NET_IPV6)) + { + fNoListen = !GetBoolArg("-listen", true); + fDiscover = GetBoolArg("-discover", true); + fNameLookup = GetBoolArg("-dns", true); + } else { + // Don't listen, discover addresses or search for nodes if IPv4 and IPv6 networking is disabled. + fNoListen = true; + fDiscover = fNameLookup = false; + SoftSetBoolArg("-irc", false); + SoftSetBoolArg("-dnsseed", false); + } bool fBound = false; if (!fNoListen) { - std::string strError; if (mapArgs.count("-bind")) { - BOOST_FOREACH(std::string strBind, mapMultiArgs["-bind"]) { + for(std::string strBind : mapMultiArgs["-bind"]) { CService addrBind; if (!Lookup(strBind.c_str(), addrBind, GetListenPort(), false)) return InitError(strprintf(_("Cannot resolve -bind address: '%s'"), strBind.c_str())); @@ -688,14 +712,30 @@ bool AppInit2() #endif if (!IsLimited(NET_IPV4)) fBound |= Bind(CService(inaddr_any, GetListenPort()), !fBound); + } if (!fBound) return InitError(_("Failed to listen on any port. Use -listen=0 if you want this.")); } + // If Tor is reachable then listen on loopback interface, + // to allow allow other users reach you through the hidden service + if (!IsLimited(NET_TOR) && mapArgs.count("-torname")) { + std::string strError; + struct in_addr inaddr_loopback; + inaddr_loopback.s_addr = htonl(INADDR_LOOPBACK); + +#ifdef USE_IPV6 + if (!BindListenPort(CService(in6addr_loopback, GetListenPort()), strError)) + return InitError(strError); +#endif + if (!BindListenPort(CService(inaddr_loopback, GetListenPort()), strError)) + return InitError(strError); + } + if (mapArgs.count("-externalip")) { - BOOST_FOREACH(string strAddr, mapMultiArgs["-externalip"]) { + for(string strAddr : mapMultiArgs["-externalip"]) { CService addrLocal(strAddr, GetListenPort(), fNameLookup); if (!addrLocal.IsValid()) return InitError(strprintf(_("Cannot resolve -externalip address: '%s'"), strAddr.c_str())); @@ -705,7 +745,6 @@ bool AppInit2() if (mapArgs.count("-reservebalance")) // ppcoin: reserve balance amount { - int64_t nReserveBalance = 0; if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance)) { InitError(_("Invalid amount for -reservebalance=")); @@ -719,7 +758,7 @@ bool AppInit2() InitError(_("Unable to sign checkpoint, wrong checkpointkey?\n")); } - BOOST_FOREACH(string strDest, mapMultiArgs["-seednode"]) + for(string strDest : mapMultiArgs["-seednode"]) AddOneShot(strDest); // ********************************************************* Step 7: load blockchain @@ -740,12 +779,37 @@ bool AppInit2() return false; } - uiInterface.InitMessage(_("Loading block index...")); + printf("Loading block index...\n"); - nStart = GetTimeMillis(); - if (!LoadBlockIndex()) - return InitError(_("Error loading blkindex.dat")); + bool fLoaded = false; + int64_t nStart; + while (!fLoaded) { + std::string strLoadError; + uiInterface.InitMessage(_("Loading block index...")); + nStart = GetTimeMillis(); + do { + try { + UnloadBlockIndex(); + + if (!LoadBlockIndex()) { + strLoadError = _("Error loading block database"); + break; + } + } catch(const std::exception&) { + strLoadError = _("Error opening block database"); + break; + } + + fLoaded = true; + } while(false); + + if (!fLoaded) { + DropBlockIndex(); + // TODO: suggest reindex here + return InitError(strLoadError); + } + } // as LoadBlockIndex can take several minutes, it's possible the user // requested to kill bitcoin-qt during the last operation. If so, exit. @@ -765,14 +829,14 @@ bool AppInit2() if (mapArgs.count("-printblock")) { - string strMatch = mapArgs["-printblock"]; + auto 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) + auto hash = (*mi).first; + if (strMatch.compare(hash.ToString()) == 0) { - CBlockIndex* pindex = (*mi).second; + auto pindex = (*mi).second; CBlock block; block.ReadFromDisk(pindex); block.BuildMerkleTree(); @@ -788,9 +852,23 @@ bool AppInit2() // ********************************************************* Step 8: load wallet + if (GetBoolArg("-zapwallettxes", false)) { + uiInterface.InitMessage(_("Zapping all transactions from wallet...")); + + pwalletMain = new CWallet(strWalletFileName); + DBErrors nZapWalletRet = pwalletMain->ZapWalletTx(); + if (nZapWalletRet != DB_LOAD_OK) { + uiInterface.InitMessage(_("Error loading wallet.dat: Wallet corrupted")); + return false; + } + delete pwalletMain; + pwalletMain = NULL; + } + uiInterface.InitMessage(_("Loading wallet...")); printf("Loading wallet...\n"); nStart = GetTimeMillis(); + std::ostringstream strErrors; bool fFirstRun = true; pwalletMain = new CWallet(strWalletFileName); DBErrors nLoadWalletRet = pwalletMain->LoadWallet(fFirstRun); @@ -818,7 +896,7 @@ bool AppInit2() if (GetBoolArg("-upgradewallet", fFirstRun)) { - int nMaxVersion = 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); @@ -843,6 +921,13 @@ bool AppInit2() pwalletMain->SetDefaultKey(newDefaultKey); if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), "")) strErrors << _("Cannot write default address") << "\n"; + + auto keyView = pwalletMain->GenerateNewMalleableKey(); + CMalleableKey mKey; + if (!pwalletMain->GetMalleableKey(keyView, mKey)) + strErrors << _("Unable to generate new malleable key"); + if (!pwalletMain->SetAddressBookName(CBitcoinAddress(keyView.GetMalleablePubKey()), "")) + strErrors << _("Cannot write default address") << "\n"; } printf("%s", strErrors.str().c_str()); @@ -875,11 +960,11 @@ bool AppInit2() { uiInterface.InitMessage(_("Importing blockchain data file.")); - BOOST_FOREACH(string strFile, mapMultiArgs["-loadblock"]) + for(string strFile : mapMultiArgs["-loadblock"]) { FILE *file = fopen(strFile.c_str(), "rb"); if (file) - LoadExternalBlockFile(file); + LoadExternalBlockFile(file, uiInterface); } StartShutdown(); } @@ -891,7 +976,7 @@ bool AppInit2() FILE *file = fopen(pathBootstrap.string().c_str(), "rb"); if (file) { filesystem::path pathBootstrapOld = GetDataDir() / "bootstrap.dat.old"; - LoadExternalBlockFile(file); + LoadExternalBlockFile(file, uiInterface); RenameOver(pathBootstrap, pathBootstrapOld); } } @@ -931,7 +1016,11 @@ bool AppInit2() if (fServer) NewThread(ThreadRPCServer, NULL); - // ********************************************************* Step 12: finished + // ********************************************************* Step 13: IP collection thread + strCollectorCommand = GetArg("-peercollector", ""); + if (!fTestNet && strCollectorCommand != "") + NewThread(ThreadIPCollector, NULL); + // ********************************************************* Step 14: finished uiInterface.InitMessage(_("Done loading")); printf("Done loading\n"); @@ -945,7 +1034,7 @@ bool AppInit2() #if !defined(QT_GUI) // Loop until process is exit()ed from shutdown() function, // called from ThreadRPCServer thread when a "stop" command is received. - while (1) + for ( ; ; ) Sleep(5000); #endif