impl CircuitExt for SuperCircuit

Author: lispc

Cargo.lock

@@ -38,7 +38,8 @@ libsecp256k1 = "0.7"
 num-bigint = { version = "0.4" }
 subtle = "2.4"
 rand_chacha = "0.3"
-snark-verifier = { git = "https://github.com/privacy-scaling-explorations/snark-verifier", tag = "v2023_02_02", default-features = false, features = ["loader_halo2", "system_halo2"] }
+snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "halo2-ecc-snark-verifier-0323" }
+snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "halo2-ecc-snark-verifier-0323", default-features=false, features = ["loader_halo2", "loader_evm", "halo2-pse"] }
 hex = "0.4.3"
 rayon = "1.5"
 once_cell = "1.17.0"

zkevm-circuits/Cargo.toml

@@ -27,7 +27,8 @@ pub mod mpt_circuit;
 pub mod pi_circuit;
 pub mod poseidon_circuit;
 pub mod rlp_circuit;
-pub mod root_circuit;
+// we don't use this for aggregation
+//pub mod root_circuit;
 pub mod state_circuit;
 pub mod super_circuit;
 pub mod table;

zkevm-circuits/src/lib.rs

@@ -94,6 +94,8 @@ use halo2_proofs::{
     circuit::{Layouter, SimpleFloorPlanner, Value},
     plonk::{Circuit, ConstraintSystem, Error, Expression},
 };
+use itertools::Itertools;
+use snark_verifier_sdk::CircuitExt;
 
 use crate::{
     pi_circuit::{PiCircuit, PiCircuitConfig, PiCircuitConfigArgs},
@@ -305,6 +307,8 @@ impl<F: Field> SubCircuitConfig<F> for SuperCircuitConfig<F> {
         if meta.max_phase() != 0 {
             log::warn!("max_phase: {}", meta.max_phase());
         }
+        // simple selector brings a lot of trouble when (de)serialize
+        debug_assert_eq!(meta.num_simple_selectors, 0);
 
         SuperCircuitConfig::<F> {
             block_table,
@@ -593,6 +597,23 @@ impl<
     }
 }
 
+impl<
+        F: Field,
+        const MAX_TXS: usize,
+        const MAX_CALLDATA: usize,
+        const MAX_INNER_BLOCKS: usize,
+        const MOCK_RANDOMNESS: u64,
+    > CircuitExt<F> for SuperCircuit<F, MAX_TXS, MAX_CALLDATA, MAX_INNER_BLOCKS, MOCK_RANDOMNESS>
+{
+    fn num_instance(&self) -> Vec<usize> {
+        self.instances().iter().map(|l| l.len()).collect_vec()
+    }
+
+    fn instances(&self) -> Vec<Vec<F>> {
+        self.instance()
+    }
+}
+
 impl<
         F: Field,
         const MAX_TXS: usize,