merge with master

Author: hero78119

ceno_recursion/src/zkvm_verifier/verifier.rs

@@ -887,10 +887,8 @@ pub fn verify_gkr_circuit<C: Config>(
 
     for (i, layer) in gkr_circuit.layers.iter().enumerate() {
         let layer_proof = builder.get(&gkr_proof.layer_proofs, i);
-        let layer_challenges: Array<C, Ext<C::F, C::EF>> =
-            generate_layer_challenges(builder, challenger, challenges, layer.n_challenges);
         let eval_and_dedup_points: Array<C, ClaimAndPoint<C>> =
-            extract_claim_and_point(builder, layer, claims, &layer_challenges);
+            extract_claim_and_point(builder, layer, claims, challenges);
         builder.assert_usize_eq(
             Usize::from(layer.out_sel_and_eval_exprs.len()),
             eval_and_dedup_points.len(),
@@ -1695,33 +1693,6 @@ pub fn extract_claim_and_point<C: Config>(
     r
 }
 
-pub fn generate_layer_challenges<C: Config>(
-    builder: &mut Builder<C>,
-    challenger: &mut DuplexChallengerVariable<C>,
-    challenges: &Array<C, Ext<C::F, C::EF>>,
-    n_challenges: usize,
-) -> Array<C, Ext<C::F, C::EF>> {
-    let r = builder.dyn_array(n_challenges + 2);
-
-    let alpha = builder.get(challenges, 0);
-    let beta = builder.get(challenges, 1);
-
-    builder.set(&r, 0, alpha);
-    builder.set(&r, 1, beta);
-
-    // TODO: skip if n_challenges <= 2
-    transcript_observe_label(builder, challenger, b"layer challenge");
-    let c = gen_alpha_pows(builder, challenger, Usize::from(n_challenges));
-
-    for i in 0..n_challenges {
-        let idx = i + 2;
-        let e = builder.get(&c, i);
-        builder.set(&r, idx, e);
-    }
-
-    r
-}
-
 pub fn verify_ecc_proof<C: Config>(
     builder: &mut Builder<C>,
     challenger: &mut DuplexChallengerVariable<C>,

ceno_zkvm/Cargo.toml

@@ -75,7 +75,13 @@ glob = "0.3"
 
 [features]
 bigint-rug = ["sp1-curves/bigint-rug"]
-default = ["forbid_overflow", "nightly-features", "u16limb_circuit", "parallel", "bigint-rug"]
+default = [
+  "forbid_overflow",
+  "nightly-features",
+  "u16limb_circuit",
+  "parallel",
+  "bigint-rug",
+]
 flamegraph = ["pprof2/flamegraph", "pprof2/criterion"]
 forbid_overflow = []
 goldilocks = ["forbid_overflow", "nightly-features", "parallel", "bigint-rug"]
@@ -91,7 +97,12 @@ nightly-features = [
   "transcript/nightly-features",
   "witness/nightly-features",
 ]
-parallel = ["whir/parallel", "p3/parallel", "multilinear_extensions/parallel", "mpcs/parallel"]
+parallel = [
+  "whir/parallel",
+  "p3/parallel",
+  "multilinear_extensions/parallel",
+  "mpcs/parallel",
+]
 sanity-check = ["mpcs/sanity-check"]
 u16limb_circuit = ["ceno_emul/u16limb_circuit"]
 

ceno_zkvm/src/instructions.rs

@@ -65,7 +65,7 @@ pub trait Instruction<E: ExtensionField> {
                 // zero_record
                 (0..zero_len).collect_vec(),
             ],
-            Chip::new_from_cb(cb, 0),
+            Chip::new_from_cb(cb),
         );
 
         // register selector to legacy constrain system
@@ -74,7 +74,7 @@ pub trait Instruction<E: ExtensionField> {
         cb.cs.lk_selector = Some(selector_type.clone());
         cb.cs.zero_selector = Some(selector_type.clone());
 
-        let layer = Layer::from_circuit_builder(cb, format!("{}_main", Self::name()), 0, out_evals);
+        let layer = Layer::from_circuit_builder(cb, format!("{}_main", Self::name()), out_evals);
         chip.add_layer(layer);
 
         Ok((config, chip.gkr_circuit()))

ceno_zkvm/src/instructions/riscv/ecall/fptower_fp.rs

@@ -292,8 +292,7 @@ fn build_fp_op_circuit<E: ExtensionField, P: FpOpField + NumWords>(
     );
 
     let (out_evals, mut chip) = layout.finalize(cb);
-    let layer =
-        Layer::from_circuit_builder(cb, layer_name.to_string(), layout.n_challenges, out_evals);
+    let layer = Layer::from_circuit_builder(cb, layer_name.to_string(), out_evals);
     chip.add_layer(layer);
 
     Ok((

ceno_zkvm/src/instructions/riscv/ecall/fptower_fp2_add.rs

@@ -210,8 +210,7 @@ fn build_fp2_add_circuit<E: ExtensionField, P: FpOpField + Fp2AddSpec + NumWords
     );
 
     let (out_evals, mut chip) = layout.finalize(cb);
-    let layer =
-        Layer::from_circuit_builder(cb, "fp2_add".to_string(), layout.n_challenges, out_evals);
+    let layer = Layer::from_circuit_builder(cb, "fp2_add".to_string(), out_evals);
     chip.add_layer(layer);
 
     Ok((

ceno_zkvm/src/instructions/riscv/ecall/fptower_fp2_mul.rs

@@ -208,8 +208,7 @@ fn build_fp2_mul_circuit<E: ExtensionField, P: FpOpField + Fp2MulSpec + NumWords
     );
 
     let (out_evals, mut chip) = layout.finalize(cb);
-    let layer =
-        Layer::from_circuit_builder(cb, "fp2_mul".to_string(), layout.n_challenges, out_evals);
+    let layer = Layer::from_circuit_builder(cb, "fp2_mul".to_string(), out_evals);
     chip.add_layer(layer);
 
     Ok((

ceno_zkvm/src/instructions/riscv/ecall/keccak.rs

@@ -134,7 +134,7 @@ impl<E: ExtensionField> Instruction<E> for KeccakInstruction<E> {
 
         let (out_evals, mut chip) = layout.finalize(cb);
 
-        let layer = Layer::from_circuit_builder(cb, Self::name(), layout.n_challenges, out_evals);
+        let layer = Layer::from_circuit_builder(cb, Self::name(), out_evals);
         chip.add_layer(layer);
 
         let circuit = chip.gkr_circuit();

ceno_zkvm/src/instructions/riscv/ecall/sha_extend.rs

@@ -132,7 +132,7 @@ impl<E: ExtensionField> Instruction<E> for ShaExtendInstruction<E> {
 
         let (out_evals, mut chip) = layout.finalize(cb);
 
-        let layer = Layer::from_circuit_builder(cb, Self::name(), layout.n_challenges, out_evals);
+        let layer = Layer::from_circuit_builder(cb, Self::name(), out_evals);
         chip.add_layer(layer);
 
         let circuit = chip.gkr_circuit();

ceno_zkvm/src/instructions/riscv/ecall/uint256.rs

@@ -179,12 +179,7 @@ impl<E: ExtensionField> Instruction<E> for Uint256MulInstruction<E> {
 
         let (out_evals, mut chip) = layout.finalize(cb);
 
-        let layer = Layer::from_circuit_builder(
-            cb,
-            "uint256_mul".to_string(),
-            layout.n_challenges,
-            out_evals,
-        );
+        let layer = Layer::from_circuit_builder(cb, "uint256_mul".to_string(), out_evals);
         chip.add_layer(layer);
 
         let circuit = chip.gkr_circuit();
@@ -508,7 +503,7 @@ impl<E: ExtensionField, Spec: Uint256InvSpec> Instruction<E> for Uint256InvInstr
 
         let (out_evals, mut chip) = layout.finalize(cb);
 
-        let layer = Layer::from_circuit_builder(cb, Spec::name(), layout.n_challenges, out_evals);
+        let layer = Layer::from_circuit_builder(cb, Spec::name(), out_evals);
         chip.add_layer(layer);
 
         let circuit = chip.gkr_circuit();

ceno_zkvm/src/instructions/riscv/ecall/weierstrass_add.rs

@@ -179,12 +179,7 @@ impl<E: ExtensionField, EC: EllipticCurve> Instruction<E>
 
         let (out_evals, mut chip) = layout.finalize(cb);
 
-        let layer = Layer::from_circuit_builder(
-            cb,
-            "weierstrass_add".to_string(),
-            layout.n_challenges,
-            out_evals,
-        );
+        let layer = Layer::from_circuit_builder(cb, "weierstrass_add".to_string(), out_evals);
         chip.add_layer(layer);
 
         let circuit = chip.gkr_circuit();