diff --git a/Cargo.lock b/Cargo.lock index fbeca1d9..fe0fed90 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -185,7 +185,7 @@ dependencies = [ "cfg-if", "color-eyre", "criterion", - "ethers-core 2.0.13 (git+https://github.com/gakonst/ethers-rs)", + "ethers-core 2.0.13", "fnv", "hex", "num", @@ -1308,7 +1308,7 @@ version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.48", @@ -2125,9 +2125,9 @@ dependencies = [ [[package]] name = "enr" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe81b5c06ecfdbc71dd845216f225f53b62a10cb8a16c946836a3467f701d05b" +checksum = "2a3d8dc56e02f954cac8eb489772c552c473346fc34f67412bb6244fd647f7e4" dependencies = [ "base64 0.21.7", "bytes", @@ -2147,7 +2147,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" dependencies = [ - "heck", + "heck 0.4.1", "proc-macro2", "quote", "syn 2.0.48", @@ -2293,13 +2293,13 @@ dependencies = [ [[package]] name = "ethers" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c7cd562832e2ff584fa844cd2f6e5d4f35bbe11b28c7c9b8df957b2e1d0c701" +checksum = "816841ea989f0c69e459af1cf23a6b0033b19a55424a1ea3a30099becdb8dec0" dependencies = [ "ethers-addressbook", "ethers-contract", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "ethers-etherscan", "ethers-middleware", "ethers-providers", @@ -2309,11 +2309,11 @@ dependencies = [ [[package]] name = "ethers-addressbook" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35dc9a249c066d17e8947ff52a4116406163cf92c7f0763cb8c001760b26403f" +checksum = "5495afd16b4faa556c3bba1f21b98b4983e53c1755022377051a975c3b021759" dependencies = [ - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "once_cell", "serde", "serde_json", @@ -2321,14 +2321,14 @@ dependencies = [ [[package]] name = "ethers-contract" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43304317c7f776876e47f2f637859f6d0701c1ec7930a150f169d5fbe7d76f5a" +checksum = "6fceafa3578c836eeb874af87abacfb041f92b4da0a78a5edd042564b8ecdaaa" dependencies = [ "const-hex", "ethers-contract-abigen", "ethers-contract-derive", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "ethers-providers", "futures-util", "once_cell", @@ -2340,14 +2340,14 @@ dependencies = [ [[package]] name = "ethers-contract-abigen" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f96502317bf34f6d71a3e3d270defaa9485d754d789e15a8e04a84161c95eb" +checksum = "04ba01fbc2331a38c429eb95d4a570166781f14290ef9fdb144278a90b5a739b" dependencies = [ "Inflector", "const-hex", "dunce", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "ethers-etherscan", "eyre", "prettyplease", @@ -2364,14 +2364,14 @@ dependencies = [ [[package]] name = "ethers-contract-derive" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "452ff6b0a64507ce8d67ffd48b1da3b42f03680dcf5382244e9c93822cbbf5de" +checksum = "87689dcabc0051cde10caaade298f9e9093d65f6125c14575db3fd8c669a168f" dependencies = [ "Inflector", "const-hex", "ethers-contract-abigen", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "proc-macro2", "quote", "serde_json", @@ -2381,12 +2381,10 @@ dependencies = [ [[package]] name = "ethers-core" version = "2.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aab3cef6cc1c9fd7f787043c81ad3052eff2b96a3878ef1526aa446311bdbfc9" +source = "git+https://github.com/gakonst/ethers-rs#4d267f763a19e42a09e92741e1489c123f852f53" dependencies = [ "arrayvec", "bytes", - "cargo_metadata", "chrono", "const-hex", "elliptic-curve", @@ -2394,14 +2392,12 @@ dependencies = [ "generic-array", "k256", "num_enum", - "once_cell", "open-fastrlp", "rand", "rlp", "serde", "serde_json", - "strum", - "syn 2.0.48", + "strum 0.25.0", "tempfile", "thiserror", "tiny-keccak", @@ -2410,11 +2406,13 @@ dependencies = [ [[package]] name = "ethers-core" -version = "2.0.13" -source = "git+https://github.com/gakonst/ethers-rs#4d267f763a19e42a09e92741e1489c123f852f53" +version = "2.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82d80cc6ad30b14a48ab786523af33b37f28a8623fc06afd55324816ef18fb1f" dependencies = [ "arrayvec", "bytes", + "cargo_metadata", "chrono", "const-hex", "elliptic-curve", @@ -2422,12 +2420,14 @@ dependencies = [ "generic-array", "k256", "num_enum", + "once_cell", "open-fastrlp", "rand", "rlp", "serde", "serde_json", - "strum", + "strum 0.26.3", + "syn 2.0.48", "tempfile", "thiserror", "tiny-keccak", @@ -2436,12 +2436,12 @@ dependencies = [ [[package]] name = "ethers-etherscan" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16d45b981f5fa769e1d0343ebc2a44cfa88c9bc312eb681b676318b40cef6fb1" +checksum = "e79e5973c26d4baf0ce55520bd732314328cabe53193286671b47144145b9649" dependencies = [ "chrono", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "reqwest", "semver 1.0.21", "serde", @@ -2452,14 +2452,14 @@ dependencies = [ [[package]] name = "ethers-middleware" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145211f34342487ef83a597c1e69f0d3e01512217a7c72cc8a25931854c7dca0" +checksum = "48f9fdf09aec667c099909d91908d5eaf9be1bd0e2500ba4172c1d28bfaa43de" dependencies = [ "async-trait", "auto_impl", "ethers-contract", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "ethers-etherscan", "ethers-providers", "ethers-signers", @@ -2479,9 +2479,9 @@ dependencies = [ [[package]] name = "ethers-providers" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb6b15393996e3b8a78ef1332d6483c11d839042c17be58decc92fa8b1c3508a" +checksum = "6434c9a33891f1effc9c75472e12666db2fa5a0fec4b29af6221680a6fe83ab2" dependencies = [ "async-trait", "auto_impl", @@ -2489,7 +2489,7 @@ dependencies = [ "bytes", "const-hex", "enr", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "futures-channel", "futures-core", "futures-timer", @@ -2518,9 +2518,9 @@ dependencies = [ [[package]] name = "ethers-signers" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3b125a103b56aef008af5d5fb48191984aa326b50bfd2557d231dc499833de3" +checksum = "228875491c782ad851773b652dd8ecac62cda8571d3bc32a5853644dd26766c2" dependencies = [ "async-trait", "coins-bip32", @@ -2528,7 +2528,7 @@ dependencies = [ "const-hex", "elliptic-curve", "eth-keystore", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "rand", "sha2", "thiserror", @@ -2537,15 +2537,15 @@ dependencies = [ [[package]] name = "ethers-solc" -version = "2.0.13" +version = "2.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d21df08582e0a43005018a858cc9b465c5fff9cf4056651be64f844e57d1f55f" +checksum = "66244a771d9163282646dbeffe0e6eca4dda4146b6498644e678ac6089b11edd" dependencies = [ "cfg-if", "const-hex", "dirs", "dunce", - "ethers-core 2.0.13 (registry+https://github.com/rust-lang/crates.io-index)", + "ethers-core 2.0.14", "glob", "home", "md-5", @@ -3017,6 +3017,12 @@ dependencies = [ "unicode-segmentation", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -5490,7 +5496,7 @@ dependencies = [ "bytemuck", "color-eyre", "ethabi", - "ethers-core 2.0.13 (git+https://github.com/gakonst/ethers-rs)", + "ethers-core 2.0.13", "hex", "hex-literal", "itertools 0.13.0", @@ -5990,7 +5996,7 @@ dependencies = [ "atomic-write-file", "dotenvy", "either", - "heck", + "heck 0.4.1", "hex", "once_cell", "proc-macro2", @@ -6163,7 +6169,16 @@ version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125" dependencies = [ - "strum_macros", + "strum_macros 0.25.3", +] + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" +dependencies = [ + "strum_macros 0.26.4", ] [[package]] @@ -6172,7 +6187,20 @@ version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0" dependencies = [ - "heck", + "heck 0.4.1", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.48", +] + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", "proc-macro2", "quote", "rustversion", @@ -6911,7 +6939,7 @@ dependencies = [ "reqwest", "serde", "serde_json", - "strum", + "strum 0.25.0", "tracing", ] diff --git a/Cargo.toml b/Cargo.toml index efe286ac..a3381300 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ chrono = { version = "0.4.19", features = ["serde"] } clap = { version = "4.0", features = ["derive", "env"] } telemetry-batteries = { git = "https://github.com/worldcoin/telemetry-batteries.git", rev = "12cc036234b4e9b86f22ff7e35d499e2ff1e6304" } config = "0.13.4" -ethers = { version = "2.0.10", features = ["ws", "ipc", "openssl", "abigen"] } +ethers = { version = "2.0.14", features = ["ws", "ipc", "openssl", "abigen"] } ethers-solc = "2.0.10" eyre = "0.6" futures = "0.3" diff --git a/crates/micro-oz/Cargo.toml b/crates/micro-oz/Cargo.toml index 2e0d7f79..fd685dd9 100644 --- a/crates/micro-oz/Cargo.toml +++ b/crates/micro-oz/Cargo.toml @@ -11,7 +11,7 @@ async-trait = "0.1.71" axum = "0.6.19" chrono = "0.4.26" clap = { version = "4.3.14", features = ["env", "derive"] } -ethers = { version = "2.0.10", features = ["openssl"] } +ethers = { version = "2.0.14", features = ["openssl"] } hyper = "0.14.27" oz-api = { path = "../oz-api" } serde = "1.0.171" diff --git a/crates/oz-api/Cargo.toml b/crates/oz-api/Cargo.toml index 2167dc0b..2cf66af0 100644 --- a/crates/oz-api/Cargo.toml +++ b/crates/oz-api/Cargo.toml @@ -8,7 +8,7 @@ publish = false anyhow = "1.0" chrono = { version = "0.4.23", features = ["serde"] } cognitoauth = { path = "../cognitoauth" } -ethers = { version = "2.0.10", features = [ "ws", "ipc", "openssl", "abigen" ] } +ethers = { version = "2.0.14", features = [ "ws", "ipc", "openssl", "abigen" ] } hyper = { version = "^0.14.17", features = ["server", "tcp", "http1", "http2"] } reqwest = "0.11.14" serde = { version = "1.0.154", features = ["derive"] } diff --git a/crates/tx-sitter-client/Cargo.toml b/crates/tx-sitter-client/Cargo.toml index 993e4047..000731d3 100644 --- a/crates/tx-sitter-client/Cargo.toml +++ b/crates/tx-sitter-client/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] anyhow = "1.0" -ethers = { version = "2.0.10", features = [ ] } +ethers = { version = "2.0.14", features = [ ] } reqwest = "0.11.14" serde = { version = "1.0.154", features = ["derive"] } serde_json = "1.0.94" diff --git a/e2e_tests/scenarios/Cargo.toml b/e2e_tests/scenarios/Cargo.toml index 8fc9cdb2..b90e89f9 100644 --- a/e2e_tests/scenarios/Cargo.toml +++ b/e2e_tests/scenarios/Cargo.toml @@ -15,7 +15,7 @@ license-file = "./../../LICENSE.md" signup-sequencer = { path = "./../.." } anyhow = "1.0" -ethers = { version = "2.0.10" } +ethers = { version = "2.0.14" } hex = "0.4.3" hex-literal = "0.4.1" hyper = { version = "^0.14.17", features = ["tcp", "http1", "http2", "client"] }