apollo_state_sync: fix bug in state sync get_block_hash

Author: ShahakShama

crates/apollo_state_sync/src/lib.rs

@@ -154,10 +154,19 @@ impl StateSync {
     }
 
     async fn get_block_hash(&self, block_number: BlockNumber) -> StateSyncResult<BlockHash> {
-        // Getting the next block because the Sync block only contains parent hash.
-        match (self.get_block(block_number).await, self.starknet_client.as_ref()) {
-            (Ok(block), _) => Ok(block.block_header_without_hash.parent_hash),
-            (Err(StateSyncError::BlockNotFound(_)), Some(starknet_client)) => {
+        let storage_reader = self.storage_reader.clone();
+        let block_hash_opt = tokio::task::spawn_blocking(move || {
+            Ok::<_, StateSyncError>(
+                storage_reader
+                    .begin_ro_txn()?
+                    .get_block_header(block_number)?
+                    .map(|header| header.block_hash),
+            )
+        })
+        .await??;
+        match (block_hash_opt, self.starknet_client.as_ref()) {
+            (Some(block_hash), _) => Ok(block_hash),
+            (None, Some(starknet_client)) => {
                 // As a fallback, try to get the block hash through the feeder directly. This
                 // method is faster than get_block which the sync runner uses.
                 // TODO(shahak): Test this flow.
@@ -166,7 +175,7 @@ impl StateSync {
                     .await?
                     .ok_or(StateSyncError::BlockNotFound(block_number))
             }
-            (Err(err), _) => Err(err),
+            (None, _) => Err(StateSyncError::BlockNotFound(block_number)),
         }
     }
 

crates/apollo_state_sync/src/test.rs

@@ -72,9 +72,13 @@ async fn test_get_block() {
 async fn test_get_block_hash() {
     let (mut state_sync, mut storage_writer) = setup();
 
-    let Block { header: expected_header, body: expected_body } =
+    let Block { header: mut expected_header, body: expected_body } =
         get_test_block(1, None, None, None);
 
+    // get_test_block returns a block with parent_hash == block_hash. Need to change that to make
+    // sure we don't return the parent hash
+    expected_header.block_hash.0 = expected_header.block_hash.0 + Felt::from(1);
+
     storage_writer
         .begin_rw_txn()
         .unwrap()