use uniform sampling of bits

benches/sumcheck.rs

@@ -1,8 +1,8 @@
-use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
+use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use p3_baby_bear::{BabyBear, Poseidon2BabyBear};
-use p3_challenger::{DuplexChallenger, FieldChallenger, GrindingChallenger};
+use p3_challenger::{DuplexChallenger, FieldChallenger, UniformGrindingChallenger};
 use p3_field::extension::BinomialExtensionField;
-use rand::{Rng, SeedableRng, rngs::SmallRng};
+use rand::{rngs::SmallRng, Rng, SeedableRng};
 use whir_p3::{
     fiat_shamir::{domain_separator::DomainSeparator, prover::ProverState},
     poly::{evals::EvaluationsList, multilinear::MultilinearPoint},
@@ -38,7 +38,7 @@
     num_constraints: usize,
 ) -> Statement<EF>
 where
-    C: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    C: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     let mut statement = Statement::initialize(num_vars);
     for _ in 0..num_constraints {

src/fiat_shamir/domain_separator.rs

@@ -1,6 +1,6 @@
 use std::marker::PhantomData;
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, GrindingChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, Field, TwoAdicField};
 
 use crate::{
@@ -104,7 +104,7 @@
         challenger: Challenger,
     ) -> ProverState<F, EF, Challenger>
     where
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         ProverState::new(self, challenger)
     }
@@ -117,7 +117,7 @@
         challenger: Challenger,
     ) -> VerifierState<F, EF, Challenger>
     where
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         VerifierState::new(self, proof_data, challenger)
     }
@@ -133,7 +133,7 @@
         &mut self,
         params: &WhirConfig<EF, F, HC, C, Challenger>,
     ) where
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         // TODO: Add params
         self.observe(DIGEST_ELEMS, Observe::MerkleDigest);
@@ -147,7 +147,7 @@
         &mut self,
         params: &WhirConfig<EF, F, HC, C, Challenger>,
     ) where
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
         EF: TwoAdicField,
         F: TwoAdicField,
     {

src/fiat_shamir/prover.rs

@@ -1,6 +1,6 @@
 use std::fmt::Debug;
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, GrindingChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, Field};
 
 use super::domain_separator::DomainSeparator;
@@ -16,7 +16,7 @@
 pub struct ProverState<F, EF, Challenger>
 where
     F: Field,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     /// Cryptographic challenger used to sample challenges and observe data.
     challenger: Challenger,
@@ -33,7 +33,9 @@
 where
     EF: ExtensionField<F>,
     F: Field,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F>
+        + GrindingChallenger<Witness = F>
+        + UniformGrindingChallenger<Witness = F>,
 {
     /// Create a new prover state with a given domain separator and challenger.
     ///
@@ -133,7 +135,8 @@
     /// # Returns
     /// A uniformly random value with `bits` bits.
     pub fn sample_bits(&mut self, bits: usize) -> usize {
-        self.challenger.sample_bits(bits)
+        //self.challenger.sample_bits(bits)
+        self.challenger.sample_uniform_bits(bits)
     }
 
     /// Perform PoW grinding and append the witness to the transcript.
@@ -147,7 +150,7 @@
         }
 
         // Perform grinding and obtain a witness element in the base field.
-        let witness = self.challenger.grind(bits);
+        let witness = self.challenger.grind_uniform_may_panic(bits);
 
         // Append the witness to the proof data.
         self.proof_data.push(witness);
@@ -158,7 +161,7 @@
 where
     EF: ExtensionField<F>,
     F: Field,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     fn sample(&mut self) -> EF {
         self.sample()

src/fiat_shamir/verifier.rs

@@ -1,8 +1,8 @@
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, Field};
 
 use super::domain_separator::DomainSeparator;
-use crate::fiat_shamir::{ChallengeSampler, errors::FiatShamirError};
+use crate::fiat_shamir::{errors::FiatShamirError, ChallengeSampler};
 
 /// State held by the verifier in a Fiat-Shamir protocol.
 ///
@@ -12,7 +12,7 @@
 pub struct VerifierState<F, EF, Challenger>
 where
     F: Field,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     /// Cryptographic challenger used for sampling challenges and observing proof data.
     challenger: Challenger,
