merge with unstable fixes

beacon_node/execution_layer/src/test_utils/handle_rpc.rs

@@ -78,7 +78,7 @@ pub async fn handle_rpc<T: EthSpec>(
             let request: JsonExecutionPayload<T> = get_param(params, 0)?;
 
             // Canned responses set by block hash take priority.
-            if let Some(status) = ctx.get_new_payload_status(&request.block_hash) {
+            if let Some(status) = ctx.get_new_payload_status(&request.block_hash()) {
                 return Ok(serde_json::to_value(JsonPayloadStatusV1::from(status)).unwrap());
             }
 

beacon_node/network/src/beacon_processor/worker/gossip_methods.rs

@@ -706,6 +706,7 @@ impl<T: BeaconChainTypes> Worker<T> {
         block_and_blob: Arc<SignedBeaconBlockAndBlobsSidecar<T::EthSpec>>,
         seen_timestamp: Duration,
     ) {
+        //FIXME
         unimplemented!()
     }
 
@@ -2213,15 +2214,4 @@ impl<T: BeaconChainTypes> Worker<T> {
 
         self.propagate_if_timely(is_timely, message_id, peer_id)
     }
-
-    /// Handle an error whilst verifying a `SignedBlobsSidecar` from the network.
-    fn handle_blobs_verification_failure(
-        &self,
-        peer_id: PeerId,
-        message_id: MessageId,
-        reprocess_tx: Option<mpsc::Sender<ReprocessQueueMessage<T>>>,
-        error: BlobError,
-        seen_timestamp: Duration,
-    ) {
-    }
 }