Only prepare execution payload if there is a registered validator pro…

…posing in the next slot. Add AlwaysPrepareExecutionPayload feature to prepare execution in advance for each slot.
grandinetech · Jun 25, 2024 · 5e65b52 · 5e65b52
1 parent 7c12074
commit 5e65b52
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 2 deletions.
diff --git a/features/src/lib.rs b/features/src/lib.rs
@@ -39,6 +39,7 @@ static FEATURES: [AtomicBool; Feature::CARDINALITY] = [FALSE; Feature::CARDINALI
 )]
 pub enum Feature {
     AlwaysPrepackAttestations,
+    AlwaysPrepareExecutionPayload,
     CacheTargetStates,
     DebugEth1,
     DebugP2p,

diff --git a/grandine-snapshot-tests b/grandine-snapshot-tests
diff --git a/operation_pools/src/attestation_agg_pool/manager.rs b/operation_pools/src/attestation_agg_pool/manager.rs
@@ -1,3 +1,4 @@
+use core::ops::RangeBounds;
 use std::sync::Arc;
 
 use anyhow::{Context, Error, Result};
@@ -15,7 +16,7 @@ use types::{
     config::Config,
     phase0::{
         containers::{Attestation, AttestationData},
-        primitives::{Epoch, ValidatorIndex, H256},
+        primitives::{Epoch, Slot, ValidatorIndex, H256},
     },
     preset::Preset,
 };
@@ -133,6 +134,15 @@ impl<P: Preset, W: Wait> Manager<P, W> {
         });
     }
 
+    pub async fn has_registered_validators_proposing_in_slots(
+        &self,
+        range: impl RangeBounds<Slot> + Send,
+    ) -> bool {
+        self.pool
+            .has_registered_validators_proposing_in_slots(range)
+            .await
+    }
+
     pub fn pack_proposable_attestations(&self) {
         self.spawn_detached(PackProposableAttestationsTask {
             pool: self.pool.clone_arc(),

diff --git a/validator/src/validator.rs b/validator/src/validator.rs
@@ -320,6 +320,13 @@ impl<P: Preset, W: Wait + Sync> Validator<P, W> {
                         }
                     },
                     ValidatorMessage::PrepareExecutionPayload(slot, safe_execution_payload_hash, finalized_execution_payload_hash) => {
+                        let should_prepare_execution_payload = Feature::AlwaysPrepareExecutionPayload.is_enabled()
+                            || self.attestation_agg_pool.has_registered_validators_proposing_in_slots(slot..=slot).await;
+
+                        if !should_prepare_execution_payload {
+                            return Ok(());
+                        }
+
                         let slot_head = self.safe_slot_head(slot).await;
 
                         if let Some(slot_head) = slot_head {