chore(blockifier): update cairo native version to v0.2.3 (#2190)

Cargo.toml

@@ -103,7 +103,7 @@ cairo-lang-sierra-to-casm = "2.9.0-dev.0"
 cairo-lang-starknet-classes = "2.9.0-dev.0"
 cairo-lang-utils = "2.9.0-dev.0"
 # Important: when updated, make sure to update the cairo-native submodule as well.
-cairo-native = "0.2.2-alpha.0"
+cairo-native = "0.2.3"
 cairo-vm = "=1.0.1"
 camelpaste = "0.1.0"
 chrono = "0.4.26"

crates/bin/starknet-native-compile/Cargo.toml

@@ -10,6 +10,6 @@ license = "Apache-2.0"
 # TODO(Avi, 01/02/2025): Check consistency with the blockifier.
 cairo-lang-sierra = "2.9.0-dev.0"
 cairo-lang-starknet-classes = "2.9.0-dev.0"
-cairo-native = "0.2.1-alpha.0"
+cairo-native = "0.2.3"
 clap = { version = "4.5.4", features = ["derive"] }
 serde_json = "1.0.116"

crates/bin/starknet-native-compile/src/main.rs

@@ -1,11 +1,12 @@
-use crate::utils::load_sierra_program_from_file;
-use cairo_native::executor::AotContractExecutor;
-use cairo_native::OptLevel;
 use std::path::PathBuf;
 use std::process;
 
+use cairo_native::executor::AotContractExecutor;
+use cairo_native::OptLevel;
 use clap::Parser;
 
+use crate::utils::load_sierra_program_from_file;
+
 mod utils;
 
 #[derive(Parser, Debug)]
@@ -23,14 +24,18 @@ fn main() {
     let path = args.path;
     let output = args.output;
 
-    let sierra_program = load_sierra_program_from_file(&path);
+    let (contract_class, sierra_program) = load_sierra_program_from_file(&path);
 
     // TODO(Avi, 01/12/2024): Test different optimization levels for best performance.
-    let mut contract_executor = AotContractExecutor::new(&sierra_program, OptLevel::default())
-        .unwrap_or_else(|err| {
-            eprintln!("Error compiling Sierra program: {}", err);
-            process::exit(1);
-        });
+    let mut contract_executor = AotContractExecutor::new(
+        &sierra_program,
+        &contract_class.entry_points_by_type,
+        OptLevel::default(),
+    )
+    .unwrap_or_else(|err| {
+        eprintln!("Error compiling Sierra program: {}", err);
+        process::exit(1);
+    });
     contract_executor.save(output.clone()).unwrap_or_else(|err| {
         eprintln!("Error saving compiled program: {}", err);
         process::exit(1);

crates/bin/starknet-native-compile/src/utils.rs

@@ -1,11 +1,10 @@
-use cairo_lang_starknet_classes::contract_class::ContractClass;
-
-use cairo_lang_sierra::program::Program;
-
 use std::path::PathBuf;
 use std::process;
 
-pub(crate) fn load_sierra_program_from_file(path: &PathBuf) -> Program {
+use cairo_lang_sierra::program::Program;
+use cairo_lang_starknet_classes::contract_class::ContractClass;
+
+pub(crate) fn load_sierra_program_from_file(path: &PathBuf) -> (ContractClass, Program) {
     let raw_contract_class = std::fs::read_to_string(path).unwrap_or_else(|err| {
         eprintln!("Error reading Sierra file: {}", err);
         process::exit(1);
@@ -15,8 +14,11 @@ pub(crate) fn load_sierra_program_from_file(path: &PathBuf) -> Program {
             eprintln!("Error deserializing Sierra file into contract class: {}", err);
             process::exit(1);
         });
-    contract_class.extract_sierra_program().unwrap_or_else(|err| {
-        eprintln!("Error extracting Sierra program from contract class: {}", err);
-        process::exit(1);
-    })
+    (
+        contract_class.clone(),
+        contract_class.extract_sierra_program().unwrap_or_else(|err| {
+            eprintln!("Error extracting Sierra program from contract class: {}", err);
+            process::exit(1);
+        }),
+    )
 }

crates/blockifier/build.rs

@@ -38,7 +38,7 @@ fn compile_cairo_native_aot_runtime() {
     const RUNTIME_LIBRARY: &str = "CAIRO_NATIVE_RUNTIME_LIBRARY";
     let runtime_expected_path = {
         let expected_path_env =
-            std::env::var(RUNTIME_LIBRARY).expect("Cairo Native rutime path variable is not set");
+            std::env::var(RUNTIME_LIBRARY).expect("Cairo Native runtime path variable is not set");
         let expected_path = PathBuf::from(&expected_path_env);
 
         if expected_path.is_absolute() {