From 02b81dd05d04a2118aa62d6b0a7333c3329a950b Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Thu, 18 Mar 2021 10:03:50 -0700 Subject: [PATCH] Update to reqwest 0.11.2 --- Cargo.lock | 157 +++++++++------------------------- cli/Cargo.toml | 2 +- client/Cargo.toml | 2 +- core/Cargo.toml | 2 +- crate-features/Cargo.toml | 2 +- download-utils/Cargo.toml | 2 +- install/Cargo.toml | 2 +- metrics/Cargo.toml | 2 +- notifier/Cargo.toml | 2 +- programs/bpf/Cargo.lock | 175 +++++++++++++++----------------------- ramp-tps/Cargo.toml | 2 +- stake-o-matic/Cargo.toml | 2 +- 12 files changed, 118 insertions(+), 234 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8ca8d702e5..4e0387d1d6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -668,9 +668,9 @@ checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" [[package]] name = "core-foundation" -version = "0.7.0" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171" +checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62" dependencies = [ "core-foundation-sys", "libc", @@ -678,9 +678,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac" +checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b" [[package]] name = "core_affinity" @@ -1511,7 +1511,7 @@ dependencies = [ "arc-swap 1.2.0", "futures 0.3.8", "log 0.4.11", - "reqwest 0.11.0", + "reqwest", "serde", "serde_derive", "serde_json", @@ -1804,17 +1804,16 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "bytes 0.5.4", "futures-util", - "hyper 0.13.10", + "hyper 0.14.3", "log 0.4.11", - "rustls 0.18.0", - "tokio 0.2.22", - "tokio-rustls 0.14.0", + "rustls", + "tokio 1.1.1", + "tokio-rustls", "webpki", ] @@ -2326,16 +2325,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mime_guess" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -dependencies = [ - "mime 0.3.16", - "unicase 2.6.0", -] - [[package]] name = "miniz_oxide" version = "0.3.6" @@ -2436,9 +2425,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.4" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d88c06fe90d5ee94048ba40409ef1d9315d86f6f38c2efdaad4fb50c58b2d" +checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4" dependencies = [ "lazy_static", "libc", @@ -3400,46 +3389,9 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.8" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" -dependencies = [ - "base64 0.12.3", - "bytes 0.5.4", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body 0.3.1", - "hyper 0.13.10", - "hyper-rustls", - "ipnet", - "js-sys", - "lazy_static", - "log 0.4.11", - "mime 0.3.16", - "mime_guess", - "percent-encoding 2.1.0", - "pin-project-lite 0.1.5", - "rustls 0.18.0", - "serde", - "serde_json", - "serde_urlencoded 0.6.1", - "tokio 0.2.22", - "tokio-rustls 0.14.0", - "url 2.2.0", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "webpki-roots", - "winreg", -] - -[[package]] -name = "reqwest" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd281b1030aa675fb90aa994d07187645bb3c8fc756ca766e7c3070b439de9de" +checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4" dependencies = [ "base64 0.13.0", "bytes 1.0.1", @@ -3449,6 +3401,7 @@ dependencies = [ "http", "http-body 0.4.0", "hyper 0.14.3", + "hyper-rustls", "hyper-tls", "ipnet", "js-sys", @@ -3458,15 +3411,18 @@ dependencies = [ "native-tls", "percent-encoding 2.1.0", "pin-project-lite 0.2.4", + "rustls", "serde", "serde_json", - "serde_urlencoded 0.7.0", + "serde_urlencoded", "tokio 1.1.1", "tokio-native-tls", + "tokio-rustls", "url 2.2.0", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", + "webpki-roots", "winreg", ] @@ -3544,19 +3500,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustls" -version = "0.18.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cac94b333ee2aac3284c5b8a1b7fb4dd11cba88c244e3fe33cdbd047af0eb693" -dependencies = [ - "base64 0.12.3", - "log 0.4.11", - "ring", - "sct", - "webpki", -] - [[package]] name = "rustls" version = "0.19.0" @@ -3645,9 +3588,9 @@ dependencies = [ [[package]] name = "security-framework" -version = "0.4.4" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64808902d7d99f78eaddd2b4e2509713babc3dc3c85ad6f4c447680f3c01e535" +checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" dependencies = [ "bitflags", "core-foundation", @@ -3658,9 +3601,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "0.4.3" +version = "2.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17bf11d99252f512695eb468de5516e5cf75455521e69dfe343f3b74e4748405" +checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d" dependencies = [ "core-foundation-sys", "libc", @@ -3750,18 +3693,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" -dependencies = [ - "dtoa", - "itoa", - "serde", - "url 2.2.0", -] - [[package]] name = "serde_urlencoded" version = "0.7.0" @@ -4232,7 +4163,7 @@ dependencies = [ "log 0.4.11", "num-traits", "pretty-hex", - "reqwest 0.10.8", + "reqwest", "serde", "serde_derive", "serde_json", @@ -4309,7 +4240,7 @@ dependencies = [ "log 0.4.11", "net2", "rayon", - "reqwest 0.10.8", + "reqwest", "semver 0.11.0", "serde", "serde_derive", @@ -4379,7 +4310,7 @@ dependencies = [ "raptorq", "rayon", "regex", - "reqwest 0.10.8", + "reqwest", "retain_mut", "rustc_version", "rustversion", @@ -4438,7 +4369,7 @@ dependencies = [ "libc", "rand_chacha 0.2.2", "regex-syntax", - "reqwest 0.10.8", + "reqwest", "serde", "syn 0.15.44", "syn 1.0.60", @@ -4474,7 +4405,7 @@ dependencies = [ "console", "indicatif", "log 0.4.11", - "reqwest 0.10.8", + "reqwest", "solana-runtime", "solana-sdk", "tar", @@ -4639,7 +4570,7 @@ dependencies = [ "indicatif", "lazy_static", "nix 0.19.0", - "reqwest 0.10.8", + "reqwest", "semver 0.9.0", "serde", "serde_json", @@ -4869,7 +4800,7 @@ dependencies = [ "lazy_static", "log 0.4.11", "rand 0.7.3", - "reqwest 0.10.8", + "reqwest", "serial_test", "solana-sdk", ] @@ -4919,7 +4850,7 @@ name = "solana-notifier" version = "1.7.0" dependencies = [ "log 0.4.11", - "reqwest 0.10.8", + "reqwest", "serde_json", ] @@ -5066,7 +4997,7 @@ dependencies = [ "bzip2", "clap", "log 0.4.11", - "reqwest 0.10.8", + "reqwest", "serde", "serde_json", "serde_yaml", @@ -5291,7 +5222,7 @@ version = "1.7.0" dependencies = [ "clap", "log 0.4.11", - "reqwest 0.10.8", + "reqwest", "semver 0.9.0", "serde", "serde_json", @@ -6209,25 +6140,13 @@ dependencies = [ "tokio-sync", ] -[[package]] -name = "tokio-rustls" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "228139ddd4fea3fa345a29233009635235833e52807af7ea6448ead03890d6a9" -dependencies = [ - "futures-core", - "rustls 0.18.0", - "tokio 0.2.22", - "webpki", -] - [[package]] name = "tokio-rustls" version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "rustls 0.19.0", + "rustls", "tokio 1.1.1", "webpki", ] @@ -6414,7 +6333,7 @@ dependencies = [ "prost", "prost-derive", "tokio 1.1.1", - "tokio-rustls 0.22.0", + "tokio-rustls", "tokio-stream", "tokio-util 0.6.3", "tower", @@ -6840,9 +6759,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" dependencies = [ "webpki", ] diff --git a/cli/Cargo.toml b/cli/Cargo.toml index f2198f03b5..b7636f7146 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -24,7 +24,7 @@ indicatif = "0.15.0" humantime = "2.0.1" num-traits = "0.2" pretty-hex = "0.2.1" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde = "1.0.122" serde_derive = "1.0.103" serde_json = "1.0.56" diff --git a/client/Cargo.toml b/client/Cargo.toml index 9c5beb96d4..dfdc5bb1ac 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -19,7 +19,7 @@ jsonrpc-core = "17.0.0" log = "0.4.11" net2 = "0.2.37" rayon = "1.5.0" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } semver = "0.11.0" serde = "1.0.122" serde_derive = "1.0.103" diff --git a/core/Cargo.toml b/core/Cargo.toml index e5e538f99c..621e1c4853 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -88,7 +88,7 @@ trees = "0.2.1" [dev-dependencies] matches = "0.1.6" num_cpus = "1.13.0" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } serial_test = "0.4.0" symlink = "0.1.0" systemstat = "0.1.5" diff --git a/crate-features/Cargo.toml b/crate-features/Cargo.toml index ac97958b60..8b0b9b044d 100644 --- a/crate-features/Cargo.toml +++ b/crate-features/Cargo.toml @@ -19,7 +19,7 @@ lazy_static = { version = "1.4.0", features = ["spin", "spin_no_std"] } libc = { version = "0.2.62", features = ["extra_traits"] } rand_chacha = { version = "0.2.2" } regex-syntax = { version = "0.6.12" } -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde = { version = "1.0.100", features = ["rc"] } ed25519-dalek = { version = "=1.0.1", features = ["serde"] } syn_0_15 = { package = "syn", version = "0.15.42", features = ["extra-traits", "fold", "full"] } diff --git a/download-utils/Cargo.toml b/download-utils/Cargo.toml index c0ba79d71d..c04d32a3d8 100644 --- a/download-utils/Cargo.toml +++ b/download-utils/Cargo.toml @@ -14,7 +14,7 @@ bzip2 = "0.3.3" console = "0.11.3" indicatif = "0.15.0" log = "0.4.11" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } solana-sdk = { path = "../sdk", version = "=1.7.0" } solana-runtime = { path = "../runtime", version = "=1.7.0" } tar = "0.4.28" diff --git a/install/Cargo.toml b/install/Cargo.toml index 46ed6ab172..101b854f35 100644 --- a/install/Cargo.toml +++ b/install/Cargo.toml @@ -21,7 +21,7 @@ dirs-next = "2.0.0" indicatif = "0.15.0" lazy_static = "1.4.0" nix = "0.19.0" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde = { version = "1.0.122", features = ["derive"] } serde_json = "1.0.62" serde_yaml = "0.8.13" diff --git a/metrics/Cargo.toml b/metrics/Cargo.toml index 6e79386f1f..2904ffaf62 100644 --- a/metrics/Cargo.toml +++ b/metrics/Cargo.toml @@ -14,7 +14,7 @@ env_logger = "0.8.3" gethostname = "0.2.1" lazy_static = "1.4.0" log = "0.4.11" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } solana-sdk = { path = "../sdk", version = "=1.7.0" } [dev-dependencies] diff --git a/notifier/Cargo.toml b/notifier/Cargo.toml index 5b56f08244..ca81c7de72 100644 --- a/notifier/Cargo.toml +++ b/notifier/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] log = "0.4.11" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } serde_json = "1.0" [lib] diff --git a/programs/bpf/Cargo.lock b/programs/bpf/Cargo.lock index 85442595d0..ff135257b2 100644 --- a/programs/bpf/Cargo.lock +++ b/programs/bpf/Cargo.lock @@ -706,12 +706,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "dtoa" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4358a9e11b9a09cf52383b451b49a169e8d797b68aa02301ff586d70d9661ea3" - [[package]] name = "ed25519" version = "1.0.1" @@ -837,6 +831,16 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" +[[package]] +name = "form_urlencoded" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +dependencies = [ + "matches", + "percent-encoding", +] + [[package]] name = "fs_extra" version = "1.2.0" @@ -1037,21 +1041,21 @@ dependencies = [ [[package]] name = "h2" -version = "0.2.5" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79b7246d7e4b979c03fa093da39cfb3617a96bbeee6310af63991668d7e843ff" +checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78" dependencies = [ - "bytes 0.5.4", + "bytes 1.0.1", "fnv", "futures-core", "futures-sink", "futures-util", "http", "indexmap", - "log", "slab", - "tokio 0.2.21", + "tokio 1.1.1", "tokio-util", + "tracing", ] [[package]] @@ -1152,11 +1156,11 @@ dependencies = [ [[package]] name = "http-body" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13d5ff830006f7646652e057693569bfe0d51760c0085a071769d142a205111b" +checksum = "2861bd27ee074e5ee891e8b539837a9430012e249d7f0ca2d795650f579c1994" dependencies = [ - "bytes 0.5.4", + "bytes 1.0.1", "http", ] @@ -1180,11 +1184,11 @@ checksum = "3c1ad908cc71012b7bea4d0c53ba96a8cba9962f048fa68d143376143d863b7a" [[package]] name = "hyper" -version = "0.13.10" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a6f157065790a3ed2f88679250419b5cdd96e714a0d65f7797fd337186e96bb" +checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7" dependencies = [ - "bytes 0.5.4", + "bytes 1.0.1", "futures-channel", "futures-core", "futures-util", @@ -1196,7 +1200,7 @@ dependencies = [ "itoa", "pin-project", "socket2", - "tokio 0.2.21", + "tokio 1.1.1", "tower-service", "tracing", "want", @@ -1204,16 +1208,15 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.21.0" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37743cc83e8ee85eacfce90f2f4102030d9ff0a95244098d781e9bee4a90abb6" +checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" dependencies = [ - "bytes 0.5.4", "futures-util", "hyper", "log", "rustls", - "tokio 0.2.21", + "tokio 1.1.1", "tokio-rustls", "webpki", ] @@ -1231,11 +1234,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.4.0" +version = "1.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c398b2b113b55809ceb9ee3e753fcbac793f1956663f3c36549c1346015c2afe" +checksum = "824845a0bf897a9042383849b02c1bc219c2383772efcd5c6f9766fa4b81aef3" dependencies = [ "autocfg", + "hashbrown", ] [[package]] @@ -1350,9 +1354,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.40" +version = "0.3.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce10c23ad2ea25ceca0093bd3192229da4c5b3c0f2de499c1ecac0d98d452177" +checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821" dependencies = [ "wasm-bindgen", ] @@ -1504,16 +1508,6 @@ version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" -[[package]] -name = "mime_guess" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2684d4c2e97d99848d30b324b00c8fcc7e5c897b7cbb5819b09e7c90e8baf212" -dependencies = [ - "mime", - "unicase", -] - [[package]] name = "miniz_oxide" version = "0.3.7" @@ -2199,12 +2193,12 @@ dependencies = [ [[package]] name = "reqwest" -version = "0.10.8" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9eaa17ac5d7b838b7503d118fa16ad88f440498bf9ffe5424e621f93190d61e" +checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4" dependencies = [ - "base64 0.12.3", - "bytes 0.5.4", + "base64 0.13.0", + "bytes 1.0.1", "encoding_rs", "futures-core", "futures-util", @@ -2217,14 +2211,13 @@ dependencies = [ "lazy_static", "log", "mime", - "mime_guess", "percent-encoding", - "pin-project-lite 0.1.5", + "pin-project-lite 0.2.4", "rustls", "serde", "serde_json", "serde_urlencoded", - "tokio 0.2.21", + "tokio 1.1.1", "tokio-rustls", "url", "wasm-bindgen", @@ -2282,11 +2275,11 @@ dependencies = [ [[package]] name = "rustls" -version = "0.18.1" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81" +checksum = "064fd21ff87c6e87ed4506e68beb42459caa4a0e2eb144932e6776768556980b" dependencies = [ - "base64 0.12.3", + "base64 0.13.0", "log", "ring", "sct", @@ -2458,14 +2451,14 @@ dependencies = [ [[package]] name = "serde_urlencoded" -version = "0.6.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ec5d77e2d4c73717816afac02670d5c4f534ea95ed430442cad02e7a6e32c97" +checksum = "edfa57a7f8d9c1d260a549e7224100f6c43d43f9103e06dd8b4095a9b2b43ce9" dependencies = [ - "dtoa", + "form_urlencoded", "itoa", + "ryu", "serde", - "url", ] [[package]] @@ -3684,24 +3677,6 @@ dependencies = [ "tokio-uds", ] -[[package]] -name = "tokio" -version = "0.2.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d099fa27b9702bed751524694adbe393e18b36b204da91eb1cbbbbb4a5ee2d58" -dependencies = [ - "bytes 0.5.4", - "fnv", - "futures-core", - "iovec", - "lazy_static", - "memchr", - "mio 0.6.22", - "num_cpus", - "pin-project-lite 0.1.5", - "slab", -] - [[package]] name = "tokio" version = "1.1.1" @@ -3807,13 +3782,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.14.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a" +checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" dependencies = [ - "futures-core", "rustls", - "tokio 0.2.21", + "tokio 1.1.1", "webpki", ] @@ -3905,16 +3879,16 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.3.1" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" +checksum = "ec31e5cc6b46e653cf57762f36f71d5e6386391d88a72fd6db4508f8f676fb29" dependencies = [ - "bytes 0.5.4", + "bytes 1.0.1", "futures-core", "futures-sink", "log", - "pin-project-lite 0.1.5", - "tokio 0.2.21", + "pin-project-lite 0.2.4", + "tokio 1.1.1", ] [[package]] @@ -3939,7 +3913,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b0987850db3733619253fe60e17cb59b82d37c7e6c0236bb81e4d6b87c879f27" dependencies = [ "cfg-if 0.1.10", - "log", "pin-project-lite 0.1.5", "tracing-core", ] @@ -3991,15 +3964,6 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - [[package]] name = "unicode-bidi" version = "0.3.4" @@ -4053,10 +4017,11 @@ checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" [[package]] name = "url" -version = "2.1.1" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "829d4a8476c35c9bf0bbce5a3b23f4106f79728039b726d292bb93bc106787cb" +checksum = "9ccd964113622c8e9322cfac19eb1004a07e636c545f325da085d5cdde6f1f8b" dependencies = [ + "form_urlencoded", "idna", "matches", "percent-encoding", @@ -4127,11 +4092,11 @@ checksum = "93c6c3420963c5c64bca373b25e77acb562081b9bb4dd5bb864187742186cea9" [[package]] name = "wasm-bindgen" -version = "0.2.63" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c2dc4aa152834bc334f506c1a06b866416a8b6697d5c9f75b9a689c8486def0" +checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "serde", "serde_json", "wasm-bindgen-macro", @@ -4139,9 +4104,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.63" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ded84f06e0ed21499f6184df0e0cb3494727b0c5da89534e0fcc55c51d812101" +checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3" dependencies = [ "bumpalo", "lazy_static", @@ -4154,11 +4119,11 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.13" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64487204d863f109eb77e8462189d111f27cb5712cc9fdb3461297a76963a2f6" +checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "js-sys", "wasm-bindgen", "web-sys", @@ -4166,9 +4131,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.63" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "838e423688dac18d73e31edce74ddfac468e37b1506ad163ffaf0a46f703ffe3" +checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b" dependencies = [ "quote 1.0.6", "wasm-bindgen-macro-support", @@ -4176,9 +4141,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.63" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3156052d8ec77142051a533cdd686cba889537b213f948cd1d20869926e68e92" +checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d" dependencies = [ "proc-macro2 1.0.24", "quote 1.0.6", @@ -4189,9 +4154,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.63" +version = "0.2.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9ba19973a58daf4db6f352eda73dc0e289493cd29fb2632eb172085b6521acd" +checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa" [[package]] name = "web-sys" @@ -4215,9 +4180,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.19.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8eff4b7516a57307f9349c64bf34caa34b940b66fed4b2fb3136cb7386e5739" +checksum = "82015b7e0b8bad8185994674a13a93306bea76cf5a16c5a181382fd3a5ec2376" dependencies = [ "webpki", ] diff --git a/ramp-tps/Cargo.toml b/ramp-tps/Cargo.toml index 7b51d3689c..c8fcdef21a 100644 --- a/ramp-tps/Cargo.toml +++ b/ramp-tps/Cargo.toml @@ -13,7 +13,7 @@ documentation = "https://docs.rs/solana-ramp-tps" bzip2 = "0.3.3" clap = "2.33.1" log = "0.4.11" -reqwest = { version = "0.10.8", default-features = false } +reqwest = { version = "0.11.2", default-features = false } serde = "1.0.122" serde_json = "1.0.56" serde_yaml = "0.8.13" diff --git a/stake-o-matic/Cargo.toml b/stake-o-matic/Cargo.toml index 3bb18924bc..fe185e1b3b 100644 --- a/stake-o-matic/Cargo.toml +++ b/stake-o-matic/Cargo.toml @@ -12,7 +12,7 @@ version = "1.7.0" [dependencies] clap = "2.33.0" log = "0.4.11" -reqwest = { version = "0.10.8", default-features = false, features = ["blocking", "rustls-tls", "json"] } +reqwest = { version = "0.11.2", default-features = false, features = ["blocking", "rustls-tls", "json"] } semver = "0.9.0" serde = { version = "1.0.122", features = ["derive"] } serde_json = "1.0.62"