Merge branch 'main' into feat/msm

laudiacay · Aug 20, 2023 · e67c660 · e67c660
2 parents 909dea9 + 5bcad03
commit e67c660
Show file tree

Hide file tree

Showing 22 changed files with 753 additions and 535 deletions.
diff --git a/barustenberg/src/ecc/curves/bn254_scalar_multiplication.rs b/barustenberg/src/ecc/curves/bn254_scalar_multiplication.rs
@@ -6,10 +6,6 @@ use ark_ff::{Field, Zero};
 
 use crate::srs::io::read_transcript_g1;
 
-pub(crate) type G1AffineGroup = <ark_ec::short_weierstrass::Affine<
-    <ark_bn254::Config as ark_ec::bn::BnConfig>::G1Config,
-> as ark_ec::AffineRepr>::Group;
-
 use anyhow::Result;
 
 #[inline]

diff --git a/barustenberg/src/ecc/mod.rs b/barustenberg/src/ecc/mod.rs
@@ -4,8 +4,6 @@ use ark_ff::{FftField, Field};
 pub(crate) mod curves;
 pub(crate) mod scalar_multiplication;
 
-pub(crate) struct MillerLines;
-
 #[inline]
 pub(crate) fn conditionally_subtract_from_double_modulus<Fr: Field + FftField>(
     _this: &Fr,

diff --git a/barustenberg/src/plonk/composer/composer_base.rs b/barustenberg/src/plonk/composer/composer_base.rs
@@ -39,9 +39,9 @@ pub(crate) enum WireType {
 pub(crate) enum ComposerType {
     #[default]
     Standard,
-    Turbo,
-    Plookup,
-    StandardHonk,
+    _Turbo,
+    _Plookup,
+    _StandardHonk,
 }
 
 impl ComposerType {

diff --git a/barustenberg/src/plonk/composer/standard_composer.rs b/barustenberg/src/plonk/composer/standard_composer.rs
@@ -1103,7 +1103,7 @@ impl<RSF: ReferenceStringFactory> StandardComposer<RSF> {
     /// It first computes the verification key, then constructs a `Verifier`
     /// using the computed key and the manifest of public inputs.
     /// Finally, it adds a `KateCommitmentScheme` to the verifier and returns it.
-    fn create_verifier(&mut self) -> Result<Verifier<Keccak256, StandardSettings<Keccak256>>> {
+    fn create_verifier(&mut self) -> Result<Verifier<Keccak256>> {
         let cbd = self.cbd.clone();
         let cbd = cbd.read().unwrap();
 
@@ -1113,7 +1113,8 @@ impl<RSF: ReferenceStringFactory> StandardComposer<RSF> {
             self.create_manifest(cbd.public_inputs.len()),
         );
 
-        output_state.commitment_scheme = Box::new(KateCommitmentScheme::new());
+        output_state.commitment_scheme =
+            Box::new(KateCommitmentScheme::new(output_state.settings.clone()));
 
         Ok(output_state)
     }
@@ -1129,7 +1130,7 @@ impl<RSF: ReferenceStringFactory> StandardComposer<RSF> {
     /// # Returns
     ///
     /// * Returns an initialized `Prover`.
-    fn create_prover(&mut self) -> Prover<Keccak256, StandardSettings<Keccak256>> {
+    fn create_prover(&mut self) -> Prover<Keccak256> {
         self.compute_proving_key();
         self.compute_witness();
 
@@ -1154,7 +1155,7 @@ impl<RSF: ReferenceStringFactory> StandardComposer<RSF> {
             .transition_widgets
             .push(Box::new(arithmetic_widget));
 
-        output_state.commitment_scheme = KateCommitmentScheme::new();
+        output_state.commitment_scheme = KateCommitmentScheme::new(output_state.settings.clone());
 
         output_state
     }