using namespace std;
using namespace boost;
-leveldb::DB *txdb;
+leveldb::DB *txdb; // global pointer for LevelDB object instance
static leveldb::Options GetOptions() {
leveldb::Options options;
- int nCacheSizeMB = GetArg("-dbcache", 25);
+ int nCacheSizeMB = GetArgInt("-dbcache", 25);
options.block_cache = leveldb::NewLRUCache(nCacheSizeMB * 1048576);
- options.filter_policy = leveldb::NewBloomFilterPolicy(10);
+ options.filter_policy = leveldb::NewBloomFilterPolicy(10);
return options;
}
-void MakeMockTXDB() {
- leveldb::Options options = GetOptions();
- options.create_if_missing = true;
- // This will leak but don't care here.
- options.env = leveldb::NewMemEnv(leveldb::Env::Default());
- leveldb::Status status = leveldb::DB::Open(options, "txdb", &txdb);
- if (!status.ok())
- throw runtime_error(strprintf("Could not create mock LevelDB: %s", status.ToString().c_str()));
- CTxDB txdb("w");
- txdb.WriteVersion(CLIENT_VERSION);
-}
-
-// NOTE: CDB subclasses are created and destroyed VERY OFTEN. Therefore we have
-// to keep databases in global variables to avoid constantly creating and
-// destroying them, which sucks. In future the code should be changed to not
-// treat the instantiation of a database as a free operation.
+// CDB subclasses are created and destroyed VERY OFTEN. That's why
+// we shouldn't treat this as a free operations.
CTxDB::CTxDB(const char* pszMode)
{
assert(pszMode);
- pdb = txdb;
activeBatch = NULL;
fReadOnly = (!strchr(pszMode, '+') && !strchr(pszMode, 'w'));
- if (txdb)
+ if (txdb) {
+ pdb = txdb;
return;
+ }
// First time init.
filesystem::path directory = GetDataDir() / "txleveldb";
WriteVersion(CLIENT_VERSION);
fReadOnly = fTmp;
}
- printf("Opened LevelDB sucessfully\n");
+
+ printf("Opened LevelDB successfully\n");
}
void CTxDB::Close()
assert(!fClient);
// Add to tx index
- uint256 hash = tx.GetHash();
+ auto hash = tx.GetHash();
CTxIndex txindex(pos, tx.vout.size());
return Write(make_pair(string("tx"), hash), txindex);
}
bool CTxDB::EraseTxIndex(const CTransaction& tx)
{
assert(!fClient);
- uint256 hash = tx.GetHash();
+ auto hash = tx.GetHash();
return Erase(make_pair(string("tx"), hash));
}
return Write(string("strCheckpointPubKey"), strPubKey);
}
+bool CTxDB::ReadModifierUpgradeTime(unsigned int& nUpgradeTime)
+{
+ return Read(string("nUpgradeTime"), nUpgradeTime);
+}
+
+bool CTxDB::WriteModifierUpgradeTime(const unsigned int& nUpgradeTime)
+{
+ return Write(string("nUpgradeTime"), nUpgradeTime);
+}
+
static CBlockIndex *InsertBlockIndex(uint256 hash)
{
if (hash == 0)
return NULL;
// Return existing
- map<uint256, CBlockIndex*>::iterator mi = mapBlockIndex.find(hash);
+ auto mi = mapBlockIndex.find(hash);
if (mi != mapBlockIndex.end())
return (*mi).second;
// Create new
- CBlockIndex* pindexNew = new CBlockIndex();
+ auto pindexNew = new(nothrow) CBlockIndex();
if (!pindexNew)
throw runtime_error("LoadBlockIndex() : new CBlockIndex failed");
mi = mapBlockIndex.insert(make_pair(hash, pindexNew)).first;
CDiskBlockIndex diskindex;
ssValue >> diskindex;
+ auto blockHash = diskindex.GetBlockHash();
+
// Construct block index object
- CBlockIndex* pindexNew = InsertBlockIndex(diskindex.GetBlockHash());
+ CBlockIndex* pindexNew = InsertBlockIndex(blockHash);
pindexNew->pprev = InsertBlockIndex(diskindex.hashPrev);
pindexNew->pnext = InsertBlockIndex(diskindex.hashNext);
pindexNew->nFile = diskindex.nFile;
pindexNew->nNonce = diskindex.nNonce;
// Watch for genesis block
- if (pindexGenesisBlock == NULL && diskindex.GetBlockHash() == hashGenesisBlock)
+ if (pindexGenesisBlock == NULL && blockHash == (!fTestNet ? hashGenesisBlock : hashGenesisBlockTestNet))
pindexGenesisBlock = pindexNew;
if (!pindexNew->CheckIndex()) {
// Calculate nChainTrust
vector<pair<int, CBlockIndex*> > vSortedByHeight;
vSortedByHeight.reserve(mapBlockIndex.size());
- BOOST_FOREACH(const PAIRTYPE(uint256, CBlockIndex*)& item, mapBlockIndex)
+ for(const auto& item : mapBlockIndex)
{
CBlockIndex* pindex = item.second;
vSortedByHeight.push_back(make_pair(pindex->nHeight, pindex));
}
sort(vSortedByHeight.begin(), vSortedByHeight.end());
- BOOST_FOREACH(const PAIRTYPE(int, CBlockIndex*)& item, vSortedByHeight)
+ for(const auto& item : vSortedByHeight)
{
CBlockIndex* pindex = item.second;
pindex->nChainTrust = (pindex->pprev ? pindex->pprev->nChainTrust : 0) + pindex->GetBlockTrust();
// NovaCoin: calculate stake modifier checksum
pindex->nStakeModifierChecksum = GetStakeModifierChecksum(pindex);
if (!CheckStakeModifierCheckpoints(pindex->nHeight, pindex->nStakeModifierChecksum))
- return error("CTxDB::LoadBlockIndex() : Failed stake modifier checkpoint height=%d, modifier=0x%016"PRI64x, pindex->nHeight, pindex->nStakeModifier);
+ return error("CTxDB::LoadBlockIndex() : Failed stake modifier checkpoint height=%d, modifier=0x%016" PRIx64, pindex->nHeight, pindex->nStakeModifier);
}
// Load hashBestChain pointer to end of best chain
nBestInvalidTrust = bnBestInvalidTrust.getuint256();
// Verify blocks in the best chain
- int nCheckLevel = GetArg("-checklevel", 1);
- int nCheckDepth = GetArg( "-checkblocks", 2500);
+ int nCheckLevel = GetArgInt("-checklevel", 1);
+ int nCheckDepth = GetArgInt( "-checkblocks", 192);
if (nCheckDepth == 0)
nCheckDepth = 1000000000; // suffices until the year 19000
if (nCheckDepth > nBestHeight)
// check level 2: verify transaction index validity
if (nCheckLevel>1)
{
- pair<unsigned int, unsigned int> pos = make_pair(pindex->nFile, pindex->nBlockPos);
+ auto pos = make_pair(pindex->nFile, pindex->nBlockPos);
mapBlockPos[pos] = pindex;
- BOOST_FOREACH(const CTransaction &tx, block.vtx)
+ for(const auto &tx : block.vtx)
{
- uint256 hashTx = tx.GetHash();
+ auto hashTx = tx.GetHash();
CTxIndex txindex;
if (ReadTxIndex(hashTx, txindex))
{
unsigned int nOutput = 0;
if (nCheckLevel>3)
{
- BOOST_FOREACH(const CDiskTxPos &txpos, txindex.vSpent)
+ for(const CDiskTxPos &txpos : txindex.vSpent)
{
if (!txpos.IsNull())
{
- pair<unsigned int, unsigned int> posFind = make_pair(txpos.nFile, txpos.nBlockPos);
+ auto posFind = make_pair(txpos.nFile, txpos.nBlockPos);
if (!mapBlockPos.count(posFind))
{
printf("LoadBlockIndex(): *** found bad spend at %d, hashBlock=%s, hashTx=%s\n", pindex->nHeight, pindex->GetBlockHash().ToString().c_str(), hashTx.ToString().c_str());
else
{
bool fFound = false;
- BOOST_FOREACH(const CTxIn &txin, txSpend.vin)
+ for(const CTxIn &txin : txSpend.vin)
if (txin.prevout.hash == hashTx && txin.prevout.n == nOutput)
fFound = true;
if (!fFound)
// check level 5: check whether all prevouts are marked spent
if (nCheckLevel>4)
{
- BOOST_FOREACH(const CTxIn &txin, tx.vin)
+ for(const CTxIn &txin : tx.vin)
{
CTxIndex txindex;
if (ReadTxIndex(txin.prevout.hash, txindex))
return true;
}
-
-extern bool fDisableSignatureChecking;
-
-static uint64 nTotalBytes;
-static uint64 nTotalBytesCompleted;
-static double nProgressPercent;
-static LevelDBMigrationProgress *callbackTotalOperationProgress;
-
-void MigrationProgress(unsigned int bytesRead) {
- // Called from inside LoadExternalBlockFile with how many bytes were
- // processed so far.
- nTotalBytesCompleted += bytesRead;
- double newProgressPercent = 100.0 * ((double)nTotalBytesCompleted / (double)nTotalBytes);
- // Throttle UI notifications.
- if (newProgressPercent - nProgressPercent < 0.01)
- return;
- nProgressPercent = newProgressPercent;
- printf("LevelDB migration %0.2f%% complete.\n", nProgressPercent);
- (*callbackTotalOperationProgress)(nProgressPercent);
-}
-
-LevelDBMigrationResult MaybeMigrateToLevelDB(LevelDBMigrationProgress &progress) {
- // Check if we have a blkindex.dat: if so, delete it. Because leveldb is
- // more efficient (space-wise) than bdb, this should ensure we have enough
- // disk space to perform the migration. We delete before migrate because if
- // we got here, the code to handle the BDB based block index is not compiled
- // in anymore, so there's no point in keeping the old file around - it's
- // onwards and upwards.
- //
- // The act of replaying would normally append data to the blk data files,
- // but we're reading from them so we don't want that. We disable it here,
- // along with the signature checking as it doesn't help us right now. Note
- // that replaying the chain could b0rk the wallet, but this process takes
- // place before any wallets are registered.
- //
- // TODO(hearn): Assert on lack of a wallet here.
-
- int64 nStart = GetTimeMillis();
-
- boost::filesystem::path oldIndex = GetDataDir() / "blkindex.dat";
- if (!boost::filesystem::exists(oldIndex)) {
- return NONE_NEEDED;
- }
-
- // Check we have enough disk space for migration. We need at least 2GB free
- // to hold the blk file we are migrating, and leveldb may have transient
- // storage spikes, so we ask for at least 3GB.
- uint64 nFreeBytesAvailable = filesystem::space(GetDataDir()).available;
- if (nFreeBytesAvailable < 3UL * 1024UL * 1024UL * 1024UL) {
- return INSUFFICIENT_DISK_SPACE;
- }
-
- printf("Deleting old blkindex.dat to make space for leveldb import.\n");
- boost::filesystem::remove(oldIndex);
- FILE *file;
- int nFile = 1;
- // Firstly, figure out the total number of bytes we need to migrate, for
- // the progress indicator.
- nTotalBytes = 0;
- while (true)
- {
- std::string filename = strprintf("blk%04d.dat", nFile);
- boost::filesystem::path blkpath = GetDataDir() / filename;
- if (!boost::filesystem::exists(blkpath))
- break;
- uintmax_t nFileSize = boost::filesystem::file_size(blkpath);
- if (nFileSize == static_cast<uintmax_t>(-1)) // Some other error.
- break;
- nTotalBytes += nFileSize;
- nFile++;
- }
- nFile = 1;
-
- // Set up progress calculations and callbacks.
- callbackTotalOperationProgress = &progress;
- ExternalBlockFileProgress callbackProgress;
- callbackProgress.connect(MigrationProgress);
- (*callbackTotalOperationProgress)(0.0);
-
- // We don't need to re-run scripts during migration as they were run already
- // and this saves a lot of time.
- fDisableSignatureChecking = true;
- // There may be multiple blk0000?.dat files, iterate over each one, rename
- // it and then reimport it. For the first one, we need to initialize the
- // fresh file with the genesis block.
- while (true)
- {
- std::string filename = strprintf("blk%04d.dat", nFile);
- std::string tmpname = strprintf("tmp-blk%04d.dat", nFile);
- boost::filesystem::path blkpath = GetDataDir() / filename;
- if (!boost::filesystem::exists(blkpath)) {
- // No more work to do.
- break;
- }
- boost::filesystem::path tmppath = GetDataDir() / tmpname;
- boost::filesystem::rename(blkpath, tmppath);
- printf("Migrating blk%04d.dat to leveldb\n", nFile);
- file = fopen(tmppath.string().c_str(), "rb");
- if (nFile == 1) {
- // This will create a fresh blk0001.dat ready for usage.
- LoadBlockIndex();
- }
- // LoadExternalBlockFile will close the given input file itself.
- // It reads each block from the storage files and calls ProcessBlock
- // on each one, which will go back and add to the database.
- if (!LoadExternalBlockFile(file, &callbackProgress)) {
- // We can't really clean up elegantly here.
- fDisableSignatureChecking = false;
- return OTHER_ERROR;
- }
- boost::filesystem::remove(tmppath);
- nFile++;
- }
- fDisableSignatureChecking = false;
- printf("LevelDB migration took %fs\n", (GetTimeMillis() - nStart) / 1000.0);
- return COMPLETED;
-}
git://git.novaco.in / novacoin.git / blobdiff