Skip bids from builders exited by the parent payload during block production ethereum/consensus-specs#5580

Author: eserilev

beacon_node/beacon_chain/src/block_production/gloas.rs

@@ -46,7 +46,9 @@ use sensitive_url::SensitiveUrl;
 use crate::block_production::bid_selection::{self, BidCandidate, BidSource, ExecutionPayloadData};
 use crate::payload_bid_verification::PayloadBidError;
 use crate::payload_bid_verification::direct_verified_bid::verify_direct_bid;
-use crate::payload_bid_verification::gossip_verified_bid::verify_bid_state_conditions;
+use crate::payload_bid_verification::gossip_verified_bid::{
+    builder_exit_requested, verify_bid_state_conditions,
+};
 use crate::payload_bid_verification::payload_bid_cache::BidParent;
 use crate::pending_payload_envelopes::PendingEnvelopeData;
 use crate::{
@@ -292,6 +294,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             &builder_config,
             proposer_preferences.as_deref(),
             &state,
+            &parent_execution_requests,
         );
         let local_fut = self.clone().produce_execution_payload_bid(
             &state,
@@ -1019,6 +1022,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         builder_config: &BuilderConfig,
         proposer_preferences: Option<&SignedProposerPreferences>,
         state: &BeaconState<T::EthSpec>,
+        parent_execution_requests: &ExecutionRequestsGloas<T::EthSpec>,
     ) -> Vec<BidCandidate<T::EthSpec>> {
         let mut externals = Vec::new();
 
@@ -1073,6 +1077,22 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             }
         }
 
+        // The parent's exit requests apply to the state before this block's bid is processed, so a
+        // bid from a builder the parent payload exits fails `process_execution_payload_bid`.
+        externals.retain(|candidate| {
+            let builder_index = candidate.signed_bid.message.builder_index;
+            let exit_requested = state
+                .get_builder(builder_index)
+                .is_ok_and(|builder| builder_exit_requested(builder, parent_execution_requests));
+            if exit_requested {
+                warn!(
+                    builder_index,
+                    "Skipping bid from a builder the parent payload exits"
+                );
+            }
+            !exit_requested
+        });
+
         externals
     }
 

beacon_node/beacon_chain/src/payload_bid_verification/gossip_verified_bid.rs

@@ -19,8 +19,9 @@ use state_processing::signature_sets::{
 };
 use tracing::debug;
 use types::{
-    BeaconState, ChainSpec, EthSpec, ExecutionPayloadBid, SignedExecutionPayloadBid,
-    SignedProposerPreferences, Slot, consts::gloas::PAYLOAD_BUILDER_VERSION,
+    BeaconState, Builder, ChainSpec, EthSpec, ExecutionPayloadBid, ExecutionRequestsGloas,
+    SignedExecutionPayloadBid, SignedProposerPreferences, Slot,
+    consts::gloas::PAYLOAD_BUILDER_VERSION,
 };
 
 pub(crate) fn verify_bid_slot(bid_slot: Slot, current_slot: Slot) -> Result<(), PayloadBidError> {
@@ -156,14 +157,19 @@ pub(crate) fn parent_payload_exits_builder<T: BeaconChainTypes>(
             parent_block_hash: bid.parent_block_hash,
         })?;
 
-    Ok(parent_envelope
-        .message
-        .execution_requests
-        .builder_exits
-        .iter()
-        .any(|request| {
-            request.pubkey == builder.pubkey && request.source_address == builder.execution_address
-        }))
+    Ok(builder_exit_requested(
+        builder,
+        &parent_envelope.message.execution_requests,
+    ))
+}
+
+pub(crate) fn builder_exit_requested<E: EthSpec>(
+    builder: &Builder,
+    execution_requests: &ExecutionRequestsGloas<E>,
+) -> bool {
+    execution_requests.builder_exits.iter().any(|request| {
+        request.pubkey == builder.pubkey && request.source_address == builder.execution_address
+    })
 }
 
 /// Checks if `bid` is compatible with the head branch