Update to main

Author: MeidarSharkansky-starkware

.github/workflows/check.yml

@@ -3,7 +3,7 @@ name: check
 on:
   push:
     branches:
-      - main
+      - meidar/update_rev/main/bl_unpacking
   pull_request:
 
 jobs:
@@ -24,7 +24,7 @@ jobs:
       - run: rustup show
       - run: rustup component add clippy
       - uses: Swatinem/rust-cache@v2
-      - run: cargo clippy --all -- -D warnings
+      - run: cargo +nightly-2025-07-14 clippy --all -- -D warnings
 
   tests:
     runs-on: ubuntu-latest
@@ -45,7 +45,7 @@ jobs:
           RUSTFLAGS="-D warnings" cargo run --example run_program
       - name: "Unit tests in stwo_run_and_prove"
         run: |
-          RUSTFLAGS="-D warnings" cargo test -p stwo_run_and_prove
+          RUSTFLAGS="-D warnings" cargo +nightly-2025-07-14 test -p stwo_run_and_prove
 
   udeps:
     runs-on: ubuntu-latest
@@ -56,4 +56,4 @@ jobs:
           cache-on-failure: true
       - run: cargo install cargo-udeps --locked
       #      - run: cargo +nightly udeps --all-targets
-      - run: cargo +nightly-2025-04-06 udeps
+      - run: cargo +nightly-2025-07-14 udeps

.github/workflows/upload_artifacts_workflow.yml

@@ -3,8 +3,8 @@ name: Upload-Artifacts
 on:
   push:
     branches:
-      - main
-      
+      - meidar/update_rev/main/bl_unpacking
+
 jobs:
   artifacts-push:
     runs-on: ubuntu-24.04

Cargo.toml

@@ -11,12 +11,12 @@ resolver = "2"
 bincode = { version = "2.0.1", features = [
     "serde",
 ] }
-cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo.git", rev = "f6f7c3bf45c9973bf8782d78c84aed6e741c2a2d" }
-cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo.git", rev = "f6f7c3bf45c9973bf8782d78c84aed6e741c2a2d" }
-cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo.git", rev = "f6f7c3bf45c9973bf8782d78c84aed6e741c2a2d" }
-cairo-lang-execute-utils = { git = "https://github.com/starkware-libs/cairo.git", rev = "f6f7c3bf45c9973bf8782d78c84aed6e741c2a2d" }
+cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
+cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
+cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
+cairo-lang-execute-utils = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
 cairo-program-runner-lib = { path = "crates/cairo-program-runner-lib" }
-cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "b1a91f929b5fa29a1a2e9e6990a68a1220c0c673", features = [
+cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "e2c6c91c73cd0bc351721f302390fcc0965c6224", features = [
     "extensive_hints",
     "mod_builtin",
     "clap",
@@ -26,15 +26,15 @@ log = "0.4.21"
 num-bigint = "0.4"
 num-traits = "0.2.19"
 regex = "1.11.1"
-serde = { version = "1.0.202", features = ["derive"] }
-serde_json = "1.0.117"
+serde = { version = "1.0.219", features = ["derive"] }
+serde_json = "1.0.142"
 starknet-crypto = "0.6.2"
 starknet-types-core = "0.1.2"
-stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "d7b50347905c687a885a3b6818db4e9311683735" }
-stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "d7b50347905c687a885a3b6818db4e9311683735" }
-stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "d7b50347905c687a885a3b6818db4e9311683735" } 
-stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "d7b50347905c687a885a3b6818db4e9311683735" } 
-cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "d7b50347905c687a885a3b6818db4e9311683735" } 
+stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "59bc14aef12bee9fb9519c3da6e90c4a196206b5" }
+stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "59bc14aef12bee9fb9519c3da6e90c4a196206b5" }
+stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "59bc14aef12bee9fb9519c3da6e90c4a196206b5" }
+stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "59bc14aef12bee9fb9519c3da6e90c4a196206b5" }
+cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "59bc14aef12bee9fb9519c3da6e90c4a196206b5" }
 tempfile = "3.10.1"
 thiserror = "1.0.61"
 thiserror-no-std = "2.0.2"

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

