Merge conflicts'

consensus/fork_choice/src/fork_choice.rs

@@ -1506,6 +1506,11 @@ where
         }
     }
 
+    /// Returns whether the payload envelope has been received for the given block.
+    pub fn is_payload_received(&self, block_root: &Hash256) -> bool {
+        self.proto_array.is_payload_received(block_root)
+    }
+
     /// Returns whether the proposer should extend the execution payload chain of the given block.
     pub fn should_extend_payload(&self, block_root: &Hash256) -> Result<bool, Error<T::Error>> {
         let proposer_boost_root = self.fc_store.proposer_boost_root();