Bump libp2p to 0.40.0 #10035

kpp · 2021-10-15T12:13:44Z

What does it do?

Updates libp2p to a 0.40.0 version.

gilescope · 2021-10-18T22:39:45Z

excellent. this will be one more dep not using an old rand version.

dvdplm · 2021-11-04T09:35:45Z

@kpp Any news on this? Now that 0.40 is out this could use an update?

kpp · 2021-11-04T10:47:59Z

Yes, I will update it.
News: there are burn-ins running - https://grafana.parity-mgmt.parity.io/explore?orgId=1&left=%5B%22now-1h%22%2C%22now%22%2C%22loki-polkadot.stakingops-logs%22%2C%7B%22expr%22%3A%22%7Bhost%3D%5C%22polkadot-burnin-fullnode-1%5C%22%7D%22%7D%5D , we should review them.

tomaka · 2021-11-16T10:41:04Z

I think that some methods have been added to the NetworkBehaviour trait in libp2p 0.40
https://docs.rs/libp2p/0.40.0/libp2p/swarm/trait.NetworkBehaviour.html

Could you make sure that all our implementations of this trait have all the methods when necessary?
I see that inject_address_change is missing in discovery.rs.

kpp · 2021-11-16T12:47:30Z

inject_address_change is missing in discovery.rs

It was introduced in libp2p-swarm in 0.20.0 [2020-07-01].

I made a diff of methods of NetworkBehaviour:

$ diff 0.39.txt 0.40.txt 
3d2
< inject_addr_reach_failure
13a13
> inject_listen_failure

So only NetworkBehaviour::inject_listen_failure should be addressed in this PR. Will fix.

tomaka · 2021-11-16T15:34:11Z

client/network/src/discovery.rs

-		for k in self.kademlias.values_mut() {
-			NetworkBehaviour::inject_connection_closed(k, peer_id, conn, endpoint)
-		}
+		// NetworkBehaviour::inject_connection_closed on Kademlia<MemoryStore> does nothing.


That's not really future-proof. Maybe in a future version it will do something.
We need a way to deconstruct a MultiHandler and libp2p doesn't provide any. When this PR is merged, could you open an issue in libp2p and in Substrate and follow up with a fix?

@mxinden can you take a look at this one? ^

We need a way to deconstruct a MultiHandler and libp2p doesn't provide any.

Any road blockers to contributing this upstream (rust-libp2p)?

tomaka · 2021-11-16T15:34:28Z

client/network/src/discovery.rs

@@ -649,6 +689,10 @@ impl NetworkBehaviour for DiscoveryBehaviour {
 		}
 	}

