Cache the block hashes on disk.

Animecointeam · Oct 20, 2019 · bbabd0f · bbabd0f
1 parent 956438e
commit bbabd0f
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/src/chain.h b/src/chain.h
@@ -9,11 +9,15 @@
 #include "arith_uint256.h"
 #include "primitives/block.h"
 #include "pow.h"
+#include "timedata.h"
 #include "tinyformat.h"
 #include "uint256.h"
 
 #include <vector>
 
+/** Whether to recalculate hashes on startup */
+extern bool fUseFastIndex;
+
 class CBlockFileInfo
 {
 public:
@@ -333,11 +337,15 @@ class CBlockIndex
 /** Used to marshal pointers into hashes for db storage. */
 class CDiskBlockIndex : public CBlockIndex
 {
+private:
+    uint256 blockHash;
+
 public:
     uint256 hashPrev;
 
     CDiskBlockIndex() {
         hashPrev = uint256();
+        blockHash = uint256();
     }
 
     explicit CDiskBlockIndex(const CBlockIndex* pindex) : CBlockIndex(*pindex) {
@@ -361,6 +369,10 @@ class CDiskBlockIndex : public CBlockIndex
         if (nStatus & BLOCK_HAVE_UNDO)
             READWRITE(VARINT(nUndoPos));
 
+        if (!ser_action.ForRead() && blockHash.IsNull())
+            GetBlockHash();
+        READWRITE(blockHash);
+
         // block header
         READWRITE(this->nVersion);
         READWRITE(hashPrev);
@@ -372,14 +384,20 @@ class CDiskBlockIndex : public CBlockIndex
 
     uint256 GetBlockHash() const
     {
+        if (fUseFastIndex && (nTime < GetAdjustedTime() - 24 * 60 * 60) && !blockHash.IsNull()) // TODO: clock drift settings.
+            return blockHash;
+
         CBlockHeader block;
         block.nVersion        = nVersion;
         block.hashPrevBlock   = hashPrev;
         block.hashMerkleRoot  = hashMerkleRoot;
         block.nTime           = nTime;
         block.nBits           = nBits;
         block.nNonce          = nNonce;
-        return block.GetHash();
+
+        const_cast<CDiskBlockIndex*>(this)->blockHash = block.GetHash();
+
+        return blockHash;
     }
 
 

diff --git a/src/init.cpp b/src/init.cpp
@@ -60,6 +60,7 @@
 using namespace std;
 
 bool fFeeEstimatesInitialized = false;
+bool fUseFastIndex;
 static const bool DEFAULT_PROXYRANDOMIZE = true;
 static const bool DEFAULT_REST_ENABLE = false;
 static const bool DEFAULT_DISABLE_SAFEMODE = false;
@@ -843,6 +844,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
 
     // also see: InitParameterInteraction()
 
+    // whether to recalculate block hashes on startup or not
+    fUseFastIndex = GetBoolArg("-fastindex", true);
+
     // if using block pruning, then disable txindex
     if (GetArg("-prune", 0)||!GetBoolArg("-autorequestblocks", DEFAULT_AUTOMATIC_BLOCK_REQUESTS)) {
         if (GetBoolArg("-txindex", DEFAULT_TXINDEX))

diff --git a/src/test/test_bitcoin.cpp b/src/test/test_bitcoin.cpp
@@ -26,6 +26,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/thread.hpp>
 
+bool fUseFastIndex;
 std::unique_ptr<CConnman> g_connman;
 FastRandomContext insecure_rand_ctx(true);
 

diff --git a/src/txdb.cpp b/src/txdb.cpp
@@ -187,8 +187,9 @@ bool CBlockTreeDB::LoadBlockIndexGuts(std::function<CBlockIndex*(const uint256&)
         if (pcursor->GetKey(key) && key.first == 'b') {
             CDiskBlockIndex diskindex;
             if (pcursor->GetValue(diskindex)) {
+                uint256 blockHash = diskindex.GetBlockHash();
                 // Construct block index object
-                CBlockIndex* pindexNew = insertBlockIndex(diskindex.GetBlockHash());
+                CBlockIndex* pindexNew = insertBlockIndex(blockHash);
                 pindexNew->pprev          = insertBlockIndex(diskindex.hashPrev);
                 pindexNew->nHeight        = diskindex.nHeight;
                 pindexNew->nFile          = diskindex.nFile;