Start adding payload prep delay

paulhauner · paulhauner · commit f1e6056319f3 · 2022-03-01T13:24:54.000+11:00
diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -116,6 +116,8 @@ const EARLY_ATTESTER_CACHE_HISTORIC_SLOTS: u64 = 4;
 pub const INVALID_JUSTIFIED_PAYLOAD_SHUTDOWN_REASON: &str =
     "Justified block has an invalid execution payload.";
 
+const PAYLOAD_PREPARATION_LOOKAHEAD_FACTOR: u32 = 3;
+
 /// Defines the behaviour when a block/block-root for a skipped slot is requested.
 pub enum WhenSlotSkipped {
     /// If the slot is a skip slot, return `None`.
@@ -3710,6 +3712,11 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
             .clone()
             .ok_or(Error::ExecutionLayerMissing)?;
 
+        if !execution_layer.has_proposers().await {
+            // Nothing to do if there are no proposers registered with the EL.
+            return Ok(());
+        }
+
         let head = self.head_info()?;
         let head_epoch = head.slot.epoch(T::EthSpec::slots_per_epoch());
         let prepare_slot = self.slot()? + 1;
@@ -3769,8 +3776,25 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                         self.log,
                         "Prepared beacon proposer";
                         "already_known" => already_known,
+                        "prepare_slot" => prepare_slot,
                         "validator" => proposer.index,
                     );
+
+                    if let Some(duration) = self.slot_clock.duration_to_slot(prepare_slot) {
+                        if duration
+                            <= self.slot_clock.slot_duration()
+                                / PAYLOAD_PREPARATION_LOOKAHEAD_FACTOR
+                        {
+                            // TODO(paul): update fork choice.
+                        }
+                    } else {
+                        warn!(
+                            self.log,
+                            "Delayed proposer preparation";
+                            "prepare_slot" => prepare_slot,
+                            "validator" => proposer.index,
+                        );
+                    }
                 }
             } else {
                 debug!(
diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
@@ -371,6 +371,10 @@ impl ExecutionLayer {
         Ok(())
     }
 
+    pub async fn has_proposers(&self) -> bool {
+        !self.proposer_preparation_data().await.is_empty()
+    }
+
     pub async fn has_proposer_preparation_data(&self, proposer_index: u64) -> bool {
         self.proposer_preparation_data()
             .await
