Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

*: Update to libp2p v0.34.0 #7888

Merged
3 commits merged into from
Jan 15, 2021
Merged

*: Update to libp2p v0.34.0 #7888

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3796310
*: Update to libp2p v0.34.0
mxinden Jan 13, 2021
a00a3e0
client/network: Update bytes, unsigned-varint and asynchronous-codec
mxinden Jan 13, 2021
d240694
client: Update to prost v0.7
mxinden Jan 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
289 changes: 141 additions & 148 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion bin/node/browser-testing/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ license = "Apache-2.0"

[dependencies]
futures-timer = "3.0.2"
libp2p = { version = "0.33.0", default-features = false }
libp2p = { version = "0.34.0", default-features = false }
jsonrpc-core = "15.0.0"
serde = "1.0.106"
serde_json = "1.0.48"
Expand Down
6 changes: 3 additions & 3 deletions client/authority-discovery/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
prost-build = "0.6.1"
prost-build = "0.7"

[dependencies]
async-trait = "0.1"
Expand All @@ -23,10 +23,10 @@ derive_more = "0.99.2"
either = "1.5.3"
futures = "0.3.9"
futures-timer = "3.0.1"
libp2p = { version = "0.33.0", default-features = false, features = ["kad"] }
libp2p = { version = "0.34.0", default-features = false, features = ["kad"] }
log = "0.4.8"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", path = "../../utils/prometheus", version = "0.8.0"}
prost = "0.6.1"
prost = "0.7"
rand = "0.7.2"
sc-client-api = { version = "2.0.0", path = "../api" }
sc-network = { version = "0.8.0", path = "../network" }
Expand Down
2 changes: 1 addition & 1 deletion client/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ regex = "1.4.2"
tokio = { version = "0.2.21", features = [ "signal", "rt-core", "rt-threaded", "blocking" ] }
futures = "0.3.9"
fdlimit = "0.2.1"
libp2p = "0.33.0"
libp2p = "0.34.0"
parity-scale-codec = "1.3.6"
hex = "0.4.2"
rand = "0.7.3"
Expand Down
2 changes: 1 addition & 1 deletion client/network-gossip/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ targets = ["x86_64-unknown-linux-gnu"]
[dependencies]
futures = "0.3.9"
futures-timer = "3.0.1"
libp2p = { version = "0.33.0", default-features = false }
libp2p = { version = "0.34.0", default-features = false }
log = "0.4.8"
lru = "0.6.1"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
Expand Down
16 changes: 8 additions & 8 deletions client/network/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,14 @@ readme = "README.md"
targets = ["x86_64-unknown-linux-gnu"]

[build-dependencies]
prost-build = "0.6.1"
prost-build = "0.7"

[dependencies]
async-trait = "0.1"
async-std = "1.6.5"
bitflags = "1.2.0"
bs58 = "0.4.0"
bytes = "0.5.0"
bytes = "1"
codec = { package = "parity-scale-codec", version = "1.3.6", features = ["derive"] }
derive_more = "0.99.2"
either = "1.5.3"
Expand All @@ -30,7 +30,7 @@ fnv = "1.0.6"
fork-tree = { version = "2.0.0", path = "../../utils/fork-tree" }
futures = "0.3.9"
futures-timer = "3.0.2"
futures_codec = "0.4.0"
asynchronous-codec = "0.5"
hex = "0.4.0"
ip_network = "0.3.4"
linked-hash-map = "0.5.2"
Expand All @@ -40,7 +40,7 @@ nohash-hasher = "0.2.0"
parking_lot = "0.11.1"
pin-project = "0.4.6"
prometheus-endpoint = { package = "substrate-prometheus-endpoint", version = "0.8.0", path = "../../utils/prometheus" }
prost = "0.6.1"
prost = "0.7"
rand = "0.7.2"
sc-block-builder = { version = "0.8.0", path = "../block-builder" }
sc-client-api = { version = "2.0.0", path = "../api" }
Expand All @@ -57,19 +57,19 @@ sp-core = { version = "2.0.0", path = "../../primitives/core" }
sp-runtime = { version = "2.0.0", path = "../../primitives/runtime" }
sp-utils = { version = "2.0.0", path = "../../primitives/utils" }
thiserror = "1"
unsigned-varint = { version = "0.5.0", features = ["futures", "futures-codec"] }
unsigned-varint = { version = "0.6.0", features = ["futures", "asynchronous_codec"] }
void = "1.0.2"
wasm-timer = "0.2"
zeroize = "1.2.0"

