fix: read scope from chip (#1642)

succinctlabs · Oct 15, 2024 · 87d5de2 · 87d5de2
1 parent 752cf46
commit 87d5de2
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 31 deletions.
diff --git a/crates/recursion/circuit/src/machine/compress.rs b/crates/recursion/circuit/src/machine/compress.rs
@@ -173,8 +173,6 @@ where
                 shard_proof.public_values[0..machine.num_pv_elts()].iter().copied(),
             );
 
-            assert!(!shard_proof.contains_global_main_commitment());
-
             let zero_ext: Ext<C::F, C::EF> = builder.eval(C::F::zero());
             StarkVerifier::verify_shard(
                 builder,

diff --git a/crates/recursion/circuit/src/machine/deferred.rs b/crates/recursion/circuit/src/machine/deferred.rs
@@ -168,8 +168,6 @@ where
                 shard_proof.public_values[0..machine.num_pv_elts()].iter().copied(),
             );
 
-            assert!(!shard_proof.contains_global_main_commitment());
-
             let zero_ext: Ext<C::F, C::EF> = builder.eval(C::F::zero());
             StarkVerifier::verify_shard(
                 builder,

diff --git a/crates/recursion/circuit/src/machine/wrap.rs b/crates/recursion/circuit/src/machine/wrap.rs
@@ -71,8 +71,6 @@ where
         challenger
             .observe_slice(builder, proof.public_values[0..machine.num_pv_elts()].iter().copied());
 
-        assert!(!proof.contains_global_main_commitment());
-
         let zero_ext: Ext<C::F, C::EF> = builder.eval(C::F::zero());
         StarkVerifier::verify_shard(
             builder,

diff --git a/crates/recursion/circuit/src/stark.rs b/crates/recursion/circuit/src/stark.rs
@@ -41,7 +41,6 @@ pub struct ShardProofVariable<C: CircuitConfig<F = SC::Val>, SC: BabyBearFriConf
     pub opened_values: ShardOpenedValues<Ext<C::F, C::EF>>,
     pub opening_proof: TwoAdicPcsProofVariable<C, SC>,
     pub chip_ordering: HashMap<String, usize>,
-    pub chip_scopes: Vec<InteractionScope>,
     pub public_values: Vec<Felt<C::F>>,
 }
 
@@ -180,14 +179,8 @@ pub fn dummy_vk_and_shard_proof<A: MachineAir<BabyBear>>(
         chip_ordering: preprocessed_chip_ordering,
     };
 
-    let shard_proof = ShardProof {
-        commitment,
-        opened_values,
-        opening_proof,
-        chip_ordering,
-        chip_scopes,
-        public_values,
-    };
+    let shard_proof =
+        ShardProof { commitment, opened_values, opening_proof, chip_ordering, public_values };
 
     (vk, shard_proof)
 }
@@ -277,15 +270,15 @@ where
         A: for<'a> Air<RecursiveVerifierConstraintFolder<'a, C>>,
     {
         let chips = machine.shard_chips_ordered(&proof.chip_ordering).collect::<Vec<_>>();
+        let chip_scopes = chips.iter().map(|chip| chip.commit_scope()).collect::<Vec<_>>();
 
-        let has_global_main_commit = proof.contains_global_main_commitment();
+        let has_global_main_commit = chip_scopes.contains(&InteractionScope::Global);
 
         let ShardProofVariable {
             commitment,
             opened_values,
             opening_proof,
             chip_ordering,
-            chip_scopes,
             public_values,
         } = proof;
 
@@ -527,10 +520,6 @@ impl<C: CircuitConfig<F = SC::Val>, SC: BabyBearFriConfigVariable<C>> ShardProof
     pub fn contains_memory_finalize(&self) -> bool {
         self.chip_ordering.contains_key("MemoryGlobalFinalize")
     }
-
-    pub fn contains_global_main_commitment(&self) -> bool {
-        self.chip_scopes.contains(&InteractionScope::Global)
-    }
 }
 
 #[allow(unused_imports)]

diff --git a/crates/recursion/circuit/src/witness/mod.rs b/crates/recursion/circuit/src/witness/mod.rs
@@ -143,15 +143,13 @@ where
         let opening_proof = self.opening_proof.read(builder);
         let public_values = self.public_values.read(builder);
         let chip_ordering = self.chip_ordering.clone();
-        let chip_scopes = self.chip_scopes.clone();
 
         ShardProofVariable {
             commitment,
             opened_values,
             opening_proof,
             public_values,
             chip_ordering,
-            chip_scopes,
         }
     }
 

diff --git a/crates/sdk/src/provers/mock.rs b/crates/sdk/src/provers/mock.rs
@@ -85,7 +85,6 @@ impl Prover<DefaultProverComponents> for MockProver {
                         query_openings: vec![],
                     },
                     chip_ordering: HashMap::new(),
-                    chip_scopes: vec![],
                     public_values: vec![],
                 };
 

diff --git a/crates/stark/src/prover.rs b/crates/stark/src/prover.rs
@@ -752,7 +752,6 @@ where
             opened_values: ShardOpenedValues { chips: opened_values },
             opening_proof,
             chip_ordering: all_chips_ordering,
-            chip_scopes: all_chip_scopes,
             public_values: local_public_values,
         })
     }

diff --git a/crates/stark/src/types.rs b/crates/stark/src/types.rs
@@ -83,7 +83,6 @@ pub struct ShardProof<SC: StarkGenericConfig> {
     pub opened_values: ShardOpenedValues<Challenge<SC>>,
     pub opening_proof: OpeningProof<SC>,
     pub chip_ordering: HashMap<String, usize>,
-    pub chip_scopes: Vec<InteractionScope>,
     pub public_values: Vec<Val<SC>>,
 }
 
@@ -151,10 +150,6 @@ impl<SC: StarkGenericConfig> ShardProof<SC> {
     pub fn contains_global_memory_finalize(&self) -> bool {
         self.chip_ordering.contains_key("MemoryGlobalFinalize")
     }
-
-    pub fn contains_global_main_commitment(&self) -> bool {
-        self.chip_scopes.contains(&InteractionScope::Global)
-    }
 }
 
 #[derive(Serialize, Deserialize, Clone)]

diff --git a/crates/stark/src/verifier.rs b/crates/stark/src/verifier.rs
@@ -45,7 +45,6 @@ impl<SC: StarkGenericConfig, A: MachineAir<Val<SC>>> Verifier<SC, A> {
             opened_values,
             opening_proof,
             chip_ordering,
-            chip_scopes,
             public_values,
             ..
         } = proof;
@@ -56,6 +55,8 @@ impl<SC: StarkGenericConfig, A: MachineAir<Val<SC>>> Verifier<SC, A> {
             return Err(VerificationError::ChipOpeningLengthMismatch);
         }
 
+        let chip_scopes = chips.iter().map(|chip| chip.commit_scope()).collect::<Vec<_>>();
+
         // Assert that the byte multiplicities don't overflow.
         let mut max_byte_lookup_mult = 0u64;
         chips.iter().zip(opened_values.chips.iter()).for_each(|(chip, val)| {