+	fn inject_listen_failure(&mut self, _: &Multiaddr, _: &Multiaddr, _: Self::ProtocolsHandler) {
+		// NetworkBehaviour::inject_listen_failure on Kademlia<MemoryStore> does nothing.


Same remark as above

client/network/src/discovery.rs

client/network/src/peer_info.rs

tomaka

LGTM provided we fix my two remaining review comments in the near future.

bkchr

Just needs master merge

tomaka · 2021-11-25T08:33:24Z

bot merge

* Bump libp2p to 0.40.0-rc.1 * Fix PingFailure import * Reduce the number of compilation errors (this is a FIXME commit) * Bump libp2p to 0.40.0-rc.2 * Fix sc-network::Behaviour to inject events into fields * Fix some NetworkBehaviourAction types * More fixes * More fixes * More fixes * Fix DiscoveryBehaviour * Fix PeerInfoBehaviour * Fix RequestResponsesBehaviour * Fix RequestResponsesBehaviour * Fix Notifications * Fix NetworkWorker * Fix Behaviour * Please borrowchk * Please borrowchk * Please borrowchk * Fix fmt * Cover all cases in matches * Fix some clippy warnings * Fix into_peer_id -> to_peer_id * Fix some warnings * Fix some inject_dial_failure FIXMEs * Fix DiscoveryBehaviour::inject_dial_failure * Fix RequestResponsesBehaviour::inject_dial_failure * Fix the order of inject_connection_closed PeerInfoBehaviour events * Make KademliaEvent with filtering unreachable * Fix Notifications::inject_dial_failure * Use concurrent_dial_errors in NetworkWorker * Remove commented-out RequestResponsesBehaviour::inject_addr_reach_failure * Fix tests * Dont report new PendingConnectionError and DialError variants to metrics * Bump libp2p to 0.40.0 * Add fn inject_listen_failure and inject_address_change * Review fixes

Bump libp2p to 0.40.0-rc.1

b078c39

github-actions bot added the A3-in_progress Pull request is in progress. No review needed at this stage. label Oct 15, 2021

kpp added 3 commits October 15, 2021 15:29

Fix PingFailure import

4eeea1f

Reduce the number of compilation errors (this is a FIXME commit)

e23de70

Bump libp2p to 0.40.0-rc.2

c4b9418

kpp changed the title ~~Bump libp2p to 0.40.0-rc.1~~ Bump libp2p to 0.40.0-rc Oct 15, 2021

kpp added 5 commits October 15, 2021 18:35

Fix sc-network::Behaviour to inject events into fields

eed99ad

Fix some NetworkBehaviourAction types

518a3ff

More fixes

b22d3e2

More fixes

804b3c1

More fixes

c1d4fe6

kpp added 18 commits October 19, 2021 15:47

Fix DiscoveryBehaviour

c4cc39b

Fix PeerInfoBehaviour

a4ef3c6

Fix RequestResponsesBehaviour

973a4ab

Fix RequestResponsesBehaviour

6e46a76

Fix Notifications

8537466

Fix NetworkWorker

00eccd2

Fix Behaviour

b966c15

Please borrowchk

485a19b

Please borrowchk

76aa852

Please borrowchk

bb2a135

Fix fmt

2cdc640

Cover all cases in matches

75177fb

Fix some clippy warnings

cef557c

Fix into_peer_id -> to_peer_id

fdb562c

Fix some warnings

2c4f0bf

Fix some inject_dial_failure FIXMEs

1276e4e

Fix DiscoveryBehaviour::inject_dial_failure

15aa6dd

Fix RequestResponsesBehaviour::inject_dial_failure

e47a3bd

Fix tests

093e52a

kpp added B0-silent Changes should not be mentioned in any release notes C1-low PR touches the given topic and has a low impact on builders. labels Oct 21, 2021

Dont report new PendingConnectionError and DialError variants to metrics

dc5ed8d

kpp mentioned this pull request Oct 21, 2021

Bump substrate with libp2p:0.40.0-rc paritytech/polkadot#4121

Closed

kpp changed the title ~~Bump libp2p to 0.40.0-rc~~ Bump libp2p to 0.40.0 Nov 8, 2021

kpp added 2 commits November 8, 2021 12:25

Bump libp2p to 0.40.0

6b71363

Merge branch 'master' into kpp-libp2p-0.40.0-rc1

697ed8f

kpp requested review from tomaka and bkchr November 8, 2021 09:32

Merge branch 'master' into kpp-libp2p-0.40.0-rc1

d52ece1

Add fn inject_listen_failure and inject_address_change

66acaf1

tomaka suggested changes Nov 16, 2021

View reviewed changes

Review fixes

ec22376

tomaka approved these changes Nov 17, 2021

View reviewed changes

Merge branch 'master' into kpp-libp2p-0.40.0-rc1

c914217

bkchr approved these changes Nov 24, 2021

View reviewed changes

Merge branch 'master' into kpp-libp2p-0.40.0-rc1

08987a5

tomaka mentioned this pull request Nov 25, 2021

NetworkBehaviour trait is not fully implemented #10370

Closed

paritytech-processbot bot merged commit 4617267 into master Nov 25, 2021

paritytech-processbot bot deleted the kpp-libp2p-0.40.0-rc1 branch November 25, 2021 08:33

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump libp2p to 0.40.0 #10035

Bump libp2p to 0.40.0 #10035

kpp commented Oct 15, 2021 •

edited

Loading

gilescope commented Oct 18, 2021

dvdplm commented Nov 4, 2021

kpp commented Nov 4, 2021

tomaka commented Nov 16, 2021

kpp commented Nov 16, 2021

tomaka Nov 16, 2021

kpp Nov 17, 2021

mxinden Nov 19, 2021

tomaka Nov 16, 2021

tomaka left a comment

bkchr left a comment

tomaka commented Nov 25, 2021

Bump libp2p to 0.40.0 #10035

Bump libp2p to 0.40.0 #10035

Conversation

kpp commented Oct 15, 2021 • edited Loading

gilescope commented Oct 18, 2021

dvdplm commented Nov 4, 2021

kpp commented Nov 4, 2021

tomaka commented Nov 16, 2021

kpp commented Nov 16, 2021

tomaka Nov 16, 2021

Choose a reason for hiding this comment

kpp Nov 17, 2021

Choose a reason for hiding this comment

mxinden Nov 19, 2021

Choose a reason for hiding this comment

tomaka Nov 16, 2021

Choose a reason for hiding this comment

tomaka left a comment

Choose a reason for hiding this comment

bkchr left a comment

Choose a reason for hiding this comment

tomaka commented Nov 25, 2021

kpp commented Oct 15, 2021 •

edited

Loading