Bump stwo-cairo, cairo-vm, cairo-lang

Author: YairVaknin-starkware

Cargo.toml

@@ -9,16 +9,18 @@ resolver = "2"
 
 [workspace.dependencies]
 anyhow = "1.0.98"
-bincode = { version = "2.0.1", features = [
-    "serde",
-] }
-cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
-cairo-lang-executable = "=2.12.4-dev.1"
-cairo-lang-runner = "=2.12.4-dev.1"
-cairo-lang-casm = "=2.12.4-dev.1"
-cairo-lang-execute-utils = "=2.12.4-dev.1"
+bincode = { version = "2.0.1", features = ["serde"] }
+cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "6b45dd698a31d76c43f1e400cdb7ed8c23f97157" }
+cairo-lang-executable = "=2.14.1-dev.0"
+cairo-lang-runner = "=2.14.1-dev.0"
+cairo-lang-casm = "=2.14.1-dev.0"
+cairo-lang-execute-utils = "=2.14.1-dev.0"
 cairo-program-runner-lib = { path = "crates/cairo-program-runner-lib" }
-cairo-vm = { version = "=3.0.0-rc.3", features = ["extensive_hints", "mod_builtin", "clap"] }
+cairo-vm = { version = "=3.0.0", features = [
+    "extensive_hints",
+    "mod_builtin",
+    "clap",
+] }
 clap = { version = "4.3.10", features = ["derive"] }
 ctor = "0.2"
 env_logger = "0.11.3"
@@ -31,15 +33,14 @@ serde_json = "1.0.142"
 sonic-rs = "0.3.17"
 starknet-crypto = "=0.8.1"
 starknet-ff = "0.3.7"
-starknet-types-core = "=0.2.0"
-stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
-stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
-stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
-stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "a8a434b521a588cf80eb3625affb984f9913be6c" }
+starknet-types-core = "=0.2.4"
+stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "6b45dd698a31d76c43f1e400cdb7ed8c23f97157" }
+stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "6b45dd698a31d76c43f1e400cdb7ed8c23f97157" }
+stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "6b45dd698a31d76c43f1e400cdb7ed8c23f97157" }
+stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "6b45dd698a31d76c43f1e400cdb7ed8c23f97157" }
 tempfile = "3.10.1"
 thiserror = "1.0.61"
 thiserror-no-std = "2.0.2"
 tracing = "0.1.40"
 mockall = "0.13.1"
 rstest = "0.21"
-

crates/cairo-program-runner-lib/src/hints/bootloader_hints.rs

