From 89330cfba06eafec0ce3035abe603d8de9d5692c Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Fri, 23 Jun 2023 22:23:51 -0700 Subject: [PATCH] upstream ethers again --- Cargo.lock | 34 ++++++++++++++++++++++------------ entities/Cargo.toml | 3 +-- payment-contracts/Cargo.toml | 5 ++--- web3_proxy/Cargo.toml | 5 ++++- 4 files changed, 29 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f306781..e89a7b84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1828,7 +1828,8 @@ dependencies = [ [[package]] name = "ethers" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a58ce802c65cf3d0756dee5a61094a92cde53c1583b246e9ee5b37226c7fc15" dependencies = [ "ethers-addressbook", "ethers-contract", @@ -1843,7 +1844,8 @@ dependencies = [ [[package]] name = "ethers-addressbook" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b856b7b8ff5c961093cb8efe151fbcce724b451941ce20781de11a531ccd578" dependencies = [ "ethers-core", "once_cell", @@ -1854,13 +1856,13 @@ dependencies = [ [[package]] name = "ethers-contract" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e066a0d9cfc70c454672bf16bb433b0243427420076dc5b2f49c448fb5a10628" dependencies = [ "ethers-contract-abigen", "ethers-contract-derive", "ethers-core", "ethers-providers", - "ethers-signers", "futures-util", "hex", "once_cell", @@ -1873,7 +1875,8 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c113e3e86b6bc16d98484b2c3bb2d01d6fed9f489fe2e592e5cc87c3024d616b" dependencies = [ "Inflector", "dunce", @@ -1896,7 +1899,8 @@ dependencies = [ [[package]] name = "ethers-contract-derive" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3fb5adee25701c79ec58fcf2c63594cd8829bc9ad6037ff862d5a111101ed2" dependencies = [ "Inflector", "ethers-contract-abigen", @@ -1911,7 +1915,8 @@ dependencies = [ [[package]] name = "ethers-core" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6da5fa198af0d3be20c19192df2bd9590b92ce09a8421e793bec8851270f1b05" dependencies = [ "arrayvec", "bytes", @@ -1940,7 +1945,8 @@ dependencies = [ [[package]] name = "ethers-etherscan" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84ebb401ba97c6f5af278c2c9936c4546cad75dec464b439ae6df249906f4caa" dependencies = [ "ethers-core", "reqwest", @@ -1954,7 +1960,8 @@ dependencies = [ [[package]] name = "ethers-middleware" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "740f4a773c19dd6d6a68c8c2e0996c096488d38997d524e21dc612c55da3bd24" dependencies = [ "async-trait", "auto_impl", @@ -1980,7 +1987,8 @@ dependencies = [ [[package]] name = "ethers-providers" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56b498fd2a6c019d023e43e83488cd1fb0721f299055975aa6bac8dbf1e95f2c" dependencies = [ "async-trait", "auto_impl", @@ -2016,7 +2024,8 @@ dependencies = [ [[package]] name = "ethers-signers" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "02c4b7e15f212fa7cc2e1251868320221d4ff77a3d48068e69f47ce1c491df2d" dependencies = [ "async-trait", "coins-bip32", @@ -2034,7 +2043,8 @@ dependencies = [ [[package]] name = "ethers-solc" version = "2.0.7" -source = "git+https://github.com/llamanodes/ethers-rs/?rev=eb68f5d60850008cd302762bd3a5a4bdcfecc713#eb68f5d60850008cd302762bd3a5a4bdcfecc713" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a81c89f121595cf8959e746045bb8b25a6a38d72588561e1a3b7992fc213f674" dependencies = [ "cfg-if", "dunce", diff --git a/entities/Cargo.toml b/entities/Cargo.toml index 459f573a..722f19ca 100644 --- a/entities/Cargo.toml +++ b/entities/Cargo.toml @@ -10,8 +10,7 @@ path = "src/mod.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ethers = { git = "https://github.com/llamanodes/ethers-rs/", rev = "eb68f5d60850008cd302762bd3a5a4bdcfecc713", default-features = false } - +ethers = { version = "2.0.7", default-features = false } sea-orm = "0.11.3" serde = "1.0.164" ulid = "1.0.0" diff --git a/payment-contracts/Cargo.toml b/payment-contracts/Cargo.toml index f8c233b4..8a27e93c 100644 --- a/payment-contracts/Cargo.toml +++ b/payment-contracts/Cargo.toml @@ -6,9 +6,8 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -ethers = { git = "https://github.com/llamanodes/ethers-rs/", rev = "eb68f5d60850008cd302762bd3a5a4bdcfecc713", default-features = false } - +ethers = { version = "2.0.7", default-features = false } glob = "0.3.1" [dependencies] -ethers = { git = "https://github.com/llamanodes/ethers-rs/", rev = "eb68f5d60850008cd302762bd3a5a4bdcfecc713", default-features = false } +ethers = { version = "2.0.7", default-features = false } diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index 16ad58ce..e98ec5b6 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -22,9 +22,10 @@ migration = { path = "../migration" } payment-contracts = { path = "../payment-contracts" } redis-rate-limiter = { path = "../redis-rate-limiter" } -ethers = { git = "https://github.com/llamanodes/ethers-rs/", rev = "eb68f5d60850008cd302762bd3a5a4bdcfecc713", default-features = false, features = ["rustls", "ws"] } +#ethers = { git = "https://github.com/llamanodes/ethers-rs/", rev = "eb68f5d60850008cd302762bd3a5a4bdcfecc713", default-features = false, features = ["rustls", "ws"] } influxdb2 = { git = "https://github.com/llamanodes/influxdb2", features = ["rustls"], rev = "2d125128696a29d7e0b9abc052c928937e7c0579" } influxdb2-structmap = { git = "https://github.com/llamanodes/influxdb2/", rev = "2d125128696a29d7e0b9abc052c928937e7c0579"} +#siwe = { git = "https://github.com/llamanodes/siwe-rs", rev = "bef5449b5dd8beb4e9fc697f09cd6dd11ba8f6e6", features = ["ethers", "serde"] } # TODO: regex has several "perf" features that we might want to use # TODO: make sure this uuid version matches sea-orm. PR to put this in their prelude @@ -33,6 +34,7 @@ influxdb2-structmap = { git = "https://github.com/llamanodes/influxdb2/", rev = # TODO: make sure this time version matches siwe. PR to put this in their prelude # TODO: rdkafka has a tracing feature # TODO: axum has a tracing feature +# TODO: siwe ha a ethers feature that is blocked by # TODO: hdrhistogram for automated tiers @@ -50,6 +52,7 @@ console-subscriber = { version = "0.1.9", features = ["env-filter", "parking_lot counter = "0.5.7" derive_more = { version = "0.99.17", features = ["nightly"] } ethbloom = { version = "0.13.0", features = ["serialize"] } +ethers = { version = "2.0.7", default-features = false, features = ["rustls", "ws"] } ewma = "0.1.1" fdlimit = "0.2.1" flume = "0.10.14"