chore(blockifier_reexecution): compile sierra to versioned runnable c…

…lass
starkware-libs · Dec 15, 2024 · 13950e4 · 13950e4
1 parent ab56dd1
commit 13950e4
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 18 deletions.
diff --git a/crates/blockifier_reexecution/src/state_reader/compile.rs b/crates/blockifier_reexecution/src/state_reader/compile.rs
@@ -10,7 +10,7 @@ use cairo_lang_starknet_classes::contract_class::ContractEntryPoints;
 use cairo_lang_utils::bigint::BigUintAsHex;
 use flate2::bufread;
 use serde::Deserialize;
-use starknet_api::contract_class::{ContractClass, EntryPointType};
+use starknet_api::contract_class::{ContractClass, EntryPointType, SierraVersion};
 use starknet_api::core::EntryPointSelector;
 use starknet_api::deprecated_contract_class::{
     ContractClass as DeprecatedContractClass,
@@ -72,8 +72,11 @@ pub fn decode_reader(bytes: Vec<u8>) -> io::Result<String> {
     Ok(s)
 }
 
-/// Compile a FlattenedSierraClass to a ContractClass V1 (casm) using cairo_lang_starknet_classes.
-pub fn sierra_to_contact_class_v1(sierra: FlattenedSierraClass) -> StateResult<ContractClass> {
+/// Compile a FlattenedSierraClass to a versioned ContractClass V1 (casm) using
+/// cairo_lang_starknet_classes.
+pub fn sierra_to_versioned_contract_class_v1(
+    sierra: FlattenedSierraClass,
+) -> StateResult<(ContractClass, SierraVersion)> {
     let middle_sierra: MiddleSierraContractClass = {
         let v = serde_json::to_value(sierra).map_err(serde_err_to_state_err);
         serde_json::from_value(v?).map_err(serde_err_to_state_err)?
@@ -86,6 +89,18 @@ pub fn sierra_to_contact_class_v1(sierra: FlattenedSierraClass) -> StateResult<C
         abi: None,
     };
 
+    let [major, minor, patch] = sierra
+        .sierra_program
+        .clone()
+        .into_iter()
+        .take(3)
+        .map(|big_uint_as_hex| u64::try_from(big_uint_as_hex.value).unwrap())
+        .collect::<Vec<u64>>()
+        .try_into()
+        .expect("Expected exactly 3 elements.");
+
+    let sierra_version = SierraVersion::new(major, minor, patch);
+
     let casm =
         cairo_lang_starknet_classes::casm_contract_class::CasmContractClass::from_contract_class(
             sierra,
@@ -94,7 +109,7 @@ pub fn sierra_to_contact_class_v1(sierra: FlattenedSierraClass) -> StateResult<C
         )
         // TODO(Aviv): Reconsider the unwrap.
         .unwrap();
-    Ok(ContractClass::V1(casm))
+    Ok((ContractClass::V1(casm), sierra_version))
 }
 
 /// Compile a CompressedLegacyContractClass to a ContractClass V0 using cairo_lang_starknet_classes.

diff --git a/crates/blockifier_reexecution/src/state_reader/offline_state_reader.rs b/crates/blockifier_reexecution/src/state_reader/offline_state_reader.rs
@@ -19,7 +19,10 @@ use starknet_api::transaction::{Transaction, TransactionHash};
 use starknet_core::types::ContractClass as StarknetContractClass;
 use starknet_types_core::felt::Felt;
 
-use crate::state_reader::compile::{legacy_to_contract_class_v0, sierra_to_contact_class_v1};
+use crate::state_reader::compile::{
+    legacy_to_contract_class_v0,
+    sierra_to_versioned_contract_class_v1,
+};
 use crate::state_reader::errors::ReexecutionResult;
 use crate::state_reader::reexecution_state_reader::{
     ConsecutiveReexecutionStateReaders,
@@ -157,11 +160,12 @@ impl StateReader for OfflineStateReader {
     fn get_compiled_class(&self, class_hash: ClassHash) -> StateResult<RunnableCompiledClass> {
         match self.get_contract_class(&class_hash)? {
             StarknetContractClass::Sierra(sierra) => {
+                let (casm, _) = sierra_to_versioned_contract_class_v1(sierra).unwrap();
                 Ok(sierra_to_contact_class_v1(sierra).unwrap().try_into().unwrap())
             }
-            StarknetContractClass::Legacy(legacy) => {
-                Ok(legacy_to_contract_class_v0(legacy).unwrap().try_into().unwrap())
-            }
+            StarknetContractClass::Legacy(legacy) => Ok(VersionedRunnableCompiledClass::Cairo0(
+                legacy_to_contract_class_v0(legacy).unwrap().try_into().unwrap(),
+            )),
         }
     }
 

diff --git a/crates/blockifier_reexecution/src/state_reader/reexecution_state_reader.rs b/crates/blockifier_reexecution/src/state_reader/reexecution_state_reader.rs
@@ -12,7 +12,10 @@ use starknet_api::core::ClassHash;
 use starknet_api::transaction::{Transaction, TransactionHash};
 use starknet_core::types::ContractClass as StarknetContractClass;
 
-use crate::state_reader::compile::{legacy_to_contract_class_v0, sierra_to_contact_class_v1};
+use crate::state_reader::compile::{
+    legacy_to_contract_class_v0,
+    sierra_to_versioned_contract_class_v1,
+};
 use crate::state_reader::errors::{ReexecutionError, ReexecutionResult};
 
 pub trait ReexecutionStateReader {
@@ -24,14 +27,10 @@ pub trait ReexecutionStateReader {
                 let abi_length = sierra.abi.len();
                 let sierra_length = sierra.sierra_program.len();
 
-                let sierra_version = SierraVersion::extract_from_program(&sierra.sierra_program)?;
+                let (contract_class, sierra_version) =
+                    sierra_to_versioned_contract_class_v1(sierra)?;
 
-                Ok(ClassInfo::new(
-                    &sierra_to_contact_class_v1(sierra)?,
-                    sierra_length,
-                    abi_length,
-                    sierra_version,
-                )?)
+                Ok(ClassInfo::new(&contract_class, sierra_length, abi_length, sierra_version)?)
             }
             StarknetContractClass::Legacy(legacy) => {
                 let abi_length =

diff --git a/crates/blockifier_reexecution/src/state_reader/test_state_reader.rs b/crates/blockifier_reexecution/src/state_reader/test_state_reader.rs
@@ -32,7 +32,10 @@ use starknet_gateway::rpc_state_reader::RpcStateReader;
 use starknet_types_core::felt::Felt;
 
 use crate::retry_request;
-use crate::state_reader::compile::{legacy_to_contract_class_v0, sierra_to_contact_class_v1};
+use crate::state_reader::compile::{
+    legacy_to_contract_class_v0,
+    sierra_to_versioned_contract_class_v1,
+};
 use crate::state_reader::errors::ReexecutionResult;
 use crate::state_reader::offline_state_reader::SerializableDataNextBlock;
 use crate::state_reader::reexecution_state_reader::{
@@ -131,7 +134,9 @@ impl StateReader for TestStateReader {
 
         match contract_class {
             StarknetContractClass::Sierra(sierra) => {
-                Ok(sierra_to_contact_class_v1(sierra).unwrap().try_into().unwrap())
+                let (casm, _) = sierra_to_versioned_contract_class_v1(sierra).unwrap();
+                let runnable_contract_class: RunnableCompiledClass = casm.try_into().unwrap();
+                Ok(runnable_contract_class.try_into().unwrap())
             }
             StarknetContractClass::Legacy(legacy) => {
                 Ok(legacy_to_contract_class_v0(legacy).unwrap().try_into().unwrap())