From 9b81043a5322cf7653e27f7fdafc368c516d9b6a Mon Sep 17 00:00:00 2001
From: Matthias Seitz <matthias.seitz@outlook.de>
Date: Wed, 14 Jun 2023 21:58:39 +0200
Subject: [PATCH] chore(deps): move ethers to workspace deps (#3145)

---
 Cargo.toml                     |  8 +++++++-
 crates/net/eth-wire/Cargo.toml |  4 ++--
 crates/net/network/Cargo.toml  | 10 +++++-----
 crates/primitives/Cargo.toml   |  2 +-
 crates/rpc/rpc/Cargo.toml      |  2 +-
 crates/staged-sync/Cargo.toml  |  8 ++++----
 6 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 3c38e1da55..2865760063 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -78,7 +78,7 @@ revm = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
 revm-primitives = { git = "https://github.com/bluealloy/revm/", branch = "release/v25" }
 
 [workspace.dependencies]
-## eth
+## reth
 revm = { version = "3" }
 revm-primitives = "1.1"
 reth-primitives = { path = "./crates/primitives" }
@@ -92,6 +92,12 @@ reth-transaction-pool = { path = "./crates/transaction-pool" }
 reth-tasks = { path = "./crates/tasks" }
 reth-network-api = { path = "./crates/net/network-api" }
 
+## eth
+ethers-core = { version = "2.0.7", default-features = false }
+ethers-providers = { version = "2.0.7", default-features = false }
+ethers-signers = { version = "2.0.7", default-features = false }
+ethers-middleware = { version = "2.0.7", default-features = false }
+
 ## misc
 tracing = "^0.1.0"
 thiserror = "1.0.37"
diff --git a/crates/net/eth-wire/Cargo.toml b/crates/net/eth-wire/Cargo.toml
index bdb0ed5c63..f9acb39bac 100644
--- a/crates/net/eth-wire/Cargo.toml
+++ b/crates/net/eth-wire/Cargo.toml
@@ -27,7 +27,7 @@ reth-rlp = { workspace = true, features = [
 reth-metrics = { workspace = true }
 
 # used for Chain and builders
-ethers-core = { version = "2.0.7", default-features = false }
+ethers-core = { workspace = true, default-features = false }
 
 tokio = { workspace = true, features = ["full"] }
 tokio-util = { workspace = true, features = ["io", "codec"] }
@@ -47,7 +47,7 @@ proptest-derive = { version = "0.3", optional = true }
 [dev-dependencies]
 reth-primitives = { workspace = true, features = ["arbitrary"] }
 reth-tracing = { path = "../../tracing" }
-ethers-core = { version = "2.0.7", default-features = false }
+ethers-core = { workspace = true, default-features = false }
 
 test-fuzz = "3.0.4"
 tokio-util = { workspace = true, features = ["io", "codec"] }
diff --git a/crates/net/network/Cargo.toml b/crates/net/network/Cargo.toml
index cb1d909830..6b90bb35b0 100644
--- a/crates/net/network/Cargo.toml
+++ b/crates/net/network/Cargo.toml
@@ -60,7 +60,7 @@ rand = { workspace = true }
 secp256k1 = { workspace = true, features = ["global-context", "rand-std", "recovery"] }
 
 enr = { version = "0.8.1", features = ["rust-secp256k1"], optional = true }
-ethers-core = { version = "2.0.7", default-features = false, optional = true }
+ethers-core = { workspace = true, default-features = false, optional = true }
 tempfile = { version = "3.3", optional = true }
 
 [dev-dependencies]
@@ -76,10 +76,10 @@ reth-provider = { workspace = true, features = ["test-utils"] }
 reth-tracing = { path = "../../tracing" }
 reth-transaction-pool = { workspace = true, features = ["test-utils"] }
 
-ethers-core = { version = "2.0.7", default-features = false }
-ethers-providers = { version = "2.0.7", default-features = false }
-ethers-signers = { version = "2.0.7", default-features = false }
-ethers-middleware = { version = "2.0.7", default-features = false }
+ethers-core = { workspace = true, default-features = false }
+ethers-providers = { workspace = true, default-features = false }
+ethers-signers = { workspace = true, default-features = false }
+ethers-middleware = { workspace = true, default-features = false }
 
 enr = { version = "0.8.1", features = ["serde", "rust-secp256k1"] }
 
diff --git a/crates/primitives/Cargo.toml b/crates/primitives/Cargo.toml
index a47af1c201..0efed1faa7 100644
--- a/crates/primitives/Cargo.toml
+++ b/crates/primitives/Cargo.toml
@@ -17,7 +17,7 @@ reth-codecs = { version = "0.1.0", path = "../storage/codecs" }
 revm-primitives = { workspace = true, features = ["serde"] }
 
 # ethereum
-ethers-core = { version = "2.0.7", default-features = false }
+ethers-core = { workspace = true, default-features = false }
 tiny-keccak = { version = "2.0", features = ["keccak"] }
 crunchy = { version = "0.2.2", default-features = false, features = ["limit_256"] }
 ruint = { version = "1.7.0", features = ["primitive-types", "rlp"] }
diff --git a/crates/rpc/rpc/Cargo.toml b/crates/rpc/rpc/Cargo.toml
index b39f3e6a6d..0cf7a4f833 100644
--- a/crates/rpc/rpc/Cargo.toml
+++ b/crates/rpc/rpc/Cargo.toml
@@ -29,7 +29,7 @@ revm = { workspace = true, features = [
     "optional_eip3607",
     "optional_no_base_fee",
 ] }
-ethers-core = { version = "2.0.7", features = ["eip712"] }
+ethers-core = { workspace = true, features = ["eip712"] }
 revm-primitives = { workspace = true, features = ["serde"] }
 
 # rpc
diff --git a/crates/staged-sync/Cargo.toml b/crates/staged-sync/Cargo.toml
index f0e98d8257..ebdbed6eb7 100644
--- a/crates/staged-sync/Cargo.toml
+++ b/crates/staged-sync/Cargo.toml
@@ -42,12 +42,12 @@ thiserror = { workspace = true }
 enr = { version = "0.8.1", features = ["serde", "rust-secp256k1"], optional = true }
 
 # ethers
-ethers-core = { version = "2.0.7", default-features = false, optional = true }
-ethers-providers = { version = "2.0.7", features = [
+ethers-core = { workspace = true, default-features = false, optional = true }
+ethers-providers = { workspace = true, features = [
     "ws",
 ], default-features = false, optional = true }
-ethers-middleware = { version = "2.0.7", default-features = false, optional = true }
-ethers-signers = { version = "2.0.7", default-features = false, optional = true }
+ethers-middleware = { workspace = true, default-features = false, optional = true }
+ethers-signers = { workspace = true, default-features = false, optional = true }
 
 # async / futures
 async-trait = { workspace = true, optional = true }