gkr and keccak example works

scroll-tech · Jul 11, 2024 · 5874771 · 5874771
1 parent 24fd98f
commit 5874771
Show file tree

Hide file tree

Showing 29 changed files with 806 additions and 4,262 deletions.
diff --git a/gkr-graph/src/circuit_graph_builder.rs b/gkr-graph/src/circuit_graph_builder.rs
@@ -2,7 +2,7 @@ use std::{collections::BTreeSet, sync::Arc};
 
 use ark_std::Zero;
 use ff_ext::ExtensionField;
-use gkr::structs::{Circuit, CircuitWitnessV2};
+use gkr::structs::{Circuit, CircuitWitness};
 use itertools::{chain, izip, Itertools};
 use multilinear_extensions::{
     mle::DenseMultilinearExtension, virtual_poly_v2::ArcMultilinearExtension,
@@ -60,7 +60,7 @@ impl<'a, E: ExtensionField> CircuitGraphBuilder<'a, E> {
                 .collect_vec()
         );
 
-        let mut witness = CircuitWitnessV2::new(circuit, challenges);
+        let mut witness = CircuitWitness::new(circuit, challenges);
         let wits_in = izip!(preds.iter(), sources.into_iter())
             .map(|(pred, source)| match pred {
                 PredType::Source => source.into(),

diff --git a/gkr-graph/src/structs.rs b/gkr-graph/src/structs.rs
@@ -1,10 +1,10 @@
 use ff_ext::ExtensionField;
-use gkr::structs::{Circuit, CircuitWitnessV2, PointAndEval};
+use gkr::structs::{Circuit, CircuitWitness, PointAndEval};
 use simple_frontend::structs::WitnessId;
 use std::{marker::PhantomData, sync::Arc};
 
-pub(crate) type GKRProverState<F> = gkr::structs::IOPProverStateV2<F>;
-pub(crate) type GKRVerifierState<F> = gkr::structs::IOPVerifierStateV2<F>;
+pub(crate) type GKRProverState<F> = gkr::structs::IOPProverState<F>;
+pub(crate) type GKRVerifierState<F> = gkr::structs::IOPVerifierState<F>;
 pub(crate) type GKRProof<F> = gkr::structs::IOPProof<F>;
 
 /// Corresponds to the `output_evals` and `wires_out_evals` in gkr
@@ -60,7 +60,7 @@ pub struct CircuitGraph<E: ExtensionField> {
 
 #[derive(Default)]
 pub struct CircuitGraphWitness<'a, E: ExtensionField> {
-    pub node_witnesses: Vec<Arc<CircuitWitnessV2<'a, E>>>,
+    pub node_witnesses: Vec<Arc<CircuitWitness<'a, E>>>,
 }
 
 pub struct CircuitGraphBuilder<'a, E: ExtensionField> {

diff --git a/gkr/examples/keccak256.rs b/gkr/examples/keccak256.rs
@@ -7,7 +7,7 @@ use ff::Field;
 use ff_ext::ExtensionField;
 use gkr::{
     gadgets::keccak256::{keccak256_circuit, prove_keccak256, verify_keccak256},
-    structs::CircuitWitnessV2,
+    structs::CircuitWitness,
     util::ceil_log2,
 };
 use goldilocks::GoldilocksExt2;
@@ -75,7 +75,7 @@ fn main() {
             DenseMultilinearExtension::from_evaluations_vec(ceil_log2(wit_in.len()), wit_in)
         })
         .collect();
-        let mut witness = CircuitWitnessV2::new(&circuit, Vec::new());
+        let mut witness = CircuitWitness::new(&circuit, Vec::new());
         witness.add_instance(&circuit, all_zero);
         witness.add_instance(&circuit, all_one);
 

diff --git a/gkr/src/circuit.rs b/gkr/src/circuit.rs
@@ -7,7 +7,6 @@ use crate::structs::{Gate1In, Gate2In, Gate3In, GateCIn};
 
 mod circuit_layout;
 mod circuit_witness;
-mod circuit_witness_v2;
 
 pub trait EvaluateGateCIn<E>
 where