Fix/transcript fork

ceno_zkvm/examples/riscv_add.rs

@@ -55,14 +55,14 @@
 
     let max_threads = {
         if !is_power_of_2(RAYON_NUM_THREADS) {
             #[cfg(not(feature = "non_pow2_rayon_thread"))]
             {
                 panic!(
                     "add --features non_pow2_rayon_thread to enable unsafe feature which support non pow of 2 rayon thread pool"
                 );
             }
 
             #[cfg(feature = "non_pow2_rayon_thread")]
             {
                 use sumcheck::{local_thread_pool::create_local_pool_once, util::ceil_log2};
                 let max_thread_id = 1 << ceil_log2(RAYON_NUM_THREADS);
@@ -141,12 +141,12 @@
 
         let timer = Instant::now();
 
-        let mut transcript = Transcript::new(b"riscv");
+        let transcript = Transcript::new(b"riscv");
         let mut rng = test_rng();
         let real_challenges = [E::random(&mut rng), E::random(&mut rng)];
 
         let zkvm_proof = prover
-            .create_proof(zkvm_witness, max_threads, &mut transcript, &real_challenges)
+            .create_proof(zkvm_witness, max_threads, transcript, &real_challenges)
             .expect("create_proof failed");
 
         println!(
@@ -155,10 +155,10 @@
             timer.elapsed().as_secs_f64()
         );
 
-        let mut transcript = Transcript::new(b"riscv");
+        let transcript = Transcript::new(b"riscv");
         assert!(
             verifier
-                .verify_proof(zkvm_proof, &mut transcript, &real_challenges)
+                .verify_proof(zkvm_proof, transcript, &real_challenges)
                 .expect("verify proof return with error"),
         );
     }

ceno_zkvm/src/scheme.rs

@@ -60,8 +60,17 @@ pub struct ZKVMTableProof<E: ExtensionField> {
     pub wits_in_evals: Vec<E>,
 }
 
+/// Map circuit names to
+/// - an opcode or table proof,
+/// - an index unique across both types.
 #[derive(Default, Clone)]
 pub struct ZKVMProof<E: ExtensionField> {
-    opcode_proofs: HashMap<String, ZKVMOpcodeProof<E>>,
-    table_proofs: HashMap<String, ZKVMTableProof<E>>,
+    opcode_proofs: HashMap<String, (usize, ZKVMOpcodeProof<E>)>,
+    table_proofs: HashMap<String, (usize, ZKVMTableProof<E>)>,
+}
+
+impl<E: ExtensionField> ZKVMProof<E> {
+    pub fn num_circuits(&self) -> usize {
+        self.opcode_proofs.len() + self.table_proofs.len()
+    }
 }

ceno_zkvm/src/scheme/prover.rs

@@ -47,11 +47,18 @@ impl<E: ExtensionField> ZKVMProver<E> {
         &self,
         mut witnesses: ZKVMWitnesses<E>,
         max_threads: usize,
-        transcript: &mut Transcript<E>,
+        transcript: Transcript<E>,
         challenges: &[E; 2],
     ) -> Result<ZKVMProof<E>, ZKVMError> {
         let mut vm_proof = ZKVMProof::default();
-        for (circuit_name, pk) in self.pk.circuit_pks.iter() {
+        let mut transcripts = transcript.fork(self.pk.circuit_pks.len());
+
+        for ((circuit_name, pk), (i, transcript)) in self
+            .pk
+            .circuit_pks
+            .iter() // Sorted by key.
+            .zip_eq(transcripts.iter_mut().enumerate())
+        {
             let witness = witnesses
                 .witnesses
                 .remove(circuit_name)
@@ -94,7 +101,7 @@ impl<E: ExtensionField> ZKVMProver<E> {
                 );
                 vm_proof
                     .opcode_proofs
-                    .insert(circuit_name.clone(), opcode_proof);
+                    .insert(circuit_name.clone(), (i, opcode_proof));
             } else {
                 let table_proof = self.create_table_proof(
                     pk,
@@ -116,7 +123,7 @@ impl<E: ExtensionField> ZKVMProver<E> {
                 );
                 vm_proof
                     .table_proofs
-                    .insert(circuit_name.clone(), table_proof);
+                    .insert(circuit_name.clone(), (i, table_proof));
             }
         }
 

ceno_zkvm/src/scheme/verifier.rs

@@ -39,7 +39,7 @@ impl<E: ExtensionField> ZKVMVerifier<E> {
     pub fn verify_proof(
         &self,
         vm_proof: ZKVMProof<E>,
-        transcript: &mut Transcript<E>,
+        transcript: Transcript<E>,
         challenges: &[E; 2],
     ) -> Result<bool, ZKVMError> {
         let mut prod_r = E::ONE;
@@ -48,7 +48,11 @@ impl<E: ExtensionField> ZKVMVerifier<E> {
         let dummy_table_item = challenges[0];
         let point_eval = PointAndEval::default();
         let mut dummy_table_item_multiplicity = 0;
-        for (name, opcode_proof) in vm_proof.opcode_proofs {
+        let mut transcripts = transcript.fork(vm_proof.num_circuits());
+
+        for (name, (i, opcode_proof)) in vm_proof.opcode_proofs {
+            let transcript = &mut transcripts[i];
+
             let circuit_vk = self
                 .vk
                 .circuit_vks
@@ -82,7 +86,9 @@ impl<E: ExtensionField> ZKVMVerifier<E> {
                 opcode_proof.lk_p2_out_eval * opcode_proof.lk_q2_out_eval.invert().unwrap();
         }
 
-        for (name, table_proof) in vm_proof.table_proofs {
+        for (name, (i, table_proof)) in vm_proof.table_proofs {
+            let transcript = &mut transcripts[i];
+
             let circuit_vk = self
                 .vk
                 .circuit_vks

transcript/src/basic.rs

@@ -27,6 +27,17 @@ impl<E: ExtensionField> Transcript<E> {
 }
 
 impl<E: ExtensionField> Transcript<E> {
+    /// Fork this transcript into n different threads.
+    pub fn fork(self, n: usize) -> Vec<Self> {
+        let mut forks = Vec::with_capacity(n);
+        for i in 0..n {
+            let mut fork = self.clone();
+            fork.append_field_element(&(i as u64).into());
+            forks.push(fork);
+        }
+        forks
+    }
+
     // Append the message to the transcript.
     pub fn append_message(&mut self, msg: &[u8]) {
         let msg_f = E::BaseField::bytes_to_field_elements(msg);