Default without compress selectors

input-output-hk · Oct 21, 2024 · dfb066e · dfb066e
1 parent b5b0aef
commit dfb066e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/halo2_proofs/src/plonk.rs b/halo2_proofs/src/plonk.rs
@@ -55,6 +55,10 @@ where
     #[cfg(not(feature = "circuit-params"))]
     ConcreteCircuit::configure(&mut cs);
 
+    // we still need to replace selectors with fixed Expressions in `cs`
+    let fake_selectors = vec![vec![]; cs.num_selectors()];
+    let (cs, _) = cs.directly_convert_selectors_to_fixed(fake_selectors);
+
     let cs_mid: ConstraintSystemMid<_> = cs.into();
     VerifyingKey::read(reader, format, cs_mid.into())
 }

diff --git a/halo2_proofs/src/plonk/keygen.rs b/halo2_proofs/src/plonk/keygen.rs
@@ -24,7 +24,7 @@ where
     ConcreteCircuit: Circuit<C::Scalar>,
     C::Scalar: FromUniformBytes<64>,
 {
-    keygen_vk_custom(params, circuit, true)
+    keygen_vk_custom(params, circuit, false)
 }
 
 /// Generate a `VerifyingKey` from an instance of `Circuit`.
@@ -66,7 +66,7 @@ where
     P: Params<C>,
     ConcreteCircuit: Circuit<C::Scalar>,
 {
-    keygen_pk_custom(params, vk, circuit, true)
+    keygen_pk_custom(params, vk, circuit, false)
 }
 
 /// Generate a `ProvingKey` from an instance of `Circuit`.