Public input rebase (#108)

* public input

* fmt

* clippy

* M31+BN w/ public input

Signed-off-by: Zhiyong Fang <[email protected]>

* update downloading script

Signed-off-by: Zhiyong Fang <[email protected]>

* correct bn circuit

Signed-off-by: Zhiyong Fang <[email protected]>

* fix error

Signed-off-by: Zhiyong Fang <[email protected]>

* fmt

Signed-off-by: Zhiyong Fang <[email protected]>

* fix

Signed-off-by: Zhiyong Fang <[email protected]>

* Update expander_circuit.rs

Signed-off-by: Zhiyong Fang <[email protected]>

* check modulus when loading ecc circuit

* correct url addresses for poseidon circuit

---------

Signed-off-by: Zhiyong Fang <[email protected]>
Co-authored-by: siq1 <[email protected]>
Co-authored-by: zhenfei <[email protected]>

Author: 3 people

Cargo.toml

@@ -20,6 +20,7 @@ rand.workspace = true
 sha2.workspace = true
 halo2curves.workspace = true
 thiserror.workspace = true
+ethnum.workspace = true
 
 # for the server
 bytes.workspace = true

arith/gf2/src/gf2.rs

@@ -8,7 +8,6 @@ use std::ops::{Add, AddAssign, Mul, MulAssign, Neg, Sub, SubAssign};
 
 use arith::{field_common, FieldSerde, FieldSerdeResult};
 use arith::{Field, FieldForECC};
-use ark_std::iterable::Iterable;
 
 pub const MOD: u32 = 2;
 
@@ -36,15 +35,8 @@ impl FieldSerde for GF2 {
     }
 
     #[inline(always)]
-    fn try_deserialize_from_ecc_format<R: Read>(mut reader: R) -> FieldSerdeResult<Self> {
-        let mut u = [0u8; 32];
-        reader.read_exact(&mut u)?;
-
-        // FIXME:
-        // assert!(u.iter().skip(1).all(|x| x == 0u8));
-        assert!(u.iter().skip(4).all(|x| x == 0u8));
-
-        Ok(GF2 { v: u[0] % 2 })
+    fn try_deserialize_from_ecc_format<R: Read>(reader: R) -> FieldSerdeResult<Self> {
+        Self::deserialize_from(reader)
     }
 }
 

arith/mersenne31/src/m31.rs

@@ -47,15 +47,9 @@ impl FieldSerde for M31 {
         Ok(M31 { v })
     }
 
-    #[inline]
-    fn try_deserialize_from_ecc_format<R: Read>(mut reader: R) -> FieldSerdeResult<Self> {
-        let mut buf = [0u8; 32];
-        reader.read_exact(&mut buf)?;
-        assert!(
-            buf.iter().skip(4).all(|&x| x == 0),
-            "non-zero byte found in witness byte"
-        );
-        Ok(Self::from(u32::from_le_bytes(buf[..4].try_into().unwrap())))
+    #[inline(always)]
+    fn try_deserialize_from_ecc_format<R: Read>(reader: R) -> FieldSerdeResult<Self> {
+        Self::deserialize_from(reader)
     }
 }
 

arith/src/bn254.rs

@@ -166,14 +166,9 @@ impl FieldSerde for Fr {
         }
     }
 
-    #[inline]
-    fn try_deserialize_from_ecc_format<R: Read>(mut reader: R) -> FieldSerdeResult<Self> {
-        let mut buffer = [0u8; Self::SERIALIZED_SIZE];
-        reader.read_exact(&mut buffer)?;
-        match Fr::from_bytes(&buffer).into_option() {
-            Some(v) => Ok(v),
-            None => Err(FieldSerdeError::DeserializeError),
-        }
+    #[inline(always)]
+    fn try_deserialize_from_ecc_format<R: Read>(reader: R) -> FieldSerdeResult<Self> {
+        Self::deserialize_from(reader)
     }
 }
 

arith/src/serde.rs

@@ -26,24 +26,59 @@ pub trait FieldSerde: Sized {
     fn try_deserialize_from_ecc_format<R: Read>(reader: R) -> FieldSerdeResult<Self>;
 }
 
