gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-07 00:42:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Network service additions

Browse Source
This commit is contained in:
Age Manning
2020-05-04 18:34:01 +10:00
parent 35838dbfbe
commit 1ccf83b574
1 changed files with 25 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
beacon_node/eth2-libp2p/src/service.rs
View File

@@ -179,36 +179,31 @@ impl<TSpec: EthSpec> Service<TSpec> {
} }
} }
// TODO: Convert to an async function via building a stored stream from libp2p swarm
impl<TSpec: EthSpec> Stream for Service<TSpec> { impl<TSpec: EthSpec> Stream for Service<TSpec> {
type Item = Result<BehaviourEvent<TSpec>, error::Error>; type Item = Result<BehaviourEvent<TSpec>, error::Error>;
fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> { fn poll_next(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
loop { loop {
match self.swarm.poll() { match self.swarm.poll_next_unpin(cx) {
Poll::Ready(Some(event)) => { Poll::Ready(Some(event)) => {
return Poll::Ready(Some(event)); return Poll::Ready(Some(Ok(event)));
} }
Ok(Poll::Ready(None)) => unreachable!("Swarm stream shouldn't end"), Poll::Ready(None) => unreachable!("Swarm stream shouldn't end"),
Ok(Poll::Pending) => break, Poll::Pending => break,
_ => break, _ => break,
} }
} }
// check if peers need to be banned // check if peers need to be banned
loop { loop {
match self.peers_to_ban.poll() { match self.peers_to_ban.poll_next_unpin(cx) {
Poll::Ready(Some(Ok(peer_id))) => { Poll::Ready(Some(Ok(peer_id))) => {
let peer_id = peer_id.into_inner(); let peer_id = peer_id.into_inner();
Swarm::ban_peer_id(&mut self.swarm, peer_id.clone()); Swarm::ban_peer_id(&mut self.swarm, peer_id.clone());
// TODO: Correctly notify protocols of the disconnect // TODO: Correctly notify protocols of the disconnect
// TODO: Also remove peer from the DHT: https://github.com/sigp/lighthouse/issues/629 // TODO: Also remove peer from the DHT: https://github.com/sigp/lighthouse/issues/629
let dummy_connected_point = ConnectedPoint::Dialer { self.swarm.inject_disconnected(&peer_id);
address: "/ip4/0.0.0.0"
.parse::<Multiaddr>()
.expect("valid multiaddr"),
};
self.swarm
.inject_disconnected(&peer_id, dummy_connected_point);
// inform the behaviour that the peer has been banned // inform the behaviour that the peer has been banned
self.swarm.peer_banned(peer_id); self.swarm.peer_banned(peer_id);
} }
@@ -221,7 +216,7 @@ impl<TSpec: EthSpec> Stream for Service<TSpec> {
// un-ban peer if it's timeout has expired // un-ban peer if it's timeout has expired
loop { loop {
match self.peer_ban_timeout.poll() { match self.peer_ban_timeout.poll_next_unpin(cx) {
Poll::Ready(Some(Ok(peer_id))) => { Poll::Ready(Some(Ok(peer_id))) => {
let peer_id = peer_id.into_inner(); let peer_id = peer_id.into_inner();
debug!(self.log, "Peer has been unbanned"; "peer" => format!("{:?}", peer_id)); debug!(self.log, "Peer has been unbanned"; "peer" => format!("{:?}", peer_id));
@@ -241,58 +236,32 @@ impl<TSpec: EthSpec> Stream for Service<TSpec> {
/// The implementation supports TCP/IP, WebSockets over TCP/IP, noise/secio as the encryption layer, and /// The implementation supports TCP/IP, WebSockets over TCP/IP, noise/secio as the encryption layer, and
/// mplex or yamux as the multiplexing layer. /// mplex or yamux as the multiplexing layer.
fn build_transport(local_private_key: Keypair) -> Boxed<(PeerId, StreamMuxerBox), Error> { fn build_transport(
local_private_key: Keypair,
) -> Result<Boxed<(PeerId, StreamMuxerBox), Error>, io::Error> {
// TODO: The Wire protocol currently doesn't specify encryption and this will need to be customised // TODO: The Wire protocol currently doesn't specify encryption and this will need to be customised
// in the future. // in the future.
let transport = libp2p::tcp::TcpConfig::new().nodelay(true); let transport = libp2p::tcp::TcpConfig::new().nodelay(true);
let transport = libp2p::dns::DnsConfig::new(transport); let transport = libp2p::dns::DnsConfig::new(transport)?;
#[cfg(feature = "libp2p-websocket")] #[cfg(feature = "libp2p-websocket")]
let transport = { let transport = {
let trans_clone = transport.clone(); let trans_clone = transport.clone();
transport.or_transport(websocket::WsConfig::new(trans_clone)) transport.or_transport(websocket::WsConfig::new(trans_clone))
}; }?;
// Authentication transport
let transport = transport .upgrade(core::upgrade::Version::V1)
.and_then(move |stream, endpoint| { .authenticate(core::upgrade::SelectUpgrade::new(
let upgrade = core::upgrade::SelectUpgrade::new( generate_noise_config(&local_private_key),
generate_noise_config(&local_private_key), secio::SecioConfig::new(local_private_key),
secio::SecioConfig::new(local_private_key), ))
); .multiplex(core::upgrade::SelectUpgrade::new(
core::upgrade::apply(stream, upgrade, endpoint, core::upgrade::Version::V1).and_then( yamux::Config::default(),
move |out| { mplex::MplexConfig::new(),
match out { ))
// Noise was negotiated .map(|(peer, muxer), _| (peer, core::muxing::StreamMuxerBox::new(muxer)))
core::either::EitherOutput::First((remote_id, out)) => {
Ok((core::either::EitherOutput::First(out), remote_id))
}
// Secio was negotiated
core::either::EitherOutput::Second((remote_id, out)) => {
Ok((core::either::EitherOutput::Second(out), remote_id))
}
}
},
)
})
.timeout(Duration::from_secs(20));
// Multiplexing
let transport = transport
.and_then(move |(stream, peer_id), endpoint| {
let peer_id2 = peer_id.clone();
let upgrade = core::upgrade::SelectUpgrade::new(
libp2p::yamux::Config::default(),
libp2p::mplex::MplexConfig::new(),
)
.map_inbound(move |muxer| (peer_id, muxer))
.map_outbound(move |muxer| (peer_id2, muxer));
core::upgrade::apply(stream, upgrade, endpoint, core::upgrade::Version::V1)
.map(|(id, muxer)| (id, core::muxing::StreamMuxerBox::new(muxer)))
})
.timeout(Duration::from_secs(20)) .timeout(Duration::from_secs(20))
.map_err(|err| Error::new(ErrorKind::Other, err)) .map_err(|err| Error::new(ErrorKind::Other, err))
.boxed(); .boxed()
transport
} }
fn keypair_from_hex(hex_bytes: &str) -> error::Result<Keypair> { fn keypair_from_hex(hex_bytes: &str) -> error::Result<Keypair> {