diff --git a/Cargo.lock b/Cargo.lock index 88be91b037..b460f5df89 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -782,7 +782,7 @@ dependencies = [ "clap", "dirs-next", "futures", - "libp2p", + "libp2p 0.55.0", "reqwest 0.12.9", "serde", "serde_json", @@ -844,7 +844,7 @@ dependencies = [ "evmlib", "hex 0.4.3", "lazy_static", - "libp2p", + "libp2p 0.55.0", "rand 0.8.5", "ring 0.17.8", "rmp-serde", @@ -922,7 +922,8 @@ dependencies = [ "hyper 0.14.31", "itertools 0.12.1", "lazy_static", - "libp2p", + "libp2p 0.54.1", + "libp2p 0.55.0", "libp2p-identity", "prometheus-client", "quickcheck", @@ -976,7 +977,7 @@ dependencies = [ "futures", "hex 0.4.3", "itertools 0.12.1", - "libp2p", + "libp2p 0.55.0", "num-traits", "prometheus-client", "prost 0.9.0", @@ -1024,7 +1025,7 @@ dependencies = [ "colored", "dirs-next", "indicatif", - "libp2p", + "libp2p 0.55.0", "libp2p-identity", "mockall 0.12.1", "nix 0.27.1", @@ -1060,7 +1061,7 @@ dependencies = [ "clap", "color-eyre", "hex 0.4.3", - "libp2p", + "libp2p 0.55.0", "libp2p-identity", "thiserror 1.0.69", "tokio", @@ -1086,7 +1087,7 @@ dependencies = [ "exponential-backoff", "hex 0.4.3", "lazy_static", - "libp2p", + "libp2p 0.55.0", "prost 0.9.0", "rmp-serde", "serde", @@ -1147,7 +1148,7 @@ dependencies = [ "ant-protocol", "async-trait", "dirs-next", - "libp2p", + "libp2p 0.55.0", "libp2p-identity", "mockall 0.11.4", "prost 0.9.0", @@ -1454,6 +1455,18 @@ dependencies = [ "futures-core", ] +[[package]] +name = "async-channel" +version = "2.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a" +dependencies = [ + "concurrent-queue", + "event-listener-strategy", + "futures-core", + "pin-project-lite", +] + [[package]] name = "async-io" version = "2.4.0" @@ -1484,6 +1497,17 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "async-recursion" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "async-stream" version = "0.3.6" @@ -1530,6 +1554,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "atomic-write-file" version = "0.2.2" @@ -1612,7 +1642,7 @@ dependencies = [ "hex 0.4.3", "instant", "js-sys", - "libp2p", + "libp2p 0.55.0", "pyo3", "rand 0.8.5", "rmp-serde", @@ -3804,6 +3834,19 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42012b0f064e01aa58b545fe3727f90f7dd4020f4a3ea735b50344965f5a57e9" +[[package]] +name = "generator" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6bd114ceda131d3b1d665eba35788690ad37f5916457286b32ab6fd3c438dd" +dependencies = [ + "cfg-if", + "libc", + "log", + "rustversion", + "windows 0.58.0", +] + [[package]] name = "generic-array" version = "0.12.4" @@ -4468,6 +4511,25 @@ dependencies = [ "tracing", ] +[[package]] +name = "h2" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e" +dependencies = [ + "atomic-waker", + "bytes", + "fnv", + "futures-core", + "futures-sink", + "http 1.2.0", + "indexmap 2.7.0", + "slab", + "tokio", + "tokio-util 0.7.13", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -4521,6 +4583,15 @@ dependencies = [ "hashbrown 0.14.5", ] +[[package]] +name = "hashlink" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba4ff7128dee98c7dc9794b6a411377e1404dba1c97deb8d1a55297bd25d8af" +dependencies = [ + "hashbrown 0.14.5", +] + [[package]] name = "headers" version = "0.3.9" @@ -4645,6 +4716,32 @@ dependencies = [ "url", ] +[[package]] +name = "hickory-proto" +version = "0.25.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d063c0692ee669aa6d261988aa19ca5510f1cc40e4f211024f50c888499a35d7" +dependencies = [ + "async-recursion", + "async-trait", + "cfg-if", + "data-encoding", + "enum-as-inner", + "futures-channel", + "futures-io", + "futures-util", + "idna", + "ipnet", + "once_cell", + "rand 0.8.5", + "socket2", + "thiserror 2.0.6", + "tinyvec", + "tokio", + "tracing", + "url", +] + [[package]] name = "hickory-resolver" version = "0.24.2" @@ -4653,7 +4750,7 @@ checksum = "0a2e2aba9c389ce5267d31cf1e4dace82390ae276b0b364ea55630b1fa1b44b4" dependencies = [ "cfg-if", "futures-util", - "hickory-proto", + "hickory-proto 0.24.2", "ipconfig", "lru-cache", "once_cell", @@ -4666,6 +4763,27 @@ dependencies = [ "tracing", ] +[[package]] +name = "hickory-resolver" +version = "0.25.0-alpha.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42bc352e4412fb657e795f79b4efcf2bd60b59ee5ca0187f3554194cd1107a27" +dependencies = [ + "cfg-if", + "futures-util", + "hickory-proto 0.25.0-alpha.4", + "ipconfig", + "moka", + "once_cell", + "parking_lot", + "rand 0.8.5", + "resolv-conf", + "smallvec", + "thiserror 2.0.6", + "tokio", + "tracing", +] + [[package]] name = "hkdf" version = "0.12.4" @@ -4777,7 +4895,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad" dependencies = [ "anyhow", - "async-channel", + "async-channel 1.9.0", "base64 0.13.1", "futures-lite 1.13.0", "http 0.2.12", @@ -4829,7 +4947,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -4852,6 +4970,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.7", "http 1.2.0", "http-body 1.0.1", "httparse", @@ -5145,6 +5264,27 @@ dependencies = [ "xmltree", ] +[[package]] +name = "igd-next" +version = "0.15.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76b0d7d4541def58a37bf8efc559683f21edce7c82f0d866c93ac21f7e098f93" +dependencies = [ + "async-trait", + "attohttpc", + "bytes", + "futures", + "http 1.2.0", + "http-body-util", + "hyper 1.5.1", + "hyper-util", + "log", + "rand 0.8.5", + "tokio", + "url", + "xmltree", +] + [[package]] name = "ignore" version = "0.4.23" @@ -5449,31 +5589,65 @@ dependencies = [ "futures", "futures-timer", "getrandom 0.2.15", - "libp2p-allow-block-list", + "libp2p-allow-block-list 0.4.0", + "libp2p-connection-limits 0.4.0", + "libp2p-core 0.42.0", + "libp2p-dns 0.42.0", + "libp2p-gossipsub 0.47.0", + "libp2p-identify 0.45.0", + "libp2p-identity", + "libp2p-kad 0.46.2", + "libp2p-mdns 0.46.0", + "libp2p-metrics 0.15.0", + "libp2p-noise 0.45.0", + "libp2p-quic 0.11.1", + "libp2p-request-response 0.27.0", + "libp2p-swarm 0.45.1", + "libp2p-tcp 0.42.0", + "libp2p-upnp 0.3.0", + "libp2p-websocket-websys", + "libp2p-yamux 0.46.0", + "multiaddr", + "pin-project", + "rw-stream-sink", + "thiserror 1.0.69", +] + +[[package]] +name = "libp2p" +version = "0.55.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b72dc443ddd0254cb49a794ed6b6728400ee446a0f7ab4a07d0209ee98de20e9" +dependencies = [ + "bytes", + "either", + "futures", + "futures-timer", + "getrandom 0.2.15", + "libp2p-allow-block-list 0.5.0", "libp2p-autonat", - "libp2p-connection-limits", - "libp2p-core", - "libp2p-dns", - "libp2p-gossipsub", - "libp2p-identify", + "libp2p-connection-limits 0.5.0", + "libp2p-core 0.43.0", + "libp2p-dns 0.43.0", + "libp2p-gossipsub 0.48.0", + "libp2p-identify 0.46.0", "libp2p-identity", - "libp2p-kad", - "libp2p-mdns", - "libp2p-metrics", - "libp2p-noise", - "libp2p-quic", + "libp2p-kad 0.47.0", + "libp2p-mdns 0.47.0", + "libp2p-metrics 0.16.0", + "libp2p-noise 0.46.0", + "libp2p-quic 0.12.0", "libp2p-relay", - "libp2p-request-response", - "libp2p-swarm", - "libp2p-tcp", - "libp2p-upnp", + "libp2p-request-response 0.28.0", + "libp2p-swarm 0.46.0", + "libp2p-tcp 0.43.0", + "libp2p-upnp 0.4.0", "libp2p-websocket", - "libp2p-websocket-websys", - "libp2p-yamux", + "libp2p-yamux 0.47.0", "multiaddr", "pin-project", "rw-stream-sink", - "thiserror 1.0.69", + "thiserror 2.0.6", ] [[package]] @@ -5482,36 +5656,45 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041" dependencies = [ - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "void", ] +[[package]] +name = "libp2p-allow-block-list" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38944b7cb981cc93f2f0fb411ff82d0e983bd226fbcc8d559639a3a73236568b" +dependencies = [ + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", +] + [[package]] name = "libp2p-autonat" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a083675f189803d0682a2726131628e808144911dad076858bfbe30b13065499" +checksum = "e297bfc6cabb70c6180707f8fa05661b77ecb9cb67e8e8e1c469301358fa21d0" dependencies = [ "async-trait", "asynchronous-codec", - "bytes", "either", "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.43.0", "libp2p-identity", - "libp2p-request-response", - "libp2p-swarm", + "libp2p-request-response 0.28.0", + "libp2p-swarm 0.46.0", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", "rand_core 0.6.4", - "thiserror 1.0.69", + "thiserror 2.0.6", "tracing", - "void", "web-time", ] @@ -5521,12 +5704,23 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8" dependencies = [ - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "void", ] +[[package]] +name = "libp2p-connection-limits" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "efe9323175a17caa8a2ed4feaf8a548eeef5e0b72d03840a0eab4bcb0210ce1c" +dependencies = [ + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", +] + [[package]] name = "libp2p-core" version = "0.42.0" @@ -5547,7 +5741,6 @@ dependencies = [ "quick-protobuf", "rand 0.8.5", "rw-stream-sink", - "serde", "smallvec", "thiserror 1.0.69", "tracing", @@ -5556,6 +5749,32 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-core" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "193c75710ba43f7504ad8f58a62ca0615b1d7e572cb0f1780bc607252c39e9ef" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "libp2p-identity", + "multiaddr", + "multihash", + "multistream-select", + "once_cell", + "parking_lot", + "pin-project", + "quick-protobuf", + "rand 0.8.5", + "rw-stream-sink", + "thiserror 2.0.6", + "tracing", + "unsigned-varint 0.8.0", + "web-time", +] + [[package]] name = "libp2p-dns" version = "0.42.0" @@ -5564,8 +5783,24 @@ checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd" dependencies = [ "async-trait", "futures", - "hickory-resolver", - "libp2p-core", + "hickory-resolver 0.24.2", + "libp2p-core 0.42.0", + "libp2p-identity", + "parking_lot", + "smallvec", + "tracing", +] + +[[package]] +name = "libp2p-dns" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b780a1150214155b0ed1cdf09fbd2e1b0442604f9146a431d1b21d23eef7bd7" +dependencies = [ + "async-trait", + "futures", + "hickory-resolver 0.25.0-alpha.4", + "libp2p-core 0.43.0", "libp2p-identity", "parking_lot", "smallvec", @@ -5588,15 +5823,14 @@ dependencies = [ "futures-ticker", "getrandom 0.2.15", "hex_fmt", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "prometheus-client", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", "regex", - "serde", "sha2 0.10.8", "smallvec", "tracing", @@ -5604,6 +5838,38 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-gossipsub" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d558548fa3b5a8e9b66392f785921e363c57c05dcadfda4db0d41ae82d313e4a" +dependencies = [ + "async-channel 2.3.1", + "asynchronous-codec", + "base64 0.22.1", + "byteorder", + "bytes", + "either", + "fnv", + "futures", + "futures-timer", + "getrandom 0.2.15", + "hashlink 0.9.1", + "hex_fmt", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", + "prometheus-client", + "quick-protobuf", + "quick-protobuf-codec", + "rand 0.8.5", + "regex", + "serde", + "sha2 0.10.8", + "tracing", + "web-time", +] + [[package]] name = "libp2p-identify" version = "0.45.0" @@ -5615,9 +5881,9 @@ dependencies = [ "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "lru", "quick-protobuf", "quick-protobuf-codec", @@ -5627,6 +5893,27 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-identify" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8c06862544f02d05d62780ff590cc25a75f5c2b9df38ec7a370dcae8bb873cf" +dependencies = [ + "asynchronous-codec", + "either", + "futures", + "futures-bounded", + "futures-timer", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", + "quick-protobuf", + "quick-protobuf-codec", + "smallvec", + "thiserror 2.0.6", + "tracing", +] + [[package]] name = "libp2p-identity" version = "0.2.10" @@ -5660,22 +5947,49 @@ dependencies = [ "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", - "serde", "sha2 0.10.8", "smallvec", "thiserror 1.0.69", "tracing", - "uint", + "uint 0.9.5", "void", "web-time", ] +[[package]] +name = "libp2p-kad" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bab0466a27ebe955bcbc27328fae5429c5b48c915fd6174931414149802ec23" +dependencies = [ + "asynchronous-codec", + "bytes", + "either", + "fnv", + "futures", + "futures-bounded", + "futures-timer", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", + "quick-protobuf", + "quick-protobuf-codec", + "rand 0.8.5", + "serde", + "sha2 0.10.8", + "smallvec", + "thiserror 2.0.6", + "tracing", + "uint 0.10.0", + "web-time", +] + [[package]] name = "libp2p-mdns" version = "0.46.0" @@ -5684,11 +5998,11 @@ checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417" dependencies = [ "data-encoding", "futures", - "hickory-proto", + "hickory-proto 0.24.2", "if-watch", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "rand 0.8.5", "smallvec", "socket2", @@ -5697,6 +6011,25 @@ dependencies = [ "void", ] +[[package]] +name = "libp2p-mdns" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11d0ba095e1175d797540e16b62e7576846b883cb5046d4159086837b36846cc" +dependencies = [ + "futures", + "hickory-proto 0.25.0-alpha.4", + "if-watch", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", + "rand 0.8.5", + "smallvec", + "socket2", + "tokio", + "tracing", +] + [[package]] name = "libp2p-metrics" version = "0.15.0" @@ -5704,12 +6037,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "77ebafa94a717c8442d8db8d3ae5d1c6a15e30f2d347e0cd31d057ca72e42566" dependencies = [ "futures", - "libp2p-core", - "libp2p-identify", + "libp2p-core 0.42.0", + "libp2p-identify 0.45.0", "libp2p-identity", - "libp2p-kad", + "libp2p-kad 0.46.2", + "libp2p-swarm 0.45.1", + "pin-project", + "prometheus-client", + "web-time", +] + +[[package]] +name = "libp2p-metrics" +version = "0.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ce58c64292e87af624fcb86465e7dd8342e46a388d71e8fec0ab37ee789630a" +dependencies = [ + "futures", + "libp2p-core 0.43.0", + "libp2p-identify 0.46.0", + "libp2p-identity", + "libp2p-kad 0.47.0", "libp2p-relay", - "libp2p-swarm", + "libp2p-swarm 0.46.0", "pin-project", "prometheus-client", "web-time", @@ -5725,7 +6075,7 @@ dependencies = [ "bytes", "curve25519-dalek 4.1.3", "futures", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", "multiaddr", "multihash", @@ -5741,6 +6091,30 @@ dependencies = [ "zeroize", ] +[[package]] +name = "libp2p-noise" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "afcc133e0f3cea07acde6eb8a9665cb11b600bd61110b010593a0210b8153b16" +dependencies = [ + "asynchronous-codec", + "bytes", + "futures", + "libp2p-core 0.43.0", + "libp2p-identity", + "multiaddr", + "multihash", + "once_cell", + "quick-protobuf", + "rand 0.8.5", + "snow", + "static_assertions", + "thiserror 2.0.6", + "tracing", + "x25519-dalek", + "zeroize", +] + [[package]] name = "libp2p-quic" version = "0.11.1" @@ -5751,9 +6125,9 @@ dependencies = [ "futures", "futures-timer", "if-watch", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-tls", + "libp2p-tls 0.5.0", "parking_lot", "quinn", "rand 0.8.5", @@ -5765,11 +6139,33 @@ dependencies = [ "tracing", ] +[[package]] +name = "libp2p-quic" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "41432a159b00424a0abaa2c80d786cddff81055ac24aa127e0cf375f7858d880" +dependencies = [ + "futures", + "futures-timer", + "if-watch", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-tls 0.6.0", + "quinn", + "rand 0.8.5", + "ring 0.17.8", + "rustls 0.23.20", + "socket2", + "thiserror 2.0.6", + "tokio", + "tracing", +] + [[package]] name = "libp2p-relay" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10df23d7f5b5adcc129f4a69d6fbd05209e356ccf9e8f4eb10b2692b79c77247" +checksum = "08a41e346681395877118c270cf993f90d57d045fbf0913ca2f07b59ec6062e4" dependencies = [ "asynchronous-codec", "bytes", @@ -5777,16 +6173,15 @@ dependencies = [ "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.43.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.46.0", "quick-protobuf", "quick-protobuf-codec", "rand 0.8.5", "static_assertions", - "thiserror 1.0.69", + "thiserror 2.0.6", "tracing", - "void", "web-time", ] @@ -5801,9 +6196,9 @@ dependencies = [ "futures", "futures-bounded", "futures-timer", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", - "libp2p-swarm", + "libp2p-swarm 0.45.1", "rand 0.8.5", "serde", "smallvec", @@ -5812,6 +6207,25 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-request-response" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "548fe44a80ff275d400f1b26b090d441d83ef73efabbeb6415f4ce37e5aed865" +dependencies = [ + "async-trait", + "cbor4ii", + "futures", + "futures-bounded", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm 0.46.0", + "rand 0.8.5", + "serde", + "smallvec", + "tracing", +] + [[package]] name = "libp2p-swarm" version = "0.45.1" @@ -5823,7 +6237,7 @@ dependencies = [ "futures", "futures-timer", "getrandom 0.2.15", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", "libp2p-swarm-derive", "lru", @@ -5838,6 +6252,29 @@ dependencies = [ "web-time", ] +[[package]] +name = "libp2p-swarm" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "803399b4b6f68adb85e63ab573ac568154b193e9a640f03e0f2890eabbcb37f8" +dependencies = [ + "either", + "fnv", + "futures", + "futures-timer", + "libp2p-core 0.43.0", + "libp2p-identity", + "libp2p-swarm-derive", + "lru", + "multistream-select", + "once_cell", + "rand 0.8.5", + "smallvec", + "tokio", + "tracing", + "web-time", +] + [[package]] name = "libp2p-swarm-derive" version = "0.35.0" @@ -5860,13 +6297,29 @@ dependencies = [ "futures-timer", "if-watch", "libc", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", "socket2", "tokio", "tracing", ] +[[package]] +name = "libp2p-tcp" +version = "0.43.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65346fb4d36035b23fec4e7be4c320436ba53537ce9b6be1d1db1f70c905cad0" +dependencies = [ + "futures", + "futures-timer", + "if-watch", + "libc", + "libp2p-core 0.43.0", + "socket2", + "tokio", + "tracing", +] + [[package]] name = "libp2p-tls" version = "0.5.0" @@ -5875,7 +6328,7 @@ checksum = "47b23dddc2b9c355f73c1e36eb0c3ae86f7dc964a3715f0731cfad352db4d847" dependencies = [ "futures", "futures-rustls", - "libp2p-core", + "libp2p-core 0.42.0", "libp2p-identity", "rcgen", "ring 0.17.8", @@ -5886,6 +6339,25 @@ dependencies = [ "yasna", ] +[[package]] +name = "libp2p-tls" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dcaebc1069dea12c5b86a597eaaddae0317c2c2cb9ec99dc94f82fd340f5c78b" +dependencies = [ + "futures", + "futures-rustls", + "libp2p-core 0.43.0", + "libp2p-identity", + "rcgen", + "ring 0.17.8", + "rustls 0.23.20", + "rustls-webpki 0.101.7", + "thiserror 2.0.6", + "x509-parser", + "yasna", +] + [[package]] name = "libp2p-upnp" version = "0.3.0" @@ -5894,30 +6366,45 @@ checksum = "01bf2d1b772bd3abca049214a3304615e6a36fa6ffc742bdd1ba774486200b8f" dependencies = [ "futures", "futures-timer", - "igd-next", - "libp2p-core", - "libp2p-swarm", + "igd-next 0.14.3", + "libp2p-core 0.42.0", + "libp2p-swarm 0.45.1", "tokio", "tracing", "void", ] +[[package]] +name = "libp2p-upnp" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d457b9ecceb66e7199f049926fad447f1f17f040e8d29d690c086b4cab8ed14a" +dependencies = [ + "futures", + "futures-timer", + "igd-next 0.15.1", + "libp2p-core 0.43.0", + "libp2p-swarm 0.46.0", + "tokio", + "tracing", +] + [[package]] name = "libp2p-websocket" -version = "0.44.0" +version = "0.45.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "888b2ff2e5d8dcef97283daab35ad1043d18952b65e05279eecbe02af4c6e347" +checksum = "2bf5d48a4d8fad8a49fbf23816a878cac25623549f415d74da8ef4327e6196a9" dependencies = [ "either", "futures", "futures-rustls", - "libp2p-core", + "libp2p-core 0.43.0", "libp2p-identity", "parking_lot", "pin-project-lite", "rw-stream-sink", "soketto", - "thiserror 1.0.69", + "thiserror 2.0.6", "tracing", "url", "webpki-roots 0.25.4", @@ -5932,7 +6419,7 @@ dependencies = [ "bytes", "futures", "js-sys", - "libp2p-core", + "libp2p-core 0.42.0", "parking_lot", "send_wrapper 0.6.0", "thiserror 1.0.69", @@ -5949,13 +6436,28 @@ checksum = "788b61c80789dba9760d8c669a5bedb642c8267555c803fabd8396e4ca5c5882" dependencies = [ "either", "futures", - "libp2p-core", + "libp2p-core 0.42.0", "thiserror 1.0.69", "tracing", "yamux 0.12.1", "yamux 0.13.4", ] +[[package]] +name = "libp2p-yamux" +version = "0.47.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f15df094914eb4af272acf9adaa9e287baa269943f32ea348ba29cfb9bfc60d8" +dependencies = [ + "either", + "futures", + "libp2p-core 0.43.0", + "thiserror 2.0.6", + "tracing", + "yamux 0.12.1", + "yamux 0.13.4", +] + [[package]] name = "libredox" version = "0.1.3" @@ -6001,6 +6503,19 @@ version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +[[package]] +name = "loom" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "419e0dc8046cb947daa77eb95ae174acfbddb7673b4151f56d1eed8e93fbfaca" +dependencies = [ + "cfg-if", + "generator", + "scoped-tls", + "tracing", + "tracing-subscriber", +] + [[package]] name = "lru" version = "0.12.5" @@ -6202,6 +6717,25 @@ dependencies = [ "syn 2.0.90", ] +[[package]] +name = "moka" +version = "0.12.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9321642ca94a4282428e6ea4af8cc2ca4eac48ac7a6a4ea8f33f76d0ce70926" +dependencies = [ + "crossbeam-channel", + "crossbeam-epoch", + "crossbeam-utils", + "loom", + "parking_lot", + "portable-atomic", + "rustc_version 0.4.1", + "smallvec", + "tagptr", + "thiserror 1.0.69", + "uuid", +] + [[package]] name = "multer" version = "2.1.0" @@ -6292,7 +6826,7 @@ dependencies = [ "clap-verbosity-flag", "color-eyre", "futures", - "libp2p", + "libp2p 0.55.0", "tokio", "tracing", "tracing-log 0.2.0", @@ -7327,7 +7861,7 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2" dependencies = [ "fixed-hash", "impl-codec", - "uint", + "uint 0.9.5", ] [[package]] @@ -8033,7 +8567,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", @@ -9255,6 +9789,12 @@ dependencies = [ "libc", ] +[[package]] +name = "tagptr" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" + [[package]] name = "tap" version = "1.0.1" @@ -9326,7 +9866,7 @@ dependencies = [ "color-eyre", "dirs-next", "evmlib", - "libp2p", + "libp2p 0.55.0", "rand 0.8.5", "serde", "serde_json", @@ -9669,7 +10209,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", @@ -9701,7 +10241,7 @@ dependencies = [ "bytes", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "hyper 0.14.31", @@ -10002,6 +10542,18 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "uint" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "909988d098b2f738727b161a106cfc7cab00c539c2687a8836f8e565976fb53e" +dependencies = [ + "byteorder", + "crunchy", + "hex 0.4.3", + "static_assertions", +] + [[package]] name = "unarray" version = "0.1.4" @@ -10558,6 +11110,16 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" +dependencies = [ + "windows-core 0.58.0", + "windows-targets 0.52.6", +] + [[package]] name = "windows-core" version = "0.52.0" @@ -10577,6 +11139,41 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result 0.2.0", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.90", +] + [[package]] name = "windows-registry" version = "0.2.0" @@ -10926,7 +11523,7 @@ checksum = "8902160c4e6f2fb145dbe9d6760a75e3c9522d8bf796ed7047c85919ac7115f8" dependencies = [ "arraydeque", "encoding_rs", - "hashlink", + "hashlink 0.8.4", ] [[package]] diff --git a/ant-bootstrap/Cargo.toml b/ant-bootstrap/Cargo.toml index 856a44fdc0..f91a6e5ac7 100644 --- a/ant-bootstrap/Cargo.toml +++ b/ant-bootstrap/Cargo.toml @@ -20,7 +20,7 @@ chrono = { version = "0.4", features = ["serde"] } clap = { version = "4.2.1", features = ["derive", "env"] } dirs-next = "~2.0.0" futures = "0.3.30" -libp2p = { version = "0.54.1", features = ["serde"] } +libp2p = { version = "0.55.0", features = ["serde"] } reqwest = { version = "0.12.2", default-features = false, features = [ "rustls-tls-manual-roots", ] } diff --git a/ant-evm/Cargo.toml b/ant-evm/Cargo.toml index 02663b1484..4cbb829bf0 100644 --- a/ant-evm/Cargo.toml +++ b/ant-evm/Cargo.toml @@ -19,7 +19,7 @@ custom_debug = "~0.6.1" evmlib = { path = "../evmlib", version = "0.1.8" } hex = "~0.4.3" lazy_static = "~1.4.0" -libp2p = { version = "0.54.1", features = ["identify", "kad"] } +libp2p = { version = "0.55.0", features = ["identify", "kad"] } rand = { version = "~0.8.5", features = ["small_rng"] } ring = "0.17.8" rmp-serde = "1.1.1" diff --git a/ant-networking/Cargo.toml b/ant-networking/Cargo.toml index ecfcdc4462..bd1c574a49 100644 --- a/ant-networking/Cargo.toml +++ b/ant-networking/Cargo.toml @@ -39,7 +39,7 @@ hyper = { version = "0.14", features = [ ], optional = true } itertools = "~0.12.1" lazy_static = "~1.4.0" -libp2p = { version = "0.54.1", features = [ +libp2p = { version = "0.55.0", features = [ "tokio", "dns", "kad", @@ -95,7 +95,7 @@ crate-type = ["cdylib", "rlib"] [target.'cfg(target_arch = "wasm32")'.dependencies] getrandom = { version = "0.2.12", features = ["js"] } -libp2p = { version = "0.54.1", features = [ +libp2p = { version = "0.55.0", features = [ "tokio", "dns", "kad", diff --git a/ant-networking/src/event/request_response.rs b/ant-networking/src/event/request_response.rs index ce6755e8dc..93a2558d27 100644 --- a/ant-networking/src/event/request_response.rs +++ b/ant-networking/src/event/request_response.rs @@ -24,7 +24,7 @@ impl SwarmDriver { event: request_response::Event, ) -> Result<(), NetworkError> { match event { - request_response::Event::Message { message, peer } => match message { + request_response::Event::Message { message, peer, .. } => match message { Message::Request { request, channel, @@ -124,6 +124,7 @@ impl SwarmDriver { request_id, error, peer, + .. } => { if let Some(sender) = self.pending_requests.remove(&request_id) { match sender { @@ -146,10 +147,13 @@ impl SwarmDriver { peer, request_id, error, + .. } => { warn!("RequestResponse: InboundFailure for request_id: {request_id:?} and peer: {peer:?}, with error: {error:?}"); } - request_response::Event::ResponseSent { peer, request_id } => { + request_response::Event::ResponseSent { + peer, request_id, .. + } => { debug!("ResponseSent for request_id: {request_id:?} and peer: {peer:?}"); } } diff --git a/ant-node-manager/Cargo.toml b/ant-node-manager/Cargo.toml index e83f43dabb..ea580ce8b2 100644 --- a/ant-node-manager/Cargo.toml +++ b/ant-node-manager/Cargo.toml @@ -43,7 +43,7 @@ colored = "2.0.4" color-eyre = "~0.6" dirs-next = "2.0.0" indicatif = { version = "0.17.5", features = ["tokio"] } -libp2p = { version = "0.54.1", features = [] } +libp2p = { version = "0.55.0", features = [] } libp2p-identity = { version = "0.2.7", features = ["rand"] } prost = { version = "0.9" } rand = "0.8.5" diff --git a/ant-node-rpc-client/Cargo.toml b/ant-node-rpc-client/Cargo.toml index 80690be5b3..0babb0d5b5 100644 --- a/ant-node-rpc-client/Cargo.toml +++ b/ant-node-rpc-client/Cargo.toml @@ -27,7 +27,7 @@ bls = { package = "blsttc", version = "8.0.1" } clap = { version = "4.2.1", features = ["derive"] } color-eyre = "0.6.2" hex = "~0.4.3" -libp2p = { version = "0.54.1", features = ["kad"]} +libp2p = { version = "0.55.0", features = ["kad"]} libp2p-identity = { version="0.2.7", features = ["rand"] } thiserror = "1.0.23" # # watch out updating this, protoc compiler needs to be installed on all build systems diff --git a/ant-node/Cargo.toml b/ant-node/Cargo.toml index f226244287..2bad11bb00 100644 --- a/ant-node/Cargo.toml +++ b/ant-node/Cargo.toml @@ -49,7 +49,7 @@ file-rotate = "0.7.3" futures = "~0.3.13" hex = "~0.4.3" itertools = "~0.12.1" -libp2p = { version = "0.54.1", features = ["tokio", "dns", "kad", "macros"] } +libp2p = { version = "0.55.0", features = ["tokio", "dns", "kad", "macros"] } num-traits = "0.2" prometheus-client = { version = "0.22", optional = true } # watch out updating this, protoc compiler needs to be installed on all build systems diff --git a/ant-protocol/Cargo.toml b/ant-protocol/Cargo.toml index cdc866bdc9..ac9343c832 100644 --- a/ant-protocol/Cargo.toml +++ b/ant-protocol/Cargo.toml @@ -26,7 +26,7 @@ dirs-next = "~2.0.0" exponential-backoff = "2.0.0" hex = "~0.4.3" lazy_static = "1.4.0" -libp2p = { version = "0.54.1", features = ["identify", "kad"] } +libp2p = { version = "0.55.0", features = ["identify", "kad"] } # # watch out updating this, protoc compiler needs to be installed on all build systems # # arm builds + musl are very problematic # prost and tonic are needed for the RPC server messages, not the underlying protocol diff --git a/ant-service-management/Cargo.toml b/ant-service-management/Cargo.toml index 662634a107..7e001f0262 100644 --- a/ant-service-management/Cargo.toml +++ b/ant-service-management/Cargo.toml @@ -16,7 +16,7 @@ ant-logging = { path = "../ant-logging", version = "0.2.45" } ant-protocol = { path = "../ant-protocol", version = "0.3.3", features = ["rpc"] } async-trait = "0.1" dirs-next = "2.0.0" -libp2p = { version = "0.54.1", features = ["kad"] } +libp2p = { version = "0.55.0", features = ["kad"] } libp2p-identity = { version = "0.2.7", features = ["rand"] } prost = { version = "0.9" } serde = { version = "1.0", features = ["derive"] } diff --git a/autonomi/Cargo.toml b/autonomi/Cargo.toml index 31ea027dd5..26cb9b0831 100644 --- a/autonomi/Cargo.toml +++ b/autonomi/Cargo.toml @@ -50,7 +50,7 @@ curv = { version = "0.10.1", package = "sn_curv", default-features = false, feat eip2333 = { version = "0.2.1", package = "sn_bls_ckd" } futures = "0.3.30" hex = "~0.4.3" -libp2p = "0.54.1" +libp2p = "0.55.0" pyo3 = { version = "0.20", optional = true, features = ["extension-module", "abi3-py38"] } rand = "0.8.5" rmp-serde = "1.1.1" diff --git a/nat-detection/Cargo.toml b/nat-detection/Cargo.toml index 2ad2fc2dcd..1f22215bcb 100644 --- a/nat-detection/Cargo.toml +++ b/nat-detection/Cargo.toml @@ -24,7 +24,7 @@ clap = { version = "4.5.4", features = ["derive"] } clap-verbosity-flag = "2.2.0" color-eyre = { version = "0.6", default-features = false } futures = "~0.3.13" -libp2p = { version = "0.54.1", features = [ +libp2p = { version = "0.55.0", features = [ "tokio", "tcp", "noise", diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 7e6538d29f..5d85ca1054 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -14,7 +14,7 @@ bytes = { version = "1.0.1", features = ["serde"] } color-eyre = "~0.6.2" dirs-next = "~2.0.0" evmlib = { path = "../evmlib", version = "0.1.8" } -libp2p = { version = "0.54.1", features = ["identify", "kad"] } +libp2p = { version = "0.55.0", features = ["identify", "kad"] } rand = "0.8.5" serde = { version = "1.0.133", features = ["derive"] } serde_json = "1.0"