-impl FieldSerde for u64 {
-    /// size of the serialized bytes
-    const SERIALIZED_SIZE: usize = 8;
+macro_rules! field_serde_for_integer {
+    ($int_type: ident, $size_in_bytes: expr) => {
+        impl FieldSerde for $int_type {
+            /// size of the serialized bytes
+            const SERIALIZED_SIZE: usize = $size_in_bytes;
+
+            /// serialize u64 into bytes
+            fn serialize_into<W: Write>(&self, mut writer: W) -> FieldSerdeResult<()> {
+                writer.write_all(&self.to_le_bytes())?;
+                Ok(())
+            }
+
+            /// deserialize bytes into u64
+            fn deserialize_from<R: Read>(mut reader: R) -> FieldSerdeResult<Self> {
+                let mut buffer = [0u8; Self::SERIALIZED_SIZE];
+                reader.read_exact(&mut buffer)?;
+                Ok($int_type::from_le_bytes(buffer))
+            }
+
+            fn try_deserialize_from_ecc_format<R: Read>(_reader: R) -> FieldSerdeResult<Self> {
+                unimplemented!("not implemented")
+            }
+        }
+    };
+}
+
+field_serde_for_integer!(u64, 8);
+field_serde_for_integer!(usize, 8);
+field_serde_for_integer!(u8, 1);
+
+// Consider use const generics after it gets stable
+impl FieldSerde for [u64; 4] {
+    const SERIALIZED_SIZE: usize = 32;
 
-    /// serialize u64 into bytes
     fn serialize_into<W: Write>(&self, mut writer: W) -> FieldSerdeResult<()> {
-        writer.write_all(&self.to_le_bytes())?;
+        for i in self {
+            writer.write_all(&i.to_le_bytes())?;
+        }
         Ok(())
     }
 
-    /// deserialize bytes into u64
     fn deserialize_from<R: Read>(mut reader: R) -> FieldSerdeResult<Self> {
-        let mut buffer = [0u8; Self::SERIALIZED_SIZE];
-        reader.read_exact(&mut buffer)?;
-        Ok(u64::from_le_bytes(buffer))
+        let mut ret = [0u64; 4];
+        let mut buffer = [0u8; u64::SERIALIZED_SIZE];
+
+        for r in &mut ret {
+            reader.read_exact(&mut buffer)?;
+            *r = u64::from_le_bytes(buffer);
+        }
+        Ok(ret)
     }
 
     fn try_deserialize_from_ecc_format<R: Read>(_reader: R) -> FieldSerdeResult<Self> {
-        unimplemented!("not implemented for u64")
+        unimplemented!()
     }
 }

benches/gkr_hashes.rs

@@ -1,5 +1,8 @@
 use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
-use expander_rs::utils::{KECCAK_M31_CIRCUIT, POSEIDON_CIRCUIT};
+use expander_rs::utils::{
+    KECCAK_BN254_CIRCUIT, KECCAK_BN254_WITNESS, KECCAK_M31_CIRCUIT, KECCAK_M31_WITNESS,
+    POSEIDON_BN254_CIRCUIT, POSEIDON_M31_CIRCUIT,
+};
 use expander_rs::{
     BN254ConfigSha2, Circuit, Config, GKRConfig, GKRScheme, M31ExtConfigSha2, MPIConfig, Prover,
 };
@@ -11,18 +14,33 @@ fn prover_run<C: GKRConfig>(config: &Config<C>, circuit: &mut Circuit<C>) {
     prover.prove(circuit);
 }
 
-fn benchmark_setup<C: GKRConfig>(scheme: GKRScheme, circuit_file: &str) -> (Config<C>, Circuit<C>) {
+fn benchmark_setup<C: GKRConfig>(
+    scheme: GKRScheme,
+    circuit_file: &str,
+    witness_file: Option<&str>,
+) -> (Config<C>, Circuit<C>) {
     let config = Config::<C>::new(scheme, MPIConfig::new());
     let mut circuit = Circuit::<C>::load_circuit(circuit_file);
-    circuit.set_random_input_for_test();
+    if witness_file.is_some() {
+        circuit.load_witness_file(witness_file.unwrap());
+    } else {
+        circuit.set_random_input_for_test();
+    }
     (config, circuit)
 }
 
 fn criterion_gkr_keccak(c: &mut Criterion) {
-    let (m31_config, mut m31_circuit) =
-        benchmark_setup::<M31ExtConfigSha2>(GKRScheme::Vanilla, KECCAK_M31_CIRCUIT);
-    let (bn254_config, mut bn254_circuit) =
-        benchmark_setup::<BN254ConfigSha2>(GKRScheme::Vanilla, KECCAK_M31_CIRCUIT);
+    let (m31_config, mut m31_circuit) = benchmark_setup::<M31ExtConfigSha2>(
+        GKRScheme::Vanilla,
+        KECCAK_M31_CIRCUIT,
+        Some(KECCAK_M31_WITNESS),
+    );
+    let (bn254_config, mut bn254_circuit) = benchmark_setup::<BN254ConfigSha2>(
+        GKRScheme::Vanilla,
+        KECCAK_BN254_CIRCUIT,
+        Some(KECCAK_BN254_WITNESS),
+    );
+
     let num_keccak_m31 = 2 * M31ExtConfigSha2::get_field_pack_size();
     let num_keccak_bn254 = 2 * BN254ConfigSha2::get_field_pack_size();
 
@@ -66,9 +84,9 @@ fn criterion_gkr_keccak(c: &mut Criterion) {
 
 fn criterion_gkr_poseidon(c: &mut Criterion) {
     let (m31_config, mut m31_circuit) =
-        benchmark_setup::<M31ExtConfigSha2>(GKRScheme::GkrSquare, POSEIDON_CIRCUIT);
+        benchmark_setup::<M31ExtConfigSha2>(GKRScheme::GkrSquare, POSEIDON_M31_CIRCUIT, None);
     let (bn254_config, mut bn254_circuit) =
-        benchmark_setup::<BN254ConfigSha2>(GKRScheme::GkrSquare, POSEIDON_CIRCUIT);
+        benchmark_setup::<BN254ConfigSha2>(GKRScheme::GkrSquare, POSEIDON_BN254_CIRCUIT, None);
 
     let mut group = c.benchmark_group("single thread proving poseidon by GKR^2");
     let num_poseidon_m31 = 120 * M31ExtConfigSha2::get_field_pack_size();

src/circuit.rs

@@ -6,3 +6,9 @@ pub use ecc_circuit::*;
 
 mod expander_circuit;
 pub use expander_circuit::*;
+
+mod witness;
+pub use witness::*;
+
+mod serde;
+pub use serde::*;