starknet_os_runner: prev block hash

Author: AvivYossef-starkware

crates/starknet_os_runner/src/runner.rs

@@ -140,8 +140,7 @@ where
             tx_execution_infos,
             block_info: execution_data.block_context.block_info().clone(),
             initial_reads: execution_data.initial_reads,
-            // TODO(Aviv): Use the actual previous block hash.
-            prev_block_hash: BlockHash::default(),
+            prev_block_hash: execution_data.prev_block_hash,
         };
 
         // Build OsHints.

crates/starknet_os_runner/src/storage_proofs_test.rs

@@ -3,7 +3,7 @@ use std::collections::HashSet;
 use blockifier::context::BlockContext;
 use blockifier::state::cached_state::StateMaps;
 use rstest::rstest;
-use starknet_api::block::BlockNumber;
+use starknet_api::block::{BlockHash, BlockNumber};
 use starknet_api::core::ContractAddress;
 use starknet_api::state::StorageKey;
 use starknet_rust::providers::Provider;
@@ -47,6 +47,7 @@ fn test_get_storage_proofs_from_rpc(
         block_context: BlockContext::create_for_account_testing(),
         initial_reads: state_maps,
         executed_class_hashes: HashSet::new(),
+        prev_block_hash: BlockHash::default(),
     };
 
     let result = rpc_provider.get_storage_proofs(BlockNumber(block_number), &execution_data);

crates/starknet_os_runner/src/virtual_block_executor.rs

@@ -14,8 +14,9 @@ use blockifier::state::state_reader_and_contract_manager::{
 };
 use blockifier::transaction::account_transaction::ExecutionFlags;
 use blockifier::transaction::transaction_execution::Transaction as BlockifierTransaction;
+use blockifier_reexecution::state_reader::reexecution_state_reader::ReexecutionStateReader;
 use blockifier_reexecution::state_reader::rpc_state_reader::RpcStateReader;
-use starknet_api::block::BlockNumber;
+use starknet_api::block::{BlockHash, BlockNumber};
 use starknet_api::core::{ChainId, ClassHash};
 use starknet_api::transaction::fields::Fee;
 use starknet_api::transaction::{InvokeTransaction, Transaction, TransactionHash};
@@ -36,6 +37,8 @@ pub struct VirtualBlockExecutionData {
     pub initial_reads: StateMaps,
     /// The class hashes of all contracts executed in the virtual block.
     pub executed_class_hashes: HashSet<ClassHash>,
+    //. The block hash of block_number - 1.
+    pub prev_block_hash: BlockHash,
 }
 
 /// Executes a virtual block of transactions.
@@ -86,6 +89,7 @@ pub trait VirtualBlockExecutor {
         let blockifier_txs = self.convert_invoke_txs(txs)?;
         let block_context = self.block_context(block_number)?;
         let state_reader = self.state_reader(block_number)?;
+        let prev_block_hash = self.prev_block_hash(block_number)?;
 
         // Create state reader with contract manager.
         let state_reader_and_contract_manager =
@@ -132,6 +136,7 @@ pub trait VirtualBlockExecutor {
             block_context,
             initial_reads,
             executed_class_hashes,
+            prev_block_hash,
         })
     }
 
@@ -172,6 +177,12 @@ pub trait VirtualBlockExecutor {
         block_number: BlockNumber,
     ) -> Result<BlockContext, VirtualBlockExecutorError>;
 
+    /// Returns the previous block hash for the given block number.
+    fn prev_block_hash(
+        &self,
+        block_number: BlockNumber,
+    ) -> Result<BlockHash, VirtualBlockExecutorError>;
+
     /// Returns a state reader that implements `FetchCompiledClasses` for the given block number.
     /// Must be `Send + Sync + 'static` to be used in the transaction executor.
     fn state_reader(
@@ -219,6 +230,16 @@ impl VirtualBlockExecutor for RpcVirtualBlockExecutor {
             .map_err(|e| VirtualBlockExecutorError::ReexecutionError(Box::new(e)))
     }
 
+    fn prev_block_hash(
+        &self,
+        block_number: BlockNumber,
+    ) -> Result<BlockHash, VirtualBlockExecutorError> {
+        let prev_block_number = BlockNumber(block_number.0 - 1);
+        self.rpc_state_reader
+            .get_old_block_hash(prev_block_number)
+            .map_err(|e| VirtualBlockExecutorError::ReexecutionError(Box::new(e)))
+    }
+
     fn state_reader(
         &self,
         _block_number: BlockNumber,