diff --git a/Cargo.lock b/Cargo.lock index 313fa3df..01e8be3d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3241,13 +3241,14 @@ dependencies = [ [[package]] name = "multiaddr" -version = "0.17.0" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b53e0cc5907a5c216ba6584bf74be8ab47d6d6289f72793b2dddbf15dc3bf8c" +checksum = "2b36f567c7099511fa8612bbbb52dda2419ce0bdbacf31714e3a5ffdb766d3bd" dependencies = [ "arrayref", "byteorder", "data-encoding", + "log", "multibase", "multihash", "percent-encoding", diff --git a/core/Cargo.toml b/core/Cargo.toml index 1db5325d..210f7c35 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -18,7 +18,7 @@ futures-timer = "3" instant = "0.1.11" libp2p-identity = { version = "0.1", path = "../identity", features = ["peerid", "ed25519"] } log = "0.4" -multiaddr = { version = "0.17.0" } +multiaddr = { version = "0.17.1" } multihash = { version = "0.17.0", default-features = false, features = ["std"] } multistream-select = { version = "0.12.1", path = "../misc/multistream-select" } once_cell = "1.17.1" diff --git a/examples/distributed-key-value-store/Cargo.toml b/examples/distributed-key-value-store/Cargo.toml index b8fcb9ba..b690baac 100644 --- a/examples/distributed-key-value-store/Cargo.toml +++ b/examples/distributed-key-value-store/Cargo.toml @@ -11,4 +11,4 @@ async-trait = "0.1" env_logger = "0.10" futures = "0.3.28" libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "mdns", "noise", "macros", "tcp", "websocket", "yamux"] } -multiaddr = { version = "0.17.0" } +multiaddr = { version = "0.17.1" } \ No newline at end of file diff --git a/examples/file-sharing/Cargo.toml b/examples/file-sharing/Cargo.toml index 534c914d..dc486ecf 100644 --- a/examples/file-sharing/Cargo.toml +++ b/examples/file-sharing/Cargo.toml @@ -13,4 +13,4 @@ either = "1.8" env_logger = "0.10" futures = "0.3.28" libp2p = { path = "../../libp2p", features = ["async-std", "dns", "kad", "noise", "macros", "request-response", "tcp", "websocket", "yamux"] } -multiaddr = { version = "0.17.0" } +multiaddr = { version = "0.17.1" } \ No newline at end of file diff --git a/examples/ipfs-private/Cargo.toml b/examples/ipfs-private/Cargo.toml index d7685195..5271f71c 100644 --- a/examples/ipfs-private/Cargo.toml +++ b/examples/ipfs-private/Cargo.toml @@ -12,4 +12,4 @@ either = "1.8" env_logger = "0.10" futures = "0.3.28" libp2p = { path = "../../libp2p", features = ["async-std", "gossipsub", "dns", "identify", "kad", "macros", "noise", "ping", "pnet", "tcp", "websocket", "yamux"] } -multiaddr = { version = "0.17.0" } +multiaddr = { version = "0.17.1" } \ No newline at end of file diff --git a/examples/ping-example/Cargo.toml b/examples/ping-example/Cargo.toml index 0e2c79af..db612b55 100644 --- a/examples/ping-example/Cargo.toml +++ b/examples/ping-example/Cargo.toml @@ -10,4 +10,4 @@ async-std = { version = "1.12", features = ["attributes"] } async-trait = "0.1" futures = "0.3.28" libp2p = { path = "../../libp2p", features = ["async-std", "dns", "macros", "noise", "ping", "tcp", "websocket", "yamux"] } -multiaddr = { version = "0.17.0" } +multiaddr = { version = "0.17.1" } \ No newline at end of file diff --git a/identity/Cargo.toml b/identity/Cargo.toml index e2764e1e..3b98eaca 100644 --- a/identity/Cargo.toml +++ b/identity/Cargo.toml @@ -17,7 +17,7 @@ bs58 = { version = "0.4.0", optional = true } ed25519-dalek = { version = "1.0.1", optional = true } libsecp256k1 = { version = "0.7.0", optional = true } log = "0.4" -multiaddr = { version = "0.17.0", optional = true } +multiaddr = { version = "0.17.1", optional = true } multihash = { version = "0.17.0", default-features = false, features = ["std"], optional = true } p256 = { version = "0.12", default-features = false, features = ["ecdsa", "std"], optional = true } prost = { version = "0.11", optional = true } diff --git a/interop-tests/src/bin/ping.rs b/interop-tests/src/bin/ping.rs index ba29f9c5..9b0fe668 100644 --- a/interop-tests/src/bin/ping.rs +++ b/interop-tests/src/bin/ping.rs @@ -77,7 +77,7 @@ async fn main() -> Result<()> { ) .map(|(peer_id, conn), _| (peer_id, StreamMuxerBox::new(conn))) .boxed(), - format!("/ip4/{ip}/udp/0/webrtc"), + format!("/ip4/{ip}/udp/0/webrtc-direct"), ), }; diff --git a/transports/webrtc/examples/listen_ping.rs b/transports/webrtc/examples/listen_ping.rs index 218380ec..219acf0d 100644 --- a/transports/webrtc/examples/listen_ping.rs +++ b/transports/webrtc/examples/listen_ping.rs @@ -13,7 +13,7 @@ use void::Void; async fn main() -> Result<()> { let mut swarm = create_swarm()?; - swarm.listen_on("/ip4/127.0.0.1/udp/0/webrtc".parse()?)?; + swarm.listen_on("/ip4/127.0.0.1/udp/0/webrtc-direct".parse()?)?; loop { let event = swarm.next().await.unwrap(); diff --git a/transports/webrtc/src/tokio/transport.rs b/transports/webrtc/src/tokio/transport.rs index 5c4c7770..904da61c 100644 --- a/transports/webrtc/src/tokio/transport.rs +++ b/transports/webrtc/src/tokio/transport.rs @@ -480,7 +480,7 @@ mod tests { #[test] fn parse_valid_address_with_certhash_and_p2p() { - let addr = "/ip4/127.0.0.1/udp/39901/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS" + let addr = "/ip4/127.0.0.1/udp/39901/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS" .parse() .unwrap(); @@ -499,7 +499,7 @@ mod tests { #[test] fn peer_id_is_not_required() { - let addr = "/ip4/127.0.0.1/udp/39901/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w" + let addr = "/ip4/127.0.0.1/udp/39901/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w" .parse() .unwrap(); @@ -518,7 +518,7 @@ mod tests { #[test] fn tcp_is_invalid_protocol() { - let addr = "/ip4/127.0.0.1/tcp/12345/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w" + let addr = "/ip4/127.0.0.1/tcp/12345/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w" .parse() .unwrap(); @@ -529,7 +529,7 @@ mod tests { #[test] fn cannot_follow_other_protocols_after_certhash() { - let addr = "/ip4/127.0.0.1/udp/12345/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/tcp/12345" + let addr = "/ip4/127.0.0.1/udp/12345/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/tcp/12345" .parse() .unwrap(); @@ -541,7 +541,7 @@ mod tests { #[test] fn parse_ipv6() { let addr = - "/ip6/::1/udp/12345/webrtc/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS" + "/ip6/::1/udp/12345/webrtc-direct/certhash/uEiDikp5KVUgkLta1EjUN-IKbHk-dUBg8VzKgf5nXxLK46w/p2p/12D3KooWNpDk9w6WrEEcdsEH1y47W71S36yFjw4sd3j7omzgCSMS" .parse() .unwrap(); @@ -560,7 +560,7 @@ mod tests { #[test] fn can_parse_valid_addr_without_certhash() { - let addr = "/ip6/::1/udp/12345/webrtc".parse().unwrap(); + let addr = "/ip6/::1/udp/12345/webrtc-direct".parse().unwrap(); let maybe_parsed = parse_webrtc_listen_addr(&addr); @@ -574,7 +574,7 @@ mod tests { fn fails_to_parse_if_certhash_present_but_wrong_hash_function() { // We only support SHA2-256 for now but this certhash has been encoded with SHA3-256. let addr = - "/ip6/::1/udp/12345/webrtc/certhash/uFiCH_tkkzpAwkoIDbE4I7QtQksFMYs5nQ4MyYrkgCJYi4A" + "/ip6/::1/udp/12345/webrtc-direct/certhash/uFiCH_tkkzpAwkoIDbE4I7QtQksFMYs5nQ4MyYrkgCJYi4A" .parse() .unwrap(); @@ -597,7 +597,7 @@ mod tests { // is temporarily empty. for _ in 0..2 { let listener = transport - .listen_on("/ip4/0.0.0.0/udp/0/webrtc".parse().unwrap()) + .listen_on("/ip4/0.0.0.0/udp/0/webrtc-direct".parse().unwrap()) .unwrap(); match poll_fn(|cx| Pin::new(&mut transport).as_mut().poll(cx)).await { TransportEvent::NewAddress { diff --git a/transports/webrtc/tests/smoke.rs b/transports/webrtc/tests/smoke.rs index 67d2f95a..16f64d05 100644 --- a/transports/webrtc/tests/smoke.rs +++ b/transports/webrtc/tests/smoke.rs @@ -41,8 +41,8 @@ async fn smoke() { let (a_peer_id, mut a_transport) = create_transport(); let (b_peer_id, mut b_transport) = create_transport(); - let addr = start_listening(&mut a_transport, "/ip4/127.0.0.1/udp/0/webrtc").await; - start_listening(&mut b_transport, "/ip4/127.0.0.1/udp/0/webrtc").await; + let addr = start_listening(&mut a_transport, "/ip4/127.0.0.1/udp/0/webrtc-direct").await; + start_listening(&mut b_transport, "/ip4/127.0.0.1/udp/0/webrtc-direct").await; let ((a_connected, _, _), (b_connected, _)) = connect(&mut a_transport, &mut b_transport, addr).await; @@ -109,7 +109,8 @@ fn prop(number_listeners: NonZeroU8, number_streams: NonZeroU8) -> quickcheck::T async move { let (peer_id, mut listener) = create_transport(); - let addr = start_listening(&mut listener, "/ip4/127.0.0.1/udp/0/webrtc").await; + let addr = + start_listening(&mut listener, "/ip4/127.0.0.1/udp/0/webrtc-direct").await; listeners_tx.send((peer_id, addr)).await.unwrap();