Expose proof module

o1-labs · Nov 16, 2023 · 6206115 · 6206115
1 parent de77773
commit 6206115
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/optimism/Cargo.toml b/optimism/Cargo.toml
@@ -26,6 +26,9 @@ serde = "1.0.130"
 serde_with = "1.10.0"
 ark-poly = { version = "0.3.0", features = [ "parallel" ] }
 ark-ff = { version = "0.3.0", features = [ "parallel" ] }
+ark-ec = { version = "0.3.0", features = [ "parallel" ] }
+ark-serialize = "0.3.0"
+o1-utils = { path = "../utils", version = "0.1.0" }
 clap = "4.4.6"
 hex = "0.4.3"
 regex = "1.10.2"

diff --git a/optimism/src/lib.rs b/optimism/src/lib.rs
@@ -1,3 +1,4 @@
 pub mod cannon;
 pub mod prover_index;
+pub mod proof;
 pub mod mips;
diff --git a/optimism/src/proof.rs b/optimism/src/proof.rs
@@ -1,9 +1,11 @@
-use crate::circuits::expr::{ColumnEvaluations, ExprError};
+use kimchi::circuits::expr::{ColumnEvaluations, ExprError};
 use crate::mips::columns::{
-    Column, FixedColumns, InstructionParts, InstructionSelectors, LookupCounters, NUM_LOOKUP_TERMS,
-    SCRATCH_SIZE,
+    Column, FixedColumns, LookupCounters
 };
-use crate::proof::PointEvaluations;
+use crate::mips::interpreter::{InstructionParts, InstructionSelectors};
+use crate::mips::{SCRATCH_SIZE, NUM_LOOKUP_TERMS};
+
+use kimchi::proof::PointEvaluations;
 use ark_ec::AffineCurve;
 use poly_commitment::{commitment::PolyComm, evaluation_proof::OpeningProof};
 use serde::{Deserialize, Serialize};
@@ -140,7 +142,7 @@ impl<G: AffineCurve> Proof<G> {
             ft_eval1,
             t_comm,
             commitments,
-            evaluations: evaluations.map(&f),
+            evaluations: evaluations.map(f),
         }
     }
 }
@@ -160,7 +162,7 @@ impl<G: AffineCurve> SerializableProof<G> {
             ft_eval1,
             t_comm,
             commitments,
-            evaluations: evaluations.map(&f),
+            evaluations: evaluations.map(f),
         }
     }
 }