Support get_block_hash syscall

Author: cptartur

crates/cheatnet/src/runtime_extensions/forge_runtime_extension/cheatcodes/cheat_block_hash.rs

@@ -78,13 +78,11 @@ impl CheatnetState {
         self.cheat_block_hash(block_number, Operation::StopGlobal);
     }
 
-    #[expect(clippy::result_large_err)]
-    pub fn get_block_hash_for_contract(
+    pub fn get_cheated_block_hash_for_contract(
         &mut self,
         contract_address: ContractAddress,
         block_number: u64,
-        syscall_handler: &mut SyscallHintProcessor,
-    ) -> SyscallResult<BlockHash> {
+    ) -> Option<BlockHash> {
         if let Some((cheat_span, block_hash)) = self
             .block_hash_contracts
             .get(&(contract_address, block_number))
@@ -110,17 +108,33 @@ impl CheatnetState {
                 }
                 CheatSpan::Indefinite => {}
             }
-            return Ok(BlockHash(StarkHash::from(block_hash)));
+            return Some(BlockHash(StarkHash::from(block_hash)));
         }
 
         if let Some((block_hash, except)) = self.global_block_hash.get(&block_number)
             && !except.contains(&contract_address)
         {
-            return Ok(BlockHash(StarkHash::from(*block_hash)));
+            return Some(BlockHash(StarkHash::from(*block_hash)));
         }
 
-        Ok(BlockHash(
-            syscall_handler.base.get_block_hash(block_number)?,
-        ))
+        None
+    }
+
+    #[expect(clippy::result_large_err)]
+    pub fn get_block_hash_for_contract(
+        &mut self,
+        contract_address: ContractAddress,
+        block_number: u64,
+        syscall_handler: &mut SyscallHintProcessor,
+    ) -> SyscallResult<BlockHash> {
+        let cheated_block_hash =
+            self.get_cheated_block_hash_for_contract(contract_address, block_number);
+        if let Some(cheated_block_hash) = cheated_block_hash {
+            Ok(cheated_block_hash)
+        } else {
+            Ok(BlockHash(
+                syscall_handler.base.get_block_hash(block_number)?,
+            ))
+        }
     }
 }

crates/cheatnet/src/runtime_extensions/native/native_syscall_handler.rs

@@ -383,8 +383,33 @@ impl StarknetSyscallHandler for &mut CheatableNativeSyscallHandler<'_> {
         block_number: u64,
         remaining_gas: &mut u64,
     ) -> SyscallResult<Felt> {
-        self.native_syscall_handler
-            .get_block_hash(block_number, remaining_gas)
+        self.pre_execute_syscall(
+            remaining_gas,
+            self.native_syscall_handler
+                .gas_costs()
+                .syscalls
+                .get_block_hash
+                .base_syscall_cost(),
+            SyscallSelector::GetBlockHash,
+        )?;
+
+        let block_hash = self.cheatnet_state.get_cheated_block_hash_for_contract(
+            self.native_syscall_handler.base.call.storage_address,
+            block_number,
+        );
+
+        if let Some(block_hash) = block_hash {
+            Ok(block_hash.0)
+        } else {
+            match self
+                .native_syscall_handler
+                .base
+                .get_block_hash(block_number)
+            {
+                Ok(value) => Ok(value),
+                Err(e) => Err(self.handle_error(remaining_gas, e)),
+            }
+        }
     }
 
     fn get_execution_info(&mut self, remaining_gas: &mut u64) -> SyscallResult<ExecutionInfo> {

crates/forge/tests/e2e/running.rs

@@ -63,14 +63,15 @@ fn simple_package_with_cheats() {
     [..]Finished[..]
 
 
-    Collected 4 test(s) from simple_package_with_cheats package
+    Collected 5 test(s) from simple_package_with_cheats package
     Running 0 test(s) from src/
-    Running 4 test(s) from tests/
+    Running 5 test(s) from tests/
     [PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke [..]
     [PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke_proxy [..]
     [PASS] simple_package_with_cheats_integrationtest::contract::call_and_invoke_library_call [..]
     [PASS] simple_package_with_cheats_integrationtest::contract::deploy_syscall [..]
-    Tests: 4 passed, 0 failed, 0 ignored, 0 filtered out
+    [PASS] simple_package_with_cheats_integrationtest::contract::block_hash [..]
+    Tests: 5 passed, 0 failed, 0 ignored, 0 filtered out
     "},
     );
 }