diff --git a/Cargo.lock b/Cargo.lock index c3ffd40..9afb44b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -78,9 +78,9 @@ checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea" [[package]] name = "arc-swap" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9f3647c145568cec02c42054e07bdf9a5a698e15b466fb2341bfc393cd24aa5" +checksum = "a07d1f37ff60921c83bdfc7407723bdefe89b44b98a9b772f225c8f9d67141a6" dependencies = [ "rustversion", ] @@ -142,6 +142,17 @@ dependencies = [ "syn 2.0.116", ] +[[package]] +name = "async-lock" +version = "3.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290f7f2596bd5b78a9fec8088ccd89180d7f9f55b94b0576823bbbdc72ee8311" +dependencies = [ + "event-listener", + "event-listener-strategy", + "pin-project-lite", +] + [[package]] name = "async-trait" version = "0.1.89" @@ -290,16 +301,16 @@ dependencies = [ [[package]] name = "blake3" -version = "1.8.3" +version = "1.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2468ef7d57b3fb7e16b576e8377cdbde2320c60e1491e961d11da40fc4f02a2d" +checksum = "4d2d5991425dfd0785aed03aedcf0b321d61975c9b5b3689c774a2610ae0b51e" dependencies = [ "arrayref", "arrayvec", "cc", "cfg-if", "constant_time_eq", - "cpufeatures 0.2.17", + "cpufeatures 0.3.0", ] [[package]] @@ -481,6 +492,15 @@ dependencies = [ "tokio-util", ] +[[package]] +name = "concurrent-queue" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973" +dependencies = [ + "crossbeam-utils", +] + [[package]] name = "constant_time_eq" version = "0.4.2" @@ -717,9 +737,9 @@ dependencies = [ [[package]] name = "dlopen2" -version = "0.5.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09b4f5f101177ff01b8ec4ecc81eead416a8aa42819a2869311b3420fa114ffa" +checksum = "5e2c5bd4158e66d1e215c49b837e11d62f3267b30c92f1d171c4d3105e3dc4d4" dependencies = [ "libc", "once_cell", @@ -784,6 +804,27 @@ dependencies = [ "arrayvec", ] +[[package]] +name = "event-listener" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab" +dependencies = [ + "concurrent-queue", + "parking", + "pin-project-lite", +] + +[[package]] +name = "event-listener-strategy" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93" +dependencies = [ + "event-listener", + "pin-project-lite", +] + [[package]] name = "faster-hex" version = "0.10.0" @@ -1465,9 +1506,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" dependencies = [ "serde", ] @@ -1625,9 +1666,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.180" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libloading" @@ -1636,7 +1677,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34" dependencies = [ "cfg-if", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] @@ -1812,7 +1853,7 @@ dependencies = [ "left-right", "libc", "netdev", - "nix 0.31.1", + "nix 0.31.2", "openssl", "quinn", "rand 0.10.0", @@ -1882,9 +1923,9 @@ dependencies = [ [[package]] name = "netdev" -version = "0.40.0" +version = "0.41.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc9815643a243856e7bd84524e1ff739e901e846cfb06ad9627cd2b6d59bd737" +checksum = "395f1acaf7a073f756fc22068e0b526d2cf22d09f5e13802b516ef8eeaeee5eb" dependencies = [ "block2", "dispatch2", @@ -1893,13 +1934,13 @@ dependencies = [ "libc", "mac-addr", "netlink-packet-core", - "netlink-packet-route 0.25.1", + "netlink-packet-route 0.29.0", "netlink-sys", "objc2-core-foundation", "objc2-system-configuration", "once_cell", "plist", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1913,9 +1954,9 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.25.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec2f5b6839be2a19d7fa5aab5bc444380f6311c2b693551cb80f45caaa7b5ef" +checksum = "4ce3636fa715e988114552619582b530481fd5ef176a1e5c1bf024077c2c9445" dependencies = [ "bitflags 2.9.0", "libc", @@ -1925,9 +1966,9 @@ dependencies = [ [[package]] name = "netlink-packet-route" -version = "0.28.0" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ce3636fa715e988114552619582b530481fd5ef176a1e5c1bf024077c2c9445" +checksum = "df9854ea6ad14e3f4698a7f03b65bce0833dd2d81d594a0e4a984170537146b6" dependencies = [ "bitflags 2.9.0", "libc", @@ -1951,12 +1992,12 @@ dependencies = [ [[package]] name = "netlink-sys" -version = "0.8.7" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16c903aa70590cb93691bf97a767c8d1d6122d2cc9070433deb3bbf36ce8bd23" +checksum = "cd6c30ed10fa69cc491d491b85cc971f6bdeb8e7367b7cde2ee6cc878d583fae" dependencies = [ "bytes", - "futures", + "futures-util", "libc", "log", "tokio", @@ -1976,9 +2017,9 @@ dependencies = [ [[package]] name = "nix" -version = "0.31.1" +version = "0.31.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225e7cfe711e0ba79a68baeddb2982723e4235247aefce1482f2f16c27865b66" +checksum = "5d6d0705320c1e6ba1d912b5e37cf18071b6c2e9b7fa8215a1e8a7651966f5d3" dependencies = [ "bitflags 2.9.0", "cfg-if", @@ -2120,9 +2161,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.75" +version = "0.10.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" +checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf" dependencies = [ "bitflags 2.9.0", "cfg-if", @@ -2155,9 +2196,9 @@ dependencies = [ [[package]] name = "openssl-sys" -version = "0.9.111" +version = "0.9.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" +checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" dependencies = [ "cc", "libc", @@ -2166,6 +2207,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "parking" +version = "2.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba" + [[package]] name = "parking_lot" version = "0.11.2" @@ -2601,11 +2648,12 @@ dependencies = [ [[package]] name = "redis" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e969d1d702793536d5fda739a82b88ad7cbe7d04f8386ee8cd16ad3eff4854a5" +checksum = "d76e41a79ae5cbb41257d84cf4cf0db0bb5a95b11bf05c62c351de4fe748620d" dependencies = [ "arcstr", + "async-lock", "bytes", "cfg-if", "combine", @@ -2880,9 +2928,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.36" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "once_cell", "ring", @@ -3327,9 +3375,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -3391,7 +3439,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b2688a909b49d133bf55f2e29271fb3a81ff1e1a0b99c366da9ffd9af69b933a" dependencies = [ "libc", - "nix 0.31.1", + "nix 0.31.2", "tokio", ] @@ -3531,9 +3579,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", diff --git a/mycelium-api/Cargo.toml b/mycelium-api/Cargo.toml index 00083e4..cb2eed6 100644 --- a/mycelium-api/Cargo.toml +++ b/mycelium-api/Cargo.toml @@ -24,7 +24,7 @@ jsonrpsee = { version = "0.26.0", features = [ ] } serde_json = "1.0.149" tracing = "0.1.44" -tokio = { version = "1.49.0", default-features = false, features = [ +tokio = { version = "1.50.0", default-features = false, features = [ "net", "rt", ] } diff --git a/mycelium-cli/Cargo.toml b/mycelium-cli/Cargo.toml index 3bc1d33..e8b1a69 100644 --- a/mycelium-cli/Cargo.toml +++ b/mycelium-cli/Cargo.toml @@ -16,7 +16,7 @@ serde_json = "1.0.149" base64 = "0.22.1" prettytable-rs = "0.10.0" tracing = "0.1.44" -tokio = { version = "1.49.0", default-features = false, features = [ +tokio = { version = "1.50.0", default-features = false, features = [ "net", "rt", "fs", diff --git a/mycelium-metrics/Cargo.toml b/mycelium-metrics/Cargo.toml index 2b60cfc..e3e1bdb 100644 --- a/mycelium-metrics/Cargo.toml +++ b/mycelium-metrics/Cargo.toml @@ -18,7 +18,7 @@ mycelium = { path = "../mycelium", default-features = false } prometheus = { version = "0.14.0", default-features = false, optional = true, features = [ "process", ] } -tokio = { version = "1.49.0", default-features = false, optional = true, features = [ +tokio = { version = "1.50.0", default-features = false, optional = true, features = [ "net", "rt", ] } diff --git a/mycelium/Cargo.toml b/mycelium/Cargo.toml index ee1dc0a..817bf36 100644 --- a/mycelium/Cargo.toml +++ b/mycelium/Cargo.toml @@ -16,7 +16,7 @@ mactunfd = [ [dependencies] cdn-meta = { git = "https://github.com/threefoldtech/mycelium-cdn-registry", package = "cdn-meta" } -tokio = { version = "1.49.0", features = [ +tokio = { version = "1.50.0", features = [ "io-util", "fs", "macros", @@ -33,25 +33,25 @@ bytes = "1.11.0" x25519-dalek = { version = "2.0.1", features = ["getrandom", "static_secrets"] } aes-gcm = "0.10.3" tracing = { version = "0.1.44", features = ["release_max_level_debug"] } -tracing-subscriber = { version = "0.3.22", features = ["env-filter"] } +tracing-subscriber = { version = "0.3.23", features = ["env-filter"] } tracing-logfmt = { version = "0.3.7", features = ["ansi_logs"] } faster-hex = "0.10.0" tokio-stream = { version = "0.1.18", features = ["sync"] } left-right = "0.11.7" -ipnet = "2.11.0" +ipnet = "2.12.0" ip_network_table-deps-treebitmap = "0.5.0" -blake3 = "1.8.3" +blake3 = "1.8.4" etherparse = "0.19.0" quinn = { version = "0.11.9", default-features = false, features = [ "runtime-tokio", "rustls", ] } -rustls = { version = "0.23.36", default-features = false, features = ["ring"] } +rustls = { version = "0.23.37", default-features = false, features = ["ring"] } rcgen = "0.14.7" -netdev = "0.40.0" -openssl = { version = "0.10.75", optional = true } +netdev = "0.41.0" +openssl = { version = "0.10.76", optional = true } tokio-openssl = { version = "0.6.5", optional = true } -arc-swap = "1.8.2" +arc-swap = "1.9.0" dashmap = { version = "6.1.0", features = ["inline"] } ahash = "0.8.11" axum = "0.8.8" @@ -62,7 +62,7 @@ reqwest = { version = "0.12.24", default-features = false, features = [ "system-proxy", "rustls-tls", ] } -redis = { version = "1.0.3", features = ["tokio-comp"] } +redis = { version = "1.1.0", features = ["tokio-comp"] } reed-solomon-erasure = "6.0.0" hickory-server = "0.25.2" async-trait = "0.1.89" @@ -70,7 +70,7 @@ hickory-resolver = "0.25.2" [target.'cfg(target_os = "linux")'.dependencies] rtnetlink = "0.20.0" tokio-tun = "0.15.2" -nix = { version = "0.31.1", features = ["socket"] } +nix = { version = "0.31.2", features = ["socket"] } [target.'cfg(target_os = "macos")'.dependencies] tun = { git = "https://github.com/LeeSmet/rust-tun", features = ["async"] }