Working recursive test

Cargo.toml

@@ -43,7 +43,7 @@ backtrace = { version = "0.3", optional = true }
 ff = "0.13"
 group = "0.13"
 halo2curves = { version = "0.7.0", default-features = false }
-blstrs = { git = "https://github.com/davidnevadoc/blstrs", rev = "8ca6da7" }
+blstrs = { git = "https://github.com/davidnevadoc/blstrs", rev = "3dfe5bf" }
 rand_core = { version = "0.6", default-features = false }
 tracing = "0.1"
 blake2b_simd = "1" # MSRV 1.66.0
@@ -59,6 +59,7 @@ tabbycat = { version = "0.1", features = ["attributes"], optional = true }
 
 # Legacy circuit compatibility
 halo2_legacy_pdqsort = { version = "0.1.0", optional = true }
+num-bigint = "0.4.6"
 
 [dev-dependencies]
 assert_matches = "1.5"

src/plonk/circuit.rs

@@ -481,7 +481,7 @@ impl Selector {
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct FixedQuery {
     /// Query index
-    pub(crate) index: Option<usize>,
+    pub index: Option<usize>,
     /// Column index
     pub(crate) column_index: usize,
     /// Rotation of this query
@@ -504,7 +504,7 @@ impl FixedQuery {
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct AdviceQuery {
     /// Query index
-    pub(crate) index: Option<usize>,
+    pub index: Option<usize>,
     /// Column index
     pub(crate) column_index: usize,
     /// Rotation of this query
@@ -534,7 +534,7 @@ impl AdviceQuery {
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 pub struct InstanceQuery {
     /// Query index
-    pub(crate) index: Option<usize>,
+    pub index: Option<usize>,
     /// Column index
     pub(crate) column_index: usize,
     /// Rotation of this query
@@ -1338,11 +1338,6 @@ impl<F: Field> Product<Self> for Expression<F> {
     }
 }
 
-// /// Represents an index into a vector where each entry corresponds to a distinct
-// /// point that polynomials are queried at.
-// #[derive(Copy, Clone, Debug)]
-// pub(crate) struct PointIndex(pub usize);
-
 /// A "virtual cell" is a PLONK cell that has been queried at a particular relative offset
 /// within a custom gate.
 #[derive(Clone, Debug)]
@@ -2140,7 +2135,8 @@ impl<F: Field> ConstraintSystem<F> {
             });
     }
 
-    pub(crate) fn phases(&self) -> impl Iterator<Item = sealed::Phase> {
+    /// Return an iterator over the phases of the constraint system.
+    pub fn phases(&self) -> impl Iterator<Item = sealed::Phase> {
         let max_phase = self
             .advice_column_phase
             .iter()

src/plonk/keygen.rs

@@ -246,6 +246,10 @@ fn k_from_circuit<F: Ord + Field + FromUniformBytes<64>, C: Circuit<F>>(circuit:
 
 /// Generate a `VerifyingKey` from an instance of `Circuit`.
 /// By default, selector compression is turned **off**.
+///
+/// This function automatically generates the VK using the smallest
+/// value of k required for the ConcreteCircuit.
+/// To specify a particular value for k, use keygen_vk_with_k instead.
 pub fn keygen_vk<F, CS, ConcreteCircuit>(
     params: &CS::Parameters,
     circuit: &ConcreteCircuit,
@@ -256,6 +260,22 @@ where
     ConcreteCircuit: Circuit<F>,
 {
     let k = k_from_circuit(circuit);
+
+    keygen_vk_with_k(params, circuit, k)
+}
+
+/// Generate a `VerifyingKey` from an instance of `Circuit`.
+/// By default, selector compression is turned **off**.
+pub fn keygen_vk_with_k<F, CS, ConcreteCircuit>(
+    params: &CS::Parameters,
+    circuit: &ConcreteCircuit,
+    k: u32,
+) -> Result<VerifyingKey<F, CS>, Error>
+where
+    F: WithSmallOrderMulGroup<3> + FromUniformBytes<64> + Ord,
+    CS: PolynomialCommitmentScheme<F>,
+    ConcreteCircuit: Circuit<F>,
+{
     if params.max_k() < k {
         return Err(Error::NotEnoughRowsAvailable {
             current_k: params.max_k(),

src/plonk/permutation.rs

@@ -23,7 +23,7 @@ use std::io;
 #[derive(Debug, Clone)]
 pub struct Argument {
     /// A sequence of columns involved in the argument.
-    pub(super) columns: Vec<Column<Any>>,
+    pub columns: Vec<Column<Any>>,
 }
 
 impl Argument {
@@ -88,7 +88,7 @@ pub struct VerifyingKey<F: PrimeField, CS: PolynomialCommitmentScheme<F>> {
 }
 
 impl<F: PrimeField, CS: PolynomialCommitmentScheme<F>> VerifyingKey<F, CS> {
-    /// Returns commitments of sigma polynomials
+    /// Returns the commitments of the verifying key.
     pub fn commitments(&self) -> &Vec<CS::Commitment> {
         &self.commitments
     }

src/plonk/verifier.rs

@@ -19,7 +19,8 @@ where
         + Hashable<T::Hash>
         + Sampleable<T::Hash>
         + SerdeObject
-        + FromUniformBytes<64>,
+        + FromUniformBytes<64>
+        + Ord,
     CS::Commitment: Hashable<T::Hash> + SerdeObject,
 {
     // Check that instances matches the expected number of instance columns
@@ -119,6 +120,7 @@ where
     // Sample x challenge, which is used to ensure the circuit is
     // satisfied with high probability.
     let x: F = transcript.squeeze_challenge();
+
     let instance_evals = {
         let xn = x.pow([vk.n()]);
         let (min_rotation, max_rotation) =
@@ -165,7 +167,6 @@ where
         .collect::<Result<Vec<_>, _>>()?;
 
     let fixed_evals = read_n(transcript, vk.cs.fixed_queries.len())?;
-
     let vanishing = vanishing.evaluate_after_x(vk, transcript)?;
 
     let permutations_common = vk.permutation.evaluate(transcript)?;

src/poly/commitment.rs

@@ -43,7 +43,7 @@ pub trait PolynomialCommitmentScheme<F: PrimeField>: Clone + Debug {
     ) -> Result<(), Error>
     where
         I: IntoIterator<Item = ProverQuery<'com, F>> + Clone,
-        F: Sampleable<T::Hash>,
+        F: Sampleable<T::Hash> + Ord + Hashable<<T as Transcript>::Hash>,
         Self::Commitment: Hashable<T::Hash>;
 
     /// Verify an opening proof at a given query
@@ -53,7 +53,7 @@ pub trait PolynomialCommitmentScheme<F: PrimeField>: Clone + Debug {
     ) -> Result<Self::VerificationGuard, Error>
     where
         I: IntoIterator<Item = VerifierQuery<F, Self>> + Clone,
-        F: Sampleable<T::Hash>,
+        F: Sampleable<T::Hash> + Ord + Hashable<T::Hash>,
         Self::Commitment: Hashable<T::Hash>;
 }