Bump stwo-cairo. (#458)

Author: ilyalesokhin-starkware

Cargo.lock

@@ -18,7 +18,7 @@ edition = "2024"
 [workspace.dependencies]
 blake2 = { version = "0.10.6", default-features = false }
 hashbrown = ">=0.15.2"
-indexmap = { version = "2.10.0", default-features = false }
+indexmap = { version = "2.10.0", default-features = false, features = ["std"] }
 indoc = "2.0.6"
 itertools = { version = "0.12", default-features = false, features = [
     "use_alloc",
@@ -33,21 +33,21 @@ serde = "1.0.219"
 serde_json = "1.0"
 
 # stwo
-stwo = { git = "https://github.com/starkware-libs/stwo", rev = "aeceb74c", features = [
+stwo = { version = "2.2.0", features = [
     "parallel",
 ], default-features = false }
-stwo-constraint-framework = {  git = "https://github.com/starkware-libs/stwo", rev = "aeceb74c", features = [
+stwo-constraint-framework = { version = "2.2.0", features = [
     "parallel",
 ] }
-stwo-air-utils-derive = { git = "https://github.com/starkware-libs/stwo", rev = "aeceb74c" }
-stwo-air-utils = { git = "https://github.com/starkware-libs/stwo", rev = "aeceb74c" }
+stwo-air-utils-derive = { version = "2.2.0" }
+stwo-air-utils = { version = "2.2.0" }
 
 # stwo-cairo
-cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "467d5c6d" }
-stwo_cairo_prover = { package = "stwo-cairo-prover", git = "https://github.com/starkware-libs/stwo-cairo", rev = "467d5c6d" }
-stwo_cairo_common = { package = "stwo-cairo-common", git = "https://github.com/starkware-libs/stwo-cairo", rev = "467d5c6d" }
-stwo_cairo_dev_utils = { package = "stwo-cairo-dev-utils", git = "https://github.com/starkware-libs/stwo-cairo", rev = "467d5c6d" }
-stwo_cairo_utils = { package = "stwo-cairo-utils", git = "https://github.com/starkware-libs/stwo-cairo", rev = "467d5c6d" }
+cairo-air = { git = "https://github.com/starkware-libs/stwo-cairo", rev = "8a3950c2" }
+stwo_cairo_prover = { package = "stwo-cairo-prover", git = "https://github.com/starkware-libs/stwo-cairo", rev = "8a3950c2" }
+stwo_cairo_common = { package = "stwo-cairo-common", git = "https://github.com/starkware-libs/stwo-cairo", rev = "8a3950c2" }
+stwo_cairo_dev_utils = { package = "stwo-cairo-dev-utils", git = "https://github.com/starkware-libs/stwo-cairo", rev = "8a3950c2" }
+stwo_cairo_utils = { package = "stwo-cairo-utils", git = "https://github.com/starkware-libs/stwo-cairo", rev = "8a3950c2" }
 
 # local crates
 circuits = { path = "crates/circuits"}

Cargo.toml

@@ -17,6 +17,7 @@ circuits-stark-verifier.workspace = true
 serde_json.workspace = true
 
 [dev-dependencies]
+cairo-vm = "3.2.0"
 stwo_cairo_prover.workspace = true
 stwo_cairo_dev_utils.workspace = true
 stwo_cairo_utils.workspace = true

crates/cairo_air/Cargo.toml

@@ -147,6 +147,15 @@ pub fn all_components<Value: IValue>() -> IndexMap<&'static str, Box<dyn Circuit
             "range_check_builtin",
             Box::new(components::range_check_builtin::Component {}) as Box<dyn CircuitEval<Value>>,
         ),
+        (
+            "ec_op_builtin",
+            Box::new(components::ec_op_builtin::Component {}) as Box<dyn CircuitEval<Value>>,
+        ),
+        (
+            "partial_ec_mul_generic",
+            Box::new(components::partial_ec_mul_generic::Component {})
+                as Box<dyn CircuitEval<Value>>,
+        ),
         (
             "pedersen_aggregator_window_bits_18",
             Box::new(components::pedersen_aggregator_window_bits_18::Component {})

crates/cairo_air/src/all_components.rs

@@ -1,4 +1,3 @@
-use cairo_air::PreProcessedTraceVariant;
 use cairo_air::verifier::INTERACTION_POW_BITS;
 use circuits::ivalue::NoValue;
 use circuits_stark_verifier::constraint_eval::CircuitEval;
@@ -8,6 +7,7 @@ use indexmap::IndexMap;
 use std::collections::HashSet;
 use stwo::core::fri::FriConfig;
 use stwo::core::pcs::PcsConfig;
+use stwo_cairo_common::preprocessed_columns::preprocessed_trace::PreProcessedTraceVariant;
 
 use crate::all_components::all_components;
 use crate::utils::{get_test_data_dir, load_program};

crates/cairo_air/src/privacy.rs

@@ -85,6 +85,12 @@ fn test_verify_privacy() {
 
 #[test]
 fn test_verify_privacy_with_recursion() {
+    // The proof file was generated from the proving-utils repo using:
+    // cargo run -r --bin stwo-run-and-prove -- \
+    //     --prover_params_json ../stwo-circuits/test_data/privacy/prover_params.json \
+    //     --program ../stwo-circuits/test_data/privacy/privacy_simple_bootloader_compiled.json \
+    //     --program_input ../stwo-circuits/test_data/privacy/program_input.json \
+    //     --proof_path ../stwo-circuits/test_data/privacy/proof.bin --proof-format extended-binary
     let proof_path = get_proof_file_path("privacy");
     let proof_file = File::open(proof_path).unwrap();
     let cairo_proof = binary_deserialize_from_file(&proof_file).unwrap();

crates/cairo_air/src/privacy_test.rs

@@ -1,4 +1,4 @@
-// AIR version 42672126
+// AIR version 77f11bb4
 use stwo::core::fields::{cm31::CM31, m31::M31, qm31::QM31};
 pub const ADD_AP_OPCODE_SAMPLE_EVAL_RESULT: QM31 =
     QM31(CM31(M31(1435814162), M31(1618992457)), CM31(M31(840348268), M31(442754761)));

crates/cairo_air/src/sample_evaluations.rs

@@ -3,7 +3,6 @@ use std::collections::HashMap;
 use std::sync::Arc;
 
 use crate::preprocessed_columns::MAX_SEQUENCE_LOG_SIZE;
-use cairo_air::PreProcessedTraceVariant;
 use cairo_air::components::memory_address_to_id::MEMORY_ADDRESS_TO_ID_SPLIT;
 use cairo_air::relations::{
     MEMORY_ADDRESS_TO_ID_RELATION_ID, MEMORY_ID_TO_BIG_RELATION_ID, OPCODES_RELATION_ID,
@@ -29,6 +28,7 @@ use stwo_cairo_common::builtins::{
     BITWISE_BUILTIN_MEMORY_CELLS, PEDERSEN_BUILTIN_MEMORY_CELLS, POSEIDON_BUILTIN_MEMORY_CELLS,
     RANGE_CHECK_BUILTIN_MEMORY_CELLS,
 };
+use stwo_cairo_common::preprocessed_columns::preprocessed_trace::PreProcessedTraceVariant;
 use stwo_constraint_framework::preprocessed_columns::PreProcessedColumnId;
 
 #[cfg(test)]

crates/cairo_air/src/statement.rs

@@ -4,10 +4,10 @@ use std::fs::{File, OpenOptions};
 use std::sync::Arc;
 
 use cairo_air::CairoProof;
-use cairo_air::PreProcessedTraceVariant;
 use cairo_air::flat_claims::FlatClaim;
 use cairo_air::utils::{binary_deserialize_from_file, binary_serialize_to_file};
 use cairo_air::verifier::INTERACTION_POW_BITS;
+use cairo_vm::types::layout_name::LayoutName;
 use circuits::context::Context;
 use circuits::ivalue::NoValue;
 use circuits::ops::Guess;
@@ -23,6 +23,7 @@ use stwo::core::fields::qm31::QM31;
 use stwo::core::fri::FriConfig;
 use stwo::core::pcs::PcsConfig;
 use stwo::core::vcs_lifted::blake2_merkle::{Blake2sM31MerkleChannel, Blake2sM31MerkleHasher};
+use stwo_cairo_common::preprocessed_columns::preprocessed_trace::PreProcessedTraceVariant;
 use stwo_cairo_dev_utils::utils::get_compiled_cairo_program_path;
 use stwo_cairo_dev_utils::vm_utils::{ProgramType, run_and_adapt};
 use stwo_cairo_prover::prover::{ChannelHash, ProverParameters, prove_cairo};
@@ -156,7 +157,9 @@ fn test_verify_all_opcodes() {
     if std::env::var("FIX_PROOF").is_ok() {
         let compiled_program =
             get_compiled_cairo_program_path("test_prove_verify_all_opcode_components");
-        let input = run_and_adapt(&compiled_program, ProgramType::Json, None).unwrap();
+        let input =
+            run_and_adapt(&compiled_program, ProgramType::Json, LayoutName::all_cairo_stwo, None)
+                .unwrap();
         let prover_params = ProverParameters {
             channel_hash: ChannelHash::Blake2sM31,
             pcs_config: PcsConfig {

crates/cairo_air/src/test.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 use crate::all_components::all_components;
 use crate::statement::{CairoStatement, MEMORY_VALUES_LIMBS, PUBLIC_DATA_LEN};
 use cairo_air::CairoProof;
-use cairo_air::PreProcessedTraceVariant;
 use cairo_air::air::PublicData;
 use cairo_air::flat_claims::FlatClaim;
 use circuits::blake::HashValue;
@@ -21,6 +20,7 @@ use num_traits::Zero;
 use stwo::core::fields::m31::M31;
 use stwo::core::fields::qm31::QM31;
 use stwo::core::vcs_lifted::blake2_merkle::Blake2sM31MerkleHasher;
+use stwo_cairo_common::preprocessed_columns::preprocessed_trace::PreProcessedTraceVariant;
 
 /// Logup security is defined by the `QM31` space (~124 bits) + `INTERACTION_POW_BITS` -
 /// log2(number of relation terms).