@@ -29,7 +29,7 @@
 
 impl<F, EF, Challenger> VerifierState<F, EF, Challenger>
 where
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     EF: ExtensionField<F>,
     F: Field,
 {
@@ -186,7 +186,8 @@
     /// # Returns
     /// A uniformly random value with `bits` bits.
     pub fn sample_bits(&mut self, bits: usize) -> usize {
-        self.challenger.sample_bits(bits)
+        //self.challenger.sample_bits(bits)
+        self.challenger.sample_uniform_bits_may_panic(bits)
     }
 
     /// Verify PoW grinding witness correctness.
@@ -213,7 +214,10 @@
         self.index += 1;
 
         // Verify the witness using the challenger.
-        if self.challenger.check_witness(bits, witness) {
+        if self
+            .challenger
+            .check_witness_uniform_may_panic(bits, witness)
+        {
             Ok(())
         } else {
             Err(FiatShamirError::InvalidGrindingWitness)
@@ -225,7 +229,7 @@
 where
     EF: ExtensionField<F>,
     F: Field,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     fn sample(&mut self) -> EF {
         self.sample()

src/sumcheck/sumcheck_single.rs

@@ -1,4 +1,4 @@
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, GrindingChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, Field, TwoAdicField};
 use p3_interpolation::interpolate_subgroup;
 use p3_maybe_rayon::prelude::*;
@@ -43,7 +43,9 @@
     pow_bits: usize,
 ) -> (EF, EvaluationsList<EF>)
 where
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F>
+        + GrindingChallenger<Witness = F>
+        + UniformGrindingChallenger<Witness = F>,
 {
     // Compute the quadratic sumcheck polynomial for the current variable.
     let sumcheck_poly = compute_sumcheck_polynomial(evals, weights, *sum);
@@ -89,7 +91,7 @@
     pow_bits: usize,
 ) -> EF
 where
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     // Compute the quadratic sumcheck polynomial for the current variable.
     let sumcheck_poly = compute_sumcheck_polynomial(evals, weights, *sum);
@@ -270,7 +272,7 @@
     where
         F: TwoAdicField,
         EF: TwoAdicField,
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         assert_ne!(folding_factor, 0);
         let mut res = Vec::with_capacity(folding_factor);
@@ -319,7 +321,7 @@
     where
         F: TwoAdicField,
         EF: TwoAdicField,
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         assert_ne!(folding_factor, 0);
         let mut res = Vec::with_capacity(folding_factor);
@@ -522,7 +524,7 @@
     where
         F: TwoAdicField,
         EF: TwoAdicField,
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         // Standard round-by-round folding
         // Proceed with one-variable-per-round folding for remaining variables.

src/sumcheck/tests.rs

@@ -1,12 +1,12 @@
 use p3_baby_bear::{BabyBear, Poseidon2BabyBear};
-use p3_challenger::{DuplexChallenger, FieldChallenger, GrindingChallenger};
+use p3_challenger::{DuplexChallenger, FieldChallenger, UniformGrindingChallenger};
 use p3_field::{
-    ExtensionField, Field, PrimeCharacteristicRing, TwoAdicField, extension::BinomialExtensionField,
+    extension::BinomialExtensionField, ExtensionField, Field, PrimeCharacteristicRing, TwoAdicField,
 };
 use p3_interpolation::interpolate_subgroup;
 use p3_symmetric::{PaddingFreeSponge, TruncatedPermutation};
 use proptest::prelude::*;
-use rand::{Rng, SeedableRng, rngs::SmallRng};
+use rand::{rngs::SmallRng, Rng, SeedableRng};
 
 use super::sumcheck_single::SumcheckSingle;
 use crate::{
@@ -85,7 +85,7 @@
     poly: &EvaluationsList<F>,
 ) -> Statement<EF>
 where
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     // Initialize the statement to hold the evaluation constraints.
     let mut statement = Statement::initialize(num_vars);
@@ -136,7 +136,7 @@
     sumcheck: &mut SumcheckSingle<F, EF>,
 ) -> (Statement<EF>, EF)
 where
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     // Determine how many variables are left in the current sumcheck polynomial.
     let num_vars = sumcheck.num_variables();
@@ -203,7 +203,7 @@
     num_points: usize,
 ) -> Statement<EF>
 where
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     // Create a new statement that will hold all reconstructed constraints.
     let mut statement = Statement::initialize(num_vars);

