Add PcsConfig to CommitmentSchemeProof

crates/prover/src/core/fri.rs

@@ -33,7 +33,7 @@ use crate::core::vcs::verifier::{MerkleVerificationError, MerkleVerifier};
 
 /// FRI proof config
 // TODO(andrew): Support different step sizes.
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct FriConfig {
     pub log_blowup_factor: u32,
     pub log_last_layer_degree_bound: u32,

crates/prover/src/core/pcs/mod.rs

@@ -12,6 +12,8 @@ pub mod quotients;
 mod utils;
 mod verifier;
 
+use serde::{Deserialize, Serialize};
+
 pub use self::prover::{
     CommitmentSchemeProof, CommitmentSchemeProver, CommitmentTreeProver, TreeBuilder,
 };
@@ -26,7 +28,7 @@ pub struct TreeSubspan {
     pub col_end: usize,
 }
 
-#[derive(Debug, Clone, Copy)]
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
 pub struct PcsConfig {
     pub pow_bits: u32,
     pub fri_config: FriConfig,

crates/prover/src/core/pcs/prover.rs

@@ -143,6 +143,7 @@ impl<'a, B: BackendForChannel<MC>, MC: MerkleChannel> CommitmentSchemeProver<'a,
             queried_values,
             proof_of_work,
             fri_proof,
+            config: self.config,
         }
     }
 }
@@ -155,6 +156,7 @@ pub struct CommitmentSchemeProof<H: MerkleHasher> {
     pub queried_values: TreeVec<Vec<BaseField>>,
     pub proof_of_work: u64,
     pub fri_proof: FriProof<H>,
+    pub config: PcsConfig,
 }
 
 pub struct TreeBuilder<'a, 'b, B: BackendForChannel<MC>, MC: MerkleChannel> {

crates/prover/src/core/prover/mod.rs

@@ -198,6 +198,7 @@ impl<H: MerkleHasher> StarkProof<H> {
             queried_values,
             proof_of_work: _,
             fri_proof,
+            config: _,
         } = commitment_scheme_proof;
 
         let FriProof {
@@ -326,13 +327,15 @@ impl<H: MerkleHasher> SizeEstimate for CommitmentSchemeProof<H> {
             queried_values,
             proof_of_work,
             fri_proof,
+            config,
         } = self;
         commitments.size_estimate()
             + sampled_values.size_estimate()
             + decommitments.size_estimate()
             + queried_values.size_estimate()
             + mem::size_of_val(proof_of_work)
             + fri_proof.size_estimate()
+            + mem::size_of_val(config)
     }
 }
 

crates/prover/src/examples/blake/air.rs

@@ -508,10 +508,10 @@ pub fn verify_blake<MC: MerkleChannel>(
         stmt1,
         stark_proof,
     }: BlakeProof<MC::H>,
-    config: PcsConfig,
 ) -> Result<(), VerificationError> {
     let channel = &mut MC::C::default();
-    let commitment_scheme = &mut CommitmentSchemeVerifier::<MC>::new(config);
+    // TODO(alonf): Consider mixing the config into the channel.
+    let commitment_scheme = &mut CommitmentSchemeVerifier::<MC>::new(stark_proof.config);
 
     let log_sizes = stmt0.log_sizes();
 
@@ -579,6 +579,6 @@ mod tests {
         let proof = prove_blake::<Blake2sMerkleChannel>(log_n_instances, config);
 
         // Verify.
-        verify_blake::<Blake2sMerkleChannel>(proof, config).unwrap();
+        verify_blake::<Blake2sMerkleChannel>(proof).unwrap();
     }
 }

crates/prover/src/examples/poseidon/mod.rs

@@ -506,7 +506,8 @@ mod tests {
         // Verify.
         // TODO: Create Air instance independently.
         let channel = &mut Blake2sChannel::default();
-        let commitment_scheme = &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(config);
+        let commitment_scheme =
+            &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(proof.config);
 
         // Decommit.
         // Retrieve the expected column sizes in each commitment interaction, from the AIR.

crates/prover/src/examples/state_machine/mod.rs

@@ -139,12 +139,12 @@ pub fn prove_state_machine(
 }
 
 pub fn verify_state_machine(
-    config: PcsConfig,
     channel: &mut Blake2sChannel,
     components: StateMachineComponents,
     proof: StateMachineProof<Blake2sMerkleHasher>,
 ) -> Result<(), VerificationError> {
-    let commitment_scheme = &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(config);
+    let commitment_scheme =
+        &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(proof.stark_proof.config);
     // Decommit.
     // Retrieve the expected column sizes in each commitment interaction, from the AIR.
     let sizes = proof.stmt0.log_sizes();
@@ -308,7 +308,7 @@ mod tests {
         let (components, proof, _) =
             prove_state_machine(log_n_rows, initial_state, config, prover_channel, false);
 
-        verify_state_machine(config, verifier_channel, components, proof).unwrap();
+        verify_state_machine(verifier_channel, components, proof).unwrap();
     }
 
     #[test]

crates/prover/src/examples/wide_fibonacci/mod.rs

@@ -273,7 +273,7 @@ mod tests {
         // Verify.
         let verifier_channel = &mut Poseidon252Channel::default();
         let commitment_scheme =
-            &mut CommitmentSchemeVerifier::<Poseidon252MerkleChannel>::new(config);
+            &mut CommitmentSchemeVerifier::<Poseidon252MerkleChannel>::new(proof.config);
 
         // Retrieve the expected column sizes in each commitment interaction, from the AIR.
         let sizes = component.trace_log_degree_bounds();

crates/prover/src/examples/xor/gkr_lookups/mle_eval.rs

@@ -834,7 +834,8 @@ mod tests {
 
         let log_sizes = components.column_log_sizes();
         let channel = &mut Blake2sChannel::default();
-        let commitment_scheme = &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(config);
+        let commitment_scheme =
+            &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(proof.config);
         commitment_scheme.commit(proof.commitments[0], &[], channel);
         commitment_scheme.commit(proof.commitments[1], &log_sizes[1], channel);
         commitment_scheme.commit(proof.commitments[2], &log_sizes[2], channel);
@@ -924,7 +925,8 @@ mod tests {
 
         let log_sizes = components.column_log_sizes();
         let channel = &mut Blake2sChannel::default();
-        let commitment_scheme = &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(config);
+        let commitment_scheme =
+            &mut CommitmentSchemeVerifier::<Blake2sMerkleChannel>::new(proof.config);
         commitment_scheme.commit(proof.commitments[0], &[], channel);
         commitment_scheme.commit(proof.commitments[1], &log_sizes[1], channel);
         commitment_scheme.commit(proof.commitments[2], &log_sizes[2], channel);