Skip to content

Commit 69ac93d

Browse files
Update stwo-cario to 4ca3f15
1 parent 0f45006 commit 69ac93d

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ jobs:
5252
cache-on-failure: true
5353
- run: cargo install cargo-udeps --locked
5454
# - run: cargo +nightly udeps --all-targets
55-
- run: cargo +nightly-2025-04-06 udeps
55+
- run: cargo +nightly-2025-05-17 udeps

.github/workflows/upload_artifacts_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Upload-Artifacts
33
on:
44
push:
55
branches:
6-
- main
6+
- meidar/update_cairo_vm_80f9e7e
77

88
jobs:
99
artifacts-push:

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ members = [
77
resolver = "2"
88

99
[workspace.dependencies]
10-
bincode = { version = "2.0.0-rc.3", default-features = false, features = [
10+
bincode = { version = "2.0.1", features = [
1111
"serde",
1212
] }
1313
cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo.git", rev = "f6f7c3bf45c9973bf8782d78c84aed6e741c2a2d" }
@@ -29,8 +29,8 @@ serde = { version = "1.0.202", features = ["derive"] }
2929
serde_json = "1.0.117"
3030
starknet-crypto = "0.6.2"
3131
starknet-types-core = "0.1.2"
32-
stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e5fc0d8e20d535adbfd6acd01e8d859c3d8460dc" }
33-
stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "e5fc0d8e20d535adbfd6acd01e8d859c3d8460dc" }
32+
stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "4ca3f15db375a0a75501a905b734551fe307e216" }
33+
stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "4ca3f15db375a0a75501a905b734551fe307e216" }
3434
tempfile = "3.10.1"
3535
thiserror = "1.0.61"
3636
thiserror-no-std = "2.0.2"

crates/vm_runner/src/main.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use cairo_vm::types::errors::program_errors::ProgramError;
88
use cairo_vm::types::layout_name::LayoutName;
99
use cairo_vm::vm::errors::cairo_run_errors::CairoRunError;
1010
use clap::Parser;
11-
use stwo_cairo_adapter::adapter::adapt_finished_runner;
11+
use stwo_cairo_adapter::adapter::adapter;
1212
use stwo_cairo_adapter::vm_import::VmImportError;
1313
use stwo_cairo_adapter::{ExecutionResources, ProverInput};
1414
use stwo_cairo_utils::binary_utils::run_binary;
@@ -73,13 +73,16 @@ fn run(args: impl Iterator<Item = String>) -> Result<ProverInput, Error> {
7373
dynamic_layout_params: None,
7474
};
7575
let cairo_runner = cairo_run_program(&program, program_input_contents, cairo_run_config)?;
76-
let cairo_input = adapt_finished_runner(cairo_runner)?;
76+
let mut prover_input_info = cairo_runner
77+
.get_prover_input_info()
78+
.expect("Unable to get prover input info");
79+
let prover_input = adapter(&mut prover_input_info)?;
7780

78-
let execution_resources = ExecutionResources::from_prover_input(&cairo_input);
81+
let execution_resources = ExecutionResources::from_prover_input(&prover_input);
7982
log::info!("Execution resources: {:#?}", execution_resources);
8083
std::fs::write(
8184
args.output_execution_resources_path,
8285
serde_json::to_string(&execution_resources)?,
8386
)?;
84-
Ok(cairo_input)
87+
Ok(prover_input)
8588
}

0 commit comments

Comments
 (0)