From 2c672a2f86b6f6da61cefe73b591ba852c09384b Mon Sep 17 00:00:00 2001
From: avivg-starkware <aviv.g@starkware.co>
Date: Wed, 30 Oct 2024 16:55:22 +0200
Subject: [PATCH] chore(blockifier): replace sierra_program with casm field for
 NativeContractClassV1 (#1540)

---
 crates/blockifier/Cargo.toml                  |  1 -
 .../src/execution/native/contract_class.rs    | 21 ++++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/crates/blockifier/Cargo.toml b/crates/blockifier/Cargo.toml
index 4f6dcc83b9..69bfac8392 100644
--- a/crates/blockifier/Cargo.toml
+++ b/crates/blockifier/Cargo.toml
@@ -28,7 +28,6 @@ cairo-lang-casm = { workspace = true, features = ["parity-scale-codec"] }
 cairo-lang-runner.workspace = true
 cairo-lang-sierra.workspace = true
 cairo-lang-starknet-classes.workspace = true
-cairo-lang-utils.workspace = true
 cairo-native = { workspace = true, optional = true }
 cairo-vm.workspace = true
 derive_more.workspace = true
diff --git a/crates/blockifier/src/execution/native/contract_class.rs b/crates/blockifier/src/execution/native/contract_class.rs
index 6509602a6d..97cb832a8c 100644
--- a/crates/blockifier/src/execution/native/contract_class.rs
+++ b/crates/blockifier/src/execution/native/contract_class.rs
@@ -6,16 +6,14 @@ use cairo_lang_starknet_classes::contract_class::{
     ContractClass as SierraContractClass,
     ContractEntryPoint as SierraContractEntryPoint,
 };
-use cairo_lang_utils::bigint::BigUintAsHex;
 #[allow(unused_imports)]
 use cairo_native::executor::AotNativeExecutor;
 use starknet_api::core::EntryPointSelector;
 
-use crate::execution::contract_class::{EntryPointsByType, HasSelector};
+use crate::execution::contract_class::{ContractClassV1, EntryPointsByType, HasSelector};
 use crate::execution::entry_point::CallEntryPoint;
 use crate::execution::errors::PreExecutionError;
 use crate::execution::native::utils::contract_entrypoint_to_entrypoint_selector;
-
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub struct NativeContractClassV1(pub Arc<NativeContractClassV1Inner>);
 impl Deref for NativeContractClassV1 {
@@ -38,8 +36,9 @@ impl NativeContractClassV1 {
     pub fn new(
         executor: AotNativeExecutor,
         sierra_contract_class: SierraContractClass,
+        casm: ContractClassV1,
     ) -> NativeContractClassV1 {
-        let contract = NativeContractClassV1Inner::new(executor, sierra_contract_class);
+        let contract = NativeContractClassV1Inner::new(executor, sierra_contract_class, casm);
 
         Self(Arc::new(contract))
     }
@@ -54,16 +53,19 @@ impl NativeContractClassV1 {
 pub struct NativeContractClassV1Inner {
     pub executor: AotNativeExecutor,
     entry_points_by_type: EntryPointsByType<NativeEntryPoint>,
-    // Storing the raw sierra program and entry points to be able to compare the contract class.
-    sierra_program: Vec<BigUintAsHex>,
+    casm: ContractClassV1,
 }
 
 impl NativeContractClassV1Inner {
-    fn new(executor: AotNativeExecutor, sierra_contract_class: SierraContractClass) -> Self {
+    fn new(
+        executor: AotNativeExecutor,
+        sierra_contract_class: SierraContractClass,
+        casm: ContractClassV1,
+    ) -> Self {
         NativeContractClassV1Inner {
             executor,
             entry_points_by_type: EntryPointsByType::from(&sierra_contract_class),
-            sierra_program: sierra_contract_class.sierra_program,
+            casm,
         }
     }
 }
@@ -72,8 +74,7 @@ impl NativeContractClassV1Inner {
 // be the same therefore we exclude it from the comparison.
 impl PartialEq for NativeContractClassV1Inner {
     fn eq(&self, other: &Self) -> bool {
-        self.entry_points_by_type == other.entry_points_by_type
-            && self.sierra_program == other.sierra_program
+        self.entry_points_by_type == other.entry_points_by_type && self.casm == other.casm
     }
 }