Deal with .db_wrapper

Author: richardkiss

chia/consensus/blockchain.py

@@ -27,6 +27,7 @@
 from chia.consensus.block_body_validation import ForkInfo, validate_block_body
 from chia.consensus.block_header_validation import validate_unfinished_header_block
 from chia.consensus.block_height_map import BlockHeightMap
+from chia.consensus.block_store_protocol import BlockStoreProtocol
 from chia.consensus.coin_store_protocol import CoinStoreProtocol
 from chia.consensus.cost_calculator import NPCResult
 from chia.consensus.difficulty_adjustment import get_next_sub_slot_iters_and_difficulty
@@ -35,7 +36,6 @@
 from chia.consensus.generator_tools import get_block_header
 from chia.consensus.get_block_generator import get_block_generator
 from chia.consensus.multiprocess_validation import PreValidationResult
-from chia.full_node.block_store import BlockStore
 from chia.types.blockchain_format.coin import Coin
 from chia.types.blockchain_format.vdf import VDFInfo
 from chia.types.coin_record import CoinRecord
@@ -104,7 +104,7 @@ class Blockchain:
     # Unspent Store
     coin_store: CoinStoreProtocol
     # Store
-    block_store: BlockStore
+    block_store: BlockStoreProtocol
     # Used to verify blocks in parallel
     pool: Executor
     # Set holding seen compact proofs, in order to avoid duplicates.
@@ -122,7 +122,7 @@ class Blockchain:
     @staticmethod
     async def create(
         coin_store: CoinStoreProtocol,
-        block_store: BlockStore,
+        block_store: BlockStoreProtocol,
         height_map: BlockHeightMap,
         consensus_constants: ConsensusConstants,
         reserved_cores: int,

chia/full_node/block_store.py

@@ -11,7 +11,6 @@
 from chia_rs.sized_bytes import bytes32
 from chia_rs.sized_ints import uint32
 
-from chia.consensus.block_store_protocol import BlockStoreProtocol
 from chia.full_node.full_block_utils import GeneratorBlockInfo, block_info_from_block, generator_from_block
 from chia.util.db_wrapper import DBWrapper2, execute_fetchone
 from chia.util.errors import Err
@@ -469,7 +468,8 @@ async def get_block_bytes_in_range(
         No orphan blocks.
         """
 
-        assert self.db_wrapper.db_version == 2
+        if self.db_wrapper.db_version != 2:
+            raise NotImplementedError("get_block_bytes_in_range requires DB version 2")
         async with self.db_wrapper.reader_no_transaction() as conn:
             async with conn.execute(
                 "SELECT block FROM full_blocks WHERE height >= ? AND height <= ? AND in_main_chain=1",

chia/full_node/full_node_api.py

@@ -1452,15 +1452,13 @@ async def request_block_headers(self, request: wallet_protocol.RequestBlockHeade
 
         if request.end_height < request.start_height or request.end_height - request.start_height > 128:
             return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
-        if self.full_node.block_store.db_wrapper.db_version == 2:
-            try:
-                blocks_bytes = await self.full_node.block_store.get_block_bytes_in_range(
-                    request.start_height, request.end_height
-                )
-            except ValueError:
-                return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
-
-        else:
+        try:
+            blocks_bytes = await self.full_node.block_store.get_block_bytes_in_range(
+                request.start_height, request.end_height
+            )
+        except NotImplementedError:
+            # The underlying block store may not support this optimized call
+            # (e.g. v1 DB). In this case, we fall back to the legacy approach
             height_to_hash = self.full_node.blockchain.height_to_hash
             header_hashes: list[bytes32] = []
             for i in range(request.start_height, request.end_height + 1):
@@ -1470,6 +1468,8 @@ async def request_block_headers(self, request: wallet_protocol.RequestBlockHeade
                 header_hashes.append(header_hash)
 
             blocks_bytes = await self.full_node.block_store.get_block_bytes_by_hash(header_hashes)
+        except ValueError:
+            return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
         if len(blocks_bytes) != (request.end_height - request.start_height + 1):  # +1 because interval is inclusive
             return make_msg(ProtocolMessageTypes.reject_block_headers, reject)
         return_filter = request.return_filter