Update zkevm circuits (including new hash scheme) and traces (#189)

* Update zkevm-circuits (include new hash scheme) and traces.

* minor fix

---------

Co-authored-by: Zhang Zhuo <mycinbrin@gmail.com>

.gitignore

@@ -9,6 +9,9 @@ target/
 .idea
 .vscode
 
+# macos
+.DS_store
+
 # for local config
 .cargo
 

prover/src/test_util.rs

@@ -12,7 +12,7 @@ pub fn parse_trace_path_from_mode(mode: &str) -> &'static str {
         "greeter" => "./tests/traces/greeter/setValue.json",
         "single" => "./tests/traces/erc20/1_transfer.json",
         "multiple" => "./tests/traces/erc20/10_transfer.json",
-        "multiswap" => "./tests/extra_traces/12_swap.json",
+        "multiswap" => "./tests/traces/multi_uniswapv2/router-swapExactTokensForTokens_34.json",
         "native" => "./tests/traces/native/transfer.json",
         "dao" => "./tests/traces/dao/dao-propose.json",
         "nft" => "./tests/traces/nft/mint.json",

prover/src/zkevm/circuit/builder.rs

@@ -28,8 +28,9 @@ use zkevm_circuits::{
     witness::WithdrawProof,
 };
 
-pub const SUB_CIRCUIT_NAMES: [&str; 11] = [
-    "evm", "state", "bytecode", "copy", "keccak", "tx", "rlp", "exp", "pi", "poseidon", "mpt",
+pub const SUB_CIRCUIT_NAMES: [&str; 14] = [
+    "evm", "state", "bytecode", "copy", "keccak", "tx", "rlp", "exp", "modexp", "pi", "poseidon",
+    "sig", "ecc", "mpt",
 ];
 
 // TODO: optimize it later

prover/tests/aggregation_tests.rs

@@ -23,6 +23,8 @@ fn test_agg_prove_verify() {
         .map(|i| format!("./tests/traces/bridge/{i:02}.json"))
         .collect();
 
+    let trace_paths = vec!["./tests/traces/erc20/10_transfer.json".to_string()];
+
     let chunk_hashes_proofs = gen_chunk_hashes_and_proofs(&output_dir, trace_paths.as_slice());
     log::info!("Generated chunk hashes and proofs");