// Ping and address broadcast intervals
extern int64_t nPingInterval;
-extern int64_t nBroadcastInterval;
extern int64_t nReserveBalance;
//////////////////////////////////////////////////////////////////////////////
fTaken = true;
}
}
- static bool fExit;
+ volatile static bool fExit;
if (fFirstThread)
{
fShutdown = true;
" -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" +
+ " -checkblocks=<n> " + _("How many blocks to check at startup (default: 192, 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" +
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
// 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");
+ 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");
// ********************************************************* 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
if (mapArgs.count("-onlynet")) {
std::set<enum Network> 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()));
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()));
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()));
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
} while(false);
if (!fLoaded) {
+ DropBlockIndex();
// TODO: suggest reindex here
return InitError(strLoadError);
}
if (mapArgs.count("-printblock"))
{
- string strMatch = mapArgs["-printblock"];
+ auto strMatch = mapArgs["-printblock"];
int nFound = 0;
- for (map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi)
+ for (auto mi = mapBlockIndex.begin(); mi != mapBlockIndex.end(); ++mi)
{
- uint256 hash = (*mi).first;
+ auto hash = (*mi).first;
if (strncmp(hash.ToString().c_str(), strMatch.c_str(), strMatch.size()) == 0)
{
- CBlockIndex* pindex = (*mi).second;
+ auto pindex = (*mi).second;
CBlock block;
block.ReadFromDisk(pindex);
block.BuildMerkleTree();
if (!pwalletMain->SetAddressBookName(pwalletMain->vchDefaultKey.GetID(), ""))
strErrors << _("Cannot write default address") << "\n";
- CMalleableKeyView keyView = pwalletMain->GenerateNewMalleableKey();
+ auto keyView = pwalletMain->GenerateNewMalleableKey();
CMalleableKey mKey;
if (!pwalletMain->GetMalleableKey(keyView, mKey))
strErrors << _("Unable to generate new malleable key");
{
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();
}
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);
}
}