#include "net.h"
#include "init.h"
#include "util.h"
+#include "ipcollector.h"
#include "ui_interface.h"
#include "checkpoints.h"
#include <boost/format.hpp>
// Ping and address broadcast intervals
extern int64_t nPingInterval;
-extern int64_t nBroadcastInterval;
extern int64_t nReserveBalance;
//////////////////////////////////////////////////////////////////////////////
" -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" +
// ********************************************************* Step 2: parameter interactions
- nNodeLifespan = (unsigned int)(GetArg("-addrlifespan", 7));
+ 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");
strLoadError = _("Error loading block database");
break;
}
- } catch(std::exception &e) {
- (void)e;
+ } catch(const std::exception&) {
strLoadError = _("Error opening block database");
break;
}
if (!pwalletMain->GetKeyFromPool(newDefaultKey, false))
strErrors << _("Cannot initialize keypool") << "\n";
pwalletMain->SetDefaultKey(newDefaultKey);
- if (!pwalletMain->SetAddressBookName(CBitcoinAddress(pwalletMain->vchDefaultKey.GetID()), ""))
+ 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";
}
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