starkware-libs · m-kus · Jun 5, 2025 · May 28, 2025
diff --git a/stwo_cairo_prover/Cargo.lock b/stwo_cairo_prover/Cargo.lock
diff --git a/stwo_cairo_prover/Cargo.toml b/stwo_cairo_prover/Cargo.toml
@@ -34,6 +34,7 @@ rand = "0.8.5"
 ruint = "1.12.3"
 serde = "1.0.207"
 serde_json = "1.0.1"
+sonic-rs = "0.3.17"
 starknet-ff = "0.3.7"
 starknet-types-core = "0.1.7"
 stwo_cairo_prover = { path = "crates/prover", version = "~0.1.0" }

diff --git a/stwo_cairo_prover/crates/cairo-air/Cargo.toml b/stwo_cairo_prover/crates/cairo-air/Cargo.toml
@@ -5,6 +5,8 @@ edition.workspace = true
 
 [dependencies]
 itertools.workspace = true
+clap.workspace = true
+sonic-rs.workspace = true
 log.workspace = true
 num-traits.workspace = true
 paste.workspace = true
@@ -20,6 +22,7 @@ stwo-cairo-serialize = { path = "../cairo-serialize" }
 stwo-prover.workspace = true
 thiserror.workspace = true
 serde_json.workspace = true
+tracing.workspace = true
 
 [dev-dependencies]
 rand.workspace = true
diff --git a/stwo_cairo_prover/crates/cairo-air/src/lib.rs b/stwo_cairo_prover/crates/cairo-air/src/lib.rs
@@ -15,6 +15,7 @@ pub mod preprocessed;
 pub mod preprocessed_utils;
 pub mod range_checks_air;
 pub mod relations;
+pub mod utils;
 
 // TODO(Ohad): verifier crate.
 pub mod verifier;

diff --git a/stwo_cairo_prover/crates/cairo-air/src/utils.rs b/stwo_cairo_prover/crates/cairo-air/src/utils.rs
@@ -0,0 +1,56 @@
+use std::fs::File;
+use std::io::Write;
+use std::path::PathBuf;
+
+use serde::Serialize;
+use stwo_cairo_serialize::CairoSerialize;
+use stwo_prover::core::channel::MerkleChannel;
+use stwo_prover::core::vcs::ops::MerkleHasher;
+use tracing::{span, Level};
+
+use crate::CairoProof;
+
+/// Cairo proof format
+#[derive(Debug, Clone, clap::ValueEnum)]
+pub enum ProofFormat {
+    /// Standard JSON format.
+    Json,
+    /// Array of field elements serialized as hex strings.
+    /// Compatible with `scarb execute`
+    CairoSerde,
+}
+
+/// Serializes Cairo proof given the desired format and writes it to a file.
+pub fn serialize_proof_to_file<MC: MerkleChannel>(
+    proof: &CairoProof<MC::H>,
+    proof_path: PathBuf,
+    proof_format: ProofFormat,
+) -> Result<(), std::io::Error>
+where
+    MC::H: Serialize,
+    <MC::H as MerkleHasher>::Hash: CairoSerialize,
+{
+    let span = span!(Level::INFO, "Serialize proof").entered();
+
+    let mut proof_file = File::create(proof_path)?;
+
+    match proof_format {
+        ProofFormat::Json => {
+            proof_file.write_all(sonic_rs::to_string_pretty(proof)?.as_bytes())?;
+        }
+        ProofFormat::CairoSerde => {
+            let mut serialized: Vec<starknet_ff::FieldElement> = Vec::new();
+            CairoSerialize::serialize(proof, &mut serialized);
+
+            let hex_strings: Vec<String> = serialized
+                .into_iter()
+                .map(|felt| format!("0x{:x}", felt))
+                .collect();
+
+            proof_file.write_all(sonic_rs::to_string_pretty(&hex_strings)?.as_bytes())?;
+        }
+    }
+
+    span.exit();
+    Ok(())
+}
diff --git a/stwo_cairo_prover/crates/dev_utils/Cargo.toml b/stwo_cairo_prover/crates/dev_utils/Cargo.toml
@@ -8,7 +8,7 @@ cairo-air.workspace = true
 clap.workspace = true
 serde.workspace = true
 starknet-ff.workspace = true
