From 813600e6c92a13ba1945b28b6c1cb61d8c4da43b Mon Sep 17 00:00:00 2001
From: Yiannis M <psyberbits@gmail.com>
Date: Wed, 21 Dec 2022 16:44:42 +0200
Subject: [PATCH] fix: Add `openssl` and `rustls` feature flags in
 ethers-middleware (#1961)

* fix: ethers-middleware: Add `openssl` and `rustls` feature flags

* fix: ethers-contract-derive: Disable default features of ethers-contract-abigen

Without this fix, `rustls` was enabled by default even if user had `openssl` feature flag
---
 CHANGELOG.md                                      | 2 ++
 Cargo.toml                                        | 2 ++
 ethers-contract/ethers-contract-derive/Cargo.toml | 2 +-
 ethers-middleware/Cargo.toml                      | 6 +++++-
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88e51cc4..ba768abc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -341,6 +341,8 @@
 
 ### Unreleased
 
+- Added `openssl` and `rustls` feature flags
+  [#1961](https://github.com/gakonst/ethers-rs/pull/1961)
 - Relax Clone requirements when Arc<Middleware> is used
   [#1183](https://github.com/gakonst/ethers-rs/pull/1183)
 - Ensure a consistent chain ID between a Signer and Provider in SignerMiddleware
diff --git a/Cargo.toml b/Cargo.toml
index 3205a175..d0ec85e9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -63,12 +63,14 @@ eip712 = ["ethers-contract/eip712", "ethers-core/eip712"]
 ws = ["ethers-providers/ws"]
 ipc = ["ethers-providers/ipc"]
 rustls = [
+    "ethers-middleware/rustls",
     "ethers-providers/rustls",
     "ethers-etherscan/rustls",
     "ethers-contract/rustls",
     "ethers-solc/rustls",
 ]
 openssl = [
+    "ethers-middleware/openssl",
     "ethers-providers/openssl",
     "ethers-etherscan/openssl",
     "ethers-contract/openssl",
diff --git a/ethers-contract/ethers-contract-derive/Cargo.toml b/ethers-contract/ethers-contract-derive/Cargo.toml
index 85da947d..1c49c995 100644
--- a/ethers-contract/ethers-contract-derive/Cargo.toml
+++ b/ethers-contract/ethers-contract-derive/Cargo.toml
@@ -17,7 +17,7 @@ proc-macro = true
 
 [dependencies]
 ethers-core = { version = "^1.0.0", path = "../../ethers-core" }
-ethers-contract-abigen = { version = "^1.0.0", path = "../ethers-contract-abigen" }
+ethers-contract-abigen = { version = "^1.0.0", path = "../ethers-contract-abigen", default-features = false }
 
 serde_json = "1.0.53"
 hex = { version = "0.4.3", default-features = false, features = ["std"] }
diff --git a/ethers-middleware/Cargo.toml b/ethers-middleware/Cargo.toml
index 9fc5775c..0dc3e9d9 100644
--- a/ethers-middleware/Cargo.toml
+++ b/ethers-middleware/Cargo.toml
@@ -31,7 +31,7 @@ tracing = { version = "0.1.37", default-features = false }
 tracing-futures = { version = "0.2.5", default-features = false }
 
 # for gas oracles
-reqwest = { version = "0.11.13", default-features = false, features = ["json", "rustls-tls"] }
+reqwest = { version = "0.11.13", default-features = false, features = ["json"] }
 url = { version = "2.3.1", default-features = false }
 
 serde_json = { version = "1.0.64", default-features = false }
@@ -50,9 +50,13 @@ ethers-providers = { version = "^1.0.0", path = "../ethers-providers", default-f
 once_cell = "1.16.0"
 ethers-solc = { version = "^1.0.0", path = "../ethers-solc" }
 serial_test = "0.9.0"
+reqwest = { version = "0.11.13", default-features = false, features = ["json", "rustls"] }
 
 [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
 tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] }
 
 [features]
+default = ["rustls"]
 celo = ["ethers-core/celo", "ethers-providers/celo", "ethers-signers/celo", "ethers-contract/celo"]
+openssl = ["reqwest/native-tls"]
+rustls = ["reqwest/rustls-tls"]