diff --git a/Cargo.lock b/Cargo.lock index 636d7f53954..c3c44d811dd 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -543,9 +543,9 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.84" +version = "0.1.85" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1244b10dcd56c92219da4e14caa97e312079e185f04ba3eea25061561dc0a0" +checksum = "3f934833b4b7233644e5848f235df3f57ed8c80f1528a26c3dfa13d2147fa056" dependencies = [ "proc-macro2", "quote", @@ -595,16 +595,43 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "bytes", "futures-util", "http 1.2.0", "http-body 1.0.1", "http-body-util", + "itoa", + "matchit 0.7.3", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower 0.5.2", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", + "bytes", + "form_urlencoded", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", "hyper 1.5.2", "hyper-util", "itoa", - "matchit", + "matchit 0.8.4", "memchr", "mime", "percent-encoding", @@ -640,6 +667,25 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http 1.2.0", + "http-body 1.0.1", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", "tracing", ] @@ -1117,7 +1163,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb" dependencies = [ "heck 0.4.1", - "indexmap 2.7.0", + "indexmap 2.5.0", "log", "proc-macro2", "quote", @@ -2654,7 +2700,7 @@ dependencies = [ "fvm_shared 2.10.0", "fvm_shared 3.12.0", "fvm_shared 4.5.3", - "indexmap 2.7.0", + "indexmap 2.5.0", "integer-encoding", "num-derive", "num-traits", @@ -2877,6 +2923,12 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" +[[package]] +name = "fixedbitset" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99" + [[package]] name = "flate2" version = "1.0.35" @@ -2943,7 +2995,7 @@ dependencies = [ "async-fs", "async-trait", "asynchronous-codec", - "axum", + "axum 0.8.1", "backon", "base64 0.22.1", "bigdecimal", @@ -3013,13 +3065,13 @@ dependencies = [ "human-repr", "human_bytes", "humantime", - "indexmap 2.7.0", + "indexmap 2.5.0", "indicatif", "insta", "integer-encoding", "ipld-core", "is-terminal", - "itertools 0.13.0", + "itertools 0.14.0", "jsonrpsee", "jsonwebtoken", "keccak-hash", @@ -3051,7 +3103,7 @@ dependencies = [ "parking_lot", "paste", "pathfinding", - "petgraph", + "petgraph 0.7.0", "pin-project-lite", "positioned-io", "predicates", @@ -3807,7 +3859,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" dependencies = [ "fallible-iterator", - "indexmap 2.7.0", + "indexmap 2.5.0", "stable_deref_trait", ] @@ -3880,7 +3932,7 @@ dependencies = [ "futures-sink", "futures-util", "http 0.2.12", - "indexmap 2.7.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -3899,7 +3951,7 @@ dependencies = [ "futures-core", "futures-sink", "http 1.2.0", - "indexmap 2.7.0", + "indexmap 2.5.0", "slab", "tokio", "tokio-util", @@ -4618,12 +4670,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.7.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f" +checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5" dependencies = [ "equivalent", - "hashbrown 0.15.2", + "hashbrown 0.14.5", "serde", ] @@ -4780,6 +4832,15 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.14" @@ -5846,6 +5907,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "matrixmultiply" version = "0.3.9" @@ -6450,7 +6517,7 @@ checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ "crc32fast", "hashbrown 0.15.2", - "indexmap 2.7.0", + "indexmap 2.5.0", "memchr", ] @@ -6622,7 +6689,7 @@ dependencies = [ "backtrace", "cfg-if", "libc", - "petgraph", + "petgraph 0.6.5", "redox_syscall", "smallvec", "thread-id", @@ -6676,7 +6743,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "301ad6aa19104eeb9af172b3d6a4ab8a5ea26234890baf2fcb1cbbc3f05f674b" dependencies = [ "deprecate-until", - "indexmap 2.7.0", + "indexmap 2.5.0", "integer-sqrt", "num-traits", "rustc-hash 2.1.0", @@ -6714,24 +6781,34 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" dependencies = [ - "fixedbitset", - "indexmap 2.7.0", + "fixedbitset 0.4.2", + "indexmap 2.5.0", +] + +[[package]] +name = "petgraph" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2b1374ec32450264534c67d1ccb5ca09818c4db8fd87cf97478d0df2fa44c65" +dependencies = [ + "fixedbitset 0.5.7", + "indexmap 2.5.0", ] [[package]] name = "pin-project" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be57f64e946e500c8ee36ef6331845d40a93055567ec57e8fae13efd33759b95" +checksum = "1e2ec53ad785f4d35dac0adea7f7dc6f1bb277ad84a680c7afefeae05d1f5916" dependencies = [ "pin-project-internal", ] [[package]] name = "pin-project-internal" -version = "1.1.7" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c" +checksum = "d56a66c0c55993aa927429d0f8a0abfd74f084e4d9c192cffed01e418d83eefb" dependencies = [ "proc-macro2", "quote", @@ -6740,9 +6817,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915a1e146535de9163f3987b8944ed8cf49a18bb0056bcebcdcece385cece4ff" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" [[package]] name = "pin-utils" @@ -7276,37 +7353,44 @@ dependencies = [ [[package]] name = "ra-ap-rustc_lexer" -version = "0.80.0" +version = "0.87.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2cf8e48b69af3ecc29ed3449892e8a999111d2f75212a78aa242e117cf1711" +checksum = "eb76f0a4d4c20859e41f0a23bff0f37ab9ca9171c214a6c7dd72ea69434865dc" dependencies = [ "unicode-properties", "unicode-xid", ] +[[package]] +name = "ra_ap_edition" +version = "0.0.252" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3024ab445eb2ec77828127dec5ca3824ce1b317145baccdf182d536451631bf" + [[package]] name = "ra_ap_limit" -version = "0.0.248" +version = "0.0.252" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "822501c9f88830865ebedf944130dbe0603fa8d30a5da90f3224c1dcca2660de" +checksum = "38b4c90dad60b1a501979ad25f2692d0f838cfe35ab555ad21b3fe270b1fbd8f" [[package]] name = "ra_ap_parser" -version = "0.0.248" +version = "0.0.252" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "573c14046174e3ef03a9d73841dbc52fd1d6224fffd1a0713aef95b45e024f75" +checksum = "17c9bda141c44e9379bd7d083ffa202293983eff77ab101abc29a0dc31d52d2e" dependencies = [ "drop_bomb", "ra-ap-rustc_lexer", + "ra_ap_edition", "ra_ap_limit", "tracing", ] [[package]] name = "ra_ap_stdx" -version = "0.0.248" +version = "0.0.252" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0be113ed187f4bf5403ebd8256d3d4aead8d265f670d534c646edea68516ef86" +checksum = "aeae5aa099e36333d4f6142d6786de6ff9c59a7e11f48e27f85847523eeca041" dependencies = [ "always-assert", "crossbeam-channel", @@ -7319,13 +7403,13 @@ dependencies = [ [[package]] name = "ra_ap_syntax" -version = "0.0.248" +version = "0.0.252" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5af8d681a9fd408be1b17f3b150eb98907fb72b9b44000ada9c3e9b6c059188" +checksum = "df6b047bcf9af1a3c0493d49e06cd35c066a76f7f6d3b3fa2778db83df404308" dependencies = [ "cov-mark", "either", - "indexmap 2.7.0", + "indexmap 2.5.0", "itertools 0.12.1", "ra-ap-rustc_lexer", "ra_ap_parser", @@ -8149,9 +8233,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", @@ -8253,7 +8337,7 @@ dependencies = [ "chrono", "hex", "indexmap 1.9.3", - "indexmap 2.7.0", + "indexmap 2.5.0", "serde", "serde_derive", "serde_json", @@ -8279,7 +8363,7 @@ version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.5.0", "itoa", "ryu", "serde", @@ -9281,7 +9365,7 @@ version = "0.19.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.5.0", "toml_datetime", "winnow 0.5.40", ] @@ -9292,7 +9376,7 @@ version = "0.22.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ - "indexmap 2.7.0", + "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", @@ -9307,7 +9391,7 @@ checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52" dependencies = [ "async-stream", "async-trait", - "axum", + "axum 0.7.9", "base64 0.22.1", "bytes", "h2 0.4.7", @@ -9883,7 +9967,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9dbe55c8f9d0dbd25d9447a5a889ff90c0cc3feaa7395310d3d826b2c703eaab" dependencies = [ "bitflags 2.6.0", - "indexmap 2.7.0", + "indexmap 2.5.0", "semver", ] @@ -9896,7 +9980,7 @@ dependencies = [ "ahash", "bitflags 2.6.0", "hashbrown 0.14.5", - "indexmap 2.7.0", + "indexmap 2.5.0", "semver", "serde", ] @@ -9934,7 +10018,7 @@ dependencies = [ "cc", "cfg-if", "hashbrown 0.14.5", - "indexmap 2.7.0", + "indexmap 2.5.0", "libc", "libm", "log", @@ -10028,7 +10112,7 @@ dependencies = [ "cranelift-bitset", "cranelift-entity", "gimli 0.29.0", - "indexmap 2.7.0", + "indexmap 2.5.0", "log", "object", "postcard", @@ -10092,7 +10176,7 @@ checksum = "3f571f63ac1d532e986eb3973bbef3a45e4ae83de521a8d573b0fe0594dc9608" dependencies = [ "anyhow", "heck 0.4.1", - "indexmap 2.7.0", + "indexmap 2.5.0", "wit-parser", ] @@ -10521,7 +10605,7 @@ checksum = "fb893dcd6d370cfdf19a0d9adfcd403efb8e544e1a0ea3a8b81a21fe392eaa78" dependencies = [ "anyhow", "id-arena", - "indexmap 2.7.0", + "indexmap 2.5.0", "log", "semver", "serde", diff --git a/Cargo.toml b/Cargo.toml index 2f5c004e9fa..959b9f0adc3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,7 +28,7 @@ async-compression = { version = "0.4", features = ["tokio", "zstd"] } async-fs = "2" async-trait = "0.1" asynchronous-codec = "0.7" -axum = "0.7" +axum = "0.8" backon = "1" base64 = "0.22" bigdecimal = "=0.4.2" # TODO(forest): https://github.com/ChainSafe/forest/issues/4035 @@ -98,7 +98,7 @@ indicatif = { version = "0.17", features = ["tokio"] } integer-encoding = "4.0" ipld-core = { version = "0.4", features = ["serde", "arb"] } is-terminal = "0.4" -itertools = "0.13" +itertools = "0.14" jsonrpsee = { version = "0.24", features = ["server", "ws-client", "http-client"] } jsonwebtoken = "9" keccak-hash = "0.11" @@ -237,13 +237,13 @@ http-range-header = "0.4" insta = { version = "1", features = ["yaml"] } libp2p-swarm-test = { workspace = true } num-bigint = { version = "0.4", features = ['quickcheck'] } -petgraph = "0.6" +petgraph = "0.7" predicates = "3" proc-macro2 = { version = "1", default-features = false, features = ["span-locations"] } quickcheck = "1" quickcheck_async = "0.1" quickcheck_macros = "1" -ra_ap_syntax = "0.0.248" +ra_ap_syntax = "0.0.252" regex-automata = "0.4" syn = { version = "2", default-features = false, features = ["full", "parsing", "visit", "printing", "extra-traits"] } tokio-test = "0.4"