Clean capella (#4019)

## Issue Addressed

Cleans up all the remnants of 4844 in capella. This makes sure when 4844 is reviewed there is nothing we are missing because it got included here 

## Proposed Changes

drop a bomb on every 4844 thing 

## Additional Info

Merge process I did (locally) is as follows:
- squash merge to produce one commit
- in new branch off unstable with the squashed commit create a `git revert HEAD` commit
- merge that new branch onto 4844 with `--strategy ours`
- compare local 4844 to remote 4844 and make sure the diff is empty
- enjoy

Co-authored-by: Paul Hauner <paul@paulhauner.com>

beacon_node/http_api/src/lib.rs

@@ -1123,9 +1123,7 @@ pub fn serve<T: BeaconChainTypes>(
              chain: Arc<BeaconChain<T>>,
              network_tx: UnboundedSender<NetworkMessage<T::EthSpec>>,
              log: Logger| async move {
-                // need to have cached the blob sidecar somewhere in the beacon chain
-                // to publish
-                publish_blocks::publish_block(None, block, None, chain, &network_tx, log)
+                publish_blocks::publish_block(None, block, chain, &network_tx, log)
                     .await
                     .map(|()| warp::reply())
             },

beacon_node/http_api/src/metrics.rs

@@ -41,16 +41,4 @@ lazy_static::lazy_static! {
         "http_api_block_published_very_late_total",
         "The count of times a block was published beyond the attestation deadline"
     );
-    pub static ref HTTP_API_BLOB_BROADCAST_DELAY_TIMES: Result<Histogram> = try_create_histogram(
-        "http_api_blob_broadcast_delay_times",
-        "Time between start of the slot and when the blob was broadcast"
-    );
-    pub static ref HTTP_API_BLOB_PUBLISHED_LATE_TOTAL: Result<IntCounter> = try_create_int_counter(
-        "http_api_blob_published_late_total",
-        "The count of times a blob was published beyond more than half way to the attestation deadline"
-    );
-    pub static ref HTTP_API_BLOB_PUBLISHED_VERY_LATE_TOTAL: Result<IntCounter> = try_create_int_counter(
-        "http_api_blob_published_very_late_total",
-        "The count of times a blob was published beyond the attestation deadline"
-    );
 }

beacon_node/http_api/src/publish_blocks.rs

@@ -3,7 +3,7 @@ use beacon_chain::validator_monitor::{get_block_delay_ms, timestamp_now};
 use beacon_chain::{
     BeaconChain, BeaconChainTypes, BlockError, CountUnrealized, NotifyExecutionLayer,
 };
-use lighthouse_network::{PubsubMessage, SignedBeaconBlockAndBlobsSidecar};
+use lighthouse_network::PubsubMessage;
 use network::NetworkMessage;
 use slog::{debug, error, info, warn, Logger};
 use slot_clock::SlotClock;
@@ -11,8 +11,8 @@ use std::sync::Arc;
 use tokio::sync::mpsc::UnboundedSender;
 use tree_hash::TreeHash;
 use types::{
-    AbstractExecPayload, BlindedPayload, BlobsSidecar, EthSpec, ExecPayload, ExecutionBlockHash,
-    FullPayload, Hash256, SignedBeaconBlock,
+    AbstractExecPayload, BlindedPayload, EthSpec, ExecPayload, ExecutionBlockHash, FullPayload,
+    Hash256, SignedBeaconBlock,
 };
 use warp::Rejection;
 
@@ -20,7 +20,6 @@ use warp::Rejection;
 pub async fn publish_block<T: BeaconChainTypes>(
     block_root: Option<Hash256>,
     block: Arc<SignedBeaconBlock<T::EthSpec>>,
-    blobs_sidecar: Option<Arc<BlobsSidecar<T::EthSpec>>>,
     chain: Arc<BeaconChain<T>>,
     network_tx: &UnboundedSender<NetworkMessage<T::EthSpec>>,
     log: Logger,
@@ -36,22 +35,7 @@ pub async fn publish_block<T: BeaconChainTypes>(
     // Send the block, regardless of whether or not it is valid. The API
     // specification is very clear that this is the desired behaviour.
 
-    let message = match &*block {
-        SignedBeaconBlock::Eip4844(block) => {
-            if let Some(sidecar) = blobs_sidecar {
-                PubsubMessage::BeaconBlockAndBlobsSidecars(Arc::new(
-                    SignedBeaconBlockAndBlobsSidecar {
-                        beacon_block: block.clone(),
-                        blobs_sidecar: (*sidecar).clone(),
-                    },
-                ))
-            } else {
-                //TODO(pawan): return an empty sidecar instead
-                return Err(warp_utils::reject::broadcast_without_import(String::new()));
-            }
-        }
-        _ => PubsubMessage::BeaconBlock(block.clone()),
-    };
+    let message = PubsubMessage::BeaconBlock(block.clone());
     crate::publish_pubsub_message(network_tx, message)?;
 
     // Determine the delay after the start of the slot, register it with metrics.
@@ -166,7 +150,6 @@ pub async fn publish_blinded_block<T: BeaconChainTypes>(
     publish_block::<T>(
         Some(block_root),
         Arc::new(full_block),
-        None,
         chain,
         network_tx,
         log,