Upgrade to libp2p 0.44.0 #11009

kpp · 2022-03-10T15:22:53Z

polkadot companion: paritytech/polkadot#5414
cumulus companion: paritytech/cumulus#1221

What does it do?

Updates libp2p to 0.44.0

Fixes #11007
Fixes #10370

…cted, minor fixes

client/network/src/peer_info.rs

mxinden

Just one comment. Otherwise this looks good to me.

client/network/src/discovery.rs

kpp · 2022-03-22T11:54:06Z

impl NetworkBehaviour for Notifications should be reviewed too.

kpp · 2022-03-22T12:28:07Z

Should inject_listen_failure be reviewed too?..

kpp · 2022-04-14T15:05:43Z

client/network/Cargo.toml

@@ -61,12 +61,12 @@ unsigned-varint = { version = "0.6.0", features = [
    "asynchronous_codec",
 ] }
 void = "1.0.2"
-zeroize = "1.5.4"
-libp2p = "0.40.0"
+zeroize = "1.4.3"


zeroize is downgraded because libp2p-noise:0.35.0 depends on snow:0.9.0 which depends on chacha20poly1305:0.9.0 which depends on zeroize ">=1, < 1.5"

But can we not just have different versions of zeroize?

I couldn't make it work.

-zeroize = "1.4.3" +zeroize = "=1.5.4"

Gives this error:

