From 2d603d5175e059f64d10ae07960f05f8d0045c8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Zwoli=C5=84ski?= <mac.zwolinski@gmail.com>
Date: Mon, 21 Aug 2023 11:51:05 +0200
Subject: [PATCH] chore: switch to upstream ethers for
 gakonst/ethers-rs/pull/2536 (#37)

---
 Cargo.lock | 55 +++++++++++++++++++++++++++++++++++++++++++-----------
 Cargo.toml |  9 +++++----
 2 files changed, 49 insertions(+), 15 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8568ffb..29ddf95 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -479,7 +479,7 @@ dependencies = [
  "logos",
  "num-bigint",
  "num-traits",
- "num_enum",
+ "num_enum 0.6.1",
  "paste",
  "pretty",
  "serde",
@@ -647,6 +647,18 @@ dependencies = [
  "toml 0.5.11",
 ]
 
+[[package]]
+name = "const-hex"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca268df6cd88e646b564e6aff1a016834e5f42077c736ef6b6789c31ef9ec5dc"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "hex",
+ "serde",
+]
+
 [[package]]
 name = "const-oid"
 version = "0.9.4"
@@ -1060,13 +1072,13 @@ dependencies = [
 [[package]]
 name = "ethers-contract"
 version = "2.0.8"
-source = "git+https://github.com/oblique/ethers-rs?rev=3740d34#3740d349ff78107547941c7e122156cd0eaf1c25"
+source = "git+https://github.com/gakonst/ethers-rs?rev=179891d#179891d45cc7b50941f2b8c30b206355ab76d94c"
 dependencies = [
+ "const-hex",
  "ethers-contract-abigen",
  "ethers-contract-derive",
  "ethers-core",
  "futures-util",
- "hex",
  "once_cell",
  "pin-project",
  "serde",
@@ -1077,13 +1089,13 @@ dependencies = [
 [[package]]
 name = "ethers-contract-abigen"
 version = "2.0.8"
-source = "git+https://github.com/oblique/ethers-rs?rev=3740d34#3740d349ff78107547941c7e122156cd0eaf1c25"
+source = "git+https://github.com/gakonst/ethers-rs?rev=179891d#179891d45cc7b50941f2b8c30b206355ab76d94c"
 dependencies = [
  "Inflector",
+ "const-hex",
  "dunce",
  "ethers-core",
  "eyre",
- "hex",
  "prettyplease",
  "proc-macro2",
  "quote",
@@ -1098,12 +1110,12 @@ dependencies = [
 [[package]]
 name = "ethers-contract-derive"
 version = "2.0.8"
-source = "git+https://github.com/oblique/ethers-rs?rev=3740d34#3740d349ff78107547941c7e122156cd0eaf1c25"
+source = "git+https://github.com/gakonst/ethers-rs?rev=179891d#179891d45cc7b50941f2b8c30b206355ab76d94c"
 dependencies = [
  "Inflector",
+ "const-hex",
  "ethers-contract-abigen",
  "ethers-core",
- "hex",
  "proc-macro2",
  "quote",
  "serde_json",
@@ -1113,18 +1125,18 @@ dependencies = [
 [[package]]
 name = "ethers-core"
 version = "2.0.8"
-source = "git+https://github.com/oblique/ethers-rs?rev=3740d34#3740d349ff78107547941c7e122156cd0eaf1c25"
+source = "git+https://github.com/gakonst/ethers-rs?rev=179891d#179891d45cc7b50941f2b8c30b206355ab76d94c"
 dependencies = [
  "arrayvec 0.7.4",
  "bytes",
  "cargo_metadata",
  "chrono",
+ "const-hex",
  "elliptic-curve",
  "ethabi",
  "generic-array",
- "hex",
  "k256",
- "num_enum",
+ "num_enum 0.7.0",
  "once_cell",
  "open-fastrlp",
  "rand 0.8.5",
@@ -2394,7 +2406,16 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
 dependencies = [
- "num_enum_derive",
+ "num_enum_derive 0.6.1",
+]
+
+[[package]]
+name = "num_enum"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
+dependencies = [
+ "num_enum_derive 0.7.0",
 ]
 
 [[package]]
@@ -2409,6 +2430,18 @@ dependencies = [
  "syn 2.0.28",
 ]
 
+[[package]]
+name = "num_enum_derive"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.28",
+]
+
 [[package]]
 name = "object"
 version = "0.31.1"
diff --git a/Cargo.toml b/Cargo.toml
index fbfafd3..a991ec6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,8 @@ lto = true
 codegen-units = 1
 
 [patch.crates-io]
-ethers-contract = { git = "https://github.com/oblique/ethers-rs", rev = "3740d34" }
-ethers-contract-abigen = { git = "https://github.com/oblique/ethers-rs", rev = "3740d34" }
-ethers-contract-derive = { git = "https://github.com/oblique/ethers-rs", rev = "3740d34" }
-ethers-core = { git = "https://github.com/oblique/ethers-rs", rev = "3740d34" }
+# needed before ethers release a next version (current 2.0.8)
+ethers-contract = { git = "https://github.com/gakonst/ethers-rs", rev = "179891d" }
+ethers-contract-abigen = { git = "https://github.com/gakonst/ethers-rs", rev = "179891d" }
+ethers-contract-derive = { git = "https://github.com/gakonst/ethers-rs", rev = "179891d" }
+ethers-core = { git = "https://github.com/gakonst/ethers-rs", rev = "179891d" }