diff --git a/.github/workflows/upload_artifacts_workflow.yml b/.github/workflows/upload_artifacts_workflow.yml index 61a8e198..6fa64a3d 100644 --- a/.github/workflows/upload_artifacts_workflow.yml +++ b/.github/workflows/upload_artifacts_workflow.yml @@ -3,8 +3,8 @@ name: Upload-Artifacts on: push: branches: - - main - + - meidar/update_for_bl_unpacking_test + jobs: artifacts-push: runs-on: ubuntu-24.04 diff --git a/Cargo.toml b/Cargo.toml index e00ef7c0..dc42880e 100644 --- a/Cargo.toml +++ b/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 = "3bbce339c66a998e6aca7dbc6d8b72ca8f4876d1" } +cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo.git", rev = "3bbce339c66a998e6aca7dbc6d8b72ca8f4876d1" } +cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo.git", rev = "3bbce339c66a998e6aca7dbc6d8b72ca8f4876d1" } +cairo-lang-execute-utils = { git = "https://github.com/starkware-libs/cairo.git", rev = "3bbce339c66a998e6aca7dbc6d8b72ca8f4876d1" } 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 = "00406f0cb324520a6706c58d71e3b9f24c076fcf", features = [ "extensive_hints", "mod_builtin", "clap", @@ -30,11 +30,11 @@ serde = { version = "1.0.202", features = ["derive"] } serde_json = "1.0.117" 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 = "54939230b06346975498ddbe46df1d2ef33eba24" } +stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "54939230b06346975498ddbe46df1d2ef33eba24" } +stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "54939230b06346975498ddbe46df1d2ef33eba24" } +stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "54939230b06346975498ddbe46df1d2ef33eba24" } +cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "54939230b06346975498ddbe46df1d2ef33eba24" } tempfile = "3.10.1" thiserror = "1.0.61" thiserror-no-std = "2.0.2" diff --git a/crates/stwo_run_and_prove/src/main.rs b/crates/stwo_run_and_prove/src/main.rs index 9dfc2f15..f84f8212 100644 --- a/crates/stwo_run_and_prove/src/main.rs +++ b/crates/stwo_run_and_prove/src/main.rs @@ -3,6 +3,7 @@ use cairo_air::utils::ProofFormat; use cairo_air::verifier::verify_cairo; use cairo_program_runner_lib::cairo_run_program; use cairo_program_runner_lib::utils::{get_cairo_run_config, get_program, get_program_input}; +use cairo_vm::prover_input_info::ProverInputInfoError; use cairo_vm::types::errors::program_errors::ProgramError; use cairo_vm::types::layout_name::LayoutName; use cairo_vm::vm::errors::cairo_run_errors::CairoRunError; @@ -111,6 +112,8 @@ enum StwoRunAndProveError { Serializing(#[from] sonic_rs::error::Error), #[error(transparent)] Proving(#[from] ProvingError), + #[error(transparent)] + ProverInputInfo(#[from] ProverInputInfoError), #[error("cairo verification failed.")] Verification, } @@ -178,7 +181,7 @@ fn stwo_run_and_prove( let program = get_program(program.as_path())?; 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 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)?; diff --git a/crates/vm_runner/src/main.rs b/crates/vm_runner/src/main.rs index 14cea56b..77d6a226 100644 --- a/crates/vm_runner/src/main.rs +++ b/crates/vm_runner/src/main.rs @@ -74,7 +74,7 @@ fn run(args: impl Iterator) -> Result { allow_missing_builtins: None, dynamic_layout_params: None, }; - let cairo_runner = cairo_run_program(&program, program_input_contents, cairo_run_config)?; + let mut 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");