Faster getblock API

AaronDewes · AaronDewes · commit 599f2608c60b · 2022-09-23T18:00:27.000+02:00
diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp
@@ -571,14 +571,18 @@ static RPCHelpMan getblockheader()
     };
 }
 
-static CBlock GetBlockChecked(BlockManager& blockman, const CBlockIndex* pblockindex) EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
+static void EnsureBlockNotPruned(BlockManager& blockman, const CBlockIndex* pblockindex) EXCLUSIVE_LOCKS_REQUIRED(::cs_main)
 {
     AssertLockHeld(::cs_main);
-    CBlock block;
+
     if (blockman.IsBlockPruned(pblockindex)) {
         throw JSONRPCError(RPC_MISC_ERROR, "Block not available (pruned data)");
     }
+}
 
+static CBlock GetBlockChecked(const CBlockIndex* pblockindex)
+{
+    CBlock block;
     if (!ReadBlockFromDisk(block, pblockindex, Params().GetConsensus())) {
         // Block not found on disk. This could be because we have the block
         // header in our index but not yet have the block or did not accept the
@@ -710,6 +714,7 @@ static RPCHelpMan getblock()
     }
 
     CBlock block;
+    bool havePruned;
     const CBlockIndex* pblockindex;
     const CBlockIndex* tip;
     ChainstateManager& chainman = EnsureAnyChainman(request.context);
@@ -722,7 +727,15 @@ static RPCHelpMan getblock()
             throw JSONRPCError(RPC_INVALID_ADDRESS_OR_KEY, "Block not found");
         }
 
-        block = GetBlockChecked(chainman.m_blockman, pblockindex);
+        havePruned = chainman.m_blockman.m_have_pruned;
+        if(havePruned) {
+            EnsureBlockNotPruned(chainman.m_blockman, pblockindex);
+            block = GetBlockChecked(pblockindex);
+        }
+    }
+
+    if(!havePruned) {
+        block = GetBlockChecked(pblockindex);
     }
 
     if (verbosity <= 0)
@@ -1795,7 +1808,8 @@ static RPCHelpMan getblockstats()
         }
     }
 
-    const CBlock& block = GetBlockChecked(chainman.m_blockman, &pindex);
+    EnsureBlockNotPruned(chainman.m_blockman, &pindex);
+    const CBlock& block = GetBlockChecked(&pindex);
     const CBlockUndo& blockUndo = GetUndoChecked(chainman.m_blockman, &pindex);
 
     const bool do_all = stats.size() == 0; // Calculate everything if nothing selected (default)
