From ff48254ade83cd050d4db059ec33a2c3d6e7a63c Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Fri, 19 Jul 2024 00:20:08 -0700 Subject: [PATCH 1/3] chore: change ethers imports --- Cargo.toml | 42 +++++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 162fcf8bfa..597b7b8abf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -12,7 +12,7 @@ members = [ "mock", "testool", "aggregator", - "prover" + "prover", ] resolver = "2" @@ -27,17 +27,25 @@ ark-std = "0.3" base64 = "0.13.0" ctor = "0.1" env_logger = "0.10" -ethers = { version = "=2.0.7", features = ["ethers-solc"] } -ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7", features = ["scroll"] } -ethers-providers = "=2.0.7" -ethers-signers = "=2.0.7" +ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } +ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7", features = [ + "scroll", +] } +ethers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } +ethers-signers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ff = "0.13" halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "v1.1" } -halo2curves = { version = "0.1.0", features = [ "derive_serde" ] } +halo2curves = { version = "0.1.0", features = ["derive_serde"] } poseidon-base = { package = "poseidon-base", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" } hash-circuit = { package = "poseidon-circuit", git = "https://github.com/scroll-tech/poseidon-circuit.git", branch = "main" } -halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] } -halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features=false, features=["halo2-pse","display"] } +halo2-base = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features = false, features = [ + "halo2-pse", + "display", +] } +halo2-ecc = { git = "https://github.com/scroll-tech/halo2-lib", branch = "develop", default-features = false, features = [ + "halo2-pse", + "display", +] } hex = "0.4" itertools = "0.11" libsecp256k1 = "0.7" @@ -52,19 +60,27 @@ rand_chacha = "0.3" rand_xorshift = "0.3" rayon = "1.5" regex = "1.5" -serde = {version = "1.0", features = ["derive"] } +serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_stacker = "0.1" sha3 = "0.10" snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" } -snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = ["loader_halo2", "loader_evm", "halo2-pse"] } +snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = [ + "loader_halo2", + "loader_evm", + "halo2-pse", +] } strum = "0.25" strum_macros = "0.25" subtle = "2.4" tokio = { version = "1.13", features = ["macros", "rt-multi-thread"] } url = "2.2" -revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40", default-features = false, features = ["std"] } # v40 -revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40", default-features = false, features = ["std"] } # v40 +revm-precompile = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40", default-features = false, features = [ + "std", +] } # v40 +revm-primitives = { git = "https://github.com/scroll-tech/revm", branch = "scroll-evm-executor/v40", default-features = false, features = [ + "std", +] } # v40 c-kzg = "1.0.2" [patch.crates-io] @@ -72,7 +88,7 @@ ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = " ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ethers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ethers-etherscan = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } -ethers-signers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } +ethers-signers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } gobuild = { git = "https://github.com/scroll-tech/gobuild.git" } halo2curves = { git = "https://github.com/scroll-tech/halo2curves", branch = "v0.1.0" } From 48db5d4e4074b9b2309f8fa3ba075f79743fc720 Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Fri, 19 Jul 2024 00:27:29 -0700 Subject: [PATCH 2/3] fix: remove features scroll from ethers-providers --- Cargo.lock | 1 - Cargo.toml | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7010a64f7f..3853f51cdd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1625,7 +1625,6 @@ version = "2.0.7" source = "git+https://github.com/scroll-tech/ethers-rs.git?branch=v2.0.7#e32dfd62e7cdec31160b91c5a646883594a586ba" dependencies = [ "ethers-core", - "ethers-solc", "reqwest", "semver 1.0.22", "serde", diff --git a/Cargo.toml b/Cargo.toml index 597b7b8abf..5b7710a164 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,9 +28,7 @@ base64 = "0.13.0" ctor = "0.1" env_logger = "0.10" ethers-core = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } -ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7", features = [ - "scroll", -] } +ethers-providers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ethers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ethers-signers = { git = "https://github.com/scroll-tech/ethers-rs.git", branch = "v2.0.7" } ff = "0.13" From 101d05dfa0e09a77d43a933c204ffe34f2ad057c Mon Sep 17 00:00:00 2001 From: Jonathan Wang <31040440+jonathanpwang@users.noreply.github.com> Date: Fri, 19 Jul 2024 02:11:24 -0700 Subject: [PATCH 3/3] chore: snark-verifier default features false --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 5b7710a164..d8e81d1d87 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -62,7 +62,7 @@ serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" serde_stacker = "0.1" sha3 = "0.10" -snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop" } +snark-verifier = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false } snark-verifier-sdk = { git = "https://github.com/scroll-tech/snark-verifier", branch = "develop", default-features = false, features = [ "loader_halo2", "loader_evm",