test: add more traces & bump zkevm-circuits version

Makefile

@@ -26,6 +26,9 @@ test-evm-trace: ## test evm circuit with real trace
 test-state-trace: ## test state circuit with real trace
 	@cargo test --features prove_verify --release test_state_prove_verify
 
+again:
+	MODE=dao cargo test --features prove_verify --release test_evm_prove_verify > 0624.dao.evm.txt 2>&1; MODE=dao cargo test --features prove_verify --release test_state_prove_verify > 0624.dao.state.txt 2>&1; MODE=nft cargo test --features prove_verify --release test_evm_prove_verify > 0624.nft.evm.txt 2>&1; MODE=nft cargo test --features prove_verify --release test_state_prove_verify > 0624.nft.state.txt 2>&1; MODE=sushi cargo test --features prove_verify --release test_evm_prove_verify > 0624.sushi.evm.txt 2>&1; MODE=sushi cargo test --features prove_verify --release test_state_prove_verify > 0624.sushi.state.txt 2>&1
+
 ## commented out for now, waiting for halo2 upstream upgrade
 # test-circuit-connect: ## test connect evm circuit & state circuit
 # 	@cargo test --features prove_verify --release test_state_evm_connect

types/Cargo.toml

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "16f6951c" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "d7dd50a" }
 base64 = "0.13.0"
 blake2 = "0.10.3"
 ethers-core = "0.6.0"

zkevm/Cargo.toml

@@ -8,9 +8,9 @@ edition = "2021"
 [dependencies]
 pairing = { git = 'https://github.com/appliedzkp/pairing', package = "pairing_bn256" }
 halo2_proofs = { git = "https://github.com/appliedzkp/halo2.git", tag = "v2022_05_09" }
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "16f6951c" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "16f6951c" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "16f6951c", features = ["test"] }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "d7dd50a" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "d7dd50a" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits", rev = "d7dd50a", features = ["test"] }
 rand = "0.8"
 rand_xorshift = "0.3"
 is-even = "1.0.0"

zkevm/tests/integration.rs

@@ -15,6 +15,9 @@ fn parse_trace_path_from_env(mode: &str) -> &'static str {
         "multiple" => "./tests/trace-multiple-erc20.json",
         "native" => "./tests/trace-native-transfer.json",
         "single" => "./tests/trace-single-erc20.json",
+        "dao" => "./tests/trace-dao.json",
+        "nft" => "./tests/trace-nft.json",
+        "sushi" => "./tests/trace-masterchef.json",
         _ => "./tests/trace-multiple-erc20.json",
     };
     log::info!("using mode {:?}, testing with {:?}", mode, trace_path);