From 4092dbd56827a1d4419fbee31672a3dfbe9d9c91 Mon Sep 17 00:00:00 2001 From: Brandon Williams Date: Thu, 25 Jul 2024 09:10:59 -0500 Subject: [PATCH] chore: update reqwest to 0.12 --- Cargo.lock | 952 ++++++++++++------ Cargo.toml | 21 +- crates/sui-analytics-indexer/Cargo.toml | 6 +- .../src/workers/archival.rs | 4 +- crates/sui-data-ingestion/src/workers/blob.rs | 4 +- crates/sui-graphql-rpc-client/src/lib.rs | 2 +- crates/sui-graphql-rpc-client/src/response.rs | 13 +- .../src/simple_client.rs | 9 +- crates/sui-graphql-rpc/src/server/builder.rs | 4 +- crates/sui-graphql-rpc/tests/e2e_tests.rs | 2 +- crates/sui-metric-checker/src/lib.rs | 6 +- crates/sui-node/src/metrics.rs | 3 +- crates/sui-oracle/Cargo.toml | 2 +- crates/sui-proxy/src/lib.rs | 6 +- crates/sui-rest-api/src/response.rs | 3 +- crates/sui-sdk/src/lib.rs | 3 +- crates/sui-security-watchdog/Cargo.toml | 4 +- .../sui-source-validation-service/Cargo.toml | 2 +- .../sui-storage/src/http_key_value_store.rs | 51 +- .../sui-storage/src/object_store/http/mod.rs | 2 + crates/sui-storage/src/object_store/mod.rs | 10 +- crates/sui-storage/src/object_store/util.rs | 6 +- crates/sui/src/client_commands.rs | 2 +- crates/suiop-cli/src/cli/lib/oauth/mod.rs | 2 +- 24 files changed, 706 insertions(+), 413 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bd6f1b9432ab9..8ca737b463380 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -169,12 +169,12 @@ dependencies = [ "ed25519 1.5.3", "futures", "hex", - "http", + "http 0.2.9", "matchit 0.5.0", "pin-project-lite", "pkcs8 0.9.0", - "quinn", - "quinn-proto", + "quinn 0.10.1", + "quinn-proto 0.10.5", "rand 0.8.5", "rcgen", "ring 0.16.20", @@ -556,9 +556,9 @@ checksum = "8da52d66c7071e2e3fa2a1e5c6d088fec47b593032b254f5e980de8ea54454d6" [[package]] name = "arrow" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa285343fba4d829d49985bdc541e3789cf6000ed0e84be7c039438df4a4e78c" +checksum = "6127ea5e585a12ec9f742232442828ebaf264dfa5eefdd71282376c599562b77" dependencies = [ "arrow-arith", "arrow-array", @@ -577,9 +577,9 @@ dependencies = [ [[package]] name = "arrow-arith" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "753abd0a5290c1bcade7c6623a556f7d1659c5f4148b140b5b63ce7bd1a45705" +checksum = "7add7f39210b7d726e2a8efc0083e7bf06e8f2d15bdb4896b564dce4410fbf5d" dependencies = [ "arrow-array", "arrow-buffer", @@ -592,9 +592,9 @@ dependencies = [ [[package]] name = "arrow-array" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d390feeb7f21b78ec997a4081a025baef1e2e0d6069e181939b61864c9779609" +checksum = "81c16ec702d3898c2f5cfdc148443c6cd7dbe5bac28399859eb0a3d38f072827" dependencies = [ "ahash 0.8.2", "arrow-buffer", @@ -608,9 +608,9 @@ dependencies = [ [[package]] name = "arrow-buffer" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69615b061701bcdffbc62756bc7e85c827d5290b472b580c972ebbbf690f5aa4" +checksum = "cae6970bab043c4fbc10aee1660ceb5b306d0c42c8cc5f6ae564efcd9759b663" dependencies = [ "bytes", "half 2.3.1", @@ -619,27 +619,29 @@ dependencies = [ [[package]] name = "arrow-cast" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e448e5dd2f4113bf5b74a1f26531708f5edcacc77335b7066f9398f4bcf4cdef" +checksum = "1c7ef44f26ef4f8edc392a048324ed5d757ad09135eff6d5509e6450d39e0398" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", - "base64 0.21.2", + "atoi", + "base64 0.22.1", "chrono", "half 2.3.1", "lexical-core", "num", + "ryu", ] [[package]] name = "arrow-csv" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46af72211f0712612f5b18325530b9ad1bfbdc87290d5fbfd32a7da128983781" +checksum = "5f843490bd258c5182b66e888161bb6f198f49f3792f7c7f98198b924ae0f564" dependencies = [ "arrow-array", "arrow-buffer", @@ -656,9 +658,9 @@ dependencies = [ [[package]] name = "arrow-data" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67d644b91a162f3ad3135ce1184d0a31c28b816a581e08f29e8e9277a574c64e" +checksum = "a769666ffac256dd301006faca1ca553d0ae7cffcf4cd07095f73f95eb226514" dependencies = [ "arrow-buffer", "arrow-schema", @@ -668,9 +670,9 @@ dependencies = [ [[package]] name = "arrow-ipc" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "03dea5e79b48de6c2e04f03f62b0afea7105be7b77d134f6c5414868feefb80d" +checksum = "dbf9c3fb57390a1af0b7bb3b5558c1ee1f63905f3eccf49ae7676a8d1e6e5a72" dependencies = [ "arrow-array", "arrow-buffer", @@ -682,9 +684,9 @@ dependencies = [ [[package]] name = "arrow-json" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8950719280397a47d37ac01492e3506a8a724b3fb81001900b866637a829ee0f" +checksum = "654e7f3724176b66ddfacba31af397c48e106fbe4d281c8144e7d237df5acfd7" dependencies = [ "arrow-array", "arrow-buffer", @@ -702,9 +704,9 @@ dependencies = [ [[package]] name = "arrow-ord" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ed9630979034077982d8e74a942b7ac228f33dd93a93b615b4d02ad60c260be" +checksum = "e8008370e624e8e3c68174faaf793540287106cfda8ad1da862fdc53d8e096b4" dependencies = [ "arrow-array", "arrow-buffer", @@ -717,9 +719,9 @@ dependencies = [ [[package]] name = "arrow-row" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "007035e17ae09c4e8993e4cb8b5b96edf0afb927cd38e2dff27189b274d83dcf" +checksum = "ca5e3a6b7fda8d9fe03f3b18a2d946354ea7f3c8e4076dbdb502ad50d9d44824" dependencies = [ "ahash 0.8.2", "arrow-array", @@ -732,15 +734,15 @@ dependencies = [ [[package]] name = "arrow-schema" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ff3e9c01f7cd169379d269f926892d0e622a704960350d09d331be3ec9e0029" +checksum = "dab1c12b40e29d9f3b699e0203c2a73ba558444c05e388a4377208f8f9c97eee" [[package]] name = "arrow-select" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce20973c1912de6514348e064829e50947e35977bb9d7fb637dc99ea9ffd78c" +checksum = "e80159088ffe8c48965cb9b1a7c968b2729f29f37363df7eca177fc3281fe7c3" dependencies = [ "ahash 0.8.2", "arrow-array", @@ -752,15 +754,16 @@ dependencies = [ [[package]] name = "arrow-string" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00f3b37f2aeece31a2636d1b037dabb69ef590e03bdc7eb68519b51ec86932a7" +checksum = "0fd04a6ea7de183648edbcb7a6dd925bbd04c210895f6384c780e27a9b54afcd" dependencies = [ "arrow-array", "arrow-buffer", "arrow-data", "arrow-schema", "arrow-select", + "memchr", "num", "regex", "regex-syntax 0.8.2", @@ -831,7 +834,7 @@ version = "0.3.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942c7cd7ae39e91bde4820d74132e9862e62c2f386c3aa90ccf55949f5bad63a" dependencies = [ - "brotli", + "brotli 3.3.4", "flate2", "futures-core", "memchr", @@ -872,7 +875,7 @@ dependencies = [ "futures-timer", "futures-util", "handlebars", - "http", + "http 0.2.9", "indexmap 2.2.6", "lru 0.7.8", "mime", @@ -1039,6 +1042,21 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atoi" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f28d99ec8bfea296261ca1af174f24225171fea9664ba9003cbebee704810528" +dependencies = [ + "num-traits", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atomic_float" version = "0.1.0" @@ -1108,8 +1126,8 @@ dependencies = [ "bytes", "fastrand 2.0.0", "hex", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "ring 0.16.20", "time", "tokio", @@ -1143,8 +1161,8 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "lazy_static", "percent-encoding", "pin-project-lite", @@ -1167,7 +1185,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "fastrand 2.0.0", - "http", + "http 0.2.9", "percent-encoding", "tracing", "uuid 1.2.2", @@ -1192,7 +1210,7 @@ dependencies = [ "aws-types", "bytes", "fastrand 2.0.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tracing", @@ -1218,7 +1236,7 @@ dependencies = [ "aws-smithy-xml", "aws-types", "fastrand 2.0.0", - "http", + "http 0.2.9", "regex", "tokio-stream", "tracing", @@ -1246,8 +1264,8 @@ dependencies = [ "aws-smithy-xml", "aws-types", "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "once_cell", "percent-encoding", "regex", @@ -1274,7 +1292,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "http", + "http 0.2.9", "regex", "tokio-stream", "tracing", @@ -1299,7 +1317,7 @@ dependencies = [ "aws-smithy-types", "aws-smithy-xml", "aws-types", - "http", + "http 0.2.9", "regex", "tracing", ] @@ -1316,7 +1334,7 @@ dependencies = [ "form_urlencoded", "hex", "hmac 0.12.1", - "http", + "http 0.2.9", "once_cell", "percent-encoding", "regex", @@ -1349,9 +1367,9 @@ dependencies = [ "crc32c", "crc32fast", "hex", - "http", - "http-body", - "md-5 0.10.5", + "http 0.2.9", + "http-body 0.4.5", + "md-5 0.10.6", "pin-project-lite", "sha1", "sha2 0.10.6", @@ -1370,9 +1388,9 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.0", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-rustls 0.24.0", "lazy_static", "pin-project-lite", @@ -1404,9 +1422,9 @@ dependencies = [ "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "once_cell", "percent-encoding", "pin-project-lite", @@ -1425,8 +1443,8 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "pin-project-lite", "tower", "tracing", @@ -1464,8 +1482,8 @@ dependencies = [ "aws-smithy-types", "bytes", "fastrand 2.0.0", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "once_cell", "pin-project-lite", "pin-utils", @@ -1483,7 +1501,7 @@ dependencies = [ "aws-smithy-http", "aws-smithy-types", "bytes", - "http", + "http 0.2.9", "tokio", "tracing", ] @@ -1522,7 +1540,7 @@ dependencies = [ "aws-smithy-client", "aws-smithy-http", "aws-smithy-types", - "http", + "http 0.2.9", "rustc_version", "tracing", ] @@ -1540,9 +1558,9 @@ dependencies = [ "bytes", "futures-util", "headers", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "itoa", "matchit 0.7.0", "memchr", @@ -1555,7 +1573,7 @@ dependencies = [ "serde_path_to_error", "serde_urlencoded", "sha1", - "sync_wrapper", + "sync_wrapper 0.1.2", "tokio", "tokio-tungstenite", "tower", @@ -1572,8 +1590,8 @@ dependencies = [ "async-trait", "bytes", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "mime", "rustversion", "tower-layer", @@ -1589,7 +1607,7 @@ dependencies = [ "axum", "bytes", "futures-util", - "http", + "http 0.2.9", "mime", "pin-project-lite", "tokio", @@ -1608,12 +1626,12 @@ dependencies = [ "arc-swap", "bytes", "futures-util", - "http", - "http-body", - "hyper", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "pin-project-lite", "rustls 0.21.12", - "rustls-pemfile", + "rustls-pemfile 1.0.2", "tokio", "tokio-rustls 0.24.0", "tower-service", @@ -2052,7 +2070,18 @@ checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", - "brotli-decompressor", + "brotli-decompressor 2.3.2", +] + +[[package]] +name = "brotli" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", + "brotli-decompressor 4.0.1", ] [[package]] @@ -2065,6 +2094,16 @@ dependencies = [ "alloc-stdlib", ] +[[package]] +name = "brotli-decompressor" +version = "4.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a45bd2e4095a8b518033b128020dd4a55aab1c0a381ba4404a472630f4bc362" +dependencies = [ + "alloc-no-stdlib", + "alloc-stdlib", +] + [[package]] name = "bs58" version = "0.4.0" @@ -2317,9 +2356,9 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", @@ -2327,7 +2366,7 @@ dependencies = [ "num-traits", "serde", "wasm-bindgen", - "windows-targets 0.48.0", + "windows-targets 0.52.0", ] [[package]] @@ -2617,8 +2656,8 @@ dependencies = [ "enum_dispatch", "fastcrypto", "futures", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "hyper-rustls 0.24.0", "itertools 0.10.5", "mockall", @@ -2629,7 +2668,7 @@ dependencies = [ "parking_lot 0.12.1", "prometheus", "prost 0.12.3", - "quinn-proto", + "quinn-proto 0.10.5", "rand 0.8.5", "rstest", "rustls 0.21.12", @@ -2752,8 +2791,8 @@ dependencies = [ "chrono", "flate2", "futures-util", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "hyperlocal", "log", "mime", @@ -3696,8 +3735,8 @@ dependencies = [ "containers-api", "docker-api-stubs", "futures-util", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "log", "paste", "serde", @@ -3931,6 +3970,18 @@ dependencies = [ "zeroize", ] +[[package]] +name = "enum-as-inner" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a" +dependencies = [ + "heck 0.4.1", + "proc-macro2 1.0.78", + "quote 1.0.35", + "syn 2.0.48", +] + [[package]] name = "enum-compat-util" version = "0.1.0" @@ -4172,7 +4223,7 @@ dependencies = [ "proc-macro2 1.0.78", "quote 1.0.35", "regex", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "syn 1.0.107", @@ -4237,7 +4288,7 @@ checksum = "8920b59cf81e357df2c8102d6a9dc81c2d68f7409543ff3b6868851ecf007807" dependencies = [ "ethers-core", "getrandom 0.2.9", - "reqwest", + "reqwest 0.11.20", "semver 1.0.16", "serde", "serde_json", @@ -4262,7 +4313,7 @@ dependencies = [ "futures-locks", "futures-util", "instant", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "thiserror", @@ -4290,11 +4341,11 @@ dependencies = [ "getrandom 0.2.9", "hashers", "hex", - "http", + "http 0.2.9", "instant", "once_cell", "pin-project", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "thiserror", @@ -4382,7 +4433,7 @@ dependencies = [ [[package]] name = "fastcrypto" version = "0.1.8" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=a3d5b18b7ca9370e099a7dbb25aca276af580608#a3d5b18b7ca9370e099a7dbb25aca276af580608" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=5f2c63266a065996d53f98156f0412782b468597#5f2c63266a065996d53f98156f0412782b468597" dependencies = [ "aes", "aes-gcm", @@ -4436,7 +4487,7 @@ dependencies = [ [[package]] name = "fastcrypto-derive" version = "0.1.3" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=a3d5b18b7ca9370e099a7dbb25aca276af580608#a3d5b18b7ca9370e099a7dbb25aca276af580608" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=5f2c63266a065996d53f98156f0412782b468597#5f2c63266a065996d53f98156f0412782b468597" dependencies = [ "quote 1.0.35", "syn 1.0.107", @@ -4445,7 +4496,7 @@ dependencies = [ [[package]] name = "fastcrypto-tbls" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=a3d5b18b7ca9370e099a7dbb25aca276af580608#a3d5b18b7ca9370e099a7dbb25aca276af580608" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=5f2c63266a065996d53f98156f0412782b468597#5f2c63266a065996d53f98156f0412782b468597" dependencies = [ "bcs", "digest 0.10.7", @@ -4464,7 +4515,7 @@ dependencies = [ [[package]] name = "fastcrypto-vdf" version = "0.1.0" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=a3d5b18b7ca9370e099a7dbb25aca276af580608#a3d5b18b7ca9370e099a7dbb25aca276af580608" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=5f2c63266a065996d53f98156f0412782b468597#5f2c63266a065996d53f98156f0412782b468597" dependencies = [ "bcs", "fastcrypto", @@ -4481,7 +4532,7 @@ dependencies = [ [[package]] name = "fastcrypto-zkp" version = "0.1.3" -source = "git+https://github.com/MystenLabs/fastcrypto?rev=a3d5b18b7ca9370e099a7dbb25aca276af580608#a3d5b18b7ca9370e099a7dbb25aca276af580608" +source = "git+https://github.com/MystenLabs/fastcrypto?rev=5f2c63266a065996d53f98156f0412782b468597#5f2c63266a065996d53f98156f0412782b468597" dependencies = [ "ark-bls12-381", "ark-bn254", @@ -4503,7 +4554,7 @@ dependencies = [ "num-bigint 0.4.4", "once_cell", "regex", - "reqwest", + "reqwest 0.12.5", "schemars", "serde", "serde_json", @@ -4664,9 +4715,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" [[package]] name = "flatbuffers" -version = "23.5.26" +version = "24.3.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dac53e22462d78c16d64a1cd22371b54cc3fe94aa15e7886a2fa6e5d1ab8640" +checksum = "8add37afff2d4ffa83bc748a70b4b1370984f6980768554182424ef71447c35f" dependencies = [ "bitflags 1.3.2", "rustc_version", @@ -4699,9 +4750,9 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" [[package]] name = "form_urlencoded" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9c384f161156f5260c24a097c56119f9be8c798586aecc13afbcbe7b7e26bf8" +checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" dependencies = [ "percent-encoding", ] @@ -4881,10 +4932,10 @@ dependencies = [ "async-stream", "async-trait", "dyn-clone", - "hyper", + "hyper 0.14.26", "hyper-rustls 0.24.0", "log", - "reqwest", + "reqwest 0.11.20", "serde", "serde_json", "thiserror", @@ -5103,7 +5154,26 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.9", + "indexmap 2.2.6", + "slab", + "tokio", + "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tracing", +] + +[[package]] +name = "h2" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.1.0", "indexmap 2.2.6", "slab", "tokio", @@ -5231,7 +5301,7 @@ dependencies = [ "bitflags 1.3.2", "bytes", "headers-core", - "http", + "http 0.2.9", "httpdate", "mime", "sha1", @@ -5243,7 +5313,7 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7f66481bfee273957b1f20485a4ff3362987f85b2c236580d81b4eb7a326429" dependencies = [ - "http", + "http 0.2.9", ] [[package]] @@ -5348,6 +5418,17 @@ dependencies = [ "itoa", ] +[[package]] +name = "http" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" +dependencies = [ + "bytes", + "fnv", + "itoa", +] + [[package]] name = "http-body" version = "0.4.5" @@ -5355,7 +5436,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ "bytes", - "http", + "http 0.2.9", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" +dependencies = [ + "bytes", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", "pin-project-lite", ] @@ -5393,9 +5497,9 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", - "http", - "http-body", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", "httparse", "httpdate", "itoa", @@ -5407,17 +5511,37 @@ dependencies = [ "want", ] +[[package]] +name = "hyper" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "httparse", + "itoa", + "pin-project-lite", + "smallvec", + "tokio", + "want", +] + [[package]] name = "hyper-rustls" version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" dependencies = [ - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "log", "rustls 0.20.7", - "rustls-native-certs", + "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.23.4", "webpki-roots 0.22.6", @@ -5429,28 +5553,67 @@ version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" dependencies = [ - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "log", "rustls 0.21.12", - "rustls-native-certs", + "rustls-native-certs 0.6.2", "tokio", "tokio-rustls 0.24.0", "webpki-roots 0.23.1", ] +[[package]] +name = "hyper-rustls" +version = "0.27.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ee4be2c948921a1a5320b629c4193916ed787a7f7f293fd3f7f5a6c9de74155" +dependencies = [ + "futures-util", + "http 1.1.0", + "hyper 1.4.1", + "hyper-util", + "rustls 0.23.12", + "rustls-native-certs 0.7.1", + "rustls-pki-types", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", + "webpki-roots 0.26.3", +] + [[package]] name = "hyper-timeout" version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" dependencies = [ - "hyper", + "hyper 0.14.26", "pin-project-lite", "tokio", "tokio-io-timeout", ] +[[package]] +name = "hyper-util" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956" +dependencies = [ + "bytes", + "futures-channel", + "futures-util", + "http 1.1.0", + "http-body 1.0.1", + "hyper 1.4.1", + "pin-project-lite", + "socket2 0.5.6", + "tokio", + "tower", + "tower-service", + "tracing", +] + [[package]] name = "hyperlocal" version = "0.8.0" @@ -5459,7 +5622,7 @@ checksum = "0fafdf7b2b2de7c9784f76e02c0935e65a8117ec3b768644379983ab333ac98c" dependencies = [ "futures-util", "hex", - "hyper", + "hyper 0.14.26", "pin-project", "tokio", ] @@ -5494,16 +5657,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e14ddfc70884202db2244c223200c204c2bda1bc6e0998d11b5e024d657209e6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.5.0" @@ -5828,6 +5981,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.5" @@ -5920,11 +6082,11 @@ version = "0.16.2" source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8" dependencies = [ "futures-util", - "http", + "http 0.2.9", "jsonrpsee-core", "jsonrpsee-types", "pin-project", - "rustls-native-certs", + "rustls-native-certs 0.6.2", "soketto", "thiserror", "tokio", @@ -5948,7 +6110,7 @@ dependencies = [ "futures-timer", "futures-util", "globset", - "hyper", + "hyper 0.14.26", "jsonrpsee-types", "parking_lot 0.12.1", "rand 0.8.5", @@ -5967,7 +6129,7 @@ version = "0.16.2" source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8" dependencies = [ "async-trait", - "hyper", + "hyper 0.14.26", "hyper-rustls 0.23.2", "jsonrpsee-core", "jsonrpsee-types", @@ -5998,8 +6160,8 @@ source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcd dependencies = [ "futures-channel", "futures-util", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "jsonrpsee-core", "jsonrpsee-types", "serde", @@ -6030,7 +6192,7 @@ name = "jsonrpsee-ws-client" version = "0.16.2" source = "git+https://github.com/wlmyng/jsonrpsee.git?rev=b1b300784795f6a64d0fcdf8f03081a9bc38bde8#b1b300784795f6a64d0fcdf8f03081a9bc38bde8" dependencies = [ - "http", + "http 0.2.9", "jsonrpsee-client-transport", "jsonrpsee-core", "jsonrpsee-types", @@ -6435,10 +6597,11 @@ dependencies = [ [[package]] name = "md-5" -version = "0.10.5" +version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6365506850d44bff6e2fbcb5176cf63650e48bd45ef2fe2665ae1570e0f4b9ca" +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf" dependencies = [ + "cfg-if", "digest 0.10.7", ] @@ -6450,9 +6613,9 @@ checksum = "490cc448043f947bae3cbee9c203358d62dbee0db12107a74be5c30ccfd09771" [[package]] name = "memchr" -version = "2.5.0" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -7426,7 +7589,7 @@ dependencies = [ "bytes", "encoding_rs", "futures-util", - "http", + "http 0.2.9", "httparse", "log", "memchr", @@ -7542,7 +7705,7 @@ dependencies = [ "bytes", "eyre", "futures", - "http", + "http 0.2.9", "multiaddr", "pin-project-lite", "serde", @@ -7710,7 +7873,7 @@ dependencies = [ "narwhal-types", "parking_lot 0.12.1", "prometheus", - "quinn-proto", + "quinn-proto 0.10.5", "rand 0.8.5", "sui-macros", "tokio", @@ -7746,7 +7909,7 @@ dependencies = [ "pretty_assertions", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "serde-reflection", "serde_yaml 0.8.26", "sui-keys", @@ -7800,7 +7963,7 @@ dependencies = [ "prometheus", "proptest", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "sui-macros", "sui-protocol-config", "tap", @@ -7943,7 +8106,7 @@ dependencies = [ "narwhal-types", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "sui-protocol-config", "tap", "telemetry-subscribers", @@ -8381,54 +8544,26 @@ dependencies = [ [[package]] name = "object_store" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d359e231e5451f4f9fa889d56e3ce34f8724f1a61db2107739359717cf2bbf08" -dependencies = [ - "async-trait", - "base64 0.21.2", - "bytes", - "chrono", - "futures", - "humantime", - "hyper", - "itertools 0.10.5", - "parking_lot 0.12.1", - "percent-encoding", - "quick-xml 0.28.2", - "rand 0.8.5", - "reqwest", - "ring 0.16.20", - "rustls-pemfile", - "serde", - "serde_json", - "snafu", - "tokio", - "tracing", - "url", - "walkdir", -] - -[[package]] -name = "object_store" -version = "0.9.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d139f545f64630e2e3688fd9f81c470888ab01edeb72d13b4e86c566f1130000" +checksum = "e6da452820c715ce78221e8202ccc599b4a52f3e1eb3eedb487b680c81a8e3f3" dependencies = [ "async-trait", - "base64 0.21.2", + "base64 0.22.1", "bytes", "chrono", "futures", "humantime", - "hyper", - "itertools 0.12.0", + "hyper 1.4.1", + "itertools 0.13.0", + "md-5 0.10.6", "parking_lot 0.12.1", "percent-encoding", - "quick-xml 0.31.0", + "quick-xml", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "ring 0.17.3", + "rustls-pemfile 2.1.2", "serde", "serde_json", "snafu", @@ -8449,9 +8584,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "oorandom" @@ -8546,7 +8681,7 @@ checksum = "7e5e5a5c4135864099f3faafbe939eb4d7f9b80ebf68a8448da961b32a7c1275" dependencies = [ "async-trait", "futures-core", - "http", + "http 0.2.9", "opentelemetry-proto", "opentelemetry-semantic-conventions", "opentelemetry_api 0.20.0", @@ -8871,9 +9006,9 @@ dependencies = [ [[package]] name = "parquet" -version = "50.0.0" +version = "52.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "547b92ebf0c1177e3892f44c8f79757ee62e678d564a9834189725f2c5b7a750" +checksum = "0f22ba0d95db56dde8685e3fadcb915cdaadda31ab8abbe3ff7f0ad1ef333267" dependencies = [ "ahash 0.8.2", "arrow-array", @@ -8883,8 +9018,8 @@ dependencies = [ "arrow-ipc", "arrow-schema", "arrow-select", - "base64 0.21.2", - "brotli", + "base64 0.22.1", + "brotli 6.0.0", "bytes", "chrono", "flate2", @@ -8899,6 +9034,7 @@ dependencies = [ "thrift", "twox-hash", "zstd 0.13.0", + "zstd-sys", ] [[package]] @@ -8923,7 +9059,7 @@ checksum = "f14d42b14749cc7927add34a9932b3b3cc5349a633384850baa67183061439dd" dependencies = [ "ciborium", "coset", - "idna 0.5.0", + "idna", "passkey-authenticator", "passkey-types", "public-suffix", @@ -9052,9 +9188,9 @@ dependencies = [ [[package]] name = "percent-encoding" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" +checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "pest" @@ -9546,13 +9682,14 @@ dependencies = [ [[package]] name = "prometheus-http-query" -version = "0.6.6" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7970fd6e91b5cb87e9a093657572a896d133879ced7752d2c7635beae29eaba0" +checksum = "0fcebfa99f03ae51220778316b37d24981e36322c82c24848f48c5bd0f64cbdb" dependencies = [ - "reqwest", + "enum-as-inner", + "mime", + "reqwest 0.12.5", "serde", - "serde_json", "time", "url", ] @@ -9751,37 +9888,44 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quick-xml" -version = "0.28.2" +version = "0.36.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" +checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" dependencies = [ "memchr", "serde", ] [[package]] -name = "quick-xml" -version = "0.31.0" +name = "quinn" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33" +checksum = "21252f1c0fc131f1b69182db8f34837e8a69737b8251dff75636a9be0518c324" dependencies = [ - "memchr", - "serde", + "bytes", + "futures-io", + "pin-project-lite", + "quinn-proto 0.10.5", + "quinn-udp 0.4.0", + "rustc-hash", + "rustls 0.21.12", + "thiserror", + "tokio", + "tracing", ] [[package]] name = "quinn" -version = "0.10.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21252f1c0fc131f1b69182db8f34837e8a69737b8251dff75636a9be0518c324" +checksum = "e4ceeeeabace7857413798eb1ffa1e9c905a9946a57d81fb69b4b71c4d8eb3ad" dependencies = [ "bytes", - "futures-io", "pin-project-lite", - "quinn-proto", - "quinn-udp", + "quinn-proto 0.11.3", + "quinn-udp 0.5.4", "rustc-hash", - "rustls 0.21.12", + "rustls 0.23.12", "thiserror", "tokio", "tracing", @@ -9804,6 +9948,23 @@ dependencies = [ "tracing", ] +[[package]] +name = "quinn-proto" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ddf517c03a109db8100448a4be38d498df8a210a99fe0e1b9eaf39e78c640efe" +dependencies = [ + "bytes", + "rand 0.8.5", + "ring 0.17.3", + "rustc-hash", + "rustls 0.23.12", + "slab", + "thiserror", + "tinyvec", + "tracing", +] + [[package]] name = "quinn-udp" version = "0.4.0" @@ -9817,6 +9978,18 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "quinn-udp" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" +dependencies = [ + "libc", + "once_cell", + "socket2 0.5.6", + "windows-sys 0.52.0", +] + [[package]] name = "quote" version = "0.6.13" @@ -10131,33 +10304,76 @@ version = "0.11.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e9ad3fe7488d7e34558a2033d45a0c90b72d97b4f80705666fea71472e2e6a1" dependencies = [ - "async-compression 0.4.6", "base64 0.21.2", "bytes", "encoding_rs", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-rustls 0.24.0", "ipnet", "js-sys", "log", "mime", - "mime_guess", "once_cell", "percent-encoding", "pin-project-lite", "rustls 0.21.12", - "rustls-native-certs", - "rustls-pemfile", + "rustls-pemfile 1.0.2", "serde", "serde_json", "serde_urlencoded", "tokio", "tokio-rustls 0.24.0", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 0.25.2", + "winreg 0.50.0", +] + +[[package]] +name = "reqwest" +version = "0.12.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7d6d2a27d57148378eb5e111173f4276ad26340ecc5c49a4a2152167a2d6a37" +dependencies = [ + "async-compression 0.4.6", + "base64 0.22.1", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "h2 0.4.5", + "http 1.1.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.4.1", + "hyper-rustls 0.27.2", + "hyper-util", + "ipnet", + "js-sys", + "log", + "mime", + "once_cell", + "percent-encoding", + "pin-project-lite", + "quinn 0.11.2", + "rustls 0.23.12", + "rustls-native-certs 0.7.1", + "rustls-pemfile 2.1.2", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper 1.0.1", + "tokio", + "tokio-rustls 0.26.0", "tokio-util 0.7.10 (registry+https://github.com/rust-lang/crates.io-index)", "tower-service", "url", @@ -10165,43 +10381,42 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 0.25.2", - "winreg", + "webpki-roots 0.26.3", + "winreg 0.52.0", ] [[package]] name = "reqwest-middleware" -version = "0.2.4" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88a3e86aa6053e59030e7ce2d2a3b258dd08fc2d337d52f73f6cb480f5858690" +checksum = "39346a33ddfe6be00cbc17a34ce996818b97b230b87229f10114693becca1268" dependencies = [ "anyhow", "async-trait", - "http", - "reqwest", + "http 1.1.0", + "reqwest 0.12.5", "serde", - "task-local-extensions", "thiserror", + "tower-service", ] [[package]] name = "reqwest-retry" -version = "0.3.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f" +checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5" dependencies = [ "anyhow", "async-trait", "chrono", "futures", "getrandom 0.2.9", - "http", - "hyper", + "http 1.1.0", + "hyper 1.4.1", "parking_lot 0.11.2", - "reqwest", + "reqwest 0.12.5", "reqwest-middleware", "retry-policies", - "task-local-extensions", "tokio", "tracing", "wasm-timer", @@ -10209,9 +10424,9 @@ dependencies = [ [[package]] name = "retry-policies" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd" +checksum = "493b4243e32d6eedd29f9a398896e35c6943a123b55eec97dcaee98310d25810" dependencies = [ "anyhow", "chrono", @@ -10409,8 +10624,8 @@ dependencies = [ "bytes", "crc32fast", "futures", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "hyper-rustls 0.23.2", "lazy_static", "log", @@ -10433,7 +10648,7 @@ dependencies = [ "chrono", "dirs-next", "futures", - "hyper", + "hyper 0.14.26", "serde", "serde_json", "shlex", @@ -10468,8 +10683,8 @@ dependencies = [ "futures", "hex", "hmac 0.11.0", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "log", "md-5 0.9.1", "percent-encoding", @@ -10673,6 +10888,20 @@ dependencies = [ "sct", ] +[[package]] +name = "rustls" +version = "0.23.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +dependencies = [ + "once_cell", + "ring 0.17.3", + "rustls-pki-types", + "rustls-webpki 0.102.6", + "subtle", + "zeroize", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -10680,7 +10909,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0167bac7a9f490495f3c33013e7722b53cb087ecbe082fb0c6387c96f634ea50" dependencies = [ "openssl-probe", - "rustls-pemfile", + "rustls-pemfile 1.0.2", + "schannel", + "security-framework", +] + +[[package]] +name = "rustls-native-certs" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba" +dependencies = [ + "openssl-probe", + "rustls-pemfile 2.1.2", + "rustls-pki-types", "schannel", "security-framework", ] @@ -10694,6 +10936,22 @@ dependencies = [ "base64 0.21.2", ] +[[package]] +name = "rustls-pemfile" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d" +dependencies = [ + "base64 0.22.1", + "rustls-pki-types", +] + +[[package]] +name = "rustls-pki-types" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d" + [[package]] name = "rustls-webpki" version = "0.100.3" @@ -10714,6 +10972,17 @@ dependencies = [ "untrusted 0.9.0", ] +[[package]] +name = "rustls-webpki" +version = "0.102.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +dependencies = [ + "ring 0.17.3", + "rustls-pki-types", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" version = "1.0.11" @@ -10769,9 +11038,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.12" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b4b9743ed687d4b4bcedf9ff5eaa7398495ae14e61cba0a295704edbc7decde" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "salsa20" @@ -11586,25 +11855,27 @@ checksum = "5e9f0ab6ef7eb7353d9119c170a436d1bf248eea575ac42d19d12f4e34130831" [[package]] name = "snowflake-api" -version = "0.7.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6e20db2ea77690628e34db7a6f63f539557195afbbc3cd349a8cbe293e1fffc" +checksum = "1c7f29746a86845a74953b3728029b378c9bac2fb15c2defd54a8177cabcc452" dependencies = [ "arrow", "async-trait", - "base64 0.21.2", + "base64 0.22.1", "bytes", "futures", + "glob", "log", - "object_store 0.9.0", + "object_store", "regex", - "reqwest", + "reqwest 0.12.5", "reqwest-middleware", "reqwest-retry", "serde", "serde_json", "snowflake-jwt", "thiserror", + "tokio", "url", "uuid 1.2.2", ] @@ -11653,7 +11924,7 @@ dependencies = [ "base64 0.13.1", "bytes", "futures", - "http", + "http 0.2.9", "httparse", "log", "rand 0.8.5", @@ -11845,7 +12116,7 @@ dependencies = [ "fastcrypto-zkp", "fs_extra", "futures", - "http", + "http 0.2.9", "im", "inquire", "insta", @@ -11865,7 +12136,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.12.5", "rusoto_core", "rusoto_kms", "rustyline", @@ -12059,7 +12330,7 @@ dependencies = [ "move-core-types", "mysten-metrics", "num_enum 0.6.1", - "object_store 0.7.0", + "object_store", "parquet", "prometheus", "rocksdb", @@ -12115,7 +12386,7 @@ dependencies = [ "move-core-types", "move-package", "num_enum 0.6.1", - "object_store 0.7.0", + "object_store", "prometheus", "rand 0.8.5", "serde", @@ -12161,7 +12432,7 @@ dependencies = [ "narwhal-config", "prettytable-rs", "prometheus-parse", - "reqwest", + "reqwest 0.12.5", "russh", "russh-keys", "serde", @@ -12251,7 +12522,7 @@ dependencies = [ "once_cell", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "rocksdb", "serde", "serde_json", @@ -12286,7 +12557,7 @@ dependencies = [ "fastcrypto", "futures", "move-core-types", - "reqwest", + "reqwest 0.12.5", "serde", "serde_json", "serde_with 3.8.1", @@ -12349,7 +12620,7 @@ dependencies = [ "move-core-types", "prometheus", "regex", - "reqwest", + "reqwest 0.12.5", "serde_json", "shared-crypto", "sui-config", @@ -12387,11 +12658,11 @@ dependencies = [ "fastcrypto", "insta", "narwhal-config", - "object_store 0.7.0", + "object_store", "once_cell", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "serde", "serde_with 3.8.1", "serde_yaml 0.8.26", @@ -12457,7 +12728,7 @@ dependencies = [ "nonempty", "num-bigint 0.4.4", "num_cpus", - "object_store 0.7.0", + "object_store", "once_cell", "parking_lot 0.12.1", "pprof", @@ -12465,7 +12736,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "rayon", - "reqwest", + "reqwest 0.12.5", "roaring", "rocksdb", "rstest", @@ -12551,7 +12822,7 @@ dependencies = [ "futures", "mysten-metrics", "notify", - "object_store 0.7.0", + "object_store", "prometheus", "rand 0.8.5", "serde", @@ -12579,7 +12850,7 @@ dependencies = [ "futures", "mysten-metrics", "notify", - "object_store 0.7.0", + "object_store", "prometheus", "rand 0.8.5", "serde", @@ -12724,7 +12995,7 @@ dependencies = [ "clap", "eyre", "futures", - "http", + "http 0.2.9", "mysten-metrics", "parking_lot 0.12.1", "prometheus", @@ -12875,8 +13146,8 @@ dependencies = [ "fastcrypto-zkp", "futures", "hex", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "im", "insta", "itertools 0.10.5", @@ -12893,7 +13164,7 @@ dependencies = [ "prometheus", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.12.5", "serde", "serde_json", "serde_with 3.8.1", @@ -12936,8 +13207,8 @@ version = "0.1.0" dependencies = [ "async-graphql", "axum", - "hyper", - "reqwest", + "hyper 0.14.26", + "reqwest 0.12.5", "serde_json", "sui-graphql-rpc-headers", "thiserror", @@ -13044,7 +13315,7 @@ dependencies = [ "eyre", "fastcrypto", "futures", - "hyper", + "hyper 0.14.26", "indexmap 2.2.6", "itertools 0.10.5", "jsonrpsee", @@ -13109,13 +13380,13 @@ dependencies = [ "anyhow", "async-trait", "bcs", - "hyper", + "hyper 0.14.26", "jsonrpsee", "move-core-types", "move-package", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "sui-config", "sui-core", "sui-json", @@ -13233,7 +13504,7 @@ dependencies = [ "humantime", "once_cell", "prometheus-http-query", - "reqwest", + "reqwest 0.12.5", "serde", "serde_yaml 0.9.21", "strum_macros 0.24.3", @@ -13462,7 +13733,7 @@ dependencies = [ "narwhal-network", "narwhal-worker", "prometheus", - "reqwest", + "reqwest 0.12.5", "serde", "snap", "sui-archival", @@ -13539,7 +13810,7 @@ dependencies = [ "once_cell", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "serde", "serde_json", "shared-crypto", @@ -13576,7 +13847,7 @@ dependencies = [ "async-trait", "bcs", "eyre", - "hyper", + "hyper 0.14.26", "insta", "lru 0.10.0", "move-binary-format", @@ -13640,8 +13911,8 @@ dependencies = [ "const-str", "fastcrypto", "hex", - "http-body", - "hyper", + "http-body 0.4.5", + "hyper 0.14.26", "ipnetwork", "itertools 0.10.5", "mime", @@ -13653,9 +13924,9 @@ dependencies = [ "prost-build", "protobuf", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "rustls 0.21.12", - "rustls-pemfile", + "rustls-pemfile 1.0.2", "serde", "serde_json", "serde_with 3.8.1", @@ -13680,7 +13951,7 @@ dependencies = [ "bcs", "clap", "futures", - "http", + "http 0.2.9", "jsonrpsee", "lru 0.10.0", "move-binary-format", @@ -13734,7 +14005,7 @@ dependencies = [ "openapiv3", "prometheus", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "schemars", "serde", "serde_json", @@ -13761,12 +14032,12 @@ dependencies = [ "eyre", "fastcrypto", "futures", - "hyper", + "hyper 0.14.26", "move-core-types", "mysten-metrics", "once_cell", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "serde", "serde_json", "shared-crypto", @@ -13857,7 +14128,7 @@ dependencies = [ "jsonrpsee", "move-core-types", "rand 0.8.5", - "reqwest", + "reqwest 0.12.5", "serde", "serde_json", "serde_with 3.8.1", @@ -13888,7 +14159,7 @@ dependencies = [ "lexical-util", "mysten-metrics", "prometheus", - "reqwest", + "reqwest 0.12.5", "serde", "serde_json", "snowflake-api", @@ -13969,7 +14240,7 @@ dependencies = [ "indicatif", "integer-encoding", "num_enum 0.6.1", - "object_store 0.7.0", + "object_store", "prometheus", "serde", "serde_json", @@ -14025,7 +14296,7 @@ dependencies = [ "clap", "expect-test", "fs_extra", - "hyper", + "hyper 0.14.26", "jsonrpsee", "move-compiler", "move-core-types", @@ -14033,7 +14304,7 @@ dependencies = [ "move-symbol-pool", "mysten-metrics", "prometheus", - "reqwest", + "reqwest 0.12.5", "serde", "sui", "sui-json-rpc-types", @@ -14069,7 +14340,7 @@ dependencies = [ "eyre", "fastcrypto", "futures", - "hyper", + "hyper 0.14.26", "hyper-rustls 0.24.0", "indicatif", "integer-encoding", @@ -14081,13 +14352,13 @@ dependencies = [ "mysten-metrics", "num_cpus", "num_enum 0.6.1", - "object_store 0.7.0", + "object_store", "once_cell", "parking_lot 0.12.1", "percent-encoding", "pretty_assertions", "prometheus", - "reqwest", + "reqwest 0.12.5", "rocksdb", "serde", "serde_json", @@ -14194,7 +14465,7 @@ dependencies = [ name = "sui-telemetry" version = "0.1.0" dependencies = [ - "reqwest", + "reqwest 0.12.5", "serde", "sui-core", "tracing", @@ -14229,7 +14500,7 @@ dependencies = [ "pkcs8 0.9.0", "rand 0.8.5", "rcgen", - "reqwest", + "reqwest 0.12.5", "rustls 0.21.12", "rustls-webpki 0.101.7", "tokio", @@ -14261,7 +14532,7 @@ dependencies = [ "narwhal-storage", "narwhal-types", "num_cpus", - "object_store 0.7.0", + "object_store", "prometheus", "rocksdb", "ron", @@ -14545,7 +14816,7 @@ dependencies = [ "mysten-metrics", "mysten-service", "notify", - "object_store 0.7.0", + "object_store", "prometheus", "rand 0.8.5", "serde", @@ -14581,7 +14852,7 @@ dependencies = [ "prettytable-rs", "rand 0.8.5", "regex", - "reqwest", + "reqwest 0.12.5", "semver 1.0.16", "serde", "serde_json", @@ -14680,6 +14951,12 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" +[[package]] +name = "sync_wrapper" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7065abeca94b6a8a577f9bd45aa0867a2238b74e8eb67cf10d492bc39351394" + [[package]] name = "synstructure" version = "0.12.6" @@ -14782,15 +15059,6 @@ dependencies = [ "target-lexicon", ] -[[package]] -name = "task-local-extensions" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8" -dependencies = [ - "pin-utils", -] - [[package]] name = "telemetry-subscribers" version = "0.2.0" @@ -15200,6 +15468,17 @@ dependencies = [ "tokio", ] +[[package]] +name = "tokio-rustls" +version = "0.26.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" +dependencies = [ + "rustls 0.23.12", + "rustls-pki-types", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.14" @@ -15345,10 +15624,10 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-timeout", "percent-encoding", "pin-project", @@ -15372,10 +15651,10 @@ dependencies = [ "axum", "base64 0.21.2", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-timeout", "percent-encoding", "pin-project", @@ -15399,10 +15678,10 @@ dependencies = [ "axum", "base64 0.21.2", "bytes", - "h2", - "http", - "http-body", - "hyper", + "h2 0.3.26", + "http 0.2.9", + "http-body 0.4.5", + "hyper 0.14.26", "hyper-timeout", "percent-encoding", "pin-project", @@ -15487,8 +15766,8 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "http", - "http-body", + "http 0.2.9", + "http-body 0.4.5", "http-range-header", "httpdate", "iri-string", @@ -15719,7 +15998,7 @@ dependencies = [ "byteorder", "bytes", "data-encoding", - "http", + "http 0.2.9", "httparse", "log", "rand 0.8.5", @@ -15978,12 +16257,12 @@ dependencies = [ [[package]] name = "url" -version = "2.3.1" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna", "percent-encoding", "serde", ] @@ -16178,9 +16457,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.33" +version = "0.4.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23639446165ca5a5de86ae1d8896b737ae80319560fbaa4c2887b7da6e7ebd7d" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" dependencies = [ "cfg-if", "js-sys", @@ -16219,9 +16498,9 @@ checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" [[package]] name = "wasm-streams" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4609d447824375f43e1ffbc051b50ad8f4b3ae8219680c94452ea05eb240ac7" +checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" dependencies = [ "futures-util", "js-sys", @@ -16247,9 +16526,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.60" +version = "0.3.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcda906d8be16e728fd5adc5b729afad4e444e106ab28cd1c7256e54fa61510f" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" dependencies = [ "js-sys", "wasm-bindgen", @@ -16289,6 +16568,15 @@ version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" +[[package]] +name = "webpki-roots" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd7c23921eeb1713a4e851530e9b9756e4fb0e89978582942612524cf09f01cd" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "which" version = "4.3.0" @@ -16589,6 +16877,16 @@ dependencies = [ "windows-sys 0.48.0", ] +[[package]] +name = "winreg" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5" +dependencies = [ + "cfg-if", + "windows-sys 0.48.0", +] + [[package]] name = "ws_stream_wasm" version = "0.7.4" @@ -16711,14 +17009,14 @@ dependencies = [ "async-trait", "base64 0.13.1", "futures", - "http", - "hyper", + "http 0.2.9", + "hyper 0.14.26", "hyper-rustls 0.24.0", "itertools 0.10.5", "log", "percent-encoding", "rustls 0.21.12", - "rustls-pemfile", + "rustls-pemfile 1.0.2", "seahash", "serde", "serde_json", diff --git a/Cargo.toml b/Cargo.toml index 3d36fc9cd1de0..6d46fb2c803e0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -237,7 +237,8 @@ opt-level = 1 # Dependencies that should be kept in sync through the whole workspace [workspace.dependencies] anyhow = "1.0.71" -arrow-array = "50.0.0" +arrow = "52" +arrow-array = "52" arc-swap = { version = "1.5.1", features = ["serde"] } assert_cmd = "2.0.6" async-graphql = "6.0.7" @@ -387,18 +388,18 @@ ntest = "0.9.0" num-bigint = "0.4.4" num_cpus = "1.15.0" num_enum = "0.6.1" -object_store = { version = "0.7", features = ["aws", "gcp", "azure", "http"] } +object_store = { version = "0.10", features = ["aws", "gcp", "azure", "http"] } once_cell = "1.18.0" ouroboros = "0.17" parking_lot = "0.12.1" -parquet = "50.0.0" +parquet = "52" pkcs8 = { version = "0.9.0", features = ["std"] } pprof = { version = "0.11.0", features = ["cpp", "frame-pointer"] } pretty_assertions = "1.3.0" prettytable-rs = "0.10.0" proc-macro2 = "1.0.47" prometheus = "0.13.3" -prometheus-http-query = { version = "0.6.6", default_features = false, features = [ +prometheus-http-query = { version = "0.8", default_features = false, features = [ "rustls-tls", ] } prometheus-parse = { git = "https://github.com/asonnino/prometheus-parser.git", rev = "75334db" } @@ -414,7 +415,7 @@ rand = "0.8.5" rayon = "1.5.3" rcgen = "0.9.2" regex = "1.7.1" -reqwest = { version = "0.11.20", default_features = false, features = [ +reqwest = { version = "0.12", default_features = false, features = [ "blocking", "json", "rustls-tls", @@ -465,6 +466,7 @@ similar = "2.4.0" slip10_ed25519 = "0.1.3" smallvec = "1.10.0" snap = "1.1.0" +snowflake-api = "0.9.0" static_assertions = "1.1.0" strum = { version = "0.24", features = ["derive"] } strum_macros = "0.24.3" @@ -506,7 +508,6 @@ tower-http = { version = "0.3.4", features = [ "set-header", "propagate-header", ] } -# tower-http = { version="0.4", features = ["trace"] } tower-layer = "0.3.2" twox-hash = "1.6.3" tracing = "0.1.37" @@ -565,10 +566,10 @@ move-abstract-interpreter = { path = "external-crates/move/crates/move-abstract- move-abstract-stack = { path = "external-crates/move/crates/move-abstract-stack" } move-analyzer = { path = "external-crates/move/crates/move-analyzer" } -fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a3d5b18b7ca9370e099a7dbb25aca276af580608" } -fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a3d5b18b7ca9370e099a7dbb25aca276af580608" } -fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a3d5b18b7ca9370e099a7dbb25aca276af580608", package = "fastcrypto-zkp" } -fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "a3d5b18b7ca9370e099a7dbb25aca276af580608", features = ["experimental"] } +fastcrypto = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597" } +fastcrypto-tbls = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597" } +fastcrypto-zkp = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", package = "fastcrypto-zkp" } +fastcrypto-vdf = { git = "https://github.com/MystenLabs/fastcrypto", rev = "5f2c63266a065996d53f98156f0412782b468597", features = ["experimental"] } passkey-types = { version = "0.2.0" } passkey-client = { version = "0.2.0" } passkey-authenticator = { version = "0.2.0" } diff --git a/crates/sui-analytics-indexer/Cargo.toml b/crates/sui-analytics-indexer/Cargo.toml index 64f0442575c9b..af30cd0811d6b 100644 --- a/crates/sui-analytics-indexer/Cargo.toml +++ b/crates/sui-analytics-indexer/Cargo.toml @@ -52,10 +52,10 @@ move-bytecode-utils.workspace = true sui-json-rpc-types.workspace = true sui-package-resolver.workspace = true simulacrum.workspace = true -arrow = { version = "50.0.0"} +arrow.workspace = true gcp-bigquery-client = "0.18.0" -snowflake-api = { version = "0.7.0" } -tap = { version = "1.0.1", features = [] } +snowflake-api.workspace = true +tap.workspace = true [dev-dependencies] diff --git a/crates/sui-data-ingestion/src/workers/archival.rs b/crates/sui-data-ingestion/src/workers/archival.rs index faf1fe76d5aec..a2692b6c3b4d6 100644 --- a/crates/sui-data-ingestion/src/workers/archival.rs +++ b/crates/sui-data-ingestion/src/workers/archival.rs @@ -118,7 +118,7 @@ impl ArchivalWorker { let bytes = finalize_manifest(manifest)?; self.remote_store - .put(&Path::from("MANIFEST"), bytes) + .put(&Path::from("MANIFEST"), bytes.into()) .await?; Ok(()) } @@ -133,7 +133,7 @@ impl ArchivalWorker { let mut cursor = Cursor::new(buffer); compress(&mut cursor, &mut compressed_buffer)?; self.remote_store - .put(&location, Bytes::from(compressed_buffer.clone())) + .put(&location, Bytes::from(compressed_buffer.clone()).into()) .await?; Ok(Bytes::from(compressed_buffer)) } diff --git a/crates/sui-data-ingestion/src/workers/blob.rs b/crates/sui-data-ingestion/src/workers/blob.rs index 24a1b546fee0b..f7367a8cf9b1e 100644 --- a/crates/sui-data-ingestion/src/workers/blob.rs +++ b/crates/sui-data-ingestion/src/workers/blob.rs @@ -38,7 +38,9 @@ impl Worker for BlobWorker { "{}.chk", checkpoint.checkpoint_summary.sequence_number )); - self.remote_store.put(&location, Bytes::from(bytes)).await?; + self.remote_store + .put(&location, Bytes::from(bytes).into()) + .await?; Ok(()) } } diff --git a/crates/sui-graphql-rpc-client/src/lib.rs b/crates/sui-graphql-rpc-client/src/lib.rs index d1615bb8a91b6..ad15df92712f7 100644 --- a/crates/sui-graphql-rpc-client/src/lib.rs +++ b/crates/sui-graphql-rpc-client/src/lib.rs @@ -2,7 +2,7 @@ // SPDX-License-Identifier: Apache-2.0 use async_graphql::Value; -use hyper::header::ToStrError; +use reqwest::header::ToStrError; use serde_json::Number; pub mod response; diff --git a/crates/sui-graphql-rpc-client/src/response.rs b/crates/sui-graphql-rpc-client/src/response.rs index 870c0d21f9dc1..807861111d967 100644 --- a/crates/sui-graphql-rpc-client/src/response.rs +++ b/crates/sui-graphql-rpc-client/src/response.rs @@ -3,8 +3,7 @@ use super::ClientError; use async_graphql::{Response, ServerError, Value}; -use axum::http::HeaderName; -use hyper::HeaderMap; +use reqwest::header::{HeaderMap, HeaderName}; use reqwest::Response as ReqwestResponse; use serde_json::json; use std::{collections::BTreeMap, net::SocketAddr}; @@ -14,8 +13,8 @@ use sui_graphql_rpc_headers::VERSION_HEADER; pub struct GraphqlResponse { headers: HeaderMap, remote_address: Option, - http_version: hyper::Version, - status: hyper::StatusCode, + http_version: reqwest::Version, + status: reqwest::StatusCode, full_response: Response, } @@ -39,7 +38,7 @@ impl GraphqlResponse { pub fn graphql_version(&self) -> Result { Ok(self .headers - .get(&VERSION_HEADER) + .get(VERSION_HEADER.as_str()) .ok_or(ClientError::ServiceVersionHeaderNotFound)? .to_str() .map_err(|e| ClientError::ServiceVersionHeaderValueInvalidString { error: e })? @@ -58,11 +57,11 @@ impl GraphqlResponse { serde_json::to_string_pretty(&self.full_response).unwrap() } - pub fn http_status(&self) -> hyper::StatusCode { + pub fn http_status(&self) -> reqwest::StatusCode { self.status } - pub fn http_version(&self) -> hyper::Version { + pub fn http_version(&self) -> reqwest::Version { self.http_version } diff --git a/crates/sui-graphql-rpc-client/src/simple_client.rs b/crates/sui-graphql-rpc-client/src/simple_client.rs index 3fcfc9117334b..6f7d2054e5f8e 100644 --- a/crates/sui-graphql-rpc-client/src/simple_client.rs +++ b/crates/sui-graphql-rpc-client/src/simple_client.rs @@ -2,8 +2,8 @@ // SPDX-License-Identifier: Apache-2.0 use crate::ClientError; -use axum::http::HeaderValue; -use hyper::header; +use reqwest::header; +use reqwest::header::HeaderValue; use reqwest::Response; use serde_json::Value; use std::collections::BTreeMap; @@ -52,7 +52,10 @@ impl SimpleClient { mut headers: Vec<(header::HeaderName, header::HeaderValue)>, ) -> Result { if get_usage { - headers.push((LIMITS_HEADER.clone(), HeaderValue::from_static("true"))); + headers.push(( + LIMITS_HEADER.clone().as_str().try_into().unwrap(), + HeaderValue::from_static("true"), + )); } GraphqlResponse::from_resp(self.execute_impl(query, variables, headers, false).await?).await } diff --git a/crates/sui-graphql-rpc/src/server/builder.rs b/crates/sui-graphql-rpc/src/server/builder.rs index b0afb65b57cd5..51fd2ada86411 100644 --- a/crates/sui-graphql-rpc/src/server/builder.rs +++ b/crates/sui-graphql-rpc/src/server/builder.rs @@ -1076,10 +1076,10 @@ pub mod tests { server_builder.build_schema(); let resp = reqwest::get(&url).await.unwrap(); - assert_eq!(resp.status(), StatusCode::OK); + assert_eq!(resp.status(), reqwest::StatusCode::OK); let url_with_param = format!("{}?max_checkpoint_lag_ms=1", url); let resp = reqwest::get(&url_with_param).await.unwrap(); - assert_eq!(resp.status(), StatusCode::GATEWAY_TIMEOUT); + assert_eq!(resp.status(), reqwest::StatusCode::GATEWAY_TIMEOUT); } } diff --git a/crates/sui-graphql-rpc/tests/e2e_tests.rs b/crates/sui-graphql-rpc/tests/e2e_tests.rs index b0c43867b68b2..ddb28fd7bf876 100644 --- a/crates/sui-graphql-rpc/tests/e2e_tests.rs +++ b/crates/sui-graphql-rpc/tests/e2e_tests.rs @@ -160,7 +160,7 @@ mod tests { .unwrap(); assert_eq!(res.http_status().as_u16(), 200); - assert_eq!(res.http_version(), hyper::Version::HTTP_11); + assert_eq!(res.http_version(), reqwest::Version::HTTP_11); assert!(res.graphql_version().unwrap().len() >= 5); assert!(res.errors().is_empty()); diff --git a/crates/sui-metric-checker/src/lib.rs b/crates/sui-metric-checker/src/lib.rs index d397870662085..b21296b589128 100644 --- a/crates/sui-metric-checker/src/lib.rs +++ b/crates/sui-metric-checker/src/lib.rs @@ -133,9 +133,9 @@ pub fn fails_threshold_condition( } fn unix_seconds_to_timestamp_string(unix_seconds: i64) -> String { - let datetime = NaiveDateTime::from_timestamp_opt(unix_seconds, 0); - let timestamp: DateTime = DateTime::from_naive_utc_and_offset(datetime.unwrap(), Utc); - timestamp.to_string() + DateTime::from_timestamp(unix_seconds, 0) + .unwrap() + .to_string() } #[cfg(test)] diff --git a/crates/sui-node/src/metrics.rs b/crates/sui-node/src/metrics.rs index bf51e21e089a3..7ea4b781b81a9 100644 --- a/crates/sui-node/src/metrics.rs +++ b/crates/sui-node/src/metrics.rs @@ -1,6 +1,5 @@ // Copyright (c) Mysten Labs, Inc. // SPDX-License-Identifier: Apache-2.0 -use axum::http::header; use mysten_network::metrics::MetricsCallbackProvider; use prometheus::{ register_histogram_vec_with_registry, register_int_counter_vec_with_registry, @@ -105,7 +104,7 @@ pub fn start_metrics_push_task(config: &sui_config::NodeConfig, registry: Regist .client() .post(url.to_owned()) .header(reqwest::header::CONTENT_ENCODING, "snappy") - .header(header::CONTENT_TYPE, PROTOBUF_FORMAT) + .header(reqwest::header::CONTENT_TYPE, PROTOBUF_FORMAT) .body(compressed) .send() .await?; diff --git a/crates/sui-oracle/Cargo.toml b/crates/sui-oracle/Cargo.toml index 2be3fc99b2b31..4c616fa80ee74 100644 --- a/crates/sui-oracle/Cargo.toml +++ b/crates/sui-oracle/Cargo.toml @@ -13,7 +13,7 @@ prometheus = "0.13.3" tokio = { workspace = true, features = ["full"] } tracing = "0.1.36" once_cell.workspace = true -reqwest = { version = "0.11.13", default_features = false, features = ["blocking", "json", "rustls-tls"] } +reqwest.workspace = true serde = { version = "1.0.144", features = ["derive", "rc"] } serde_json = { version = "1.0.1" } jsonpath_lib = "0.3.0" diff --git a/crates/sui-proxy/src/lib.rs b/crates/sui-proxy/src/lib.rs index d32e8e6740c0d..c858b4568ef2d 100644 --- a/crates/sui-proxy/src/lib.rs +++ b/crates/sui-proxy/src/lib.rs @@ -40,7 +40,7 @@ mod tests { use crate::prom_to_mimir::tests::*; use crate::{admin::CertKeyPair, config::RemoteWriteConfig, peers::SuiNodeProvider}; - use axum::http::{header, StatusCode}; + use axum::http::StatusCode; use axum::routing::post; use axum::Router; use multiaddr::Multiaddr; @@ -170,7 +170,7 @@ mod tests { let res = client .post(&server_url) - .header(header::CONTENT_TYPE, PROTOBUF_FORMAT) + .header(reqwest::header::CONTENT_TYPE, PROTOBUF_FORMAT) .body(buf) .send() .await @@ -178,6 +178,6 @@ mod tests { let status = res.status(); let body = res.text().await.unwrap(); assert_eq!("created", body); - assert_eq!(status, StatusCode::CREATED); + assert_eq!(status, reqwest::StatusCode::CREATED); } } diff --git a/crates/sui-rest-api/src/response.rs b/crates/sui-rest-api/src/response.rs index a3548a762072b..deb57c8dd5dcf 100644 --- a/crates/sui-rest-api/src/response.rs +++ b/crates/sui-rest-api/src/response.rs @@ -3,10 +3,9 @@ use axum::{ extract::State, - http::HeaderMap, + http::{HeaderMap, StatusCode}, response::{IntoResponse, Response}, }; -use reqwest::StatusCode; use crate::{ content_type::ContentType, diff --git a/crates/sui-sdk/src/lib.rs b/crates/sui-sdk/src/lib.rs index 8841fb7d64d27..945a0e0ba5c86 100644 --- a/crates/sui-sdk/src/lib.rs +++ b/crates/sui-sdk/src/lib.rs @@ -222,7 +222,8 @@ impl SuiClientBuilder { let auth = base64::engine::general_purpose::STANDARD .encode(format!("{}:{}", username, password)); headers.insert( - reqwest::header::AUTHORIZATION, + "authorization", + // reqwest::header::AUTHORIZATION, HeaderValue::from_str(&format!("Basic {}", auth)).unwrap(), ); } diff --git a/crates/sui-security-watchdog/Cargo.toml b/crates/sui-security-watchdog/Cargo.toml index 94c4d88433f9c..5cd19eb5f2b9c 100644 --- a/crates/sui-security-watchdog/Cargo.toml +++ b/crates/sui-security-watchdog/Cargo.toml @@ -15,7 +15,7 @@ tokio.workspace = true tracing.workspace = true anyhow.workspace = true chrono.workspace = true -snowflake-api = { version = "0.7.0"} +snowflake-api.workspace = true tokio-cron-scheduler = "0.10.0" clap.workspace = true prometheus.workspace = true @@ -24,4 +24,4 @@ async-trait.workspace = true uuid.workspace = true lexical-util = "0.8.5" reqwest = { workspace = true, features = ["json"] } -env_logger = "0.11.3" \ No newline at end of file +env_logger = "0.11.3" diff --git a/crates/sui-source-validation-service/Cargo.toml b/crates/sui-source-validation-service/Cargo.toml index 67c8040864983..56b3b24c04e8b 100644 --- a/crates/sui-source-validation-service/Cargo.toml +++ b/crates/sui-source-validation-service/Cargo.toml @@ -45,7 +45,7 @@ tower-http.workspace = true [dev-dependencies] expect-test = "1.4.0" fs_extra = "1.3.0" -reqwest = { version = "0.11", default-features = false, features = ["rustls-tls"] } +reqwest.workspace = true sui.workspace = true sui-move = { workspace = true, features = ["all"] } diff --git a/crates/sui-storage/src/http_key_value_store.rs b/crates/sui-storage/src/http_key_value_store.rs index 5188c4128e016..9232bdfb1bc50 100644 --- a/crates/sui-storage/src/http_key_value_store.rs +++ b/crates/sui-storage/src/http_key_value_store.rs @@ -4,11 +4,9 @@ use async_trait::async_trait; use bytes::Bytes; use futures::stream::{self, StreamExt}; -use hyper::client::HttpConnector; -use hyper::header::{HeaderValue, CONTENT_LENGTH}; -use hyper::Client; -use hyper::Uri; -use hyper_rustls::{HttpsConnector, HttpsConnectorBuilder}; +use reqwest::header::{HeaderValue, CONTENT_LENGTH}; +use reqwest::Client; +use reqwest::Url; use serde::{Deserialize, Serialize}; use std::str::FromStr; use std::sync::Arc; @@ -28,14 +26,13 @@ use sui_types::{ }; use tap::TapFallible; use tracing::{error, info, instrument, trace, warn}; -use url::Url; use crate::key_value_store::{TransactionKeyValueStore, TransactionKeyValueStoreTrait}; use crate::key_value_store_metrics::KeyValueStoreMetrics; pub struct HttpKVStore { base_url: Url, - client: Arc>>, + client: Client, } pub fn encode_digest>(digest: &T) -> String { @@ -126,15 +123,8 @@ impl HttpKVStore { pub fn new(base_url: &str) -> SuiResult { info!("creating HttpKVStore with base_url: {}", base_url); - let http = HttpsConnectorBuilder::new() - .with_webpki_roots() - .https_or_http() - .enable_http2() - .build(); - let client = Client::builder() - .http2_only(true) - .build::<_, hyper::Body>(http); + let client = Client::builder().http2_prior_knowledge().build().unwrap(); let base_url = if base_url.ends_with('/') { base_url.to_string() @@ -144,19 +134,16 @@ impl HttpKVStore { let base_url = Url::parse(&base_url).into_sui_result()?; - Ok(Self { - base_url, - client: Arc::new(client), - }) + Ok(Self { base_url, client }) } - fn get_url(&self, key: &Key) -> SuiResult { + fn get_url(&self, key: &Key) -> SuiResult { let (digest, item_type) = key_to_path_elements(key)?; let joined = self .base_url .join(&format!("{}/{}", digest, item_type)) .into_sui_result()?; - Uri::from_str(joined.as_str()).into_sui_result() + Url::from_str(joined.as_str()).into_sui_result() } async fn multi_fetch(&self, uris: Vec) -> Vec>> { @@ -165,18 +152,23 @@ impl HttpKVStore { uris_vec .into_iter() .enumerate() - .map(|(_i, uri)| self.fetch(uri)), + .map(|(_i, url)| self.fetch(url)), ); fetches.buffered(uris.len()).collect::>().await } async fn fetch(&self, key: Key) -> SuiResult> { - let uri = self.get_url(&key)?; - trace!("fetching uri: {}", uri); - let resp = self.client.get(uri.clone()).await.into_sui_result()?; + let url = self.get_url(&key)?; + trace!("fetching url: {}", url); + let resp = self + .client + .get(url.clone()) + .send() + .await + .into_sui_result()?; trace!( - "got response {} for uri: {}, len: {:?}", - uri, + "got response {} for url: {}, len: {:?}", + url, resp.status(), resp.headers() .get(CONTENT_LENGTH) @@ -184,10 +176,7 @@ impl HttpKVStore { ); // return None if 400 if resp.status().is_success() { - hyper::body::to_bytes(resp.into_body()) - .await - .map(Some) - .into_sui_result() + resp.bytes().await.map(Some).into_sui_result() } else { Ok(None) } diff --git a/crates/sui-storage/src/object_store/http/mod.rs b/crates/sui-storage/src/object_store/http/mod.rs index dfdd5ad97f084..280e8285e599b 100644 --- a/crates/sui-storage/src/object_store/http/mod.rs +++ b/crates/sui-storage/src/object_store/http/mod.rs @@ -90,6 +90,7 @@ async fn get( range: 0..meta.size, payload: GetResultPayload::Stream(stream), meta, + attributes: object_store::Attributes::new(), }) } @@ -118,6 +119,7 @@ fn header_meta(location: &Path, headers: &HeaderMap) -> Result { last_modified, size: content_length, e_tag: Some(e_tag.to_string()), + version: None, }) } diff --git a/crates/sui-storage/src/object_store/mod.rs b/crates/sui-storage/src/object_store/mod.rs index 60556c1ba7eb5..1ebfa595af66c 100644 --- a/crates/sui-storage/src/object_store/mod.rs +++ b/crates/sui-storage/src/object_store/mod.rs @@ -49,7 +49,7 @@ pub trait ObjectStoreListExt: Send + Sync + 'static { async fn list_objects( &self, src: Option<&Path>, - ) -> object_store::Result>>; + ) -> BoxStream<'_, object_store::Result>; } macro_rules! as_ref_list_ext_impl { @@ -59,7 +59,7 @@ macro_rules! as_ref_list_ext_impl { async fn list_objects( &self, src: Option<&Path>, - ) -> object_store::Result>> { + ) -> BoxStream<'_, object_store::Result> { self.as_ref().list_objects(src).await } } @@ -74,8 +74,8 @@ impl ObjectStoreListExt for Arc { async fn list_objects( &self, src: Option<&Path>, - ) -> object_store::Result>> { - self.list(src).await + ) -> BoxStream<'_, object_store::Result> { + self.list(src) } } @@ -102,7 +102,7 @@ as_ref_put_ext_impl!(Box); #[async_trait] impl ObjectStorePutExt for Arc { async fn put_bytes(&self, src: &Path, bytes: Bytes) -> Result<()> { - self.put(src, bytes).await?; + self.put(src, bytes.into()).await?; Ok(()) } } diff --git a/crates/sui-storage/src/object_store/util.rs b/crates/sui-storage/src/object_store/util.rs index 2954406fb8f3b..b672bf5ae2453 100644 --- a/crates/sui-storage/src/object_store/util.rs +++ b/crates/sui-storage/src/object_store/util.rs @@ -160,7 +160,7 @@ pub async fn copy_recursively Result> { let mut input_paths = vec![]; let mut output_paths = vec![]; - let mut paths = src_store.list_objects(Some(dir)).await?; + let mut paths = src_store.list_objects(Some(dir)).await; while let Some(res) = paths.next().await { if let Ok(object_metadata) = res { input_paths.push(object_metadata.location.clone()); @@ -207,7 +207,7 @@ pub async fn delete_recursively( concurrency: NonZeroUsize, ) -> Result> { let mut paths_to_delete = vec![]; - let mut paths = store.list_objects(Some(path)).await?; + let mut paths = store.list_objects(Some(path)).await; while let Some(res) = paths.next().await { if let Ok(object_metadata) = res { paths_to_delete.push(object_metadata.location); @@ -381,7 +381,7 @@ pub async fn write_snapshot_manifest( epoch_prefix: String, ) -> Result<()> { let mut file_names = vec![]; - let mut paths = store.list_objects(Some(dir)).await?; + let mut paths = store.list_objects(Some(dir)).await; while let Some(res) = paths.next().await { if let Ok(object_metadata) = res { // trim the "epoch_XX/" dir prefix here diff --git a/crates/sui/src/client_commands.rs b/crates/sui/src/client_commands.rs index 71804621752c2..09907f0941ede 100644 --- a/crates/sui/src/client_commands.rs +++ b/crates/sui/src/client_commands.rs @@ -18,7 +18,6 @@ use std::{ }; use anyhow::{anyhow, bail, ensure, Context}; -use axum::http::StatusCode; use bip32::DerivationPath; use clap::*; use colored::Colorize; @@ -26,6 +25,7 @@ use fastcrypto::{ encoding::{Base64, Encoding}, traits::ToFromBytes, }; +use reqwest::StatusCode; use move_binary_format::CompiledModule; use move_bytecode_verifier_meter::Scope; diff --git a/crates/suiop-cli/src/cli/lib/oauth/mod.rs b/crates/suiop-cli/src/cli/lib/oauth/mod.rs index db9c0a109b976..f33908e25c5f6 100644 --- a/crates/suiop-cli/src/cli/lib/oauth/mod.rs +++ b/crates/suiop-cli/src/cli/lib/oauth/mod.rs @@ -6,12 +6,12 @@ mod util; use std::net::SocketAddr; use anyhow::Result; -use axum::http::{HeaderMap, HeaderValue}; use axum::response::IntoResponse; use axum::{extract::Query, routing::get, Router}; use chrono; use dirs; use reqwest; +use reqwest::header::{HeaderMap, HeaderValue}; use serde::{Deserialize, Serialize}; use std::fs::{self, File}; use std::io::{self, Read, Write};