From f79913a0de58f0e6362548117ba24f201ee7b7fb Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Thu, 16 Mar 2023 22:09:27 +0100
Subject: [PATCH 1/2] fix: feature resolution

---
 Cargo.toml                                        | 14 ++++++++------
 ethers-contract/ethers-contract-abigen/Cargo.toml |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 7e70cb7e4..cc850ce1c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,6 +58,8 @@ default-members = [
     "ethers-solc",
 ]
 
+resolver = "2"
+
 [workspace.dependencies]
 # workspace crates
 ethers = { version = "2.0.0", path = "ethers", default-features = false }
@@ -77,11 +79,11 @@ ethers-derive-eip712 = { version = "2.0.0", path = "ethers-core/ethers-derive-ei
 # async / async utils
 tokio = "1.26"
 tokio-tungstenite = { version = "0.18.0", default-features = false }
-futures = { version = "0.3.27", default-features = false }
-futures-core = { version = "0.3.27", default-features = false }
-futures-util = { version = "0.3.27", default-features = false }
-futures-executor = { version = "0.3.27", default-features = false }
-futures-channel = { version = "0.3.27", default-features = false }
+futures = { version = "0.3.27", default-features = false, features = ["std"] }
+futures-core = "0.3.27"
+futures-util = "0.3.27"
+futures-executor = "0.3.27"
+futures-channel = "0.3.27"
 futures-locks = { version = "0.7.1", default-features = false }
 futures-timer = { version = "3.0.2", default-features = false, features = ["wasm-bindgen"] }
 pin-project = "1.0"
@@ -103,7 +105,7 @@ serde_json = "1.0"
 # macros
 proc-macro2 = "1.0"
 quote = "1.0"
-syn = "1.0"
+syn = { version = "1.0", features = ["extra-traits"] }
 async-trait = "0.1.66"
 auto_impl = "1.0"
 
diff --git a/ethers-contract/ethers-contract-abigen/Cargo.toml b/ethers-contract/ethers-contract-abigen/Cargo.toml
index 3c15c8a02..fdbb5a47d 100644
--- a/ethers-contract/ethers-contract-abigen/Cargo.toml
+++ b/ethers-contract/ethers-contract-abigen/Cargo.toml
@@ -30,7 +30,7 @@ ethers-core = { workspace = true, features = ["macros"] }
 
 proc-macro2.workspace = true
 quote.workspace = true
-syn = { workspace = true, features = ["full"] }
+syn.workspace = true
 prettyplease = "0.1.25"
 
 Inflector = "0.11"

From 73ebf722ac3e0034d6c25db8a86192fe728f681c Mon Sep 17 00:00:00 2001
From: DaniPopes <57450786+DaniPopes@users.noreply.github.com>
Date: Thu, 16 Mar 2023 22:21:55 +0100
Subject: [PATCH 2/2] docs: add comment explaining resolver

---
 Cargo.toml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Cargo.toml b/Cargo.toml
index cc850ce1c..ab7bf7ef1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,6 +58,8 @@ default-members = [
     "ethers-solc",
 ]
 
+# Explicitly set the resolver to version 2, which is the default for packages with edition >= 2021
+# https://doc.rust-lang.org/edition-guide/rust-2021/default-cargo-resolver.html
 resolver = "2"
 
 [workspace.dependencies]