feat: wrap g16 api (0xEigenLabs#145)

* chore: change curve naming to uppercase format (0xEigenLabs#142) * feat: move api from zkit to g16 --------- Co-authored-by: ibmp33 <[email protected]>
SuccinctPaul · Oct 28, 2023 · b998be6 · b998be6
1 parent fa36961
commit b998be6
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/zkit/src/groth16_api.rs → groth16/src/api.rs b/zkit/src/groth16_api.rs → groth16/src/api.rs
@@ -1,12 +1,4 @@
-use algebraic::{
-    bellman_ce::Engine,
-    circom_circuit::CircomCircuit,
-    errors::{EigenError, Result},
-    reader::load_r1cs,
-    witness::{load_input_for_witness, WitnessCalculator},
-    Field, PrimeField,
-};
-use groth16::{
+use crate::{
     bellman_ce::{
         groth16::{Parameters, Proof, VerifyingKey},
         pairing::{
@@ -17,6 +9,14 @@ use groth16::{
     groth16::Groth16,
     json_utils::*,
 };
+use algebraic::{
+    bellman_ce::Engine,
+    circom_circuit::CircomCircuit,
+    errors::{EigenError, Result},
+    reader::load_r1cs,
+    witness::{load_input_for_witness, WitnessCalculator},
+    Field, PrimeField,
+};
 use num_traits::Zero;
 use rand;
 

diff --git a/groth16/src/lib.rs b/groth16/src/lib.rs
@@ -1,3 +1,4 @@
+pub mod api;
 pub mod groth16;
 pub mod json_utils;
 

diff --git a/test/recursive_proof_to_snark.sh b/test/recursive_proof_to_snark.sh
@@ -68,7 +68,7 @@ if [ "$GENERATE_PROOF_TYPE" = "stark" ]; then
     ../target/release/eigen-zkit stark_prove -s ../starky/data/c12.starkStruct.json \
         -p $WORKSPACE/$C12_VERIFIER.pil.json \
         --o $WORKSPACE/$C12_VERIFIER.const \
-        --m $WORKSPACE/$C12_VERIFIER.cm -c $WORKSPACE/circuits/$RECURSIVE1_VERIFIER.circom --i $WORKSPACE/aggregation/$RECURSIVE1_VERIFIER/input.zkin.json --norm_stage
+        --m $WORKSPACE/$C12_VERIFIER.cm -c $WORKSPACE/circuits/$RECURSIVE1_VERIFIER.circom --i $WORKSPACE/aggregation/$RECURSIVE1_VERIFIER/input.zkin.json --norm_stage --agg_stage
 
 else 
     echo "Generate snark proof"

diff --git a/zkit/src/lib.rs b/zkit/src/lib.rs
diff --git a/zkit/src/main.rs b/zkit/src/main.rs
@@ -1,7 +1,7 @@
 extern crate clap;
 use clap::{command, Parser};
 use dsl_compile::circom_compiler;
-use eigen_zkit::groth16_api::*;
+use groth16::api::*;
 use plonky::api::{
     aggregation_check, aggregation_prove, aggregation_verify, analyse, calculate_witness,
     export_aggregation_verification_key, export_verification_key, generate_aggregation_verifier,
@@ -297,7 +297,7 @@ pub struct Groth16ProveOpt {
     #[arg(long = "r1cs", required = true)]
     circuit_file: String,
     #[arg(short, required = true)]
-    wtns_file: String,
+    wasm_file: String,
     #[arg(short, required = true, default_value = "g16.zkey")]
     pk_file: String,
     #[arg(short, required = true)]
@@ -484,7 +484,7 @@ fn main() {
         Command::Groth16Prove(args) => groth16_prove(
             &args.curve_type,
             &args.circuit_file,
-            &args.wtns_file,
+            &args.wasm_file,
             &args.pk_file,
             &args.input_file,
             &args.public_input_file,