return options;
}
-void init_blockindex(leveldb::Options& options, bool fRemoveOld = false) {
- // First time init.
- filesystem::path directory = GetDataDir() / "txleveldb";
-
- if (fRemoveOld) {
- filesystem::remove_all(directory); // remove directory
- 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++;
- }
- }
-
- filesystem::create_directory(directory);
- printf("Opening LevelDB in %s\n", directory.string().c_str());
- leveldb::Status status = leveldb::DB::Open(options, directory.string(), &txdb);
- if (!status.ok()) {
- throw runtime_error(strprintf("init_blockindex(): error opening database environment %s", status.ToString().c_str()));
- }
-}
-
// 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)
return;
}
+ // First time init.
+ filesystem::path directory = GetDataDir() / "txleveldb";
bool fCreate = strchr(pszMode, 'c');
options = GetOptions();
options.create_if_missing = fCreate;
options.filter_policy = leveldb::NewBloomFilterPolicy(10);
-
- init_blockindex(options); // Init directory
+ filesystem::create_directory(directory);
+ printf("Opening LevelDB in %s\n", directory.string().c_str());
+ leveldb::Status status = leveldb::DB::Open(options, directory.string(), &txdb);
+ if (!status.ok()) {
+ throw runtime_error(strprintf("CDB(): error opening database environment %s", status.ToString().c_str()));
+ }
pdb = txdb;
- if (Exists(string("version")))
- {
- ReadVersion(nVersion);
- printf("Transaction index version is %d\n", nVersion);
-
- if (nVersion < DATABASE_VERSION)
- {
- printf("Required index version is %d, removing old database\n", DATABASE_VERSION);
-
- // Leveldb instance destruction
- delete txdb;
- txdb = pdb = NULL;
- delete activeBatch;
- activeBatch = NULL;
-
- init_blockindex(options, true); // Remove directory and create new database
- pdb = txdb;
-
- bool fTmp = fReadOnly;
- fReadOnly = false;
- WriteVersion(DATABASE_VERSION); // Save transaction index version
- fReadOnly = fTmp;
- }
- }
- else if (fCreate)
+ if (fCreate && !Exists(string("version")))
{
bool fTmp = fReadOnly;
fReadOnly = false;
- WriteVersion(DATABASE_VERSION);
+ WriteVersion(CLIENT_VERSION);
fReadOnly = fTmp;
}
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 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(nothrow) 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;
- uint256 blockHash = diskindex.GetBlockHash();
+ auto blockHash = diskindex.GetBlockHash();
// Construct block index object
CBlockIndex* pindexNew = InsertBlockIndex(blockHash);
// 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();
// Verify blocks in the best chain
int nCheckLevel = GetArgInt("-checklevel", 1);
- int nCheckDepth = GetArgInt( "-checkblocks", 2500);
+ 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))
git://git.novaco.in / novacoin.git / blobdiff