wip

hyperplonk/src/lib.rs

@@ -1,15 +1,14 @@
 //! Main module for the HyperPlonk PolyIOP.
 
 use ark_ec::PairingEngine;
-use ark_ff::PrimeField;
 use ark_poly::{DenseMultilinearExtension, MultilinearExtension};
 use ark_std::{end_timer, start_timer, One, Zero};
 use errors::HyperPlonkErrors;
 use pcs::prelude::{
-    merge_polynomials, MultilinearCommitmentScheme, PCSErrors, StructuredReferenceString,
+    merge_polynomials, PolynomialCommitmentScheme, PCSErrors, StructuredReferenceString,
 };
 use poly_iop::{
-    prelude::{IOPTranscript, PermutationCheck, SumCheck, VPAuxInfo, ZeroCheck},
+    prelude::{ PermutationCheck, SumCheck, VPAuxInfo, ZeroCheck},
     PolyIOP,
 };
 use selectors::SelectorRow;
@@ -33,7 +32,7 @@ pub trait HyperPlonkPIOP<E, PCS>:
     SumCheck<E::Fr> + ZeroCheck<E::Fr> + PermutationCheck<E::Fr>
 where
     E: PairingEngine,
-    PCS: MultilinearCommitmentScheme<E, Transcript = Self::Transcript>,
+    PCS: PolynomialCommitmentScheme<E>,
 {
     type Parameters;
     type ProvingKey;
@@ -97,7 +96,7 @@ where
 impl<E, PCS> HyperPlonkPIOP<E, PCS> for PolyIOP<E::Fr>
 where
     E: PairingEngine,
-    PCS: MultilinearCommitmentScheme<E, Transcript = Self::Transcript>,
+    PCS: PolynomialCommitmentScheme<E>,
 {
     type Parameters = HyperPlonkParams;
     type ProvingKey = HyperPlonkProvingKey<E, PCS>;
@@ -634,9 +633,9 @@ where
 mod tests {
     use super::*;
     use crate::structs::CustomizedGates;
-    use ark_bls12_381::{Bls12_381};
-    use ark_std::test_rng;use ark_std::UniformRand;
-    use pcs::KZGMultilinearPC;
+    use ark_bls12_381::Bls12_381;
+    use ark_std::{test_rng, UniformRand};
+    use pcs::prelude::KZGMultilinearPCS;
 
     #[test]
     fn test_hyperplonk_e2e() -> Result<(), HyperPlonkErrors> {
@@ -675,12 +674,11 @@ mod tests {
             log_n_wires,
             gate_func,
         };
-        let pcs_srs = KZGMultilinearPC::<E>::setup(&mut rng, 10)?;
-        let permutation:Vec<E::Fr> = (0..1<<nv).map(|_|E::Fr::rand(&mut rng)).collect();
-
+        let pcs_srs = KZGMultilinearPCS::<E>::setup(&mut rng, 10)?;
+        let permutation: Vec<E::Fr> = (0..1 << nv).map(|_| E::Fr::rand(&mut rng)).collect();
 
         // generate pk and vks
-        let (pk, vk) = <PolyIOP<E::Fr> as HyperPlonkPIOP<E, KZGMultilinearPC<E>>>::preprocess(
+        let (pk, vk) = <PolyIOP<E::Fr> as HyperPlonkPIOP<E, KZGMultilinearPCS<E>>>::preprocess(
             &params,
             &pcs_srs,
             &permutation,

hyperplonk/src/selectors.rs

@@ -22,11 +22,7 @@ impl<F: PrimeField> SelectorRow<'_, F> {
 
 #[cfg(test)]
 impl<'a, F: PrimeField> SelectorRow<'a, F> {
-
-
-    pub(crate) fn rand<R: RngCore>(rng: &mut R,  num_vars: usize)->Self {
-        let slices:Vec<F> = (0..1<<num_vars).map(|_| F::rand(&mut rng)).collect();
-
+    pub(crate) fn rand<R: RngCore>(rng: &mut R, num_vars: usize) -> Self {
+        let slices: Vec<F> = (0..1 << num_vars).map(|_| F::rand(&mut rng)).collect();
     }
 }
-

hyperplonk/src/structs.rs

@@ -1,7 +1,7 @@
 use ark_ec::PairingEngine;
 use ark_ff::PrimeField;
 use ark_poly::DenseMultilinearExtension;
-use pcs::MultilinearCommitmentScheme;
+use pcs::PolynomialCommitmentScheme;
 use poly_iop::prelude::{PermutationCheck, ZeroCheck};
 use std::rc::Rc;
 
@@ -27,7 +27,7 @@ pub struct HyperPlonkSubClaim<F: PrimeField, ZC: ZeroCheck<F>, PC: PermutationCh
 #[derive(Clone, Debug, Default, PartialEq)]
 pub struct HyperPlonkProof<
     E: PairingEngine,
-    PCS: MultilinearCommitmentScheme<E>,
+    PCS: PolynomialCommitmentScheme<E>,
     ZC: ZeroCheck<E::Fr>,
     PC: PermutationCheck<E::Fr>,
 > {
@@ -94,7 +94,7 @@ pub struct HyperPlonkParams {
 ///   - the hyperplonk instance parameters
 ///   - the preprocessed polynomials output by the indexer
 #[derive(Clone, Debug, Default, PartialEq)]
-pub struct HyperPlonkProvingKey<E: PairingEngine, PCS: MultilinearCommitmentScheme<E>> {
+pub struct HyperPlonkProvingKey<E: PairingEngine, PCS: PolynomialCommitmentScheme<E>> {
     /// hyperplonk instance parameters
     pub params: HyperPlonkParams,
     /// the preprocessed permutation polynomials
@@ -110,7 +110,7 @@ pub struct HyperPlonkProvingKey<E: PairingEngine, PCS: MultilinearCommitmentSche
 ///   - the hyperplonk instance parameters
 ///   - the preprocessed polynomials output by the indexer
 #[derive(Clone, Debug, Default, PartialEq)]
-pub struct HyperPlonkVerifyingKey<E: PairingEngine, PCS: MultilinearCommitmentScheme<E>> {
+pub struct HyperPlonkVerifyingKey<E: PairingEngine, PCS: PolynomialCommitmentScheme<E>> {
     /// hyperplonk instance parameters
     pub params: HyperPlonkParams,
     /// the parameters for PCS commitment

pcs/benches/bench.rs

@@ -1,7 +1,7 @@
 use ark_bls12_381::{Bls12_381, Fr};
 use ark_ff::UniformRand;
 use ark_poly::{DenseMultilinearExtension, MultilinearExtension};
-use ark_std::test_rng;
+use ark_std::{rc::Rc, test_rng};
 use pcs::{
     prelude::{KZGMultilinearPCS, PCSErrors, PolynomialCommitmentScheme},
     StructuredReferenceString,
@@ -27,7 +27,7 @@ fn bench_pcs() -> Result<(), PCSErrors> {
             10
         };
 
-        let poly = DenseMultilinearExtension::rand(nv, &mut rng);
+        let poly = Rc::new(DenseMultilinearExtension::rand(nv, &mut rng));
         let (ml_ck, ml_vk) = uni_params.0.trim(nv)?;
         let (uni_ck, uni_vk) = uni_params.1.trim(nv)?;
         let ck = (ml_ck, uni_ck);