Move HashConfig into GenericConfig associated types

evm/src/arithmetic/arithmetic_stark.rs

@@ -171,7 +171,7 @@ mod tests {
     use anyhow::Result;
     use ethereum_types::U256;
     use plonky2::field::types::{Field, PrimeField64};
-    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use rand::{Rng, SeedableRng};
     use rand_chacha::ChaCha8Rng;
 
@@ -183,9 +183,7 @@ mod tests {
     fn degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = ArithmeticStark<F, D>;
 
         let stark = S {
@@ -198,24 +196,20 @@ mod tests {
     fn circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = ArithmeticStark<F, D>;
 
         let stark = S {
             f: Default::default(),
         };
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 
     #[test]
     fn basic_trace() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = ArithmeticStark<F, D>;
 
         let stark = S {
@@ -301,9 +295,7 @@ mod tests {
     fn big_traces() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = ArithmeticStark<F, D>;
 
         let stark = S {

evm/src/cpu/cpu_stark.rs

@@ -199,7 +199,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for CpuStark<F, D
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     use crate::cpu::cpu_stark::CpuStark;
     use crate::stark_testing::{test_stark_circuit_constraints, test_stark_low_degree};
@@ -208,9 +208,7 @@ mod tests {
     fn test_stark_degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = CpuStark<F, D>;
 
         let stark = S {
@@ -223,14 +221,12 @@ mod tests {
     fn test_stark_circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = CpuStark<F, D>;
 
         let stark = S {
             f: Default::default(),
         };
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 }

evm/src/cross_table_lookup.rs

@@ -323,18 +323,14 @@ where
 impl<'a, F: RichField + Extendable<D>, const D: usize>
     CtlCheckVars<'a, F, F::Extension, F::Extension, D>
 {
-    pub(crate) fn from_proofs<
+    pub(crate) fn from_proofs<C: GenericConfig<D, F = F>>(
-        HCO: HashConfig,
+        proofs: &[StarkProofWithMetadata<F, C, D>; NUM_TABLES],
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
-        proofs: &[StarkProofWithMetadata<F, HCO, HCI, C, D>; NUM_TABLES],
         cross_table_lookups: &'a [CrossTableLookup<F>],
         ctl_challenges: &'a GrandProductChallengeSet<F>,
         num_permutation_zs: &[usize; NUM_TABLES],
     ) -> [Vec<Self>; NUM_TABLES]
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         let mut ctl_zs = proofs
             .iter()

evm/src/fixed_recursive_verifier.rs

@@ -45,33 +45,29 @@ const THRESHOLD_DEGREE_BITS: usize = 13;
 /// `degree_bits`, this contains a chain of recursive circuits for shrinking that STARK from
 /// `degree_bits` to a constant `THRESHOLD_DEGREE_BITS`. It also contains a special root circuit
 /// for combining each STARK's shrunk wrapper proof into a single proof.
-pub struct AllRecursiveCircuits<F, HCO, HCI, C, const D: usize>
+pub struct AllRecursiveCircuits<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    [(); HCO::WIDTH]:,
 {
     /// The EVM root circuit, which aggregates the (shrunk) per-table recursive proofs.
-    pub root: RootCircuitData<F, HCO, HCI, C, D>,
+    pub root: RootCircuitData<F, C, D>,
-    pub aggregation: AggregationCircuitData<F, HCO, HCI, C, D>,
+    pub aggregation: AggregationCircuitData<F, C, D>,
     /// The block circuit, which verifies an aggregation root proof and a previous block proof.
-    pub block: BlockCircuitData<F, HCO, HCI, C, D>,
+    pub block: BlockCircuitData<F, C, D>,
     /// Holds chains of circuits for each table and for each initial `degree_bits`.
-    by_table: [RecursiveCircuitsForTable<F, HCO, HCI, C, D>; NUM_TABLES],
+    by_table: [RecursiveCircuitsForTable<F, C, D>; NUM_TABLES],
 }
 
 /// Data for the EVM root circuit, which is used to combine each STARK's shrunk wrapper proof
 /// into a single proof.
-pub struct RootCircuitData<F, HCO, HCI, C, const D: usize>
+pub struct RootCircuitData<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
-    circuit: CircuitData<F, HCO, HCI, C, D>,
+    circuit: CircuitData<F, C, D>,
     proof_with_pis: [ProofWithPublicInputsTarget<D>; NUM_TABLES],
     /// For each table, various inner circuits may be used depending on the initial table size.
     /// This target holds the index of the circuit (within `final_circuits()`) that was used.
@@ -83,14 +79,12 @@ where
 
 /// Data for the aggregation circuit, which is used to compress two proofs into one. Each inner
 /// proof can be either an EVM root proof or another aggregation proof.
-pub struct AggregationCircuitData<F, HCO, HCI, C, const D: usize>
+pub struct AggregationCircuitData<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
-    circuit: CircuitData<F, HCO, HCI, C, D>,
+    circuit: CircuitData<F, C, D>,
     lhs: AggregationChildTarget<D>,
     rhs: AggregationChildTarget<D>,
     cyclic_vk: VerifierCircuitTarget,
@@ -102,35 +96,31 @@ pub struct AggregationChildTarget<const D: usize> {
     evm_proof: ProofWithPublicInputsTarget<D>,
 }
 
-pub struct BlockCircuitData<F, HCO, HCI, C, const D: usize>
+pub struct BlockCircuitData<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
-    circuit: CircuitData<F, HCO, HCI, C, D>,
+    circuit: CircuitData<F, C, D>,
     has_parent_block: BoolTarget,
     parent_block_proof: ProofWithPublicInputsTarget<D>,
     agg_root_proof: ProofWithPublicInputsTarget<D>,
     cyclic_vk: VerifierCircuitTarget,
 }
 
-impl<F, HCO, HCI, C, const D: usize> AllRecursiveCircuits<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> AllRecursiveCircuits<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig + 'static,
+    C: GenericConfig<D, F = F> + 'static,
-    HCI: HashConfig + 'static,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F> + 'static,
-    C::Hasher: AlgebraicHasher<F, HCO>,
     [(); C::Hasher::HASH_SIZE]:,
     [(); CpuStark::<F, D>::COLUMNS]:,
     [(); KeccakStark::<F, D>::COLUMNS]:,
     [(); KeccakSpongeStark::<F, D>::COLUMNS]:,
     [(); LogicStark::<F, D>::COLUMNS]:,
     [(); MemoryStark::<F, D>::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     /// Preprocess all recursive circuits used by the system.
     pub fn new(
@@ -187,9 +177,9 @@ where
     }
 
     fn create_root_circuit(
-        by_table: &[RecursiveCircuitsForTable<F, HCO, HCI, C, D>; NUM_TABLES],
+        by_table: &[RecursiveCircuitsForTable<F, C, D>; NUM_TABLES],
         stark_config: &StarkConfig,
-    ) -> RootCircuitData<F, HCO, HCI, C, D> {
+    ) -> RootCircuitData<F, C, D> {
         let inner_common_data: [_; NUM_TABLES] =
             core::array::from_fn(|i| &by_table[i].final_circuits()[0].common);
 
@@ -197,11 +187,14 @@ where
         let recursive_proofs =
             core::array::from_fn(|i| builder.add_virtual_proof_with_pis(inner_common_data[i]));
         let pis: [_; NUM_TABLES] = core::array::from_fn(|i| {
-            PublicInputs::<Target, HCO>::from_vec(&recursive_proofs[i].public_inputs, stark_config)
+            PublicInputs::<Target, C::HCO>::from_vec(
+                &recursive_proofs[i].public_inputs,
+                stark_config,
+            )
         });
         let index_verifier_data = core::array::from_fn(|_i| builder.add_virtual_target());
 
-        let mut challenger = RecursiveChallenger::<F, HCO, C::Hasher, D>::new(&mut builder);
+        let mut challenger = RecursiveChallenger::<F, C::HCO, C::Hasher, D>::new(&mut builder);
         for pi in &pis {
             for h in &pi.trace_cap {
                 challenger.observe_elements(h);
@@ -227,12 +220,12 @@ where
         }
 
         let state = challenger.compact(&mut builder);
-        for k in 0..HCO::WIDTH {
+        for k in 0..C::HCO::WIDTH {
             builder.connect(state[k], pis[0].challenger_state_before[k]);
         }
         // Check that the challenger state is consistent between proofs.
         for i in 1..NUM_TABLES {
-            for k in 0..HCO::WIDTH {
+            for k in 0..C::HCO::WIDTH {
                 builder.connect(
                     pis[i].challenger_state_before[k],
                     pis[i - 1].challenger_state_after[k],
@@ -268,7 +261,7 @@ where
             let inner_verifier_data =
                 builder.random_access_verifier_data(index_verifier_data[i], possible_vks);
 
-            builder.verify_proof::<HCO, HCI, C>(
+            builder.verify_proof::<C>(
                 &recursive_proofs[i],
                 &inner_verifier_data,
                 inner_common_data[i],
@@ -280,7 +273,7 @@ where
         let cyclic_vk = builder.add_verifier_data_public_inputs();
 
         RootCircuitData {
-            circuit: builder.build::<HCO, HCI, C>(),
+            circuit: builder.build::<C>(),
             proof_with_pis: recursive_proofs,
             index_verifier_data,
             cyclic_vk,
@@ -288,8 +281,8 @@ where
     }
 
     fn create_aggregation_circuit(
-        root: &RootCircuitData<F, HCO, HCI, C, D>,
+        root: &RootCircuitData<F, C, D>,
-    ) -> AggregationCircuitData<F, HCO, HCI, C, D> {
+    ) -> AggregationCircuitData<F, C, D> {
         let mut builder = CircuitBuilder::<F, D>::new(root.circuit.common.config.clone());
         let cyclic_vk = builder.add_verifier_data_public_inputs();
         let lhs = Self::add_agg_child(&mut builder, root);
@@ -300,7 +293,7 @@ where
             builder.add_gate(NoopGate, vec![]);
         }
 
-        let circuit = builder.build::<HCO, HCI, C>();
+        let circuit = builder.build::<C>();
         AggregationCircuitData {
             circuit,
             lhs,
@@ -311,7 +304,7 @@ where
 
     fn add_agg_child(
         builder: &mut CircuitBuilder<F, D>,
-        root: &RootCircuitData<F, HCO, HCI, C, D>,
+        root: &RootCircuitData<F, C, D>,
     ) -> AggregationChildTarget<D> {
         let common = &root.circuit.common;
         let root_vk = builder.constant_verifier_data(&root.circuit.verifier_only);
@@ -319,7 +312,7 @@ where
         let agg_proof = builder.add_virtual_proof_with_pis(common);
         let evm_proof = builder.add_virtual_proof_with_pis(common);
         builder
-            .conditionally_verify_cyclic_proof::<HCO, HCI, C>(
+            .conditionally_verify_cyclic_proof::<C>(
                 is_agg, &agg_proof, &evm_proof, &root_vk, common,
             )
             .expect("Failed to build cyclic recursion circuit");
@@ -330,9 +323,7 @@ where
         }
     }
 
-    fn create_block_circuit(
+    fn create_block_circuit(agg: &AggregationCircuitData<F, C, D>) -> BlockCircuitData<F, C, D> {
-        agg: &AggregationCircuitData<F, HCO, HCI, C, D>,
-    ) -> BlockCircuitData<F, HCO, HCI, C, D> {
         // The block circuit is similar to the agg circuit; both verify two inner proofs.
         // We need to adjust a few things, but it's easier than making a new CommonCircuitData.
         let expected_common_data = CommonCircuitData {
@@ -350,7 +341,7 @@ where
 
         let cyclic_vk = builder.add_verifier_data_public_inputs();
         builder
-            .conditionally_verify_cyclic_proof_or_dummy::<HCO, HCI, C>(
+            .conditionally_verify_cyclic_proof_or_dummy::<C>(
                 has_parent_block,
                 &parent_block_proof,
                 &expected_common_data,
@@ -358,13 +349,9 @@ where
             .expect("Failed to build cyclic recursion circuit");
 
         let agg_verifier_data = builder.constant_verifier_data(&agg.circuit.verifier_only);
-        builder.verify_proof::<HCO, HCI, C>(
+        builder.verify_proof::<C>(&agg_root_proof, &agg_verifier_data, &agg.circuit.common);
-            &agg_root_proof,
-            &agg_verifier_data,
-            &agg.circuit.common,
-        );
 
-        let circuit = builder.build::<HCO, HCI, C>();
+        let circuit = builder.build::<C>();
         BlockCircuitData {
             circuit,
             has_parent_block,
@@ -381,8 +368,8 @@ where
         config: &StarkConfig,
         generation_inputs: GenerationInputs,
         timing: &mut TimingTree,
-    ) -> anyhow::Result<ProofWithPublicInputs<F, HCO, HCI, C, D>> {
+    ) -> anyhow::Result<ProofWithPublicInputs<F, C, D>> {
-        let all_proof = prove::<F, HCO, HCI, C, D>(all_stark, config, generation_inputs, timing)?;
+        let all_proof = prove::<F, C, D>(all_stark, config, generation_inputs, timing)?;
         let mut root_inputs = PartialWitness::new();
 
         for table in 0..NUM_TABLES {
@@ -411,20 +398,17 @@ where
         self.root.circuit.prove(root_inputs)
     }
 
-    pub fn verify_root(
+    pub fn verify_root(&self, agg_proof: ProofWithPublicInputs<F, C, D>) -> anyhow::Result<()> {
-        &self,
-        agg_proof: ProofWithPublicInputs<F, HCO, HCI, C, D>,
-    ) -> anyhow::Result<()> {
         self.root.circuit.verify(agg_proof)
     }
 
     pub fn prove_aggregation(
         &self,
         lhs_is_agg: bool,
-        lhs_proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        lhs_proof: &ProofWithPublicInputs<F, C, D>,
         rhs_is_agg: bool,
-        rhs_proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        rhs_proof: &ProofWithPublicInputs<F, C, D>,
-    ) -> anyhow::Result<ProofWithPublicInputs<F, HCO, HCI, C, D>> {
+    ) -> anyhow::Result<ProofWithPublicInputs<F, C, D>> {
         let mut agg_inputs = PartialWitness::new();
 
         agg_inputs.set_bool_target(self.aggregation.lhs.is_agg, lhs_is_agg);
@@ -445,7 +429,7 @@ where
 
     pub fn verify_aggregation(
         &self,
-        agg_proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        agg_proof: &ProofWithPublicInputs<F, C, D>,
     ) -> anyhow::Result<()> {
         self.aggregation.circuit.verify(agg_proof.clone())?;
         check_cyclic_proof_verifier_data(
@@ -457,9 +441,9 @@ where
 
     pub fn prove_block(
         &self,
-        opt_parent_block_proof: Option<&ProofWithPublicInputs<F, HCO, HCI, C, D>>,
+        opt_parent_block_proof: Option<&ProofWithPublicInputs<F, C, D>>,
-        agg_root_proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        agg_root_proof: &ProofWithPublicInputs<F, C, D>,
-    ) -> anyhow::Result<ProofWithPublicInputs<F, HCO, HCI, C, D>> {
+    ) -> anyhow::Result<ProofWithPublicInputs<F, C, D>> {
         let mut block_inputs = PartialWitness::new();
 
         block_inputs.set_bool_target(
@@ -479,10 +463,7 @@ where
         self.block.circuit.prove(block_inputs)
     }
 
-    pub fn verify_block(
+    pub fn verify_block(&self, block_proof: &ProofWithPublicInputs<F, C, D>) -> anyhow::Result<()> {
-        &self,
-        block_proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
-    ) -> anyhow::Result<()> {
         self.block.circuit.verify(block_proof.clone())?;
         check_cyclic_proof_verifier_data(
             block_proof,
@@ -492,29 +473,25 @@ where
     }
 }
 
-struct RecursiveCircuitsForTable<F, HCO, HCI, C, const D: usize>
+struct RecursiveCircuitsForTable<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    [(); HCO::WIDTH]:,
 {
     /// A map from `log_2(height)` to a chain of shrinking recursion circuits starting at that
     /// height.
-    by_stark_size: BTreeMap<usize, RecursiveCircuitsForTableSize<F, HCO, HCI, C, D>>,
+    by_stark_size: BTreeMap<usize, RecursiveCircuitsForTableSize<F, C, D>>,
 }
 
-impl<F, HCO, HCI, C, const D: usize> RecursiveCircuitsForTable<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> RecursiveCircuitsForTable<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    C::Hasher: AlgebraicHasher<F, HCO>,
     [(); C::Hasher::HASH_SIZE]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     fn new<S: Stark<F, D>>(
         table: Table,
@@ -545,7 +522,7 @@ where
 
     /// For each initial `degree_bits`, get the final circuit at the end of that shrinking chain.
     /// Each of these final circuits should have degree `THRESHOLD_DEGREE_BITS`.
-    fn final_circuits(&self) -> Vec<&CircuitData<F, HCO, HCI, C, D>> {
+    fn final_circuits(&self) -> Vec<&CircuitData<F, C, D>> {
         self.by_stark_size
             .values()
             .map(|chain| {
@@ -561,28 +538,24 @@ where
 
 /// A chain of shrinking wrapper circuits, ending with a final circuit with `degree_bits`
 /// `THRESHOLD_DEGREE_BITS`.
-struct RecursiveCircuitsForTableSize<F, HCO, HCI, C, const D: usize>
+struct RecursiveCircuitsForTableSize<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    [(); HCO::WIDTH]:,
 {
-    initial_wrapper: StarkWrapperCircuit<F, HCO, HCI, C, D>,
+    initial_wrapper: StarkWrapperCircuit<F, C, D>,
-    shrinking_wrappers: Vec<PlonkWrapperCircuit<F, HCO, HCI, C, D>>,
+    shrinking_wrappers: Vec<PlonkWrapperCircuit<F, C, D>>,
 }
 
-impl<F, HCO, HCI, C, const D: usize> RecursiveCircuitsForTableSize<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> RecursiveCircuitsForTableSize<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    C::Hasher: AlgebraicHasher<F, HCO>,
     [(); C::Hasher::HASH_SIZE]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     fn new<S: Stark<F, D>>(
         table: Table,
@@ -609,7 +582,7 @@ where
         loop {
             let last = shrinking_wrappers
                 .last()
-                .map(|wrapper: &PlonkWrapperCircuit<F, HCO, HCI, C, D>| &wrapper.circuit)
+                .map(|wrapper: &PlonkWrapperCircuit<F, C, D>| &wrapper.circuit)
                 .unwrap_or(&initial_wrapper.circuit);
             let last_degree_bits = last.common.degree_bits();
             assert!(last_degree_bits >= THRESHOLD_DEGREE_BITS);
@@ -620,10 +593,10 @@ where
             let mut builder = CircuitBuilder::new(shrinking_config());
             let proof_with_pis_target = builder.add_virtual_proof_with_pis(&last.common);
             let last_vk = builder.constant_verifier_data(&last.verifier_only);
-            builder.verify_proof::<HCO, HCI, C>(&proof_with_pis_target, &last_vk, &last.common);
+            builder.verify_proof::<C>(&proof_with_pis_target, &last_vk, &last.common);
             builder.register_public_inputs(&proof_with_pis_target.public_inputs); // carry PIs forward
             add_common_recursion_gates(&mut builder);
-            let circuit = builder.build::<HCO, HCI, C>();
+            let circuit = builder.build::<C>();
 
             assert!(
                 circuit.common.degree_bits() < last_degree_bits,
@@ -645,9 +618,9 @@ where
 
     fn shrink(
         &self,
-        stark_proof_with_metadata: &StarkProofWithMetadata<F, HCO, HCI, C, D>,
+        stark_proof_with_metadata: &StarkProofWithMetadata<F, C, D>,
         ctl_challenges: &GrandProductChallengeSet<F>,
-    ) -> anyhow::Result<ProofWithPublicInputs<F, HCO, HCI, C, D>> {
+    ) -> anyhow::Result<ProofWithPublicInputs<F, C, D>> {
         let mut proof = self
             .initial_wrapper
             .prove(stark_proof_with_metadata, ctl_challenges)?;

evm/src/get_challenges.rs

@@ -14,15 +14,9 @@ use crate::permutation::{
 };
 use crate::proof::*;
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> AllProof<F, C, D>
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > AllProof<F, HCO, HCI, C, D>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     /// Computes all Fiat-Shamir challenges used in the STARK proof.
     pub(crate) fn get_challenges(
@@ -31,10 +25,10 @@ where
         config: &StarkConfig,
     ) -> AllProofChallenges<F, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
-        let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+        let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
 
         for proof in &self.stark_proofs {
             challenger.observe_cap(&proof.proof.trace_cap);
@@ -67,12 +61,12 @@ where
         &self,
         all_stark: &AllStark<F, D>,
         config: &StarkConfig,
-    ) -> AllChallengerState<F, HCO, D>
+    ) -> AllChallengerState<F, C::HCO, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
-        let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+        let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
 
         for proof in &self.stark_proofs {
             challenger.observe_cap(&proof.proof.trace_cap);
@@ -104,24 +98,22 @@ where
     }
 }
 
-impl<F, HCO, HCI, C, const D: usize> StarkProof<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> StarkProof<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
     /// Computes all Fiat-Shamir challenges used in the STARK proof.
     pub(crate) fn get_challenges(
         &self,
-        challenger: &mut Challenger<F, HCO, C::Hasher>,
+        challenger: &mut Challenger<F, C::HCO, C::Hasher>,
         stark_use_permutation: bool,
         stark_permutation_batch_size: usize,
         config: &StarkConfig,
     ) -> StarkProofChallenges<F, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let degree_bits = self.recover_degree_bits(config);
 
@@ -162,7 +154,7 @@ where
             permutation_challenge_sets,
             stark_alphas,
             stark_zeta,
-            fri_challenges: challenger.fri_challenges::<HCI, C, D>(
+            fri_challenges: challenger.fri_challenges::<C, D>(
                 commit_phase_merkle_caps,
                 final_poly,
                 *pow_witness,
@@ -174,23 +166,18 @@ where
 }
 
 impl<const D: usize> StarkProofTarget<D> {
-    pub(crate) fn get_challenges<
+    pub(crate) fn get_challenges<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>>(
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &self,
         builder: &mut CircuitBuilder<F, D>,
-        challenger: &mut RecursiveChallenger<F, HCO, C::Hasher, D>,
+        challenger: &mut RecursiveChallenger<F, C::HCO, C::Hasher, D>,
         stark_use_permutation: bool,
         stark_permutation_batch_size: usize,
         config: &StarkConfig,
     ) -> StarkProofChallengesTarget<D>
     where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let StarkProofTarget {
             permutation_ctl_zs_cap,

evm/src/keccak/keccak_stark.rs

@@ -607,7 +607,7 @@ mod tests {
     use plonky2::field::types::{Field, PrimeField64};
     use plonky2::fri::oracle::PolynomialBatch;
     use plonky2::iop::challenger::Challenger;
-    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use plonky2::timed;
     use plonky2::util::timing::TimingTree;
     use tiny_keccak::keccakf;
@@ -624,9 +624,7 @@ mod tests {
     fn test_stark_degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = KeccakStark<F, D>;
 
         let stark = S {
@@ -639,15 +637,13 @@ mod tests {
     fn test_stark_circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = KeccakStark<F, D>;
 
         let stark = S {
             f: Default::default(),
         };
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 
     #[test]
@@ -656,9 +652,7 @@ mod tests {
 
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = KeccakStark<F, D>;
 
         let stark = S {
@@ -691,9 +685,7 @@ mod tests {
         const NUM_PERMS: usize = 85;
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = KeccakStark<F, D>;
         let stark = S::default();
         let config = StarkConfig::standard_fast_config();
@@ -716,7 +708,7 @@ mod tests {
         let trace_commitments = timed!(
             timing,
             "compute trace commitment",
-            PolynomialBatch::<F, HCO, HCI, C, D>::from_values(
+            PolynomialBatch::<F, C, D>::from_values(
                 cloned_trace_poly_values,
                 config.fri_config.rate_bits,
                 false,

evm/src/keccak_sponge/keccak_sponge_stark.rs

@@ -411,7 +411,7 @@ mod tests {
     use keccak_hash::keccak;
     use plonky2::field::goldilocks_field::GoldilocksField;
     use plonky2::field::types::PrimeField64;
-    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     use crate::keccak_sponge::columns::KeccakSpongeColumnsView;
     use crate::keccak_sponge::keccak_sponge_stark::{KeccakSpongeOp, KeccakSpongeStark};
@@ -423,9 +423,7 @@ mod tests {
     fn test_stark_degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = KeccakSpongeStark<F, D>;
 
         let stark = S::default();
@@ -436,13 +434,11 @@ mod tests {
     fn test_stark_circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = KeccakSpongeStark<F, D>;
 
         let stark = S::default();
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 
     #[test]

evm/src/logic.rs

@@ -303,7 +303,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for LogicStark<F,
 #[cfg(test)]
 mod tests {
     use anyhow::Result;
-    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     use crate::logic::LogicStark;
     use crate::stark_testing::{test_stark_circuit_constraints, test_stark_low_degree};
@@ -312,9 +312,7 @@ mod tests {
     fn test_stark_degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = LogicStark<F, D>;
 
         let stark = S {
@@ -327,14 +325,12 @@ mod tests {
     fn test_stark_circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = LogicStark<F, D>;
 
         let stark = S {
             f: Default::default(),
         };
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 }

evm/src/memory/memory_stark.rs

@@ -462,7 +462,7 @@ impl<F: RichField + Extendable<D>, const D: usize> Stark<F, D> for MemoryStark<F
 #[cfg(test)]
 pub(crate) mod tests {
     use anyhow::Result;
-    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     use crate::memory::memory_stark::MemoryStark;
     use crate::stark_testing::{test_stark_circuit_constraints, test_stark_low_degree};
@@ -471,9 +471,7 @@ pub(crate) mod tests {
     fn test_stark_degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = MemoryStark<F, D>;
 
         let stark = S {
@@ -486,14 +484,12 @@ pub(crate) mod tests {
     fn test_stark_circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = MemoryStark<F, D>;
 
         let stark = S {
             f: Default::default(),
         };
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 }

evm/src/proof.rs

@@ -21,29 +21,18 @@ use crate::permutation::GrandProductChallengeSet;
 
 /// A STARK proof for each table, plus some metadata used to create recursive wrapper proofs.
 #[derive(Debug, Clone)]
-pub struct AllProof<
+pub struct AllProof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-    F: RichField + Extendable<D>,
+where
-    HCO: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> where
-    [(); HCO::WIDTH]:,
 {
-    pub stark_proofs: [StarkProofWithMetadata<F, HCO, HCI, C, D>; NUM_TABLES],
+    pub stark_proofs: [StarkProofWithMetadata<F, C, D>; NUM_TABLES],
     pub(crate) ctl_challenges: GrandProductChallengeSet<F>,
     pub public_values: PublicValues,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> AllProof<F, C, D>
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > AllProof<F, HCO, HCI, C, D>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     pub fn degree_bits(&self, config: &StarkConfig) -> [usize; NUM_TABLES] {
         core::array::from_fn(|i| self.stark_proofs[i].proof.recover_degree_bits(config))
@@ -117,48 +106,33 @@ pub struct BlockMetadataTarget {
 }
 
 #[derive(Debug, Clone)]
-pub struct StarkProof<
+pub struct StarkProof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> {
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> {
     /// Merkle cap of LDEs of trace values.
-    pub trace_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub trace_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of permutation Z values.
-    pub permutation_ctl_zs_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub permutation_ctl_zs_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of trace values.
-    pub quotient_polys_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub quotient_polys_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Purported values of each polynomial at the challenge point.
     pub openings: StarkOpeningSet<F, D>,
     /// A batch FRI argument for all openings.
-    pub opening_proof: FriProof<F, HCO, C::Hasher, D>,
+    pub opening_proof: FriProof<F, C::HCO, C::Hasher, D>,
 }
 
 /// A `StarkProof` along with some metadata about the initial Fiat-Shamir state, which is used when
 /// creating a recursive wrapper proof around a STARK proof.
 #[derive(Debug, Clone)]
-pub struct StarkProofWithMetadata<F, HCO, HCI, C, const D: usize>
+pub struct StarkProofWithMetadata<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    [(); HCO::WIDTH]:,
 {
-    pub(crate) init_challenger_state: [F; HCO::WIDTH],
+    pub(crate) init_challenger_state: [F; C::HCO::WIDTH],
-    pub(crate) proof: StarkProof<F, HCO, HCI, C, D>,
+    pub(crate) proof: StarkProof<F, C, D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> StarkProof<F, C, D> {
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > StarkProof<F, HCO, HCI, C, D>
-{
     /// Recover the length of the trace from a STARK proof and a STARK config.
     pub fn recover_degree_bits(&self, config: &StarkConfig) -> usize {
         let initial_merkle_proof = &self.opening_proof.query_round_proofs[0]
@@ -232,22 +206,22 @@ pub struct StarkOpeningSet<F: RichField + Extendable<D>, const D: usize> {
 }
 
 impl<F: RichField + Extendable<D>, const D: usize> StarkOpeningSet<F, D> {
-    pub fn new<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn new<C: GenericConfig<D, F = F>>(
         zeta: F::Extension,
         g: F,
-        trace_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        trace_commitment: &PolynomialBatch<F, C, D>,
-        permutation_ctl_zs_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        permutation_ctl_zs_commitment: &PolynomialBatch<F, C, D>,
-        quotient_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        quotient_commitment: &PolynomialBatch<F, C, D>,
         degree_bits: usize,
         num_permutation_zs: usize,
     ) -> Self {
-        let eval_commitment = |z: F::Extension, c: &PolynomialBatch<F, HCO, HCI, C, D>| {
+        let eval_commitment = |z: F::Extension, c: &PolynomialBatch<F, C, D>| {
             c.polynomials
                 .par_iter()
                 .map(|p| p.to_extension().eval(z))
                 .collect::<Vec<_>>()
         };
-        let eval_commitment_base = |z: F, c: &PolynomialBatch<F, HCO, HCI, C, D>| {
+        let eval_commitment_base = |z: F, c: &PolynomialBatch<F, C, D>| {
             c.polynomials
                 .par_iter()
                 .map(|p| p.eval(z))

evm/src/prover.rs

@@ -42,25 +42,23 @@ use crate::vanishing_poly::eval_vanishing_poly;
 use crate::vars::StarkEvaluationVars;
 
 /// Generate traces, then create all STARK proofs.
-pub fn prove<F, HCO, HCI, C, const D: usize>(
+pub fn prove<F, C, const D: usize>(
     all_stark: &AllStark<F, D>,
     config: &StarkConfig,
     inputs: GenerationInputs,
     timing: &mut TimingTree,
-) -> Result<AllProof<F, HCO, HCI, C, D>>
+) -> Result<AllProof<F, C, D>>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     [(); CpuStark::<F, D>::COLUMNS]:,
     [(); KeccakStark::<F, D>::COLUMNS]:,
     [(); KeccakSpongeStark::<F, D>::COLUMNS]:,
     [(); LogicStark::<F, D>::COLUMNS]:,
     [(); MemoryStark::<F, D>::COLUMNS]:,
     [(); C::Hasher::HASH_SIZE]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let (proof, _outputs) = prove_with_outputs(all_stark, config, inputs, timing)?;
     Ok(proof)
@@ -68,25 +66,23 @@ where
 
 /// Generate traces, then create all STARK proofs. Returns information about the post-state,
 /// intended for debugging, in addition to the proof.
-pub fn prove_with_outputs<F, HCO, HCI, C, const D: usize>(
+pub fn prove_with_outputs<F, C, const D: usize>(
     all_stark: &AllStark<F, D>,
     config: &StarkConfig,
     inputs: GenerationInputs,
     timing: &mut TimingTree,
-) -> Result<(AllProof<F, HCO, HCI, C, D>, GenerationOutputs)>
+) -> Result<(AllProof<F, C, D>, GenerationOutputs)>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     [(); C::Hasher::HASH_SIZE]:,
     [(); CpuStark::<F, D>::COLUMNS]:,
     [(); KeccakStark::<F, D>::COLUMNS]:,
     [(); KeccakSpongeStark::<F, D>::COLUMNS]:,
     [(); LogicStark::<F, D>::COLUMNS]:,
     [(); MemoryStark::<F, D>::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     timed!(timing, "build kernel", Lazy::force(&KERNEL));
     let (traces, public_values, outputs) = timed!(
@@ -99,26 +95,24 @@ where
 }
 
 /// Compute all STARK proofs.
-pub(crate) fn prove_with_traces<F, HCO, HCI, C, const D: usize>(
+pub(crate) fn prove_with_traces<F, C, const D: usize>(
     all_stark: &AllStark<F, D>,
     config: &StarkConfig,
     trace_poly_values: [Vec<PolynomialValues<F>>; NUM_TABLES],
     public_values: PublicValues,
     timing: &mut TimingTree,
-) -> Result<AllProof<F, HCO, HCI, C, D>>
+) -> Result<AllProof<F, C, D>>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     [(); CpuStark::<F, D>::COLUMNS]:,
     [(); KeccakStark::<F, D>::COLUMNS]:,
     [(); KeccakSpongeStark::<F, D>::COLUMNS]:,
     [(); LogicStark::<F, D>::COLUMNS]:,
     [(); MemoryStark::<F, D>::COLUMNS]:,
     [(); C::Hasher::HASH_SIZE]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let rate_bits = config.fri_config.rate_bits;
     let cap_height = config.fri_config.cap_height;
@@ -133,7 +127,7 @@ where
                 timed!(
                     timing,
                     &format!("compute trace commitment for {:?}", table),
-                    PolynomialBatch::<F, HCO, HCI, C, D>::from_values(
+                    PolynomialBatch::<F, C, D>::from_values(
                         // TODO: Cloning this isn't great; consider having `from_values` accept a reference,
                         // or having `compute_permutation_z_polys` read trace values from the `PolynomialBatch`.
                         trace.clone(),
@@ -152,7 +146,7 @@ where
         .iter()
         .map(|c| c.merkle_tree.cap.clone())
         .collect::<Vec<_>>();
-    let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+    let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
     for cap in &trace_caps {
         challenger.observe_cap(cap);
     }
@@ -189,28 +183,26 @@ where
     })
 }
 
-fn prove_with_commitments<F, HCO, HCI, C, const D: usize>(
+fn prove_with_commitments<F, C, const D: usize>(
     all_stark: &AllStark<F, D>,
     config: &StarkConfig,
     trace_poly_values: [Vec<PolynomialValues<F>>; NUM_TABLES],
-    trace_commitments: Vec<PolynomialBatch<F, HCO, HCI, C, D>>,
+    trace_commitments: Vec<PolynomialBatch<F, C, D>>,
     ctl_data_per_table: [CtlData<F>; NUM_TABLES],
-    challenger: &mut Challenger<F, HCO, C::Hasher>,
+    challenger: &mut Challenger<F, C::HCO, C::Hasher>,
     timing: &mut TimingTree,
-) -> Result<[StarkProofWithMetadata<F, HCO, HCI, C, D>; NUM_TABLES]>
+) -> Result<[StarkProofWithMetadata<F, C, D>; NUM_TABLES]>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     [(); C::Hasher::HASH_SIZE]:,
     [(); CpuStark::<F, D>::COLUMNS]:,
     [(); KeccakStark::<F, D>::COLUMNS]:,
     [(); KeccakSpongeStark::<F, D>::COLUMNS]:,
     [(); LogicStark::<F, D>::COLUMNS]:,
     [(); MemoryStark::<F, D>::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let cpu_proof = timed!(
         timing,
@@ -287,24 +279,22 @@ where
 }
 
 /// Compute proof for a single STARK table.
-pub(crate) fn prove_single_table<F, HCO, HCI, C, S, const D: usize>(
+pub(crate) fn prove_single_table<F, C, S, const D: usize>(
     stark: &S,
     config: &StarkConfig,
     trace_poly_values: &[PolynomialValues<F>],
-    trace_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+    trace_commitment: &PolynomialBatch<F, C, D>,
     ctl_data: &CtlData<F>,
-    challenger: &mut Challenger<F, HCO, C::Hasher>,
+    challenger: &mut Challenger<F, C::HCO, C::Hasher>,
     timing: &mut TimingTree,
-) -> Result<StarkProofWithMetadata<F, HCO, HCI, C, D>>
+) -> Result<StarkProofWithMetadata<F, C, D>>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let degree = trace_poly_values[0].len();
     let degree_bits = log2_strict(degree);
@@ -377,7 +367,7 @@ where
     let quotient_polys = timed!(
         timing,
         "compute quotient polys",
-        compute_quotient_polys::<F, <F as Packable>::Packing, HCO, HCI, C, S, D>(
+        compute_quotient_polys::<F, <F as Packable>::Packing, C, S, D>(
             stark,
             trace_commitment,
             &permutation_ctl_zs_commitment,
@@ -474,10 +464,10 @@ where
 
 /// Computes the quotient polynomials `(sum alpha^i C_i(x)) / Z_H(x)` for `alpha` in `alphas`,
 /// where the `C_i`s are the Stark constraints.
-fn compute_quotient_polys<'a, F, P, HCO, HCI, C, S, const D: usize>(
+fn compute_quotient_polys<'a, F, P, C, S, const D: usize>(
     stark: &S,
-    trace_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    trace_commitment: &'a PolynomialBatch<F, C, D>,
-    permutation_ctl_zs_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    permutation_ctl_zs_commitment: &'a PolynomialBatch<F, C, D>,
     permutation_challenges: Option<&'a Vec<GrandProductChallengeSet<F>>>,
     ctl_data: &CtlData<F>,
     alphas: Vec<F>,
@@ -488,9 +478,7 @@ fn compute_quotient_polys<'a, F, P, HCO, HCI, C, S, const D: usize>(
 where
     F: RichField + Extendable<D>,
     P: PackedField<Scalar = F>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
 {
@@ -613,10 +601,10 @@ where
 
 /// Check that all constraints evaluate to zero on `H`.
 /// Can also be used to check the degree of the constraints by evaluating on a larger subgroup.
-fn check_constraints<'a, F, HCO, HCI, C, S, const D: usize>(
+fn check_constraints<'a, F, C, S, const D: usize>(
     stark: &S,
-    trace_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    trace_commitment: &'a PolynomialBatch<F, C, D>,
-    permutation_ctl_zs_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    permutation_ctl_zs_commitment: &'a PolynomialBatch<F, C, D>,
     permutation_challenges: Option<&'a Vec<GrandProductChallengeSet<F>>>,
     ctl_data: &CtlData<F>,
     alphas: Vec<F>,
@@ -625,9 +613,7 @@ fn check_constraints<'a, F, HCO, HCI, C, S, const D: usize>(
     config: &StarkConfig,
 ) where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
 {
@@ -645,7 +631,7 @@ fn check_constraints<'a, F, HCO, HCI, C, S, const D: usize>(
     let subgroup = F::two_adic_subgroup(degree_bits + rate_bits);
 
     // Get the evaluations of a batch of polynomials over our subgroup.
-    let get_subgroup_evals = |comm: &PolynomialBatch<F, HCO, HCI, C, D>| -> Vec<Vec<F>> {
+    let get_subgroup_evals = |comm: &PolynomialBatch<F, C, D>| -> Vec<Vec<F>> {
         let values = comm
             .polynomials
             .par_iter()

evm/src/recursive_verifier.rs

@@ -43,12 +43,10 @@ use crate::vars::StarkEvaluationTargets;
 /// Table-wise recursive proofs of an `AllProof`.
 pub struct RecursiveAllProof<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub recursive_proofs: [ProofWithPublicInputs<F, HCO, HCI, C, D>; NUM_TABLES],
+    pub recursive_proofs: [ProofWithPublicInputs<F, C, D>; NUM_TABLES],
 }
 
 pub(crate) struct PublicInputs<T: Copy + Eq + PartialEq + Debug, HC: HashConfig>
@@ -102,30 +100,28 @@ where
     }
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    RecursiveAllProof<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > RecursiveAllProof<F, HCO, HCI, C, D>
 {
     /// Verify every recursive proof.
     pub fn verify(
         self,
-        verifier_data: &[VerifierCircuitData<F, HCO, HCI, C, D>; NUM_TABLES],
+        verifier_data: &[VerifierCircuitData<F, C, D>; NUM_TABLES],
         cross_table_lookups: Vec<CrossTableLookup<F>>,
         inner_config: &StarkConfig,
     ) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let pis: [_; NUM_TABLES] = core::array::from_fn(|i| {
-            PublicInputs::<F, HCO>::from_vec(&self.recursive_proofs[i].public_inputs, inner_config)
+            PublicInputs::<F, C::HCO>::from_vec(
+                &self.recursive_proofs[i].public_inputs,
+                inner_config,
+            )
         });
 
-        let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+        let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
         for pi in &pis {
             for h in &pi.trace_cap {
                 challenger.observe_elements(h);
@@ -161,36 +157,32 @@ impl<
 }
 
 /// Represents a circuit which recursively verifies a STARK proof.
-pub(crate) struct StarkWrapperCircuit<F, HCO: HashConfig, HCI: HashConfig, C, const D: usize>
+pub(crate) struct StarkWrapperCircuit<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    [(); HCO::WIDTH]:,
 {
-    pub(crate) circuit: CircuitData<F, HCO, HCI, C, D>,
+    pub(crate) circuit: CircuitData<F, C, D>,
     pub(crate) stark_proof_target: StarkProofTarget<D>,
     pub(crate) ctl_challenges_target: GrandProductChallengeSet<Target>,
-    pub(crate) init_challenger_state_target: [Target; HCO::WIDTH],
+    pub(crate) init_challenger_state_target: [Target; C::HCO::WIDTH],
     pub(crate) zero_target: Target,
 }
 
-impl<F, HCO, HCI, C, const D: usize> StarkWrapperCircuit<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> StarkWrapperCircuit<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F>,
+    [(); C::HCO::WIDTH]:,
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    [(); C::HCI::WIDTH]:,
-    [(); HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
 {
     pub(crate) fn prove(
         &self,
-        proof_with_metadata: &StarkProofWithMetadata<F, HCO, HCI, C, D>,
+        proof_with_metadata: &StarkProofWithMetadata<F, C, D>,
         ctl_challenges: &GrandProductChallengeSet<F>,
-    ) -> Result<ProofWithPublicInputs<F, HCO, HCI, C, D>> {
+    ) -> Result<ProofWithPublicInputs<F, C, D>> {
         let mut inputs = PartialWitness::new();
 
         set_stark_proof_target(
@@ -220,31 +212,27 @@ where
 }
 
 /// Represents a circuit which recursively verifies a PLONK proof.
-pub(crate) struct PlonkWrapperCircuit<F, HCO, HCI, C, const D: usize>
+pub(crate) struct PlonkWrapperCircuit<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
-    pub(crate) circuit: CircuitData<F, HCO, HCI, C, D>,
+    pub(crate) circuit: CircuitData<F, C, D>,
     pub(crate) proof_with_pis_target: ProofWithPublicInputsTarget<D>,
 }
 
-impl<F, HCO, HCI, C, const D: usize> PlonkWrapperCircuit<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> PlonkWrapperCircuit<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F>,
+    [(); C::HCO::WIDTH]:,
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    [(); C::HCI::WIDTH]:,
-    [(); HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
 {
     pub(crate) fn prove(
         &self,
-        proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof: &ProofWithPublicInputs<F, C, D>,
-    ) -> Result<ProofWithPublicInputs<F, HCO, HCI, C, D>> {
+    ) -> Result<ProofWithPublicInputs<F, C, D>> {
         let mut inputs = PartialWitness::new();
         inputs.set_proof_with_pis_target(&self.proof_with_pis_target, proof);
         self.circuit.prove(inputs)
@@ -254,9 +242,7 @@ where
 /// Returns the recursive Stark circuit.
 pub(crate) fn recursive_stark_circuit<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -267,12 +253,12 @@ pub(crate) fn recursive_stark_circuit<
     inner_config: &StarkConfig,
     circuit_config: &CircuitConfig,
     min_degree_bits: usize,
-) -> StarkWrapperCircuit<F, HCO, HCI, C, D>
+) -> StarkWrapperCircuit<F, C, D>
 where
     [(); S::COLUMNS]:,
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let mut builder = CircuitBuilder::<F, D>::new(circuit_config.clone());
     let zero_target = builder.zero();
@@ -311,8 +297,8 @@ where
 
     let init_challenger_state_target = core::array::from_fn(|_| builder.add_virtual_public_input());
     let mut challenger =
-        RecursiveChallenger::<F, HCO, C::Hasher, D>::from_state(init_challenger_state_target);
+        RecursiveChallenger::<F, C::HCO, C::Hasher, D>::from_state(init_challenger_state_target);
-    let challenges = proof_target.get_challenges::<F, HCO, HCI, C>(
+    let challenges = proof_target.get_challenges::<F, C>(
         &mut builder,
         &mut challenger,
         num_permutation_zs > 0,
@@ -324,7 +310,7 @@ where
 
     builder.register_public_inputs(&proof_target.openings.ctl_zs_last);
 
-    verify_stark_proof_with_challenges_circuit::<F, HCO, HCI, C, _, D>(
+    verify_stark_proof_with_challenges_circuit::<F, C, _, D>(
         &mut builder,
         stark,
         &proof_target,
@@ -340,7 +326,7 @@ where
         builder.add_gate(NoopGate, vec![]);
     }
 
-    let circuit = builder.build::<HCO, HCI, C>();
+    let circuit = builder.build::<C>();
     StarkWrapperCircuit {
         circuit,
         stark_proof_target: proof_target,
@@ -364,9 +350,7 @@ pub(crate) fn add_common_recursion_gates<F: RichField + Extendable<D>, const D:
 /// Recursively verifies an inner proof.
 fn verify_stark_proof_with_challenges_circuit<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -377,9 +361,9 @@ fn verify_stark_proof_with_challenges_circuit<
     ctl_vars: &[CtlCheckVarsTarget<F, D>],
     inner_config: &StarkConfig,
 ) where
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
     [(); S::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     let zero = builder.zero();
     let one = builder.one_extension();
@@ -463,7 +447,7 @@ fn verify_stark_proof_with_challenges_circuit<
         ctl_zs_last.len(),
         inner_config,
     );
-    builder.verify_fri_proof::<HCO, HCI, C>(
+    builder.verify_fri_proof::<C>(
         &fri_instance,
         &proof.openings.to_fri_openings(zero),
         &challenges.fri_challenges,
@@ -591,23 +575,14 @@ fn add_virtual_stark_opening_set<F: RichField + Extendable<D>, S: Stark<F, D>, c
     }
 }
 
-pub(crate) fn set_stark_proof_target<
+pub(crate) fn set_stark_proof_target<F, C: GenericConfig<D, F = F>, W, const D: usize>(
-    F,
-    HCO,
-    HCI,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    W,
-    const D: usize,
->(
     witness: &mut W,
     proof_target: &StarkProofTarget<D>,
-    proof: &StarkProof<F, HCO, HCI, C, D>,
+    proof: &StarkProof<F, C, D>,
     zero: Target,
 ) where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    HCI: HashConfig,
-    C::Hasher: AlgebraicHasher<F, HCO>,
     W: Witness<F>,
 {
     witness.set_cap_target(&proof_target.trace_cap, &proof.trace_cap);

evm/src/stark_testing.rs

@@ -79,9 +79,7 @@ where
 /// Tests that the circuit constraints imposed by the given STARK are coherent with the native constraints.
 pub fn test_stark_circuit_constraints<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -89,8 +87,8 @@ pub fn test_stark_circuit_constraints<
 ) -> Result<()>
 where
     [(); S::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     // Compute native constraint evaluation on random values.
     let vars = StarkEvaluationVars {
@@ -148,7 +146,7 @@ where
     let native_eval_t = builder.constant_extension(native_eval);
     builder.connect_extension(circuit_eval, native_eval_t);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let proof = data.prove(pw)?;
     data.verify(proof)
 }

evm/src/verifier.rs

@@ -26,15 +26,9 @@ use crate::stark::Stark;
 use crate::vanishing_poly::eval_vanishing_poly;
 use crate::vars::StarkEvaluationVars;
 
-pub fn verify_proof<
+pub fn verify_proof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
     all_stark: &AllStark<F, D>,
-    all_proof: AllProof<F, HCO, HCI, C, D>,
+    all_proof: AllProof<F, C, D>,
     config: &StarkConfig,
 ) -> Result<()>
 where
@@ -43,8 +37,8 @@ where
     [(); KeccakSpongeStark::<F, D>::COLUMNS]:,
     [(); LogicStark::<F, D>::COLUMNS]:,
     [(); MemoryStark::<F, D>::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let AllProofChallenges {
         stark_challenges,
@@ -114,21 +108,19 @@ where
 
 pub(crate) fn verify_stark_proof_with_challenges<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
     stark: &S,
-    proof: &StarkProof<F, HCO, HCI, C, D>,
+    proof: &StarkProof<F, C, D>,
     challenges: &StarkProofChallenges<F, D>,
     ctl_vars: &[CtlCheckVars<F, F::Extension, F::Extension, D>],
     config: &StarkConfig,
 ) -> Result<()>
 where
     [(); S::COLUMNS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     log::debug!("Checking proof: {}", type_name::<S>());
     validate_proof_shape(stark, proof, config, ctl_vars.len())?;
@@ -199,7 +191,7 @@ where
         proof.quotient_polys_cap.clone(),
     ];
 
-    verify_fri_proof::<F, HCO, HCI, C, D>(
+    verify_fri_proof::<F, C, D>(
         &stark.fri_instance(
             challenges.stark_zeta,
             F::primitive_root_of_unity(degree_bits),
@@ -217,17 +209,15 @@ where
     Ok(())
 }
 
-fn validate_proof_shape<F, HCO, HCI, C, S, const D: usize>(
+fn validate_proof_shape<F, C, S, const D: usize>(
     stark: &S,
-    proof: &StarkProof<F, HCO, HCI, C, D>,
+    proof: &StarkProof<F, C, D>,
     config: &StarkConfig,
     num_ctl_zs: usize,
 ) -> anyhow::Result<()>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
 {

evm/tests/add11_yml.rs

@@ -10,7 +10,7 @@ use ethereum_types::Address;
 use hex_literal::hex;
 use keccak_hash::keccak;
 use plonky2::field::goldilocks_field::GoldilocksField;
-use plonky2::plonk::config::{PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::PoseidonGoldilocksConfig;
 use plonky2::util::timing::TimingTree;
 use plonky2_evm::all_stark::AllStark;
 use plonky2_evm::config::StarkConfig;
@@ -24,8 +24,6 @@ use plonky2_evm::Node;
 type F = GoldilocksField;
 const D: usize = 2;
 type C = PoseidonGoldilocksConfig;
-type HCO = PoseidonHashConfig;
-type HCI = HCO;
 
 /// The `add11_yml` test case from https://github.com/ethereum/tests
 #[test]
@@ -100,7 +98,7 @@ fn add11_yml() -> anyhow::Result<()> {
     };
 
     let mut timing = TimingTree::new("prove", log::Level::Debug);
-    let proof = prove::<F, HCO, HCI, C, D>(&all_stark, &config, inputs, &mut timing)?;
+    let proof = prove::<F, C, D>(&all_stark, &config, inputs, &mut timing)?;
     timing.filter(Duration::from_millis(100)).print();
 
     let beneficiary_account_after = AccountRlp {

evm/tests/basic_smart_contract.rs

@@ -10,7 +10,7 @@ use ethereum_types::{Address, U256};
 use hex_literal::hex;
 use keccak_hash::keccak;
 use plonky2::field::goldilocks_field::GoldilocksField;
-use plonky2::plonk::config::{PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::PoseidonGoldilocksConfig;
 use plonky2::util::timing::TimingTree;
 use plonky2_evm::all_stark::AllStark;
 use plonky2_evm::config::StarkConfig;
@@ -25,8 +25,6 @@ use plonky2_evm::Node;
 type F = GoldilocksField;
 const D: usize = 2;
 type C = PoseidonGoldilocksConfig;
-type HCO = PoseidonHashConfig;
-type HCI = HCO;
 
 /// Test a simple token transfer to a new address.
 #[test]
@@ -114,7 +112,7 @@ fn test_basic_smart_contract() -> anyhow::Result<()> {
     };
 
     let mut timing = TimingTree::new("prove", log::Level::Debug);
-    let proof = prove::<F, HCO, HCI, C, D>(&all_stark, &config, inputs, &mut timing)?;
+    let proof = prove::<F, C, D>(&all_stark, &config, inputs, &mut timing)?;
     timing.filter(Duration::from_millis(100)).print();
 
     let expected_state_trie_after: HashedPartialTrie = {

evm/tests/empty_txn_list.rs

@@ -7,7 +7,7 @@ use env_logger::{try_init_from_env, Env, DEFAULT_FILTER_ENV};
 use eth_trie_utils::partial_trie::{HashedPartialTrie, PartialTrie};
 use keccak_hash::keccak;
 use plonky2::field::goldilocks_field::GoldilocksField;
-use plonky2::plonk::config::{PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::PoseidonGoldilocksConfig;
 use plonky2::util::timing::TimingTree;
 use plonky2_evm::all_stark::AllStark;
 use plonky2_evm::config::StarkConfig;
@@ -21,8 +21,6 @@ use plonky2_evm::Node;
 type F = GoldilocksField;
 const D: usize = 2;
 type C = PoseidonGoldilocksConfig;
-type HCO = PoseidonHashConfig;
-type HCI = HCO;
 
 /// Execute the empty list of transactions, i.e. a no-op.
 #[test]
@@ -64,7 +62,7 @@ fn test_empty_txn_list() -> anyhow::Result<()> {
     // TODO: This is redundant; prove_root below calls this prove method internally.
     // Just keeping it for now because the root proof returned by prove_root doesn't contain public
     // values yet, and we want those for the assertions below.
-    let proof = prove::<F, HCO, HCI, C, D>(&all_stark, &config, inputs.clone(), &mut timing)?;
+    let proof = prove::<F, C, D>(&all_stark, &config, inputs.clone(), &mut timing)?;
     timing.filter(Duration::from_millis(100)).print();
 
     assert_eq!(
@@ -94,7 +92,7 @@ fn test_empty_txn_list() -> anyhow::Result<()> {
 
     verify_proof(&all_stark, proof, &config)?;
 
-    let all_circuits = AllRecursiveCircuits::<F, HCO, HCI, C, D>::new(&all_stark, 9..19, &config);
+    let all_circuits = AllRecursiveCircuits::<F, C, D>::new(&all_stark, 9..19, &config);
     let root_proof = all_circuits.prove_root(&all_stark, &config, inputs, &mut timing)?;
     all_circuits.verify_root(root_proof.clone())?;
 

evm/tests/simple_transfer.rs

@@ -10,7 +10,7 @@ use ethereum_types::{Address, U256};
 use hex_literal::hex;
 use keccak_hash::keccak;
 use plonky2::field::goldilocks_field::GoldilocksField;
-use plonky2::plonk::config::{PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::PoseidonGoldilocksConfig;
 use plonky2::util::timing::TimingTree;
 use plonky2_evm::all_stark::AllStark;
 use plonky2_evm::config::StarkConfig;
@@ -24,8 +24,6 @@ use plonky2_evm::Node;
 type F = GoldilocksField;
 const D: usize = 2;
 type C = PoseidonGoldilocksConfig;
-type HCO = PoseidonHashConfig;
-type HCI = HCO;
 
 /// Test a simple token transfer to a new address.
 #[test]
@@ -89,7 +87,7 @@ fn test_simple_transfer() -> anyhow::Result<()> {
     };
 
     let mut timing = TimingTree::new("prove", log::Level::Debug);
-    let proof = prove::<F, HCO, HCI, C, D>(&all_stark, &config, inputs, &mut timing)?;
+    let proof = prove::<F, C, D>(&all_stark, &config, inputs, &mut timing)?;
     timing.filter(Duration::from_millis(100)).print();
 
     let expected_state_trie_after: HashedPartialTrie = {

plonky2/examples/bench_recursion.rs

@@ -18,9 +18,7 @@ use plonky2::hash::hashing::HashConfig;
 use plonky2::iop::witness::{PartialWitness, WitnessWrite};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::circuit_data::{CircuitConfig, CommonCircuitData, VerifierOnlyCircuitData};
-use plonky2::plonk::config::{
+use plonky2::plonk::config::{AlgebraicHasher, GenericConfig, PoseidonGoldilocksConfig};
-    AlgebraicHasher, GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig,
-};
 use plonky2::plonk::proof::{CompressedProofWithPublicInputs, ProofWithPublicInputs};
 use plonky2::plonk::prover::prove;
 use plonky2::util::timing::TimingTree;
@@ -31,9 +29,9 @@ use rand::{RngCore, SeedableRng};
 use rand_chacha::ChaCha8Rng;
 use structopt::StructOpt;
 
-type ProofTuple<F, HCO, HCI, C, const D: usize> = (
+type ProofTuple<F, C, const D: usize> = (
-    ProofWithPublicInputs<F, HCO, HCI, C, D>,
+    ProofWithPublicInputs<F, C, D>,
-    VerifierOnlyCircuitData<HCO, HCI, C, D>,
+    VerifierOnlyCircuitData<C, D>,
     CommonCircuitData<F, D>,
 );
 
@@ -65,19 +63,13 @@ struct Options {
 }
 
 /// Creates a dummy proof which should have `2 ** log2_size` rows.
-fn dummy_proof<
+fn dummy_proof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
     config: &CircuitConfig,
     log2_size: usize,
-) -> Result<ProofTuple<F, HCO, HCI, C, D>>
+) -> Result<ProofTuple<F, C, D>>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     // 'size' is in degree, but we want number of noop gates. A non-zero amount of padding will be added and size will be rounded to the next power of two. To hit our target size, we go just under the previous power of two and hope padding is less than half the proof.
     let num_dummy_gates = match log2_size {
@@ -93,11 +85,11 @@ where
     }
     builder.print_gate_counts(0);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let inputs = PartialWitness::new();
 
     let mut timing = TimingTree::new("prove", Level::Debug);
-    let proof = prove::<F, HCO, HCI, C, D>(&data.prover_only, &data.common, inputs, &mut timing)?;
+    let proof = prove::<F, C, D>(&data.prover_only, &data.common, inputs, &mut timing)?;
     timing.print();
     data.verify(proof.clone())?;
 
@@ -106,24 +98,20 @@ where
 
 fn recursive_proof<
     F: RichField + Extendable<D>,
-    HCOO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCOI: HashConfig,
+    InnerC: GenericConfig<D, F = F>,
-    HCIO: HashConfig,
-    HCII: HashConfig,
-    C: GenericConfig<HCOO, HCOI, D, F = F>,
-    InnerC: GenericConfig<HCIO, HCII, D, F = F>,
     const D: usize,
 >(
-    inner: &ProofTuple<F, HCIO, HCII, InnerC, D>,
+    inner: &ProofTuple<F, InnerC, D>,
     config: &CircuitConfig,
     min_degree_bits: Option<usize>,
-) -> Result<ProofTuple<F, HCOO, HCOI, C, D>>
+) -> Result<ProofTuple<F, C, D>>
 where
-    InnerC::Hasher: AlgebraicHasher<F, HCIO>,
+    InnerC::Hasher: AlgebraicHasher<F, InnerC::HCO>,
-    [(); HCOO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCOI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
-    [(); HCIO::WIDTH]:,
+    [(); InnerC::HCO::WIDTH]:,
-    [(); HCII::WIDTH]:,
+    [(); InnerC::HCI::WIDTH]:,
 {
     let (inner_proof, inner_vd, inner_cd) = inner;
     let mut builder = CircuitBuilder::<F, D>::new(config.clone());
@@ -131,7 +119,7 @@ where
 
     let inner_data = builder.add_virtual_verifier_data(inner_cd.config.fri_config.cap_height);
 
-    builder.verify_proof::<HCIO, HCII, InnerC>(&pt, &inner_data, inner_cd);
+    builder.verify_proof::<InnerC>(&pt, &inner_data, inner_cd);
     builder.print_gate_counts(0);
 
     if let Some(min_degree_bits) = min_degree_bits {
@@ -145,14 +133,14 @@ where
         }
     }
 
-    let data = builder.build::<HCOO, HCOI, C>();
+    let data = builder.build::<C>();
 
     let mut pw = PartialWitness::new();
     pw.set_proof_with_pis_target(&pt, inner_proof);
     pw.set_verifier_data_target(&inner_data, inner_vd);
 
     let mut timing = TimingTree::new("prove", Level::Debug);
-    let proof = prove::<F, HCOO, HCOI, C, D>(&data.prover_only, &data.common, pw, &mut timing)?;
+    let proof = prove::<F, C, D>(&data.prover_only, &data.common, pw, &mut timing)?;
     timing.print();
 
     data.verify(proof.clone())?;
@@ -161,20 +149,14 @@ where
 }
 
 /// Test serialization and print some size info.
-fn test_serialization<
+fn test_serialization<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
+    proof: &ProofWithPublicInputs<F, C, D>,
-    HCO: HashConfig,
+    vd: &VerifierOnlyCircuitData<C, D>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
-    proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
-    vd: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
     cd: &CommonCircuitData<F, D>,
 ) -> Result<()>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let proof_bytes = proof.to_bytes();
     info!("Proof length: {} bytes", proof_bytes.len());
@@ -204,12 +186,10 @@ where
 fn benchmark(config: &CircuitConfig, log2_inner_size: usize) -> Result<()> {
     const D: usize = 2;
     type C = PoseidonGoldilocksConfig;
-    type HCO = PoseidonHashConfig;
+    type F = <C as GenericConfig<D>>::F;
-    type HCI = HCO;
-    type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
     // Start with a dummy proof of specified size
-    let inner = dummy_proof::<F, HCO, HCI, C, D>(config, log2_inner_size)?;
+    let inner = dummy_proof::<F, C, D>(config, log2_inner_size)?;
     let (_, _, cd) = &inner;
     info!(
         "Initial proof degree {} = 2^{}",
@@ -218,7 +198,7 @@ fn benchmark(config: &CircuitConfig, log2_inner_size: usize) -> Result<()> {
     );
 
     // Recursively verify the proof
-    let middle = recursive_proof::<F, HCO, HCI, HCO, HCI, C, C, D>(&inner, config, None)?;
+    let middle = recursive_proof::<F, C, C, D>(&inner, config, None)?;
     let (_, _, cd) = &middle;
     info!(
         "Single recursion proof degree {} = 2^{}",
@@ -227,7 +207,7 @@ fn benchmark(config: &CircuitConfig, log2_inner_size: usize) -> Result<()> {
     );
 
     // Add a second layer of recursion to shrink the proof size further
-    let outer = recursive_proof::<F, HCO, HCI, HCO, HCI, C, C, D>(&middle, config, None)?;
+    let outer = recursive_proof::<F, C, C, D>(&middle, config, None)?;
     let (proof, vd, cd) = &outer;
     info!(
         "Double recursion proof degree {} = 2^{}",

plonky2/examples/factorial.rs

@@ -5,7 +5,7 @@ use plonky2::field::types::Field;
 use plonky2::iop::witness::{PartialWitness, WitnessWrite};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::circuit_data::CircuitConfig;
-use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
 /// An example of using Plonky2 to prove a statement of the form
 /// "I know n * (n + 1) * ... * (n + 99)".
@@ -13,9 +13,7 @@ use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHa
 fn main() -> Result<()> {
     const D: usize = 2;
     type C = PoseidonGoldilocksConfig;
-    type HCO = PoseidonHashConfig;
+    type F = <C as GenericConfig<D>>::F;
-    type HCI = HCO;
-    type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
     let config = CircuitConfig::standard_recursion_config();
     let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -35,7 +33,7 @@ fn main() -> Result<()> {
     let mut pw = PartialWitness::new();
     pw.set_target(initial, F::ONE);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let proof = data.prove(pw)?;
 
     println!(

plonky2/examples/fibonacci.rs

@@ -5,7 +5,7 @@ use plonky2::field::types::Field;
 use plonky2::iop::witness::{PartialWitness, WitnessWrite};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::circuit_data::CircuitConfig;
-use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
 /// An example of using Plonky2 to prove a statement of the form
 /// "I know the 100th element of the Fibonacci sequence, starting with constants a and b."
@@ -13,9 +13,7 @@ use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHa
 fn main() -> Result<()> {
     const D: usize = 2;
     type C = PoseidonGoldilocksConfig;
-    type HCO = PoseidonHashConfig;
+    type F = <C as GenericConfig<D>>::F;
-    type HCI = HCO;
-    type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
     let config = CircuitConfig::standard_recursion_config();
     let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -41,7 +39,7 @@ fn main() -> Result<()> {
     pw.set_target(initial_a, F::ZERO);
     pw.set_target(initial_b, F::ONE);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let proof = data.prove(pw)?;
 
     println!(

plonky2/examples/square_root.rs

@@ -10,7 +10,7 @@ use plonky2::iop::target::Target;
 use plonky2::iop::witness::{PartialWitness, PartitionWitness, Witness, WitnessWrite};
 use plonky2::plonk::circuit_builder::CircuitBuilder;
 use plonky2::plonk::circuit_data::CircuitConfig;
-use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+use plonky2::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 use plonky2_field::extension::Extendable;
 
 /// A generator used by the prover to calculate the square root (`x`) of a given value
@@ -44,9 +44,7 @@ impl<F: RichField + Extendable<D>, const D: usize> SimpleGenerator<F>
 fn main() -> Result<()> {
     const D: usize = 2;
     type C = PoseidonGoldilocksConfig;
-    type HCO = PoseidonHashConfig;
+    type F = <C as GenericConfig<D>>::F;
-    type HCI = HCO;
-    type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
     let config = CircuitConfig::standard_recursion_config();
 
@@ -75,7 +73,7 @@ fn main() -> Result<()> {
     let mut pw = PartialWitness::new();
     pw.set_target(x_squared, x_squared_value);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let proof = data.prove(pw.clone())?;
 
     let x_squared_actual = proof.public_inputs[0];

plonky2/src/fri/challenges.rs

@@ -26,9 +26,9 @@ where
         }
     }
 
-    pub fn fri_challenges<HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>, const D: usize>(
+    pub fn fri_challenges<C: GenericConfig<D, F = F>, const D: usize>(
         &mut self,
-        commit_phase_merkle_caps: &[MerkleCap<F, HCO, C::Hasher>],
+        commit_phase_merkle_caps: &[MerkleCap<F, C::HCO, C::Hasher>],
         final_poly: &PolynomialCoeffs<F::Extension>,
         pow_witness: F,
         degree_bits: usize,
@@ -36,8 +36,8 @@ where
     ) -> FriChallenges<F, D>
     where
         F: RichField + Extendable<D>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let num_fri_queries = config.num_query_rounds;
         let lde_size = 1 << (degree_bits + config.rate_bits);
@@ -48,7 +48,7 @@ where
         let fri_betas = commit_phase_merkle_caps
             .iter()
             .map(|cap| {
-                self.observe_cap::<HCO, C::Hasher>(cap);
+                self.observe_cap::<C::HCO, C::Hasher>(cap);
                 self.get_extension_challenge::<D>()
             })
             .collect();

plonky2/src/fri/oracle.rs

@@ -27,27 +27,17 @@ use crate::util::{log2_strict, reverse_bits, reverse_index_bits_in_place, transp
 pub const SALT_SIZE: usize = 4;
 
 /// Represents a FRI oracle, i.e. a batch of polynomials which have been Merklized.
-pub struct PolynomialBatch<
+pub struct PolynomialBatch<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-    F: RichField + Extendable<D>,
+{
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> {
     pub polynomials: Vec<PolynomialCoeffs<F>>,
-    pub merkle_tree: MerkleTree<F, HCO, C::Hasher>,
+    pub merkle_tree: MerkleTree<F, C::HCO, C::Hasher>,
     pub degree_log: usize,
     pub rate_bits: usize,
     pub blinding: bool,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    PolynomialBatch<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > PolynomialBatch<F, HCO, HCI, C, D>
 {
     /// Creates a list polynomial commitment for the polynomials interpolating the values in `values`.
     pub fn from_values(
@@ -59,7 +49,7 @@ impl<
         fft_root_table: Option<&FftRootTable<F>>,
     ) -> Self
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         let coeffs = timed!(
             timing,
@@ -87,7 +77,7 @@ impl<
         fft_root_table: Option<&FftRootTable<F>>,
     ) -> Self
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         let degree = polynomials[0].len();
         let lde_values = timed!(
@@ -178,13 +168,13 @@ impl<
     pub fn prove_openings(
         instance: &FriInstanceInfo<F, D>,
         oracles: &[&Self],
-        challenger: &mut Challenger<F, HCO, C::Hasher>,
+        challenger: &mut Challenger<F, C::HCO, C::Hasher>,
         fri_params: &FriParams,
         timing: &mut TimingTree,
-    ) -> FriProof<F, HCO, C::Hasher, D>
+    ) -> FriProof<F, C::HCO, C::Hasher, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         assert!(D > 1, "Not implemented for D=1.");
         let alpha = challenger.get_extension_challenge::<D>();
@@ -223,7 +213,7 @@ impl<
             lde_final_poly.coset_fft(F::coset_shift().into())
         );
 
-        let fri_proof = fri_proof::<F, HCO, HCI, C, D>(
+        let fri_proof = fri_proof::<F, C, D>(
             &oracles
                 .par_iter()
                 .map(|c| &c.merkle_tree)

plonky2/src/fri/prover.rs

@@ -17,25 +17,19 @@ use crate::util::reverse_index_bits_in_place;
 use crate::util::timing::TimingTree;
 
 /// Builds a FRI proof.
-pub fn fri_proof<
+pub fn fri_proof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
+    initial_merkle_trees: &[&MerkleTree<F, C::HCO, C::Hasher>],
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
-    initial_merkle_trees: &[&MerkleTree<F, HCO, C::Hasher>],
     // Coefficients of the polynomial on which the LDT is performed. Only the first `1/rate` coefficients are non-zero.
     lde_polynomial_coeffs: PolynomialCoeffs<F::Extension>,
     // Evaluation of the polynomial on the large domain.
     lde_polynomial_values: PolynomialValues<F::Extension>,
-    challenger: &mut Challenger<F, HCO, C::Hasher>,
+    challenger: &mut Challenger<F, C::HCO, C::Hasher>,
     fri_params: &FriParams,
     timing: &mut TimingTree,
-) -> FriProof<F, HCO, C::Hasher, D>
+) -> FriProof<F, C::HCO, C::Hasher, D>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let n = lde_polynomial_values.len();
     assert_eq!(lde_polynomial_coeffs.len(), n);
@@ -44,7 +38,7 @@ where
     let (trees, final_coeffs) = timed!(
         timing,
         "fold codewords in the commitment phase",
-        fri_committed_trees::<F, HCO, HCI, C, D>(
+        fri_committed_trees::<F, C, D>(
             lde_polynomial_coeffs,
             lde_polynomial_values,
             challenger,
@@ -56,17 +50,12 @@ where
     let pow_witness = timed!(
         timing,
         "find proof-of-work witness",
-        fri_proof_of_work::<F, HCO, HCI, C, D>(challenger, &fri_params.config)
+        fri_proof_of_work::<F, C, D>(challenger, &fri_params.config)
     );
 
     // Query phase
-    let query_round_proofs = fri_prover_query_rounds::<F, HCO, HCI, C, D>(
+    let query_round_proofs =
-        initial_merkle_trees,
+        fri_prover_query_rounds::<F, C, D>(initial_merkle_trees, &trees, challenger, n, fri_params);
-        &trees,
-        challenger,
-        n,
-        fri_params,
-    );
 
     FriProof {
         commit_phase_merkle_caps: trees.iter().map(|t| t.cap.clone()).collect(),
@@ -76,25 +65,19 @@ where
     }
 }
 
-type FriCommitedTrees<F, HCO, HCI, C, const D: usize> = (
+type FriCommitedTrees<F, C, const D: usize> = (
-    Vec<MerkleTree<F, HCO, <C as GenericConfig<HCO, HCI, D>>::Hasher>>,
+    Vec<MerkleTree<F, <C as GenericConfig<D>>::HCO, <C as GenericConfig<D>>::Hasher>>,
     PolynomialCoeffs<<F as Extendable<D>>::Extension>,
 );
 
-fn fri_committed_trees<
+fn fri_committed_trees<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
     mut coeffs: PolynomialCoeffs<F::Extension>,
     mut values: PolynomialValues<F::Extension>,
-    challenger: &mut Challenger<F, HCO, C::Hasher>,
+    challenger: &mut Challenger<F, C::HCO, C::Hasher>,
     fri_params: &FriParams,
-) -> FriCommitedTrees<F, HCO, HCI, C, D>
+) -> FriCommitedTrees<F, C, D>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     let mut trees = Vec::new();
 
@@ -109,7 +92,7 @@ where
             .map(|chunk: &[F::Extension]| flatten(chunk))
             .collect();
         let tree =
-            MerkleTree::<F, HCO, C::Hasher>::new(chunked_values, fri_params.config.cap_height);
+            MerkleTree::<F, C::HCO, C::Hasher>::new(chunked_values, fri_params.config.cap_height);
 
         challenger.observe_cap(&tree.cap);
         trees.push(tree);
@@ -137,19 +120,13 @@ where
 }
 
 /// Performs the proof-of-work (a.k.a. grinding) step of the FRI protocol. Returns the PoW witness.
-fn fri_proof_of_work<
+fn fri_proof_of_work<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
+    challenger: &mut Challenger<F, C::HCO, C::Hasher>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
-    challenger: &mut Challenger<F, HCO, C::Hasher>,
     config: &FriConfig,
 ) -> F
 where
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     let min_leading_zeros = config.proof_of_work_bits + (64 - F::order().bits()) as u32;
 
@@ -181,10 +158,10 @@ where
             let mut duplex_state = duplex_intermediate_state;
             duplex_state[witness_input_pos] = F::from_canonical_u64(candidate);
             duplex_state =
-                <<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<F, HCO>>::Permutation::permute(
+                <<C as GenericConfig<D>>::Hasher as Hasher<F, C::HCO>>::Permutation::permute(
                     duplex_state,
                 );
-            let pow_response = duplex_state[HCO::RATE - 1];
+            let pow_response = duplex_state[C::HCO::RATE - 1];
             let leading_zeros = pow_response.to_canonical_u64().leading_zeros();
             leading_zeros >= min_leading_zeros
         })
@@ -201,49 +178,40 @@ where
 
 fn fri_prover_query_rounds<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
-    initial_merkle_trees: &[&MerkleTree<F, HCO, C::Hasher>],
+    initial_merkle_trees: &[&MerkleTree<F, C::HCO, C::Hasher>],
-    trees: &[MerkleTree<F, HCO, C::Hasher>],
+    trees: &[MerkleTree<F, C::HCO, C::Hasher>],
-    challenger: &mut Challenger<F, HCO, C::Hasher>,
+    challenger: &mut Challenger<F, C::HCO, C::Hasher>,
     n: usize,
     fri_params: &FriParams,
-) -> Vec<FriQueryRound<F, HCO, C::Hasher, D>>
+) -> Vec<FriQueryRound<F, C::HCO, C::Hasher, D>>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     challenger
         .get_n_challenges(fri_params.config.num_query_rounds)
         .into_par_iter()
         .map(|rand| {
             let x_index = rand.to_canonical_u64() as usize % n;
-            fri_prover_query_round::<F, HCO, HCI, C, D>(
+            fri_prover_query_round::<F, C, D>(initial_merkle_trees, trees, x_index, fri_params)
-                initial_merkle_trees,
-                trees,
-                x_index,
-                fri_params,
-            )
         })
         .collect()
 }
 
 fn fri_prover_query_round<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
-    initial_merkle_trees: &[&MerkleTree<F, HCO, C::Hasher>],
+    initial_merkle_trees: &[&MerkleTree<F, C::HCO, C::Hasher>],
-    trees: &[MerkleTree<F, HCO, C::Hasher>],
+    trees: &[MerkleTree<F, C::HCO, C::Hasher>],
     mut x_index: usize,
     fri_params: &FriParams,
-) -> FriQueryRound<F, HCO, C::Hasher, D>
+) -> FriQueryRound<F, C::HCO, C::Hasher, D>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     let mut query_steps = Vec::new();
     let initial_proof = initial_merkle_trees

plonky2/src/fri/recursive_verifier.rs

@@ -99,11 +99,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         );
     }
 
-    pub fn verify_fri_proof<
+    pub fn verify_fri_proof<C: GenericConfig<D, F = F>>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &mut self,
         instance: &FriInstanceInfoTarget<D>,
         openings: &FriOpeningsTarget<D>,
@@ -112,8 +108,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         proof: &FriProofTarget<D>,
         params: &FriParams,
     ) where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         if let Some(max_arity_bits) = params.max_arity_bits() {
             self.check_recursion_config(max_arity_bits);
@@ -166,7 +162,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
                 self,
                 level,
                 &format!("verify one (of {num_queries}) query rounds"),
-                self.fri_verifier_query_round::<HCO, HCI, C>(
+                self.fri_verifier_query_round::<C>(
                     instance,
                     challenges,
                     &precomputed_reduced_evals,
@@ -254,11 +250,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         sum
     }
 
-    fn fri_verifier_query_round<
+    fn fri_verifier_query_round<C: GenericConfig<D, F = F>>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &mut self,
         instance: &FriInstanceInfoTarget<D>,
         challenges: &FriChallengesTarget<D>,
@@ -270,8 +262,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         round_proof: &FriQueryRoundTarget<D>,
         params: &FriParams,
     ) where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         let n_log = log2_strict(n);
 
@@ -285,7 +277,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         with_context!(
             self,
             "check FRI initial proof",
-            self.fri_verify_initial_proof::<HCO, C::Hasher>(
+            self.fri_verify_initial_proof::<C::HCO, C::Hasher>(
                 &x_index_bits,
                 &round_proof.initial_trees_proof,
                 initial_merkle_caps,
@@ -345,7 +337,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             with_context!(
                 self,
                 "verify FRI round Merkle proof.",
-                self.verify_merkle_proof_to_cap_with_cap_index::<HCO, C::Hasher>(
+                self.verify_merkle_proof_to_cap_with_cap_index::<C::HCO, C::Hasher>(
                     flatten_target(evals),
                     &coset_index_bits,
                     cap_index,

plonky2/src/fri/validate_shape.rs

@@ -5,20 +5,17 @@ use crate::fri::proof::{FriProof, FriQueryRound, FriQueryStep};
 use crate::fri::structure::FriInstanceInfo;
 use crate::fri::FriParams;
 use crate::hash::hash_types::RichField;
-use crate::hash::hashing::HashConfig;
 use crate::plonk::config::GenericConfig;
 use crate::plonk::plonk_common::salt_size;
 
-pub(crate) fn validate_fri_proof_shape<F, HCO, HCI, C, const D: usize>(
+pub(crate) fn validate_fri_proof_shape<F, C, const D: usize>(
-    proof: &FriProof<F, HCO, C::Hasher, D>,
+    proof: &FriProof<F, C::HCO, C::Hasher, D>,
     instance: &FriInstanceInfo<F, D>,
     params: &FriParams,
 ) -> anyhow::Result<()>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
     let FriProof {
         commit_phase_merkle_caps,

plonky2/src/fri/verifier.rs

@@ -59,24 +59,18 @@ pub(crate) fn fri_verify_proof_of_work<F: RichField + Extendable<D>, const D: us
     Ok(())
 }
 
-pub fn verify_fri_proof<
+pub fn verify_fri_proof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
     instance: &FriInstanceInfo<F, D>,
     openings: &FriOpenings<F, D>,
     challenges: &FriChallenges<F, D>,
-    initial_merkle_caps: &[MerkleCap<F, HCO, C::Hasher>],
+    initial_merkle_caps: &[MerkleCap<F, C::HCO, C::Hasher>],
-    proof: &FriProof<F, HCO, C::Hasher, D>,
+    proof: &FriProof<F, C::HCO, C::Hasher, D>,
     params: &FriParams,
 ) -> Result<()>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
-    validate_fri_proof_shape::<F, HCO, HCI, C, D>(proof, instance, params)?;
+    validate_fri_proof_shape::<F, C, D>(proof, instance, params)?;
 
     // Size of the LDE domain.
     let n = params.lde_size();
@@ -97,7 +91,7 @@ where
         .iter()
         .zip(&proof.query_round_proofs)
     {
-        fri_verifier_query_round::<F, HCO, HCI, C, D>(
+        fri_verifier_query_round::<F, C, D>(
             instance,
             challenges,
             &precomputed_reduced_evals,
@@ -130,13 +124,11 @@ where
 
 pub(crate) fn fri_combine_initial<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     instance: &FriInstanceInfo<F, D>,
-    proof: &FriInitialTreeProof<F, HCO, C::Hasher>,
+    proof: &FriInitialTreeProof<F, C::HCO, C::Hasher>,
     alpha: F::Extension,
     subgroup_x: F,
     precomputed_reduced_evals: &PrecomputedReducedOpenings<F, D>,
@@ -173,25 +165,23 @@ pub(crate) fn fri_combine_initial<
 
 fn fri_verifier_query_round<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     instance: &FriInstanceInfo<F, D>,
     challenges: &FriChallenges<F, D>,
     precomputed_reduced_evals: &PrecomputedReducedOpenings<F, D>,
-    initial_merkle_caps: &[MerkleCap<F, HCO, C::Hasher>],
+    initial_merkle_caps: &[MerkleCap<F, C::HCO, C::Hasher>],
-    proof: &FriProof<F, HCO, C::Hasher, D>,
+    proof: &FriProof<F, C::HCO, C::Hasher, D>,
     mut x_index: usize,
     n: usize,
-    round_proof: &FriQueryRound<F, HCO, C::Hasher, D>,
+    round_proof: &FriQueryRound<F, C::HCO, C::Hasher, D>,
     params: &FriParams,
 ) -> Result<()>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
-    fri_verify_initial_proof::<F, HCO, C::Hasher>(
+    fri_verify_initial_proof::<F, C::HCO, C::Hasher>(
         x_index,
         &round_proof.initial_trees_proof,
         initial_merkle_caps,
@@ -203,7 +193,7 @@ where
 
     // old_eval is the last derived evaluation; it will be checked for consistency with its
     // committed "parent" value in the next iteration.
-    let mut old_eval = fri_combine_initial::<F, HCO, HCI, C, D>(
+    let mut old_eval = fri_combine_initial::<F, C, D>(
         instance,
         &round_proof.initial_trees_proof,
         challenges.fri_alpha,
@@ -232,7 +222,7 @@ where
             challenges.fri_betas[i],
         );
 
-        verify_merkle_proof_to_cap::<F, HCO, C::Hasher>(
+        verify_merkle_proof_to_cap::<F, C::HCO, C::Hasher>(
             flatten(evals),
             coset_index,
             &proof.commit_phase_merkle_caps[i],

plonky2/src/gadgets/arithmetic_extension.rs

@@ -576,20 +576,15 @@ mod tests {
     use crate::iop::witness::{PartialWitness, WitnessWrite};
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{
+    use crate::plonk::config::{GenericConfig, KeccakGoldilocksConfig, PoseidonGoldilocksConfig};
-        GenericConfig, KeccakGoldilocksConfig, KeccakHashConfig, PoseidonGoldilocksConfig,
-        PoseidonHashConfig,
-    };
     use crate::plonk::verifier::verify;
 
     #[test]
     fn test_mul_many() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         let config = CircuitConfig::standard_recursion_config();
 
@@ -614,7 +609,7 @@ mod tests {
         builder.connect_extension(mul0, mul1);
         builder.connect_extension(mul1, mul2);
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)
@@ -624,10 +619,8 @@ mod tests {
     fn test_div_extension() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         let config = CircuitConfig::standard_recursion_zk_config();
 
@@ -643,7 +636,7 @@ mod tests {
         let comp_zt = builder.div_extension(xt, yt);
         builder.connect_extension(zt, comp_zt);
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)
@@ -653,10 +646,8 @@ mod tests {
     fn test_mul_algebra() -> Result<()> {
         const D: usize = 2;
         type C = KeccakGoldilocksConfig;
-        type HCO = KeccakHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = PoseidonHashConfig;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         let config = CircuitConfig::standard_recursion_config();
 
@@ -683,7 +674,7 @@ mod tests {
             pw.set_extension_target(zt.0[i], z.0[i]);
         }
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)

plonky2/src/gadgets/interpolation.rs

@@ -47,17 +47,15 @@ mod tests {
     use crate::iop::witness::PartialWitness;
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     #[test]
     fn test_interpolate() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
         let config = CircuitConfig::standard_recursion_config();
         let pw = PartialWitness::new();
         let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -104,7 +102,7 @@ mod tests {
             builder.connect_extension(eval_coset_gate, true_eval_target);
         }
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)

plonky2/src/gadgets/random_access.rs

@@ -107,16 +107,14 @@ mod tests {
     use crate::field::types::{Field, Sample};
     use crate::iop::witness::PartialWitness;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     fn test_random_access_given_len(len_log: usize) -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
         let len = 1 << len_log;
         let config = CircuitConfig::standard_recursion_config();
         let pw = PartialWitness::new();
@@ -131,7 +129,7 @@ mod tests {
             builder.connect_extension(elem, res);
         }
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)

plonky2/src/gadgets/select.rs

@@ -44,17 +44,15 @@ mod tests {
     use crate::iop::witness::{PartialWitness, WitnessWrite};
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     #[test]
     fn test_select() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
         let config = CircuitConfig::standard_recursion_config();
         let mut pw = PartialWitness::<F>::new();
         let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -74,7 +72,7 @@ mod tests {
         builder.connect_extension(should_be_x, xt);
         builder.connect_extension(should_be_y, yt);
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)

plonky2/src/gadgets/split_base.rs

@@ -113,16 +113,14 @@ mod tests {
     use super::*;
     use crate::iop::witness::PartialWitness;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     #[test]
     fn test_split_base() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let config = CircuitConfig::standard_recursion_config();
         let pw = PartialWitness::new();
         let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -139,7 +137,7 @@ mod tests {
         builder.connect(limbs[3], one);
 
         builder.assert_leading_zeros(xt, 64 - 9);
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
 
         let proof = data.prove(pw)?;
 
@@ -150,9 +148,7 @@ mod tests {
     fn test_base_sum() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let config = CircuitConfig::standard_recursion_config();
         let pw = PartialWitness::new();
         let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -176,7 +172,7 @@ mod tests {
 
         builder.connect(x, y);
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
 
         let proof = data.prove(pw)?;
 

plonky2/src/gates/arithmetic_base.rs

@@ -218,7 +218,7 @@ mod tests {
     use crate::gates::arithmetic_base::ArithmeticGate;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -230,10 +230,8 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let gate = ArithmeticGate::new_from_config(&CircuitConfig::standard_recursion_config());
-        test_eval_fns::<F, HCO, HCI, C, _, D>(gate)
+        test_eval_fns::<F, C, _, D>(gate)
     }
 }

plonky2/src/gates/arithmetic_extension.rs

@@ -211,7 +211,7 @@ mod tests {
     use crate::gates::arithmetic_extension::ArithmeticExtensionGate;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -224,11 +224,9 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let gate =
             ArithmeticExtensionGate::new_from_config(&CircuitConfig::standard_recursion_config());
-        test_eval_fns::<F, HCO, HCI, C, _, D>(gate)
+        test_eval_fns::<F, C, _, D>(gate)
     }
 }

plonky2/src/gates/base_sum.rs

@@ -204,7 +204,7 @@ mod tests {
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::base_sum::BaseSumGate;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -215,9 +215,7 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(BaseSumGate::<6>::new(11))
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(BaseSumGate::<6>::new(11))
     }
 }

plonky2/src/gates/constant.rs

@@ -122,7 +122,7 @@ mod tests {
     use crate::gates::constant::ConstantGate;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -135,11 +135,9 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let num_consts = CircuitConfig::standard_recursion_config().num_constants;
         let gate = ConstantGate { num_consts };
-        test_eval_fns::<F, HCO, HCI, C, _, D>(gate)
+        test_eval_fns::<F, C, _, D>(gate)
     }
 }

plonky2/src/gates/coset_interpolation.rs

@@ -606,7 +606,7 @@ mod tests {
     use crate::field::types::{Field, Sample};
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::hash::hash_types::HashOut;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn test_degree_and_wires_minimized() {
@@ -747,13 +747,9 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         for degree in 2..=4 {
-            test_eval_fns::<F, HCO, HCI, C, _, D>(CosetInterpolationGate::with_max_degree(
+            test_eval_fns::<F, C, _, D>(CosetInterpolationGate::with_max_degree(2, degree))?;
-                2, degree,
-            ))?;
         }
         Ok(())
     }
@@ -762,10 +758,8 @@ mod tests {
     fn test_gate_constraint() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         /// Returns the local wires for an interpolation gate for given coeffs, points and eval point.
         fn get_wires(shift: F, values: PolynomialValues<FF>, eval_point: FF) -> Vec<FF> {

plonky2/src/gates/exponentiation.rs

@@ -294,7 +294,7 @@ mod tests {
     use crate::field::types::Sample;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::hash::hash_types::HashOut;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::util::log2_ceil;
 
     const MAX_POWER_BITS: usize = 17;
@@ -329,10 +329,8 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(ExponentiationGate::new_from_config(
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(ExponentiationGate::new_from_config(
             &CircuitConfig::standard_recursion_config(),
         ))
     }
@@ -341,10 +339,8 @@ mod tests {
     fn test_gate_constraint() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         /// Returns the local wires for an exponentiation gate given the base, power, and power bit
         /// values.

plonky2/src/gates/gate_testing.rs

@@ -89,17 +89,15 @@ fn random_low_degree_values<F: Field>(rate_bits: usize) -> Vec<F> {
 
 pub fn test_eval_fns<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     G: Gate<F, D>,
     const D: usize,
 >(
     gate: G,
 ) -> Result<()>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     // Test that `eval_unfiltered` and `eval_unfiltered_base` are coherent.
     let wires_base = F::rand_vec(gate.num_wires());
@@ -164,7 +162,7 @@ where
     let evals_t = gate.eval_unfiltered_circuit(&mut builder, vars_t);
     pw.set_extension_targets(&evals_t, &evals);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let proof = data.prove(pw)?;
-    verify::<F, HCO, HCI, C, D>(proof, &data.verifier_only, &data.common)
+    verify::<F, C, D>(proof, &data.verifier_only, &data.common)
 }

plonky2/src/gates/multiplication_extension.rs

@@ -187,7 +187,7 @@ mod tests {
     use super::*;
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -199,10 +199,8 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let gate = MulExtensionGate::new_from_config(&CircuitConfig::standard_recursion_config());
-        test_eval_fns::<F, HCO, HCI, C, _, D>(gate)
+        test_eval_fns::<F, C, _, D>(gate)
     }
 }

plonky2/src/gates/noop.rs

@@ -60,7 +60,7 @@ mod tests {
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::noop::NoopGate;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -71,9 +71,7 @@ mod tests {
     fn eval_fns() -> anyhow::Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(NoopGate)
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(NoopGate)
     }
 }

plonky2/src/gates/poseidon.rs

@@ -515,7 +515,7 @@ mod tests {
     use crate::iop::witness::{PartialWitness, Witness, WitnessWrite};
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn wire_indices() {
@@ -543,9 +543,7 @@ mod tests {
     fn generated_output() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let config = CircuitConfig {
             num_wires: 143,
@@ -555,7 +553,7 @@ mod tests {
         type Gate = PoseidonGate<F, D>;
         let gate = Gate::new();
         let row = builder.add_gate(gate, vec![]);
-        let circuit = builder.build_prover::<HCO, HCI, C>();
+        let circuit = builder.build_prover::<C>();
 
         let permutation_inputs = (0..SPONGE_WIDTH)
             .map(F::from_canonical_usize)
@@ -603,10 +601,8 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let gate = PoseidonGate::<F, 2>::new();
-        test_eval_fns::<F, HCO, HCI, C, _, D>(gate)
+        test_eval_fns::<F, C, _, D>(gate)
     }
 }

plonky2/src/gates/poseidon_mds.rs

@@ -243,15 +243,13 @@ impl<F: RichField + Extendable<D> + Poseidon, const D: usize> SimpleGenerator<F>
 mod tests {
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::poseidon_mds::PoseidonMdsGate;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let gate = PoseidonMdsGate::<F, D>::new();
         test_low_degree(gate)
     }
@@ -260,10 +258,8 @@ mod tests {
     fn eval_fns() -> anyhow::Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let gate = PoseidonMdsGate::<F, D>::new();
-        test_eval_fns::<F, HCO, HCI, C, _, D>(gate)
+        test_eval_fns::<F, C, _, D>(gate)
     }
 }

plonky2/src/gates/public_input.rs

@@ -104,7 +104,7 @@ mod tests {
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::public_input::PublicInputGate;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -115,9 +115,7 @@ mod tests {
     fn eval_fns() -> anyhow::Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(PublicInputGate)
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(PublicInputGate)
     }
 }

plonky2/src/gates/random_access.rs

@@ -389,7 +389,7 @@ mod tests {
     use crate::field::types::Sample;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::hash::hash_types::HashOut;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -400,20 +400,16 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(RandomAccessGate::new(4, 4, 1))
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(RandomAccessGate::new(4, 4, 1))
     }
 
     #[test]
     fn test_gate_constraint() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         /// Returns the local wires for a random access gate given the vectors, elements to compare,
         /// and indices.

plonky2/src/gates/reducing.rs

@@ -216,7 +216,7 @@ mod tests {
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::reducing::ReducingGate;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -227,9 +227,7 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(ReducingGate::new(22))
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(ReducingGate::new(22))
     }
 }

plonky2/src/gates/reducing_extension.rs

@@ -210,7 +210,7 @@ mod tests {
     use crate::field::goldilocks_field::GoldilocksField;
     use crate::gates::gate_testing::{test_eval_fns, test_low_degree};
     use crate::gates::reducing_extension::ReducingExtensionGate;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn low_degree() {
@@ -221,9 +221,7 @@ mod tests {
     fn eval_fns() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        test_eval_fns::<F, C, _, D>(ReducingExtensionGate::new(22))
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        test_eval_fns::<F, HCO, HCI, C, _, D>(ReducingExtensionGate::new(22))
     }
 }

plonky2/src/hash/merkle_proofs.rs

@@ -187,7 +187,7 @@ mod tests {
     use crate::iop::witness::{PartialWitness, WitnessWrite};
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     fn random_data<F: Field>(n: usize, k: usize) -> Vec<Vec<F>> {
@@ -198,9 +198,7 @@ mod tests {
     fn test_recursive_merkle_proof() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let config = CircuitConfig::standard_recursion_config();
         let mut pw = PartialWitness::new();
         let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -209,9 +207,10 @@ mod tests {
         let n = 1 << log_n;
         let cap_height = 1;
         let leaves = random_data::<F>(n, 7);
-        let tree = MerkleTree::<F, HCO, <C as GenericConfig<HCO, HCI, D>>::Hasher>::new(
+        let tree =
-            leaves, cap_height,
+            MerkleTree::<F, <C as GenericConfig<D>>::HCO, <C as GenericConfig<D>>::Hasher>::new(
-        );
+                leaves, cap_height,
+            );
         let i: usize = OsRng.gen_range(0..n);
         let proof = tree.prove(i);
 
@@ -233,11 +232,11 @@ mod tests {
             pw.set_target(data[j], tree.leaves[i][j]);
         }
 
-        builder.verify_merkle_proof_to_cap::<HCI, <C as GenericConfig<HCO, HCI, D>>::InnerHasher>(
+        builder.verify_merkle_proof_to_cap::<<C as GenericConfig<D>>::HCI, <C as GenericConfig<D>>::InnerHasher>(
             data, &i_bits, &cap_t, &proof_t,
         );
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)

plonky2/src/hash/merkle_tree.rs

@@ -223,26 +223,20 @@ mod tests {
     use super::*;
     use crate::field::extension::Extendable;
     use crate::hash::merkle_proofs::verify_merkle_proof_to_cap;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     fn random_data<F: RichField>(n: usize, k: usize) -> Vec<Vec<F>> {
         (0..n).map(|_| F::rand_vec(k)).collect()
     }
 
-    fn verify_all_leaves<
+    fn verify_all_leaves<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    >(
         leaves: Vec<Vec<F>>,
         cap_height: usize,
     ) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
-        let tree = MerkleTree::<F, HCO, C::Hasher>::new(leaves.clone(), cap_height);
+        let tree = MerkleTree::<F, C::HCO, C::Hasher>::new(leaves.clone(), cap_height);
         for (i, leaf) in leaves.into_iter().enumerate() {
             let proof = tree.prove(i);
             verify_merkle_proof_to_cap(leaf, i, &tree.cap, &proof)?;
@@ -255,15 +249,13 @@ mod tests {
     fn test_cap_height_too_big() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let log_n = 8;
         let cap_height = log_n + 1; // Should panic if `cap_height > len_n`.
 
         let leaves = random_data::<F>(1 << log_n, 7);
-        let _ = MerkleTree::<F, HCO, <C as GenericConfig<HCO, HCI, D>>::Hasher>::new(
+        let _ = MerkleTree::<F, <C as GenericConfig<D>>::HCO, <C as GenericConfig<D>>::Hasher>::new(
             leaves, cap_height,
         );
     }
@@ -272,15 +264,13 @@ mod tests {
     fn test_cap_height_eq_log2_len() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let log_n = 8;
         let n = 1 << log_n;
         let leaves = random_data::<F>(n, 7);
 
-        verify_all_leaves::<F, HCO, HCI, C, D>(leaves, log_n)?;
+        verify_all_leaves::<F, C, D>(leaves, log_n)?;
 
         Ok(())
     }
@@ -289,15 +279,13 @@ mod tests {
     fn test_merkle_trees() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let log_n = 8;
         let n = 1 << log_n;
         let leaves = random_data::<F>(n, 7);
 
-        verify_all_leaves::<F, HCO, HCI, C, D>(leaves, 1)?;
+        verify_all_leaves::<F, C, D>(leaves, 1)?;
 
         Ok(())
     }

plonky2/src/hash/path_compression.rs

@@ -124,22 +124,21 @@ mod tests {
     use super::*;
     use crate::field::types::Sample;
     use crate::hash::merkle_tree::MerkleTree;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn test_path_compression() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let h = 10;
         let cap_height = 3;
         let vs = (0..1 << h).map(|_| vec![F::rand()]).collect::<Vec<_>>();
-        let mt = MerkleTree::<F, HCO, <C as GenericConfig<HCO, HCI, D>>::Hasher>::new(
+        let mt =
-            vs.clone(),
+            MerkleTree::<F, <C as GenericConfig<D>>::HCO, <C as GenericConfig<D>>::Hasher>::new(
-            cap_height,
+                vs.clone(),
-        );
+                cap_height,
+            );
 
         let mut rng = OsRng;
         let k = rng.gen_range(1..=1 << h);

plonky2/src/iop/challenger.rs

@@ -390,17 +390,18 @@ mod tests {
     use crate::iop::witness::{PartialWitness, Witness};
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
 
     #[test]
     fn no_duplicate_challenges() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        let mut challenger = Challenger::<
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
+            F,
-        let mut challenger =
+            <C as GenericConfig<D>>::HCI,
-            Challenger::<F, HCI, <C as GenericConfig<HCO, HCI, D>>::InnerHasher>::new();
+            <C as GenericConfig<D>>::InnerHasher,
+        >::new();
         let mut challenges = Vec::new();
 
         for i in 1..10 {
@@ -421,9 +422,7 @@ mod tests {
     fn test_consistency() {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         // These are mostly arbitrary, but we want to test some rounds with enough inputs/outputs to
         // trigger multiple absorptions/squeezes.
@@ -436,8 +435,11 @@ mod tests {
             .map(|&n| F::rand_vec(n))
             .collect();
 
-        let mut challenger =
+        let mut challenger = Challenger::<
-            Challenger::<F, HCI, <C as GenericConfig<HCO, HCI, D>>::InnerHasher>::new();
+            F,
+            <C as GenericConfig<D>>::HCI,
+            <C as GenericConfig<D>>::InnerHasher,
+        >::new();
         let mut outputs_per_round: Vec<Vec<F>> = Vec::new();
         for (r, inputs) in inputs_per_round.iter().enumerate() {
             challenger.observe_elements(inputs);
@@ -446,10 +448,12 @@ mod tests {
 
         let config = CircuitConfig::standard_recursion_config();
         let mut builder = CircuitBuilder::<F, D>::new(config);
-        let mut recursive_challenger =
+        let mut recursive_challenger = RecursiveChallenger::<
-            RecursiveChallenger::<F, HCI, <C as GenericConfig<HCO, HCI, D>>::InnerHasher, D>::new(
+            F,
-                &mut builder,
+            <C as GenericConfig<D>>::HCI,
-            );
+            <C as GenericConfig<D>>::InnerHasher,
+            D,
+        >::new(&mut builder);
         let mut recursive_outputs_per_round: Vec<Vec<Target>> = Vec::new();
         for (r, inputs) in inputs_per_round.iter().enumerate() {
             recursive_challenger.observe_elements(&builder.constants(inputs));
@@ -457,7 +461,7 @@ mod tests {
                 recursive_challenger.get_n_challenges(&mut builder, num_outputs_per_round[r]),
             );
         }
-        let circuit = builder.build::<HCO, HCI, C>();
+        let circuit = builder.build::<C>();
         let inputs = PartialWitness::new();
         let witness = generate_partial_witness(inputs, &circuit.prover_only, &circuit.common);
         let recursive_output_values_per_round: Vec<Vec<F>> = recursive_outputs_per_round

plonky2/src/iop/generator.rs

@@ -6,7 +6,6 @@ use core::marker::PhantomData;
 use crate::field::extension::Extendable;
 use crate::field::types::Field;
 use crate::hash::hash_types::RichField;
-use crate::hash::hashing::HashConfig;
 use crate::iop::ext_target::ExtensionTarget;
 use crate::iop::target::Target;
 use crate::iop::wire::Wire;
@@ -19,13 +18,11 @@ use crate::plonk::config::GenericConfig;
 pub(crate) fn generate_partial_witness<
     'a,
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     inputs: PartialWitness<F>,
-    prover_data: &'a ProverOnlyCircuitData<F, HCO, HCI, C, D>,
+    prover_data: &'a ProverOnlyCircuitData<F, C, D>,
     common_data: &'a CommonCircuitData<F, D>,
 ) -> PartitionWitness<'a, F> {
     let config = &common_data.config;

plonky2/src/iop/witness.rs

@@ -72,18 +72,13 @@ pub trait WitnessWrite<F: Field> {
 
     /// Set the targets in a `ProofWithPublicInputsTarget` to their corresponding values in a
     /// `ProofWithPublicInputs`.
-    fn set_proof_with_pis_target<
+    fn set_proof_with_pis_target<C: GenericConfig<D, F = F>, const D: usize>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    >(
         &mut self,
         proof_with_pis_target: &ProofWithPublicInputsTarget<D>,
-        proof_with_pis: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof_with_pis: &ProofWithPublicInputs<F, C, D>,
     ) where
         F: RichField + Extendable<D>,
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
     {
         let ProofWithPublicInputs {
             proof,
@@ -103,18 +98,13 @@ pub trait WitnessWrite<F: Field> {
     }
 
     /// Set the targets in a `ProofTarget` to their corresponding values in a `Proof`.
-    fn set_proof_target<
+    fn set_proof_target<C: GenericConfig<D, F = F>, const D: usize>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    >(
         &mut self,
         proof_target: &ProofTarget<D>,
-        proof: &Proof<F, HCO, HCI, C, D>,
+        proof: &Proof<F, C, D>,
     ) where
         F: RichField + Extendable<D>,
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
     {
         self.set_cap_target(&proof_target.wires_cap, &proof.wires_cap);
         self.set_cap_target(
@@ -147,18 +137,13 @@ pub trait WitnessWrite<F: Field> {
         }
     }
 
-    fn set_verifier_data_target<
+    fn set_verifier_data_target<C: GenericConfig<D, F = F>, const D: usize>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    >(
         &mut self,
         vdt: &VerifierCircuitTarget,
-        vd: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+        vd: &VerifierOnlyCircuitData<C, D>,
     ) where
         F: RichField + Extendable<D>,
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
     {
         self.set_cap_target(&vdt.constants_sigmas_cap, &vd.constants_sigmas_cap);
         self.set_hash_target(vdt.circuit_digest, vd.circuit_digest);

plonky2/src/plonk/circuit_builder.rs

@@ -442,14 +442,12 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         MerkleCapTarget(cap.0.iter().map(|h| self.constant_hash(*h)).collect())
     }
 
-    pub fn constant_verifier_data<HCO, HCI, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn constant_verifier_data<C: GenericConfig<D, F = F>>(
         &mut self,
-        verifier_data: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+        verifier_data: &VerifierOnlyCircuitData<C, D>,
     ) -> VerifierCircuitTarget
     where
-        HCO: HashConfig,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        HCI: HashConfig,
-        C::Hasher: AlgebraicHasher<F, HCO>,
     {
         VerifierCircuitTarget {
             constants_sigmas_cap: self.constant_merkle_cap(&verifier_data.constants_sigmas_cap),
@@ -740,12 +738,10 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     }
 
     /// Builds a "full circuit", with both prover and verifier data.
-    pub fn build<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn build<C: GenericConfig<D, F = F>>(mut self) -> CircuitData<F, C, D>
-        mut self,
-    ) -> CircuitData<F, HCO, HCI, C, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let mut timing = TimingTree::new("preprocess", Level::Trace);
         #[cfg(feature = "std")]
@@ -757,7 +753,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         // those hash wires match the claimed public inputs.
         let num_public_inputs = self.public_inputs.len();
         let public_inputs_hash =
-            self.hash_n_to_hash_no_pad::<HCI, C::InnerHasher>(self.public_inputs.clone());
+            self.hash_n_to_hash_no_pad::<C::HCI, C::InnerHasher>(self.public_inputs.clone());
         let pi_gate = self.add_gate(PublicInputGate, vec![]);
         for (&hash_part, wire) in public_inputs_hash
             .elements
@@ -834,7 +830,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         let fft_root_table = fft_root_table(max_fft_points);
 
         let constants_sigmas_vecs = [constant_vecs, sigma_vecs.clone()].concat();
-        let constants_sigmas_commitment = PolynomialBatch::<F, HCO, HCI, C, D>::from_values(
+        let constants_sigmas_commitment = PolynomialBatch::<F, C, D>::from_values(
             constants_sigmas_vecs,
             rate_bits,
             PlonkOracle::CONSTANTS_SIGMAS.blinding,
@@ -922,7 +918,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             assert_eq!(goal_data, common, "The expected circuit data passed to cyclic recursion method did not match the actual circuit");
         }
 
-        let prover_only = ProverOnlyCircuitData::<F, HCO, HCI, C, D> {
+        let prover_only = ProverOnlyCircuitData::<F, C, D> {
             generators: self.generators,
             generator_indices_by_watches,
             constants_sigmas_commitment,
@@ -934,7 +930,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             circuit_digest,
         };
 
-        let verifier_only = VerifierOnlyCircuitData::<HCO, HCI, C, D> {
+        let verifier_only = VerifierOnlyCircuitData::<C, D> {
             constants_sigmas_cap,
             circuit_digest,
         };
@@ -950,28 +946,24 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     }
 
     /// Builds a "prover circuit", with data needed to generate proofs but not verify them.
-    pub fn build_prover<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn build_prover<C: GenericConfig<D, F = F>>(self) -> ProverCircuitData<F, C, D>
-        self,
-    ) -> ProverCircuitData<F, HCO, HCI, C, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         // TODO: Can skip parts of this.
-        let circuit_data = self.build::<HCO, HCI, C>();
+        let circuit_data = self.build::<C>();
         circuit_data.prover_data()
     }
 
     /// Builds a "verifier circuit", with data needed to verify proofs but not generate them.
-    pub fn build_verifier<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn build_verifier<C: GenericConfig<D, F = F>>(self) -> VerifierCircuitData<F, C, D>
-        self,
-    ) -> VerifierCircuitData<F, HCO, HCI, C, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         // TODO: Can skip parts of this.
-        let circuit_data = self.build::<HCO, HCI, C>();
+        let circuit_data = self.build::<C>();
         circuit_data.verifier_data()
     }
 }

plonky2/src/plonk/circuit_data.rs

@@ -107,35 +107,21 @@ impl CircuitConfig {
 }
 
 /// Circuit data required by the prover or the verifier.
-pub struct CircuitData<
+pub struct CircuitData<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> {
-    F: RichField + Extendable<D>,
+    pub prover_only: ProverOnlyCircuitData<F, C, D>,
-    HCO: HashConfig,
+    pub verifier_only: VerifierOnlyCircuitData<C, D>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> {
-    pub prover_only: ProverOnlyCircuitData<F, HCO, HCI, C, D>,
-    pub verifier_only: VerifierOnlyCircuitData<HCO, HCI, C, D>,
     pub common: CommonCircuitData<F, D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    CircuitData<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > CircuitData<F, HCO, HCI, C, D>
 {
-    pub fn prove(
+    pub fn prove(&self, inputs: PartialWitness<F>) -> Result<ProofWithPublicInputs<F, C, D>>
-        &self,
-        inputs: PartialWitness<F>,
-    ) -> Result<ProofWithPublicInputs<F, HCO, HCI, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
-        prove::<F, HCO, HCI, C, D>(
+        prove::<F, C, D>(
             &self.prover_only,
             &self.common,
             inputs,
@@ -143,48 +129,48 @@ impl<
         )
     }
 
-    pub fn verify(&self, proof_with_pis: ProofWithPublicInputs<F, HCO, HCI, C, D>) -> Result<()>
+    pub fn verify(&self, proof_with_pis: ProofWithPublicInputs<F, C, D>) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
-        verify::<F, HCO, HCI, C, D>(proof_with_pis, &self.verifier_only, &self.common)
+        verify::<F, C, D>(proof_with_pis, &self.verifier_only, &self.common)
     }
 
     pub fn verify_compressed(
         &self,
-        compressed_proof_with_pis: CompressedProofWithPublicInputs<F, HCO, HCI, C, D>,
+        compressed_proof_with_pis: CompressedProofWithPublicInputs<F, C, D>,
     ) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         compressed_proof_with_pis.verify(&self.verifier_only, &self.common)
     }
 
     pub fn compress(
         &self,
-        proof: ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof: ProofWithPublicInputs<F, C, D>,
-    ) -> Result<CompressedProofWithPublicInputs<F, HCO, HCI, C, D>>
+    ) -> Result<CompressedProofWithPublicInputs<F, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         proof.compress(&self.verifier_only.circuit_digest, &self.common)
     }
 
     pub fn decompress(
         &self,
-        proof: CompressedProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof: CompressedProofWithPublicInputs<F, C, D>,
-    ) -> Result<ProofWithPublicInputs<F, HCO, HCI, C, D>>
+    ) -> Result<ProofWithPublicInputs<F, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         proof.decompress(&self.verifier_only.circuit_digest, &self.common)
     }
 
-    pub fn verifier_data(&self) -> VerifierCircuitData<F, HCO, HCI, C, D> {
+    pub fn verifier_data(&self) -> VerifierCircuitData<F, C, D> {
         let CircuitData {
             verifier_only,
             common,
@@ -196,7 +182,7 @@ impl<
         }
     }
 
-    pub fn prover_data(self) -> ProverCircuitData<F, HCO, HCI, C, D> {
+    pub fn prover_data(self) -> ProverCircuitData<F, C, D> {
         let CircuitData {
             prover_only,
             common,
@@ -218,32 +204,22 @@ impl<
 /// construct a more minimal prover structure and convert back and forth.
 pub struct ProverCircuitData<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub prover_only: ProverOnlyCircuitData<F, HCO, HCI, C, D>,
+    pub prover_only: ProverOnlyCircuitData<F, C, D>,
     pub common: CommonCircuitData<F, D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    ProverCircuitData<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > ProverCircuitData<F, HCO, HCI, C, D>
 {
-    pub fn prove(
+    pub fn prove(&self, inputs: PartialWitness<F>) -> Result<ProofWithPublicInputs<F, C, D>>
-        &self,
-        inputs: PartialWitness<F>,
-    ) -> Result<ProofWithPublicInputs<F, HCO, HCI, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
-        prove::<F, HCO, HCI, C, D>(
+        prove::<F, C, D>(
             &self.prover_only,
             &self.common,
             inputs,
@@ -256,38 +232,31 @@ impl<
 #[derive(Debug)]
 pub struct VerifierCircuitData<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub verifier_only: VerifierOnlyCircuitData<HCO, HCI, C, D>,
+    pub verifier_only: VerifierOnlyCircuitData<C, D>,
     pub common: CommonCircuitData<F, D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    VerifierCircuitData<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > VerifierCircuitData<F, HCO, HCI, C, D>
 {
-    pub fn verify(&self, proof_with_pis: ProofWithPublicInputs<F, HCO, HCI, C, D>) -> Result<()>
+    pub fn verify(&self, proof_with_pis: ProofWithPublicInputs<F, C, D>) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
-        verify::<F, HCO, HCI, C, D>(proof_with_pis, &self.verifier_only, &self.common)
+        verify::<F, C, D>(proof_with_pis, &self.verifier_only, &self.common)
     }
 
     pub fn verify_compressed(
         &self,
-        compressed_proof_with_pis: CompressedProofWithPublicInputs<F, HCO, HCI, C, D>,
+        compressed_proof_with_pis: CompressedProofWithPublicInputs<F, C, D>,
     ) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         compressed_proof_with_pis.verify(&self.verifier_only, &self.common)
     }
@@ -296,9 +265,7 @@ impl<
 /// Circuit data required by the prover, but not the verifier.
 pub struct ProverOnlyCircuitData<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
     pub generators: Vec<Box<dyn WitnessGenerator<F>>>,
@@ -306,7 +273,7 @@ pub struct ProverOnlyCircuitData<
     /// they watch.
     pub generator_indices_by_watches: BTreeMap<usize, Vec<usize>>,
     /// Commitments to the constants polynomials and sigma polynomials.
-    pub constants_sigmas_commitment: PolynomialBatch<F, HCO, HCI, C, D>,
+    pub constants_sigmas_commitment: PolynomialBatch<F, C, D>,
     /// The transpose of the list of sigma polynomials.
     pub sigmas: Vec<Vec<F>>,
     /// Subgroup of order `degree`.
@@ -320,22 +287,17 @@ pub struct ProverOnlyCircuitData<
     pub fft_root_table: Option<FftRootTable<F>>,
     /// A digest of the "circuit" (i.e. the instance, minus public inputs), which can be used to
     /// seed Fiat-Shamir.
-    pub circuit_digest: <<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<F, HCO>>::Hash,
+    pub circuit_digest: <<C as GenericConfig<D>>::Hasher as Hasher<F, C::HCO>>::Hash,
 }
 
 /// Circuit data required by the verifier, but not the prover.
 #[derive(Debug, Clone, Eq, PartialEq)]
-pub struct VerifierOnlyCircuitData<
+pub struct VerifierOnlyCircuitData<C: GenericConfig<D>, const D: usize> {
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D>,
-    const D: usize,
-> {
     /// A commitment to each constant polynomial and each permutation polynomial.
-    pub constants_sigmas_cap: MerkleCap<C::F, HCO, C::Hasher>,
+    pub constants_sigmas_cap: MerkleCap<C::F, C::HCO, C::Hasher>,
     /// A digest of the "circuit" (i.e. the instance, minus public inputs), which can be used to
     /// seed Fiat-Shamir.
-    pub circuit_digest: <<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+    pub circuit_digest: <<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
 }
 
 /// Circuit data required by both the prover and the verifier.

plonky2/src/plonk/config.rs

@@ -93,17 +93,21 @@ pub trait AlgebraicHasher<F: RichField, HC: HashConfig>: Hasher<F, HC, Hash = Ha
 }
 
 /// Generic configuration trait.
-pub trait GenericConfig<HCO: HashConfig, HCI: HashConfig, const D: usize>:
+pub trait GenericConfig<const D: usize>:
     Debug + Clone + Sync + Sized + Send + Eq + PartialEq
 {
     /// Main field.
     type F: RichField + Extendable<D, Extension = Self::FE>;
     /// Field extension of degree D of the main field.
     type FE: FieldExtension<D, BaseField = Self::F>;
+    /// Hash configuration for this GenericConfig's `Hasher`.
+    type HCO: HashConfig;
+    /// Hash configuration for this GenericConfig's `InnerHasher`.
+    type HCI: HashConfig;
     /// Hash function used for building Merkle trees.
-    type Hasher: Hasher<Self::F, HCO>;
+    type Hasher: Hasher<Self::F, Self::HCO>;
     /// Algebraic hash function used for the challenger and hashing public inputs.
-    type InnerHasher: AlgebraicHasher<Self::F, HCI>;
+    type InnerHasher: AlgebraicHasher<Self::F, Self::HCI>;
 }
 
 #[derive(Clone, Debug, Eq, PartialEq)]
@@ -115,9 +119,11 @@ impl HashConfig for PoseidonHashConfig {
 /// Configuration using Poseidon over the Goldilocks field.
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub struct PoseidonGoldilocksConfig;
-impl GenericConfig<PoseidonHashConfig, PoseidonHashConfig, 2> for PoseidonGoldilocksConfig {
+impl GenericConfig<2> for PoseidonGoldilocksConfig {
     type F = GoldilocksField;
     type FE = QuadraticExtension<Self::F>;
+    type HCO = PoseidonHashConfig;
+    type HCI = PoseidonHashConfig;
     type Hasher = PoseidonHash;
     type InnerHasher = PoseidonHash;
 }
@@ -131,9 +137,11 @@ impl HashConfig for KeccakHashConfig {
 /// Configuration using truncated Keccak over the Goldilocks field.
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub struct KeccakGoldilocksConfig;
-impl GenericConfig<KeccakHashConfig, PoseidonHashConfig, 2> for KeccakGoldilocksConfig {
+impl GenericConfig<2> for KeccakGoldilocksConfig {
     type F = GoldilocksField;
     type FE = QuadraticExtension<Self::F>;
+    type HCO = KeccakHashConfig;
+    type HCI = PoseidonHashConfig;
     type Hasher = KeccakHash<25>;
     type InnerHasher = PoseidonHash;
 }

plonky2/src/plonk/get_challenges.rs

@@ -23,45 +23,39 @@ use crate::plonk::proof::{
 };
 use crate::util::reverse_bits;
 
-fn get_challenges<
+fn get_challenges<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
+    public_inputs_hash: <<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash,
-    HCO: HashConfig,
+    wires_cap: &MerkleCap<F, C::HCO, C::Hasher>,
-    HCI: HashConfig,
+    plonk_zs_partial_products_cap: &MerkleCap<F, C::HCO, C::Hasher>,
-    C: GenericConfig<HCO, HCI, D, F = F>,
+    quotient_polys_cap: &MerkleCap<F, C::HCO, C::Hasher>,
-    const D: usize,
->(
-    public_inputs_hash: <<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash,
-    wires_cap: &MerkleCap<F, HCO, C::Hasher>,
-    plonk_zs_partial_products_cap: &MerkleCap<F, HCO, C::Hasher>,
-    quotient_polys_cap: &MerkleCap<F, HCO, C::Hasher>,
     openings: &OpeningSet<F, D>,
-    commit_phase_merkle_caps: &[MerkleCap<F, HCO, C::Hasher>],
+    commit_phase_merkle_caps: &[MerkleCap<F, C::HCO, C::Hasher>],
     final_poly: &PolynomialCoeffs<F::Extension>,
     pow_witness: F,
-    circuit_digest: &<<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+    circuit_digest: &<<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
     common_data: &CommonCircuitData<F, D>,
 ) -> anyhow::Result<ProofChallenges<F, D>>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let config = &common_data.config;
     let num_challenges = config.num_challenges;
 
-    let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+    let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
 
     // Observe the instance.
-    challenger.observe_hash::<HCO, C::Hasher>(*circuit_digest);
+    challenger.observe_hash::<C::HCO, C::Hasher>(*circuit_digest);
-    challenger.observe_hash::<HCI, C::InnerHasher>(public_inputs_hash);
+    challenger.observe_hash::<C::HCI, C::InnerHasher>(public_inputs_hash);
 
-    challenger.observe_cap::<HCO, C::Hasher>(wires_cap);
+    challenger.observe_cap::<C::HCO, C::Hasher>(wires_cap);
     let plonk_betas = challenger.get_n_challenges(num_challenges);
     let plonk_gammas = challenger.get_n_challenges(num_challenges);
 
-    challenger.observe_cap::<HCO, C::Hasher>(plonk_zs_partial_products_cap);
+    challenger.observe_cap::<C::HCO, C::Hasher>(plonk_zs_partial_products_cap);
     let plonk_alphas = challenger.get_n_challenges(num_challenges);
 
-    challenger.observe_cap::<HCO, C::Hasher>(quotient_polys_cap);
+    challenger.observe_cap::<C::HCO, C::Hasher>(quotient_polys_cap);
     let plonk_zeta = challenger.get_extension_challenge::<D>();
 
     challenger.observe_openings(&openings.to_fri_openings());
@@ -71,7 +65,7 @@ where
         plonk_gammas,
         plonk_alphas,
         plonk_zeta,
-        fri_challenges: challenger.fri_challenges::<HCI, C, D>(
+        fri_challenges: challenger.fri_challenges::<C, D>(
             commit_phase_merkle_caps,
             final_poly,
             pow_witness,
@@ -81,22 +75,17 @@ where
     })
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    ProofWithPublicInputs<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > ProofWithPublicInputs<F, HCO, HCI, C, D>
 {
     pub(crate) fn fri_query_indices(
         &self,
-        circuit_digest: &<<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+        circuit_digest: &<<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
         common_data: &CommonCircuitData<F, D>,
     ) -> anyhow::Result<Vec<usize>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         Ok(self
             .get_challenges(self.get_public_inputs_hash(), circuit_digest, common_data)?
@@ -107,13 +96,13 @@ impl<
     /// Computes all Fiat-Shamir challenges used in the Plonk proof.
     pub(crate) fn get_challenges(
         &self,
-        public_inputs_hash: <<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash,
+        public_inputs_hash: <<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash,
-        circuit_digest: &<<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+        circuit_digest: &<<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
         common_data: &CommonCircuitData<F, D>,
     ) -> anyhow::Result<ProofChallenges<F, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let Proof {
             wires_cap,
@@ -129,7 +118,7 @@ impl<
                 },
         } = &self.proof;
 
-        get_challenges::<F, HCO, HCI, C, D>(
+        get_challenges::<F, C, D>(
             public_inputs_hash,
             wires_cap,
             plonk_zs_partial_products_cap,
@@ -144,24 +133,19 @@ impl<
     }
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    CompressedProofWithPublicInputs<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > CompressedProofWithPublicInputs<F, HCO, HCI, C, D>
 {
     /// Computes all Fiat-Shamir challenges used in the Plonk proof.
     pub(crate) fn get_challenges(
         &self,
-        public_inputs_hash: <<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash,
+        public_inputs_hash: <<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash,
-        circuit_digest: &<<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+        circuit_digest: &<<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
         common_data: &CommonCircuitData<F, D>,
     ) -> anyhow::Result<ProofChallenges<F, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let CompressedProof {
             wires_cap,
@@ -177,7 +161,7 @@ impl<
                 },
         } = &self.proof;
 
-        get_challenges::<F, HCO, HCI, C, D>(
+        get_challenges::<F, C, D>(
             public_inputs_hash,
             wires_cap,
             plonk_zs_partial_products_cap,
@@ -222,7 +206,7 @@ impl<
         for &(mut x_index) in fri_query_indices {
             let mut subgroup_x = F::MULTIPLICATIVE_GROUP_GENERATOR
                 * F::primitive_root_of_unity(log_n).exp_u64(reverse_bits(x_index, log_n) as u64);
-            let mut old_eval = fri_combine_initial::<F, HCO, HCI, C, D>(
+            let mut old_eval = fri_combine_initial::<F, C, D>(
                 &common_data.get_fri_instance(*plonk_zeta),
                 &self
                     .proof
@@ -268,7 +252,7 @@ impl<
 }
 
 impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
-    fn get_challenges<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    fn get_challenges<C: GenericConfig<D, F = F>>(
         &mut self,
         public_inputs_hash: HashOutTarget,
         wires_cap: &MerkleCapTarget,
@@ -282,14 +266,14 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         inner_common_data: &CommonCircuitData<F, D>,
     ) -> ProofChallengesTarget<D>
     where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let config = &inner_common_data.config;
         let num_challenges = config.num_challenges;
 
-        let mut challenger = RecursiveChallenger::<F, HCO, C::Hasher, D>::new(self);
+        let mut challenger = RecursiveChallenger::<F, C::HCO, C::Hasher, D>::new(self);
 
         // Observe the instance.
         challenger.observe_hash(&inner_circuit_digest);
@@ -324,12 +308,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 }
 
 impl<const D: usize> ProofWithPublicInputsTarget<D> {
-    pub(crate) fn get_challenges<
+    pub(crate) fn get_challenges<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>>(
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &self,
         builder: &mut CircuitBuilder<F, D>,
         public_inputs_hash: HashOutTarget,
@@ -337,9 +316,9 @@ impl<const D: usize> ProofWithPublicInputsTarget<D> {
         inner_common_data: &CommonCircuitData<F, D>,
     ) -> ProofChallengesTarget<D>
     where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let ProofTarget {
             wires_cap,
@@ -355,7 +334,7 @@ impl<const D: usize> ProofWithPublicInputsTarget<D> {
                 },
         } = &self.proof;
 
-        builder.get_challenges::<HCO, HCI, C>(
+        builder.get_challenges::<C>(
             public_inputs_hash,
             wires_cap,
             plonk_zs_partial_products_cap,

plonky2/src/plonk/proof.rs

@@ -28,23 +28,17 @@ use crate::util::serialization::{Buffer, Read};
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
 #[serde(bound = "")]
-pub struct Proof<
+pub struct Proof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> {
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> {
     /// Merkle cap of LDEs of wire values.
-    pub wires_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub wires_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of Z, in the context of Plonk's permutation argument.
-    pub plonk_zs_partial_products_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub plonk_zs_partial_products_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of the quotient polynomial components.
-    pub quotient_polys_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub quotient_polys_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Purported values of each polynomial at the challenge point.
     pub openings: OpeningSet<F, D>,
     /// A batch FRI argument for all openings.
-    pub opening_proof: FriProof<F, HCO, C::Hasher, D>,
+    pub opening_proof: FriProof<F, C::HCO, C::Hasher, D>,
 }
 
 #[derive(Clone, Debug)]
@@ -56,20 +50,9 @@ pub struct ProofTarget<const D: usize> {
     pub opening_proof: FriProofTarget<D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> Proof<F, C, D> {
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > Proof<F, HCO, HCI, C, D>
-{
     /// Compress the proof.
-    pub fn compress(
+    pub fn compress(self, indices: &[usize], params: &FriParams) -> CompressedProof<F, C, D> {
-        self,
-        indices: &[usize],
-        params: &FriParams,
-    ) -> CompressedProof<F, HCO, HCI, C, D> {
         let Proof {
             wires_cap,
             plonk_zs_partial_products_cap,
@@ -92,31 +75,24 @@ impl<
 #[serde(bound = "")]
 pub struct ProofWithPublicInputs<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub proof: Proof<F, HCO, HCI, C, D>,
+    pub proof: Proof<F, C, D>,
     pub public_inputs: Vec<F>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    ProofWithPublicInputs<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > ProofWithPublicInputs<F, HCO, HCI, C, D>
 {
     pub fn compress(
         self,
-        circuit_digest: &<<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+        circuit_digest: &<<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
         common_data: &CommonCircuitData<F, D>,
-    ) -> anyhow::Result<CompressedProofWithPublicInputs<F, HCO, HCI, C, D>>
+    ) -> anyhow::Result<CompressedProofWithPublicInputs<F, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let indices = self.fri_query_indices(circuit_digest, common_data)?;
         let compressed_proof = self.proof.compress(&indices, &common_data.fri_params);
@@ -128,9 +104,9 @@ impl<
 
     pub(crate) fn get_public_inputs_hash(
         &self,
-    ) -> <<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash
+    ) -> <<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash
     where
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         C::InnerHasher::hash_no_pad(&self.public_inputs)
     }
@@ -158,32 +134,22 @@ impl<
 
 #[derive(Serialize, Deserialize, Clone, Debug, Eq, PartialEq)]
 #[serde(bound = "")]
-pub struct CompressedProof<
+pub struct CompressedProof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-    F: RichField + Extendable<D>,
+{
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> {
     /// Merkle cap of LDEs of wire values.
-    pub wires_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub wires_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of Z, in the context of Plonk's permutation argument.
-    pub plonk_zs_partial_products_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub plonk_zs_partial_products_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of the quotient polynomial components.
-    pub quotient_polys_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub quotient_polys_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Purported values of each polynomial at the challenge point.
     pub openings: OpeningSet<F, D>,
     /// A compressed batch FRI argument for all openings.
-    pub opening_proof: CompressedFriProof<F, HCO, C::Hasher, D>,
+    pub opening_proof: CompressedFriProof<F, C::HCO, C::Hasher, D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    CompressedProof<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > CompressedProof<F, HCO, HCI, C, D>
 {
     /// Decompress the proof.
     pub(crate) fn decompress(
@@ -191,9 +157,9 @@ impl<
         challenges: &ProofChallenges<F, D>,
         fri_inferred_elements: FriInferredElements<F, D>,
         params: &FriParams,
-    ) -> Proof<F, HCO, HCI, C, D>
+    ) -> Proof<F, C, D>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         let CompressedProof {
             wires_cap,
@@ -217,31 +183,24 @@ impl<
 #[serde(bound = "")]
 pub struct CompressedProofWithPublicInputs<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub proof: CompressedProof<F, HCO, HCI, C, D>,
+    pub proof: CompressedProof<F, C, D>,
     pub public_inputs: Vec<F>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-        F: RichField + Extendable<D>,
+    CompressedProofWithPublicInputs<F, C, D>
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > CompressedProofWithPublicInputs<F, HCO, HCI, C, D>
 {
     pub fn decompress(
         self,
-        circuit_digest: &<<C as GenericConfig<HCO, HCI, D>>::Hasher as Hasher<C::F, HCO>>::Hash,
+        circuit_digest: &<<C as GenericConfig<D>>::Hasher as Hasher<C::F, C::HCO>>::Hash,
         common_data: &CommonCircuitData<F, D>,
-    ) -> anyhow::Result<ProofWithPublicInputs<F, HCO, HCI, C, D>>
+    ) -> anyhow::Result<ProofWithPublicInputs<F, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let challenges =
             self.get_challenges(self.get_public_inputs_hash(), circuit_digest, common_data)?;
@@ -257,12 +216,12 @@ impl<
 
     pub(crate) fn verify(
         self,
-        verifier_data: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+        verifier_data: &VerifierOnlyCircuitData<C, D>,
         common_data: &CommonCircuitData<F, D>,
     ) -> anyhow::Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         ensure!(
             self.public_inputs.len() == common_data.num_public_inputs,
@@ -278,7 +237,7 @@ impl<
         let decompressed_proof =
             self.proof
                 .decompress(&challenges, fri_inferred_elements, &common_data.fri_params);
-        verify_with_challenges::<F, HCO, HCI, C, D>(
+        verify_with_challenges::<F, C, D>(
             decompressed_proof,
             public_inputs_hash,
             challenges,
@@ -289,9 +248,9 @@ impl<
 
     pub(crate) fn get_public_inputs_hash(
         &self,
-    ) -> <<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash
+    ) -> <<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash
     where
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         C::InnerHasher::hash_no_pad(&self.public_inputs)
     }
@@ -365,16 +324,16 @@ pub struct OpeningSet<F: RichField + Extendable<D>, const D: usize> {
 }
 
 impl<F: RichField + Extendable<D>, const D: usize> OpeningSet<F, D> {
-    pub fn new<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn new<C: GenericConfig<D, F = F>>(
         zeta: F::Extension,
         g: F::Extension,
-        constants_sigmas_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        constants_sigmas_commitment: &PolynomialBatch<F, C, D>,
-        wires_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        wires_commitment: &PolynomialBatch<F, C, D>,
-        zs_partial_products_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        zs_partial_products_commitment: &PolynomialBatch<F, C, D>,
-        quotient_polys_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        quotient_polys_commitment: &PolynomialBatch<F, C, D>,
         common_data: &CommonCircuitData<F, D>,
     ) -> Self {
-        let eval_commitment = |z: F::Extension, c: &PolynomialBatch<F, HCO, HCI, C, D>| {
+        let eval_commitment = |z: F::Extension, c: &PolynomialBatch<F, C, D>| {
             c.polynomials
                 .par_iter()
                 .map(|p| p.to_extension().eval(z))
@@ -461,16 +420,14 @@ mod tests {
     use crate::iop::witness::PartialWitness;
     use crate::plonk::circuit_builder::CircuitBuilder;
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     #[test]
     fn test_proof_compression() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let mut config = CircuitConfig::standard_recursion_config();
         config.fri_config.reduction_strategy = FriReductionStrategy::Fixed(vec![1, 1]);
@@ -491,7 +448,7 @@ mod tests {
         for _ in 0..100 {
             builder.add_gate(NoopGate, vec![]);
         }
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
         verify(proof.clone(), &data.verifier_only, &data.common)?;
 

plonky2/src/plonk/prover.rs

@@ -26,23 +26,17 @@ use crate::util::partial_products::{partial_products_and_z_gx, quotient_chunk_pr
 use crate::util::timing::TimingTree;
 use crate::util::{ceil_div_usize, log2_ceil, transpose};
 
-pub fn prove<
+pub fn prove<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
+    prover_data: &ProverOnlyCircuitData<F, C, D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
-    prover_data: &ProverOnlyCircuitData<F, HCO, HCI, C, D>,
     common_data: &CommonCircuitData<F, D>,
     inputs: PartialWitness<F>,
     timing: &mut TimingTree,
-) -> Result<ProofWithPublicInputs<F, HCO, HCI, C, D>>
+) -> Result<ProofWithPublicInputs<F, C, D>>
 where
-    C::Hasher: Hasher<F, HCO>,
+    C::Hasher: Hasher<F, C::HCO>,
-    C::InnerHasher: Hasher<F, HCI>,
+    C::InnerHasher: Hasher<F, C::HCI>,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let config = &common_data.config;
     let num_challenges = config.num_challenges;
@@ -77,7 +71,7 @@ where
     let wires_commitment = timed!(
         timing,
         "compute wires commitment",
-        PolynomialBatch::<F, HCO, HCI, C, D>::from_values(
+        PolynomialBatch::<F, C, D>::from_values(
             wires_values,
             config.fri_config.rate_bits,
             config.zero_knowledge && PlonkOracle::WIRES.blinding,
@@ -87,13 +81,13 @@ where
         )
     );
 
-    let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+    let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
 
     // Observe the instance.
-    challenger.observe_hash::<HCO, C::Hasher>(prover_data.circuit_digest);
+    challenger.observe_hash::<C::HCO, C::Hasher>(prover_data.circuit_digest);
-    challenger.observe_hash::<HCI, C::InnerHasher>(public_inputs_hash);
+    challenger.observe_hash::<C::HCI, C::InnerHasher>(public_inputs_hash);
 
-    challenger.observe_cap::<HCO, C::Hasher>(&wires_commitment.merkle_tree.cap);
+    challenger.observe_cap::<C::HCO, C::Hasher>(&wires_commitment.merkle_tree.cap);
     let betas = challenger.get_n_challenges(num_challenges);
     let gammas = challenger.get_n_challenges(num_challenges);
 
@@ -117,7 +111,7 @@ where
     let partial_products_and_zs_commitment = timed!(
         timing,
         "commit to partial products and Z's",
-        PolynomialBatch::<F, HCO, HCI, C, D>::from_values(
+        PolynomialBatch::<F, C, D>::from_values(
             zs_partial_products,
             config.fri_config.rate_bits,
             config.zero_knowledge && PlonkOracle::ZS_PARTIAL_PRODUCTS.blinding,
@@ -127,14 +121,15 @@ where
         )
     );
 
-    challenger.observe_cap::<HCO, C::Hasher>(&partial_products_and_zs_commitment.merkle_tree.cap);
+    challenger
+        .observe_cap::<C::HCO, C::Hasher>(&partial_products_and_zs_commitment.merkle_tree.cap);
 
     let alphas = challenger.get_n_challenges(num_challenges);
 
     let quotient_polys = timed!(
         timing,
         "compute quotient polys",
-        compute_quotient_polys::<F, HCO, HCI, C, D>(
+        compute_quotient_polys::<F, C, D>(
             common_data,
             prover_data,
             &public_inputs_hash,
@@ -165,7 +160,7 @@ where
     let quotient_polys_commitment = timed!(
         timing,
         "commit to quotient polys",
-        PolynomialBatch::<F, HCO, HCI, C, D>::from_coeffs(
+        PolynomialBatch::<F, C, D>::from_coeffs(
             all_quotient_poly_chunks,
             config.fri_config.rate_bits,
             config.zero_knowledge && PlonkOracle::QUOTIENT.blinding,
@@ -175,7 +170,7 @@ where
         )
     );
 
-    challenger.observe_cap::<HCO, C::Hasher>(&quotient_polys_commitment.merkle_tree.cap);
+    challenger.observe_cap::<C::HCO, C::Hasher>(&quotient_polys_commitment.merkle_tree.cap);
 
     let zeta = challenger.get_extension_challenge::<D>();
     // To avoid leaking witness data, we want to ensure that our opening locations, `zeta` and
@@ -190,7 +185,7 @@ where
     let openings = timed!(
         timing,
         "construct the opening set",
-        OpeningSet::new::<HCO, HCI, C>(
+        OpeningSet::new::<C>(
             zeta,
             g,
             &prover_data.constants_sigmas_commitment,
@@ -205,7 +200,7 @@ where
     let opening_proof = timed!(
         timing,
         "compute opening proofs",
-        PolynomialBatch::<F, HCO, HCI, C, D>::prove_openings(
+        PolynomialBatch::<F, C, D>::prove_openings(
             &common_data.get_fri_instance(zeta),
             &[
                 &prover_data.constants_sigmas_commitment,
@@ -219,14 +214,14 @@ where
         )
     );
 
-    let proof = Proof::<F, HCO, HCI, C, D> {
+    let proof = Proof::<F, C, D> {
         wires_cap: wires_commitment.merkle_tree.cap,
         plonk_zs_partial_products_cap: partial_products_and_zs_commitment.merkle_tree.cap,
         quotient_polys_cap: quotient_polys_commitment.merkle_tree.cap,
         openings,
         opening_proof,
     };
-    Ok(ProofWithPublicInputs::<F, HCO, HCI, C, D> {
+    Ok(ProofWithPublicInputs::<F, C, D> {
         proof,
         public_inputs,
     })
@@ -235,15 +230,13 @@ where
 /// Compute the partial products used in the `Z` polynomials.
 fn all_wires_permutation_partial_products<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     witness: &MatrixWitness<F>,
     betas: &[F],
     gammas: &[F],
-    prover_data: &ProverOnlyCircuitData<F, HCO, HCI, C, D>,
+    prover_data: &ProverOnlyCircuitData<F, C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> Vec<Vec<PolynomialValues<F>>> {
     (0..common_data.config.num_challenges)
@@ -264,15 +257,13 @@ fn all_wires_permutation_partial_products<
 /// where `f, g` are the products in the definition of `Z`: `Z(g^i) = f / g`.
 fn wires_permutation_partial_products_and_zs<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     witness: &MatrixWitness<F>,
     beta: F,
     gamma: F,
-    prover_data: &ProverOnlyCircuitData<F, HCO, HCI, C, D>,
+    prover_data: &ProverOnlyCircuitData<F, C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> Vec<PolynomialValues<F>> {
     let degree = common_data.quotient_degree_factor;
@@ -328,16 +319,14 @@ const BATCH_SIZE: usize = 32;
 fn compute_quotient_polys<
     'a,
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     common_data: &CommonCircuitData<F, D>,
-    prover_data: &'a ProverOnlyCircuitData<F, HCO, HCI, C, D>,
+    prover_data: &'a ProverOnlyCircuitData<F, C, D>,
-    public_inputs_hash: &<<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash,
+    public_inputs_hash: &<<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash,
-    wires_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    wires_commitment: &'a PolynomialBatch<F, C, D>,
-    zs_partial_products_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    zs_partial_products_commitment: &'a PolynomialBatch<F, C, D>,
     betas: &[F],
     gammas: &[F],
     alphas: &[F],

plonky2/src/plonk/validate_shape.rs

@@ -2,20 +2,17 @@ use anyhow::ensure;
 
 use crate::field::extension::Extendable;
 use crate::hash::hash_types::RichField;
-use crate::hash::hashing::HashConfig;
 use crate::plonk::circuit_data::CommonCircuitData;
 use crate::plonk::config::GenericConfig;
 use crate::plonk::proof::{OpeningSet, Proof, ProofWithPublicInputs};
 
-pub(crate) fn validate_proof_with_pis_shape<F, HCO, HCI, C, const D: usize>(
+pub(crate) fn validate_proof_with_pis_shape<F, C, const D: usize>(
-    proof_with_pis: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+    proof_with_pis: &ProofWithPublicInputs<F, C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> anyhow::Result<()>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
     let ProofWithPublicInputs {
         proof,
@@ -29,15 +26,13 @@ where
     Ok(())
 }
 
-fn validate_proof_shape<F, HCO, HCI, C, const D: usize>(
+fn validate_proof_shape<F, C, const D: usize>(
-    proof: &Proof<F, HCO, HCI, C, D>,
+    proof: &Proof<F, C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> anyhow::Result<()>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
     let config = &common_data.config;
     let Proof {

plonky2/src/plonk/verifier.rs

@@ -13,20 +13,14 @@ use crate::plonk::validate_shape::validate_proof_with_pis_shape;
 use crate::plonk::vanishing_poly::eval_vanishing_poly;
 use crate::plonk::vars::EvaluationVars;
 
-pub(crate) fn verify<
+pub(crate) fn verify<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-    F: RichField + Extendable<D>,
+    proof_with_pis: ProofWithPublicInputs<F, C, D>,
-    HCO: HashConfig,
+    verifier_data: &VerifierOnlyCircuitData<C, D>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
->(
-    proof_with_pis: ProofWithPublicInputs<F, HCO, HCI, C, D>,
-    verifier_data: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> Result<()>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     validate_proof_with_pis_shape(&proof_with_pis, common_data)?;
 
@@ -37,7 +31,7 @@ where
         common_data,
     )?;
 
-    verify_with_challenges::<F, HCO, HCI, C, D>(
+    verify_with_challenges::<F, C, D>(
         proof_with_pis.proof,
         public_inputs_hash,
         challenges,
@@ -48,19 +42,17 @@ where
 
 pub(crate) fn verify_with_challenges<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
-    proof: Proof<F, HCO, HCI, C, D>,
+    proof: Proof<F, C, D>,
-    public_inputs_hash: <<C as GenericConfig<HCO, HCI, D>>::InnerHasher as Hasher<F, HCI>>::Hash,
+    public_inputs_hash: <<C as GenericConfig<D>>::InnerHasher as Hasher<F, C::HCI>>::Hash,
     challenges: ProofChallenges<F, D>,
-    verifier_data: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+    verifier_data: &VerifierOnlyCircuitData<C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> Result<()>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     let local_constants = &proof.openings.constants;
     let local_wires = &proof.openings.wires;
@@ -113,7 +105,7 @@ where
         proof.quotient_polys_cap,
     ];
 
-    verify_fri_proof::<F, HCO, HCI, C, D>(
+    verify_fri_proof::<F, C, D>(
         &common_data.get_fri_instance(challenges.plonk_zeta),
         &proof.openings.to_fri_openings(),
         &challenges.fri_challenges,

plonky2/src/recursion/conditional_recursive_verifier.rs

@@ -21,11 +21,7 @@ use crate::with_context;
 impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     /// Verify `proof0` if `condition` else verify `proof1`.
     /// `proof0` and `proof1` are assumed to use the same `CommonCircuitData`.
-    pub fn conditionally_verify_proof<
+    pub fn conditionally_verify_proof<C: GenericConfig<D, F = F>>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &mut self,
         condition: BoolTarget,
         proof_with_pis0: &ProofWithPublicInputsTarget<D>,
@@ -34,9 +30,9 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         inner_verifier_data1: &VerifierCircuitTarget,
         inner_common_data: &CommonCircuitData<F, D>,
     ) where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let selected_proof =
             self.select_proof_with_pis(condition, proof_with_pis0, proof_with_pis1);
@@ -53,19 +49,11 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
             ),
         };
 
-        self.verify_proof::<HCO, HCI, C>(
+        self.verify_proof::<C>(&selected_proof, &selected_verifier_data, inner_common_data);
-            &selected_proof,
-            &selected_verifier_data,
-            inner_common_data,
-        );
     }
 
     /// Conditionally verify a proof with a new generated dummy proof.
-    pub fn conditionally_verify_proof_or_dummy<
+    pub fn conditionally_verify_proof_or_dummy<C: GenericConfig<D, F = F> + 'static>(
-        HCO,
-        HCI,
-        C: GenericConfig<HCO, HCI, D, F = F> + 'static,
-    >(
         &mut self,
         condition: BoolTarget,
         proof_with_pis: &ProofWithPublicInputsTarget<D>,
@@ -73,15 +61,13 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         inner_common_data: &CommonCircuitData<F, D>,
     ) -> anyhow::Result<()>
     where
-        HCO: HashConfig + 'static,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        HCI: HashConfig + 'static,
+        [(); C::HCO::WIDTH]:,
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        [(); C::HCI::WIDTH]:,
-        [(); HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
     {
         let (dummy_proof_with_pis_target, dummy_verifier_data_target) =
-            self.dummy_proof_and_vk::<HCO, HCI, C>(inner_common_data)?;
+            self.dummy_proof_and_vk::<C>(inner_common_data)?;
-        self.conditionally_verify_proof::<HCO, HCI, C>(
+        self.conditionally_verify_proof::<C>(
             condition,
             proof_with_pis,
             inner_verifier_data,
@@ -361,7 +347,7 @@ mod tests {
     use crate::gates::noop::NoopGate;
     use crate::iop::witness::{PartialWitness, WitnessWrite};
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::recursion::dummy_circuit::{dummy_circuit, dummy_proof};
 
     #[test]
@@ -369,9 +355,7 @@ mod tests {
         init_logger();
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let config = CircuitConfig::standard_recursion_config();
 
         // Generate proof.
@@ -384,7 +368,7 @@ mod tests {
         for _ in 0..64 {
             builder.add_gate(NoopGate, vec![]);
         }
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
         data.verify(proof.clone())?;
 
@@ -398,7 +382,7 @@ mod tests {
         let pt = builder.add_virtual_proof_with_pis(&data.common);
         pw.set_proof_with_pis_target(&pt, &proof);
         let dummy_pt = builder.add_virtual_proof_with_pis(&data.common);
-        pw.set_proof_with_pis_target::<HCO, HCI, C, D>(&dummy_pt, &dummy_proof);
+        pw.set_proof_with_pis_target::<C, D>(&dummy_pt, &dummy_proof);
         let inner_data =
             builder.add_virtual_verifier_data(data.common.config.fri_config.cap_height);
         pw.set_verifier_data_target(&inner_data, &data.verifier_only);
@@ -406,7 +390,7 @@ mod tests {
             builder.add_virtual_verifier_data(data.common.config.fri_config.cap_height);
         pw.set_verifier_data_target(&dummy_inner_data, &dummy_data.verifier_only);
         let b = builder.constant_bool(F::rand().0 % 2 == 0);
-        builder.conditionally_verify_proof::<HCO, HCI, C>(
+        builder.conditionally_verify_proof::<C>(
             b,
             &pt,
             &inner_data,
@@ -416,7 +400,7 @@ mod tests {
         );
 
         builder.print_gate_counts(100);
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
         data.verify(proof)
     }

plonky2/src/recursion/cyclic_recursion.rs

@@ -14,12 +14,10 @@ use crate::plonk::circuit_data::{
 use crate::plonk::config::{AlgebraicHasher, GenericConfig};
 use crate::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget};
 
-impl<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D>, const D: usize>
+impl<C: GenericConfig<D>, const D: usize> VerifierOnlyCircuitData<C, D> {
-    VerifierOnlyCircuitData<HCO, HCI, C, D>
-{
     fn from_slice(slice: &[C::F], common_data: &CommonCircuitData<C::F, D>) -> Result<Self>
     where
-        C::Hasher: AlgebraicHasher<C::F, HCO>,
+        C::Hasher: AlgebraicHasher<C::F, C::HCO>,
     {
         // The structure of the public inputs is `[..., circuit_digest, constants_sigmas_cap]`.
         let cap_len = common_data.config.fri_config.num_cap_elements();
@@ -82,11 +80,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     /// that the verification key matches.
     ///
     /// WARNING: Do not register any public input after calling this! TODO: relax this
-    pub fn conditionally_verify_cyclic_proof<
+    pub fn conditionally_verify_cyclic_proof<C: GenericConfig<D, F = F>>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &mut self,
         condition: BoolTarget,
         cyclic_proof_with_pis: &ProofWithPublicInputsTarget<D>,
@@ -95,9 +89,9 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         common_data: &CommonCircuitData<F, D>,
     ) -> Result<()>
     where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let verifier_data = self
             .verifier_data_public_input
@@ -125,7 +119,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         );
 
         // Verify the cyclic proof if `condition` is set to true, otherwise verify the other proof.
-        self.conditionally_verify_proof::<HCO, HCI, C>(
+        self.conditionally_verify_proof::<C>(
             condition,
             cyclic_proof_with_pis,
             &verifier_data,
@@ -142,26 +136,20 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         Ok(())
     }
 
-    pub fn conditionally_verify_cyclic_proof_or_dummy<
+    pub fn conditionally_verify_cyclic_proof_or_dummy<C: GenericConfig<D, F = F> + 'static>(
-        HCO,
-        HCI,
-        C: GenericConfig<HCO, HCI, D, F = F> + 'static,
-    >(
         &mut self,
         condition: BoolTarget,
         cyclic_proof_with_pis: &ProofWithPublicInputsTarget<D>,
         common_data: &CommonCircuitData<F, D>,
     ) -> Result<()>
     where
-        HCO: HashConfig + 'static,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        HCI: HashConfig + 'static,
+        [(); C::HCO::WIDTH]:,
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        [(); C::HCI::WIDTH]:,
-        [(); HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
     {
         let (dummy_proof_with_pis_target, dummy_verifier_data_target) =
-            self.dummy_proof_and_vk::<HCO, HCI, C>(common_data)?;
+            self.dummy_proof_and_vk::<C>(common_data)?;
-        self.conditionally_verify_cyclic_proof::<HCO, HCI, C>(
+        self.conditionally_verify_cyclic_proof::<C>(
             condition,
             cyclic_proof_with_pis,
             &dummy_proof_with_pis_target,
@@ -176,22 +164,19 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 /// Checks that the purported verifier data in the public inputs match the real verifier data.
 pub fn check_cyclic_proof_verifier_data<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
-    proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+    proof: &ProofWithPublicInputs<F, C, D>,
-    verifier_data: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+    verifier_data: &VerifierOnlyCircuitData<C, D>,
     common_data: &CommonCircuitData<F, D>,
 ) -> Result<()>
 where
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
-    let pis =
+    let pis = VerifierOnlyCircuitData::<C, D>::from_slice(&proof.public_inputs, common_data)?;
-        VerifierOnlyCircuitData::<HCO, HCI, C, D>::from_slice(&proof.public_inputs, common_data)?;
     ensure!(verifier_data.constants_sigmas_cap == pis.constants_sigmas_cap);
     ensure!(verifier_data.circuit_digest == pis.circuit_digest);
 
@@ -220,37 +205,35 @@ mod tests {
     // Generates `CommonCircuitData` usable for recursion.
     fn common_data_for_recursion<
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
         const D: usize,
     >() -> CommonCircuitData<F, D>
     where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let config = CircuitConfig::standard_recursion_config();
         let builder = CircuitBuilder::<F, D>::new(config);
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let config = CircuitConfig::standard_recursion_config();
         let mut builder = CircuitBuilder::<F, D>::new(config);
         let proof = builder.add_virtual_proof_with_pis(&data.common);
         let verifier_data =
             builder.add_virtual_verifier_data(data.common.config.fri_config.cap_height);
-        builder.verify_proof::<HCO, HCI, C>(&proof, &verifier_data, &data.common);
+        builder.verify_proof::<C>(&proof, &verifier_data, &data.common);
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
 
         let config = CircuitConfig::standard_recursion_config();
         let mut builder = CircuitBuilder::<F, D>::new(config);
         let proof = builder.add_virtual_proof_with_pis(&data.common);
         let verifier_data =
             builder.add_virtual_verifier_data(data.common.config.fri_config.cap_height);
-        builder.verify_proof::<HCO, HCI, C>(&proof, &verifier_data, &data.common);
+        builder.verify_proof::<C>(&proof, &verifier_data, &data.common);
         while builder.num_gates() < 1 << 12 {
             builder.add_gate(NoopGate, vec![]);
         }
-        builder.build::<HCO, HCI, C>().common
+        builder.build::<C>().common
     }
 
     /// Uses cyclic recursion to build a hash chain.
@@ -263,9 +246,7 @@ mod tests {
     fn test_cyclic_recursion() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let config = CircuitConfig::standard_recursion_config();
         let mut builder = CircuitBuilder::<F, D>::new(config);
@@ -281,7 +262,7 @@ mod tests {
         builder.register_public_inputs(&current_hash_out.elements);
         let counter = builder.add_virtual_public_input();
 
-        let mut common_data = common_data_for_recursion::<F, HCO, HCI, C, D>();
+        let mut common_data = common_data_for_recursion::<F, C, D>();
         let verifier_data_target = builder.add_verifier_data_public_inputs();
         common_data.num_public_inputs = builder.num_public_inputs();
 
@@ -308,19 +289,19 @@ mod tests {
         let new_counter = builder.mul_add(condition.target, inner_cyclic_counter, one);
         builder.connect(counter, new_counter);
 
-        builder.conditionally_verify_cyclic_proof_or_dummy::<HCO, HCI, C>(
+        builder.conditionally_verify_cyclic_proof_or_dummy::<C>(
             condition,
             &inner_cyclic_proof_with_pis,
             &common_data,
         )?;
 
-        let cyclic_circuit_data = builder.build::<HCO, HCI, C>();
+        let cyclic_circuit_data = builder.build::<C>();
 
         let mut pw = PartialWitness::new();
         let initial_hash = [F::ZERO, F::ONE, F::TWO, F::from_canonical_usize(3)];
         let initial_hash_pis = initial_hash.into_iter().enumerate().collect();
         pw.set_bool_target(condition, false);
-        pw.set_proof_with_pis_target::<HCO, HCI, C, D>(
+        pw.set_proof_with_pis_target::<C, D>(
             &inner_cyclic_proof_with_pis,
             &cyclic_base_proof(
                 &common_data,

plonky2/src/recursion/dummy_circuit.rs

@@ -23,19 +23,17 @@ use crate::plonk::proof::{ProofWithPublicInputs, ProofWithPublicInputsTarget};
 /// public inputs which encode the cyclic verification key must be set properly, and this method
 /// takes care of that. It also allows the user to specify any other public inputs which should be
 /// set in this base proof.
-pub fn cyclic_base_proof<F, HCO, HCI, C, const D: usize>(
+pub fn cyclic_base_proof<F, C, const D: usize>(
     common_data: &CommonCircuitData<F, D>,
-    verifier_data: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+    verifier_data: &VerifierOnlyCircuitData<C, D>,
     mut nonzero_public_inputs: HashMap<usize, F>,
-) -> ProofWithPublicInputs<F, HCO, HCI, C, D>
+) -> ProofWithPublicInputs<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    C::Hasher: AlgebraicHasher<C::F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F>,
+    [(); C::HCO::WIDTH]:,
-    C::Hasher: AlgebraicHasher<C::F, HCO>,
+    [(); C::HCI::WIDTH]:,
-    [(); HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
 {
     let pis_len = common_data.num_public_inputs;
     let cap_elements = common_data.config.fri_config.num_cap_elements();
@@ -51,8 +49,8 @@ where
 
     // TODO: A bit wasteful to build a dummy circuit here. We could potentially use a proof that
     // just consists of zeros, apart from public inputs.
-    dummy_proof::<F, HCO, HCI, C, D>(
+    dummy_proof::<F, C, D>(
-        &dummy_circuit::<F, HCO, HCI, C, D>(common_data),
+        &dummy_circuit::<F, C, D>(common_data),
         nonzero_public_inputs,
     )
     .unwrap()
@@ -63,17 +61,15 @@ where
 /// The rest will default to zero.
 pub(crate) fn dummy_proof<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
-    circuit: &CircuitData<F, HCO, HCI, C, D>,
+    circuit: &CircuitData<F, C, D>,
     nonzero_public_inputs: HashMap<usize, F>,
-) -> anyhow::Result<ProofWithPublicInputs<F, HCO, HCI, C, D>>
+) -> anyhow::Result<ProofWithPublicInputs<F, C, D>>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let mut pw = PartialWitness::new();
     for i in 0..circuit.common.num_public_inputs {
@@ -86,16 +82,14 @@ where
 /// Generate a circuit matching a given `CommonCircuitData`.
 pub(crate) fn dummy_circuit<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 >(
     common_data: &CommonCircuitData<F, D>,
-) -> CircuitData<F, HCO, HCI, C, D>
+) -> CircuitData<F, C, D>
 where
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let config = common_data.config.clone();
     assert!(
@@ -119,26 +113,23 @@ where
         builder.add_virtual_public_input();
     }
 
-    let circuit = builder.build::<HCO, HCI, C>();
+    let circuit = builder.build::<C>();
     assert_eq!(&circuit.common, common_data);
     circuit
 }
 
 impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
-    pub(crate) fn dummy_proof_and_vk<HCO, HCI, C: GenericConfig<HCO, HCI, D, F = F> + 'static>(
+    pub(crate) fn dummy_proof_and_vk<C: GenericConfig<D, F = F> + 'static>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
     ) -> anyhow::Result<(ProofWithPublicInputsTarget<D>, VerifierCircuitTarget)>
     where
-        HCO: HashConfig + 'static,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        HCI: HashConfig + 'static,
+        [(); C::HCO::WIDTH]:,
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        [(); C::HCI::WIDTH]:,
-        [(); HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
     {
-        let dummy_circuit = dummy_circuit::<F, HCO, HCI, C, D>(common_data);
+        let dummy_circuit = dummy_circuit::<F, C, D>(common_data);
-        let dummy_proof_with_pis =
+        let dummy_proof_with_pis = dummy_proof::<F, C, D>(&dummy_circuit, HashMap::new())?;
-            dummy_proof::<F, HCO, HCI, C, D>(&dummy_circuit, HashMap::new())?;
         let dummy_proof_with_pis_target = self.add_virtual_proof_with_pis(common_data);
         let dummy_verifier_data_target =
             self.add_virtual_verifier_data(self.config.fri_config.cap_height);
@@ -155,26 +146,22 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
 }
 
 #[derive(Debug)]
-pub(crate) struct DummyProofGenerator<F, HCO, HCI, C, const D: usize>
+pub(crate) struct DummyProofGenerator<F, C, const D: usize>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
 {
     pub(crate) proof_with_pis_target: ProofWithPublicInputsTarget<D>,
-    pub(crate) proof_with_pis: ProofWithPublicInputs<F, HCO, HCI, C, D>,
+    pub(crate) proof_with_pis: ProofWithPublicInputs<F, C, D>,
     pub(crate) verifier_data_target: VerifierCircuitTarget,
-    pub(crate) verifier_data: VerifierOnlyCircuitData<HCO, HCI, C, D>,
+    pub(crate) verifier_data: VerifierOnlyCircuitData<C, D>,
 }
 
-impl<F, HCO, HCI, C, const D: usize> SimpleGenerator<F> for DummyProofGenerator<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> SimpleGenerator<F> for DummyProofGenerator<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig + 'static,
+    C: GenericConfig<D, F = F> + 'static,
-    HCI: HashConfig + 'static,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    C: GenericConfig<HCO, HCI, D, F = F> + 'static,
-    C::Hasher: AlgebraicHasher<F, HCO>,
 {
     fn dependencies(&self) -> Vec<Target> {
         vec![]

plonky2/src/recursion/recursive_verifier.rs

@@ -15,30 +15,30 @@ use crate::with_context;
 
 impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     /// Recursively verifies an inner proof.
-    pub fn verify_proof<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn verify_proof<C: GenericConfig<D, F = F>>(
         &mut self,
         proof_with_pis: &ProofWithPublicInputsTarget<D>,
         inner_verifier_data: &VerifierCircuitTarget,
         inner_common_data: &CommonCircuitData<F, D>,
     ) where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         assert_eq!(
             proof_with_pis.public_inputs.len(),
             inner_common_data.num_public_inputs
         );
-        let public_inputs_hash =
+        let public_inputs_hash = self
-            self.hash_n_to_hash_no_pad::<HCI, C::InnerHasher>(proof_with_pis.public_inputs.clone());
+            .hash_n_to_hash_no_pad::<C::HCI, C::InnerHasher>(proof_with_pis.public_inputs.clone());
-        let challenges = proof_with_pis.get_challenges::<F, HCO, HCI, C>(
+        let challenges = proof_with_pis.get_challenges::<F, C>(
             self,
             public_inputs_hash,
             inner_verifier_data.circuit_digest,
             inner_common_data,
         );
 
-        self.verify_proof_with_challenges::<HCO, HCI, C>(
+        self.verify_proof_with_challenges::<C>(
             &proof_with_pis.proof,
             public_inputs_hash,
             challenges,
@@ -48,11 +48,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
     }
 
     /// Recursively verifies an inner proof.
-    fn verify_proof_with_challenges<
+    fn verify_proof_with_challenges<C: GenericConfig<D, F = F>>(
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-    >(
         &mut self,
         proof: &ProofTarget<D>,
         public_inputs_hash: HashOutTarget,
@@ -60,8 +56,8 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         inner_verifier_data: &VerifierCircuitTarget,
         inner_common_data: &CommonCircuitData<F, D>,
     ) where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
     {
         let one = self.one_extension();
 
@@ -123,7 +119,7 @@ impl<F: RichField + Extendable<D>, const D: usize> CircuitBuilder<F, D> {
         with_context!(
             self,
             "verify FRI proof",
-            self.verify_fri_proof::<HCO, HCI, C>(
+            self.verify_fri_proof::<C>(
                 &fri_instance,
                 &proof.openings.to_fri_openings(),
                 &challenges.fri_challenges,
@@ -195,10 +191,7 @@ mod tests {
     use crate::gates::noop::NoopGate;
     use crate::iop::witness::{PartialWitness, WitnessWrite};
     use crate::plonk::circuit_data::{CircuitConfig, VerifierOnlyCircuitData};
-    use crate::plonk::config::{
+    use crate::plonk::config::{GenericConfig, KeccakGoldilocksConfig, PoseidonGoldilocksConfig};
-        GenericConfig, KeccakGoldilocksConfig, KeccakHashConfig, PoseidonGoldilocksConfig,
-        PoseidonHashConfig,
-    };
     use crate::plonk::proof::{CompressedProofWithPublicInputs, ProofWithPublicInputs};
     use crate::plonk::prover::prove;
     use crate::util::timing::TimingTree;
@@ -208,15 +201,12 @@ mod tests {
         init_logger();
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         let config = CircuitConfig::standard_recursion_zk_config();
 
-        let (proof, vd, cd) = dummy_proof::<F, HCO, HCI, C, D>(&config, 4_000)?;
+        let (proof, vd, cd) = dummy_proof::<F, C, D>(&config, 4_000)?;
-        let (proof, vd, cd) = recursive_proof::<F, HCO, HCI, HCO, HCI, C, C, D>(
+        let (proof, vd, cd) =
-            proof, vd, cd, &config, None, true, true,
+            recursive_proof::<F, C, C, D>(proof, vd, cd, &config, None, true, true)?;
-        )?;
         test_serialization(&proof, &vd, &cd)?;
 
         Ok(())
@@ -227,32 +217,22 @@ mod tests {
         init_logger();
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
 
         let config = CircuitConfig::standard_recursion_config();
 
         // Start with a degree 2^14 proof
-        let (proof, vd, cd) = dummy_proof::<F, HCO, HCI, C, D>(&config, 16_000)?;
+        let (proof, vd, cd) = dummy_proof::<F, C, D>(&config, 16_000)?;
         assert_eq!(cd.degree_bits(), 14);
 
         // Shrink it to 2^13.
-        let (proof, vd, cd) = recursive_proof::<F, HCO, HCI, HCO, HCI, C, C, D>(
+        let (proof, vd, cd) =
-            proof,
+            recursive_proof::<F, C, C, D>(proof, vd, cd, &config, Some(13), false, false)?;
-            vd,
-            cd,
-            &config,
-            Some(13),
-            false,
-            false,
-        )?;
         assert_eq!(cd.degree_bits(), 13);
 
         // Shrink it to 2^12.
-        let (proof, vd, cd) = recursive_proof::<F, HCO, HCI, HCO, HCI, C, C, D>(
+        let (proof, vd, cd) =
-            proof, vd, cd, &config, None, true, true,
+            recursive_proof::<F, C, C, D>(proof, vd, cd, &config, None, true, true)?;
-        )?;
         assert_eq!(cd.degree_bits(), 12);
 
         test_serialization(&proof, &vd, &cd)?;
@@ -269,28 +249,17 @@ mod tests {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
         type KC = KeccakGoldilocksConfig;
-        type HCCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCCI = HCCO;
-        type HCKCO = KeccakHashConfig;
-        type HCKCI = HCCI;
-        type F = <C as GenericConfig<HCCO, HCCI, D>>::F;
 
         let standard_config = CircuitConfig::standard_recursion_config();
 
         // An initial dummy proof.
-        let (proof, vd, cd) = dummy_proof::<F, HCCO, HCCI, C, D>(&standard_config, 4_000)?;
+        let (proof, vd, cd) = dummy_proof::<F, C, D>(&standard_config, 4_000)?;
         assert_eq!(cd.degree_bits(), 12);
 
         // A standard recursive proof.
-        let (proof, vd, cd) = recursive_proof::<F, HCCO, HCCI, HCCO, HCCI, C, C, D>(
+        let (proof, vd, cd) =
-            proof,
+            recursive_proof::<F, C, C, D>(proof, vd, cd, &standard_config, None, false, false)?;
-            vd,
-            cd,
-            &standard_config,
-            None,
-            false,
-            false,
-        )?;
         assert_eq!(cd.degree_bits(), 12);
 
         // A high-rate recursive proof, designed to be verifiable with fewer routed wires.
@@ -303,15 +272,8 @@ mod tests {
             },
             ..standard_config
         };
-        let (proof, vd, cd) = recursive_proof::<F, HCCO, HCCI, HCCO, HCCI, C, C, D>(
+        let (proof, vd, cd) =
-            proof,
+            recursive_proof::<F, C, C, D>(proof, vd, cd, &high_rate_config, None, true, true)?;
-            vd,
-            cd,
-            &high_rate_config,
-            None,
-            true,
-            true,
-        )?;
         assert_eq!(cd.degree_bits(), 12);
 
         // A final proof, optimized for size.
@@ -326,15 +288,8 @@ mod tests {
             },
             ..high_rate_config
         };
-        let (proof, vd, cd) = recursive_proof::<F, HCKCO, HCKCI, HCCO, HCCI, KC, C, D>(
+        let (proof, vd, cd) =
-            proof,
+            recursive_proof::<F, KC, C, D>(proof, vd, cd, &final_config, None, true, true)?;
-            vd,
-            cd,
-            &final_config,
-            None,
-            true,
-            true,
-        )?;
         assert_eq!(cd.degree_bits(), 12, "final proof too large");
 
         test_serialization(&proof, &vd, &cd)?;
@@ -348,55 +303,43 @@ mod tests {
         const D: usize = 2;
         type PC = PoseidonGoldilocksConfig;
         type KC = KeccakGoldilocksConfig;
-        type HCCO = PoseidonHashConfig;
+        type F = <PC as GenericConfig<D>>::F;
-        type HCCI = HCCO;
-        type HCKCO = KeccakHashConfig;
-        type HCKCI = HCCI;
-        type F = <PC as GenericConfig<HCCO, HCCI, D>>::F;
 
         let config = CircuitConfig::standard_recursion_config();
-        let (proof, vd, cd) = dummy_proof::<F, HCCO, HCCI, PC, D>(&config, 4_000)?;
+        let (proof, vd, cd) = dummy_proof::<F, PC, D>(&config, 4_000)?;
 
-        let (proof, vd, cd) = recursive_proof::<F, HCCO, HCCI, HCCO, HCCI, PC, PC, D>(
+        let (proof, vd, cd) =
-            proof, vd, cd, &config, None, false, false,
+            recursive_proof::<F, PC, PC, D>(proof, vd, cd, &config, None, false, false)?;
-        )?;
         test_serialization(&proof, &vd, &cd)?;
 
-        let (proof, vd, cd) = recursive_proof::<F, HCKCO, HCKCI, HCCO, HCCI, KC, PC, D>(
+        let (proof, vd, cd) =
-            proof, vd, cd, &config, None, false, false,
+            recursive_proof::<F, KC, PC, D>(proof, vd, cd, &config, None, false, false)?;
-        )?;
         test_serialization(&proof, &vd, &cd)?;
 
         Ok(())
     }
 
-    type Proof<F, HCO, HCI, C, const D: usize> = (
+    type Proof<F, C, const D: usize> = (
-        ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        ProofWithPublicInputs<F, C, D>,
-        VerifierOnlyCircuitData<HCO, HCI, C, D>,
+        VerifierOnlyCircuitData<C, D>,
         CommonCircuitData<F, D>,
     );
 
     /// Creates a dummy proof which should have roughly `num_dummy_gates` gates.
-    fn dummy_proof<
+    fn dummy_proof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>(
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    >(
         config: &CircuitConfig,
         num_dummy_gates: u64,
-    ) -> Result<Proof<F, HCO, HCI, C, D>>
+    ) -> Result<Proof<F, C, D>>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let mut builder = CircuitBuilder::<F, D>::new(config.clone());
         for _ in 0..num_dummy_gates {
             builder.add_gate(NoopGate, vec![]);
         }
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let inputs = PartialWitness::new();
         let proof = data.prove(inputs)?;
         data.verify(proof.clone())?;
@@ -406,28 +349,24 @@ mod tests {
 
     fn recursive_proof<
         F: RichField + Extendable<D>,
-        HCOO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCOI: HashConfig,
+        InnerC: GenericConfig<D, F = F>,
-        HCIO: HashConfig,
-        HCII: HashConfig,
-        C: GenericConfig<HCOO, HCOI, D, F = F>,
-        InnerC: GenericConfig<HCIO, HCII, D, F = F>,
         const D: usize,
     >(
-        inner_proof: ProofWithPublicInputs<F, HCIO, HCII, InnerC, D>,
+        inner_proof: ProofWithPublicInputs<F, InnerC, D>,
-        inner_vd: VerifierOnlyCircuitData<HCIO, HCII, InnerC, D>,
+        inner_vd: VerifierOnlyCircuitData<InnerC, D>,
         inner_cd: CommonCircuitData<F, D>,
         config: &CircuitConfig,
         min_degree_bits: Option<usize>,
         print_gate_counts: bool,
         print_timing: bool,
-    ) -> Result<Proof<F, HCOO, HCOI, C, D>>
+    ) -> Result<Proof<F, C, D>>
     where
-        InnerC::Hasher: AlgebraicHasher<F, HCIO>,
+        InnerC::Hasher: AlgebraicHasher<F, InnerC::HCO>,
-        [(); HCOO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCOI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
-        [(); HCIO::WIDTH]:,
+        [(); InnerC::HCO::WIDTH]:,
-        [(); HCII::WIDTH]:,
+        [(); InnerC::HCI::WIDTH]:,
     {
         let mut builder = CircuitBuilder::<F, D>::new(config.clone());
         let mut pw = PartialWitness::new();
@@ -441,7 +380,7 @@ mod tests {
         );
         pw.set_hash_target(inner_data.circuit_digest, inner_vd.circuit_digest);
 
-        builder.verify_proof::<HCIO, HCII, InnerC>(&pt, &inner_data, &inner_cd);
+        builder.verify_proof::<InnerC>(&pt, &inner_data, &inner_cd);
 
         if print_gate_counts {
             builder.print_gate_counts(0);
@@ -457,7 +396,7 @@ mod tests {
             }
         }
 
-        let data = builder.build::<HCOO, HCOI, C>();
+        let data = builder.build::<C>();
 
         let mut timing = TimingTree::new("prove", Level::Debug);
         let proof = prove(&data.prover_only, &data.common, pw, &mut timing)?;
@@ -473,18 +412,16 @@ mod tests {
     /// Test serialization and print some size info.
     fn test_serialization<
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
         const D: usize,
     >(
-        proof: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof: &ProofWithPublicInputs<F, C, D>,
-        vd: &VerifierOnlyCircuitData<HCO, HCI, C, D>,
+        vd: &VerifierOnlyCircuitData<C, D>,
         cd: &CommonCircuitData<F, D>,
     ) -> Result<()>
     where
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let proof_bytes = proof.to_bytes();
         info!("Proof length: {} bytes", proof_bytes.len());

plonky2/src/util/reducing.rs

@@ -280,16 +280,14 @@ mod tests {
     use crate::field::types::Sample;
     use crate::iop::witness::{PartialWitness, WitnessWrite};
     use crate::plonk::circuit_data::CircuitConfig;
-    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig};
+    use crate::plonk::config::{GenericConfig, PoseidonGoldilocksConfig};
     use crate::plonk::verifier::verify;
 
     fn test_reduce_gadget_base(n: usize) -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         let config = CircuitConfig::standard_recursion_config();
 
@@ -311,7 +309,7 @@ mod tests {
 
         builder.connect_extension(manual_reduce, circuit_reduce);
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)
@@ -320,10 +318,8 @@ mod tests {
     fn test_reduce_gadget(n: usize) -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
+        type FF = <C as GenericConfig<D>>::FE;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
-        type FF = <C as GenericConfig<HCO, HCI, D>>::FE;
 
         let config = CircuitConfig::standard_recursion_config();
 
@@ -343,7 +339,7 @@ mod tests {
 
         builder.connect_extension(manual_reduce, circuit_reduce);
 
-        let data = builder.build::<HCO, HCI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
 
         verify(proof, &data.verifier_only, &data.common)

plonky2/src/util/serialization.rs

@@ -149,15 +149,13 @@ pub trait Read {
 
     /// Reads a value of type [`OpeningSet`] from `self` with the given `common_data`.
     #[inline]
-    fn read_opening_set<F, HCO, HCI, C, const D: usize>(
+    fn read_opening_set<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
     ) -> IoResult<OpeningSet<F, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let constants = self.read_field_ext_vec::<F, D>(common_data.num_constants)?;
@@ -199,15 +197,13 @@ pub trait Read {
 
     /// Reads a value of type [`FriInitialTreeProof`] from `self` with the given `common_data`.
     #[inline]
-    fn read_fri_initial_proof<F, HCO, HCI, C, const D: usize>(
+    fn read_fri_initial_proof<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<FriInitialTreeProof<F, HCO, C::Hasher>>
+    ) -> IoResult<FriInitialTreeProof<F, C::HCO, C::Hasher>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let salt = salt_size(common_data.fri_params.hiding);
@@ -239,16 +235,14 @@ pub trait Read {
     /// Reads a value of type [`FriQueryStep`] from `self` with the given `arity` and `compressed`
     /// flag.
     #[inline]
-    fn read_fri_query_step<F, HCO, HCI, C, const D: usize>(
+    fn read_fri_query_step<F, C, const D: usize>(
         &mut self,
         arity: usize,
         compressed: bool,
-    ) -> IoResult<FriQueryStep<F, HCO, C::Hasher, D>>
+    ) -> IoResult<FriQueryStep<F, C::HCO, C::Hasher, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let evals = self.read_field_ext_vec::<F, D>(arity - usize::from(compressed))?;
         let merkle_proof = self.read_merkle_proof()?;
@@ -260,26 +254,24 @@ pub trait Read {
 
     /// Reads a vector of [`FriQueryRound`]s from `self` with `common_data`.
     #[inline]
-    fn read_fri_query_rounds<F, HCO, HCI, C, const D: usize>(
+    #[allow(clippy::type_complexity)]
+    fn read_fri_query_rounds<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<Vec<FriQueryRound<F, HCO, C::Hasher, D>>>
+    ) -> IoResult<Vec<FriQueryRound<F, C::HCO, C::Hasher, D>>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let mut fqrs = Vec::with_capacity(config.fri_config.num_query_rounds);
         for _ in 0..config.fri_config.num_query_rounds {
-            let initial_trees_proof =
+            let initial_trees_proof = self.read_fri_initial_proof::<F, C, D>(common_data)?;
-                self.read_fri_initial_proof::<F, HCO, HCI, C, D>(common_data)?;
             let steps = common_data
                 .fri_params
                 .reduction_arity_bits
                 .iter()
-                .map(|&ar| self.read_fri_query_step::<F, HCO, HCI, C, D>(1 << ar, false))
+                .map(|&ar| self.read_fri_query_step::<F, C, D>(1 << ar, false))
                 .collect::<Result<_, _>>()?;
             fqrs.push(FriQueryRound {
                 initial_trees_proof,
@@ -291,21 +283,19 @@ pub trait Read {
 
     /// Reads a value of type [`FriProof`] from `self` with `common_data`.
     #[inline]
-    fn read_fri_proof<F, HCO, HCI, C, const D: usize>(
+    fn read_fri_proof<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<FriProof<F, HCO, C::Hasher, D>>
+    ) -> IoResult<FriProof<F, C::HCO, C::Hasher, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let commit_phase_merkle_caps = (0..common_data.fri_params.reduction_arity_bits.len())
             .map(|_| self.read_merkle_cap(config.fri_config.cap_height))
             .collect::<Result<Vec<_>, _>>()?;
-        let query_round_proofs = self.read_fri_query_rounds::<F, HCO, HCI, C, D>(common_data)?;
+        let query_round_proofs = self.read_fri_query_rounds::<F, C, D>(common_data)?;
         let final_poly = PolynomialCoeffs::new(
             self.read_field_ext_vec::<F, D>(common_data.fri_params.final_poly_len())?,
         );
@@ -320,22 +310,20 @@ pub trait Read {
 
     /// Reads a value of type [`Proof`] from `self` with `common_data`.
     #[inline]
-    fn read_proof<F, HCO, HCI, C, const D: usize>(
+    fn read_proof<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<Proof<F, HCO, HCI, C, D>>
+    ) -> IoResult<Proof<F, C, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let wires_cap = self.read_merkle_cap(config.fri_config.cap_height)?;
         let plonk_zs_partial_products_cap = self.read_merkle_cap(config.fri_config.cap_height)?;
         let quotient_polys_cap = self.read_merkle_cap(config.fri_config.cap_height)?;
-        let openings = self.read_opening_set::<F, HCO, HCI, C, D>(common_data)?;
+        let openings = self.read_opening_set::<F, C, D>(common_data)?;
-        let opening_proof = self.read_fri_proof::<F, HCO, HCI, C, D>(common_data)?;
+        let opening_proof = self.read_fri_proof::<F, C, D>(common_data)?;
         Ok(Proof {
             wires_cap,
             plonk_zs_partial_products_cap,
@@ -347,16 +335,14 @@ pub trait Read {
 
     /// Reads a value of type [`ProofWithPublicInputs`] from `self` with `common_data`.
     #[inline]
-    fn read_proof_with_public_inputs<F, HCO, HCI, C, const D: usize>(
+    fn read_proof_with_public_inputs<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<ProofWithPublicInputs<F, HCO, HCI, C, D>>
+    ) -> IoResult<ProofWithPublicInputs<F, C, D>>
     where
         Self: Remaining,
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let proof = self.read_proof(common_data)?;
         let public_inputs = self.read_field_vec(self.remaining() / size_of::<u64>())?;
@@ -368,15 +354,13 @@ pub trait Read {
 
     /// Reads a value of type [`CompressedFriQueryRounds`] from `self` with `common_data`.
     #[inline]
-    fn read_compressed_fri_query_rounds<F, HCO, HCI, C, const D: usize>(
+    fn read_compressed_fri_query_rounds<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<CompressedFriQueryRounds<F, HCO, C::Hasher, D>>
+    ) -> IoResult<CompressedFriQueryRounds<F, C::HCO, C::Hasher, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let original_indices = (0..config.fri_config.num_query_rounds)
@@ -387,10 +371,7 @@ pub trait Read {
         indices.dedup();
         let mut pairs = Vec::new();
         for &i in &indices {
-            pairs.push((
+            pairs.push((i, self.read_fri_initial_proof::<F, C, D>(common_data)?));
-                i,
-                self.read_fri_initial_proof::<F, HCO, HCI, C, D>(common_data)?,
-            ));
         }
         let initial_trees_proofs = HashMap::from_iter(pairs);
 
@@ -401,7 +382,7 @@ pub trait Read {
             });
             indices.dedup();
             let query_steps = (0..indices.len())
-                .map(|_| self.read_fri_query_step::<F, HCO, HCI, C, D>(1 << a, true))
+                .map(|_| self.read_fri_query_step::<F, C, D>(1 << a, true))
                 .collect::<Result<Vec<_>, _>>()?;
             steps.push(
                 indices
@@ -421,22 +402,19 @@ pub trait Read {
 
     /// Reads a value of type [`CompressedFriProof`] from `self` with `common_data`.
     #[inline]
-    fn read_compressed_fri_proof<F, HCO, HCI, C, const D: usize>(
+    fn read_compressed_fri_proof<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<CompressedFriProof<F, HCO, C::Hasher, D>>
+    ) -> IoResult<CompressedFriProof<F, C::HCO, C::Hasher, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let commit_phase_merkle_caps = (0..common_data.fri_params.reduction_arity_bits.len())
             .map(|_| self.read_merkle_cap(config.fri_config.cap_height))
             .collect::<Result<Vec<_>, _>>()?;
-        let query_round_proofs =
+        let query_round_proofs = self.read_compressed_fri_query_rounds::<F, C, D>(common_data)?;
-            self.read_compressed_fri_query_rounds::<F, HCO, HCI, C, D>(common_data)?;
         let final_poly = PolynomialCoeffs::new(
             self.read_field_ext_vec::<F, D>(common_data.fri_params.final_poly_len())?,
         );
@@ -451,22 +429,20 @@ pub trait Read {
 
     /// Reads a value of type [`CompressedProof`] from `self` with `common_data`.
     #[inline]
-    fn read_compressed_proof<F, HCO, HCI, C, const D: usize>(
+    fn read_compressed_proof<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<CompressedProof<F, HCO, HCI, C, D>>
+    ) -> IoResult<CompressedProof<F, C, D>>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let config = &common_data.config;
         let wires_cap = self.read_merkle_cap(config.fri_config.cap_height)?;
         let plonk_zs_partial_products_cap = self.read_merkle_cap(config.fri_config.cap_height)?;
         let quotient_polys_cap = self.read_merkle_cap(config.fri_config.cap_height)?;
-        let openings = self.read_opening_set::<F, HCO, HCI, C, D>(common_data)?;
+        let openings = self.read_opening_set::<F, C, D>(common_data)?;
-        let opening_proof = self.read_compressed_fri_proof::<F, HCO, HCI, C, D>(common_data)?;
+        let opening_proof = self.read_compressed_fri_proof::<F, C, D>(common_data)?;
         Ok(CompressedProof {
             wires_cap,
             plonk_zs_partial_products_cap,
@@ -478,16 +454,14 @@ pub trait Read {
 
     /// Reads a value of type [`CompressedProofWithPublicInputs`] from `self` with `common_data`.
     #[inline]
-    fn read_compressed_proof_with_public_inputs<F, HCO, HCI, C, const D: usize>(
+    fn read_compressed_proof_with_public_inputs<F, C, const D: usize>(
         &mut self,
         common_data: &CommonCircuitData<F, D>,
-    ) -> IoResult<CompressedProofWithPublicInputs<F, HCO, HCI, C, D>>
+    ) -> IoResult<CompressedProofWithPublicInputs<F, C, D>>
     where
         Self: Remaining,
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let proof = self.read_compressed_proof(common_data)?;
         let public_inputs = self.read_field_vec(self.remaining() / size_of::<u64>())?;
@@ -625,15 +599,13 @@ pub trait Write {
 
     /// Writes a value `fitp` of type [`FriInitialTreeProof`] to `self.`
     #[inline]
-    fn write_fri_initial_proof<F, HCO, HCI, C, const D: usize>(
+    fn write_fri_initial_proof<F, C, const D: usize>(
         &mut self,
-        fitp: &FriInitialTreeProof<F, HCO, C::Hasher>,
+        fitp: &FriInitialTreeProof<F, C::HCO, C::Hasher>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         for (v, p) in &fitp.evals_proofs {
             self.write_field_vec(v)?;
@@ -644,15 +616,13 @@ pub trait Write {
 
     /// Writes a value `fqs` of type [`FriQueryStep`] to `self.`
     #[inline]
-    fn write_fri_query_step<F, HCO, HCI, C, const D: usize>(
+    fn write_fri_query_step<F, C, const D: usize>(
         &mut self,
-        fqs: &FriQueryStep<F, HCO, C::Hasher, D>,
+        fqs: &FriQueryStep<F, C::HCO, C::Hasher, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         self.write_field_ext_vec::<F, D>(&fqs.evals)?;
         self.write_merkle_proof(&fqs.merkle_proof)
@@ -660,20 +630,18 @@ pub trait Write {
 
     /// Writes a value `fqrs` of type [`FriQueryRound`] to `self.`
     #[inline]
-    fn write_fri_query_rounds<F, HCO, HCI, C, const D: usize>(
+    fn write_fri_query_rounds<F, C, const D: usize>(
         &mut self,
-        fqrs: &[FriQueryRound<F, HCO, C::Hasher, D>],
+        fqrs: &[FriQueryRound<F, C::HCO, C::Hasher, D>],
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         for fqr in fqrs {
-            self.write_fri_initial_proof::<F, HCO, HCI, C, D>(&fqr.initial_trees_proof)?;
+            self.write_fri_initial_proof::<F, C, D>(&fqr.initial_trees_proof)?;
             for fqs in &fqr.steps {
-                self.write_fri_query_step::<F, HCO, HCI, C, D>(fqs)?;
+                self.write_fri_query_step::<F, C, D>(fqs)?;
             }
         }
         Ok(())
@@ -681,54 +649,45 @@ pub trait Write {
 
     /// Writes a value `fq` of type [`FriProof`] to `self.`
     #[inline]
-    fn write_fri_proof<F, HCO, HCI, C, const D: usize>(
+    fn write_fri_proof<F, C, const D: usize>(
         &mut self,
-        fp: &FriProof<F, HCO, C::Hasher, D>,
+        fp: &FriProof<F, C::HCO, C::Hasher, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         for cap in &fp.commit_phase_merkle_caps {
             self.write_merkle_cap(cap)?;
         }
-        self.write_fri_query_rounds::<F, HCO, HCI, C, D>(&fp.query_round_proofs)?;
+        self.write_fri_query_rounds::<F, C, D>(&fp.query_round_proofs)?;
         self.write_field_ext_vec::<F, D>(&fp.final_poly.coeffs)?;
         self.write_field(fp.pow_witness)
     }
 
     /// Writes a value `proof` of type [`Proof`] to `self.`
     #[inline]
-    fn write_proof<F, HCO, HCI, C, const D: usize>(
+    fn write_proof<F, C, const D: usize>(&mut self, proof: &Proof<F, C, D>) -> IoResult<()>
-        &mut self,
-        proof: &Proof<F, HCO, HCI, C, D>,
-    ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         self.write_merkle_cap(&proof.wires_cap)?;
         self.write_merkle_cap(&proof.plonk_zs_partial_products_cap)?;
         self.write_merkle_cap(&proof.quotient_polys_cap)?;
         self.write_opening_set(&proof.openings)?;
-        self.write_fri_proof::<F, HCO, HCI, C, D>(&proof.opening_proof)
+        self.write_fri_proof::<F, C, D>(&proof.opening_proof)
     }
 
     /// Writes a value `proof_with_pis` of type [`ProofWithPublicInputs`] to `self.`
     #[inline]
-    fn write_proof_with_public_inputs<F, HCO, HCI, C, const D: usize>(
+    fn write_proof_with_public_inputs<F, C, const D: usize>(
         &mut self,
-        proof_with_pis: &ProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof_with_pis: &ProofWithPublicInputs<F, C, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let ProofWithPublicInputs {
             proof,
@@ -740,15 +699,13 @@ pub trait Write {
 
     /// Writes a value `cfqrs` of type [`CompressedFriQueryRounds`] to `self.`
     #[inline]
-    fn write_compressed_fri_query_rounds<F, HCO, HCI, C, const D: usize>(
+    fn write_compressed_fri_query_rounds<F, C, const D: usize>(
         &mut self,
-        cfqrs: &CompressedFriQueryRounds<F, HCO, C::Hasher, D>,
+        cfqrs: &CompressedFriQueryRounds<F, C::HCO, C::Hasher, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         for &i in &cfqrs.indices {
             self.write_u32(i as u32)?;
@@ -756,13 +713,13 @@ pub trait Write {
         let mut initial_trees_proofs = cfqrs.initial_trees_proofs.iter().collect::<Vec<_>>();
         initial_trees_proofs.sort_by_key(|&x| x.0);
         for (_, itp) in initial_trees_proofs {
-            self.write_fri_initial_proof::<F, HCO, HCI, C, D>(itp)?;
+            self.write_fri_initial_proof::<F, C, D>(itp)?;
         }
         for h in &cfqrs.steps {
             let mut fri_query_steps = h.iter().collect::<Vec<_>>();
             fri_query_steps.sort_by_key(|&x| x.0);
             for (_, fqs) in fri_query_steps {
-                self.write_fri_query_step::<F, HCO, HCI, C, D>(fqs)?;
+                self.write_fri_query_step::<F, C, D>(fqs)?;
             }
         }
         Ok(())
@@ -770,54 +727,48 @@ pub trait Write {
 
     /// Writes a value `fq` of type [`CompressedFriProof`] to `self.`
     #[inline]
-    fn write_compressed_fri_proof<F, HCO, HCI, C, const D: usize>(
+    fn write_compressed_fri_proof<F, C, const D: usize>(
         &mut self,
-        fp: &CompressedFriProof<F, HCO, C::Hasher, D>,
+        fp: &CompressedFriProof<F, C::HCO, C::Hasher, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         for cap in &fp.commit_phase_merkle_caps {
             self.write_merkle_cap(cap)?;
         }
-        self.write_compressed_fri_query_rounds::<F, HCO, HCI, C, D>(&fp.query_round_proofs)?;
+        self.write_compressed_fri_query_rounds::<F, C, D>(&fp.query_round_proofs)?;
         self.write_field_ext_vec::<F, D>(&fp.final_poly.coeffs)?;
         self.write_field(fp.pow_witness)
     }
 
     /// Writes a value `proof` of type [`CompressedProof`] to `self.`
     #[inline]
-    fn write_compressed_proof<F, HCO, HCI, C, const D: usize>(
+    fn write_compressed_proof<F, C, const D: usize>(
         &mut self,
-        proof: &CompressedProof<F, HCO, HCI, C, D>,
+        proof: &CompressedProof<F, C, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         self.write_merkle_cap(&proof.wires_cap)?;
         self.write_merkle_cap(&proof.plonk_zs_partial_products_cap)?;
         self.write_merkle_cap(&proof.quotient_polys_cap)?;
         self.write_opening_set(&proof.openings)?;
-        self.write_compressed_fri_proof::<F, HCO, HCI, C, D>(&proof.opening_proof)
+        self.write_compressed_fri_proof::<F, C, D>(&proof.opening_proof)
     }
 
     /// Writes a value `proof_with_pis` of type [`CompressedProofWithPublicInputs`] to `self.`
     #[inline]
-    fn write_compressed_proof_with_public_inputs<F, HCO, HCI, C, const D: usize>(
+    fn write_compressed_proof_with_public_inputs<F, C, const D: usize>(
         &mut self,
-        proof_with_pis: &CompressedProofWithPublicInputs<F, HCO, HCI, C, D>,
+        proof_with_pis: &CompressedProofWithPublicInputs<F, C, D>,
     ) -> IoResult<()>
     where
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
     {
         let CompressedProofWithPublicInputs {
             proof,

starky/src/fibonacci_stark.rs

@@ -131,9 +131,7 @@ mod tests {
     use plonky2::iop::witness::PartialWitness;
     use plonky2::plonk::circuit_builder::CircuitBuilder;
     use plonky2::plonk::circuit_data::CircuitConfig;
-    use plonky2::plonk::config::{
+    use plonky2::plonk::config::{AlgebraicHasher, GenericConfig, PoseidonGoldilocksConfig};
-        AlgebraicHasher, GenericConfig, PoseidonGoldilocksConfig, PoseidonHashConfig,
-    };
     use plonky2::util::timing::TimingTree;
 
     use crate::config::StarkConfig;
@@ -156,9 +154,7 @@ mod tests {
     fn test_fibonacci_stark() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = FibonacciStark<F, D>;
 
         let config = StarkConfig::standard_fast_config();
@@ -166,7 +162,7 @@ mod tests {
         let public_inputs = [F::ZERO, F::ONE, fibonacci(num_rows - 1, F::ZERO, F::ONE)];
         let stark = S::new(num_rows);
         let trace = stark.generate_trace(public_inputs[0], public_inputs[1]);
-        let proof = prove::<F, HCO, HCI, C, S, D>(
+        let proof = prove::<F, C, S, D>(
             stark,
             &config,
             trace,
@@ -181,9 +177,7 @@ mod tests {
     fn test_fibonacci_stark_degree() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = FibonacciStark<F, D>;
 
         let num_rows = 1 << 5;
@@ -195,14 +189,12 @@ mod tests {
     fn test_fibonacci_stark_circuit() -> Result<()> {
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = FibonacciStark<F, D>;
 
         let num_rows = 1 << 5;
         let stark = S::new(num_rows);
-        test_stark_circuit_constraints::<F, HCO, HCI, C, S, D>(stark)
+        test_stark_circuit_constraints::<F, C, S, D>(stark)
     }
 
     #[test]
@@ -210,9 +202,7 @@ mod tests {
         init_logger();
         const D: usize = 2;
         type C = PoseidonGoldilocksConfig;
-        type HCO = PoseidonHashConfig;
+        type F = <C as GenericConfig<D>>::F;
-        type HCI = HCO;
-        type F = <C as GenericConfig<HCO, HCI, D>>::F;
         type S = FibonacciStark<F, D>;
 
         let config = StarkConfig::standard_fast_config();
@@ -220,7 +210,7 @@ mod tests {
         let public_inputs = [F::ZERO, F::ONE, fibonacci(num_rows - 1, F::ZERO, F::ONE)];
         let stark = S::new(num_rows);
         let trace = stark.generate_trace(public_inputs[0], public_inputs[1]);
-        let proof = prove::<F, HCO, HCI, C, S, D>(
+        let proof = prove::<F, C, S, D>(
             stark,
             &config,
             trace,
@@ -229,33 +219,29 @@ mod tests {
         )?;
         verify_stark_proof(stark, proof.clone(), &config)?;
 
-        recursive_proof::<F, HCO, HCI, HCO, HCI, C, S, C, D>(stark, proof, &config, true)
+        recursive_proof::<F, C, S, C, D>(stark, proof, &config, true)
     }
 
     fn recursive_proof<
         F: RichField + Extendable<D>,
-        HCOO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCOI: HashConfig,
-        HCIO: HashConfig,
-        HCII: HashConfig,
-        C: GenericConfig<HCOO, HCOI, D, F = F>,
         S: Stark<F, D> + Copy,
-        InnerC: GenericConfig<HCIO, HCII, D, F = F>,
+        InnerC: GenericConfig<D, F = F>,
         const D: usize,
     >(
         stark: S,
-        inner_proof: StarkProofWithPublicInputs<F, HCIO, HCII, InnerC, D>,
+        inner_proof: StarkProofWithPublicInputs<F, InnerC, D>,
         inner_config: &StarkConfig,
         print_gate_counts: bool,
     ) -> Result<()>
     where
-        InnerC::Hasher: AlgebraicHasher<F, HCIO>,
+        InnerC::Hasher: AlgebraicHasher<F, InnerC::HCO>,
         [(); S::COLUMNS]:,
         [(); S::PUBLIC_INPUTS]:,
-        [(); HCOO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCOI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
-        [(); HCIO::WIDTH]:,
+        [(); InnerC::HCO::WIDTH]:,
-        [(); HCII::WIDTH]:,
+        [(); InnerC::HCI::WIDTH]:,
     {
         let circuit_config = CircuitConfig::standard_recursion_config();
         let mut builder = CircuitBuilder::<F, D>::new(circuit_config);
@@ -264,18 +250,13 @@ mod tests {
         let pt = add_virtual_stark_proof_with_pis(&mut builder, stark, inner_config, degree_bits);
         set_stark_proof_with_pis_target(&mut pw, &pt, &inner_proof);
 
-        verify_stark_proof_circuit::<F, HCIO, HCII, InnerC, S, D>(
+        verify_stark_proof_circuit::<F, InnerC, S, D>(&mut builder, stark, pt, inner_config);
-            &mut builder,
-            stark,
-            pt,
-            inner_config,
-        );
 
         if print_gate_counts {
             builder.print_gate_counts(0);
         }
 
-        let data = builder.build::<HCOO, HCOI, C>();
+        let data = builder.build::<C>();
         let proof = data.prove(pw)?;
         data.verify(proof)
     }

starky/src/get_challenges.rs

@@ -19,13 +19,13 @@ use crate::permutation::{
 use crate::proof::*;
 use crate::stark::Stark;
 
-fn get_challenges<F, HCO, HCI, C, S, const D: usize>(
+fn get_challenges<F, C, S, const D: usize>(
     stark: &S,
-    trace_cap: &MerkleCap<F, HCO, C::Hasher>,
+    trace_cap: &MerkleCap<F, C::HCO, C::Hasher>,
-    permutation_zs_cap: Option<&MerkleCap<F, HCO, C::Hasher>>,
+    permutation_zs_cap: Option<&MerkleCap<F, C::HCO, C::Hasher>>,
-    quotient_polys_cap: &MerkleCap<F, HCO, C::Hasher>,
+    quotient_polys_cap: &MerkleCap<F, C::HCO, C::Hasher>,
     openings: &StarkOpeningSet<F, D>,
-    commit_phase_merkle_caps: &[MerkleCap<F, HCO, C::Hasher>],
+    commit_phase_merkle_caps: &[MerkleCap<F, C::HCO, C::Hasher>],
     final_poly: &PolynomialCoeffs<F::Extension>,
     pow_witness: F,
     config: &StarkConfig,
@@ -33,16 +33,14 @@ fn get_challenges<F, HCO, HCI, C, S, const D: usize>(
 ) -> StarkProofChallenges<F, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let num_challenges = config.num_challenges;
 
-    let mut challenger = Challenger::<F, HCO, C::Hasher>::new();
+    let mut challenger = Challenger::<F, C::HCO, C::Hasher>::new();
 
     challenger.observe_cap(trace_cap);
 
@@ -67,7 +65,7 @@ where
         permutation_challenge_sets,
         stark_alphas,
         stark_zeta,
-        fri_challenges: challenger.fri_challenges::<HCI, C, D>(
+        fri_challenges: challenger.fri_challenges::<C, D>(
             commit_phase_merkle_caps,
             final_poly,
             pow_witness,
@@ -77,14 +75,12 @@ where
     }
 }
 
-impl<F, HCO, HCI, C, const D: usize> StarkProofWithPublicInputs<F, HCO, HCI, C, D>
+impl<F, C, const D: usize> StarkProofWithPublicInputs<F, C, D>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
+    [(); C::HCO::WIDTH]:,
-    C: GenericConfig<HCO, HCI, D, F = F>,
+    [(); C::HCI::WIDTH]:,
-    [(); HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
 {
     // TODO: Should be used later in compression?
     #![allow(dead_code)]
@@ -120,7 +116,7 @@ where
                 },
         } = &self.proof;
 
-        get_challenges::<F, HCO, HCI, C, S, D>(
+        get_challenges::<F, C, S, D>(
             stark,
             trace_cap,
             permutation_zs_cap.as_ref(),
@@ -138,9 +134,7 @@ where
 #[allow(clippy::too_many_arguments)]
 pub(crate) fn get_challenges_target<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -156,13 +150,13 @@ pub(crate) fn get_challenges_target<
     config: &StarkConfig,
 ) -> StarkProofChallengesTarget<D>
 where
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let num_challenges = config.num_challenges;
 
-    let mut challenger = RecursiveChallenger::<F, HCO, C::Hasher, D>::new(builder);
+    let mut challenger = RecursiveChallenger::<F, C::HCO, C::Hasher, D>::new(builder);
 
     challenger.observe_cap(trace_cap);
 
@@ -201,9 +195,7 @@ where
 impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
     pub(crate) fn get_challenges<
         F: RichField + Extendable<D>,
-        HCO: HashConfig,
+        C: GenericConfig<D, F = F>,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
         S: Stark<F, D>,
     >(
         &self,
@@ -212,9 +204,9 @@ impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
         config: &StarkConfig,
     ) -> StarkProofChallengesTarget<D>
     where
-        C::Hasher: AlgebraicHasher<F, HCO>,
+        C::Hasher: AlgebraicHasher<F, C::HCO>,
-        [(); HCO::WIDTH]:,
+        [(); C::HCO::WIDTH]:,
-        [(); HCI::WIDTH]:,
+        [(); C::HCI::WIDTH]:,
     {
         let StarkProofTarget {
             trace_cap,
@@ -230,7 +222,7 @@ impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
                 },
         } = &self.proof;
 
-        get_challenges_target::<F, HCO, HCI, C, S, D>(
+        get_challenges_target::<F, C, S, D>(
             builder,
             stark,
             trace_cap,
@@ -246,13 +238,13 @@ impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
 }
 
 // TODO: Deal with the compressed stuff.
-// impl<F: RichField + Extendable<D>, C: GenericConfig<HCO, HCI, D, F = F>, const D: usize>
+// impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize>
-//     CompressedProofWithPublicInputs<F, HCO, HCI, C, D>
+//     CompressedProofWithPublicInputs<F, C, D>
 // {
 //     /// Computes all Fiat-Shamir challenges used in the Plonk proof.
 //     pub(crate) fn get_challenges(
 //         &self,
-//         common_data: &CommonCircuitData<F, HCO, HCI, C, D>,
+//         common_data: &CommonCircuitData<F, C, D>,
 //     ) -> anyhow::Result<ProofChallenges<F, D>> {
 //         let CompressedProof {
 //             wires_cap,
@@ -285,7 +277,7 @@ impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
 //     pub(crate) fn get_inferred_elements(
 //         &self,
 //         challenges: &ProofChallenges<F, D>,
-//         common_data: &CommonCircuitData<F, HCO, HCI, C, D>,
+//         common_data: &CommonCircuitData<F, C, D>,
 //     ) -> FriInferredElements<F, D> {
 //         let ProofChallenges {
 //             plonk_zeta,
@@ -308,7 +300,7 @@ impl<const D: usize> StarkProofWithPublicInputsTarget<D> {
 //         for &(mut x_index) in fri_query_indices {
 //             let mut subgroup_x = F::MULTIPLICATIVE_GROUP_GENERATOR
 //                 * F::primitive_root_of_unity(log_n).exp_u64(reverse_bits(x_index, log_n) as u64);
-//             let mut old_eval = fri_combine_initial::<F, HCO, HCI, C, D>(
+//             let mut old_eval = fri_combine_initial::<F, C, D>(
 //                 &common_data.get_fri_instance(*plonk_zeta),
 //                 &self
 //                     .proof

starky/src/proof.rs

@@ -11,7 +11,6 @@ use plonky2::fri::structure::{
     FriOpeningBatch, FriOpeningBatchTarget, FriOpenings, FriOpeningsTarget,
 };
 use plonky2::hash::hash_types::{MerkleCapTarget, RichField};
-use plonky2::hash::hashing::HashConfig;
 use plonky2::hash::merkle_tree::MerkleCap;
 use plonky2::iop::ext_target::ExtensionTarget;
 use plonky2::iop::target::Target;
@@ -22,33 +21,20 @@ use crate::config::StarkConfig;
 use crate::permutation::PermutationChallengeSet;
 
 #[derive(Debug, Clone)]
-pub struct StarkProof<
+pub struct StarkProof<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> {
-    F: RichField + Extendable<D>,
-    HCO: HashConfig,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    const D: usize,
-> {
     /// Merkle cap of LDEs of trace values.
-    pub trace_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub trace_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Merkle cap of LDEs of permutation Z values.
-    pub permutation_zs_cap: Option<MerkleCap<F, HCO, C::Hasher>>,
+    pub permutation_zs_cap: Option<MerkleCap<F, C::HCO, C::Hasher>>,
     /// Merkle cap of LDEs of trace values.
-    pub quotient_polys_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub quotient_polys_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Purported values of each polynomial at the challenge point.
     pub openings: StarkOpeningSet<F, D>,
     /// A batch FRI argument for all openings.
-    pub opening_proof: FriProof<F, HCO, C::Hasher, D>,
+    pub opening_proof: FriProof<F, C::HCO, C::Hasher, D>,
 }
 
-impl<
+impl<F: RichField + Extendable<D>, C: GenericConfig<D, F = F>, const D: usize> StarkProof<F, C, D> {
-        F: RichField + Extendable<D>,
-        HCO: HashConfig,
-        HCI: HashConfig,
-        C: GenericConfig<HCO, HCI, D, F = F>,
-        const D: usize,
-    > StarkProof<F, HCO, HCI, C, D>
-{
     /// Recover the length of the trace from a STARK proof and a STARK config.
     pub fn recover_degree_bits(&self, config: &StarkConfig) -> usize {
         let initial_merkle_proof = &self.opening_proof.query_round_proofs[0]
@@ -83,12 +69,10 @@ impl<const D: usize> StarkProofTarget<D> {
 #[derive(Debug, Clone)]
 pub struct StarkProofWithPublicInputs<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub proof: StarkProof<F, HCO, HCI, C, D>,
+    pub proof: StarkProof<F, C, D>,
     // TODO: Maybe make it generic over a `S: Stark` and replace with `[F; S::PUBLIC_INPUTS]`.
     pub public_inputs: Vec<F>,
 }
@@ -100,27 +84,23 @@ pub struct StarkProofWithPublicInputsTarget<const D: usize> {
 
 pub struct CompressedStarkProof<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
     /// Merkle cap of LDEs of trace values.
-    pub trace_cap: MerkleCap<F, HCO, C::Hasher>,
+    pub trace_cap: MerkleCap<F, C::HCO, C::Hasher>,
     /// Purported values of each polynomial at the challenge point.
     pub openings: StarkOpeningSet<F, D>,
     /// A batch FRI argument for all openings.
-    pub opening_proof: CompressedFriProof<F, HCO, C::Hasher, D>,
+    pub opening_proof: CompressedFriProof<F, C::HCO, C::Hasher, D>,
 }
 
 pub struct CompressedStarkProofWithPublicInputs<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     const D: usize,
 > {
-    pub proof: CompressedStarkProof<F, HCO, HCI, C, D>,
+    pub proof: CompressedStarkProof<F, C, D>,
     pub public_inputs: Vec<F>,
 }
 
@@ -155,14 +135,14 @@ pub struct StarkOpeningSet<F: RichField + Extendable<D>, const D: usize> {
 }
 
 impl<F: RichField + Extendable<D>, const D: usize> StarkOpeningSet<F, D> {
-    pub fn new<HCO: HashConfig, HCI: HashConfig, C: GenericConfig<HCO, HCI, D, F = F>>(
+    pub fn new<C: GenericConfig<D, F = F>>(
         zeta: F::Extension,
         g: F,
-        trace_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        trace_commitment: &PolynomialBatch<F, C, D>,
-        permutation_zs_commitment: Option<&PolynomialBatch<F, HCO, HCI, C, D>>,
+        permutation_zs_commitment: Option<&PolynomialBatch<F, C, D>>,
-        quotient_commitment: &PolynomialBatch<F, HCO, HCI, C, D>,
+        quotient_commitment: &PolynomialBatch<F, C, D>,
     ) -> Self {
-        let eval_commitment = |z: F::Extension, c: &PolynomialBatch<F, HCO, HCI, C, D>| {
+        let eval_commitment = |z: F::Extension, c: &PolynomialBatch<F, C, D>| {
             c.polynomials
                 .par_iter()
                 .map(|p| p.to_extension().eval(z))

starky/src/prover.rs

@@ -30,23 +30,21 @@ use crate::stark::Stark;
 use crate::vanishing_poly::eval_vanishing_poly;
 use crate::vars::StarkEvaluationVars;
 
-pub fn prove<F, HCO, HCI, C, S, const D: usize>(
+pub fn prove<F, C, S, const D: usize>(
     stark: S,
     config: &StarkConfig,
     trace_poly_values: Vec<PolynomialValues<F>>,
     public_inputs: [F; S::PUBLIC_INPUTS],
     timing: &mut TimingTree,
-) -> Result<StarkProofWithPublicInputs<F, HCO, HCI, C, D>>
+) -> Result<StarkProofWithPublicInputs<F, C, D>>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     let degree = trace_poly_values[0].len();
     let degree_bits = log2_strict(degree);
@@ -61,7 +59,7 @@ where
     let trace_commitment = timed!(
         timing,
         "compute trace commitment",
-        PolynomialBatch::<F, HCO, HCI, C, D>::from_values(
+        PolynomialBatch::<F, C, D>::from_values(
             // TODO: Cloning this isn't great; consider having `from_values` accept a reference,
             // or having `compute_permutation_z_polys` read trace values from the `PolynomialBatch`.
             trace_poly_values.clone(),
@@ -116,7 +114,7 @@ where
     }
 
     let alphas = challenger.get_n_challenges(config.num_challenges);
-    let quotient_polys = compute_quotient_polys::<F, <F as Packable>::Packing, HCO, HCI, C, S, D>(
+    let quotient_polys = compute_quotient_polys::<F, <F as Packable>::Packing, C, S, D>(
         &stark,
         &trace_commitment,
         &permutation_zs_commitment_challenges,
@@ -200,11 +198,11 @@ where
 
 /// Computes the quotient polynomials `(sum alpha^i C_i(x)) / Z_H(x)` for `alpha` in `alphas`,
 /// where the `C_i`s are the Stark constraints.
-fn compute_quotient_polys<'a, F, P, HCO, HCI, C, S, const D: usize>(
+fn compute_quotient_polys<'a, F, P, C, S, const D: usize>(
     stark: &S,
-    trace_commitment: &'a PolynomialBatch<F, HCO, HCI, C, D>,
+    trace_commitment: &'a PolynomialBatch<F, C, D>,
     permutation_zs_commitment_challenges: &'a Option<(
-        PolynomialBatch<F, HCO, HCI, C, D>,
+        PolynomialBatch<F, C, D>,
         Vec<PermutationChallengeSet<F>>,
     )>,
     public_inputs: [F; S::PUBLIC_INPUTS],
@@ -215,9 +213,7 @@ fn compute_quotient_polys<'a, F, P, HCO, HCI, C, S, const D: usize>(
 where
     F: RichField + Extendable<D>,
     P: PackedField<Scalar = F>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,

starky/src/recursive_verifier.rs

@@ -28,9 +28,7 @@ use crate::vars::StarkEvaluationTargets;
 
 pub fn verify_stark_proof_circuit<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -39,21 +37,21 @@ pub fn verify_stark_proof_circuit<
     proof_with_pis: StarkProofWithPublicInputsTarget<D>,
     inner_config: &StarkConfig,
 ) where
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     assert_eq!(proof_with_pis.public_inputs.len(), S::PUBLIC_INPUTS);
     let degree_bits = proof_with_pis.proof.recover_degree_bits(inner_config);
     let challenges = with_context!(
         builder,
         "compute challenges",
-        proof_with_pis.get_challenges::<F, HCO, HCI, C, S>(builder, &stark, inner_config)
+        proof_with_pis.get_challenges::<F, C, S>(builder, &stark, inner_config)
     );
 
-    verify_stark_proof_with_challenges_circuit::<F, HCO, HCI, C, S, D>(
+    verify_stark_proof_with_challenges_circuit::<F, C, S, D>(
         builder,
         stark,
         proof_with_pis,
@@ -66,9 +64,7 @@ pub fn verify_stark_proof_circuit<
 /// Recursively verifies an inner proof.
 fn verify_stark_proof_with_challenges_circuit<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -79,10 +75,10 @@ fn verify_stark_proof_with_challenges_circuit<
     inner_config: &StarkConfig,
     degree_bits: usize,
 ) where
-    C::Hasher: AlgebraicHasher<F, HCO>,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     check_permutation_options(&stark, &proof_with_pis, &challenges).unwrap();
     let one = builder.one_extension();
@@ -169,7 +165,7 @@ fn verify_stark_proof_with_challenges_circuit<
         F::primitive_root_of_unity(degree_bits),
         inner_config,
     );
-    builder.verify_fri_proof::<HCO, HCI, C>(
+    builder.verify_fri_proof::<C>(
         &fri_instance,
         &proof.openings.to_fri_openings(),
         &challenges.fri_challenges,
@@ -267,22 +263,13 @@ fn add_stark_opening_set_target<F: RichField + Extendable<D>, S: Stark<F, D>, co
     }
 }
 
-pub fn set_stark_proof_with_pis_target<
+pub fn set_stark_proof_with_pis_target<F, C: GenericConfig<D, F = F>, W, const D: usize>(
-    F,
-    HCO,
-    HCI,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    W,
-    const D: usize,
->(
     witness: &mut W,
     stark_proof_with_pis_target: &StarkProofWithPublicInputsTarget<D>,
-    stark_proof_with_pis: &StarkProofWithPublicInputs<F, HCO, HCI, C, D>,
+    stark_proof_with_pis: &StarkProofWithPublicInputs<F, C, D>,
 ) where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    HCI: HashConfig,
-    C::Hasher: AlgebraicHasher<F, HCO>,
     W: Witness<F>,
 {
     let StarkProofWithPublicInputs {
@@ -302,22 +289,13 @@ pub fn set_stark_proof_with_pis_target<
     set_stark_proof_target(witness, pt, proof);
 }
 
-pub fn set_stark_proof_target<
+pub fn set_stark_proof_target<F, C: GenericConfig<D, F = F>, W, const D: usize>(
-    F,
-    HCO,
-    HCI,
-    C: GenericConfig<HCO, HCI, D, F = F>,
-    W,
-    const D: usize,
->(
     witness: &mut W,
     proof_target: &StarkProofTarget<D>,
-    proof: &StarkProof<F, HCO, HCI, C, D>,
+    proof: &StarkProof<F, C, D>,
 ) where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C::Hasher: AlgebraicHasher<F, C::HCO>,
-    HCI: HashConfig,
-    C::Hasher: AlgebraicHasher<F, HCO>,
     W: Witness<F>,
 {
     witness.set_cap_target(&proof_target.trace_cap, &proof.trace_cap);

starky/src/stark_testing.rs

@@ -81,9 +81,7 @@ where
 /// Tests that the circuit constraints imposed by the given STARK are coherent with the native constraints.
 pub fn test_stark_circuit_constraints<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
@@ -92,8 +90,8 @@ pub fn test_stark_circuit_constraints<
 where
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     // Compute native constraint evaluation on random values.
     let vars = StarkEvaluationVars {
@@ -155,7 +153,7 @@ where
     let native_eval_t = builder.constant_extension(native_eval);
     builder.connect_extension(circuit_eval, native_eval_t);
 
-    let data = builder.build::<HCO, HCI, C>();
+    let data = builder.build::<C>();
     let proof = data.prove(pw)?;
     data.verify(proof)
 }

starky/src/verifier.rs

@@ -21,21 +21,19 @@ use crate::vars::StarkEvaluationVars;
 
 pub fn verify_stark_proof<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
     stark: S,
-    proof_with_pis: StarkProofWithPublicInputs<F, HCO, HCI, C, D>,
+    proof_with_pis: StarkProofWithPublicInputs<F, C, D>,
     config: &StarkConfig,
 ) -> Result<()>
 where
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
-    [(); HCI::WIDTH]:,
+    [(); C::HCI::WIDTH]:,
 {
     ensure!(proof_with_pis.public_inputs.len() == S::PUBLIC_INPUTS);
     let degree_bits = proof_with_pis.proof.recover_degree_bits(config);
@@ -45,14 +43,12 @@ where
 
 pub(crate) fn verify_stark_proof_with_challenges<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
     stark: S,
-    proof_with_pis: StarkProofWithPublicInputs<F, HCO, HCI, C, D>,
+    proof_with_pis: StarkProofWithPublicInputs<F, C, D>,
     challenges: StarkProofChallenges<F, D>,
     degree_bits: usize,
     config: &StarkConfig,
@@ -60,7 +56,7 @@ pub(crate) fn verify_stark_proof_with_challenges<
 where
     [(); S::COLUMNS]:,
     [(); S::PUBLIC_INPUTS]:,
-    [(); HCO::WIDTH]:,
+    [(); C::HCO::WIDTH]:,
 {
     validate_proof_shape(&stark, &proof_with_pis, config)?;
     check_permutation_options(&stark, &proof_with_pis, &challenges)?;
@@ -136,7 +132,7 @@ where
         .chain(once(proof.quotient_polys_cap))
         .collect_vec();
 
-    verify_fri_proof::<F, HCO, HCI, C, D>(
+    verify_fri_proof::<F, C, D>(
         &stark.fri_instance(
             challenges.stark_zeta,
             F::primitive_root_of_unity(degree_bits),
@@ -152,16 +148,14 @@ where
     Ok(())
 }
 
-fn validate_proof_shape<F, HCO, HCI, C, S, const D: usize>(
+fn validate_proof_shape<F, C, S, const D: usize>(
     stark: &S,
-    proof_with_pis: &StarkProofWithPublicInputs<F, HCO, HCI, C, D>,
+    proof_with_pis: &StarkProofWithPublicInputs<F, C, D>,
     config: &StarkConfig,
 ) -> anyhow::Result<()>
 where
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     [(); S::COLUMNS]:,
 {
@@ -241,14 +235,12 @@ fn eval_l_0_and_l_last<F: Field>(log_n: usize, x: F) -> (F, F) {
 /// the Stark uses a permutation argument.
 fn check_permutation_options<
     F: RichField + Extendable<D>,
-    HCO: HashConfig,
+    C: GenericConfig<D, F = F>,
-    HCI: HashConfig,
-    C: GenericConfig<HCO, HCI, D, F = F>,
     S: Stark<F, D>,
     const D: usize,
 >(
     stark: &S,
-    proof_with_pis: &StarkProofWithPublicInputs<F, HCO, HCI, C, D>,
+    proof_with_pis: &StarkProofWithPublicInputs<F, C, D>,
     challenges: &StarkProofChallenges<F, D>,
 ) -> Result<()> {
     let options_is_some = [