From d2c46867c1e27bd01d64a9656d5faa5a8f665aab Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Sun, 29 May 2022 02:54:45 +0200 Subject: [PATCH] chore(deps): make tokio required dependency (#1322) * chore(deps): make tokio non optional * chore(deps): bump tokio 0.18 * Update ethers-providers/Cargo.toml Co-authored-by: Georgios Konstantopoulos --- Cargo.lock | 136 ++++++++++++++++++++++------------- Cargo.toml | 2 +- ethers-contract/Cargo.toml | 2 +- ethers-etherscan/Cargo.toml | 2 +- ethers-middleware/Cargo.toml | 4 +- ethers-providers/Cargo.toml | 9 ++- ethers-signers/Cargo.toml | 2 +- ethers-solc/Cargo.toml | 4 +- 8 files changed, 100 insertions(+), 61 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 139b820c..79ce0cfa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1345,7 +1345,7 @@ dependencies = [ "hex", "http", "once_cell", - "parking_lot", + "parking_lot 0.11.2", "pin-project", "reqwest", "serde", @@ -1354,7 +1354,6 @@ dependencies = [ "thiserror", "tokio", "tokio-tungstenite", - "tokio-util 0.7.2", "tracing", "tracing-futures", "url", @@ -1751,7 +1750,7 @@ dependencies = [ "indexmap", "slab", "tokio", - "tokio-util 0.6.9", + "tokio-util", "tracing", ] @@ -2136,9 +2135,9 @@ dependencies = [ [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" dependencies = [ "scopeguard", ] @@ -2216,24 +2215,14 @@ checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" [[package]] name = "mio" -version = "0.7.14" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799" dependencies = [ "libc", "log", - "miow", - "ntapi", - "winapi", -] - -[[package]] -name = "miow" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9f1c5b025cda876f66ef43a113f91ebc9f4ccef34843000e0adf6ebbab84e21" -dependencies = [ - "winapi", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -2273,15 +2262,6 @@ dependencies = [ "void", ] -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi", -] - [[package]] name = "num-integer" version = "0.1.44" @@ -2458,7 +2438,17 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core", + "parking_lot_core 0.8.5", +] + +[[package]] +name = "parking_lot" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +dependencies = [ + "lock_api", + "parking_lot_core 0.9.3", ] [[package]] @@ -2475,6 +2465,19 @@ dependencies = [ "winapi", ] +[[package]] +name = "parking_lot_core" +version = "0.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall", + "smallvec", + "windows-sys", +] + [[package]] name = "password-hash" version = "0.2.3" @@ -3385,7 +3388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5bcc41d18f7a1d50525d080fd3e953be87c4f9f1a974f3c21798ca00d54ec15" dependencies = [ "lazy_static", - "parking_lot", + "parking_lot 0.11.2", "serial_test_derive", ] @@ -3608,7 +3611,7 @@ checksum = "923f0f39b6267d37d23ce71ae7235602134b250ace715dd2c90421998ddac0c6" dependencies = [ "lazy_static", "new_debug_unreachable", - "parking_lot", + "parking_lot 0.11.2", "phf_shared 0.8.0", "precomputed-hash", ] @@ -3852,9 +3855,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.16.0" +version = "1.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95e99d373042c30406d317cfc5bfad7b5d604bdd31dab72cf8739abebaa64aee" +checksum = "4903bf0427cf68dddd5aa6a93220756f8be0c34fcfa9f5e6191e103e15a31395" dependencies = [ "bytes", "libc", @@ -3862,9 +3865,10 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot", + "parking_lot 0.12.0", "pin-project-lite", "signal-hook-registry", + "socket2", "tokio-macros", "winapi", ] @@ -3933,19 +3937,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-util" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f988a1a1adc2fb21f9c12aa96441da33a1728193ae0b95d2be22dbd17fcb4e5c" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", -] - [[package]] name = "toml" version = "0.5.8" @@ -4218,6 +4209,12 @@ version = "0.10.2+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm-bindgen" version = "0.2.80" @@ -4318,7 +4315,7 @@ checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f" dependencies = [ "futures", "js-sys", - "parking_lot", + "parking_lot 0.11.2", "pin-utils", "wasm-bindgen", "wasm-bindgen-futures", @@ -4397,6 +4394,49 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-sys" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" +dependencies = [ + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" + +[[package]] +name = "windows_i686_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" + +[[package]] +name = "windows_i686_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.36.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" + [[package]] name = "winreg" version = "0.10.1" diff --git a/Cargo.toml b/Cargo.toml index de7a3807..12067133 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,7 +101,7 @@ eyre = "0.6" rand = "0.8.5" serde = { version = "1.0.124", features = ["derive"] } serde_json = "1.0.64" -tokio = { version = "1.5", features = ["macros", "rt-multi-thread"] } +tokio = { version = "1.18", features = ["macros", "rt-multi-thread"] } hex = "0.4.3" bytes = "1.1.0" diff --git a/ethers-contract/Cargo.toml b/ethers-contract/Cargo.toml index 6126f97c..212311ee 100644 --- a/ethers-contract/Cargo.toml +++ b/ethers-contract/Cargo.toml @@ -35,7 +35,7 @@ ethers-derive-eip712 = { version = "^0.2.0", path = "../ethers-core/ethers-deriv ethers-solc = { version = "^0.3.0", path = "../ethers-solc", default-features = false } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.5", default-features = false, features = ["macros"] } +tokio = { version = "1.18", default-features = false, features = ["macros"] } [features] eip712 = ["ethers-derive-eip712", "ethers-core/eip712"] diff --git a/ethers-etherscan/Cargo.toml b/ethers-etherscan/Cargo.toml index 32611707..23c40687 100644 --- a/ethers-etherscan/Cargo.toml +++ b/ethers-etherscan/Cargo.toml @@ -26,7 +26,7 @@ semver = "1.0.9" [dev-dependencies] tempfile = "3.3.0" -tokio = { version = "1.5", features = ["macros", "rt-multi-thread", "time"] } +tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "time"] } serial_test = "0.6.0" tracing-subscriber = { version = "0.3", default-features = false, features = ["env-filter", "fmt"] } diff --git a/ethers-middleware/Cargo.toml b/ethers-middleware/Cargo.toml index d043951b..a1a3df0b 100644 --- a/ethers-middleware/Cargo.toml +++ b/ethers-middleware/Cargo.toml @@ -36,7 +36,7 @@ serde_json = { version = "1.0.64", default-features = false } instant = {version = "0.1.12", features = ["now"] } [target.'cfg(not(target_arch = "wasm32"))'.dependencies] -tokio = { version = "1.5" } +tokio = { version = "1.18" } [dev-dependencies] hex = { version = "0.4.3", default-features = false, features = ["std"] } @@ -47,7 +47,7 @@ ethers-solc = { version = "^0.3.0", path = "../ethers-solc", default-features = serial_test = "0.6.0" [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.5", default-features = false, features = ["rt", "macros", "time"] } +tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] } [features] celo = ["ethers-core/celo", "ethers-providers/celo", "ethers-signers/celo", "ethers-contract/celo"] diff --git a/ethers-providers/Cargo.toml b/ethers-providers/Cargo.toml index 77cc3ef0..3c216993 100644 --- a/ethers-providers/Cargo.toml +++ b/ethers-providers/Cargo.toml @@ -44,8 +44,7 @@ hashers = "1.0.1" [target.'cfg(not(target_arch = "wasm32"))'.dependencies] # tokio -tokio-util = { version = "0.7.2", default-features = false, features = ["io"], optional = true } -tokio = { version = "1.5", default-features = false, optional = true } +tokio = { version = "1.18", features = ["time"] } tokio-tungstenite = { version = "0.17.1", default-features = false, features = ["connect"], optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] @@ -58,14 +57,14 @@ wasm-timer = "0.2" parking_lot = { version = "0.11", features = ["wasm-bindgen"] } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] -tokio = { version = "1.5", default-features = false, features = ["rt", "macros", "time"] } +tokio = { version = "1.18", default-features = false, features = ["rt", "macros", "time"] } tempfile = "3.3.0" [features] default = ["ws", "rustls"] celo = ["ethers-core/celo"] -ws = ["tokio", "tokio-tungstenite", "futures-channel"] -ipc = ["tokio", "tokio/io-util", "tokio-util", "bytes", "futures-channel"] +ws = ["tokio-tungstenite", "futures-channel"] +ipc = ["tokio/io-util", "bytes", "futures-channel"] openssl = ["tokio-tungstenite/native-tls", "reqwest/native-tls"] # we use the webpki roots so we can build static binaries w/o any root cert dependencies diff --git a/ethers-signers/Cargo.toml b/ethers-signers/Cargo.toml index cbe24383..b3e0d6e0 100644 --- a/ethers-signers/Cargo.toml +++ b/ethers-signers/Cargo.toml @@ -49,7 +49,7 @@ yubihsm = { version = "0.40.0", features = ["secp256k1", "usb", "mockhsm"] } [target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies] yubihsm = { version = "0.40.0", features = ["secp256k1", "usb", "mockhsm"] } -tokio = { version = "1.5", default-features = false, features = ["macros", "rt"] } +tokio = { version = "1.18", default-features = false, features = ["macros", "rt"] } tempfile = "3.3.0" [features] diff --git a/ethers-solc/Cargo.toml b/ethers-solc/Cargo.toml index e06a7c8d..9d7217c7 100644 --- a/ethers-solc/Cargo.toml +++ b/ethers-solc/Cargo.toml @@ -19,7 +19,7 @@ serde_json = "1.0.68" serde = { version = "1.0.130", features = ["derive"] } semver = { version = "1.0.9", features = ["serde"] } walkdir = "2.3.2" -tokio = { version = "1.15.0", default-features = false, features = ["rt"] } +tokio = { version = "1.18", default-features = false, features = ["rt"] } futures-util = { version = "^0.3", optional = true } once_cell = "1.12.0" regex = "1.5.6" @@ -59,7 +59,7 @@ tracing-subscriber = {version = "0.3", default-features = false, features = ["en rand = "0.8.5" pretty_assertions = "1.2.1" tempfile = "3.3.0" -tokio = { version = "1.15.0", features = ["full"] } +tokio = { version = "1.18", features = ["full"] } [[bench]] name = "compile_many"