gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-03-11 18:04:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix Rpc Ping sequence number (#6408)

Browse Source 
* fix Rpc Ping sequence number

* bubble up Outbound Err's and Responses even if the peer disconnected

* send pings via Rpc from main network

* add comment to connected check

* Merge branch 'unstable' into fix-ping-seq-number
This commit is contained in:
João Oliveira
2024-09-26 15:52:03 +01:00
committed by GitHub
parent 50d8375d46
commit 5d1ff7c6f8
3 changed files with 90 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
beacon_node/lighthouse_network/src/service/mod.rs
View File

@@ -159,38 +159,36 @@ impl<E: EthSpec> Network<E> {
.collect();
// set up a collection of variables accessible outside of the network crate
let network_globals = {
// Create an ENR or load from disk if appropriate
let enr = crate::discovery::enr::build_or_load_enr::<E>(
local_keypair.clone(),
&config,
&ctx.enr_fork_id,
&log,
&ctx.chain_spec,
)?;
// Construct the metadata
let custody_subnet_count = if ctx.chain_spec.is_peer_das_scheduled() {
if config.subscribe_all_data_column_subnets {
Some(ctx.chain_spec.data_column_sidecar_subnet_count)
} else {
Some(ctx.chain_spec.custody_requirement)
}
// Create an ENR or load from disk if appropriate
let enr = crate::discovery::enr::build_or_load_enr::<E>(
local_keypair.clone(),
&config,
&ctx.enr_fork_id,
&log,
&ctx.chain_spec,
)?;
// Construct the metadata
let custody_subnet_count = ctx.chain_spec.is_peer_das_scheduled().then(|| {
if config.subscribe_all_data_column_subnets {
ctx.chain_spec.data_column_sidecar_subnet_count
} else {
None
};
let meta_data =
utils::load_or_build_metadata(&config.network_dir, custody_subnet_count, &log);
let globals = NetworkGlobals::new(
enr,
meta_data,
trusted_peers,
config.disable_peer_scoring,
&log,
config.clone(),
ctx.chain_spec.clone(),
);
Arc::new(globals)
};
ctx.chain_spec.custody_requirement
}
});
let meta_data =
utils::load_or_build_metadata(&config.network_dir, custody_subnet_count, &log);
let seq_number = *meta_data.seq_number();
let globals = NetworkGlobals::new(
enr,
meta_data,
trusted_peers,
config.disable_peer_scoring,
&log,
config.clone(),
ctx.chain_spec.clone(),
);
let network_globals = Arc::new(globals);
// Grab our local ENR FORK ID
let enr_fork_id = network_globals
@@ -338,6 +336,7 @@ impl<E: EthSpec> Network<E> {
config.outbound_rate_limiter_config.clone(),
log.clone(),
network_params,
seq_number,
);
let discovery = {
@@ -1104,33 +1103,26 @@ impl<E: EthSpec> Network<E> {
.sync_committee_bitfield::<E>()
.expect("Local discovery must have sync committee bitfield");
{
// write lock scope
let mut meta_data = self.network_globals.local_metadata.write();
// write lock scope
let mut meta_data_w = self.network_globals.local_metadata.write();
*meta_data.seq_number_mut() += 1;
*meta_data.attnets_mut() = local_attnets;
if let Ok(syncnets) = meta_data.syncnets_mut() {
*syncnets = local_syncnets;
}
*meta_data_w.seq_number_mut() += 1;
*meta_data_w.attnets_mut() = local_attnets;
if let Ok(syncnets) = meta_data_w.syncnets_mut() {
*syncnets = local_syncnets;
}
let seq_number = *meta_data_w.seq_number();
let meta_data = meta_data_w.clone();
drop(meta_data_w);
self.eth2_rpc_mut().update_seq_number(seq_number);
// Save the updated metadata to disk
utils::save_metadata_to_disk(
&self.network_dir,
self.network_globals.local_metadata.read().clone(),
&self.log,
);
utils::save_metadata_to_disk(&self.network_dir, meta_data, &self.log);
}
/// Sends a Ping request to the peer.
fn ping(&mut self, peer_id: PeerId) {
let ping = crate::rpc::Ping {
data: *self.network_globals.local_metadata.read().seq_number(),
};
trace!(self.log, "Sending Ping"; "peer_id" => %peer_id);
let id = RequestId::Internal;
self.eth2_rpc_mut()
.send_request(peer_id, id, OutboundRequest::Ping(ping));
self.eth2_rpc_mut().ping(peer_id, RequestId::Internal);
}
/// Sends a METADATA request to a peer.
@@ -1400,8 +1392,12 @@ impl<E: EthSpec> Network<E> {
fn inject_rpc_event(&mut self, event: RPCMessage<RequestId, E>) -> Option<NetworkEvent<E>> {
let peer_id = event.peer_id;
// Do not permit Inbound events from peers that are being disconnected, or RPC requests.
if !self.peer_manager().is_connected(&peer_id) {
// Do not permit Inbound events from peers that are being disconnected or RPC requests,
// but allow `RpcFailed` and `HandlerErr::Outbound` to be bubble up to sync for state management.
if !self.peer_manager().is_connected(&peer_id)
&& (matches!(event.message, Err(HandlerErr::Inbound { .. }))
|| matches!(event.message, Ok(RPCReceived::Request(..))))
{
debug!(
self.log,
"Ignoring rpc message of disconnecting peer";