From 364097dcecca9980953de8497edf5fa1940e4aa6 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Wed, 11 Jan 2023 15:19:21 -0800 Subject: [PATCH] cargo upgrade --- Cargo.lock | 84 ++++++++++++++++++++++++++++++------------- web3_proxy/Cargo.toml | 12 +++---- 2 files changed, 66 insertions(+), 30 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4cbc06cd..3fea06a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,9 +113,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "argh" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c375edecfd2074d5edcc31396860b6e54b6f928714d0e097b983053fac0cabe3" +checksum = "ab257697eb9496bf75526f0217b5ed64636a9cfafa78b8365c71bd283fcef93e" dependencies = [ "argh_derive", "argh_shared", @@ -123,12 +123,11 @@ dependencies = [ [[package]] name = "argh_derive" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa013479b80109a1bf01a039412b0f0013d716f36921226d86c6709032fb7a03" +checksum = "b382dbd3288e053331f03399e1db106c9fb0d8562ad62cb04859ae926f324fa6" dependencies = [ "argh_shared", - "heck 0.4.0", "proc-macro2", "quote", "syn", @@ -136,9 +135,9 @@ dependencies = [ [[package]] name = "argh_shared" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "149f75bbec1827618262e0855a68f0f9a7f2edc13faebf33c4f16d6725edb6a9" +checksum = "64cb94155d965e3d37ffbbe7cc5b82c3dd79dd33bd48e536f73d2cfb8d85506f" [[package]] name = "arrayvec" @@ -343,13 +342,13 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axum" -version = "0.6.1" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08b108ad2665fa3f6e6a517c3d80ec3e77d224c47d605167aefaa5d7ef97fa48" +checksum = "1304eab461cf02bd70b083ed8273388f9724c549b316ba3d1e213ce0e9e7fb7e" dependencies = [ "async-trait", "axum-core", - "base64 0.13.0", + "base64 0.20.0", "bitflags", "bytes", "futures-util", @@ -368,10 +367,10 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sha-1", + "sha1", "sync_wrapper", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.18.0", "tower", "tower-http", "tower-layer", @@ -380,9 +379,9 @@ dependencies = [ [[package]] name = "axum-client-ip" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27e888320b2a506263b84ef2f147a68bec582e49b7c6ab8246174aa196e18c8" +checksum = "ddfb5a3ddd6367075d50629546fb46710584016ae7704cd03b6d41cb5be82e5a" dependencies = [ "axum", "forwarded-header-value", @@ -390,9 +389,9 @@ dependencies = [ [[package]] name = "axum-core" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b8558f5a0581152dc94dcd289132a1d377494bdeafcd41869b3258e3e2ad92" +checksum = "f487e40dc9daee24d8a1779df88522f159a54a980f99cfbe43db0be0bd3444a8" dependencies = [ "async-trait", "bytes", @@ -407,9 +406,9 @@ dependencies = [ [[package]] name = "axum-macros" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4df0fc33ada14a338b799002f7e8657711422b25d4e16afb032708d6b185621" +checksum = "cc7d7c3e69f305217e317a28172aab29f275667f2e1c15b87451e134fe27c7b1" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -479,6 +478,12 @@ version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +[[package]] +name = "base64" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ea22880d78093b0cbe17c89f64a7d457941e65759157ec6cb31a31d652b05e5" + [[package]] name = "base64ct" version = "1.0.1" @@ -1659,7 +1664,7 @@ dependencies = [ "serde_json", "thiserror", "tokio", - "tokio-tungstenite", + "tokio-tungstenite 0.17.2", "tracing", "tracing-futures", "url", @@ -2482,9 +2487,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.7.0" +version = "2.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11b0d96e660696543b251e58030cf9787df56da39dab19ad60eae7353040917e" +checksum = "30e22bd8629359895450b59ea7a776c850561b96a3b1d31321c1949d9e6c9146" [[package]] name = "iri-string" @@ -3657,9 +3662,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.7.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e076559ef8e241f2ae3479e36f97bd5741c0330689e217ad51ce2c76808b868a" +checksum = "48aaa5748ba571fb95cd2c85c09f629215d3a6ece942baa100950af03a34f733" dependencies = [ "aho-corasick", "memchr", @@ -5047,11 +5052,23 @@ dependencies = [ "rustls", "tokio", "tokio-rustls", - "tungstenite", + "tungstenite 0.17.3", "webpki", "webpki-roots", ] +[[package]] +name = "tokio-tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54319c93411147bced34cb5609a80e0a8e44c5999c93903a81cd866630ec0bfd" +dependencies = [ + "futures-util", + "log", + "tokio", + "tungstenite 0.18.0", +] + [[package]] name = "tokio-util" version = "0.7.2" @@ -5228,6 +5245,25 @@ dependencies = [ "webpki", ] +[[package]] +name = "tungstenite" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30ee6ab729cd4cf0fd55218530c4522ed30b7b6081752839b68fcec8d0960788" +dependencies = [ + "base64 0.13.0", + "byteorder", + "bytes", + "http", + "httparse", + "log", + "rand", + "sha1", + "thiserror", + "url", + "utf-8", +] + [[package]] name = "typenum" version = "1.15.0" diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index 41131e85..8d0996e7 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -21,10 +21,10 @@ thread-fast-rng = { path = "../thread-fast-rng" } anyhow = { version = "1.0.68", features = ["backtrace"] } arc-swap = "1.6.0" -argh = "0.1.9" -axum = { version = "0.6.1", features = ["headers", "ws"] } -axum-client-ip = "0.3.0" -axum-macros = "0.3.0" +argh = "0.1.10" +axum = { version = "0.6.2", features = ["headers", "ws"] } +axum-client-ip = "0.3.1" +axum-macros = "0.3.1" # TODO: import chrono from sea-orm so we always have the same version chrono = "0.4.23" counter = "0.5.7" @@ -38,7 +38,7 @@ futures = { version = "0.3.25", features = ["thread-pool"] } hashbrown = { version = "0.13.1", features = ["serde"] } hdrhistogram = "7.5.2" http = "0.2.8" -ipnet = "2.7.0" +ipnet = "2.7.1" log = "0.4.17" metered = { version = "0.9.0", features = ["serialize"] } moka = { version = "0.9.6", default-features = false, features = ["future"] } @@ -49,7 +49,7 @@ num-traits = "0.2.15" parking_lot = { version = "0.12.1", features = ["arc_lock"] } proctitle = "0.1.1" # TODO: regex has several "perf" features that we might want to use -regex = "1.7.0" +regex = "1.7.1" reqwest = { version = "0.11.13", default-features = false, features = ["json", "tokio-rustls"] } handlebars = "4.3.6" rustc-hash = "1.1.0"