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

Merge sigp/unstable into gloas-lookup-sync-fixes

Browse Source 
Brings in the gossip-blob deprecation (#9126) and 17 other unstable
commits. Conflict resolutions (8 files):

- Kept our unified `SyncMessage::UnknownParentSidecarHeader` design over
  unstable's separate `UnknownParentDataColumn`/`UnknownParentPartialDataColumn`
  variants (gossip_methods, manager, single_block_lookup, mod, tests).
- Adopted unstable's gossip-blob deprecation: dropped `process_gossip_blob`,
  `process_gossip_verified_blob`, and the blob parent-unknown test path.
- Took unstable's `process_gossip_verified_data_column` (Result-returning
  `to_partial`), router PayloadEnvelopesByRoot flattened match, and combined
  `BlockProcessType::id` arm.
- Dropped unstable's gloas-lookup-sync boilerplate stubs (#9322) that
  duplicated our real impls: `process_lookup_envelope`,
  `rpc_payload_envelope_received`, `on_single_payload_envelope_response`,
  and the `SinglePayloadEnvelope` processing-result arm.

cargo check -p network passes clean.
This commit is contained in:
dapplion
2026-06-01 06:15:12 +02:00
parent 77935bfbad 74a5609ab1
commit d137620ce5
134 changed files with 3321 additions and 3910 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
beacon_node/beacon_processor/src/lib.rs
View File

@@ -390,7 +390,6 @@ pub enum Work<E: EthSpec> {
process_batch: Box<dyn FnOnce(Vec<GossipAggregatePackage<E>>) + Send + Sync>,
},
GossipBlock(AsyncFn),
GossipBlobSidecar(AsyncFn),
GossipDataColumnSidecar(AsyncFn),
GossipPartialDataColumnSidecar(AsyncFn),
DelayedImportBlock {
@@ -473,7 +472,6 @@ pub enum WorkType {
UnknownLightClientOptimisticUpdate,
GossipAggregateBatch,
GossipBlock,
GossipBlobSidecar,
GossipDataColumnSidecar,
GossipPartialDataColumnSidecar,
DelayedImportBlock,
@@ -530,7 +528,6 @@ impl<E: EthSpec> Work<E> {
Work::GossipAggregate { .. } => WorkType::GossipAggregate,
Work::GossipAggregateBatch { .. } => WorkType::GossipAggregateBatch,
Work::GossipBlock(_) => WorkType::GossipBlock,
Work::GossipBlobSidecar(_) => WorkType::GossipBlobSidecar,
Work::GossipDataColumnSidecar(_) => WorkType::GossipDataColumnSidecar,
Work::GossipPartialDataColumnSidecar(_) => WorkType::GossipPartialDataColumnSidecar,
Work::DelayedImportBlock { .. } => WorkType::DelayedImportBlock,
@@ -845,8 +842,6 @@ impl<E: EthSpec> BeaconProcessor<E> {
} else if let Some(item) = work_queues.gossip_execution_payload_queue.pop()
{
Some(item)
} else if let Some(item) = work_queues.gossip_blob_queue.pop() {
Some(item)
} else if let Some(item) = work_queues.gossip_data_column_queue.pop() {
Some(item)
} else if let Some(item) =
@@ -1159,9 +1154,6 @@ impl<E: EthSpec> BeaconProcessor<E> {
Work::GossipBlock { .. } => {
work_queues.gossip_block_queue.push(work, work_id)
}
Work::GossipBlobSidecar { .. } => {
work_queues.gossip_blob_queue.push(work, work_id)
}
Work::GossipDataColumnSidecar { .. } => {
work_queues.gossip_data_column_queue.push(work, work_id)
}
@@ -1308,7 +1300,6 @@ impl<E: EthSpec> BeaconProcessor<E> {
}
WorkType::GossipAggregateBatch => 0, // No queue
WorkType::GossipBlock => work_queues.gossip_block_queue.len(),
WorkType::GossipBlobSidecar => work_queues.gossip_blob_queue.len(),
WorkType::GossipDataColumnSidecar => {
work_queues.gossip_data_column_queue.len()
}
@@ -1538,7 +1529,6 @@ impl<E: EthSpec> BeaconProcessor<E> {
| Work::ColumnReconstruction(process_fn) => task_spawner.spawn_async(process_fn),
Work::IgnoredRpcBlock { process_fn } => task_spawner.spawn_blocking(process_fn),
Work::GossipBlock(work)
| Work::GossipBlobSidecar(work)
| Work::GossipDataColumnSidecar(work)
| Work::GossipPartialDataColumnSidecar(work)
| Work::GossipExecutionPayload(work) => task_spawner.spawn_async(async move {