@@ -267,7 +267,7 @@ pub fn configure_fact_topologies<FT: AsRef<FactTopology>>(
 }
 
 fn check_tree_structure(tree_structure: &[usize]) -> Result<(), TreeStructureError> {
-    if (!tree_structure.len() % 2 == 0) || (tree_structure.len() > 10) {
+    if (!tree_structure.len()).is_multiple_of(2) || (tree_structure.len() > 10) {
         return Err(TreeStructureError::InvalidTreeStructure);
     }
 

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

@@ -1,4 +1,4 @@
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 
 use cairo_vm::types::builtin_name::BuiltinName;
 use cairo_vm::types::errors::math_errors::MathError;
@@ -77,7 +77,7 @@ impl From<CairoPieLoaderError> for HintError {
 /// a pointer in the VM memory, or to an integer in case the segment is uninitialized.
 /// Those will be wrapped by the appropriate `MaybeRelocatable` variant.
 pub struct RelocationTable {
-    relocations: HashMap<isize, MaybeRelocatable>,
+    relocations: BTreeMap<isize, MaybeRelocatable>,
 }
 
 impl RelocationTable {
@@ -156,11 +156,11 @@ pub fn extract_segment(maybe_relocatable: MaybeRelocatable) -> Result<isize, Rel
     }
 }
 
-/// Builds a hashmap of address -> value from the `CairoPieMemory` vector.
+/// Builds a BTreeMap of address -> value from the `CairoPieMemory` vector.
 ///
 /// Makes it more convenient to access values in the Cairo PIE memory.
-fn build_cairo_pie_memory_map(memory: &CairoPieMemory) -> HashMap<Relocatable, &MaybeRelocatable> {
-    let mut memory_map: HashMap<Relocatable, &MaybeRelocatable> = HashMap::new();
+fn build_cairo_pie_memory_map(memory: &CairoPieMemory) -> BTreeMap<Relocatable, &MaybeRelocatable> {
+    let mut memory_map: BTreeMap<Relocatable, &MaybeRelocatable> = BTreeMap::new();
 
     for ((segment_index, offset), value) in memory.0.iter() {
         let address = Relocatable::from((*segment_index as isize, *offset));
@@ -203,7 +203,7 @@ pub fn build_cairo_pie_relocation_table(
         offset: 0,
     };
 
-    // Create a hashmap of the program memory for easier searching.
+    // Create a BTreeMap of the program memory for easier searching.
     // If this turns out to be too expensive, consider building it directly
     // when building the CairoPie object.
     let memory_map = build_cairo_pie_memory_map(&cairo_pie.memory);
@@ -231,7 +231,7 @@ pub fn build_cairo_pie_relocation_table(
 
 fn extend_additional_data(
     builtin: &mut SignatureBuiltinRunner,
-    data: &HashMap<Relocatable, (Felt252, Felt252)>,
+    data: &BTreeMap<Relocatable, (Felt252, Felt252)>,
     relocation_table: &RelocationTable,
 ) -> Result<(), SignatureRelocationError> {
     for (addr, signature) in data {

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

@@ -482,6 +482,7 @@ impl RunMode {
                 entrypoint: "main",
                 trace_enabled: true,
                 relocate_mem,
+                relocate_trace: relocate_mem,
                 layout,
                 proof_mode: true,
                 secure_run: None,
@@ -496,6 +497,7 @@ impl RunMode {
                 entrypoint: "main",
                 trace_enabled: false,
                 relocate_mem: false,
+                relocate_trace: false,
                 layout,
                 proof_mode: false,
                 secure_run: None,

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

@@ -3,6 +3,7 @@ use std::{
     str::FromStr,
 };
 
+use cairo_lang_executable::executable::EntryPointKind;
 use cairo_lang_executable::executable::Executable;
 use cairo_lang_execute_utils::{program_and_hints_from_executable, user_args_from_flags};
 use cairo_vm::types::errors::program_errors::ProgramError;
@@ -75,7 +76,19 @@ pub fn create_cairo1_program_task(
         .iter()
         .map(|n| BigInt::from_str(&n.to_string()).unwrap())
         .collect();
-    let (program, string_to_hint) = program_and_hints_from_executable(&executable, false)
+
+    let entrypoint = executable
+        .entrypoints
+        .iter()
+        .find(|e| e.kind == EntryPointKind::Bootloader)
+        .ok_or_else(|| {
+            BootloaderTaskError::Cairo1(format!(
+                "{:?} entrypoint not found",
+                EntryPointKind::Bootloader
+            ))
+        })?;
+
+    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:?}")))?;

crates/stwo_run_and_prove/src/main.rs

@@ -20,14 +20,24 @@ use stwo_cairo_adapter::vm_import::VmImportError;
 use stwo_cairo_prover::prover::{
     ChannelHash, ProverParameters, default_prod_prover_parameters, prove_cairo,
 };
-use stwo_cairo_prover::stwo_prover::core::backend::BackendForChannel;
-use stwo_cairo_prover::stwo_prover::core::backend::simd::SimdBackend;
-use stwo_cairo_prover::stwo_prover::core::channel::MerkleChannel;
-use stwo_cairo_prover::stwo_prover::core::pcs::PcsConfig;
-use stwo_cairo_prover::stwo_prover::core::prover::ProvingError;
-use stwo_cairo_prover::stwo_prover::core::vcs::blake2_merkle::Blake2sMerkleChannel;
-use stwo_cairo_prover::stwo_prover::core::vcs::ops::MerkleHasher;
-use stwo_cairo_prover::stwo_prover::core::vcs::poseidon252_merkle::Poseidon252MerkleChannel;
+
+use stwo_cairo_prover::stwo::core::channel::MerkleChannel;
+use stwo_cairo_prover::stwo::core::pcs::PcsConfig;
+use stwo_cairo_prover::stwo::core::vcs::MerkleHasher;
+use stwo_cairo_prover::stwo::core::vcs::blake2_merkle::Blake2sMerkleChannel;
+use stwo_cairo_prover::stwo::core::vcs::poseidon252_merkle::Poseidon252MerkleChannel;
+use stwo_cairo_prover::stwo::prover::ProvingError;
+use stwo_cairo_prover::stwo::prover::backend::BackendForChannel;
+use stwo_cairo_prover::stwo::prover::backend::simd::SimdBackend;
+
+// use stwo_cairo_prover::stwo_prover::core::backend::BackendForChannel;
+// use stwo_cairo_prover::stwo_prover::core::backend::simd::SimdBackend;
+// use stwo_cairo_prover::stwo_prover::core::channel::MerkleChannel;
+// use stwo_cairo_prover::stwo_prover::core::pcs::PcsConfig;
+// use stwo_cairo_prover::stwo_prover::core::prover::ProvingError;
+// use stwo_cairo_prover::stwo_prover::core::vcs::blake2_merkle::Blake2sMerkleChannel;
+// use stwo_cairo_prover::stwo_prover::core::vcs::ops::MerkleHasher;
+// use stwo_cairo_prover::stwo_prover::core::vcs::poseidon252_merkle::Poseidon252MerkleChannel;
 use stwo_cairo_serialize::CairoSerialize;
 use stwo_cairo_utils::file_utils::{IoErrorWithPath, create_file, read_to_string};
 use thiserror::Error;
@@ -183,9 +193,7 @@ fn stwo_run_and_prove(
     let program_input = get_program_input(&program_input)?;
     info!("Running cairo run program.");
     let runner = cairo_run_program(&program, program_input, cairo_run_config)?;
-    let mut prover_input_info = runner.get_prover_input_info()?;
-    info!("Adapting prover input.");
-    let prover_input = adapter(&mut prover_input_info)?;
+    let prover_input = adapter(&runner);
     let output_vec = prove_with_retries(prover_input, prove_config, prover)?;
 
     if let Some(output_path) = program_output {
@@ -229,7 +237,7 @@ fn prove_with_retries(
             i + 1,
             prove_config.n_proof_attempts
         );
-        let proof_file_path = prove_config.proofs_dir.join(format!("proof_{}", i));
+        let proof_file_path = prove_config.proofs_dir.join(format!("proof_{i}"));
 
         match prover.choose_channel_and_prove(
             &cairo_prover_inputs,
@@ -360,7 +368,7 @@ where
             CairoSerialize::serialize(&proof, &mut serialized);
             let hex_strings: Vec<String> = serialized
                 .into_iter()
-                .map(|felt| format!("0x{:x}", felt))
+                .map(|felt| format!("0x{felt:x}"))
                 .collect();
             let serialized_hex = sonic_rs::to_string_pretty(&hex_strings)?;
             proof_file.write_all(serialized_hex.as_bytes())?;

crates/vm_runner/src/main.rs

@@ -67,6 +67,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<ProverInput, Error> {
         // we don't need to relocate memory in the VM because we later call the adapter that does
         // relocation.
         relocate_mem: false,
+        relocate_trace: false,
         layout: args.layout,
         proof_mode: true,
         secure_run: None,
@@ -75,10 +76,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<ProverInput, Error> {
         dynamic_layout_params: None,
     };
     let cairo_runner = cairo_run_program(&program, program_input_contents, cairo_run_config)?;
-    let mut prover_input_info = cairo_runner
-        .get_prover_input_info()
-        .expect("Unable to get prover input info");
-    let prover_input = adapter(&mut prover_input_info)?;
+    let prover_input = adapter(&cairo_runner);
 
     let execution_resources = ExecutionResources::from_prover_input(&prover_input);
     log::info!("Execution resources: {execution_resources:#?}");

rust-toolchain.toml

@@ -1,2 +1,2 @@
 [toolchain]
-channel = "nightly-2025-04-06"
+channel = "nightly-2025-07-14"