@@ -919,12 +919,7 @@ mod tests {
             HintProcessorData::new_default(String::from(BOOTLOADER_SAVE_OUTPUT_POINTER), ids_data);
         let mut hint_processor = MinimalBootloaderHintProcessor::new();
         assert!(matches!(
-            hint_processor.execute_hint(
-                &mut vm,
-                &mut exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            ),
+            hint_processor.execute_hint(&mut vm, &mut exec_scopes, &any_box!(hint_data),),
             Ok(())
         ));
 
@@ -970,12 +965,7 @@ mod tests {
         );
         let mut hint_processor = MinimalBootloaderHintProcessor::new();
         assert!(matches!(
-            hint_processor.execute_hint(
-                &mut vm,
-                &mut exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            ),
+            hint_processor.execute_hint(&mut vm, &mut exec_scopes, &any_box!(hint_data),),
             Ok(())
         ));
 
@@ -1073,12 +1063,7 @@ mod tests {
         );
         let mut hint_processor = MinimalBootloaderHintProcessor::new();
         assert!(matches!(
-            hint_processor.execute_hint(
-                &mut vm,
-                &mut exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            ),
+            hint_processor.execute_hint(&mut vm, &mut exec_scopes, &any_box!(hint_data),),
             Ok(())
         ));
 
@@ -1118,12 +1103,7 @@ mod tests {
         let mut hint_processor = MinimalBootloaderHintProcessor::new();
 
         assert!(matches!(
-            hint_processor.execute_hint(
-                &mut vm,
-                &mut exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            ),
+            hint_processor.execute_hint(&mut vm, &mut exec_scopes, &any_box!(hint_data),),
             Ok(())
         ));
 
@@ -1201,12 +1181,7 @@ mod tests {
         );
         let mut hint_processor = MinimalBootloaderHintProcessor::new();
 
-        let result = hint_processor.execute_hint(
-            &mut vm,
-            &mut exec_scopes,
-            &any_box!(hint_data),
-            &HashMap::new(),
-        );
+        let result = hint_processor.execute_hint(&mut vm, &mut exec_scopes, &any_box!(hint_data));
 
         match result {
             Ok(_) => assert!(!expect_fail),

crates/cairo-program-runner-lib/src/hints/execute_task_hints.rs

@@ -371,6 +371,7 @@ fn process_program_common_logic(
                             &hint.flow_tracking_data.reference_ids,
                             references,
                             &hint.accessible_scopes,
+                            program.constants.clone(),
                         )
                         .map_err(|err| {
                             HintError::CustomHint(format!("{err} for hint: {}", hint.code).into())
@@ -406,7 +407,6 @@ pub fn setup_subtask_for_execution(
 
     let mut hint_extension = HintExtension::default();
 
-    let subtask_cairo0_constants: Option<HashMap<String, Felt252>>;
     let subtask_cairo1_hint_processor: Option<CairoHintProcessor>;
     match &task {
         Task::Cairo0Program(cairo0_executable) => {
@@ -421,8 +421,6 @@ pub fn setup_subtask_for_execution(
                 hint_processor,
                 &mut hint_extension,
             )?;
-
-            subtask_cairo0_constants = Some(cairo0_executable.program.constants.clone());
             // This task doesn’t require a cairo1 hint processor.
             subtask_cairo1_hint_processor = None;
         }
@@ -450,8 +448,7 @@ pub fn setup_subtask_for_execution(
                 ret_pc,
             )
             .map_err(Into::<HintError>::into)?;
-            // No subtask constants and cairo1 hint processor are used.
-            subtask_cairo0_constants = None;
+            // No cairo1 hint processor is used.
             subtask_cairo1_hint_processor = None;
         }
         Task::Cairo1Program(cairo1_executable) => {
@@ -473,11 +470,9 @@ pub fn setup_subtask_for_execution(
                 subtask_cairo1_hint_processor.as_ref().unwrap(),
                 &mut hint_extension,
             )?;
-            // Push None since no subtask constants are used.
-            subtask_cairo0_constants = None;
         }
     }
-    hint_processor.spawn_subtask(subtask_cairo0_constants, subtask_cairo1_hint_processor);
+    hint_processor.spawn_subtask(subtask_cairo1_hint_processor);
 
     // output_runner_data = prepare_output_runner(
     //     task=task,
@@ -775,12 +770,7 @@ mod tests {
         let mut hint_processor = BootloaderHintProcessor::new();
 
         let hint_extension = hint_processor
-            .execute_hint_extensive(
-                &mut vm,
-                &mut exec_scopes,
-                &any_box!(hint_data),
-                &HashMap::new(),
-            )
+            .execute_hint_extensive(&mut vm, &mut exec_scopes, &any_box!(hint_data))
             .expect("Hint failed unexpectedly");
 
         // Fibonnacci code should be loaded after the header whose size is 5 as checked in

crates/cairo-program-runner-lib/src/hints/fact_topologies.rs

@@ -614,11 +614,8 @@ mod tests {
             offset: 10,
         };
 
-        let result =
-            configure_fact_topologies(&fact_topologies, &mut output_start, &mut output_builtin)
-                .expect("Configuring fact topologies failed unexpectedly");
-
-        assert_eq!(result, ());
+        configure_fact_topologies(&fact_topologies, &mut output_start, &mut output_builtin)
+            .expect("Configuring fact topologies failed unexpectedly");
 
         // We expect the offset to 2 + sum(page_sizes) for each fact topology
         let expected_offset: usize = fact_topologies.iter().flat_map(|ft| &ft.page_sizes).sum();

crates/cairo-program-runner-lib/src/hints/hint_processors.rs

@@ -1,5 +1,4 @@
 use std::any::Any;
-use std::collections::HashMap;
 use std::rc::Rc;
 
 use cairo_lang_runner::CairoHintProcessor;
@@ -11,8 +10,6 @@ use cairo_vm::types::exec_scope::ExecutionScopes;
 use cairo_vm::vm::errors::hint_errors::HintError;
 use cairo_vm::vm::runners::cairo_runner::ResourceTracker;
 use cairo_vm::vm::vm_core::VirtualMachine;
-use cairo_vm::Felt252;
-use starknet_types_core::felt::Felt;
 
 use crate::hints::bootloader_hints::{
     assert_is_composite_packed_output, assert_program_address,
@@ -92,14 +89,14 @@ impl HintProcessorLogic for MinimalBootloaderHintProcessor {
         vm: &mut VirtualMachine,
         exec_scopes: &mut ExecutionScopes,
         hint_data: &Box<dyn Any>,
-        constants: &HashMap<String, Felt252>,
     ) -> Result<(), HintError> {
         let hint_data = hint_data
             .downcast_ref::<HintProcessorData>()
             .ok_or(HintError::WrongHintData)?;
 
         let ids_data = &hint_data.ids_data;
         let ap_tracking = &hint_data.ap_tracking;
+        let constants = &hint_data.constants;
 
         match hint_data.code.as_str() {
             BOOTLOADER_RESTORE_BOOTLOADER_OUTPUT => restore_bootloader_output(vm, exec_scopes),
@@ -274,7 +271,6 @@ impl HintProcessorLogic for MinimalTestProgramsHintProcessor {
         vm: &mut VirtualMachine,
         exec_scopes: &mut ExecutionScopes,
         hint_data: &Box<dyn Any>,
-        _constants: &HashMap<String, Felt252>,
     ) -> Result<(), HintError> {
         let hint_data = hint_data
             .downcast_ref::<HintProcessorData>()
@@ -363,7 +359,6 @@ pub struct BootloaderHintProcessor<'a> {
     builtin_hint_processor: BuiltinHintProcessor,
     test_programs_hint_processor: MinimalTestProgramsHintProcessor,
     pub subtask_cairo1_hint_processor_stack: Vec<Option<CairoHintProcessor<'a>>>,
-    pub subtask_cairo0_constants_stack: Vec<Option<HashMap<String, Felt252>>>,
 }
 
 impl Default for BootloaderHintProcessor<'_> {
@@ -379,7 +374,6 @@ impl<'a> BootloaderHintProcessor<'a> {
             builtin_hint_processor: BuiltinHintProcessor::new_empty(),
             subtask_cairo1_hint_processor_stack: Vec::new(),
             test_programs_hint_processor: MinimalTestProgramsHintProcessor::new(),
-            subtask_cairo0_constants_stack: Vec::new(),
         }
     }
 
@@ -390,20 +384,14 @@ impl<'a> BootloaderHintProcessor<'a> {
     }
 
     /// Push new subtask state onto the stacks.
-    /// Pass an optional constants map and an optional Cairo hint processor.
-    pub fn spawn_subtask(
-        &mut self,
-        constants: Option<HashMap<String, Felt252>>,
-        cairo_hint_processor: Option<CairoHintProcessor<'a>>,
-    ) {
-        self.subtask_cairo0_constants_stack.push(constants);
+    /// Pass an an optional Cairo hint processor.
+    pub fn spawn_subtask(&mut self, cairo_hint_processor: Option<CairoHintProcessor<'a>>) {
         self.subtask_cairo1_hint_processor_stack
             .push(cairo_hint_processor);
     }
 
     /// Pop the current subtask state off the stacks.
     pub fn despawn_subtask(&mut self) {
-        self.subtask_cairo0_constants_stack.pop();
         self.subtask_cairo1_hint_processor_stack.pop();
     }
 }
@@ -414,7 +402,6 @@ impl HintProcessorLogic for BootloaderHintProcessor<'_> {
         _vm: &mut VirtualMachine,
         _exec_scopes: &mut ExecutionScopes,
         hint_data: &Box<dyn Any>,
-        _constants: &HashMap<String, Felt>,
     ) -> Result<(), HintError> {
         // This method will never be called, but must be defined for `HintProcessorLogic`.
 
@@ -428,43 +415,25 @@ impl HintProcessorLogic for BootloaderHintProcessor<'_> {
         vm: &mut VirtualMachine,
         exec_scopes: &mut ExecutionScopes,
         hint_data: &Box<dyn Any>,
-        constants: &HashMap<String, Felt>,
     ) -> Result<HintExtension, HintError> {
-        // Cascade through the internal hint processors until we find the hint implementation.
-        let curr_consts = if self.subtask_cairo0_constants_stack.is_empty() {
-            constants
-        } else {
-            self.subtask_cairo0_constants_stack
-                .last()
-                .and_then(|opt| opt.as_ref())
-                .unwrap_or(constants)
-        };
-
         // In case the subtask_cairo_hint_processor is a Some variant, we try matching the hint
         // using it first, for efficiency, since it is assumed to only be Some if we're inside
         // an execution of a cairo1 program subtask.
         if let Some(Some(subtask_cairo_hint_processor)) =
             self.subtask_cairo1_hint_processor_stack.last_mut()
         {
-            match subtask_cairo_hint_processor.execute_hint_extensive(
-                vm,
-                exec_scopes,
-                hint_data,
-                curr_consts,
-            ) {
+            match subtask_cairo_hint_processor.execute_hint_extensive(vm, exec_scopes, hint_data) {
                 Err(HintError::UnknownHint(_)) | Err(HintError::WrongHintData) => {}
                 result => {
                     return result;
                 }
             }
         }
 
-        match self.bootloader_hint_processor.execute_hint_extensive(
-            vm,
-            exec_scopes,
-            hint_data,
-            curr_consts,
-        ) {
+        match self
+            .bootloader_hint_processor
+            .execute_hint_extensive(vm, exec_scopes, hint_data)
+        {
             Err(HintError::UnknownHint(_)) => {}
             result => {
                 return result;
@@ -488,24 +457,18 @@ impl HintProcessorLogic for BootloaderHintProcessor<'_> {
             _ => {}
         }
 
-        match self.builtin_hint_processor.execute_hint_extensive(
-            vm,
-            exec_scopes,
-            hint_data,
-            curr_consts,
-        ) {
+        match self
+            .builtin_hint_processor
+            .execute_hint_extensive(vm, exec_scopes, hint_data)
+        {
             Err(HintError::UnknownHint(_)) => {}
             result => {
                 return result;
             }
         }
 
-        self.test_programs_hint_processor.execute_hint_extensive(
-            vm,
-            exec_scopes,
-            hint_data,
-            curr_consts,
-        )
+        self.test_programs_hint_processor
+            .execute_hint_extensive(vm, exec_scopes, hint_data)
     }
 }
 

crates/cairo-program-runner-lib/src/tasks.rs

@@ -77,7 +77,7 @@ pub fn create_cairo1_program_task(
         .map(|n| BigInt::from_str(&n.to_string()).unwrap())
         .collect();
 
-    executable
+    let entrypoint = executable
         .entrypoints
         .iter()
         .find(|e| matches!(e.kind, EntryPointKind::Bootloader))
@@ -87,8 +87,7 @@ pub fn create_cairo1_program_task(
                 EntryPointKind::Bootloader
             ))
         })?;
-    let standalone = false;
-    let (program, string_to_hint) = program_and_hints_from_executable(&executable, standalone)
+    let (program, string_to_hint) = program_and_hints_from_executable(&executable, entrypoint)
         .map_err(|e| BootloaderTaskError::Cairo1(format!("Failed to parse executable: {e:?}")))?;
     let user_args = user_args_from_flags(user_args_file.as_ref(), &user_args_list)
         .map_err(|e| BootloaderTaskError::Cairo1(format!("Failed to parse user args: {e:?}")))?;