*: Use upstream multiaddr crate (#2075)

Use multiaddr instead of parity-multiaddr, removing the latter from the
repository.

CHANGELOG.md

@@ -36,11 +36,34 @@
 
 ## Utilities
 
-- [`parity-multiaddr` CHANGELOG](misc/multiaddr/CHANGELOG.md)
 - [`multistream-select` CHANGELOG](misc/multistream-select/CHANGELOG.md)
 
 # `libp2p` facade crate
 
+## Version 0.39.0 [unreleased]
+
+- Update individual crates.
+    - `libp2p-core`
+    - `libp2p-deflate`
+    - `libp2p-dns`
+    - `libp2p-floodsub`
+    - `libp2p-gossipsub`
+    - `libp2p-identify`
+    - `libp2p-kad`
+    - `libp2p-mdns`
+    - `libp2p-mplex`
+    - `libp2p-noise`
+    - `libp2p-ping`
+    - `libp2p-plaintext`
+    - `libp2p-relay`
+    - `libp2p-request-response`
+    - `libp2p-swarm`
+    - `libp2p-tcp`
+    - `libp2p-uds`
+    - `libp2p-wasm-ext`
+    - `libp2p-websocket`
+    - `libp2p-yamux`
+
 ## Version 0.38.0 [2021-05-17]
 
 - Update individual crates.

Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p"
 edition = "2018"
 description = "Peer-to-peer networking library"
-version = "0.38.0"
+version = "0.39.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -64,35 +64,35 @@ atomic = "0.5.0"
 bytes = "1"
 futures = "0.3.1"
 lazy_static = "1.2"
-libp2p-core = { version = "0.28.3", path = "core",  default-features = false }
-libp2p-floodsub = { version = "0.29.0", path = "protocols/floodsub", optional = true }
-libp2p-gossipsub = { version = "0.31.0", path = "./protocols/gossipsub", optional = true }
-libp2p-identify = { version = "0.29.0", path = "protocols/identify", optional = true }
-libp2p-kad = { version = "0.30.0", path = "protocols/kad", optional = true }
-libp2p-mplex = { version = "0.28.0", path = "muxers/mplex", optional = true }
-libp2p-noise = { version = "0.31.0", path = "transports/noise", optional = true }
-libp2p-ping = { version = "0.29.0", path = "protocols/ping", optional = true }
-libp2p-plaintext = { version = "0.28.0", path = "transports/plaintext", optional = true }
+libp2p-core = { version = "0.29.0", path = "core",  default-features = false }
+libp2p-floodsub = { version = "0.30.0", path = "protocols/floodsub", optional = true }
+libp2p-gossipsub = { version = "0.32.0", path = "./protocols/gossipsub", optional = true }
+libp2p-identify = { version = "0.30.0", path = "protocols/identify", optional = true }
+libp2p-kad = { version = "0.31.0", path = "protocols/kad", optional = true }
+libp2p-mplex = { version = "0.29.0", path = "muxers/mplex", optional = true }
+libp2p-noise = { version = "0.32.0", path = "transports/noise", optional = true }
+libp2p-ping = { version = "0.30.0", path = "protocols/ping", optional = true }
+libp2p-plaintext = { version = "0.29.0", path = "transports/plaintext", optional = true }
 libp2p-pnet = { version = "0.21.0", path = "transports/pnet", optional = true }
-libp2p-relay = { version = "0.2.0", path = "protocols/relay", optional = true }
-libp2p-request-response = { version = "0.11.0", path = "protocols/request-response", optional = true }
-libp2p-swarm = { version = "0.29.0", path = "swarm" }
+libp2p-relay = { version = "0.3.0", path = "protocols/relay", optional = true }
+libp2p-request-response = { version = "0.12.0", path = "protocols/request-response", optional = true }
+libp2p-swarm = { version = "0.30.0", path = "swarm" }
 libp2p-swarm-derive = { version = "0.23.0", path = "swarm-derive" }
-libp2p-uds = { version = "0.28.0", path = "transports/uds", optional = true }
-libp2p-wasm-ext = { version = "0.28.2", path = "transports/wasm-ext", default-features = false, optional = true }
-libp2p-yamux = { version = "0.32.0", path = "muxers/yamux", optional = true }
-multiaddr = { package = "parity-multiaddr", version = "0.11.2", path = "misc/multiaddr" }
+libp2p-uds = { version = "0.29.0", path = "transports/uds", optional = true }
+libp2p-wasm-ext = { version = "0.29.0", path = "transports/wasm-ext", default-features = false, optional = true }
+libp2p-yamux = { version = "0.33.0", path = "muxers/yamux", optional = true }
+multiaddr = { version = "0.12.0" }
 parking_lot = "0.11.0"
 pin-project = "1.0.0"
 smallvec = "1.6.1"
 wasm-timer = "0.2.4"
 
 [target.'cfg(not(any(target_os = "emscripten", target_os = "wasi", target_os = "unknown")))'.dependencies]
-libp2p-deflate = { version = "0.28.0", path = "transports/deflate", optional = true }
-libp2p-dns = { version = "0.28.1", path = "transports/dns", optional = true, default-features = false }
-libp2p-mdns = { version = "0.30.0", path = "protocols/mdns", optional = true }
-libp2p-tcp = { version = "0.28.0", path = "transports/tcp", default-features = false, optional = true }
-libp2p-websocket = { version = "0.29.0", path = "transports/websocket", optional = true }
+libp2p-deflate = { version = "0.29.0", path = "transports/deflate", optional = true }
+libp2p-dns = { version = "0.29.0", path = "transports/dns", optional = true, default-features = false }
+libp2p-mdns = { version = "0.31.0", path = "protocols/mdns", optional = true }
+libp2p-tcp = { version = "0.29.0", path = "transports/tcp", default-features = false, optional = true }
+libp2p-websocket = { version = "0.30.0", path = "transports/websocket", optional = true }
 
 [dev-dependencies]
 async-std = { version = "1.6.2", features = ["attributes"] }
@@ -103,7 +103,6 @@ tokio = { version = "1.0.1", features = ["io-util", "io-std", "macros", "rt", "r
 resolver = "2"
 members = [
     "core",
-    "misc/multiaddr",
     "misc/multistream-select",
     "misc/peer-id-generator",
     "muxers/mplex",

core/CHANGELOG.md

@@ -1,4 +1,6 @@
-# 0.28.4 [unreleased]
+# 0.29.0 [unreleased]
+
+- Switch from `parity-multiaddr` to upstream `multiaddr`.
 
 - Update dependencies.
 

core/Cargo.toml

@@ -2,7 +2,7 @@
 name = "libp2p-core"
 edition = "2018"
 description = "Core traits and structs of libp2p"
-version = "0.28.4"
+version = "0.29.0"
 authors = ["Parity Technologies <[email protected]>"]
 license = "MIT"
 repository = "https://github.com/libp2p/rust-libp2p"
@@ -20,7 +20,7 @@ futures-timer = "3"
 lazy_static = "1.2"
 libsecp256k1 = { version = "0.5.0", optional = true }
 log = "0.4"
-multiaddr = { package = "parity-multiaddr", version = "0.11.2", path = "../misc/multiaddr" }
+multiaddr = { version = "0.12.0" }
 multihash = { version = "0.13", default-features = false, features = ["std", "multihash-impl", "identity", "sha2"] }
 multistream-select = { version = "0.10", path = "../misc/multistream-select" }
 parking_lot = "0.11.0"

misc/multiaddr/README.md

@@ -0,0 +1 @@
+Moved to https://github.com/multiformats/rust-multiaddr.