fix evm-verifier and fmt

a16z · Aug 23, 2024 · 1f1ff45 · 1f1ff45
1 parent dbd4661
commit 1f1ff45
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 18 deletions.
diff --git a/jolt-evm-verifier/script/Cargo.toml b/jolt-evm-verifier/script/Cargo.toml
@@ -16,6 +16,7 @@ ark-serialize = "0.4.2"
 ark-ec = "0.4.2"
 ark-std = "0.4.0"
 jolt-core = { path = "../../jolt-core", package = "jolt-core"}
+jolt-types = { path = "../../jolt-types" }
 rand_core = "0.6.4"
 rand_chacha = { version = "0.3.0", default-features = false }
 

diff --git a/jolt-evm-verifier/script/src/bin/autogenerate_r1cs.rs b/jolt-evm-verifier/script/src/bin/autogenerate_r1cs.rs
@@ -1,7 +1,7 @@
 use alloy_primitives::hex;
-use jolt_core::field::JoltField;
 use jolt_core::r1cs::key::SparseConstraints;
 use jolt_core::r1cs::key::SparseEqualityItem;
+use jolt_types::field::JoltField;
 
 // This code is provided as an example of how to turn the sparse constraints into solidity, and was the base
 // for the code in R1CSMatrix, however because the key is not expected to change often full auto-generation is not

diff --git a/jolt-evm-verifier/script/src/bin/grand_product_example.rs b/jolt-evm-verifier/script/src/bin/grand_product_example.rs
@@ -1,10 +1,9 @@
 use jolt_core::{
-    field::JoltField,
     poly::commitment::hyperkzg::HyperKZG,
     subprotocols::grand_product::{BatchedDenseGrandProduct, BatchedGrandProduct},
-    utils::transcript::ProofTranscript,
-    utils::sol_types::GrandProductProof
+    utils::sol_types::GrandProductProof,
 };
+use jolt_types::{field::JoltField, utils::transcript::ProofTranscript};
 use std::env;
 
 use alloy_primitives::{hex, U256};
@@ -20,10 +19,9 @@ fn get_proof_data(batched_circuit: &mut BatchedDenseGrandProduct<Fr>) {
         Fr,
         HyperKZG<Bn254>,
     >>::prove_grand_product(batched_circuit, &mut transcript, None);
-    let claims =
-        <BatchedDenseGrandProduct<Fr> as BatchedGrandProduct<Fr, HyperKZG<Bn254>>>::claims(
-            batched_circuit,
-        );
+    let claims = <BatchedDenseGrandProduct<Fr> as BatchedGrandProduct<Fr, HyperKZG<Bn254>>>::claims(
+        batched_circuit,
+    );
 
     //encoding the proof into abi
 
@@ -33,10 +31,7 @@ fn get_proof_data(batched_circuit: &mut BatchedDenseGrandProduct<Fr>) {
         uint256[] r_prover;
     });
 
-    let r_prover = r_prover
-        .iter()
-        .map(fr_to_uint256)
-        .collect::<Vec<_>>();
+    let r_prover = r_prover.iter().map(fr_to_uint256).collect::<Vec<_>>();
 
     let claims = claims.iter().map(fr_to_uint256).collect::<Vec<_>>();
 

diff --git a/jolt-evm-verifier/script/src/bin/hyperkzg_batch_example.rs b/jolt-evm-verifier/script/src/bin/hyperkzg_batch_example.rs
@@ -9,7 +9,7 @@ use ark_std::UniformRand;
 use jolt_core::poly::commitment::commitment_scheme::{BatchType, CommitmentScheme};
 use jolt_core::poly::commitment::hyperkzg::*;
 use jolt_core::poly::dense_mlpoly::DensePolynomial;
-use jolt_core::utils::transcript::ProofTranscript;
+use jolt_types::utils::transcript::ProofTranscript;
 use rand_core::SeedableRng;
 
 use jolt_core::utils::sol_types::{HyperKZGProofSol, VK};

diff --git a/jolt-evm-verifier/script/src/bin/hyperkzg_example.rs b/jolt-evm-verifier/script/src/bin/hyperkzg_example.rs
@@ -8,7 +8,7 @@ use ark_ff::PrimeField;
 use ark_std::UniformRand;
 use jolt_core::poly::commitment::hyperkzg::*;
 use jolt_core::poly::dense_mlpoly::DensePolynomial;
-use jolt_core::utils::transcript::ProofTranscript;
+use jolt_types::utils::transcript::ProofTranscript;
 use rand_core::SeedableRng;
 
 use jolt_core::utils::sol_types::{HyperKZGProofSol, VK};

diff --git a/jolt-evm-verifier/script/src/bin/transcript_example.rs b/jolt-evm-verifier/script/src/bin/transcript_example.rs
@@ -1,4 +1,4 @@
-use jolt_core::{field::JoltField, utils::transcript::ProofTranscript};
+use jolt_types::{field::JoltField, utils::transcript::ProofTranscript};
 
 use ark_ff::{BigInteger, PrimeField};
 

diff --git a/jolt-sdk/Cargo.toml b/jolt-sdk/Cargo.toml
@@ -17,6 +17,7 @@ host = [
     "dep:tracer",
     "dep:common",
     "dep:jolt-core",
+    "dep:jolt-types",
     "dep:ark-ec",
     "dep:ark-ff",
     "dep:ark-bn254",
@@ -42,6 +43,6 @@ ark-serialize = { version = "0.4.2", features = ["derive"], optional = true }
 
 jolt-sdk-macros = { path = "./macros" }
 jolt-core = { path = "../jolt-core", optional = true }
-jolt-types = { path = "../jolt-types" }
+jolt-types = { path = "../jolt-types", optional = true }
 tracer = { path = "../tracer", optional = true }
 common = { path = "../common", optional = true }
diff --git a/jolt-svm-verifier/program/Cargo.toml b/jolt-svm-verifier/program/Cargo.toml
@@ -5,8 +5,6 @@ description = "SVM program to verify JOLT proofs"
 edition = "2021"
 
 [workspace]
-members = [
-]
 
 [lib]
 crate-type = ["cdylib", "lib"]