From 2960eb9d7793cb17b803ae1430011173be216e85 Mon Sep 17 00:00:00 2001 From: qima Date: Tue, 3 Dec 2024 23:40:38 +0800 Subject: [PATCH] chore: libp2p dependent updated to latest --- Cargo.lock | 192 ++++++++++++++++-------------- ant-evm/Cargo.toml | 2 +- ant-networking/Cargo.toml | 4 +- ant-networking/src/driver.rs | 15 ++- ant-node-manager/Cargo.toml | 2 +- ant-node-rpc-client/Cargo.toml | 2 +- ant-node/Cargo.toml | 2 +- ant-peers-acquisition/Cargo.toml | 2 +- ant-protocol/Cargo.toml | 2 +- ant-service-management/Cargo.toml | 2 +- autonomi/Cargo.toml | 2 +- nat-detection/Cargo.toml | 2 +- test-utils/Cargo.toml | 2 +- 13 files changed, 127 insertions(+), 104 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index aff7d76738..acb2c18bea 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1370,6 +1370,18 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b34d609dfbaf33d6889b2b7106d3ca345eacad44200913df5ba02bfd31d2ba9" +[[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" @@ -1446,6 +1458,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 = "attohttpc" version = "0.24.1" @@ -3616,17 +3634,6 @@ version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" -[[package]] -name = "futures-ticker" -version = "0.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9763058047f713632a52e916cc7f6a4b3fc6e9fc1ff8c5b1dc49e5a89041682e" -dependencies = [ - "futures", - "futures-timer", - "instant", -] - [[package]] name = "futures-timer" version = "3.0.3" @@ -4325,6 +4332,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.1.0", + "indexmap 2.7.0", + "slab", + "tokio", + "tokio-util 0.7.12", + "tracing", +] + [[package]] name = "half" version = "2.4.1" @@ -4665,7 +4691,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2", + "h2 0.3.26", "http 0.2.12", "http-body 0.4.6", "httparse", @@ -4688,6 +4714,7 @@ dependencies = [ "bytes", "futures-channel", "futures-util", + "h2 0.4.7", "http 1.1.0", "http-body 1.0.1", "httparse", @@ -4974,16 +5001,18 @@ dependencies = [ [[package]] name = "igd-next" -version = "0.14.3" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "064d90fec10d541084e7b39ead8875a5a80d9114a2b18791565253bae25f49e4" +checksum = "76b0d7d4541def58a37bf8efc559683f21edce7c82f0d866c93ac21f7e098f93" dependencies = [ "async-trait", "attohttpc", "bytes", "futures", - "http 0.2.12", - "hyper 0.14.31", + "http 1.1.0", + "http-body-util", + "hyper 1.5.1", + "hyper-util", "log", "rand 0.8.5", "tokio", @@ -5280,8 +5309,8 @@ checksum = "8355be11b20d696c8f18f6cc018c4e372165b1fa8126cef092399c9951984ffa" [[package]] name = "libp2p" -version = "0.54.1" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.54.2" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "bytes", "either", @@ -5312,24 +5341,23 @@ dependencies = [ "multiaddr", "pin-project", "rw-stream-sink", - "thiserror 1.0.69", + "thiserror 2.0.3", ] [[package]] name = "libp2p-allow-block-list" -version = "0.4.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.4.2" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "void", ] [[package]] name = "libp2p-autonat" -version = "0.13.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.13.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "async-trait", "asynchronous-codec", @@ -5346,27 +5374,25 @@ dependencies = [ "quick-protobuf-codec", "rand 0.8.5", "rand_core 0.6.4", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", - "void", "web-time", ] [[package]] name = "libp2p-connection-limits" -version = "0.4.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.4.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "libp2p-core", "libp2p-identity", "libp2p-swarm", - "void", ] [[package]] name = "libp2p-core" -version = "0.42.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.42.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "either", "fnv", @@ -5383,17 +5409,16 @@ dependencies = [ "rand 0.8.5", "rw-stream-sink", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "unsigned-varint", - "void", "web-time", ] [[package]] name = "libp2p-dns" version = "0.42.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "async-trait", "futures", @@ -5407,9 +5432,10 @@ dependencies = [ [[package]] name = "libp2p-gossipsub" -version = "0.47.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.48.0" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ + "async-channel", "asynchronous-codec", "base64 0.22.1", "byteorder", @@ -5417,7 +5443,7 @@ dependencies = [ "either", "fnv", "futures", - "futures-ticker", + "futures-timer", "getrandom 0.2.15", "hex_fmt", "libp2p-core", @@ -5431,14 +5457,13 @@ dependencies = [ "sha2 0.10.8", "smallvec", "tracing", - "void", "web-time", ] [[package]] name = "libp2p-identify" -version = "0.45.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.46.0" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "asynchronous-codec", "either", @@ -5452,9 +5477,8 @@ dependencies = [ "quick-protobuf", "quick-protobuf-codec", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", - "void", ] [[package]] @@ -5477,8 +5501,8 @@ dependencies = [ [[package]] name = "libp2p-kad" -version = "0.46.2" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.47.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "arrayvec", "asynchronous-codec", @@ -5496,17 +5520,16 @@ dependencies = [ "rand 0.8.5", "sha2 0.10.8", "smallvec", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "uint", - "void", "web-time", ] [[package]] name = "libp2p-mdns" version = "0.46.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "data-encoding", "futures", @@ -5520,13 +5543,12 @@ dependencies = [ "socket2", "tokio", "tracing", - "void", ] [[package]] name = "libp2p-metrics" version = "0.15.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "futures", "libp2p-core", @@ -5542,8 +5564,8 @@ dependencies = [ [[package]] name = "libp2p-noise" -version = "0.45.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.45.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "asynchronous-codec", "bytes", @@ -5559,7 +5581,7 @@ dependencies = [ "sha2 0.10.8", "snow", "static_assertions", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "x25519-dalek", "zeroize", @@ -5567,8 +5589,8 @@ dependencies = [ [[package]] name = "libp2p-quic" -version = "0.11.1" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.11.2" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "bytes", "futures", @@ -5583,15 +5605,15 @@ dependencies = [ "ring 0.17.8", "rustls 0.23.19", "socket2", - "thiserror 1.0.69", + "thiserror 2.0.3", "tokio", "tracing", ] [[package]] name = "libp2p-relay" -version = "0.18.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.18.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "asynchronous-codec", "bytes", @@ -5606,16 +5628,15 @@ dependencies = [ "quick-protobuf-codec", "rand 0.8.5", "static_assertions", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", - "void", "web-time", ] [[package]] name = "libp2p-request-response" -version = "0.27.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.27.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "async-trait", "cbor4ii", @@ -5629,14 +5650,13 @@ dependencies = [ "serde", "smallvec", "tracing", - "void", "web-time", ] [[package]] name = "libp2p-swarm" -version = "0.45.1" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.45.2" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "either", "fnv", @@ -5653,7 +5673,6 @@ dependencies = [ "smallvec", "tokio", "tracing", - "void", "wasm-bindgen-futures", "web-time", ] @@ -5661,7 +5680,7 @@ dependencies = [ [[package]] name = "libp2p-swarm-derive" version = "0.35.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -5672,7 +5691,7 @@ dependencies = [ [[package]] name = "libp2p-tcp" version = "0.42.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "futures", "futures-timer", @@ -5688,7 +5707,7 @@ dependencies = [ [[package]] name = "libp2p-tls" version = "0.5.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "futures", "futures-rustls", @@ -5698,15 +5717,15 @@ dependencies = [ "ring 0.17.8", "rustls 0.23.19", "rustls-webpki 0.101.7", - "thiserror 1.0.69", + "thiserror 2.0.3", "x509-parser", "yasna", ] [[package]] name = "libp2p-upnp" -version = "0.3.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.3.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "futures", "futures-timer", @@ -5715,13 +5734,12 @@ dependencies = [ "libp2p-swarm", "tokio", "tracing", - "void", ] [[package]] name = "libp2p-websocket" -version = "0.44.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.44.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "either", "futures", @@ -5732,7 +5750,7 @@ dependencies = [ "pin-project-lite", "rw-stream-sink", "soketto", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "url", "webpki-roots 0.25.4", @@ -5740,8 +5758,8 @@ dependencies = [ [[package]] name = "libp2p-websocket-websys" -version = "0.4.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +version = "0.4.1" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "bytes", "futures", @@ -5749,7 +5767,7 @@ dependencies = [ "libp2p-core", "parking_lot", "send_wrapper 0.6.0", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "wasm-bindgen", "web-sys", @@ -5758,12 +5776,12 @@ dependencies = [ [[package]] name = "libp2p-yamux" version = "0.46.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "either", "futures", "libp2p-core", - "thiserror 1.0.69", + "thiserror 2.0.3", "tracing", "yamux 0.12.1", "yamux 0.13.4", @@ -6082,7 +6100,7 @@ checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" [[package]] name = "multistream-select" version = "0.13.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "bytes", "futures", @@ -7374,12 +7392,12 @@ dependencies = [ [[package]] name = "quick-protobuf-codec" version = "0.3.1" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "asynchronous-codec", "bytes", "quick-protobuf", - "thiserror 1.0.69", + "thiserror 2.0.3", "unsigned-varint", ] @@ -7818,7 +7836,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", @@ -8240,7 +8258,7 @@ dependencies = [ [[package]] name = "rw-stream-sink" version = "0.4.0" -source = "git+https://github.com/maqi/rust-libp2p.git?branch=kad_0.46.2#15f0535f87256ff141963006af129cc2c839b472" +source = "git+https://github.com/maqi/rust-libp2p.git?branch=master#d0590a7a71160dcf806d38813b74925d3217a98c" dependencies = [ "futures", "pin-project", @@ -9435,7 +9453,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", @@ -9467,7 +9485,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", diff --git a/ant-evm/Cargo.toml b/ant-evm/Cargo.toml index e151b2cacf..2116ea8c15 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.4" } hex = "~0.4.3" lazy_static = "~1.4.0" -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = ["identify", "kad"] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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 98613fabf8..b64a2abfc5 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 = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = [ +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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 = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = [ +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", features = [ "tokio", "dns", "kad", diff --git a/ant-networking/src/driver.rs b/ant-networking/src/driver.rs index a9792700da..9bd8b91383 100644 --- a/ant-networking/src/driver.rs +++ b/ant-networking/src/driver.rs @@ -239,6 +239,12 @@ pub enum VerificationKind { }, } +impl From for NodeEvent { + fn from(_: std::convert::Infallible) -> Self { + panic!("NodeBehaviour is not Infallible!") + } +} + /// The behaviors are polled in the order they are defined. /// The first struct member is polled until it returns Poll::Pending before moving on to later members. /// Prioritize the behaviors related to connection handling. @@ -638,11 +644,10 @@ impl NetworkBuilder { let identify_protocol_str = IDENTIFY_PROTOCOL_STR.to_string(); info!("Building Identify with identify_protocol_str: {identify_protocol_str:?} and identify_version: {identify_version:?}"); let identify = { - let mut cfg = - libp2p::identify::Config::new(identify_protocol_str, self.keypair.public()) - .with_agent_version(identify_version); - // Enlength the identify interval from default 5 mins to 1 hour. - cfg.interval = RESEND_IDENTIFY_INVERVAL; + let cfg = libp2p::identify::Config::new(identify_protocol_str, self.keypair.public()) + .with_agent_version(identify_version) + // Enlength the identify interval from default 5 mins to 1 hour. + .with_interval(RESEND_IDENTIFY_INVERVAL); libp2p::identify::Behaviour::new(cfg) }; diff --git a/ant-node-manager/Cargo.toml b/ant-node-manager/Cargo.toml index 94857697b6..b0069b0958 100644 --- a/ant-node-manager/Cargo.toml +++ b/ant-node-manager/Cargo.toml @@ -44,7 +44,7 @@ colored = "2.0.4" color-eyre = "~0.6" dirs-next = "2.0.0" indicatif = { version = "0.17.5", features = ["tokio"] } -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = [] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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 057ed08492..b355040027 100644 --- a/ant-node-rpc-client/Cargo.toml +++ b/ant-node-rpc-client/Cargo.toml @@ -28,7 +28,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 = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = ["kad"]} +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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 a1a5700b64..d63e575ef1 100644 --- a/ant-node/Cargo.toml +++ b/ant-node/Cargo.toml @@ -51,7 +51,7 @@ file-rotate = "0.7.3" futures = "~0.3.13" hex = "~0.4.3" itertools = "~0.12.1" -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = ["tokio", "dns", "kad", "macros"] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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-peers-acquisition/Cargo.toml b/ant-peers-acquisition/Cargo.toml index 381f0e0388..66a07d86a0 100644 --- a/ant-peers-acquisition/Cargo.toml +++ b/ant-peers-acquisition/Cargo.toml @@ -18,7 +18,7 @@ websockets = [] ant-protocol = { path = "../ant-protocol", version = "0.17.15", optional = true} clap = { version = "4.2.1", features = ["derive", "env"] } lazy_static = "~1.4.0" -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = [] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", features = [] } rand = "0.8.5" reqwest = { version="0.12.2", default-features=false, features = ["rustls-tls"] } thiserror = "1.0.23" diff --git a/ant-protocol/Cargo.toml b/ant-protocol/Cargo.toml index 8812ec0c93..ee5a001cd4 100644 --- a/ant-protocol/Cargo.toml +++ b/ant-protocol/Cargo.toml @@ -27,7 +27,7 @@ dirs-next = "~2.0.0" exponential-backoff = "2.0.0" hex = "~0.4.3" lazy_static = "1.4.0" -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = ["identify", "kad"] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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 88e6dd313f..bd65f25575 100644 --- a/ant-service-management/Cargo.toml +++ b/ant-service-management/Cargo.toml @@ -15,7 +15,7 @@ ant-logging = { path = "../ant-logging", version = "0.2.40" } ant-protocol = { path = "../ant-protocol", version = "0.17.15", features = ["rpc"] } async-trait = "0.1" dirs-next = "2.0.0" -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = ["kad"] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", 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 88d61c711a..487fa338da 100644 --- a/autonomi/Cargo.toml +++ b/autonomi/Cargo.toml @@ -44,7 +44,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 = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2" } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master" } 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 f753247881..b5d853cb2d 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 = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = [ +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", features = [ "tokio", "tcp", "noise", diff --git a/test-utils/Cargo.toml b/test-utils/Cargo.toml index 4d05fbfbb3..0c50fa4c51 100644 --- a/test-utils/Cargo.toml +++ b/test-utils/Cargo.toml @@ -18,7 +18,7 @@ bytes = { version = "1.0.1", features = ["serde"] } color-eyre = "~0.6.2" dirs-next = "~2.0.0" evmlib = { path = "../evmlib", version = "0.1.4" } -libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "kad_0.46.2", features = ["identify", "kad"] } +libp2p = { git = "https://github.com/maqi/rust-libp2p.git", branch = "master", features = ["identify", "kad"] } rand = "0.8.5" serde = { version = "1.0.133", features = ["derive"] } serde_json = "1.0"