starknet_os_runner: aviv refactor the rpc state reader to compute the compiled class hash

Author: AvivYossef-starkware

crates/blockifier_reexecution/src/state_reader/offline_state_reader.rs

@@ -16,6 +16,7 @@ use blockifier::state::state_reader_and_contract_manager::{
     FetchCompiledClasses,
     StateReaderAndContractManager,
 };
+use blockifier::state::utils::get_compiled_class_hash_v2 as default_get_compiled_class_hash_v2;
 use blockifier::transaction::transaction_execution::Transaction as BlockifierTransaction;
 use serde::{Deserialize, Serialize};
 use starknet_api::block::{BlockHash, BlockHashAndNumber, BlockInfo, BlockNumber, StarknetVersion};
@@ -31,7 +32,6 @@ use crate::errors::ReexecutionResult;
 use crate::state_reader::reexecution_state_reader::{
     ConsecutiveReexecutionStateReaders,
     ReexecutionStateReader,
-    DUMMY_COMPILED_CLASS_HASH,
 };
 use crate::state_reader::rpc_state_reader::StarknetContractClassMapping;
 use crate::utils::get_chain_info;
@@ -171,23 +171,16 @@ impl StateReader for OfflineStateReader {
         }
     }
 
-    /// Returns a dummy compiled class hash for reexecution purposes.
-    ///
-    /// This method is required since v0.14.1 for checking if compiled class hashes
-    /// need to be migrated from v1 to v2 format.
-    /// In reexecution we use a dummy value for both get_compiled_class_hash and
-    /// get_compiled_class_hash_v2, to avoid the migration process.
     fn get_compiled_class_hash(&self, _class_hash: ClassHash) -> StateResult<CompiledClassHash> {
-        Ok(DUMMY_COMPILED_CLASS_HASH)
+        unimplemented!("The offline state reader does not support get_compiled_class_hash.")
     }
 
-    /// returns the same value as get_compiled_class_hash, to avoid the migration process.
     fn get_compiled_class_hash_v2(
         &self,
         class_hash: ClassHash,
-        _compiled_class: &RunnableCompiledClass,
+        compiled_class: &RunnableCompiledClass,
     ) -> StateResult<CompiledClassHash> {
-        self.get_compiled_class_hash(class_hash)
+        default_get_compiled_class_hash_v2(self, class_hash, compiled_class)
     }
 }
 

crates/blockifier_reexecution/src/state_reader/reexecution_state_reader.rs

@@ -9,19 +9,17 @@ use blockifier::transaction::account_transaction::ExecutionFlags;
 use blockifier::transaction::transaction_execution::Transaction as BlockifierTransaction;
 use starknet_api::block::{BlockHash, BlockNumber};
 use starknet_api::contract_class::{ClassInfo, SierraVersion};
-use starknet_api::core::{ClassHash, CompiledClassHash};
+use starknet_api::core::ClassHash;
 use starknet_api::state::SierraContractClass;
 use starknet_api::test_utils::MAX_FEE;
 use starknet_api::transaction::{Transaction, TransactionHash};
-use starknet_core::types::{ContractClass as StarknetContractClass, Felt};
+use starknet_core::types::ContractClass as StarknetContractClass;
 
 use crate::assert_eq_state_diff;
 use crate::compile::{legacy_to_contract_class_v0, sierra_to_versioned_contract_class_v1};
 use crate::errors::ReexecutionResult;
 use crate::utils::contract_class_to_compiled_classes;
 
-pub const DUMMY_COMPILED_CLASS_HASH: CompiledClassHash = CompiledClassHash(Felt::ONE);
-
 pub trait ReexecutionStateReader {
     fn get_contract_class(&self, class_hash: &ClassHash) -> StateResult<StarknetContractClass>;
 

crates/blockifier_reexecution/src/state_reader/rpc_state_reader.rs

@@ -26,6 +26,7 @@ use blockifier::state::state_reader_and_contract_manager::{
     FetchCompiledClasses,
     StateReaderAndContractManager,
 };
+use blockifier::state::utils::get_compiled_class_hash_v2 as default_get_compiled_class_hash_v2;
 use blockifier::transaction::transaction_execution::Transaction as BlockifierTransaction;
 use serde::Serialize;
 use serde_json::{json, Value};
@@ -54,7 +55,6 @@ use crate::state_reader::offline_state_reader::{
 use crate::state_reader::reexecution_state_reader::{
     ConsecutiveReexecutionStateReaders,
     ReexecutionStateReader,
-    DUMMY_COMPILED_CLASS_HASH,
 };
 use crate::utils::{
     disjoint_hashmap_union,
@@ -156,23 +156,18 @@ impl StateReader for RpcStateReader {
         }
     }
 
-    /// Returns a dummy compiled class hash for reexecution purposes.
-    ///
-    /// This method is required since v0.14.1 for checking if compiled class hashes
-    /// need to be migrated from v1 to v2 format.
-    /// In reexecution we use a dummy value for both get_compiled_class_hash and
-    /// get_compiled_class_hash_v2, to avoid the migration process.
     fn get_compiled_class_hash(&self, _class_hash: ClassHash) -> StateResult<CompiledClassHash> {
-        Ok(DUMMY_COMPILED_CLASS_HASH)
+        unimplemented!("The rpc state reader does not support get_compiled_class_hash.")
     }
 
-    /// returns the same value as get_compiled_class_hash, to avoid the migration process.
+    /// Use the default implementation of get_compiled_class_hash_v2.
+    /// Which compute the hash.
     fn get_compiled_class_hash_v2(
         &self,
         class_hash: ClassHash,
-        _compiled_class: &RunnableCompiledClass,
+        compiled_class: &RunnableCompiledClass,
     ) -> StateResult<CompiledClassHash> {
-        self.get_compiled_class_hash(class_hash)
+        default_get_compiled_class_hash_v2(self, class_hash, compiled_class)
     }
 }
 
@@ -291,15 +286,19 @@ impl RpcStateReader {
             .collect::<Result<_, _>>()
     }
 
-    pub fn get_versioned_constants(&self) -> ReexecutionResult<&'static VersionedConstants> {
-        Ok(VersionedConstants::get(&self.get_starknet_version()?)?)
+    pub fn get_versioned_constants(&self) -> ReexecutionResult<VersionedConstants> {
+        let mut vc = VersionedConstants::get(&self.get_starknet_version()?)?.clone();
+        // Casm hash migration is not supported. It requires compiled class hashes, and the
+        // reexecution state readers do not have them.
+        vc.enable_casm_hash_migration = false;
+        Ok(vc)
     }
 
     pub fn get_block_context(&self) -> ReexecutionResult<BlockContext> {
         Ok(BlockContext::new(
             self.get_block_info()?,
             get_chain_info(&self.chain_id),
-            self.get_versioned_constants()?.clone(),
+            self.get_versioned_constants()?,
             BouncerConfig::max(),
         ))
     }
@@ -330,6 +329,8 @@ impl RpcStateReader {
         )?)
     }
 
+    /// Get the commitment state diff of the current block.
+    /// Note: the commitment state diff does not include migrated_compiled_classes.
     pub fn get_state_diff(&self) -> ReexecutionResult<CommitmentStateDiff> {
         let raw_statediff =
             &retry_request!(self.retry_config, || self.rpc_state_reader.send_rpc_request(