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

filter voluntary exits that conflict w/ parent envelope execution requests

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-04-27 13:55:19 +02:00
parent 6ab48a76f0
commit 4d99d1a3b5
1 changed files with 43 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
beacon_node/beacon_chain/src/block_production/gloas.rs
View File

@@ -1,4 +1,4 @@
use std::collections::HashMap;
use std::collections::{HashMap, HashSet};
use std::marker::PhantomData;
use std::sync::Arc;
@@ -136,6 +136,16 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
graffiti_settings: GraffitiSettings,
verification: ProduceBlockVerification,
) -> Result<BlockProductionResult<T::EthSpec>, BlockProductionError> {
// Extract the parent's execution requests from the envelope (if parent was full).
let parent_execution_requests = if parent_payload_status == PayloadStatus::Full {
parent_envelope
.as_ref()
.map(|env| env.message.execution_requests.clone())
.ok_or(BlockProductionError::MissingParentExecutionPayload)?
} else {
ExecutionRequests::default()
};
// Part 1/3 (blocking)
//
// Perform the state advance and block-packing functions.
@@ -144,6 +154,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
.graffiti_calculator
.get_graffiti(graffiti_settings)
.await;
let parent_execution_requests_ref = parent_execution_requests.clone();
let (partial_beacon_block, state) = self
.task_executor
.spawn_blocking_handle(
@@ -154,6 +165,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
produce_at_slot,
randao_reveal,
graffiti,
&parent_execution_requests_ref,
)
},
"produce_partial_beacon_block_gloas",
@@ -162,16 +174,6 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
.await
.map_err(BlockProductionError::TokioJoin)??;
// Extract the parent's execution requests from the envelope (if parent was full).
let parent_execution_requests = if parent_payload_status == PayloadStatus::Full {
parent_envelope
.as_ref()
.map(|env| env.message.execution_requests.clone())
.ok_or(BlockProductionError::MissingParentExecutionPayload)?
} else {
ExecutionRequests::default()
};
// Part 2/3 (async)
//
// Produce the execution payload bid.
@@ -222,6 +224,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
produce_at_slot: Slot,
randao_reveal: Signature,
graffiti: Graffiti,
parent_execution_requests: &ExecutionRequests<T::EthSpec>,
) -> Result<(PartialBeaconBlock<T::EthSpec>, BeaconState<T::EthSpec>), BlockProductionError>
{
// It is invalid to try to produce a block using a state from a future slot.
@@ -256,6 +259,35 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
let (mut proposer_slashings, mut attester_slashings, mut voluntary_exits) =
self.op_pool.get_slashings_and_exits(&state, &self.spec);
// Filter out voluntary exits that conflict with parent execution requests.
// Parent withdrawal/consolidation requests are processed before voluntary
// exits during block processing (`process_parent_execution_payload` runs
// before `process_operations`) and can initiate validator exits, causing the
// voluntary exit assertion failures.
let mut exited_pubkeys = HashSet::with_capacity(
parent_execution_requests.withdrawals.len()
+ parent_execution_requests.consolidations.len(),
);
for req in &parent_execution_requests.withdrawals {
if req.amount == self.spec.full_exit_request_amount {
exited_pubkeys.insert(req.validator_pubkey);
}
}
for req in &parent_execution_requests.consolidations {
if req.source_pubkey != req.target_pubkey {
exited_pubkeys.insert(req.source_pubkey);
}
}
if !exited_pubkeys.is_empty() {
voluntary_exits.retain(|exit| {
state
.validators()
.get(exit.message.validator_index as usize)
.map(|v| !exited_pubkeys.contains(&v.pubkey))
.unwrap_or(false)
});
}
drop(slashings_and_exits_span);
let eth1_data = state.eth1_data().clone();