error: failed to select a version for `zeroize`. ... required by package `chacha20poly1305 v0.9.0` ... which satisfies dependency `chacha20poly1305 = "^0.9"` of package `snow v0.9.0` ... which satisfies dependency `snow = "^0.9.0"` of package `libp2p-noise v0.35.0` ... which satisfies dependency `libp2p-noise = "^0.35.0"` of package `libp2p v0.44.0` ... which satisfies dependency `libp2p = "^0.44.0"` of package `sc-authority-discovery v0.10.0-dev (/home/kpp/parity/substrate/client/authority-discovery)` ... which satisfies path dependency `sc-authority-discovery` (locked to 0.10.0-dev) of package `node-cli v3.0.0-dev (/home/kpp/parity/substrate/bin/node/cli)` ... which satisfies path dependency `node-cli` (locked to 3.0.0-dev) of package `chain-spec-builder v2.0.0 (/home/kpp/parity/substrate/bin/utils/chain-spec-builder)` versions that meet the requirements `>=1, <1.5` are: 1.4.3, 1.4.2, 1.4.1, 1.4.0, 1.3.0, 1.2.0, 1.1.1, 1.1.0, 1.0.0 all possible versions conflict with previously selected packages. previously selected package `zeroize v1.5.4` ... which satisfies dependency `zeroize = "=1.5.4"` of package `sc-network v0.10.0-dev (/home/kpp/parity/substrate/client/network)` ... which satisfies path dependency `sc-network` (locked to 0.10.0-dev) of package `beefy-gadget v4.0.0-dev (/home/kpp/parity/substrate/client/beefy)` ... which satisfies path dependency `beefy-gadget` (locked to 4.0.0-dev) of package `beefy-gadget-rpc v4.0.0-dev (/home/kpp/parity/substrate/client/beefy/rpc)` ```

bkchr

Most of the stuff looks reasonable, but I'm mainly trusting here @mxinden

client/telemetry/src/transport.rs

bkchr · 2022-04-15T06:27:12Z

primitives/core/Cargo.toml

@@ -32,7 +32,7 @@ substrate-bip39 = { version = "0.4.4", optional = true }
 tiny-bip39 = { version = "0.8.2", optional = true }
 regex = { version = "1.5.4", optional = true }
 num-traits = { version = "0.2.8", default-features = false }
-zeroize = { version = "1.5.4", default-features = false }
+zeroize = { version = "1.4.3", default-features = false }


I read your other comment, but why do we need to downgrade here as well?

error: failed to select a version for zeroize. ... required by package chacha20poly1305 v0.9.0 ... which satisfies dependency chacha20poly1305 = "^0.9" of package snow v0.9.0 ... which satisfies dependency snow = "^0.9.0" of package libp2p-noise v0.35.0 ... which satisfies dependency libp2p-noise = "^0.35.0" of package libp2p v0.44.0 ... which satisfies dependency libp2p = "^0.44.0" of package sc-authority-discovery v0.10.0-dev (/home/kpp/parity/substrate/client/authority-discovery) ... which satisfies path dependency sc-authority-discovery (locked to 0.10.0-dev) of package node-cli v3.0.0-dev (/home/kpp/parity/substrate/bin/node/cli) ... which satisfies path dependency node-cli (locked to 3.0.0-dev) of package chain-spec-builder v2.0.0 (/home/kpp/parity/substrate/bin/utils/chain-spec-builder) versions that meet the requirements >=1, <1.5 are: 1.4.3, 1.4.2, 1.4.1, 1.4.0, 1.3.0, 1.2.0, 1.1.1, 1.1.0, 1.0.0 all possible versions conflict with previously selected packages. previously selected package zeroize v1.5.4 ... which satisfies dependency zeroize = "^1.5.4" of package sc-network v0.10.0-dev (/home/kpp/parity/substrate/client/network) ... which satisfies path dependency sc-network (locked to 0.10.0-dev) of package beefy-gadget v4.0.0-dev (/home/kpp/parity/substrate/client/beefy) ... which satisfies path dependency beefy-gadget (locked to 4.0.0-dev) of package beefy-gadget-rpc v4.0.0-dev (/home/kpp/parity/substrate/client/beefy/rpc) failed to select a version for zeroize which could resolve this conflict

tomaka · 2022-04-26T14:53:10Z

The conflicts need to be resolved

kpp · 2022-04-26T22:04:44Z

@tomaka done

bkchr · 2022-04-27T15:51:36Z

@kpp could you create a polkadot companion? Should be only for fixing zeroize.

kpp · 2022-04-28T13:59:32Z

@bkchr it worked for polkadot, but not for cumulus. There is some CI magic I am not familiar with.

* Update libp2p to 0.43.0, lru to 0.7.3 * Fix websoket Incoming::Data * Rename ProtocolsHandler -> ConnectionHandler, remove inject_dis/connected, minor fixes * Fix args for inject_connection* callbacks * Fix DialPeer/DialAddress * Fix debug fmt * Add Endpoint to NetworkState * Fix Kad::get_record by key * Fix Sha2_256::digest * Fix IntoConnectionHandler * Fix borrowchk * Fix DialError::WrongPeerId * Remove NodeHandlerWrapperError * Fix KademliaEvent variants * Fix impl Add for String * Fix tabs in network_state * Apply cargo fmt * Fix a typo in req/resp * Fix tests * Fix peer_info:entry.info_expire * Fix PeerInfoBehaviour inject_address_change and inject_connection_closed * Patch libp2p to 0.44.0#6cc3b4e * Fix inject_connection_closed kad, req/resp * Apply cargo fmt * Use libp2p from crates.io * Fix review notes

* Anchor polkadot-v0.9.22 * update Cargo.lock * Companion for paritytech/substrate#11009 * update Cargo.lock

* Update libp2p to 0.43.0, lru to 0.7.3 * Fix websoket Incoming::Data * Rename ProtocolsHandler -> ConnectionHandler, remove inject_dis/connected, minor fixes * Fix args for inject_connection* callbacks * Fix DialPeer/DialAddress * Fix debug fmt * Add Endpoint to NetworkState * Fix Kad::get_record by key * Fix Sha2_256::digest * Fix IntoConnectionHandler * Fix borrowchk * Fix DialError::WrongPeerId * Remove NodeHandlerWrapperError * Fix KademliaEvent variants * Fix impl Add for String * Fix tabs in network_state * Apply cargo fmt * Fix a typo in req/resp * Fix tests * Fix peer_info:entry.info_expire * Fix PeerInfoBehaviour inject_address_change and inject_connection_closed * Patch libp2p to 0.44.0#6cc3b4e * Fix inject_connection_closed kad, req/resp * Apply cargo fmt * Use libp2p from crates.io * Fix review notes

kpp added 3 commits March 10, 2022 18:15

Update libp2p to 0.43.0, lru to 0.7.3

fe59e10

Fix websoket Incoming::Data

85e4e48

Rename ProtocolsHandler -> ConnectionHandler, remove inject_dis/conne…

89fcd29

…cted, minor fixes

kpp added A3-in_progress Pull request is in progress. No review needed at this stage. B0-silent Changes should not be mentioned in any release notes labels Mar 10, 2022

kpp added this to Triage in Networking (Outdated) via automation Mar 10, 2022

github-actions bot added A0-please_review Pull request needs code review. and removed A3-in_progress Pull request is in progress. No review needed at this stage. labels Mar 10, 2022

kpp added 12 commits March 15, 2022 18:12

Fix args for inject_connection* callbacks

1fc81eb

Fix DialPeer/DialAddress

c888855

Fix debug fmt

c45b54c

Add Endpoint to NetworkState

2598c96

Fix Kad::get_record by key

2e6ca05

Fix Sha2_256::digest

4af7e1b

Fix IntoConnectionHandler

913a42c

Fix borrowchk

0a3312d

Fix DialError::WrongPeerId

1590011

Remove NodeHandlerWrapperError

d667b91

Fix KademliaEvent variants

85d0650

Fix impl Add for String

ce40db4

kpp commented Mar 15, 2022

View reviewed changes

client/network/src/peer_info.rs Show resolved Hide resolved

kpp added 4 commits March 15, 2022 21:10

Fix tabs in network_state

c4235be

Apply cargo fmt

62932f0

Merge branch 'master' into kpp-libp2p-0.43

258e1b9

Fix a typo in req/resp

60f055a

kpp added the C1-low PR touches the given topic and has a low impact on builders. label Mar 15, 2022

Fix tests

5f50377

kpp added the D3-trivial 🧸 PR contains trivial changes in a runtime directory that do not require an audit label Mar 15, 2022

Fix peer_info:entry.info_expire

fab7745

kpp changed the title ~~[WIP] update to libp2p 0.43.0~~ Upgrade to libp2p 0.43.0 Mar 15, 2022

mxinden reviewed Mar 18, 2022

View reviewed changes

client/network/src/discovery.rs Outdated Show resolved Hide resolved

kpp added 2 commits March 22, 2022 14:38

Patch libp2p to 0.44.0#6cc3b4e

61f481d

Fix inject_connection_closed kad, req/resp

f85d528

Apply cargo fmt

8682816

Use libp2p from crates.io

6d6c51a

kpp changed the title ~~Upgrade to libp2p 0.43.0~~ Upgrade to libp2p 0.44.0 Apr 14, 2022

Merge branch 'master' into kpp-libp2p-0.43

91c34c6

kpp commented Apr 14, 2022

View reviewed changes

bkchr approved these changes Apr 15, 2022

View reviewed changes

kpp added 2 commits April 18, 2022 12:24

Fix review notes

9406343

Merge branch 'master' into kpp-libp2p-0.43

8faadd8

tomaka approved these changes Apr 19, 2022

View reviewed changes

Merge branch 'master' into kpp-libp2p-0.43

cda378d

This was referenced Apr 28, 2022

Companion for substrate#11009 paritytech/polkadot#5414

Merged

Companion for substrate#11009 paritytech/cumulus#1221

Merged

bkchr merged commit 95067cc into master Apr 29, 2022

Networking (Outdated) automation moved this from Triage to Done Apr 29, 2022

bkchr deleted the kpp-libp2p-0.43 branch April 29, 2022 08:49

ordian mentioned this pull request Jun 5, 2022

Parachain and Rococo relaychain randomly crash at 0.9.22 and 0.9.23 paritytech/polkadot#5639

Closed

jiguantong added a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Jun 27, 2022

Companion for paritytech/substrate#11009

9eb2459

fewensa pushed a commit to darwinia-network/darwinia-messages-substrate that referenced this pull request Jun 27, 2022

Prepare polkadot-v0.9.22 for darwinia-parachain (#147)

343a9d9

* Anchor polkadot-v0.9.22 * update Cargo.lock * Companion for paritytech/substrate#11009 * update Cargo.lock

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Upgrade to libp2p 0.44.0 #11009

Upgrade to libp2p 0.44.0 #11009

kpp commented Mar 10, 2022 •

edited

mxinden left a comment

kpp commented Mar 22, 2022

kpp commented Mar 22, 2022

kpp Apr 14, 2022

bkchr Apr 15, 2022

kpp Apr 18, 2022 •

edited

bkchr left a comment

bkchr Apr 15, 2022

kpp Apr 15, 2022

tomaka commented Apr 26, 2022

kpp commented Apr 26, 2022

bkchr commented Apr 27, 2022

kpp commented Apr 28, 2022 •

edited

Upgrade to libp2p 0.44.0 #11009

Upgrade to libp2p 0.44.0 #11009

Conversation

kpp commented Mar 10, 2022 • edited

mxinden left a comment

Choose a reason for hiding this comment

kpp commented Mar 22, 2022

kpp commented Mar 22, 2022

kpp Apr 14, 2022

Choose a reason for hiding this comment

bkchr Apr 15, 2022

Choose a reason for hiding this comment

kpp Apr 18, 2022 • edited

Choose a reason for hiding this comment

bkchr left a comment

Choose a reason for hiding this comment

bkchr Apr 15, 2022

Choose a reason for hiding this comment

kpp Apr 15, 2022

Choose a reason for hiding this comment

tomaka commented Apr 26, 2022

kpp commented Apr 26, 2022

bkchr commented Apr 27, 2022

kpp commented Apr 28, 2022 • edited

kpp commented Mar 10, 2022 •

edited

kpp Apr 18, 2022 •

edited

kpp commented Apr 28, 2022 •

edited