X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Ftxdb-leveldb.h;h=c73dda68b1bfc8520dd46d7ff95549cd0049a199;hb=5f3f7465db4444e49dd4a896f88c090b40d0a303;hp=ab3f9ee6a08f348541849aaaeeb19b828976bd55;hpb=adb8391acdf671640adb1e8be564e68b254fca69;p=novacoin.git diff --git a/src/txdb-leveldb.h b/src/txdb-leveldb.h index ab3f9ee..c73dda6 100644 --- a/src/txdb-leveldb.h +++ b/src/txdb-leveldb.h @@ -42,11 +42,13 @@ public: private: leveldb::DB *pdb; // Points to the global instance. + // A batch stores up writes and deletes for atomic application. When this // field is non-NULL, writes/deletes go there instead of directly to disk. leveldb::WriteBatch *activeBatch; leveldb::Options options; bool fReadOnly; + int nVersion; protected: // Returns true and sets (value,false) if activeBatch contains the given key @@ -90,6 +92,7 @@ protected: ssValue >> value; } catch (std::exception &e) { + (void)e; return false; } return true; @@ -199,23 +202,10 @@ public: bool WriteSyncCheckpoint(uint256 hashCheckpoint); bool ReadCheckpointPubKey(std::string& strPubKey); bool WriteCheckpointPubKey(const std::string& strPubKey); + bool ReadModifierUpgradeTime(unsigned int& nUpgradeTime); + bool WriteModifierUpgradeTime(const unsigned int& nUpgradeTime); bool LoadBlockIndex(); -private: - bool LoadBlockIndexGuts(); }; -// Called from the initialization code. Checks to see if there is an old -// blkindex.dat file. If so, deletes it and begins re-importing the block -// chain, which will create the new database. -enum LevelDBMigrationResult { - NONE_NEEDED, - INSUFFICIENT_DISK_SPACE, - COMPLETED, - OTHER_ERROR, -}; - -typedef boost::signals2::signal LevelDBMigrationProgress; - -LevelDBMigrationResult MaybeMigrateToLevelDB(LevelDBMigrationProgress &progress); #endif // BITCOIN_DB_H