feat: verifier returns all outputs rather than their hash

iosis-tech · Jan 9, 2025 · 9407640 · 9407640
1 parent ccd16d3
commit 9407640
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 37 deletions.
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))
     }
 }
diff --git a/crates/stark/src/stark.rs b/crates/stark/src/stark.rs
@@ -1,6 +1,7 @@
 use crate::{
     commit::stark_commit, queries::generate_queries, types::StarkProof, verify::stark_verify,
 };
+use alloc::vec::Vec;
 use starknet_crypto::Felt;
 use swiftness_air::{
     domains::StarkDomains,
@@ -12,7 +13,7 @@ impl StarkProof {
     pub fn verify<Layout: GenericLayoutTrait + LayoutTrait>(
         &self,
         security_bits: Felt,
-    ) -> Result<(Felt, Felt), Error> {
+    ) -> Result<(Felt, Vec<Felt>), Error> {
         let n_original_columns =
             Layout::get_num_columns_first(&self.public_input).ok_or(Error::ColumnMissing)?;
         let n_interaction_columns =