refactor codes to be compatible with "use scroll l2 trace for super circuit testing in zkevm-circuits" feature

Cargo.toml

@@ -3,6 +3,7 @@ members = [
     "bin",
     "prover",
     "types",
+    "run-testnet",
 ]
 
 [patch.crates-io]

Dockerfile.run_testnet

@@ -0,0 +1,15 @@
+FROM scrolltech/go-rust-builder as builder
+
+RUN mkdir -p /root/src
+ADD . /root/src
+RUN cd /root/src/run-testnet && cargo build --release --bin testnet-runner
+RUN cd /root/src/target/release && find -name libzktrie.so | xargs -I {} cp {} /root/src/target/release
+
+FROM builder
+
+COPY --from=builder /root/src/target/release/testnet-runner /bin/
+COPY --from=builder /root/src/run-testnet/run.sh /bin/testnet-runner.sh
+COPY --from=builder /root/src/target/release/libzktrie.so /usr/local/lib
+ENV LD_LIBRARY_PATH /usr/local/lib
+
+CMD testnet-runner.sh

prover/Cargo.toml

@@ -8,12 +8,12 @@ edition = "2021"
 [dependencies]
 halo2_proofs = { git = "https://github.com/privacy-scaling-explorations/halo2.git", tag = "v2023_02_02" }
 
-aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.7.5" }
-bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.7.5" }
-eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.7.5" }
-zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.7.5", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
-mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.7.5" }
-mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", tag = "v0.7.5" }
+aggregator = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
+bus-mapping = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
+eth-types = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
+zkevm-circuits = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop", default-features = false, features = ["test","scroll","scroll-trace","shanghai"] }
+mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
+mock = { git = "https://github.com/scroll-tech/zkevm-circuits.git", branch = "develop" }
 
 snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.2" }
 snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", tag = "v0.1.2" }

prover/src/utils.rs

@@ -24,7 +24,7 @@ use std::{
     str::FromStr,
     sync::Once,
 };
-use types::eth::{BlockTrace, BlockTraceJsonRpcResult};
+use types::{eth::BlockTrace, BlockTraceJsonRpcResult};
 use zkevm_circuits::evm_circuit::witness::Block;
 
 pub static LOGGER: Once = Once::new();