-sonic-rs = "0.3.17"
+sonic-rs.workspace = true
 stwo-cairo-adapter = {path= "../adapter", features = ["std"]}
 stwo-cairo-serialize.workspace = true
 stwo-prover.workspace = true
@@ -17,4 +17,3 @@ tracing-subscriber.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
 log.workspace = true
-
diff --git a/stwo_cairo_prover/crates/dev_utils/src/bin/prove_from_compiled_program.rs b/stwo_cairo_prover/crates/dev_utils/src/bin/prove_from_compiled_program.rs
@@ -1,7 +1,8 @@
 use std::path::PathBuf;
 
+use cairo_air::utils::ProofFormat;
 use clap::Parser;
-use dev_utils::utils::{create_and_serialize_proof, Error, ProofFormat};
+use dev_utils::utils::{create_and_serialize_proof, Error};
 use stwo_cairo_adapter::test_utils::{read_compiled_cairo_program, run_program_and_adapter};
 use tracing::{span, Level};
 use tracing_subscriber::fmt::format::FmtSpan;

diff --git a/stwo_cairo_prover/crates/dev_utils/src/utils.rs b/stwo_cairo_prover/crates/dev_utils/src/utils.rs
@@ -1,7 +1,6 @@
-use std::fs::File;
-use std::io::Write;
 use std::path::PathBuf;
 
+use cairo_air::utils::{serialize_proof_to_file, ProofFormat};
 use cairo_air::verifier::{verify_cairo, CairoVerificationError};
 use cairo_air::PreProcessedTraceVariant;
 use serde::Serialize;
@@ -20,16 +19,6 @@ use stwo_prover::core::vcs::blake2_merkle::Blake2sMerkleChannel;
 use stwo_prover::core::vcs::ops::MerkleHasher;
 use stwo_prover::core::vcs::poseidon252_merkle::Poseidon252MerkleChannel;
 use thiserror::Error;
-use tracing::{span, Level};
-
-#[derive(Debug, Clone, clap::ValueEnum)]
-pub enum ProofFormat {
-    /// Standard JSON format.
-    Json,
-    /// Array of field elements serialized as hex strings.
-    /// Compatible with `scarb execute`
-    CairoSerde,
-}
 
 #[derive(Debug, Error)]
 pub enum Error {
@@ -64,26 +53,9 @@ where
     <MC::H as MerkleHasher>::Hash: CairoSerialize,
 {
     let proof = prove_cairo::<MC>(input, pcs_config, preprocessed_trace)?;
-    let mut proof_file = File::create(proof_path)?;
 
-    let span = span!(Level::INFO, "Serialize proof").entered();
-    match proof_format {
-        ProofFormat::Json => {
-            proof_file.write_all(sonic_rs::to_string_pretty(&proof)?.as_bytes())?;
-        }
-        ProofFormat::CairoSerde => {
-            let mut serialized: Vec<starknet_ff::FieldElement> = Vec::new();
-            CairoSerialize::serialize(&proof, &mut serialized);
+    serialize_proof_to_file::<MC>(&proof, proof_path, proof_format)?;
 
-            let hex_strings: Vec<String> = serialized
-          
60DC
      .into_iter()
-                .map(|felt| format!("0x{:x}", felt))
-                .collect();
-
-            proof_file.write_all(sonic_rs::to_string_pretty(&hex_strings)?.as_bytes())?;
-        }
-    }
-    span.exit();
     if verify {
         verify_cairo::<MC>(proof, pcs_config, preprocessed_trace)?;
         log::info!("Proof verified successfully");