#include "net.h"
#include "init.h"
#include "util.h"
+#include "ipcollector.h"
#include "ui_interface.h"
#include "checkpoints.h"
-#include "zerocoin/ZeroTest.h"
+#include <boost/format.hpp>
#include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
#include <boost/filesystem/convenience.hpp>
CWallet* pwalletMain;
CClientUIInterface uiInterface;
std::string strWalletFileName;
+bool fConfChange;
unsigned int nNodeLifespan;
-unsigned int nDerivationMethodIndex;
+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;
+
//////////////////////////////////////////////////////////////////////////////
//
// Shutdown
static bool fTaken;
// Make this thread recognisable as the shutdown thread
- RenameThread("bitcoin-shutoff");
+ RenameThread("novacoin-shutoff");
bool fFirstThread = false;
{
if (fFirstThread)
{
fShutdown = true;
+ fRequestShutdown = true;
nTransactionsUpdated++;
// CTxDB().Close();
bitdb.Flush(false);
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;
" -conf=<file> " + _("Specify configuration file (default: novacoin.conf)") + "\n" +
" -pid=<file> " + _("Specify pid file (default: novacoind.pid)") + "\n" +
" -datadir=<dir> " + _("Specify data directory") + "\n" +
- " -wallet=<dir> " + _("Specify wallet file (within data directory)") + "\n" +
+ " -wallet=<file> " + _("Specify wallet file (within data directory)") + "\n" +
" -dbcache=<n> " + _("Set database cache size in megabytes (default: 25)") + "\n" +
" -dblogsize=<n> " + _("Set database disk log size in megabytes (default: 100)") + "\n" +
" -timeout=<n> " + _("Specify connection timeout in milliseconds (default: 5000)") + "\n" +
" -proxy=<ip:port> " + _("Connect through socks proxy") + "\n" +
" -socks=<n> " + _("Select the version of socks proxy to use (4-5, default: 5)") + "\n" +
" -tor=<ip:port> " + _("Use proxy to reach tor hidden services (default: same as -proxy)") + "\n"
+ " -torname=<host.onion> " + _("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=<port> " + _("Listen for connections on <port> (default: 7777 or testnet: 17777)") + "\n" +
" -maxconnections=<n> " + _("Maintain at most <n> connections to peers (default: 125)") + "\n" +
" -connect=<ip> " + _("Connect only to the specified node(s)") + "\n" +
" -seednode=<ip> " + _("Connect to a node to retrieve peer addresses, and disconnect") + "\n" +
" -externalip=<ip> " + _("Specify your own public address") + "\n" +
- " -onlynet=<net> " + _("Only connect to nodes in network <net> (IPv4, IPv6 or Tor)") + "\n" +
+ " -onlynet=<net> " + _("Only connect to nodes in network <net> (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" +
" -bind=<addr> " + _("Bind to given address. Use [host]:port notation for IPv6") + "\n" +
" -dnsseed " + _("Find peers using DNS lookup (default: 1)") + "\n" +
" -cppolicy " + _("Sync checkpoints policy (default: strict)") + "\n" +
- " -stakepooledkeys " + _("Use pooled pubkeys for the last coinstake output (default: 0)") + "\n" +
- " -derivationmethod " + _("Which key derivation method to use by default (default: sha512)") + "\n" +
" -banscore=<n> " + _("Threshold for disconnecting misbehaving peers (default: 100)") + "\n" +
" -bantime=<n> " + _("Number of seconds to keep misbehaving peers from reconnecting (default: 86400)") + "\n" +
" -maxreceivebuffer=<n> " + _("Maximum per-connection receive buffer, <n>*1000 bytes (default: 5000)") + "\n" +
" -maxsendbuffer=<n> " + _("Maximum per-connection send buffer, <n>*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" +
+#endif
+
" -paytxfee=<amt> " + _("Fee per KB to add to transactions you send") + "\n" +
+ " -mininput=<amt> " + str(boost::format(_("When creating transactions, ignore inputs with value less than this (default: %s)")) % FormatMoney(MIN_TXOUT_AMOUNT)) + "\n" +
#ifdef QT_GUI
" -server " + _("Accept command line and JSON-RPC commands") + "\n" +
#endif
" -rpcconnect=<ip> " + _("Send commands to node running on <ip> (default: 127.0.0.1)") + "\n" +
" -blocknotify=<cmd> " + _("Execute command when the best block changes (%s in cmd is replaced by block hash)") + "\n" +
" -walletnotify=<cmd> " + _("Execute command when a wallet transaction changes (%s in cmd is replaced by TxID)") + "\n" +
+ " -peercollector=<cmd> " + _("Execute command to collect peer addresses") + "\n" +
+ " -confchange " + _("Require a confirmations for change (default: 0)") + "\n" +
" -upgradewallet " + _("Upgrade wallet to latest format") + "\n" +
" -keypool=<n> " + _("Set key pool size to <n> (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=<n> " + _("How many blocks to check at startup (default: 2500, 0 = all)") + "\n" +
" -checklevel=<n> " + _("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=<file> " + _("Imports blocks from external blk000?.dat file") + "\n" +
"\n" + _("Block creation options:") + "\n" +
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);
// ********************************************************* Step 2: parameter interactions
- nNodeLifespan = GetArg("-addrlifespan", 7);
- fStakeUsePooledKeys = GetBoolArg("-stakepooledkeys", false);
+ nNodeLifespan = GetArgUInt("-addrlifespan", 7);
+ fUseFastIndex = GetBoolArg("-fastindex", true);
+ fUseMemoryLog = GetBoolArg("-memorylog", true);
+
+ // Ping and address broadcast intervals
+ nPingInterval = max<int64_t>(10 * 60, GetArg("-keepalive", 30 * 60));
+ nBroadcastInterval = max<int64_t>(6 * nOneHour, GetArg("-addrsetlifetime", nOneDay));
CheckpointsMode = Checkpoints::STRICT;
std::string strCpMode = GetArg("-cppolicy", "strict");
- if(strCpMode == "strict")
+ if(strCpMode == "strict") {
CheckpointsMode = Checkpoints::STRICT;
+ }
- if(strCpMode == "advisory")
+ if(strCpMode == "advisory") {
CheckpointsMode = Checkpoints::ADVISORY;
+ }
- if(strCpMode == "permissive")
+ if(strCpMode == "permissive") {
CheckpointsMode = Checkpoints::PERMISSIVE;
-
- if(GetArg("-derivationmethod", "sha512") == "scrypt+sha512")
- nDerivationMethodIndex = 1;
+ }
fTestNet = GetBoolArg("-testnet");
if (fTestNet) {
if (!GetBoolArg("-listen", true)) {
// do not map ports or try to retrieve public IP when not listening (pointless)
- SoftSetBoolArg("-upnp", false);
SoftSetBoolArg("-discover", false);
}
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 = GetArgInt("-par", 0);
+ if (nScriptCheckThreads == 0)
+ nScriptCheckThreads = boost::thread::hardware_concurrency();
+ if (nScriptCheckThreads <= 1)
+ nScriptCheckThreads = 0;
+ else if (nScriptCheckThreads > MAX_SCRIPTCHECK_THREADS)
+ nScriptCheckThreads = MAX_SCRIPTCHECK_THREADS;
+
fDebug = GetBoolArg("-debug");
// -debug implies fDebug*
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<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"))
{
InitWarning(_("Warning: -paytxfee is set very high! This is the transaction fee you will pay if you send a transaction."));
}
+ fConfChange = GetBoolArg("-confchange", false);
+
+ if (mapArgs.count("-mininput"))
+ {
+ if (!ParseMoney(mapArgs["-mininput"], nMinimumInputValue))
+ return InitError(strprintf(_("Invalid amount for -mininput=<amount>: '%s'"), mapArgs["-mininput"].c_str()));
+ }
+
// ********************************************************* Step 4: application initialization: dir lock, daemonize, pidfile, debug log
std::string strDataDir = GetDataDir().string();
- std::string strWalletFileName = GetArg("-wallet", "wallet.dat");
+ strWalletFileName = GetArg("-wallet", "wallet.dat");
// strWalletFileName must be a plain filename without a directory
if (strWalletFileName != boost::filesystem::basename(strWalletFileName) + boost::filesystem::extension(strWalletFileName))
if (fDaemon)
fprintf(stdout, "NovaCoin server starting\n");
- int64 nStart;
+ if (nScriptCheckThreads) {
+ printf("Using %u threads for script verification\n", nScriptCheckThreads);
+ for (int i=0; i<nScriptCheckThreads-1; i++)
+ NewThread(ThreadScriptCheck, NULL);
+ }
+
+ int64_t nStart;
// ********************************************************* Step 5: verify database integrity
// ********************************************************* Step 6: network initialization
- int nSocksVersion = 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);
}
// 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)
#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"]) {
if (mapArgs.count("-reservebalance")) // ppcoin: reserve balance amount
{
- int64 nReserveBalance = 0;
if (!ParseMoney(mapArgs["-reservebalance"], nReserveBalance))
{
InitError(_("Invalid amount for -reservebalance=<amount>"));
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;
+ 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) {
+ // 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.
printf("Shutdown requested. Exiting.\n");
return false;
}
- printf(" block index %15"PRI64d"ms\n", GetTimeMillis() - nStart);
+ printf(" block index %15" PRId64 "ms\n", GetTimeMillis() - nStart);
if (GetBoolArg("-printblockindex") || GetBoolArg("-printblocktree"))
{
return false;
}
- // ********************************************************* Testing Zerocoin
+ // ********************************************************* Step 8: load wallet
+ if (GetBoolArg("-zapwallettxes", false)) {
+ uiInterface.InitMessage(_("Zapping all transactions from wallet..."));
- if (GetBoolArg("-zerotest", false))
- {
- printf("\n=== ZeroCoin tests start ===\n");
- Test_RunAllTests();
- printf("=== ZeroCoin tests end ===\n\n");
+ 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;
}
- // ********************************************************* Step 8: load wallet
-
uiInterface.InitMessage(_("Loading wallet..."));
printf("Loading wallet...\n");
nStart = GetTimeMillis();
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);
pwalletMain->SetDefaultKey(newDefaultKey);
if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
strErrors << _("Cannot write default address") << "\n";
+
+ CMalleableKeyView 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());
- printf(" wallet %15"PRI64d"ms\n", GetTimeMillis() - nStart);
+ printf(" wallet %15" PRId64 "ms\n", GetTimeMillis() - nStart);
RegisterWallet(pwalletMain);
printf("Rescanning last %i blocks (from block %i)...\n", pindexBest->nHeight - pindexRescan->nHeight, pindexRescan->nHeight);
nStart = GetTimeMillis();
pwalletMain->ScanForWalletTransactions(pindexRescan, true);
- printf(" rescan %15"PRI64d"ms\n", GetTimeMillis() - nStart);
+ printf(" rescan %15" PRId64 "ms\n", GetTimeMillis() - nStart);
}
// ********************************************************* Step 9: import blocks
if (file)
LoadExternalBlockFile(file);
}
- exit(0);
+ StartShutdown();
}
filesystem::path pathBootstrap = GetDataDir() / "bootstrap.dat";
printf("Invalid or missing peers.dat; recreating\n");
}
- printf("Loaded %i addresses from peers.dat %"PRI64d"ms\n",
+ printf("Loaded %i addresses from peers.dat %" PRId64 "ms\n",
addrman.size(), GetTimeMillis() - nStart);
// ********************************************************* Step 11: start node
RandAddSeedPerfmon();
//// debug print
- printf("mapBlockIndex.size() = %"PRIszu"\n", mapBlockIndex.size());
+ printf("mapBlockIndex.size() = %" PRIszu "\n", mapBlockIndex.size());
printf("nBestHeight = %d\n", nBestHeight);
- printf("setKeyPool.size() = %"PRIszu"\n", pwalletMain->setKeyPool.size());
- printf("mapWallet.size() = %"PRIszu"\n", pwalletMain->mapWallet.size());
- printf("mapAddressBook.size() = %"PRIszu"\n", pwalletMain->mapAddressBook.size());
+ printf("setKeyPool.size() = %" PRIszu "\n", pwalletMain->setKeyPool.size());
+ printf("mapWallet.size() = %" PRIszu "\n", pwalletMain->mapWallet.size());
+ printf("mapAddressBook.size() = %" PRIszu "\n", pwalletMain->mapAddressBook.size());
if (!NewThread(StartNode, NULL))
InitError(_("Error: could not start node"));
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");
#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
git://git.novaco.in / novacoin.git / blobdiff