Merge pull request #57 from tdelabro/verify-return-all-output

feat: verifier returns all outputs rather than their hash
iosis-tech · Jan 9, 2025 · f7c539f · f7c539f
2 parents ccd16d3 + f151e66
commit f7c539f
Show file tree

Hide file tree

Showing 13 changed files with 104 additions and 52 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cli/Cargo.lock b/cli/Cargo.lock
diff --git a/cli/Cargo.toml b/cli/Cargo.toml
@@ -9,6 +9,7 @@ version = "0.1.3"
 
 [dependencies]
 clap = { version = "4.4.4", features = ["derive"] }
+starknet-core = "0.12.0"
 
 swiftness_air = { path = "../crates/air", default-features = false, features = [
     "std",
@@ -68,4 +69,4 @@ blake2s_160_lsb = [
 blake2s_248_lsb = [
     "swiftness_air/blake2s_248_lsb",
     "swiftness_stark/blake2s_248_lsb",
-]
+]
diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -27,13 +27,24 @@ struct CairoVMVerifier {
     /// Path to proof JSON file
     #[clap(short, long)]
     proof: PathBuf,
+    /// Whether to print the pedersen hash of the output instead of the full output.
+    #[clap(short = 'o', long, num_args=0..=1, default_missing_value = "true")]
+    print_output_hash: Option<bool>,
 }
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     let cli = CairoVMVerifier::parse();
     let stark_proof = parse(std::fs::read_to_string(cli.proof)?)?.transform_to();
     let security_bits = stark_proof.config.security_bits();
-    let result = stark_proof.verify::<Layout>(security_bits)?;
-    println!("{:?}", result);
+    let (program_hash, program_output) = stark_proof.verify::<Layout>(security_bits)?;
+
+    println!("program hash: {:#x}", program_hash);
+    if let Some(true) = cli.print_output_hash {
+        let hash = starknet_core::crypto::compute_hash_on_elements(&program_output);
+        println!("program output hash: {:#x}", hash);
+    } else {
+        println!("program output: {:x?}", program_output);
+    }
+
     Ok(())
 }
diff --git a/crates/air/src/layout/dex/mod.rs b/crates/air/src/layout/dex/mod.rs
@@ -353,7 +353,9 @@ impl LayoutTrait for Layout {
         Ok(())
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -405,10 +407,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &Felt::from(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into()?;
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &Felt::from(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }
diff --git a/crates/air/src/layout/dynamic/mod.rs b/crates/air/src/layout/dynamic/mod.rs
@@ -726,7 +726,9 @@ impl LayoutTrait for Layout {
         Ok(autogenerated::check_asserts(&dynamic_params, stark_domains)?)
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -778,10 +780,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &felt!(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into()?;
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &felt!(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }
diff --git a/crates/air/src/layout/mod.rs b/crates/air/src/layout/mod.rs
@@ -1,4 +1,5 @@
 use crate::{domains::StarkDomains, public_memory::PublicInput};
+use alloc::vec::Vec;
 use num_bigint::{BigInt, TryFromBigIntError};
 use starknet_core::types::NonZeroFelt;
 use starknet_crypto::Felt;
@@ -84,7 +85,9 @@ pub trait LayoutTrait {
         witness: crate::trace::Witness,
     ) -> Result<(), crate::trace::decommit::Error>;
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError>;
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError>;
 }
 
 pub trait StaticLayoutTrait {

diff --git a/crates/air/src/layout/recursive/mod.rs b/crates/air/src/layout/recursive/mod.rs
@@ -353,7 +353,9 @@ impl LayoutTrait for Layout {
         Ok(())
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -405,10 +407,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &Felt::from(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into()?;
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &Felt::from(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }
diff --git a/crates/air/src/layout/recursive_with_poseidon/mod.rs b/crates/air/src/layout/recursive_with_poseidon/mod.rs
@@ -410,7 +410,9 @@ impl LayoutTrait for Layout {
         Ok(())
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -462,10 +464,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &Felt::from(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into()?;
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &Felt::from(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }
diff --git a/crates/air/src/layout/small/mod.rs b/crates/air/src/layout/small/mod.rs
@@ -353,7 +353,9 @@ impl LayoutTrait for Layout {
         Ok(())
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -405,10 +407,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &Felt::from(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into()?;
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &Felt::from(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }
diff --git a/crates/air/src/layout/starknet/mod.rs b/crates/air/src/layout/starknet/mod.rs
@@ -480,7 +480,9 @@ impl LayoutTrait for Layout {
         Ok(())
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -532,10 +534,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &Felt::from(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into()?;
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &Felt::from(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }
diff --git a/crates/air/src/layout/starknet_with_keccak/mod.rs b/crates/air/src/layout/starknet_with_keccak/mod.rs
@@ -529,7 +529,9 @@ impl LayoutTrait for Layout {
         Ok(())
     }
 
-    fn verify_public_input(public_input: &PublicInput) -> Result<(Felt, Felt), PublicInputError> {
+    fn verify_public_input(
+        public_input: &PublicInput,
+    ) -> Result<(Felt, Vec<Felt>), PublicInputError> {
         let public_segments = &public_input.segments;
 
         let initial_pc = public_segments
@@ -581,10 +583,9 @@ impl LayoutTrait for Layout {
         let program_hash = pedersen_hash(&hash, &Felt::from(program.len()));
 
         let output_len: usize = (output_stop - output_start).to_bigint().try_into().unwrap();
-        let output = &memory[memory.len() - output_len * 2..];
-        let hash = output.iter().skip(1).step_by(2).fold(FELT_0, |acc, e| pedersen_hash(&acc, e));
-        let output_hash = pedersen_hash(&hash, &Felt::from(output_len));
+        let output =
+            memory[memory.len() - output_len * 2..].iter().skip(1).step_by(2).cloned().collect();
 
-        Ok((program_hash, output_hash))
+        Ok((program_hash, output))
     }
 }