cerc-io/lighthouse
10
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Peer scoring updates (#1342)

Browse Source 
* Prevent banned peers from interacting with the behaviour

* Update smallvec

* Add logs

* Correct log update
This commit is contained in:
Age Manning 2020-07-07 20:08:05 +10:00 committed by GitHub
parent ac2ce2ba6b
commit 025b262e01
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
beacon_node/eth2_libp2p/src/behaviour/mod.rs
View File

@ -798,6 +798,11 @@ impl<TSpec: EthSpec> NetworkBehaviour for Behaviour<TSpec> {
conn_id: ConnectionId, conn_id: ConnectionId,
event: <Self::ProtocolsHandler as ProtocolsHandler>::OutEvent, event: <Self::ProtocolsHandler as ProtocolsHandler>::OutEvent,
) { ) {
// All events from banned peers are rejected
if self.peer_manager.is_banned(&peer_id) {
return;
}
match event { match event {
// Events comming from the handler, redirected to each behaviour // Events comming from the handler, redirected to each behaviour
BehaviourHandlerOut::Delegate(delegate) => match *delegate { BehaviourHandlerOut::Delegate(delegate) => match *delegate {

5
beacon_node/eth2_libp2p/src/peer_manager/mod.rs
View File

@ -178,6 +178,8 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
unban_peer = Some(peer_id.clone()); unban_peer = Some(peer_id.clone());
} }
} }
} else {
debug!(self.log, "Peer score adjusted"; "peer_id" => peer_id.to_string(), "score" => info.score.to_string());
} }
} }
@ -291,7 +293,8 @@ impl<TSpec: EthSpec> PeerManager<TSpec> {
/// This adjusts a peer's score based on the error. /// This adjusts a peer's score based on the error.
pub fn handle_rpc_error(&mut self, peer_id: &PeerId, protocol: Protocol, err: &RPCError) { pub fn handle_rpc_error(&mut self, peer_id: &PeerId, protocol: Protocol, err: &RPCError) {
let client = self.network_globals.client(peer_id); let client = self.network_globals.client(peer_id);
warn!(self.log, "RPC Error"; "protocol" => protocol.to_string(), "err" => err.to_string(), "client" => client.to_string()); let score = self.network_globals.peers.read().score(peer_id);
warn!(self.log, "RPC Error"; "protocol" => protocol.to_string(), "err" => err.to_string(), "client" => client.to_string(), "peer_id" => peer_id.to_string(), "score" => score.to_string());
// Map this error to a `PeerAction` (if any) // Map this error to a `PeerAction` (if any)
let peer_action = match err { let peer_action = match err {