Basic peer manager based on libp2p peer_store and connection_limits
#126
+943
−435
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
I propose we review and merge this, even though upstream has not merged the peer store yet. We need something to test. Very open for other suggestions though |
Comment on lines
+46
to
+65
| beacon_node_fallback = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| bls = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| eth2 = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| eth2_config = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| eth2_network_config = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| health_metrics = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| lighthouse_network = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| metrics = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| safe_arith = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| sensitive_url = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| slashing_protection = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| slot_clock = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| task_executor = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2", default-features = false, features = [ | ||
| "tracing", | ||
| ] } | ||
| types = { git = "https://github.com/sigp/lighthouse", rev = "1a77f7a0" } | ||
| unused_port = { git = "https://github.com/sigp/lighthouse", rev = "1a77f7a0" } | ||
| validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "1a77f7a0" } | ||
| validator_services = { git = "https://github.com/sigp/lighthouse", rev = "1a77f7a0" } | ||
| validator_store = { git = "https://github.com/sigp/lighthouse", rev = "1a77f7a0" } | ||
| types = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| unused_port = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| validator_metrics = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| validator_services = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } | ||
| validator_store = { git = "https://github.com/sigp/lighthouse", rev = "b71b5f2" } |
There was a problem hiding this comment.
Is it possible to define rev only once?
| # we might need to explicitly list even more crates here if something fails | ||
| libp2p = { git = "https://github.com/dknopik/rust-libp2p.git", rev = "170816f" } | ||
| libp2p-identity = { git = "https://github.com/dknopik/rust-libp2p.git", rev = "170816f" } | ||
| libp2p-mplex = { git = "https://github.com/dknopik/rust-libp2p.git", rev = "170816f" } |
| @@ -11,7 +11,7 @@ ethereum_ssz = "0.8.1" | |||
| ethereum_ssz_derive = "0.8.1" | |||
| futures = { workspace = true } | |||
| hex = "0.4.3" | |||
| libp2p = { version = "0.54", default-features = false, features = [ | |||
| libp2p = { git = "https://github.com/dknopik/rust-libp2p.git", rev = "170816f", default-features = false, features = [ | |||
There was a problem hiding this comment.
Can we use only the peer store as a standalone dep from this repo?
| @@ -192,24 +197,39 @@ impl Network { | |||
| self.swarm | |||
| .behaviour_mut() | |||
| .discovery | |||
| .start_subnet_query(vec![subnet]); | |||
| .set_subscribed(subnet, true); | |||
There was a problem hiding this comment.
Could we do it in a different PR?
| @@ -267,6 +266,22 @@ impl Discovery { | |||
| ); | |||
| } | |||
|
|
|||
| pub fn set_subscribed(&mut self, subnet: SubnetId, subscribed: bool) { | |||
There was a problem hiding this comment.
Could we do it in a different PR?
| .filter_map(|(enr, _)| manager.discovered_peer(enr)) | ||
| .collect::<Vec<_>>(); | ||
| for dial in to_dial { | ||
| let _ = self.swarm.dial(dial); |
There was a problem hiding this comment.
Lighthouse does something like that https://github.com/sigp/lighthouse/blob/unstable/beacon_node/lighthouse_network/src/peer_manager/network_behaviour.rs#L113
Comment on lines
+30
to
+35
| pub peer_store: peer_store::Behaviour<MemoryStore<Enr>>, | ||
| pub connection_limits: connection_limits::Behaviour, | ||
| pub connected: HashSet<PeerId>, | ||
| pub needed_subnets: HashSet<SubnetId>, | ||
| pub target_peers: usize, | ||
| pub max_with_priority_peers: usize, |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Draft of basic peer manager using
connection_limitsand a preliminary version ofpeer_store.This is just a draft, as the exact design of
peer_storeis still TBD and a few things are missing.