src/whir/committer/reader.rs

@@ -1,6 +1,6 @@
 use std::{fmt::Debug, ops::Deref};
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, Field, TwoAdicField};
 use p3_symmetric::Hash;
 
@@ -66,7 +66,7 @@
     where
         F: TwoAdicField,
         EF: ExtensionField<F> + TwoAdicField,
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
     {
         // Read the Merkle root hash committed by the prover.
         let root = verifier_state
@@ -134,7 +134,7 @@
 where
     F: TwoAdicField,
     EF: ExtensionField<F> + TwoAdicField,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     /// Create a new commitment reader from a WHIR configuration.
     ///

src/whir/committer/writer.rs

@@ -1,9 +1,9 @@
 use std::{ops::Deref, sync::Arc};
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, UniformGrindingChallenger};
 use p3_commit::Mmcs;
 use p3_field::{ExtensionField, Field, TwoAdicField};
-use p3_matrix::{Matrix, dense::RowMajorMatrix};
+use p3_matrix::{dense::RowMajorMatrix, Matrix};
 use p3_merkle_tree::MerkleTreeMmcs;
 use p3_symmetric::{CryptographicHasher, PseudoCompressionFunction};
 use serde::{Deserialize, Serialize};
@@ -37,7 +37,7 @@
 where
     F: TwoAdicField,
     EF: ExtensionField<F> + TwoAdicField,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     /// Create a new writer that borrows the WHIR protocol configuration.
     pub const fn new(params: &'a WhirConfig<EF, F, H, C, Challenger>) -> Self {

src/whir/parameters.rs

@@ -1,9 +1,9 @@
 use std::{f64::consts::LOG2_10, marker::PhantomData};
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, Field, TwoAdicField};
 
-use crate::parameters::{FoldingFactor, ProtocolParameters, errors::SecurityAssumption};
+use crate::parameters::{errors::SecurityAssumption, FoldingFactor, ProtocolParameters};
 
 #[derive(Debug, Clone)]
 pub struct RoundConfig<F> {
@@ -65,7 +65,7 @@
 where
     F: TwoAdicField,
     EF: ExtensionField<F> + TwoAdicField,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     #[allow(clippy::too_many_lines)]
     pub fn new(num_variables: usize, whir_parameters: ProtocolParameters<Hash, C>) -> Self {

src/whir/prover/mod.rs

@@ -1,6 +1,6 @@
 use std::ops::Deref;
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, UniformGrindingChallenger};
 use p3_commit::{ExtensionMmcs, Mmcs};
 use p3_field::{ExtensionField, Field, TwoAdicField};
 use p3_interpolation::interpolate_subgroup;
@@ -54,7 +54,7 @@
 where
     F: TwoAdicField + Ord,
     EF: ExtensionField<F> + TwoAdicField,
-    Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+    Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
 {
     /// Validates that the total number of variables expected by the prover configuration
     /// matches the number implied by the folding schedule and the final rounds.

src/whir/prover/round_state/state.rs

@@ -4,7 +4,7 @@
 
 use std::sync::Arc;
 
-use p3_challenger::{FieldChallenger, GrindingChallenger};
+use p3_challenger::{FieldChallenger, UniformGrindingChallenger};
 use p3_field::{ExtensionField, TwoAdicField};
 use p3_matrix::dense::DenseMatrix;
 use p3_merkle_tree::MerkleTree;
@@ -153,7 +153,7 @@
         witness: Witness<EF, F, DenseMatrix<F>, DIGEST_ELEMS>,
     ) -> Result<Self, FiatShamirError>
     where
-        Challenger: FieldChallenger<F> + GrindingChallenger<Witness = F>,
+        Challenger: FieldChallenger<F> + UniformGrindingChallenger<Witness = F>,
         MyChallenger: Clone,
         C: Clone,
     {