Skip to content

Commit

Permalink
Merge pull request #1369 from tomaka/merge-master
Browse files Browse the repository at this point in the history
Merge master in stable-futures
  • Loading branch information
tomaka authored Jan 3, 2020
2 parents d0944ed + 17e90f0 commit e29f36e
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

- Use varints instead of fixed sized (4 byte) integers to delimit plaintext 2.0 messages to align implementation with the specification.

# Version 0.13.2 (2020-01-02)

- Fixed the `libp2p-noise` handshake not flushing the underlying stream before waiting for a response.
- Fixed semver issue with the `protobuf` crate.

# Version 0.13.1 (2019-11-13)

- Maintenance release to bump dependencies and deal with an accidental breaking change in multihash 0.1.4.
Expand Down
16 changes: 8 additions & 8 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p"
edition = "2018"
description = "Peer-to-peer networking library"
version = "0.13.1"
version = "0.13.2"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -20,14 +20,14 @@ multiaddr = { package = "parity-multiaddr", version = "0.6.0", path = "misc/mult
multihash = { package = "parity-multihash", version = "0.2.0", path = "misc/multihash" }
lazy_static = "1.2"
libp2p-mplex = { version = "0.13.0", path = "muxers/mplex" }
libp2p-identify = { version = "0.13.1", path = "protocols/identify" }
libp2p-kad = { version = "0.13.1", path = "protocols/kad" }
libp2p-floodsub = { version = "0.13.0", path = "protocols/floodsub" }
libp2p-identify = { version = "0.13.2", path = "protocols/identify" }
libp2p-kad = { version = "0.13.2", path = "protocols/kad" }
libp2p-floodsub = { version = "0.13.1", path = "protocols/floodsub" }
libp2p-ping = { version = "0.13.1", path = "protocols/ping" }
libp2p-plaintext = { version = "0.13.0", path = "protocols/plaintext" }
libp2p-core = { version = "0.13.1", path = "core" }
libp2p-plaintext = { version = "0.13.1", path = "protocols/plaintext" }
libp2p-core = { version = "0.13.2", path = "core" }
libp2p-core-derive = { version = "0.13.0", path = "misc/core-derive" }
libp2p-secio = { version = "0.13.0", path = "protocols/secio", default-features = false }
libp2p-secio = { version = "0.13.1", path = "protocols/secio", default-features = false }
libp2p-swarm = { version = "0.3.0", path = "swarm" }
libp2p-uds = { version = "0.13.0", path = "transports/uds" }
libp2p-wasm-ext = { version = "0.6.0", path = "transports/wasm-ext" }
Expand All @@ -40,7 +40,7 @@ wasm-timer = "0.2.4"
libp2p-deflate = { version = "0.5.0", path = "protocols/deflate" }
libp2p-dns = { version = "0.13.0", path = "transports/dns" }
libp2p-mdns = { version = "0.13.1", path = "misc/mdns" }
libp2p-noise = { version = "0.11.0", path = "protocols/noise" }
libp2p-noise = { version = "0.11.1", path = "protocols/noise" }
libp2p-tcp = { version = "0.13.0", path = "transports/tcp" }
libp2p-websocket = { version = "0.13.0", path = "transports/websocket", optional = true }

Expand Down
4 changes: 2 additions & 2 deletions core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p-core"
edition = "2018"
description = "Core traits and structs of libp2p"
version = "0.13.1"
version = "0.13.2"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -26,7 +26,7 @@ multihash = { package = "parity-multihash", version = "0.2.0", path = "../misc/m
multistream-select = { version = "0.6.0", path = "../misc/multistream-select" }
parking_lot = "0.9.0"
pin-project = "0.4.6"
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
quick-error = "1.2"
rand = "0.7"
rw-stream-sink = { version = "0.1.1", path = "../misc/rw-stream-sink" }
Expand Down
4 changes: 2 additions & 2 deletions protocols/floodsub/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p-floodsub"
edition = "2018"
description = "Floodsub protocol for libp2p"
version = "0.13.0"
version = "0.13.1"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -17,6 +17,6 @@ fnv = "1.0"
futures = "0.3.1"
libp2p-core = { version = "0.13.0", path = "../../core" }
libp2p-swarm = { version = "0.3.0", path = "../../swarm" }
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
rand = "0.7"
smallvec = "1.0"
4 changes: 2 additions & 2 deletions protocols/identify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p-identify"
edition = "2018"
description = "Nodes identifcation protocol for libp2p"
version = "0.13.1"
version = "0.13.2"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -17,7 +17,7 @@ libp2p-core = { version = "0.13.0", path = "../../core" }
libp2p-swarm = { version = "0.3.0", path = "../../swarm" }
log = "0.4.1"
multiaddr = { package = "parity-multiaddr", version = "0.6.0", path = "../../misc/multiaddr" }
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
smallvec = "1.0"
wasm-timer = "0.2"
unsigned-varint = { version = "0.3", features = ["futures-codec"] }
Expand Down
4 changes: 2 additions & 2 deletions protocols/kad/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p-kad"
edition = "2018"
description = "Kademlia protocol for libp2p"
version = "0.13.1"
version = "0.13.2"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -21,7 +21,7 @@ libp2p-core = { version = "0.13.0", path = "../../core" }
libp2p-swarm = { version = "0.3.0", path = "../../swarm" }
multiaddr = { package = "parity-multiaddr", version = "0.6.0", path = "../../misc/multiaddr" }
multihash = { package = "parity-multihash", version = "0.2.0", path = "../../misc/multihash" }
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
rand = "0.7.2"
sha2 = "0.8.0"
smallvec = "1.0"
Expand Down
4 changes: 2 additions & 2 deletions protocols/noise/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "libp2p-noise"
description = "Cryptographic handshake protocol using the noise framework."
version = "0.11.0"
version = "0.11.1"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -14,7 +14,7 @@ futures = "0.3.1"
lazy_static = "1.2"
libp2p-core = { version = "0.13.0", path = "../../core" }
log = "0.4"
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
rand = "0.7.2"
ring = { version = "0.16.9", features = ["alloc"], default-features = false }
snow = { version = "0.6.1", features = ["ring-resolver"], default-features = false }
Expand Down
4 changes: 2 additions & 2 deletions protocols/plaintext/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p-plaintext"
edition = "2018"
description = "Plaintext encryption dummy protocol for libp2p"
version = "0.13.0"
version = "0.13.1"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -15,7 +15,7 @@ futures = "0.3.1"
futures_codec = "0.3.4"
libp2p-core = { version = "0.13.0", path = "../../core" }
log = "0.4.8"
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
rw-stream-sink = { version = "0.1.1", path = "../../misc/rw-stream-sink" }
unsigned-varint = { version = "0.3", features = ["futures-codec"] }
void = "1.0.2"
Expand Down
4 changes: 2 additions & 2 deletions protocols/secio/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name = "libp2p-secio"
edition = "2018"
description = "Secio encryption protocol for libp2p"
version = "0.13.0"
version = "0.13.1"
authors = ["Parity Technologies <admin@parity.io>"]
license = "MIT"
repository = "https://github.com/libp2p/rust-libp2p"
Expand All @@ -18,7 +18,7 @@ hmac = "0.7.0"
lazy_static = "1.2.0"
libp2p-core = { version = "0.13.0", path = "../../core" }
log = "0.4.6"
protobuf = "= 2.8.1"
protobuf = "=2.8.1" # note: see https://github.com/libp2p/rust-libp2p/issues/1363
quicksink = "0.1"
rand = "0.7"
rw-stream-sink = { version = "0.1.1", path = "../../misc/rw-stream-sink" }
Expand Down

0 comments on commit e29f36e

Please sign in to comment.