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

Check da_checker before doing a block lookup request (#5681)

Browse Source 
* Check da_checker before doing a block lookup request

* Ensure consistent handling of lookup result

* use req resp pre import cache rather than da checker
This commit is contained in:
Lion - dapplion
2024-05-01 23:45:36 +09:00
committed by GitHub
parent 59753f5fed
commit 01e4e3527e
5 changed files with 151 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
beacon_node/network/src/sync/network_context.rs
View File

@@ -296,12 +296,25 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
}
}
/// Request block of `block_root` if necessary by checking:
/// - If the da_checker has a pending block from gossip or a previous request
///
/// Returns false if no request was made, because the block is already imported
pub fn block_lookup_request(
&mut self,
lookup_id: SingleLookupId,
peer_id: PeerId,
request: BlocksByRootSingleRequest,
block_root: Hash256,
) -> Result<bool, &'static str> {
if self
.chain
.reqresp_pre_import_cache
.read()
.contains_key(&block_root)
{
return Ok(false);
}
let id = SingleLookupReqId {
lookup_id,
req_id: self.next_id(),
@@ -311,11 +324,13 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
self.log,
"Sending BlocksByRoot Request";
"method" => "BlocksByRoot",
"block_root" => ?request.0,
"block_root" => ?block_root,
"peer" => %peer_id,
"id" => ?id
);
let request = BlocksByRootSingleRequest(block_root);
self.send_network_msg(NetworkMessage::SendRequest {
peer_id,
request: Request::BlocksByRoot(request.into_request(&self.chain.spec)),
@@ -333,7 +348,7 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
/// - If the da_checker has a pending block
/// - If the da_checker has pending blobs from gossip
///
/// Returns false if no request was made, because we don't need to fetch (more) blobs.
/// Returns false if no request was made, because we don't need to import (more) blobs.
pub fn blob_lookup_request(
&mut self,
lookup_id: SingleLookupId,