DL Check root hash in missing hashes. (#19797)

* DL Check root hash in missing hashes.

* Poetry.

* Send root hash param.

* Switch branch.

* Use correct branch name.

Author: fchirica

chia/data_layer/data_store.py

@@ -219,7 +219,7 @@ async def insert_into_data_store_from_file(
             delta_reader.add_internal_nodes(internal_nodes)
             delta_reader.add_leaf_nodes(terminal_nodes)
 
-            missing_hashes = await anyio.to_thread.run_sync(delta_reader.get_missing_hashes)
+            missing_hashes = await anyio.to_thread.run_sync(delta_reader.get_missing_hashes, root_hash)
 
             if len(missing_hashes) > 0:
                 # TODO: consider adding transactions around this code
@@ -230,7 +230,7 @@ async def insert_into_data_store_from_file(
                         for old_root_hash, indexes in merkle_blob_queries.items()
                     ]
                     await anyio.to_thread.run_sync(delta_reader.collect_from_merkle_blobs, jobs)
-                await self.build_cache_and_collect_missing_hashes(root, store_id, delta_reader)
+                await self.build_cache_and_collect_missing_hashes(root, root_hash, store_id, delta_reader)
 
             merkle_blob = delta_reader.create_merkle_blob_and_filter_unused_nodes(root_hash, set())
 
@@ -269,10 +269,11 @@ async def build_merkle_blob_queries_for_missing_hashes(
     async def build_cache_and_collect_missing_hashes(
         self,
         root: Root,
+        root_hash: bytes32,
         store_id: bytes32,
         delta_reader: DeltaReader,
     ) -> None:
-        missing_hashes = delta_reader.get_missing_hashes()
+        missing_hashes = delta_reader.get_missing_hashes(root_hash)
 
         if len(missing_hashes) == 0:
             return
@@ -334,7 +335,7 @@ async def build_cache_and_collect_missing_hashes(
                     ),
                 )
 
-            missing_hashes = delta_reader.get_missing_hashes()
+            missing_hashes = delta_reader.get_missing_hashes(root_hash)
 
             log.info(f"Missing hashes: added old hashes from generation {current_generation}")
 

poetry.lock

@@ -832,7 +832,7 @@ typing-extensions = "*"
 type = "git"
 url = "https://github.com/chia-network/chia_rs"
 reference = "long_lived/initial_datalayer"
-resolved_reference = "0ded7235fefed5627b839b1bda4a4c6788452224"
+resolved_reference = "ca58fd4617fb06684a90f669221290623293d3a2"
 subdirectory = "wheel/"
 
 [[package]]