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

Add logging in UnknownBlockHashFromAttestation handling (#5546)

Browse Source 
* Use should_search_for_block in unknown block root event

* Merge branch 'unstable' of https://github.com/sigp/lighthouse into should_search_for_block
This commit is contained in:
Lion - dapplion
2024-04-11 05:52:22 +09:00
committed by GitHub
parent 30dc260472
commit 54fbdda4d2
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
beacon_node/network/src/sync/manager.rs
View File

@@ -680,12 +680,8 @@ impl<T: BeaconChainTypes> SyncManager<T> {
); );
} }
SyncMessage::UnknownBlockHashFromAttestation(peer_id, block_root) => { SyncMessage::UnknownBlockHashFromAttestation(peer_id, block_root) => {
// If we are not synced, ignore this block. debug!(self.log, "Received unknown block hash message"; "block_root" => %block_root);
if self.synced_and_connected(&peer_id) { self.handle_unknown_block_root(peer_id, block_root);
debug!(self.log, "Received sync_message"; "message" => "UnknownBlockHashFromAttestation", "block_root" => %block_root);
self.block_lookups
.search_block(block_root, &[peer_id], &mut self.network);
}
} }
SyncMessage::Disconnect(peer_id) => { SyncMessage::Disconnect(peer_id) => {
self.peer_disconnect(&peer_id); self.peer_disconnect(&peer_id);
@@ -757,7 +753,7 @@ impl<T: BeaconChainTypes> SyncManager<T> {
slot: Slot, slot: Slot,
child_components: ChildComponents<T::EthSpec>, child_components: ChildComponents<T::EthSpec>,
) { ) {
match self.should_search_for_block(slot, &peer_id) { match self.should_search_for_block(Some(slot), &peer_id) {
Ok(_) => { Ok(_) => {
self.block_lookups.search_parent( self.block_lookups.search_parent(
slot, slot,
@@ -779,12 +775,28 @@ impl<T: BeaconChainTypes> SyncManager<T> {
} }
} }
fn handle_unknown_block_root(&mut self, peer_id: PeerId, block_root: Hash256) {
match self.should_search_for_block(None, &peer_id) {
Ok(_) => {
self.block_lookups
.search_block(block_root, &[peer_id], &mut self.network);
}
Err(reason) => {
debug!(self.log, "Ignoring unknown block request"; "block_root" => %block_root, "reason" => reason);
}
}
}
fn should_search_for_block( fn should_search_for_block(
&mut self, &mut self,
block_slot: Slot, block_slot: Option<Slot>,
peer_id: &PeerId, peer_id: &PeerId,
) -> Result<(), &'static str> { ) -> Result<(), &'static str> {
if !self.network_globals().sync_state.read().is_synced() { if !self.network_globals().sync_state.read().is_synced() {
let Some(block_slot) = block_slot else {
return Err("not synced");
};
let head_slot = self.chain.canonical_head.cached_head().head_slot(); let head_slot = self.chain.canonical_head.cached_head().head_slot();
// if the block is far in the future, ignore it. If its within the slot tolerance of // if the block is far in the future, ignore it. If its within the slot tolerance of
@@ -807,15 +819,6 @@ impl<T: BeaconChainTypes> SyncManager<T> {
Ok(()) Ok(())
} }
fn synced(&mut self) -> bool {
self.network_globals().sync_state.read().is_synced()
&& self.network.is_execution_engine_online()
}
fn synced_and_connected(&mut self, peer_id: &PeerId) -> bool {
self.synced() && self.network_globals().peers.read().is_connected(peer_id)
}
fn handle_new_execution_engine_state(&mut self, engine_state: EngineState) { fn handle_new_execution_engine_state(&mut self, engine_state: EngineState) {
self.network.update_execution_engine_state(engine_state); self.network.update_execution_engine_state(engine_state);