[dependencies.libp2p]
version = "0.33.0"
version = "0.34.0"
default-features = false
features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-std", "websocket", "yamux"]
features = ["identify", "kad", "mdns", "mplex", "noise", "ping", "request-response", "tcp-async-io", "websocket", "yamux"]

[dev-dependencies]
assert_matches = "1.3"
libp2p = { version = "0.33.0", default-features = false }
libp2p = { version = "0.34.0", default-features = false }
quickcheck = "0.9.0"
rand = "0.7.2"
sp-keyring = { version = "2.0.0", path = "../../primitives/keyring" }
Expand Down
2 changes: 1 addition & 1 deletion client/network/src/protocol/generic_proto/upgrade/legacy.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
use crate::config::ProtocolId;
use bytes::BytesMut;
use futures::prelude::*;
use futures_codec::Framed;
use asynchronous_codec::Framed;
use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade::ProtocolName};
use parking_lot::RwLock;
use std::{collections::VecDeque, io, pin::Pin, sync::Arc, vec::IntoIter as VecIntoIter};
Expand Down
2 changes: 1 addition & 1 deletion client/network/src/protocol/generic_proto/upgrade/notifications.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

use bytes::BytesMut;
use futures::prelude::*;
use futures_codec::Framed;
use asynchronous_codec::Framed;
use libp2p::core::{UpgradeInfo, InboundUpgrade, OutboundUpgrade, upgrade};
use log::error;
use std::{borrow::Cow, convert::Infallible, io, iter, mem, pin::Pin, task::{Context, Poll}};
Expand Down
2 changes: 1 addition & 1 deletion client/network/test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ parking_lot = "0.11.1"
futures = "0.3.9"
futures-timer = "3.0.1"
rand = "0.7.2"
libp2p = { version = "0.33.0", default-features = false }
libp2p = { version = "0.34.0", default-features = false }
sp-consensus = { version = "0.8.0", path = "../../../primitives/consensus/common" }
sc-consensus = { version = "0.8.0", path = "../../consensus/common" }
sc-client-api = { version = "2.0.0", path = "../../api" }
Expand Down
2 changes: 1 addition & 1 deletion client/peerset/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
futures = "0.3.9"
libp2p = { version = "0.33.0", default-features = false }
libp2p = { version = "0.34.0", default-features = false }
sp-utils = { version = "2.0.0", path = "../../primitives/utils"}
log = "0.4.8"
serde_json = "1.0.41"
Expand Down
2 changes: 1 addition & 1 deletion client/telemetry/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ parking_lot = "0.11.1"
futures = "0.3.9"
futures-timer = "3.0.1"
wasm-timer = "0.2.5"
libp2p = { version = "0.33.0", default-features = false, features = ["dns", "tcp-async-std", "wasm-ext", "websocket"] }
libp2p = { version = "0.34.0", default-features = false, features = ["dns", "tcp-async-io", "wasm-ext", "websocket"] }
log = "0.4.8"
pin-project = "0.4.6"
rand = "0.7.2"
Expand Down
2 changes: 1 addition & 1 deletion primitives/consensus/common/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]

[dependencies]
thiserror = "1.0.21"
libp2p = { version = "0.33.0", default-features = false }
libp2p = { version = "0.34.0", default-features = false }
log = "0.4.8"
sp-core = { path= "../../core", version = "2.0.0"}
sp-inherents = { version = "2.0.0", path = "../../inherents" }
Expand Down
2 changes: 1 addition & 1 deletion utils/browser/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
futures = { version = "0.3", features = ["compat"] }
futures01 = { package = "futures", version = "0.1.29" }
log = "0.4.8"
libp2p-wasm-ext = { version = "0.26", features = ["websocket"] }
libp2p-wasm-ext = { version = "0.27", features = ["websocket"] }
console_error_panic_hook = "0.1.6"
console_log = "0.2.0"
js-sys = "0.3.34"
Expand Down