valida verifier changes (#244)

succinctlabs · Feb 8, 2024 · 86d13dd · 86d13dd
1 parent baada92
commit 86d13dd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 7 deletions.
diff --git a/air/src/air.rs b/air/src/air.rs
@@ -22,7 +22,7 @@ pub trait Air<AB: AirBuilder>: BaseAir<AB::F> {
 pub trait AirBuilder: Sized {
     type F: Field;
 
-    type Expr: AbstractField<F = Self::F>
+    type Expr: AbstractField
         + From<Self::F>
         + Add<Self::Var, Output = Self::Expr>
         + Add<Self::F, Output = Self::Expr>

diff --git a/commit/src/pcs.rs b/commit/src/pcs.rs
@@ -89,15 +89,15 @@ where
     fn commit_shifted_batches(
         &self,
         polynomials: Vec<In>,
-        coset_shift: Val,
+        coset_shift: &[Val],
     ) -> (Self::Commitment, Self::ProverData);
 
     fn commit_shifted_batch(
         &self,
         polynomials: In,
         coset_shift: Val,
     ) -> (Self::Commitment, Self::ProverData) {
-        self.commit_shifted_batches(vec![polynomials], coset_shift)
+        self.commit_shifted_batches(vec![polynomials], &[coset_shift])
     }
 }
 

diff --git a/field/src/field.rs b/field/src/field.rs
@@ -242,6 +242,7 @@ pub trait PrimeField32: PrimeField64 {
 
 pub trait AbstractExtensionField<Base: AbstractField>:
     AbstractField
+    + From<Base>
     + Add<Base, Output = Self>
     + AddAssign<Base>
     + Sub<Base, Output = Self>

diff --git a/fri/src/two_adic_pcs.rs b/fri/src/two_adic_pcs.rs
@@ -119,7 +119,8 @@ impl<C: TwoAdicFriPcsGenericConfig, In: MatrixRows<C::Val>> Pcs<C::Val, In> for
     type Error = VerificationError<C>;
 
     fn commit_batches(&self, polynomials: Vec<In>) -> (Self::Commitment, Self::ProverData) {
-        self.commit_shifted_batches(polynomials, C::Val::one())
+        let ones = vec![C::Val::one(); polynomials.len()];
+        self.commit_shifted_batches(polynomials, &ones)
     }
 }
 
@@ -151,13 +152,14 @@ impl<C: TwoAdicFriPcsGenericConfig, In: MatrixRows<C::Val>>
     fn commit_shifted_batches(
         &self,
         polynomials: Vec<In>,
-        coset_shift: C::Val,
+        coset_shifts: &[C::Val],
     ) -> (Self::Commitment, Self::ProverData) {
-        let shift = C::Val::generator() / coset_shift;
         let ldes = info_span!("compute all coset LDEs").in_scope(|| {
             polynomials
                 .into_iter()
-                .map(|poly| {
+                .zip_eq(coset_shifts)
+                .map(|(poly, coset_shift)| {
+                    let shift = C::Val::generator() / *coset_shift;
                     let input = poly.to_row_major_matrix();
                     // Commit to the bit-reversed LDE.
                     self.dft