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

Merge branch 'gloas-serve-envelope-rpc' into epbs-devnet-0

Browse Source
This commit is contained in:
Eitan Seri- Levi
2026-03-03 20:11:41 -08:00
parent 63d4ae2800 81e105d90f
commit 16e7bb5f1d
41 changed files with 1638 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -426,6 +426,8 @@ pub enum Work<E: EthSpec> {
Status(BlockingFn),
BlocksByRangeRequest(AsyncFn),
BlocksByRootsRequest(AsyncFn),
PayloadEnvelopesByRangeRequest(AsyncFn),
PayloadEnvelopesByRootRequest(AsyncFn),
BlobsByRangeRequest(BlockingFn),
BlobsByRootsRequest(BlockingFn),
DataColumnsByRootsRequest(BlockingFn),
@@ -483,6 +485,8 @@ pub enum WorkType {
Status,
BlocksByRangeRequest,
BlocksByRootsRequest,
PayloadEnvelopesByRangeRequest,
PayloadEnvelopesByRootRequest,
BlobsByRangeRequest,
BlobsByRootsRequest,
DataColumnsByRootsRequest,
@@ -542,6 +546,8 @@ impl<E: EthSpec> Work<E> {
Work::Status(_) => WorkType::Status,
Work::BlocksByRangeRequest(_) => WorkType::BlocksByRangeRequest,
Work::BlocksByRootsRequest(_) => WorkType::BlocksByRootsRequest,
Work::PayloadEnvelopesByRangeRequest(_) => WorkType::PayloadEnvelopesByRangeRequest,
Work::PayloadEnvelopesByRootRequest(_) => WorkType::PayloadEnvelopesByRootRequest,
Work::BlobsByRangeRequest(_) => WorkType::BlobsByRangeRequest,
Work::BlobsByRootsRequest(_) => WorkType::BlobsByRootsRequest,
Work::DataColumnsByRootsRequest(_) => WorkType::DataColumnsByRootsRequest,
@@ -991,6 +997,12 @@ impl<E: EthSpec> BeaconProcessor<E> {
Some(item)
} else if let Some(item) = work_queues.dcbrange_queue.pop() {
Some(item)
} else if let Some(item) = work_queues.payload_envelopes_brange_queue.pop()
{
Some(item)
} else if let Some(item) = work_queues.payload_envelopes_broots_queue.pop()
{
Some(item)
// Check slashings after all other consensus messages so we prioritize
// following head.
//
@@ -1180,6 +1192,12 @@ impl<E: EthSpec> BeaconProcessor<E> {
Work::BlocksByRootsRequest { .. } => {
work_queues.block_broots_queue.push(work, work_id)
}
Work::PayloadEnvelopesByRangeRequest { .. } => work_queues
.payload_envelopes_brange_queue
.push(work, work_id),
Work::PayloadEnvelopesByRootRequest { .. } => work_queues
.payload_envelopes_broots_queue
.push(work, work_id),
Work::BlobsByRangeRequest { .. } => {
work_queues.blob_brange_queue.push(work, work_id)
}
@@ -1296,6 +1314,12 @@ impl<E: EthSpec> BeaconProcessor<E> {
WorkType::Status => work_queues.status_queue.len(),
WorkType::BlocksByRangeRequest => work_queues.block_brange_queue.len(),
WorkType::BlocksByRootsRequest => work_queues.block_broots_queue.len(),
WorkType::PayloadEnvelopesByRangeRequest => {
work_queues.payload_envelopes_brange_queue.len()
}
WorkType::PayloadEnvelopesByRootRequest => {
work_queues.payload_envelopes_broots_queue.len()
}
WorkType::BlobsByRangeRequest => work_queues.blob_brange_queue.len(),
WorkType::BlobsByRootsRequest => work_queues.blob_broots_queue.len(),
WorkType::DataColumnsByRootsRequest => work_queues.dcbroots_queue.len(),
@@ -1487,9 +1511,10 @@ impl<E: EthSpec> BeaconProcessor<E> {
| Work::DataColumnsByRangeRequest(process_fn) => {
task_spawner.spawn_blocking(process_fn)
}
Work::BlocksByRangeRequest(work) | Work::BlocksByRootsRequest(work) => {
task_spawner.spawn_async(work)
}
Work::BlocksByRangeRequest(work)
| Work::BlocksByRootsRequest(work)
| Work::PayloadEnvelopesByRangeRequest(work)
| Work::PayloadEnvelopesByRootRequest(work) => task_spawner.spawn_async(work),
Work::ChainSegmentBackfill(process_fn) => {
if self.config.enable_backfill_rate_limiting {
task_spawner.spawn_blocking_with_rayon(RayonPoolType::LowPriority, process_fn)

12
beacon_node/beacon_processor/src/scheduler/work_queue.rs
View File

@@ -135,6 +135,8 @@ pub struct BeaconProcessorQueueLengths {
blob_brange_queue: usize,
dcbroots_queue: usize,
dcbrange_queue: usize,
payload_envelopes_brange_queue: usize,
payload_envelopes_broots_queue: usize,
gossip_bls_to_execution_change_queue: usize,
gossip_execution_payload_queue: usize,
gossip_execution_payload_bid_queue: usize,
@@ -206,6 +208,8 @@ impl BeaconProcessorQueueLengths {
blob_brange_queue: 1024,
dcbroots_queue: 1024,
dcbrange_queue: 1024,
payload_envelopes_brange_queue: 1024,
payload_envelopes_broots_queue: 1024,
gossip_bls_to_execution_change_queue: 16384,
// TODO(EIP-7732): verify 1024 is preferable. I used same value as `gossip_block_queue` and `gossip_blob_queue`
gossip_execution_payload_queue: 1024,
@@ -256,6 +260,8 @@ pub struct WorkQueues<E: EthSpec> {
pub status_queue: FifoQueue<Work<E>>,
pub block_brange_queue: FifoQueue<Work<E>>,
pub block_broots_queue: FifoQueue<Work<E>>,
pub payload_envelopes_brange_queue: FifoQueue<Work<E>>,
pub payload_envelopes_broots_queue: FifoQueue<Work<E>>,
pub blob_broots_queue: FifoQueue<Work<E>>,
pub blob_brange_queue: FifoQueue<Work<E>>,
pub dcbroots_queue: FifoQueue<Work<E>>,
@@ -327,6 +333,10 @@ impl<E: EthSpec> WorkQueues<E> {
let blob_brange_queue = FifoQueue::new(queue_lengths.blob_brange_queue);
let dcbroots_queue = FifoQueue::new(queue_lengths.dcbroots_queue);
let dcbrange_queue = FifoQueue::new(queue_lengths.dcbrange_queue);
let payload_envelopes_brange_queue =
FifoQueue::new(queue_lengths.payload_envelopes_brange_queue);
let payload_envelopes_broots_queue =
FifoQueue::new(queue_lengths.payload_envelopes_broots_queue);
let gossip_bls_to_execution_change_queue =
FifoQueue::new(queue_lengths.gossip_bls_to_execution_change_queue);
@@ -387,6 +397,8 @@ impl<E: EthSpec> WorkQueues<E> {
blob_brange_queue,
dcbroots_queue,
dcbrange_queue,
payload_envelopes_brange_queue,
payload_envelopes_broots_queue,
gossip_bls_to_execution_change_queue,
gossip_execution_payload_queue,
gossip_execution_payload_bid_queue,