Integration test & benchmark automation

Cargo.toml

@@ -14,7 +14,7 @@ members = [
 ]
 
 [patch.crates-io]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/taikoxyz/halo2.git", branch = "integration-dependency" }
 
 # Definition of benchmarks profile to use.
 [profile.bench]

bus-mapping/Cargo.toml

@@ -13,7 +13,7 @@ mock = { path = "../mock", optional = true }
 
 ethers-core = "=2.0.0"
 ethers-providers = "=2.0.0"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/taikoxyz/halo2.git", branch = "integration-dependency" }
 itertools = "0.10"
 lazy_static = "1.4"
 log = "0.4.14"
@@ -23,7 +23,7 @@ serde_json = "1.0.66"
 strum = "0.24"
 strum_macros = "0.24"
 
-revm-precompile = "2.0.2"
+revm-precompile = "2.0.3"
 
 [dev-dependencies]
 hex = "0.4.3"

circuit-benchmarks/Cargo.toml

@@ -7,9 +7,9 @@ license = "MIT OR Apache-2.0"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
-snark-verifier = { git = "https://github.com/brechtpd/snark-verifier.git", branch = "feat/add-sdk", default-features = false, features = ["loader_halo2", "system_halo2", "loader_evm", "parallel"] }
-snark-verifier-sdk = { git = "https://github.com/brechtpd/snark-verifier.git", branch = "feat/add-sdk", default-features = false, features = ["loader_halo2", "loader_evm", "parallel", "display", "halo2_circuit_params"] }
+halo2_proofs = { git = "https://github.com/taikoxyz/halo2.git", branch = "integration-dependency" }
+snark-verifier = { git = "https://github.com/taikoxyz/snark-verifier.git", branch = "integration-dependency", default-features = false, features = ["loader_halo2", "system_halo2", "loader_evm", "parallel"] }
+snark-verifier-sdk = { git = "https://github.com/taikoxyz/snark-verifier.git", branch = "integration-dependency", default-features = false, features = ["loader_halo2", "loader_evm", "parallel", "display", "halo2_circuit_params"] }
 
 ark-std = { version = "0.3", features = ["print-trace"] }
 zkevm-circuits = { path = "../zkevm-circuits", features = ["test"] }
@@ -28,5 +28,5 @@ serde_json = "*"
 hex = "0.4.3"
 
 [features]
-default = []
+default = ["benches"]
 benches = []

eth-types/Cargo.toml

@@ -10,7 +10,7 @@ ethers-core = "=2.0.0"
 ethers-signers = "=2.0.0"
 hex = "0.4"
 lazy_static = "1.4"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/taikoxyz/halo2.git", branch = "integration-dependency" }
 regex = "1.5.4"
 serde = { version = "1.0.130", features = ["derive"] }
 serde_json = "1.0.66"

gadgets/Cargo.toml

@@ -6,7 +6,7 @@ authors = ["The appliedzkp team"]
 license = "MIT OR Apache-2.0"
 
 [dependencies]
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/taikoxyz/halo2.git", branch = "integration-dependency" }
 sha3 = "0.7.2"
 eth-types = { path = "../eth-types" }
 digest = "0.7.6"

integration-tests/Cargo.toml

@@ -20,18 +20,19 @@ url = "2.2.2"
 pretty_assertions = "1.0.0"
 log = "0.4.14"
 env_logger = "0.9"
-halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_04_20" }
+halo2_proofs = { git = "https://github.com/taikoxyz/halo2.git", branch = "integration-dependency" }
 rand_chacha = "0.3"
 paste = "1.0"
 rand_xorshift = "0.3.0"
 rand_core = "0.6.4"
 mock = { path = "../mock" }
+cli-table = { version = "0.4"}
 
 [dev-dependencies]
 pretty_assertions = "1.0.0"
 
 [features]
-default = []
+default = ["circuit_input_builder"]
 rpc = []
 circuit_input_builder = []
 circuits = []

integration-tests/README.md

@@ -52,7 +52,7 @@ The following software needs to be installed to run the integration tests script
 ## How to run circuits for Taiko
 Block explorer URL is https://explorer.internal.taiko.xyz
 ```
-export GETH0_URL="https://rpc.internal.taiko.xyz"
+export GETH_L2_URL="https://rpc.internal.taiko.xyz"
 ./run.sh --steps tests --tests taiko_circuit_input_builder
 ./run.sh --steps tests --tests taiko_circuits::mock_prover
 ```

integration-tests/src/bin/gen_blockchain_data.rs

@@ -15,7 +15,7 @@ use ethers::{
 };
 use integration_tests::{
     get_client, get_provider, get_wallet, log_init, CompiledContract, GenDataOutput, CONTRACTS,
-    CONTRACTS_PATH,
+    CONTRACTS_PATH, GETH_L2_URL,
 };
 use log::{error, info};
 use std::{collections::HashMap, fs::File, path::Path, sync::Arc, thread::sleep, time::Duration};
@@ -110,7 +110,7 @@ async fn main() {
         contracts.insert(name.to_string(), compiled_contract);
     }
 
-    let prov = get_provider();
+    let prov = get_provider(&GETH_L2_URL);
 
     // Wait for geth to be online.
     loop {
@@ -164,7 +164,7 @@ async fn main() {
     //
 
     let mut deployments = HashMap::new();
-    let prov_wallet0 = Arc::new(SignerMiddleware::new(get_provider(), wallet0));
+    let prov_wallet0 = Arc::new(SignerMiddleware::new(get_provider(&GETH_L2_URL), wallet0));
 
     // Greeter
     let contract = deploy(
@@ -205,10 +205,15 @@ async fn main() {
     info!("Generating block with multiple transfers...");
     const NUM_TXS: usize = 4; // NUM_TXS must be >= 4 for the rest of the cases to work.
     let wallets: Vec<_> = (0..NUM_TXS + 1)
-        .map(|i| Arc::new(SignerMiddleware::new(get_provider(), get_wallet(i as u32))))
+        .map(|i| {
+            Arc::new(SignerMiddleware::new(
+                get_provider(&GETH_L2_URL),
+                get_wallet(i as u32),
+            ))
+        })
         .collect();
 
-    let cli = get_client();
+    let cli = get_client(&GETH_L2_URL);
 
     // Fund NUM_TXS wallets from coinbase
     cli.miner_stop().await.expect("cannot stop miner");