Skip to content

Commit 16397f8

Browse files
bump stwo-cairo, cairo and cairo-vm versions (#226)
1 parent 4236ffe commit 16397f8

File tree

5 files changed

+20
-20
lines changed

5 files changed

+20
-20
lines changed

Cargo.toml

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,30 +11,26 @@ resolver = "2"
1111
bincode = { version = "2.0.1", features = [
1212
"serde",
1313
] }
14-
cairo-lang-executable = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
15-
cairo-lang-runner = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
16-
cairo-lang-casm = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
17-
cairo-lang-execute-utils = { git = "https://github.com/starkware-libs/cairo.git", rev = "86eb25173f9d8700adbd2770406d715fbf1bb9f8" }
14+
cairo-lang-executable = "=2.12.4-dev.1"
15+
cairo-lang-runner = "=2.12.4-dev.1"
16+
cairo-lang-casm = "=2.12.4-dev.1"
17+
cairo-lang-execute-utils = "=2.12.4-dev.1"
1818
cairo-program-runner-lib = { path = "crates/cairo-program-runner-lib" }
19-
cairo-vm = { git = "https://github.com/lambdaclass/cairo-vm", rev = "e2c6c91c73cd0bc351721f302390fcc0965c6224", features = [
20-
"extensive_hints",
21-
"mod_builtin",
22-
"clap",
23-
] }
19+
cairo-vm = { version = "=3.0.0-rc.3", features = ["extensive_hints", "mod_builtin", "clap"] }
2420
clap = { version = "4.3.10", features = ["derive"] }
2521
log = "0.4.21"
2622
num-bigint = "0.4"
2723
num-traits = "0.2.19"
2824
regex = "1.11.1"
2925
serde = { version = "1.0.219", features = ["derive"] }
3026
serde_json = "1.0.142"
31-
starknet-crypto = "0.7.4"
32-
starknet-types-core = "0.1.2"
33-
stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "ff3eacc5938dd7b0139cbef3ff88ca1762198a89" }
34-
stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "ff3eacc5938dd7b0139cbef3ff88ca1762198a89" }
35-
stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "ff3eacc5938dd7b0139cbef3ff88ca1762198a89" }
36-
stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "ff3eacc5938dd7b0139cbef3ff88ca1762198a89" }
37-
cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "ff3eacc5938dd7b0139cbef3ff88ca1762198a89" }
27+
starknet-crypto = "=0.8.1"
28+
starknet-types-core = "=0.2.0"
29+
stwo_cairo_utils = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "f57087fe5ce57e6ffe5b9c42e08038f60b3b12f4" }
30+
stwo-cairo-adapter = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "f57087fe5ce57e6ffe5b9c42e08038f60b3b12f4" }
31+
stwo_cairo_prover = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "f57087fe5ce57e6ffe5b9c42e08038f60b3b12f4" }
32+
stwo-cairo-serialize = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "f57087fe5ce57e6ffe5b9c42e08038f60b3b12f4" }
33+
cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "f57087fe5ce57e6ffe5b9c42e08038f60b3b12f4" }
3834
tempfile = "3.10.1"
3935
thiserror = "1.0.61"
4036
thiserror-no-std = "2.0.2"

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -370,6 +370,7 @@ fn process_program_common_logic(
370370
&hint.flow_tracking_data.ap_tracking,
371371
&hint.flow_tracking_data.reference_ids,
372372
references,
373+
&hint.accessible_scopes,
373374
)
374375
.map_err(|err| {
375376
HintError::CustomHint(format!("{err} for hint: {}", hint.code).into())

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,7 @@ impl RunMode {
493493
relocate_trace: relocate_mem,
494494
layout,
495495
proof_mode: true,
496+
fill_holes: true,
496497
secure_run: None,
497498
disable_trace_padding,
498499
allow_missing_builtins: None,
@@ -508,6 +509,7 @@ impl RunMode {
508509
relocate_trace: false,
509510
layout,
510511
proof_mode: false,
512+
fill_holes: false,
511513
secure_run: None,
512514
disable_trace_padding: false,
513515
allow_missing_builtins: Some(allow_missing_builtins),

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@ pub fn create_cairo1_program_task(
7777
.map(|n| BigInt::from_str(&n.to_string()).unwrap())
7878
.collect();
7979

80-
let entrypoint = executable
80+
executable
8181
.entrypoints
8282
.iter()
83-
.find(|e| e.kind == EntryPointKind::Bootloader)
83+
.find(|e| matches!(e.kind, EntryPointKind::Bootloader))
8484
.ok_or_else(|| {
8585
BootloaderTaskError::Cairo1(format!(
8686
"{:?} entrypoint not found",
8787
EntryPointKind::Bootloader
8888
))
8989
})?;
90-
91-
let (program, string_to_hint) = program_and_hints_from_executable(&executable, entrypoint)
90+
let standalone = false;
91+
let (program, string_to_hint) = program_and_hints_from_executable(&executable, standalone)
9292
.map_err(|e| BootloaderTaskError::Cairo1(format!("Failed to parse executable: {e:?}")))?;
9393
let user_args = user_args_from_flags(user_args_file.as_ref(), &user_args_list)
9494
.map_err(|e| BootloaderTaskError::Cairo1(format!("Failed to parse user args: {e:?}")))?;

crates/vm_runner/src/main.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<ProverInput, Error> {
7373
relocate_trace: false,
7474
layout: args.layout,
7575
proof_mode: true,
76+
fill_holes: true,
7677
secure_run: None,
7778
disable_trace_padding: true,
7879
allow_missing_builtins: None,

0 commit comments

Comments
 (0)