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

Resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-01-27 22:49:08 -08:00
parent 4a9aaa2b46 f7b5c7ee3f
commit aba7d45fd5
23 changed files with 1370 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -776,7 +776,10 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
}
let range_req = entry.get_mut();
if let Some(blocks_result) = range_req.responses(&self.chain.spec) {
if let Some(blocks_result) = range_req.responses(
self.chain.data_availability_checker.clone(),
self.chain.spec.clone(),
) {
if let Err(CouplingError::DataColumnPeerFailure {
error,
faulty_peers: _,
@@ -1609,7 +1612,13 @@ impl<T: BeaconChainTypes> SyncNetworkContext<T> {
.beacon_processor_if_enabled()
.ok_or(SendErrorProcessor::ProcessorNotAvailable)?;
let block = RpcBlock::new_without_blobs(Some(block_root), block);
let block = RpcBlock::new(
block,
None,
&self.chain.data_availability_checker,
self.chain.spec.clone(),
)
.map_err(|_| SendErrorProcessor::SendError)?;
debug!(block = ?block_root, id, "Sending block for processing");
// Lookup sync event safety: If `beacon_processor.send_rpc_beacon_block` returns Ok() sync