diff --git a/.cargo/config.toml b/.cargo/config.toml index 1359b47..4b613b5 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -1,2 +1,2 @@ [env] -NEARCORE_VERSION = "1.39.1-60c8ad8" +NEARCORE_VERSION = "1.40.0-rc.1-08941a3" diff --git a/CHANGELOG.md b/CHANGELOG.md index ac3f283..db9cc0f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.2.0-rc.1 + +* Upgrade Indexer Framework to be based on [nearcore 1.40.0-rc.1](https://github.com/near/nearcore/releases/tag/1.40.0-rc.1) +* Bump the minimal supported Rust version to `1.77.0` (following the `nearcore` master branch) +* Upgrade dependencies to the latest versions + ## 1.1.1 * Upgrade Indexer Framework to be based on version 1.39.1 and commit [60c8ad8](https://github.com/near/nearcore/commit/60c8ad88e5615e173963ac73e318db9337a17134) diff --git a/Cargo.lock b/Cargo.lock index 7283309..595cd24 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -23,7 +23,7 @@ dependencies = [ "pin-project-lite", "smallvec", "tokio", - "tokio-util 0.7.2", + "tokio-util", ] [[package]] @@ -40,7 +40,7 @@ dependencies = [ "memchr", "pin-project-lite", "tokio", - "tokio-util 0.7.2", + "tokio-util", ] [[package]] @@ -60,17 +60,17 @@ dependencies = [ [[package]] name = "actix-http" -version = "3.3.1" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2079246596c18b4a33e274ae10c0e50613f4d32a4198e09c7b93771013fed74" +checksum = "4eb9843d84c775696c37d9a418bbb01b932629d01870722c0f13eb3f95e2536d" dependencies = [ "actix-codec", "actix-rt", "actix-service", "actix-utils", - "ahash 0.8.8", - "base64 0.21.0", - "bitflags 1.3.2", + "ahash 0.8.11", + "base64 0.22.1", + "bitflags 2.4.1", "brotli", "bytes", "bytestring", @@ -79,7 +79,7 @@ dependencies = [ "flate2", "futures-core", "h2", - "http", + "http 0.2.12", "httparse", "httpdate", "itoa", @@ -88,11 +88,11 @@ dependencies = [ "mime", "percent-encoding", "pin-project-lite", - "rand 0.8.5", + "rand", "sha1", "smallvec", "tokio", - "tokio-util 0.7.2", + "tokio-util", "tracing", "zstd", ] @@ -115,7 +115,7 @@ checksum = "eb60846b52c118f2f04a56cc90880a274271c489b2498623d58176f8ca21fa80" dependencies = [ "bytestring", "firestorm", - "http", + "http 0.2.12", "log", "regex", "serde", @@ -145,7 +145,7 @@ dependencies = [ "futures-util", "mio", "num_cpus", - "socket2", + "socket2 0.4.9", "tokio", "tracing", ] @@ -172,12 +172,12 @@ dependencies = [ "actix-service", "actix-utils", "futures-core", - "http", + "http 0.2.12", "log", "openssl", "pin-project-lite", "tokio-openssl", - "tokio-util 0.7.2", + "tokio-util", ] [[package]] @@ -225,7 +225,7 @@ dependencies = [ "serde_json", "serde_urlencoded", "smallvec", - "socket2", + "socket2 0.4.9", "time", "url", ] @@ -283,19 +283,19 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.9", + "getrandom", "once_cell", "version_check", ] [[package]] name = "ahash" -version = "0.8.8" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42cd52102d3df161c77a887b608d7a4897d7cc112886a9537b738a887a03aaff" +checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" dependencies = [ "cfg-if 1.0.0", - "getrandom 0.2.9", + "getrandom", "once_cell", "version_check", "zerocopy", @@ -346,27 +346,18 @@ dependencies = [ "libc", ] -[[package]] -name = "ansi_term" -version = "0.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" -dependencies = [ - "winapi", -] - [[package]] name = "anstream" -version = "0.3.1" +version = "0.6.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6342bd4f5a1205d7f41e94a41a901f5647c938cdfa96036338e8533c9d6c2450" +checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", + "is_terminal_polyfill", "utf8parse", ] @@ -396,12 +387,12 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" dependencies = [ "anstyle", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -482,7 +473,7 @@ version = "0.19.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "262c3f7f5d61249d8c00e5546e2685cd15ebeeb1bc0f3cc5449350a1cb07319e" dependencies = [ - "http", + "http 0.2.12", "log", "native-tls", "openssl", @@ -492,17 +483,6 @@ dependencies = [ "wildmatch", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "autocfg" version = "1.1.0" @@ -530,14 +510,14 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", + "http 0.2.12", "itoa", "log", "mime", "openssl", "percent-encoding", "pin-project-lite", - "rand 0.8.5", + "rand", "serde", "serde_json", "serde_urlencoded", @@ -546,28 +526,44 @@ dependencies = [ [[package]] name = "aws-config" -version = "0.6.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12b964849038df43a2b4e0c20e29b67451af5a93108d757dd58b9e82f41a0ee8" +checksum = "40ddbfb5db93d62521f47b3f223da0884a2f02741ff54cb9cda192a0e73ba08b" dependencies = [ - "aws-http", + "aws-credential-types", + "aws-runtime", "aws-sdk-sso", + "aws-sdk-ssooidc", "aws-sdk-sts", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", + "fastrand", "hex", - "http", + "http 0.2.12", "hyper", - "ring", + "ring 0.17.8", + "time", "tokio", - "tower", "tracing", + "url", + "zeroize", +] + +[[package]] +name = "aws-credential-types" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e16838e6c9e12125face1c1eff1343c75e3ff540de98ff7ebd61874a89bcfeb9" +dependencies = [ + "aws-smithy-async", + "aws-smithy-runtime-api", + "aws-smithy-types", "zeroize", ] @@ -588,187 +584,206 @@ dependencies = [ ] [[package]] -name = "aws-endpoint" -version = "0.6.0" +name = "aws-region" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06d059b181b25940b751e8efecc173ceb4fe65f45d8975f56b02e98db5c42fd6" +checksum = "f92a8af5850d0ea0916ca3e015ab86951ded0bf4b70fd27896e81ae1dfb0af37" dependencies = [ - "aws-smithy-http", - "aws-types", - "http", - "regex", - "tracing", + "thiserror", ] [[package]] -name = "aws-http" -version = "0.6.0" +name = "aws-runtime" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3049066e3282c98bbf01e90459a1772ccf6c0b96cd1483c3dd5aa34bef9b9de1" +checksum = "75588e7ee5e8496eed939adac2035a6dbab9f7eb2acdd9ab2d31856dab6f3955" dependencies = [ + "aws-credential-types", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "http", - "lazy_static", + "bytes", + "fastrand", + "http 0.2.12", + "http-body 0.4.6", "percent-encoding", + "pin-project-lite", "tracing", -] - -[[package]] -name = "aws-region" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f92a8af5850d0ea0916ca3e015ab86951ded0bf4b70fd27896e81ae1dfb0af37" -dependencies = [ - "thiserror", + "uuid", ] [[package]] name = "aws-sdk-s3" -version = "0.6.0" +version = "1.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d70be50ac07c3c2b5f37056271856ac00190e80c19c76c58bcbee5be0b63ec9" +checksum = "966646a69665bb0427460d78747204317f6639bdf5ec61305c4c5195af3dc086" dependencies = [ - "aws-endpoint", - "aws-http", - "aws-sig-auth", + "ahash 0.8.11", + "aws-credential-types", + "aws-runtime", "aws-sigv4", "aws-smithy-async", - "aws-smithy-client", + "aws-smithy-checksums", "aws-smithy-eventstream", "aws-smithy-http", - "aws-smithy-http-tower", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", "bytes", - "http", - "md5", - "tokio-stream", - "tower", + "fastrand", + "hex", + "hmac", + "http 0.2.12", + "http-body 0.4.6", + "lru 0.12.3", + "once_cell", + "percent-encoding", + "regex-lite", + "sha2", + "tracing", + "url", ] [[package]] name = "aws-sdk-sso" -version = "0.6.0" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222fcabbf95f1f13c4e28cab95c9a4bb02606f998b1ea2800713b6866be5701d" +checksum = "fef2d9ca2b43051224ed326ed9960a85e277b7d554a2cd0397e57c0553d86e64" dependencies = [ - "aws-endpoint", - "aws-http", - "aws-sig-auth", + "aws-credential-types", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", - "http", - "tokio-stream", - "tower", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", ] [[package]] -name = "aws-sdk-sts" -version = "0.6.0" +name = "aws-sdk-ssooidc" +version = "1.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d85b9f081af2c73ee25642de1a35fa9ba7b2432e54f6bf42242e478ae53c3beb" +checksum = "c869d1f5c4ee7437b79c3c1664ddbf7a60231e893960cf82b2b299a5ccf2cc5d" dependencies = [ - "aws-endpoint", - "aws-http", - "aws-sig-auth", + "aws-credential-types", + "aws-runtime", "aws-smithy-async", - "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", - "aws-smithy-query", + "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", - "aws-smithy-xml", "aws-types", "bytes", - "http", - "tower", + "http 0.2.12", + "once_cell", + "regex-lite", + "tracing", ] [[package]] -name = "aws-sig-auth" -version = "0.6.0" +name = "aws-sdk-sts" +version = "1.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4012b5192350b5403aba19a01a5a3b1768158dab936c4269d89760970d4812bc" +checksum = "9e2b4a632a59e4fab7abf1db0d94a3136ad7871aba46bebd1fdb95c7054afcdb" dependencies = [ - "aws-sigv4", - "aws-smithy-eventstream", + "aws-credential-types", + "aws-runtime", + "aws-smithy-async", "aws-smithy-http", + "aws-smithy-json", + "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", + "aws-smithy-types", + "aws-smithy-xml", "aws-types", - "http", - "thiserror", + "http 0.2.12", + "once_cell", + "regex-lite", "tracing", ] [[package]] name = "aws-sigv4" -version = "0.6.1" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec202c431ef1e97987ca984f12333f4b1f7f614ff74a6ec2799015d1cb074a8c" +checksum = "58b56f1cbe6fd4d0c2573df72868f20ab1c125ca9c9dbce17927a463433a2e57" dependencies = [ + "aws-credential-types", "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", "bytes", + "crypto-bigint 0.5.5", "form_urlencoded", "hex", - "http", + "hmac", + "http 0.2.12", + "http 1.1.0", "once_cell", + "p256", "percent-encoding", - "regex", - "ring", + "ring 0.17.8", + "sha2", + "subtle", "time", "tracing", + "zeroize", ] [[package]] name = "aws-smithy-async" -version = "0.36.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69dad0aefb1b64e63e0d3a1310dc50191608d8c9e226f2f241f344a7173642e" +checksum = "62220bc6e97f946ddd51b5f1361f78996e704677afc518a4ff66b7a72ea1378c" dependencies = [ "futures-util", "pin-project-lite", "tokio", - "tokio-stream", ] [[package]] -name = "aws-smithy-client" -version = "0.36.0" +name = "aws-smithy-checksums" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93e47a8aca2194672518d6630936507d3b54598c482f13ffe53f9b7932724bbb" +checksum = "509e33efbd853e1e670c47e49af2f4df3d2ae0de8b845b068ddbf04636a6700d" dependencies = [ - "aws-smithy-async", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-types", "bytes", - "fastrand 1.9.0", - "http", - "http-body", - "hyper", - "hyper-rustls", - "lazy_static", - "pin-project", + "crc32c", + "crc32fast", + "hex", + "http 0.2.12", + "http-body 0.4.6", + "md-5", "pin-project-lite", - "tokio", - "tower", + "sha1", + "sha2", "tracing", ] [[package]] name = "aws-smithy-eventstream" -version = "0.36.0" +version = "0.60.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98bcfcb063d29c7cc7bb0a64830afe606090de75533c10a11a05460d814e8d9" +checksum = "e6363078f927f612b970edf9d1903ef5cef9a64d1e8423525ebb1f0a1633c858" dependencies = [ "aws-smithy-types", "bytes", @@ -777,92 +792,180 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.36.0" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c8bbe92ecdc4e39a612359b09994c45d000591d4951aa7343443f44b47e6696" +checksum = "4a7de001a1b9a25601016d8057ea16e31a45fdca3751304c8edf4ad72e706c08" dependencies = [ "aws-smithy-eventstream", + "aws-smithy-runtime-api", "aws-smithy-types", "bytes", "bytes-utils", "futures-core", - "http", - "http-body", - "hyper", + "http 0.2.12", + "http-body 0.4.6", + "once_cell", "percent-encoding", - "pin-project", - "tokio", - "tokio-util 0.6.10", + "pin-project-lite", + "pin-utils", "tracing", ] [[package]] -name = "aws-smithy-http-tower" -version = "0.36.0" +name = "aws-smithy-json" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23fdf1253855af3bb4abb25e42ad3152a71241af89014eebf27c14c7a59b81d" +checksum = "4683df9469ef09468dad3473d129960119a0d3593617542b7d52086c8486f2d6" dependencies = [ - "aws-smithy-http", - "bytes", - "http", - "http-body", - "pin-project", - "tower", - "tracing", + "aws-smithy-types", ] [[package]] -name = "aws-smithy-json" -version = "0.36.0" +name = "aws-smithy-query" +version = "0.60.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cc19c372b0a561aa6bfc5dfdd917da7c7b1641d3bc9049ca4d7b197bb616a09" +checksum = "f2fbd61ceb3fe8a1cb7352e42689cec5335833cd9f94103a61e98f9bb61c64bb" dependencies = [ "aws-smithy-types", + "urlencoding", ] [[package]] -name = "aws-smithy-query" -version = "0.36.0" +name = "aws-smithy-runtime" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8254e49a237e9dc0301a4683c424a825f4220420b241ec4eb51e959a70626d8a" +checksum = "4cb5ada2e705ecdaf9534374aa87dc351f77dda0d83bbae4c2be9a8074a35779" dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", - "urlencoding", + "bytes", + "fastrand", + "h2", + "http 0.2.12", + "http-body 0.4.6", + "http-body 1.0.0", + "hyper", + "hyper-rustls", + "once_cell", + "pin-project-lite", + "pin-utils", + "rustls", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "1.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b7d790d553d163c7d80a4e06e2906bf24b9172c9ebe045fc3a274e9358ab7bb" +dependencies = [ + "aws-smithy-async", + "aws-smithy-types", + "bytes", + "http 0.2.12", + "http 1.1.0", + "pin-project-lite", + "tokio", + "tracing", + "zeroize", ] [[package]] name = "aws-smithy-types" -version = "0.36.0" +version = "1.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cde96306a54777ec8781aa510830e242de614aa5746274713f5ecac0779f644f" +checksum = "5b6764ba7e1c5ede1c9f9e4046645534f06c2581402461c559b481a420330a83" dependencies = [ + "base64-simd", + "bytes", + "bytes-utils", + "futures-core", + "http 0.2.12", + "http 1.1.0", + "http-body 0.4.6", + "http-body 1.0.0", + "http-body-util", "itoa", "num-integer", + "pin-project-lite", + "pin-utils", "ryu", + "serde", "time", + "tokio", + "tokio-util", ] [[package]] name = "aws-smithy-xml" -version = "0.36.0" +version = "0.60.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b0466594a86074a6e96b11284f9a9ddc90c5c5b7d6144ab357a90be49d28c4" +checksum = "d123fbc2a4adc3c301652ba8e149bf4bc1d1725affb9784eb20c953ace06bf55" dependencies = [ - "thiserror", "xmlparser", ] [[package]] name = "aws-types" -version = "0.6.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "433fd128ea727e9b83b34c72c6d4db1b900f067760fa27b387694fe896633142" +checksum = "a807d90cd50a969b3d95e4e7ad1491fcae13c6e83948d8728363ecc09d66343a" dependencies = [ + "aws-credential-types", "aws-smithy-async", + "aws-smithy-runtime-api", "aws-smithy-types", + "http 0.2.12", "rustc_version 0.4.0", "tracing", - "zeroize", +] + +[[package]] +name = "axum" +version = "0.6.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf" +dependencies = [ + "async-trait", + "axum-core", + "bitflags 1.3.2", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "hyper", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c" +dependencies = [ + "async-trait", + "bytes", + "futures-util", + "http 0.2.12", + "http-body 0.4.6", + "mime", + "rustversion", + "tower-layer", + "tower-service", ] [[package]] @@ -880,6 +983,12 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base16ct" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" + [[package]] name = "base64" version = "0.12.3" @@ -898,6 +1007,28 @@ version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4a4ddaa51a5bc52a6948f74c06d20aaaddb71924eab79b8c97a8c556e942d6a" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + +[[package]] +name = "base64-simd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "339abbe78e73178762e23bea9dfd08e697eb3f3301cd4be981c0f78ba5859195" +dependencies = [ + "outref", + "vsimd", +] + +[[package]] +name = "base64ct" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b" + [[package]] name = "bincode" version = "1.3.3" @@ -1077,9 +1208,9 @@ dependencies = [ [[package]] name = "brotli" -version = "3.3.4" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1a0b1dbcc8ae29329621f8d4f0d835787c1c38bb1401979b49d13b0b305ff68" +checksum = "74f7971dbd9326d58187408ab83117d8ac1bb9c17b085fdacd1cf2f598719b6b" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1088,9 +1219,9 @@ dependencies = [ [[package]] name = "brotli-decompressor" -version = "2.3.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ad2d4653bf5ca36ae797b1f4bb4dbddb60ce49ca4aed8a2ce4829f60425b80" +checksum = "e6221fe77a248b9117d431ad93761222e1cf8ff282d9d1d5d9f53d6299a1cf76" dependencies = [ "alloc-no-stdlib", "alloc-stdlib", @@ -1180,16 +1311,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "c2-chacha" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80" -dependencies = [ - "cipher", - "ppv-lite86", -] - [[package]] name = "cc" version = "1.0.83" @@ -1242,15 +1363,6 @@ dependencies = [ "windows-targets 0.48.0", ] -[[package]] -name = "cipher" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" -dependencies = [ - "generic-array 0.14.5", -] - [[package]] name = "clang-sys" version = "1.3.1" @@ -1264,65 +1376,33 @@ dependencies = [ [[package]] name = "clap" -version = "3.2.25" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "atty", - "bitflags 1.3.2", - "clap_derive 3.2.25", - "clap_lex 0.2.4", - "indexmap 1.9.2", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap" -version = "4.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ac1f6381d8d82ab4684768f89c0ea3afe66925ceadb4eeb3fc452ffc55d62" +checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0" dependencies = [ "clap_builder", - "clap_derive 4.2.0", - "once_cell", + "clap_derive", ] [[package]] name = "clap_builder" -version = "4.2.4" +version = "4.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84080e799e54cff944f4b4a4b0e71630b0e0443b25b985175c7dddc1a859b749" +checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4" dependencies = [ "anstream", "anstyle", - "bitflags 1.3.2", - "clap_lex 0.4.1", - "strsim", + "clap_lex", + "strsim 0.11.1", ] [[package]] name = "clap_derive" -version = "3.2.25" +version = "4.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008" +checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64" dependencies = [ - "heck 0.4.0", - "proc-macro-error", - "proc-macro2", - "quote", - "syn 1.0.103", -] - -[[package]] -name = "clap_derive" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4" -dependencies = [ - "heck 0.4.0", + "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.32", @@ -1330,18 +1410,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - -[[package]] -name = "clap_lex" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "cloud-storage" @@ -1404,6 +1475,12 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "const-oid" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1563,7 +1640,7 @@ dependencies = [ "cranelift-codegen", "cranelift-entity", "cranelift-frontend", - "itertools", + "itertools 0.10.3", "log", "smallvec", "wasmparser 0.115.0", @@ -1585,6 +1662,15 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cace84e55f07e7301bae1c519df89cdad8cc3cd868413d3fdbdeca9ff3db484" +[[package]] +name = "crc32c" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89254598aa9b9fa608de44b3ae54c810f0f06d755e24c50177f1f8f31ff50ce2" +dependencies = [ + "rustc_version 0.4.0", +] + [[package]] name = "crc32fast" version = "1.3.2" @@ -1668,6 +1754,28 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-bigint" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +dependencies = [ + "generic-array 0.14.5", + "rand_core", + "subtle", + "zeroize", +] + +[[package]] +name = "crypto-bigint" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76" +dependencies = [ + "rand_core", + "subtle", +] + [[package]] name = "crypto-common" version = "0.1.3" @@ -1688,15 +1796,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "ct-logs" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1a816186fa68d9e426e3cb4ae4dff1fcd8e4a2c34b781bf7a822574a0d0aac8" -dependencies = [ - "sct", -] - [[package]] name = "curve25519-dalek" version = "4.1.2" @@ -1706,10 +1805,10 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures", "curve25519-dalek-derive", - "digest 0.10.6", + "digest 0.10.7", "fiat-crypto", "platforms", - "rand_core 0.6.4", + "rand_core", "rustc_version 0.4.0", "subtle", "zeroize", @@ -1790,7 +1889,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.10.0", "syn 2.0.32", ] @@ -1815,14 +1914,13 @@ dependencies = [ ] [[package]] -name = "derive-enum-from-into" -version = "0.1.1" +name = "der" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adc2a1b7c0031fb651e9bc1fa4255da82747c187b9ac1dc36b3783d71fadd9d5" +checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.103", + "const-oid", + "zeroize", ] [[package]] @@ -1869,9 +1967,9 @@ dependencies = [ [[package]] name = "digest" -version = "0.10.6" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" dependencies = [ "block-buffer", "crypto-common", @@ -1975,13 +2073,25 @@ version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53aff6fdc1b181225acdcb5b14c47106726fd8e486707315b1b138baed68ee31" +[[package]] +name = "ecdsa" +version = "0.14.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +dependencies = [ + "der", + "elliptic-curve", + "rfc6979", + "signature 1.6.4", +] + [[package]] name = "ed25519" version = "2.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53" dependencies = [ - "signature", + "signature 2.2.0", ] [[package]] @@ -1992,7 +2102,7 @@ checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0" dependencies = [ "curve25519-dalek", "ed25519", - "rand_core 0.6.4", + "rand_core", "sha2", "subtle", ] @@ -2012,6 +2122,26 @@ dependencies = [ "heapsize", ] +[[package]] +name = "elliptic-curve" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +dependencies = [ + "base16ct", + "crypto-bigint 0.4.9", + "der", + "digest 0.10.7", + "ff", + "generic-array 0.14.5", + "group", + "pkcs8", + "rand_core", + "sec1", + "subtle", + "zeroize", +] + [[package]] name = "encode_unicode" version = "0.3.6" @@ -2114,18 +2244,19 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" [[package]] name = "fastrand" -version = "1.9.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" [[package]] -name = "fastrand" -version = "2.0.1" +name = "ff" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +dependencies = [ + "rand_core", + "subtle", +] [[package]] name = "fiat-crypto" @@ -2164,12 +2295,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - [[package]] name = "flate2" version = "1.0.23" @@ -2212,16 +2337,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fs2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "fs_extra" version = "1.2.0" @@ -2251,9 +2366,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -2261,9 +2376,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3" +checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" @@ -2278,38 +2393,38 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-macro" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.32", ] [[package]] name = "futures-sink" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-util" -version = "0.3.21" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -2366,24 +2481,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi 0.9.0+wasi-snapshot-preview1", -] - -[[package]] -name = "getrandom" -version = "0.2.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -2405,9 +2509,20 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" + +[[package]] +name = "group" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +dependencies = [ + "ff", + "rand_core", + "subtle", +] [[package]] name = "h2" @@ -2420,11 +2535,11 @@ dependencies = [ "futures-core", "futures-sink", "futures-util", - "http", + "http 0.2.12", "indexmap 2.0.0", "slab", "tokio", - "tokio-util 0.7.2", + "tokio-util", "tracing", ] @@ -2452,7 +2567,7 @@ version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", ] [[package]] @@ -2461,7 +2576,7 @@ version = "0.14.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156" dependencies = [ - "ahash 0.8.8", + "ahash 0.8.11", "allocator-api2", ] @@ -2476,18 +2591,15 @@ dependencies = [ [[package]] name = "heck" -version = "0.3.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] +checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" [[package]] name = "heck" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" [[package]] name = "hermit-abi" @@ -2519,14 +2631,25 @@ version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", +] + +[[package]] +name = "http" +version = "0.2.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" +dependencies = [ + "bytes", + "fnv", + "itoa", ] [[package]] name = "http" -version = "0.2.7" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff8670570af52249509a86f5e3e18a08c60b177071826898fde8997cf5f6bfbb" +checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258" dependencies = [ "bytes", "fnv", @@ -2535,20 +2658,43 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" +dependencies = [ + "bytes", + "http 0.2.12", + "pin-project-lite", +] + +[[package]] +name = "http-body" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643" +dependencies = [ + "bytes", + "http 1.1.0", +] + +[[package]] +name = "http-body-util" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" dependencies = [ "bytes", - "http", + "futures-core", + "http 1.1.0", + "http-body 1.0.0", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.7.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" @@ -2564,22 +2710,22 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.14.18" +version = "0.14.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" +checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" dependencies = [ "bytes", "futures-channel", "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "httparse", "httpdate", "itoa", "pin-project-lite", - "socket2", + "socket2 0.5.7", "tokio", "tower-service", "tracing", @@ -2588,19 +2734,18 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.22.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f9f7a97316d44c0af9b0301e65010573a853a9fc97046d7331d7f6bc0fd5a64" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ - "ct-logs", "futures-util", + "http 0.2.12", "hyper", "log", "rustls", "rustls-native-certs", "tokio", "tokio-rustls", - "webpki", ] [[package]] @@ -2658,17 +2803,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" -[[package]] -name = "idna" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" -dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", -] - [[package]] name = "idna" version = "0.3.0" @@ -2686,7 +2820,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0acd33ff0285af998aaf9b57342af478078f53492322fafc47450e09397e0e9" dependencies = [ "bitmaps", - "rand_core 0.6.4", + "rand_core", "rand_xoshiro", "sized-chunks", "typenum", @@ -2728,15 +2862,6 @@ dependencies = [ "regex", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if 1.0.0", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -2752,34 +2877,37 @@ dependencies = [ name = "ipnet" version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" [[package]] -name = "is-terminal" -version = "0.4.7" +name = "itertools" +version = "0.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adcf93614601c8129ddf72e2d5633df827ba6551541c6d8c59520a371475be1f" +checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" dependencies = [ - "hermit-abi 0.3.3", - "io-lifetimes", - "rustix 0.37.27", - "windows-sys 0.48.0", + "either", ] [[package]] name = "itertools" -version = "0.10.3" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" dependencies = [ "either", ] [[package]] name = "itoa" -version = "1.0.2" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "jobserver" @@ -2792,9 +2920,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.57" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -2813,7 +2941,7 @@ checksum = "afabcc15e437a6484fc4f12d0fd63068fe457bf93f1c148d3d9649c60b103f32" dependencies = [ "base64 0.12.3", "pem", - "ring", + "ring 0.16.20", "serde", "serde_json", "simple_asn1", @@ -2837,7 +2965,7 @@ version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" dependencies = [ - "spin", + "spin 0.5.2", ] [[package]] @@ -2854,9 +2982,9 @@ checksum = "884e2677b40cc8c339eaefcb701c32ef1fd2493d71118dc0ca4b6a736c93bd67" [[package]] name = "libc" -version = "0.2.150" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libloading" @@ -2911,12 +3039,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.11" @@ -2969,26 +3091,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "loupe" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b6a72dfa44fe15b5e76b94307eeb2ff995a8c5b283b55008940c02e0c5b634d" -dependencies = [ - "loupe-derive", - "rustversion", -] - -[[package]] -name = "loupe-derive" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0fbfc88337168279f2e9ae06e157cfed4efd3316e14dc96ed074d4f2e6c5952" -dependencies = [ - "quote", - "syn 1.0.103", -] - [[package]] name = "lru" version = "0.7.5" @@ -3037,15 +3139,6 @@ dependencies = [ "libc", ] -[[package]] -name = "matchers" -version = "0.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1" -dependencies = [ - "regex-automata", -] - [[package]] name = "matchers" version = "0.1.0" @@ -3056,10 +3149,10 @@ dependencies = [ ] [[package]] -name = "matches" -version = "0.1.10" +name = "matchit" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" +checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" [[package]] name = "maybe-async" @@ -3078,7 +3171,7 @@ version = "0.10.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66b48670c893079d3c2ed79114e3644b7004df1c361a4e0ad52e2e6940d07c3d" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -3205,7 +3298,7 @@ checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" dependencies = [ "libc", "log", - "wasi 0.11.0+wasi-snapshot-preview1", + "wasi", "windows-sys 0.48.0", ] @@ -3215,12 +3308,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389" -[[package]] -name = "multimap" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" - [[package]] name = "native-tls" version = "0.2.10" @@ -3251,16 +3338,15 @@ dependencies = [ [[package]] name = "near-async" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", - "derive-enum-from-into", "derive_more", "futures", + "near-async-derive", "near-o11y", "near-performance-metrics", - "near-primitives", "once_cell", "serde", "serde_json", @@ -3268,18 +3354,28 @@ dependencies = [ "tokio", ] +[[package]] +name = "near-async-derive" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.32", +] + [[package]] name = "near-cache" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "lru 0.7.5", ] [[package]] name = "near-chain" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "assert_matches", @@ -3287,8 +3383,9 @@ dependencies = [ "bytesize", "chrono", "crossbeam-channel", + "easy-ext", "enum-map", - "itertools", + "itertools 0.10.3", "itoa", "lru 0.7.5", "near-async", @@ -3298,19 +3395,24 @@ dependencies = [ "near-client-primitives", "near-crypto", "near-epoch-manager", + "near-mainnet-res", "near-network", "near-o11y", + "near-parameters", "near-performance-metrics", "near-performance-metrics-macros", "near-pool", "near-primitives", "near-store", + "near-vm-runner", + "node-runtime", "num-rational", "once_cell", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "rayon", "strum", + "tempfile", "thiserror", "tracing", "yansi", @@ -3318,13 +3420,14 @@ dependencies = [ [[package]] name = "near-chain-configs" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "anyhow", "bytesize", "chrono", "derive_more", + "near-async", "near-config-utils", "near-crypto", "near-o11y", @@ -3336,33 +3439,34 @@ dependencies = [ "serde_json", "sha2", "smart-default", + "time", "tracing", ] [[package]] name = "near-chain-primitives" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ - "chrono", + "near-async", "near-crypto", "near-primitives", "thiserror", + "time", "tracing", ] [[package]] name = "near-chunks" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "borsh 1.0.0", "chrono", - "derive-enum-from-into", "derive_more", "futures", - "itertools", + "itertools 0.10.3", "lru 0.7.5", "near-async", "near-chain", @@ -3378,7 +3482,7 @@ dependencies = [ "near-primitives", "near-store", "once_cell", - "rand 0.8.5", + "rand", "reed-solomon-erasure", "strum", "time", @@ -3387,8 +3491,8 @@ dependencies = [ [[package]] name = "near-chunks-primitives" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "near-chain-primitives", "near-primitives", @@ -3396,21 +3500,23 @@ dependencies = [ [[package]] name = "near-client" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "actix-rt", "anyhow", "async-trait", "borsh 1.0.0", + "bytesize", "chrono", "cloud-storage", "derive_more", "futures", - "itertools", + "itertools 0.10.3", "lru 0.7.5", "near-async", + "near-cache", "near-chain", "near-chain-configs", "near-chain-primitives", @@ -3432,7 +3538,7 @@ dependencies = [ "num-rational", "once_cell", "percent-encoding", - "rand 0.8.5", + "rand", "rayon", "reed-solomon-erasure", "regex", @@ -3451,11 +3557,12 @@ dependencies = [ [[package]] name = "near-client-primitives" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "chrono", + "near-async", "near-chain-configs", "near-chain-primitives", "near-chunks-primitives", @@ -3465,14 +3572,15 @@ dependencies = [ "serde_json", "strum", "thiserror", + "time", "tracing", "yansi", ] [[package]] name = "near-config-utils" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "anyhow", "json_comments", @@ -3482,13 +3590,12 @@ dependencies = [ [[package]] name = "near-crypto" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "blake2", "borsh 1.0.0", "bs58", - "c2-chacha", "curve25519-dalek", "derive_more", "ed25519-dalek", @@ -3498,7 +3605,6 @@ dependencies = [ "near-stdx", "once_cell", "primitive-types", - "rand 0.7.3", "secp256k1", "serde", "serde_json", @@ -3508,10 +3614,11 @@ dependencies = [ [[package]] name = "near-dyn-configs" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "anyhow", + "near-async", "near-chain-configs", "near-o11y", "near-primitives", @@ -3526,21 +3633,23 @@ dependencies = [ [[package]] name = "near-epoch-manager" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "borsh 1.0.0", - "itertools", + "itertools 0.10.3", "near-cache", "near-chain-configs", "near-chain-primitives", "near-crypto", + "near-o11y", "near-primitives", "near-store", "num-rational", + "once_cell", "primitive-types", - "rand 0.8.5", - "rand_hc 0.3.1", + "rand", + "rand_hc", "serde_json", "smart-default", "tracing", @@ -3548,16 +3657,16 @@ dependencies = [ [[package]] name = "near-fmt" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "near-primitives-core", ] [[package]] name = "near-indexer" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "anyhow", @@ -3584,8 +3693,8 @@ dependencies = [ [[package]] name = "near-indexer-primitives" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "near-primitives", "serde", @@ -3594,16 +3703,18 @@ dependencies = [ [[package]] name = "near-jsonrpc" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "actix-cors", "actix-web", "bs58", + "derive_more", "easy-ext", "futures", "hex", + "near-async", "near-chain-configs", "near-client", "near-client-primitives", @@ -3619,13 +3730,13 @@ dependencies = [ "serde_with", "tokio", "tracing", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "near-jsonrpc-client" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix-http", "awc", @@ -3638,8 +3749,8 @@ dependencies = [ [[package]] name = "near-jsonrpc-primitives" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "arbitrary", "near-chain-configs", @@ -3650,24 +3761,23 @@ dependencies = [ "serde", "serde_json", "thiserror", + "time", ] [[package]] name = "near-lake" -version = "1.1.1" +version = "1.2.0-rc.1" dependencies = [ "actix", "anyhow", "aws-config", - "aws-endpoint", "aws-sdk-s3", - "aws-smithy-http", - "clap 3.2.25", + "clap", "dotenv", "futures", - "http", + "http 1.1.0", "humantime", - "itertools", + "itertools 0.13.0", "near-client", "near-indexer", "near-indexer-primitives", @@ -3680,13 +3790,13 @@ dependencies = [ "tokio", "tokio-stream", "tracing", - "tracing-subscriber 0.2.25", + "tracing-subscriber", ] [[package]] name = "near-mainnet-res" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "near-account-id", "near-chain-configs", @@ -3696,13 +3806,12 @@ dependencies = [ [[package]] name = "near-network" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "anyhow", "arc-swap", - "assert_matches", "async-trait", "borsh 1.0.0", "bytes", @@ -3713,7 +3822,7 @@ dependencies = [ "futures", "futures-util", "im", - "itertools", + "itertools 0.10.3", "lru 0.7.5", "near-async", "near-crypto", @@ -3722,7 +3831,6 @@ dependencies = [ "near-performance-metrics", "near-performance-metrics-macros", "near-primitives", - "near-stable-hasher", "near-store", "once_cell", "opentelemetry", @@ -3730,10 +3838,10 @@ dependencies = [ "pin-project", "protobuf 3.4.0", "protobuf-codegen", - "rand 0.8.5", - "rand_xorshift", + "rand", "rayon", "serde", + "sha2", "smart-default", "strum", "stun", @@ -3741,43 +3849,41 @@ dependencies = [ "time", "tokio", "tokio-stream", - "tokio-util 0.7.2", + "tokio-util", "tracing", ] [[package]] name = "near-o11y" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "base64 0.21.0", - "clap 4.2.4", + "clap", "near-crypto", - "near-fmt", "near-primitives-core", "once_cell", "opentelemetry", "opentelemetry-otlp", "opentelemetry-semantic-conventions", + "opentelemetry_sdk", "prometheus", "serde", "serde_json", - "strum", "thiserror", "tokio", "tracing", "tracing-appender", "tracing-opentelemetry", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "near-parameters" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ - "assert_matches", "borsh 1.0.0", "enum-map", "near-account-id", @@ -3792,8 +3898,8 @@ dependencies = [ [[package]] name = "near-performance-metrics" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "bitflags 1.3.2", @@ -3801,16 +3907,15 @@ dependencies = [ "futures", "libc", "once_cell", - "strum", "tokio", - "tokio-util 0.7.2", + "tokio-util", "tracing", ] [[package]] name = "near-performance-metrics-macros" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "quote", "syn 2.0.32", @@ -3818,25 +3923,26 @@ dependencies = [ [[package]] name = "near-pool" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "borsh 1.0.0", "near-crypto", "near-o11y", "near-primitives", "once_cell", - "rand 0.8.5", + "rand", ] [[package]] name = "near-primitives" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "arbitrary", "base64 0.21.0", "borsh 1.0.0", + "bytes", "bytesize", "cfg-if 1.0.0", "chrono", @@ -3844,9 +3950,10 @@ dependencies = [ "easy-ext", "enum-map", "hex", + "itertools 0.10.3", + "near-async", "near-crypto", "near-fmt", - "near-o11y", "near-parameters", "near-primitives-core", "near-rpc-error-macro", @@ -3855,8 +3962,8 @@ dependencies = [ "num-rational", "once_cell", "primitive-types", - "rand 0.8.5", - "rand_chacha 0.3.1", + "rand", + "rand_chacha", "reed-solomon-erasure", "serde", "serde_json", @@ -3866,14 +3973,14 @@ dependencies = [ "smart-default", "strum", "thiserror", - "time", "tracing", + "zstd", ] [[package]] name = "near-primitives-core" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "arbitrary", "base64 0.21.0", @@ -3885,16 +3992,14 @@ dependencies = [ "num-rational", "serde", "serde_repr", - "serde_with", "sha2", - "strum", "thiserror", ] [[package]] name = "near-rosetta-rpc" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "actix-cors", @@ -3920,13 +4025,12 @@ dependencies = [ "strum", "thiserror", "tokio", - "validator", ] [[package]] name = "near-rpc-error-core" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "quote", "serde", @@ -3935,29 +4039,23 @@ dependencies = [ [[package]] name = "near-rpc-error-macro" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ - "fs2", "near-rpc-error-core", "serde", "syn 2.0.32", ] -[[package]] -name = "near-stable-hasher" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" - [[package]] name = "near-stdx" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" [[package]] name = "near-store" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "actix-rt", @@ -3968,11 +4066,11 @@ dependencies = [ "derive_more", "elastic-array", "enum-map", - "fs2", "hex", - "itertools", + "itertools 0.10.3", "itoa", "lru 0.7.5", + "near-async", "near-chain-configs", "near-crypto", "near-fmt", @@ -3983,7 +4081,7 @@ dependencies = [ "near-vm-runner", "num_cpus", "once_cell", - "rand 0.8.5", + "rand", "rayon", "rlimit", "rocksdb", @@ -3998,16 +4096,16 @@ dependencies = [ [[package]] name = "near-telemetry" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "awc", "futures", + "near-async", "near-o11y", "near-performance-metrics", "near-performance-metrics-macros", - "near-primitives", "once_cell", "openssl", "serde", @@ -4017,15 +4115,14 @@ dependencies = [ [[package]] name = "near-vm-compiler" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "enumset", "finite-wasm", "near-vm-types", "near-vm-vm", "rkyv", - "smallvec", "target-lexicon 0.12.3", "thiserror", "tracing", @@ -4034,8 +4131,8 @@ dependencies = [ [[package]] name = "near-vm-compiler-singlepass" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "dynasm 2.0.0", "dynasmrt 2.0.0", @@ -4055,15 +4152,14 @@ dependencies = [ [[package]] name = "near-vm-engine" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "backtrace", "cfg-if 1.0.0", "enumset", "finite-wasm", "lazy_static", - "memmap2", "more-asserts", "near-vm-compiler", "near-vm-types", @@ -4079,8 +4175,8 @@ dependencies = [ [[package]] name = "near-vm-runner" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "anyhow", "base64 0.21.0", @@ -4088,7 +4184,6 @@ dependencies = [ "ed25519-dalek", "enum-map", "finite-wasm", - "loupe", "lru 0.12.3", "memoffset 0.8.0", "near-crypto", @@ -4110,7 +4205,6 @@ dependencies = [ "rustix 0.38.24", "serde", "serde_repr", - "serde_with", "sha2", "sha3", "strum", @@ -4133,8 +4227,8 @@ dependencies = [ [[package]] name = "near-vm-types" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "indexmap 1.9.2", "num-traits", @@ -4144,8 +4238,8 @@ dependencies = [ [[package]] name = "near-vm-vm" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "backtrace", "cc", @@ -4160,23 +4254,23 @@ dependencies = [ "rkyv", "thiserror", "tracing", - "wasmparser 0.99.0", "winapi", ] [[package]] name = "near-wallet-contract" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "anyhow", + "near-primitives-core", "near-vm-runner", ] [[package]] name = "nearcore" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "actix", "actix-rt", @@ -4184,6 +4278,7 @@ dependencies = [ "anyhow", "awc", "borsh 1.0.0", + "bytesize", "chrono", "cloud-storage", "dirs", @@ -4219,7 +4314,7 @@ dependencies = [ "node-runtime", "num-rational", "once_cell", - "rand 0.8.5", + "rand", "rayon", "regex", "reqwest", @@ -4264,8 +4359,8 @@ dependencies = [ [[package]] name = "node-runtime" -version = "1.39.1" -source = "git+https://github.com/near/nearcore?rev=60c8ad88e5615e173963ac73e318db9337a17134#60c8ad88e5615e173963ac73e318db9337a17134" +version = "1.40.0-rc.1" +source = "git+https://github.com/near/nearcore?rev=08941a3c070eca2e6163a4ad1eaed1f0d3ee233c#08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" dependencies = [ "borsh 1.0.0", "hex", @@ -4282,7 +4377,7 @@ dependencies = [ "num-rational", "num-traits", "once_cell", - "rand 0.8.5", + "rand", "rayon", "serde", "serde_json", @@ -4479,50 +4574,85 @@ dependencies = [ [[package]] name = "opentelemetry" -version = "0.17.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8" +checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf" dependencies = [ - "async-trait", - "crossbeam-channel", - "futures-channel", - "futures-executor", - "futures-util", + "futures-core", + "futures-sink", "js-sys", - "lazy_static", - "percent-encoding", - "pin-project", - "rand 0.8.5", + "once_cell", + "pin-project-lite", "thiserror", - "tokio", - "tokio-stream", + "urlencoding", ] [[package]] name = "opentelemetry-otlp" -version = "0.10.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1a6ca9de4c8b00aa7f1a153bd76cb263287155cec642680d79d98706f3d28a" +checksum = "1a016b8d9495c639af2145ac22387dcb88e44118e45320d9238fbf4e7889abcb" dependencies = [ "async-trait", - "futures", - "futures-util", - "http", + "futures-core", + "http 0.2.12", "opentelemetry", + "opentelemetry-proto", + "opentelemetry-semantic-conventions", + "opentelemetry_sdk", "prost", "thiserror", "tokio", "tonic", - "tonic-build", +] + +[[package]] +name = "opentelemetry-proto" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a8fddc9b68f5b80dae9d6f510b88e02396f006ad48cac349411fbecc80caae4" +dependencies = [ + "opentelemetry", + "opentelemetry_sdk", + "prost", + "tonic", ] [[package]] name = "opentelemetry-semantic-conventions" -version = "0.9.0" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9ab5bd6c42fb9349dcf28af2ba9a0667f697f9bdcca045d39f2cec5543e2910" + +[[package]] +name = "opentelemetry_sdk" +version = "0.22.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "985cc35d832d412224b2cffe2f9194b1b89b6aa5d0bef76d080dce09d90e62bd" +checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e" dependencies = [ + "async-trait", + "crossbeam-channel", + "futures-channel", + "futures-executor", + "futures-util", + "glob", + "once_cell", "opentelemetry", + "ordered-float", + "percent-encoding", + "rand", + "thiserror", + "tokio", + "tokio-stream", +] + +[[package]] +name = "ordered-float" +version = "4.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e" +dependencies = [ + "num-traits", ] [[package]] @@ -4536,10 +4666,10 @@ dependencies = [ ] [[package]] -name = "os_str_bytes" -version = "6.6.1" +name = "outref" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1" +checksum = "4030760ffd992bef45b0ae3f10ce1aba99e33464c90d14dd7c039884963ddc7a" [[package]] name = "overload" @@ -4547,6 +4677,17 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" +[[package]] +name = "p256" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +dependencies = [ + "ecdsa", + "elliptic-curve", + "sha2", +] + [[package]] name = "page_size" version = "0.4.2" @@ -4564,7 +4705,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "461c6d9997c512648e9cfd41575a3e0d3f46a1ec3c8214a32dd91b729487b1dc" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.3", "once_cell", "paperclip-actix", "paperclip-core", @@ -4619,7 +4760,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a0e23a129dc95a45661cbbfac1b8f865094131da7937738a343d00f47d87fada" dependencies = [ "heck 0.4.0", - "http", + "http 0.2.12", "lazy_static", "mime", "proc-macro-error", @@ -4718,41 +4859,31 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "478c572c3d73181ff3c2539045f6eb99e5491218eae919370993b890cdbdd98e" -[[package]] -name = "petgraph" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6d5014253a1331579ce62aa67443b4a658c5e7dd03d4bc6d302b94474888143" -dependencies = [ - "fixedbitset", - "indexmap 1.9.2", -] - [[package]] name = "pin-project" -version = "1.0.10" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58ad3879ad3baf4e44784bc6a718a8698867bb991f8ce24d1bcbe2cfb4c3a75e" +checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.0.10" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "744b6f092ba29c3650faf274db506afd39944f48420f6c86b17cfe0ee1cb36bb" +checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.32", ] [[package]] name = "pin-project-lite" -version = "0.2.9" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -4760,6 +4891,16 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "pkcs8" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +dependencies = [ + "der", + "spki", +] + [[package]] name = "pkg-config" version = "0.3.25" @@ -4873,55 +5014,25 @@ dependencies = [ [[package]] name = "prost" -version = "0.9.0" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" dependencies = [ "bytes", "prost-derive", ] -[[package]] -name = "prost-build" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62941722fb675d463659e49c4f3fe1fe792ff24fe5bbaa9c08cd3b98a1c354f5" -dependencies = [ - "bytes", - "heck 0.3.3", - "itertools", - "lazy_static", - "log", - "multimap", - "petgraph", - "prost", - "prost-types", - "regex", - "tempfile", - "which", -] - [[package]] name = "prost-derive" -version = "0.9.0" +version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" dependencies = [ "anyhow", - "itertools", + "itertools 0.10.3", "proc-macro2", "quote", - "syn 1.0.103", -] - -[[package]] -name = "prost-types" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534b7a0e836e3c482d2693070f982e39e7611da9695d4d1f5a4b186b51faef0a" -dependencies = [ - "bytes", - "prost", + "syn 2.0.32", ] [[package]] @@ -5036,19 +5147,6 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom 0.1.16", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc 0.2.0", -] - [[package]] name = "rand" version = "0.8.5" @@ -5056,18 +5154,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", + "rand_chacha", + "rand_core", ] [[package]] @@ -5077,16 +5165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom 0.1.16", + "rand_core", ] [[package]] @@ -5095,16 +5174,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.9", -] - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", + "getrandom", ] [[package]] @@ -5113,16 +5183,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.4", -] - -[[package]] -name = "rand_xorshift" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" -dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -5131,7 +5192,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa" dependencies = [ - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -5188,7 +5249,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.9", + "getrandom", "redox_syscall 0.2.13", "thiserror", ] @@ -5235,6 +5296,12 @@ dependencies = [ "regex-syntax", ] +[[package]] +name = "regex-lite" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30b661b2f27137bdbc16f00eda72866a92bb28af1753ffbd56744fb6e2e9cd8e" + [[package]] name = "regex-syntax" version = "0.6.28" @@ -5274,8 +5341,8 @@ dependencies = [ "futures-core", "futures-util", "h2", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "hyper", "hyper-tls", "ipnet", @@ -5291,7 +5358,7 @@ dependencies = [ "serde_urlencoded", "tokio", "tokio-native-tls", - "tokio-util 0.7.2", + "tokio-util", "tower-service", "url", "wasm-bindgen", @@ -5301,6 +5368,17 @@ dependencies = [ "winreg", ] +[[package]] +name = "rfc6979" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +dependencies = [ + "crypto-bigint 0.4.9", + "hmac", + "zeroize", +] + [[package]] name = "ring" version = "0.16.20" @@ -5310,19 +5388,34 @@ dependencies = [ "cc", "libc", "once_cell", - "spin", - "untrusted", + "spin 0.5.2", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" +dependencies = [ + "cc", + "cfg-if 1.0.0", + "getrandom", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.52.0", +] + [[package]] name = "ripemd" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1facec54cb5e0dc08553501fa740091086d0259ad0067e0d4103448e4cb22ed3" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -5393,7 +5486,7 @@ dependencies = [ "cfg-if 1.0.0", "hex", "hmac", - "http", + "http 0.2.12", "log", "maybe-async", "md5", @@ -5461,20 +5554,6 @@ dependencies = [ "windows-sys 0.45.0", ] -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno 0.3.1", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.24" @@ -5490,34 +5569,52 @@ dependencies = [ [[package]] name = "rustls" -version = "0.19.1" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35edb675feee39aec9c99fa5ff985081995a06d594114ae14cbe797ad7b7a6d7" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ - "base64 0.13.0", "log", - "ring", + "ring 0.17.8", + "rustls-webpki", "sct", - "webpki", ] [[package]] name = "rustls-native-certs" -version = "0.5.0" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a07b7c1885bd8ed3831c289b7870b13ef46fe0e856d288c30d9cc17d75a2092" +checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00" dependencies = [ "openssl-probe", - "rustls", + "rustls-pemfile", "schannel", "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c" +dependencies = [ + "base64 0.21.0", +] + +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" [[package]] name = "rxml" @@ -5568,12 +5665,12 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sct" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce" +checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414" dependencies = [ - "ring", - "untrusted", + "ring 0.17.8", + "untrusted 0.9.0", ] [[package]] @@ -5582,13 +5679,27 @@ version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" +[[package]] +name = "sec1" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +dependencies = [ + "base16ct", + "der", + "generic-array 0.14.5", + "pkcs8", + "subtle", + "zeroize", +] + [[package]] name = "secp256k1" version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f" dependencies = [ - "rand 0.8.5", + "rand", "secp256k1-sys", ] @@ -5788,7 +5899,7 @@ checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -5799,7 +5910,7 @@ checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.6", + "digest 0.10.7", ] [[package]] @@ -5808,7 +5919,7 @@ version = "0.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9" dependencies = [ - "digest 0.10.6", + "digest 0.10.7", "keccak", ] @@ -5836,6 +5947,16 @@ dependencies = [ "libc", ] +[[package]] +name = "signature" +version = "1.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +dependencies = [ + "digest 0.10.7", + "rand_core", +] + [[package]] name = "signature" version = "2.2.0" @@ -5911,12 +6032,38 @@ dependencies = [ "winapi", ] +[[package]] +name = "socket2" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + [[package]] name = "spin" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spin" +version = "0.9.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" + +[[package]] +name = "spki" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +dependencies = [ + "base64ct", + "der", +] + [[package]] name = "sptr" version = "0.3.2" @@ -5941,6 +6088,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.0" @@ -5973,8 +6126,8 @@ dependencies = [ "crc", "lazy_static", "md-5", - "rand 0.8.5", - "ring", + "rand", + "ring 0.16.20", "subtle", "thiserror", "tokio", @@ -5984,9 +6137,9 @@ dependencies = [ [[package]] name = "subtle" -version = "2.4.1" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" @@ -6022,6 +6175,12 @@ dependencies = [ "syn 2.0.32", ] +[[package]] +name = "sync_wrapper" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" + [[package]] name = "sysinfo" version = "0.24.5" @@ -6062,7 +6221,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef1adac450ad7f4b3c28589471ade84f25f731a7a0fe30d71dfa9f60fd808e5" dependencies = [ "cfg-if 1.0.0", - "fastrand 2.0.1", + "fastrand", "redox_syscall 0.4.1", "rustix 0.38.24", "windows-sys 0.48.0", @@ -6077,12 +6236,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9" - [[package]] name = "thiserror" version = "1.0.50" @@ -6167,11 +6320,10 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokio" -version = "1.29.1" +version = "1.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "532826ff75199d5833b9d2c5fe410f29235e25704ee5f0ef599fb51c21f4a4da" +checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" dependencies = [ - "autocfg", "backtrace", "bytes", "libc", @@ -6180,7 +6332,7 @@ dependencies = [ "parking_lot 0.12.1", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.5.7", "tokio-macros", "windows-sys 0.48.0", ] @@ -6197,9 +6349,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" dependencies = [ "proc-macro2", "quote", @@ -6230,13 +6382,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.22.0" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6844de72e57df1980054b38be3a9f4702aba4858be64dd700181a8a6d0e1b6" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -6250,20 +6401,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-util" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "log", - "pin-project-lite", - "tokio", -] - [[package]] name = "tokio-util" version = "0.7.2" @@ -6306,45 +6443,29 @@ dependencies = [ [[package]] name = "tonic" -version = "0.6.2" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff08f4649d10a70ffa3522ca559031285d8e421d727ac85c60825761818f5d0a" +checksum = "76c4eb7a4e9ef9d4763600161f12f5070b92a578e1b634db88a6887844c91a13" dependencies = [ "async-stream", "async-trait", - "base64 0.13.0", + "axum", + "base64 0.21.0", "bytes", - "futures-core", - "futures-util", "h2", - "http", - "http-body", + "http 0.2.12", + "http-body 0.4.6", "hyper", "hyper-timeout", "percent-encoding", "pin-project", "prost", - "prost-derive", "tokio", "tokio-stream", - "tokio-util 0.6.10", "tower", "tower-layer", "tower-service", "tracing", - "tracing-futures", -] - -[[package]] -name = "tonic-build" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9403f1bafde247186684b230dc6f38b5cd514584e8bec1dd32514be4745fa757" -dependencies = [ - "proc-macro2", - "prost-build", - "quote", - "syn 1.0.103", ] [[package]] @@ -6358,10 +6479,10 @@ dependencies = [ "indexmap 1.9.2", "pin-project", "pin-project-lite", - "rand 0.8.5", + "rand", "slab", "tokio", - "tokio-util 0.7.2", + "tokio-util", "tower-layer", "tower-service", "tracing", @@ -6369,9 +6490,9 @@ dependencies = [ [[package]] name = "tower-layer" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "343bc9466d3fe6b0f960ef45960509f84480bf4fd96f92901afe7ff3df9d3a62" +checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0" [[package]] name = "tower-service" @@ -6381,11 +6502,10 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.36" +version = "0.1.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307" +checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef" dependencies = [ - "cfg-if 1.0.0", "log", "pin-project-lite", "tracing-attributes", @@ -6394,57 +6514,37 @@ dependencies = [ [[package]] name = "tracing-appender" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e" +checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf" dependencies = [ "crossbeam-channel", + "thiserror", "time", - "tracing-subscriber 0.3.18", + "tracing-subscriber", ] [[package]] name = "tracing-attributes" -version = "0.1.22" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.32", ] [[package]] name = "tracing-core" -version = "0.1.30" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", "valuable", ] -[[package]] -name = "tracing-futures" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97d095ae15e245a057c8e8451bab9b3ee1e1f68e9ba2b4fbc18d0ac5237835f2" -dependencies = [ - "pin-project", - "tracing", -] - -[[package]] -name = "tracing-log" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" -dependencies = [ - "lazy_static", - "log", - "tracing-core", -] - [[package]] name = "tracing-log" version = "0.2.0" @@ -6458,48 +6558,20 @@ dependencies = [ [[package]] name = "tracing-opentelemetry" -version = "0.17.4" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f" +checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284" dependencies = [ + "js-sys", "once_cell", "opentelemetry", - "tracing", - "tracing-core", - "tracing-log 0.1.3", - "tracing-subscriber 0.3.18", -] - -[[package]] -name = "tracing-serde" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1" -dependencies = [ - "serde", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71" -dependencies = [ - "ansi_term", - "chrono", - "lazy_static", - "matchers 0.0.1", - "regex", - "serde", - "serde_json", - "sharded-slab", + "opentelemetry_sdk", "smallvec", - "thread_local", "tracing", "tracing-core", - "tracing-log 0.1.3", - "tracing-serde", + "tracing-log", + "tracing-subscriber", + "web-time", ] [[package]] @@ -6508,7 +6580,7 @@ version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" dependencies = [ - "matchers 0.1.0", + "matchers", "nu-ansi-term", "once_cell", "regex", @@ -6517,7 +6589,7 @@ dependencies = [ "thread_local", "tracing", "tracing-core", - "tracing-log 0.2.0", + "tracing-log", ] [[package]] @@ -6574,12 +6646,6 @@ dependencies = [ "tinyvec", ] -[[package]] -name = "unicode-segmentation" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8820f5d777f6224dc4be3632222971ac30164d4a258d595640799554ebfd99" - [[package]] name = "unicode-width" version = "0.1.9" @@ -6598,6 +6664,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.3.1" @@ -6605,15 +6677,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d68c799ae75762b8c3fe375feb6600ef5602c883c5d21eb51c09f22b83c4643" dependencies = [ "form_urlencoded", - "idna 0.3.0", + "idna", "percent-encoding", ] [[package]] name = "urlencoding" -version = "1.3.3" +version = "2.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a1f0175e03a0973cf4afd476bef05c26e228520400eb1fd473ad417b1c00ffb" +checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da" [[package]] name = "utf8parse" @@ -6627,28 +6699,6 @@ version = "1.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "345444e32442451b267fc254ae85a209c64be56d2890e601a0c37ff0c3c5ecd2" -[[package]] -name = "validator" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d6937c33ec6039d8071bcf72933146b5bbe378d645d8fa59bdadabfc2a249" -dependencies = [ - "idna 0.2.3", - "lazy_static", - "regex", - "serde", - "serde_derive", - "serde_json", - "url", - "validator_types", -] - -[[package]] -name = "validator_types" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad9680608df133af2c1ddd5eaf1ddce91d60d61b6bc51494ef326458365a470a" - [[package]] name = "valuable" version = "0.1.0" @@ -6673,6 +6723,12 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +[[package]] +name = "vsimd" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c3082ca00d5a5ef149bb8b555a72ae84c9c59f7250f013ac822ac2e49b19c64" + [[package]] name = "want" version = "0.3.0" @@ -6683,12 +6739,6 @@ dependencies = [ "try-lock", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" @@ -6697,9 +6747,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.80" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -6707,16 +6757,16 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.80" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", - "lazy_static", "log", + "once_cell", "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.32", "wasm-bindgen-shared", ] @@ -6734,9 +6784,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.80" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -6744,22 +6794,22 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.80" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 1.0.103", + "syn 2.0.32", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.80" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "wasm-encoder" @@ -7175,7 +7225,7 @@ dependencies = [ "memfd", "memoffset 0.9.0", "paste", - "rand 0.8.5", + "rand", "rustix 0.38.24", "sptr", "wasm-encoder 0.35.0", @@ -7228,13 +7278,13 @@ dependencies = [ ] [[package]] -name = "webpki" -version = "0.21.4" +name = "web-time" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" dependencies = [ - "ring", - "untrusted", + "js-sys", + "wasm-bindgen", ] [[package]] @@ -7252,7 +7302,7 @@ dependencies = [ "libc", "log", "nix 0.24.3", - "rand 0.8.5", + "rand", "thiserror", "tokio", "winapi", @@ -7361,6 +7411,15 @@ dependencies = [ "windows-targets 0.48.0", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.5", +] + [[package]] name = "windows-targets" version = "0.42.1" @@ -7391,6 +7450,22 @@ dependencies = [ "windows_x86_64_msvc 0.48.0", ] +[[package]] +name = "windows-targets" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +dependencies = [ + "windows_aarch64_gnullvm 0.52.5", + "windows_aarch64_msvc 0.52.5", + "windows_i686_gnu 0.52.5", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.5", + "windows_x86_64_gnu 0.52.5", + "windows_x86_64_gnullvm 0.52.5", + "windows_x86_64_msvc 0.52.5", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -7403,6 +7478,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" + [[package]] name = "windows_aarch64_msvc" version = "0.36.1" @@ -7421,6 +7502,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" + [[package]] name = "windows_i686_gnu" version = "0.36.1" @@ -7439,6 +7526,18 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +[[package]] +name = "windows_i686_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" + [[package]] name = "windows_i686_msvc" version = "0.36.1" @@ -7457,6 +7556,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +[[package]] +name = "windows_i686_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" + [[package]] name = "windows_x86_64_gnu" version = "0.36.1" @@ -7475,6 +7580,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -7487,6 +7598,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" + [[package]] name = "windows_x86_64_msvc" version = "0.36.1" @@ -7505,6 +7622,12 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" + [[package]] name = "winnow" version = "0.5.15" @@ -7540,9 +7663,9 @@ checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" [[package]] name = "xmlparser" -version = "0.13.3" +version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "114ba2b24d2167ef6d67d7d04c8cc86522b87f490025f39f0303b7db5bf5e3d8" +checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" [[package]] name = "xz2" @@ -7594,35 +7717,34 @@ dependencies = [ "byteorder", "crunchy", "lazy_static", - "rand 0.8.5", + "rand", "rustc-hex", ] [[package]] name = "zstd" -version = "0.12.3+zstd.1.5.2" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76eea132fb024e0e13fd9c2f5d5d595d8a967aa72382ac2f9d39fcc95afd0806" +checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" dependencies = [ "zstd-safe", ] [[package]] name = "zstd-safe" -version = "6.0.3+zstd.1.5.2" +version = "7.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e4a3f57d13d0ab7e478665c60f35e2a613dcd527851c2c7287ce5c787e134a" +checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" dependencies = [ - "libc", "zstd-sys", ] [[package]] name = "zstd-sys" -version = "2.0.1+zstd.1.5.2" +version = "2.0.10+zstd.1.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fd07cbbc53846d9145dbffdf6dd09a7a0aa52be46741825f5c97bdd4f73f12b" +checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa" dependencies = [ "cc", - "libc", + "pkg-config", ] diff --git a/Cargo.toml b/Cargo.toml index 4900d54..84f21c2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "near-lake" -version = "1.1.1" +version = "1.2.0-rc.1" authors = ["Near Inc "] edition = "2021" @@ -11,27 +11,25 @@ rustc_version = "0.4" [dependencies] actix = "0.13.0" anyhow = "1.0.51" -aws-config = "0.6.0" -aws-endpoint = "0.6.0" -aws-sdk-s3 = "0.6.0" -aws-smithy-http = "0.36.0" -clap = { version = "3.1.6", features = ["color", "derive", "env"] } +aws-config = "1.4.0" +aws-sdk-s3 = "1.29.0" +clap = { version = "4.5.4", features = ["color", "derive", "env"] } dotenv = "0.15.0" futures = "0.3.5" -http = "0.2" +http = "1.1.0" humantime = "2.1.0" -itertools = "0.10.0" +itertools = "0.13.0" openssl-probe = "0.1.5" once_cell = "1.19.0" serde = { version = "1", features = ["derive"] } serde_json = "1.0.55" -tokio = { version = "1.1", features = ["sync", "time"] } +tokio = { version = "1.37.0", features = ["sync", "time"] } tokio-stream = { version = "0.1" } -tracing = "0.1.34" -tracing-subscriber = "0.2.4" +tracing = "0.1.40" +tracing-subscriber = "0.3.18" # Please, update the supported nearcore version in .cargo/config.toml file -near-indexer = { git = "https://github.com/near/nearcore", rev = "60c8ad88e5615e173963ac73e318db9337a17134" } -near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "60c8ad88e5615e173963ac73e318db9337a17134" } -near-client = { git = "https://github.com/near/nearcore", rev = "60c8ad88e5615e173963ac73e318db9337a17134" } -near-o11y = { git = "https://github.com/near/nearcore", rev = "60c8ad88e5615e173963ac73e318db9337a17134" } +near-indexer = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } +near-indexer-primitives = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } +near-client = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } +near-o11y = { git = "https://github.com/near/nearcore", rev = "08941a3c070eca2e6163a4ad1eaed1f0d3ee233c" } diff --git a/rust-toolchain b/rust-toolchain index 32a6ce3..79e15fd 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.76.0 +1.77.0 diff --git a/src/main.rs b/src/main.rs index ec4c103..72cccbf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,7 +1,8 @@ +use std::error::Error; use std::sync::Arc; use aws_config::meta::region::RegionProviderChain; -use aws_sdk_s3::{ByteStream, Client, Endpoint, Region}; +use aws_sdk_s3::config::endpoint::{Endpoint, EndpointFuture, Params, ResolveEndpoint}; use clap::Parser; use configs::{Opts, SubCommand}; use futures::StreamExt; @@ -14,6 +15,17 @@ mod utils; const INDEXER: &str = "near_lake"; +#[derive(Debug)] +struct CustomS3EndpointResolver { + url: String, +} + +impl ResolveEndpoint for CustomS3EndpointResolver { + fn resolve_endpoint(&self, _params: &Params) -> EndpointFuture<'_> { + EndpointFuture::ready(Ok(Endpoint::builder().url(self.url.clone()).build())) + } +} + #[derive(Debug, Clone)] struct Stats { pub block_heights_processing: std::collections::BTreeSet, @@ -176,19 +188,26 @@ async fn listen_blocks( concurrency: std::num::NonZeroU16, stats: Arc>, ) { - let region_provider = RegionProviderChain::first_try(Some(Region::new(region))) - .or_default_provider() - .or_else(Region::new(fallback_region)); - let shared_config = aws_config::from_env().region(region_provider).load().await; + let region_provider = + RegionProviderChain::first_try(Some(aws_sdk_s3::config::Region::new(region))) + .or_default_provider() + .or_else(aws_sdk_s3::config::Region::new(fallback_region)); + let shared_config = aws_config::defaults(aws_config::BehaviorVersion::latest()) + .region(region_provider) + .load() + .await; let mut s3_conf = aws_sdk_s3::config::Builder::from(&shared_config); // Owerride S3 endpoint in case you want to use custom solution // like Minio or Localstack as a S3 compatible storage if let Some(s3_endpoint) = endpoint { - s3_conf = s3_conf.endpoint_resolver(Endpoint::immutable(s3_endpoint.clone())); + let endpoint_resolver = CustomS3EndpointResolver { + url: s3_endpoint.to_string(), + }; + s3_conf = s3_conf.endpoint_resolver(endpoint_resolver); tracing::info!(target: INDEXER, "Custom S3 endpoint used: {}", s3_endpoint); } - let client = Client::from_conf(s3_conf.build()); + let client = aws_sdk_s3::Client::from_conf(s3_conf.build()); let mut handle_messages = tokio_stream::wrappers::ReceiverStream::new(stream) .map(|streamer_message| { @@ -205,7 +224,7 @@ async fn listen_blocks( } async fn handle_message( - client: &Client, + client: &aws_sdk_s3::Client, streamer_message: near_indexer_primitives::StreamerMessage, bucket: String, stats: Arc>, @@ -246,23 +265,29 @@ async fn handle_message( // Saves an object to a bucket or retries forever. Aborts the entire process if credentials are missing async fn put_object_or_retry( - client: Client, + client: aws_sdk_s3::Client, bucket: String, content: serde_json::Value, filename: String, ) { loop { - let body = ByteStream::from(content.clone().to_string().as_bytes().to_vec()); + let body = aws_sdk_s3::primitives::ByteStream::from( + content.clone().to_string().as_bytes().to_vec(), + ); match put_object(&client, &bucket, body, filename.as_str()).await { Ok(_) => break, Err(err) => { // We haven't found the way to check credentials before the request has been sent // This is the weird yet working solution to throw an error if we got // missing credentials error - if let aws_smithy_http::result::SdkError::ConstructionFailure(box_error) = err { - if box_error.to_string() == *"No credentials in the property bag".to_string() { - tracing::error!(target: INDEXER, "No credentials in the property bag"); - tokio::time::sleep(std::time::Duration::from_secs(2)).await; + if let aws_sdk_s3::error::SdkError::ConstructionFailure(_) = err { + if let Some(box_error) = err.source() { + if box_error.to_string() + == *"No credentials in the property bag".to_string() + { + tracing::error!(target: INDEXER, "No credentials in the property bag"); + tokio::time::sleep(std::time::Duration::from_secs(2)).await; + } } } metrics::RETRY_COUNT.inc(); @@ -278,11 +303,11 @@ async fn put_object_or_retry( // Adds an object to a bucket async fn put_object( - client: &Client, + client: &aws_sdk_s3::Client, bucket: &str, - body: ByteStream, + body: aws_sdk_s3::primitives::ByteStream, filename: &str, -) -> Result<(), aws_smithy_http::result::SdkError> { +) -> Result<(), aws_sdk_s3::error::SdkError> { client .put_object() .bucket(bucket)