From aa71a406bbc603bee6e85bab48ea02c6b71f5103 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Tue, 15 Aug 2023 15:39:13 -0700 Subject: [PATCH] cargo upgrade --- Cargo.lock | 78 ++++++++++++++++---------------- deferred-rate-limiter/Cargo.toml | 6 +-- latency/Cargo.toml | 6 +-- migration/Cargo.toml | 2 +- rate-counter/Cargo.toml | 2 +- redis-rate-limiter/Cargo.toml | 4 +- web3_proxy/Cargo.toml | 10 ++-- web3_proxy_cli/Cargo.toml | 4 +- 8 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8da64b34..02d8746b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -148,9 +148,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.72" +version = "1.0.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b13c32d80ecc7ab747b80c3784bce54ee8a7a0cc4fbda9bf4cda2cf6fe90854" +checksum = "8c6f84b74db2535ebae81eede2f39b947dcbf01d093ae5f791e5dd414a1bf289" dependencies = [ "backtrace", ] @@ -466,9 +466,9 @@ checksum = "ecc7ab41815b3c653ccd2978ec3255c81349336702dfdf62ee6f7069b12a3aae" [[package]] name = "async-trait" -version = "0.1.72" +version = "0.1.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc6dde6e4ed435a4c1ee4e73592f5ba9da2151af10076cc04858746af9352d09" +checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0" dependencies = [ "proc-macro2", "quote", @@ -956,11 +956,12 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.79" +version = "1.0.82" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" +checksum = "305fe645edc1442a0fa8b6726ba61d422798d37a52e12eaecf4b022ebbb88f01" dependencies = [ "jobserver", + "libc", ] [[package]] @@ -3380,9 +3381,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.19" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b06a4cde4c0f271a446782e3eff8de789548ce57dbc8eca9292c27f4a42004b4" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ "value-bag", ] @@ -4184,9 +4185,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.10" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c40d25201921e5ff0c862a505c6557ea88568a4e3ace775ab55e93f2f4f9d57" +checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05" [[package]] name = "pin-utils" @@ -5578,9 +5579,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.104" +version = "1.0.105" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "076066c5f1078eac5b722a31827a8832fe108bed65dfa75e233c89f8206e976c" +checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360" dependencies = [ "itoa", "ryu", @@ -6439,11 +6440,10 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.29.1" +version = "1.31.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "40de3a2ba249dcb097e01be5e67a5ff53cf250397715a071a81543e8a832a920" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -6452,7 +6452,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2 0.4.9", + "socket2 0.5.3", "tokio-macros", "tracing", "windows-sys 0.48.0", @@ -7452,17 +7452,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "d1eeca1c172a285ee6c2c84c341ccea837e7c01b12fbb2d0fe3c9e550ce49ec8" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.2", + "windows_aarch64_msvc 0.48.2", + "windows_i686_gnu 0.48.2", + "windows_i686_msvc 0.48.2", + "windows_x86_64_gnu 0.48.2", + "windows_x86_64_gnullvm 0.48.2", + "windows_x86_64_msvc 0.48.2", ] [[package]] @@ -7473,9 +7473,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "b10d0c968ba7f6166195e13d593af609ec2e3d24f916f081690695cf5eaffb2f" [[package]] name = "windows_aarch64_msvc" @@ -7485,9 +7485,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "571d8d4e62f26d4932099a9efe89660e8bd5087775a2ab5cdd8b747b811f1058" [[package]] name = "windows_i686_gnu" @@ -7497,9 +7497,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "2229ad223e178db5fbbc8bd8d3835e51e566b8474bfca58d2e6150c48bb723cd" [[package]] name = "windows_i686_msvc" @@ -7509,9 +7509,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "600956e2d840c194eedfc5d18f8242bc2e17c7775b6684488af3a9fff6fe3287" [[package]] name = "windows_x86_64_gnu" @@ -7521,9 +7521,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "ea99ff3f8b49fb7a8e0d305e5aec485bd068c2ba691b6e277d29eaeac945868a" [[package]] name = "windows_x86_64_gnullvm" @@ -7533,9 +7533,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "8f1a05a1ece9a7a0d5a7ccf30ba2c33e3a61a30e042ffd247567d1de1d94120d" [[package]] name = "windows_x86_64_msvc" @@ -7545,9 +7545,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "d419259aba16b663966e29e6d7c6ecfa0bb8425818bb96f6f1f3c3eb71a6e7b9" [[package]] name = "winnow" diff --git a/deferred-rate-limiter/Cargo.toml b/deferred-rate-limiter/Cargo.toml index fd887140..ef4ff511 100644 --- a/deferred-rate-limiter/Cargo.toml +++ b/deferred-rate-limiter/Cargo.toml @@ -7,9 +7,9 @@ edition = "2021" [dependencies] redis-rate-limiter = { path = "../redis-rate-limiter" } -anyhow = "1.0.72" +anyhow = "1.0.74" hashbrown = "0.14.0" -log = "0.4.19" +log = "0.4.20" moka = { version = "0.11.3", features = ["future"] } -tokio = "1.29.1" +tokio = "1.31.0" tracing = "0.1.37" diff --git a/latency/Cargo.toml b/latency/Cargo.toml index d1c4a009..1a746328 100644 --- a/latency/Cargo.toml +++ b/latency/Cargo.toml @@ -6,12 +6,12 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -log = "0.4.19" +log = "0.4.20" portable-atomic = { version = "1.4.2", features = ["float"] } serde = { version = "1.0.183", features = [] } -tokio = { version = "1.29.1", features = ["full"] } +tokio = { version = "1.31.0", features = ["full"] } tracing = "0.1.37" watermill = "0.1.1" [dev-dependencies] -tokio = { version = "1.29.1", features = ["full", "test-util"] } +tokio = { version = "1.31.0", features = ["full", "test-util"] } diff --git a/migration/Cargo.toml b/migration/Cargo.toml index b1686065..0ef580f1 100644 --- a/migration/Cargo.toml +++ b/migration/Cargo.toml @@ -9,7 +9,7 @@ name = "migration" path = "src/lib.rs" [dependencies] -tokio = { version = "1.29.1", features = ["full", "tracing"] } +tokio = { version = "1.31.0", features = ["full", "tracing"] } chrono = "0.4.26" sea-orm = { version = "0.12.2", features = ["with-chrono"]} diff --git a/rate-counter/Cargo.toml b/rate-counter/Cargo.toml index d375b75f..3b45bd33 100644 --- a/rate-counter/Cargo.toml +++ b/rate-counter/Cargo.toml @@ -5,4 +5,4 @@ authors = ["Bryan Stitt "] edition = "2021" [dependencies] -tokio = { version = "1.29.1", features = ["time"] } +tokio = { version = "1.31.0", features = ["time"] } diff --git a/redis-rate-limiter/Cargo.toml b/redis-rate-limiter/Cargo.toml index d1217ea5..e6e9dd31 100644 --- a/redis-rate-limiter/Cargo.toml +++ b/redis-rate-limiter/Cargo.toml @@ -5,7 +5,7 @@ authors = ["Bryan Stitt "] edition = "2021" [dependencies] -anyhow = "1.0.72" +anyhow = "1.0.74" chrono = "0.4.26" deadpool-redis = { version = "0.12.0", features = ["rt_tokio_1", "serde"] } -tokio = "1.29.1" +tokio = "1.31.0" diff --git a/web3_proxy/Cargo.toml b/web3_proxy/Cargo.toml index a059b17e..3ab77aa4 100644 --- a/web3_proxy/Cargo.toml +++ b/web3_proxy/Cargo.toml @@ -34,11 +34,11 @@ siwe = { git = "https://github.com/llamanodes/siwe-rs", rev = "013be5204ff1c8577 # TODO: import chrono from sea-orm so we always have the same version # TODO: make sure this time version matches siwe. PR to put this in their prelude -anyhow = { version = "1.0.72", features = ["backtrace"] } +anyhow = { version = "1.0.74", features = ["backtrace"] } arc-swap = { version = "1.6.0" } argh = "0.1.12" async-stripe = { version = "0.22.2", default-features = false, features = ["billing", "checkout", "connect", "runtime-tokio-hyper-rustls", "webhook-events"] } -async-trait = "0.1.72" +async-trait = "0.1.73" axum = { version = "0.6.20", features = ["headers", "tracing", "ws"] } axum-client-ip = "0.4.1" axum-macros = "0.3.8" @@ -82,12 +82,12 @@ sentry = { version = "0.31.5", default-features = false, features = ["anyhow", " sentry-tracing = "0.31.5" serde = { version = "1.0.183" } serde-inline-default = "0.1.1" -serde_json = { version = "1.0.104", default-features = false, features = ["raw_value"] } +serde_json = { version = "1.0.105", default-features = false, features = ["raw_value"] } serde_prometheus = "0.2.3" strum = { version = "0.25.0", features = ["derive"] } time_01 = { package = "time", version = "0.1.45" } time_03 = { package = "time", version = "0.3" } -tokio = { version = "1.29.1", features = ["full", "tracing"] } +tokio = { version = "1.31.0", features = ["full", "tracing"] } tokio-console = { version = "0.1.9", optional = true } tokio-stream = { version = "0.1.14", features = ["sync"] } toml = "0.7.6" @@ -104,6 +104,6 @@ test-log = { version = "0.2.12", default-features = false, features = ["trace"] [dev-dependencies] env_logger = "0.10" test-log = "0.2.12" -tokio = { version = "1.29.1", features = ["full", "test-util"] } +tokio = { version = "1.31.0", features = ["full", "test-util"] } tracing = {version = "0.1", default-features = false} tracing-subscriber = {version = "0.3", default-features = false, features = ["env-filter", "fmt"]} diff --git a/web3_proxy_cli/Cargo.toml b/web3_proxy_cli/Cargo.toml index 899ee14e..e2326f73 100644 --- a/web3_proxy_cli/Cargo.toml +++ b/web3_proxy_cli/Cargo.toml @@ -21,13 +21,13 @@ web3_proxy = { path = "../web3_proxy" } parking_lot = { version = "0.12.1", features = ["arc_lock", "nightly"] } prettytable = "0.10.0" serde = { version = "1.0.183" } -serde_json = { version = "1.0.104", default-features = false, features = ["raw_value"] } +serde_json = { version = "1.0.105", default-features = false, features = ["raw_value"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } [dev-dependencies] env_logger = "0.10" test-log = "0.2.12" -tokio = { version = "1.29.1", features = ["full", "test-util"] } +tokio = { version = "1.31.0", features = ["full", "test-util"] } tracing = {version = "0.1", default-features = false} tracing-subscriber = {version = "0.3", default-features = false, features = ["env-filter", "fmt"]}