refactor: disable "test" "mock" features in prover side to get rid of Go (#1347)

* remove some used functions in prover

* change state root to H256

* make external-tracer as dev-deps

* clean deps

* clean deps

* clean deps

* clean deps

* fix deps

* fix deps

* fmt

Author: lispc

aggregator/Cargo.toml

@@ -8,7 +8,7 @@ license.workspace = true
 
 eth-types = { path = "../eth-types" }
 gadgets = { path = "../gadgets" }
-zkevm-circuits = { path = "../zkevm-circuits" }
+zkevm-circuits = { path = "../zkevm-circuits", default-features=false, features = ["debug-annotations", "parallel_syn"] }
 
 ark-std.workspace = true
 ctor.workspace = true

aggregator/src/chunk.rs

@@ -156,11 +156,11 @@ impl ChunkInfo {
             .ctxs
             .last_key_value()
             .map(|(_, b_ctx)| b_ctx.state_root)
-            .unwrap_or(H256(block.prev_state_root.to_be_bytes()));
+            .unwrap_or(block.prev_state_root);
 
         Self {
             chain_id: block.chain_id,
-            prev_state_root: H256(block.prev_state_root.to_be_bytes()),
+            prev_state_root: block.prev_state_root,
             post_state_root,
             withdraw_root: H256(block.withdraw_root.to_be_bytes()),
             data_hash,

bus-mapping/Cargo.toml

@@ -6,9 +6,9 @@ license.workspace = true
 
 [dependencies]
 eth-types = { path = "../eth-types" }
-external-tracer = { path="../external-tracer" }
 gadgets = { path = "../gadgets" }
 mpt-zktrie = {path = "../zktrie"}
+external-tracer = { path="../external-tracer", optional = true }
 mock = { path = "../mock", optional = true }
 
 ethers-core.workspace = true
@@ -30,13 +30,15 @@ strum_macros.workspace = true
 revm-precompile.workspace = true
 
 [dev-dependencies]
+mock = { path = "../mock" }
+external-tracer = { path="../external-tracer" }
+
 hex.workspace = true
 pretty_assertions.workspace = true
 tokio.workspace = true
 url.workspace = true
 ctor.workspace = true
 env_logger.workspace = true
-mock = { path = "../mock" }
 rand.workspace = true
 rayon.workspace = true
 
@@ -54,4 +56,4 @@ rpc-legacy-tracer = []
 # For the trace obtained from erigon node, refund field is missed
 # and must be rebuild
 fix-refund = ["rpc-legacy-tracer"]
-retrace-tx = []
+retrace-tx = ["scroll", "external-tracer"]

bus-mapping/src/circuit_input_builder/block.rs

@@ -9,7 +9,7 @@ use crate::{
     operation::{OperationContainer, RWCounter},
     Error,
 };
-use eth_types::{Address, ToWord, Word, H256};
+use eth_types::{Address, Word, H256};
 use std::collections::{BTreeMap, HashMap};
 
 /// Context of a [`Block`] which can mutate in a [`Transaction`].
@@ -155,7 +155,7 @@ pub struct Blocks {
     /// Blocks inside this chunk
     pub blocks: BTreeMap<u64, Block>,
     /// State root of the previous block
-    pub prev_state_root: Word,
+    pub prev_state_root: H256,
     /// Withdraw root
     pub withdraw_root: Word,
     /// Withdraw roof of the previous block
@@ -237,10 +237,10 @@ impl Blocks {
     }
 
     /// State root after all blocks in this chunk
-    pub fn end_state_root(&self) -> Word {
+    pub fn end_state_root(&self) -> H256 {
         self.blocks
             .last_key_value()
-            .map(|(_, blk)| blk.state_root.to_word())
+            .map(|(_, blk)| blk.state_root)
             .unwrap_or(self.prev_state_root)
     }
 

bus-mapping/src/circuit_input_builder/builder_client.rs

@@ -6,7 +6,6 @@ use eth_types::{
     Address, EthBlock, GethExecTrace, ToWord, Word, H256, KECCAK_CODE_HASH_EMPTY,
 };
 use ethers_providers::JsonRpcClient;
-use external_tracer::TraceConfig;
 use hex::decode_to_slice;
 
 use super::{AccessSet, Block, Blocks, CircuitInputBuilder, CircuitsParams};
@@ -331,6 +330,8 @@ impl<P: JsonRpcClient> BuilderClient<P> {
     }
 
     /// Perform all the steps to generate the circuit inputs
+    #[allow(unused_mut)]
+    #[allow(unused_variables)]
     pub async fn gen_inputs(
         &self,
         block_num: u64,
@@ -344,13 +345,16 @@ impl<P: JsonRpcClient> BuilderClient<P> {
         let (mut eth_block, mut geth_traces, history_hashes, prev_state_root) =
             self.get_block(block_num).await?;
 
-        let builder = if cfg!(feature = "retrace-tx") {
+        #[cfg(feature = "retrace-tx")]
+        let builder = {
             let trace_config = self
                 .get_trace_config(&eth_block, geth_traces.iter(), false)
                 .await?;
 
             self.trace_to_builder(&eth_block, &trace_config)?
-        } else {
+        };
+        #[cfg(not(feature = "retrace-tx"))]
+        let builder = {
             let (proofs, codes) = self.get_pre_state(geth_traces.iter())?;
             let proofs = self.complete_prestate(&eth_block, proofs).await?;
             let (state_db, code_db) = Self::build_state_code_db(proofs, codes);
@@ -424,13 +428,16 @@ impl<P: JsonRpcClient> BuilderClient<P> {
 
         eth_block.transactions = vec![tx.clone()];
 
-        let builder = if cfg!(feature = "retrace-tx") {
+        #[cfg(feature = "retrace-tx")]
+        let builder = {
             let trace_config = self
                 .get_trace_config(&eth_block, iter::once(&geth_trace), true)
                 .await?;
 
             self.trace_to_builder(&eth_block, &trace_config)?
-        } else {
+        };
+        #[cfg(not(feature = "retrace-tx"))]
+        let builder = {
             let (proofs, codes) = self.get_pre_state(iter::once(&geth_trace))?;
             let proofs = self.complete_prestate(&eth_block, proofs).await?;
             let (state_db, code_db) = Self::build_state_code_db(proofs, codes);
@@ -447,12 +454,13 @@ impl<P: JsonRpcClient> BuilderClient<P> {
         Ok(builder)
     }
 
+    #[cfg(feature = "retrace-tx")]
     async fn get_trace_config(
         &self,
         eth_block: &EthBlock,
         geth_traces: impl Iterator<Item = &GethExecTrace>,
         complete_prestate: bool,
-    ) -> Result<TraceConfig, Error> {
+    ) -> Result<external_tracer::TraceConfig, Error> {
         let (proofs, codes) = self.get_pre_state(geth_traces)?;
         let proofs = if complete_prestate {
             self.complete_prestate(eth_block, proofs).await?
@@ -466,7 +474,7 @@ impl<P: JsonRpcClient> BuilderClient<P> {
         //let difficulty = eth_block.difficulty;
         let difficulty = Word::zero();
 
-        Ok(TraceConfig {
+        Ok(external_tracer::TraceConfig {
             chain_id: self.chain_id,
             history_hashes: vec![eth_block.parent_hash.to_word()],
             block_constants: BlockConstants {
@@ -510,11 +518,11 @@ impl<P: JsonRpcClient> BuilderClient<P> {
         })
     }
 
-    #[cfg(feature = "scroll")]
+    #[cfg(feature = "retrace-tx")]
     fn trace_to_builder(
         &self,
         _eth_block: &EthBlock,
-        trace_config: &TraceConfig,
+        trace_config: &external_tracer::TraceConfig,
     ) -> Result<CircuitInputBuilder, Error> {
         let block_trace = external_tracer::l2trace(trace_config)?;
         let mut builder =
@@ -525,7 +533,8 @@ impl<P: JsonRpcClient> BuilderClient<P> {
         Ok(builder)
     }
 
-    #[cfg(not(feature = "scroll"))]
+    /*
+    // Seems useless?
     fn trace_to_builder(
         &self,
         eth_block: &EthBlock,
@@ -545,4 +554,5 @@ impl<P: JsonRpcClient> BuilderClient<P> {
         builder.handle_block(eth_block, &geth_traces)?;
         Ok(builder)
     }
+    */
 }

bus-mapping/src/circuit_input_builder/l2.rs

@@ -172,7 +172,7 @@ impl CircuitInputBuilder {
         }
 
         let mut builder_block = circuit_input_builder::Blocks::init(chain_id, circuits_params);
-        builder_block.prev_state_root = old_root.to_word();
+        builder_block.prev_state_root = old_root;
         builder_block.start_l1_queue_index = l2_trace.start_l1_queue_index;
         let mut builder = Self {
             sdb,

bus-mapping/src/mock.rs

@@ -40,7 +40,7 @@ impl BlockData {
         let mut block = Blocks::init(self.chain_id, Default::default());
         block.blocks.insert(header.number.as_u64(), header);
         // FIXME: better fetch a real state root instead of a mock one
-        block.prev_state_root = MOCK_OLD_STATE_ROOT.into();
+        block.prev_state_root = H256::from_low_u64_be(MOCK_OLD_STATE_ROOT);
         block.circuits_params = self.circuits_params;
         CircuitInputBuilder::new(self.sdb.clone(), self.code_db.clone(), &block)
     }

prover/Cargo.toml

@@ -8,7 +8,7 @@ license.workspace = true
 halo2_proofs.workspace = true
 
 aggregator = { path = "../aggregator" }
-bus-mapping = { path = "../bus-mapping" }
+bus-mapping = { path = "../bus-mapping", default-features = false }
 eth-types = { path = "../eth-types" }
 mpt-zktrie = { path = "../zktrie" }
 zkevm-circuits = { path = "../zkevm-circuits", default-features = false }

prover/src/io.rs

@@ -1,10 +1,9 @@
 use anyhow;
 use halo2_proofs::{
-    halo2curves::bn256::{Fq, Fr, G1Affine},
+    halo2curves::bn256::{Fr, G1Affine},
     plonk::{Circuit, VerifyingKey},
     SerdeFormat,
 };
-use num_bigint::BigUint;
 use snark_verifier::util::arithmetic::PrimeField;
 use snark_verifier_sdk::Snark;
 use std::{
@@ -93,53 +92,6 @@ pub fn deserialize_vk<C: Circuit<Fr>>(raw_vk: &[u8]) -> VerifyingKey<G1Affine> {
         .unwrap()
 }
 
-pub fn write_verify_circuit_vk(folder: &mut PathBuf, verify_circuit_vk: &[u8]) {
-    folder.push("verify_circuit.vkey");
-    let mut fd = std::fs::File::create(folder.as_path()).unwrap();
-    folder.pop();
-    fd.write_all(verify_circuit_vk).unwrap()
-}
-
-pub fn field_to_bn(f: &Fq) -> BigUint {
-    BigUint::from_bytes_le(&f.to_bytes())
-}
-
-pub fn serialize_commitments(buf: &[Vec<G1Affine>]) -> Vec<u8> {
-    let mut result = Vec::<u8>::new();
-    let mut fd = Cursor::new(&mut result);
-    let to_bytes_be = |x: &BigUint| {
-        let mut buf = x.to_bytes_le();
-        buf.resize(32, 0u8);
-        buf.reverse();
-        buf
-    };
-    for v in buf {
-        for commitment in v {
-            let x = field_to_bn(&commitment.x);
-            let y = field_to_bn(&commitment.y);
-            let be = to_bytes_be(&x)
-                .into_iter()
-                .chain(to_bytes_be(&y).into_iter())
-                .collect::<Vec<_>>();
-            fd.write_all(&be).unwrap()
-        }
-    }
-    result
-}
-
-pub fn serialize_verify_circuit_final_pair(pair: &(G1Affine, G1Affine, Vec<Fr>)) -> Vec<u8> {
-    let mut result = Vec::<u8>::new();
-    let mut fd = Cursor::new(&mut result);
-    fd.write_all(&pair.0.x.to_bytes()).unwrap();
-    fd.write_all(&pair.0.y.to_bytes()).unwrap();
-    fd.write_all(&pair.1.x.to_bytes()).unwrap();
-    fd.write_all(&pair.1.y.to_bytes()).unwrap();
-    pair.2.iter().for_each(|scalar| {
-        fd.write_all(&scalar.to_bytes()).unwrap();
-    });
-    result
-}
-
 pub fn write_snark(file_path: &str, snark: &Snark) {
     log::debug!("write_snark to {file_path}");
     let mut fd = std::fs::File::create(file_path).unwrap();
@@ -175,15 +127,3 @@ pub fn load_instances(buf: &[u8]) -> Vec<Vec<Vec<Fr>>> {
         })
         .collect()
 }
-
-pub fn load_instances_flat(buf: &[u8]) -> Vec<Vec<Vec<Fr>>> {
-    let mut ret = vec![];
-    let cursor = &mut std::io::Cursor::new(buf);
-    let mut scalar_bytes = <Fr as PrimeField>::Repr::default();
-
-    while cursor.read_exact(scalar_bytes.as_mut()).is_ok() {
-        ret.push(Fr::from_bytes(&scalar_bytes).unwrap());
-    }
-
-    vec![vec![ret]]
-}

prover/src/zkevm/capacity_checker.rs

@@ -3,7 +3,7 @@ use bus_mapping::circuit_input_builder::{self, CircuitInputBuilder};
 use eth_types::{
     l2_types::BlockTrace,
     state_db::{CodeDB, StateDB},
-    ToWord, H256,
+    H256,
 };
 use halo2_proofs::halo2curves::bn256::Fr;
 use itertools::Itertools;
@@ -155,8 +155,7 @@ impl CircuitCapacityChecker {
                     .as_ref()
                     .map(|state| state.root())
                     .map(|root| H256(*root))
-                    .unwrap_or(trace.header.state_root)
-                    .to_word();
+                    .unwrap_or(trace.header.state_root);
                 // notice the trace has included all code required for builidng witness block,
                 // so we do not need to pick them from previous one, but we still keep the
                 // old codedb in previous run for some dedup work

zkevm-circuits/Cargo.toml

@@ -11,13 +11,13 @@ halo2_proofs.workspace = true
 num.workspace = true
 sha3.workspace = true
 array-init = "2.0.0"
-bus-mapping = { path = "../bus-mapping" }
+bus-mapping = { path = "../bus-mapping", default-features=false }
 either = "1.9"
 eth-types = { path = "../eth-types" }
 ff.workspace = true
 gadgets = { path = "../gadgets" }
 ethers-core.workspace = true
-ethers-signers = { workspace = true, optional = true }
+ethers-signers = { workspace = true }
 halo2-base.workspace = true
 halo2-ecc.workspace = true
 mock = { path = "../mock", optional = true }
@@ -55,7 +55,7 @@ paste = "1.0"
 
 [features]
 default = ["test", "test-circuits", "debug-annotations", "parallel_syn"]
-test = ["ethers-signers", "mock", "bus-mapping/test"]
+test = ["mock", "bus-mapping/test"]
 
 scroll = ["bus-mapping/scroll", "eth-types/scroll", "mock?/scroll", "zktrie", "poseidon-codehash"]
 

zkevm-circuits/src/evm_circuit.rs

@@ -278,6 +278,11 @@ impl<F: Field> EvmCircuit<F> {
         num_rows += 1;
         num_rows
     }
+
+    pub fn get_test_cicuit_from_block(block: Block) -> Self {
+        let fixed_table_tags = detect_fixed_table_tags(&block);
+        EvmCircuit::<F>::new_dev(block, fixed_table_tags)
+    }
 }
 
 const FIXED_TABLE_ROWS_NO_BITWISE: usize = 3659;

zkevm-circuits/src/evm_circuit/test.rs

@@ -28,10 +28,3 @@ pub(crate) fn rand_bytes_array<const N: usize>() -> [u8; N] {
 pub(crate) fn rand_word() -> Word {
     Word::from_big_endian(&rand_bytes_array::<32>())
 }
-
-impl<F: Field> EvmCircuit<F> {
-    pub fn get_test_cicuit_from_block(block: Block) -> Self {
-        let fixed_table_tags = detect_fixed_table_tags(&block);
-        EvmCircuit::<F>::new_dev(block, fixed_table_tags)
-    }
-}

zkevm-circuits/src/mpt_circuit.rs

@@ -86,7 +86,6 @@ impl SubCircuitConfig<Fr> for MptCircuitConfig<Fr> {
     }
 }
 
-#[cfg(any(feature = "test", test))]
 impl SubCircuit<Fr> for MptCircuit<Fr> {
     type Config = MptCircuitConfig<Fr>;
 

zkevm-circuits/src/pi_circuit.rs

@@ -1777,8 +1777,8 @@ impl<F: Field> PiCircuit<F> {
         block: &Block,
     ) -> Self {
         let chain_id = block.chain_id;
-        let prev_state_root_in_trie = H256(block.mpt_updates.old_root().to_be_bytes());
-        let prev_state_root_in_header = H256(block.prev_state_root.to_be_bytes());
+        let prev_state_root_in_trie = block.mpt_updates.old_root();
+        let prev_state_root_in_header = block.prev_state_root;
         assert_eq!(prev_state_root_in_trie, prev_state_root_in_header);
         let public_data = PublicData {
             max_txs,

zkevm-circuits/src/poseidon_circuit.rs

@@ -52,7 +52,6 @@ impl<F: Field> SubCircuitConfig<F> for PoseidonCircuitConfig<F> {
     }
 }
 
-#[cfg(any(feature = "test", test))]
 impl<F: Field> SubCircuit<F> for PoseidonCircuit<F> {
     type Config = PoseidonCircuitConfig<F>;