Fork choice changes

beacon_node/beacon_chain/src/beacon_chain.rs

@@ -7765,10 +7765,10 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         )
     }
 
-    pub async fn set_unsatisfied_inclusion_list_block(
+    pub async fn record_payload_inclusion_list_satisfaction(
         self: &Arc<Self>,
-        slot: Slot,
         block_root: Hash256,
+        satisfied: bool,
     ) -> Result<(), Error> {
         let chain = self.clone();
         let fork_choice_result = self
@@ -7777,9 +7777,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                     chain
                         .canonical_head
                         .fork_choice_write_lock()
-                        .on_invalid_inclusion_list_payload(slot, block_root)
+                        .record_payload_inclusion_list_satisfaction(block_root, satisfied)
                 },
-                "invalid_inclusion_list_payload",
+                "record_payload_inclusion_list_satisfaction",
             )
             .await;
 
@@ -7787,7 +7787,7 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
         if let Err(e) = fork_choice_result {
             crit!(
                 error = ?e,
-                "Failed to process invalid inclusion list payload"
+                "Failed to record payload inclusion list satisfaction"
             );
         }
 

beacon_node/beacon_chain/src/beacon_fork_choice_store.rs

@@ -146,7 +146,7 @@ pub struct BeaconForkChoiceStore<E: EthSpec, Hot: ItemStore<E>, Cold: ItemStore<
     proposer_boost_root: Hash256,
     equivocating_indices: BTreeSet<u64>,
     inclusion_list_equivocators: HashMap<(Slot, Hash256), BTreeSet<u64>>,
-    unsatisfied_inclusion_list_blocks: HashMap<Slot, Hash256>,
+    payload_inclusion_list_satisfaction: HashMap<Hash256, bool>,
     _phantom: PhantomData<E>,
 }
 
@@ -215,7 +215,7 @@ where
             proposer_boost_root: Hash256::zero(),
             equivocating_indices: BTreeSet::new(),
             inclusion_list_equivocators: HashMap::new(),
-            unsatisfied_inclusion_list_blocks: HashMap::new(),
+            payload_inclusion_list_satisfaction: HashMap::new(),
             _phantom: PhantomData,
         })
     }
@@ -265,7 +265,7 @@ where
             proposer_boost_root: persisted.proposer_boost_root,
             equivocating_indices: persisted.equivocating_indices,
             inclusion_list_equivocators: HashMap::new(),
-            unsatisfied_inclusion_list_blocks: HashMap::new(),
+            payload_inclusion_list_satisfaction: HashMap::new(),
             _phantom: PhantomData,
         })
     }
@@ -385,22 +385,29 @@ where
         self.equivocating_indices.extend(indices);
     }
 
-    fn set_unsatisfied_inclusion_list_block(&mut self, slot: Slot, block_root: Hash256) {
+    fn record_payload_inclusion_list_satisfaction(
+        &mut self,
+        block_root: Hash256,
+        satisfied: bool,
+    ) {
         info!(
-            ?slot,
             %block_root,
-            "Set unsatisfied inclusion list block"
+            satisfied,
+            "Record payload inclusion list satisfaction"
         );
-        self.unsatisfied_inclusion_list_blocks
-            .insert(slot, block_root);
+        self.payload_inclusion_list_satisfaction
+            .insert(block_root, satisfied);
     }
 
-    fn unsatisfied_inclusion_list_block(&self, slot: Slot) -> Option<&Hash256> {
-        self.unsatisfied_inclusion_list_blocks.get(&slot)
+    fn is_payload_inclusion_list_satisfied(&self, block_root: &Hash256) -> bool {
+        self.payload_inclusion_list_satisfaction
+            .get(block_root)
+            .copied()
+            .unwrap_or(false)
     }
 
-    fn unsatisfied_inclusion_list_blocks(&self) -> &HashMap<Slot, Hash256> {
-        &self.unsatisfied_inclusion_list_blocks
+    fn payload_inclusion_list_satisfaction(&self) -> &HashMap<Hash256, bool> {
+        &self.payload_inclusion_list_satisfaction
     }
 }
 

beacon_node/beacon_chain/src/execution_payload.rs

@@ -232,9 +232,9 @@ pub async fn notify_new_payload<T: BeaconChainTypes>(
                             "Unsatisfied inclusion list"
                         );
                         chain
-                            .set_unsatisfied_inclusion_list_block(
-                                block.slot(),
+                            .record_payload_inclusion_list_satisfaction(
                                 block.tree_hash_root(),
+                                false,
                             )
                             .await?;
                     }