blockifier: feature contracts real compiled class hash (#8500)

Author: nimrod-starkware

crates/blockifier/src/test_utils/contracts.rs

@@ -5,7 +5,7 @@ use cairo_lang_starknet_classes::casm_contract_class::CasmContractClass;
 use starknet_api::abi::abi_utils::selector_from_name;
 use starknet_api::abi::constants::CONSTRUCTOR_ENTRY_POINT_NAME;
 use starknet_api::contract_class::{ContractClass, EntryPointType};
-use starknet_api::core::{ClassHash, ContractAddress, EntryPointSelector};
+use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, EntryPointSelector};
 use starknet_api::deprecated_contract_class::{
     ContractClass as DeprecatedContractClass,
     EntryPointOffset,
@@ -20,6 +20,7 @@ use crate::test_utils::struct_impls::LoadContractFromFile;
 
 pub trait FeatureContractTrait {
     fn get_class(&self) -> ContractClass;
+    fn get_real_compiled_class_hash(&self) -> CompiledClassHash;
     fn get_runnable_class(&self) -> RunnableCompiledClass;
 
     /// Fetch PC locations from the compiled contract to compute the expected PC locations in the
@@ -91,6 +92,18 @@ fn get_class_for_feature_contract(feature_contract: FeatureContract) -> Contract
     }
 }
 
+#[cached]
+fn get_real_compiled_class_hash_for_feature_contract(
+    feature_contract: FeatureContract,
+) -> CompiledClassHash {
+    match get_class_for_feature_contract(feature_contract) {
+        ContractClass::V0(_) => {
+            panic!("V0 compiled class hash is not supported.")
+        }
+        ContractClass::V1((class, _)) => CompiledClassHash(class.compiled_class_hash()),
+    }
+}
+
 impl FeatureContractTrait for FeatureContract {
     fn get_class(&self) -> ContractClass {
         get_class_for_feature_contract(*self)
@@ -106,6 +119,10 @@ impl FeatureContractTrait for FeatureContract {
 
         self.get_class().try_into().unwrap()
     }
+
+    fn get_real_compiled_class_hash(&self) -> CompiledClassHash {
+        get_real_compiled_class_hash_for_feature_contract(*self)
+    }
 }
 
 /// The information needed to test a [FeatureContract].

crates/starknet_os_flow_tests/src/tests.rs

@@ -6,8 +6,6 @@ use blockifier_test_utils::cairo_versions::{CairoVersion, RunnableCairo1};
 use blockifier_test_utils::calldata::create_calldata;
 use blockifier_test_utils::contracts::FeatureContract;
 use rstest::rstest;
-use starknet_api::contract_class::ContractClass;
-use starknet_api::core::CompiledClassHash;
 use starknet_api::executable_transaction::{DeclareTransaction, InvokeTransaction};
 use starknet_api::execution_resources::GasAmount;
 use starknet_api::test_utils::declare::declare_tx;
@@ -79,14 +77,8 @@ async fn declare_deploy_scenario(#[values(1, 2)] n_blocks: usize) {
     // Declare a test contract.
     let test_contract = FeatureContract::TestContract(CairoVersion::Cairo1(RunnableCairo1::Casm));
     let test_contract_sierra = test_contract.get_sierra();
-    let contract_class = test_contract.get_class();
-    // TODO(Nimrod): Get the class hash bay adding a method `get_real_class_hash` to feature
-    // contracts.
     let class_hash = test_contract_sierra.calculate_class_hash();
-    let ContractClass::V1((test_contract_casm, _)) = contract_class else {
-        panic!("Expected a V1 contract class.");
-    };
-    let compiled_class_hash = CompiledClassHash(test_contract_casm.compiled_class_hash());
+    let compiled_class_hash = test_contract.get_real_compiled_class_hash();
     let declare_tx_args = declare_tx_args! {
         sender_address: *FUNDED_ACCOUNT_ADDRESS,
         class_hash,

crates/starknet_os_flow_tests/src/utils.rs

@@ -148,8 +148,8 @@ pub(crate) fn create_cairo1_bootstrap_declare_tx(
         panic!("Expected a Cairo 1 contract class.");
     };
     let class_hash = sierra.calculate_class_hash();
-    let compiled_class_hash = starknet_api::core::CompiledClassHash(casm.compiled_class_hash());
-    execution_contracts.add_cairo1_contract(casm.clone(), &sierra);
+    let compiled_class_hash = feature_contract.get_real_compiled_class_hash();
+    execution_contracts.add_cairo1_contract(casm, &sierra);
     let declare_tx_args = declare_tx_args! {
         sender_address: DeclareTransaction::bootstrap_address(),
         class_hash,