More deneb cleanup (#4640)

* remove protoc and token from network tests github action

* delete unused beacon chain methods

* downgrade writing blobs to store log

* reduce diff in block import logic

* remove some todo's and deneb built in network

* remove unnecessary error, actually use some added metrics

* remove some metrics, fix missing components on publish funcitonality

* fix status tests

* rename sidecar by root to blobs by root

* clean up some metrics

* remove unnecessary feature gate from attestation subnet tests, clean up blobs by range response code

* pawan's suggestion in `protocol_info`, peer score in matching up batch sync block and blobs

* fix range tests for deneb

* pub block and blob db cache behind the same mutex

* remove unused errs and an empty file

* move sidecar trait to new file

* move types from payload to eth2 crate

* update comment and add flag value name

* make function private again, remove allow unused

* use reth rlp for tx decoding

* fix compile after merge

* rename kzg commitments

* cargo fmt

* remove unused dep

* Update beacon_node/execution_layer/src/lib.rs

Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>

* Update beacon_node/beacon_processor/src/lib.rs

Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>

* pawan's suggestiong for vec capacity

* cargo fmt

* Revert "use reth rlp for tx decoding"

This reverts commit 5181837d81.

* remove reth rlp

---------

Co-authored-by: Pawan Dhananjay <pawandhananjay@gmail.com>

beacon_node/execution_layer/src/lib.rs

@@ -15,7 +15,6 @@ use engines::{Engine, EngineError};
 pub use engines::{EngineState, ForkchoiceState};
 use eth2::types::{builder_bid::SignedBuilderBid, BlobsBundle, ForkVersionedResponse};
 use eth2::types::{FullPayloadContents, SignedBlockContents};
-use ethers_core::abi::ethereum_types::FromStrRadixErr;
 use ethers_core::types::Transaction as EthersTransaction;
 use fork_choice::ForkchoiceUpdateParameters;
 use lru::LruCache;
@@ -40,14 +39,14 @@ use tokio::{
 };
 use tokio_stream::wrappers::WatchStream;
 use tree_hash::TreeHash;
-use types::beacon_block_body::KzgCommitments;
-use types::blob_sidecar::BlobItems;
+use types::beacon_block_body::{to_block_kzg_commitments, BlockBodyKzgCommitments};
 use types::builder_bid::BuilderBid;
+use types::sidecar::{BlobItems, Sidecar};
+use types::KzgProofs;
 use types::{
     AbstractExecPayload, BeaconStateError, BlindedPayload, BlockType, ChainSpec, Epoch,
     ExecPayload, ExecutionPayloadCapella, ExecutionPayloadDeneb, ExecutionPayloadMerge,
 };
-use types::{KzgProofs, Sidecar};
 use types::{ProposerPreparationData, PublicKeyBytes, Signature, Slot, Transaction};
 
 mod block_hash;
@@ -111,7 +110,9 @@ impl<E: EthSpec, Payload: AbstractExecPayload<E>> TryFrom<BuilderBid<E>>
                     .try_into()
                     .map_err(|_| Error::InvalidPayloadConversion)?,
                 block_value: builder_bid.value,
-                kzg_commitments: builder_bid.blinded_blobs_bundle.commitments,
+                kzg_commitments: to_block_kzg_commitments::<E>(
+                    builder_bid.blinded_blobs_bundle.commitments,
+                ),
                 blobs: BlobItems::try_from_blob_roots(builder_bid.blinded_blobs_bundle.blob_roots)
                     .map_err(Error::InvalidBlobConversion)?,
                 proofs: builder_bid.blinded_blobs_bundle.proofs,
@@ -167,7 +168,7 @@ pub enum BlockProposalContents<T: EthSpec, Payload: AbstractExecPayload<T>> {
     PayloadAndBlobs {
         payload: Payload,
         block_value: Uint256,
-        kzg_commitments: KzgCommitments<T>,
+        kzg_commitments: BlockBodyKzgCommitments<T>,
         blobs: <Payload::Sidecar as Sidecar<T>>::BlobItems,
         proofs: KzgProofs<T>,
     },
@@ -184,7 +185,7 @@ impl<E: EthSpec, Payload: AbstractExecPayload<E>> TryFrom<GetPayloadResponse<E>>
             Some(bundle) => Ok(Self::PayloadAndBlobs {
                 payload: execution_payload.into(),
                 block_value,
-                kzg_commitments: bundle.commitments,
+                kzg_commitments: to_block_kzg_commitments::<E>(bundle.commitments),
                 blobs: BlobItems::try_from_blobs(bundle.blobs)
                     .map_err(Error::InvalidBlobConversion)?,
                 proofs: bundle.proofs,
@@ -203,7 +204,7 @@ impl<T: EthSpec, Payload: AbstractExecPayload<T>> BlockProposalContents<T, Paylo
         self,
     ) -> (
         Payload,
-        Option<KzgCommitments<T>>,
+        Option<BlockBodyKzgCommitments<T>>,
         Option<<Payload::Sidecar as Sidecar<T>>::BlobItems>,
         Option<KzgProofs<T>>,
     ) {
@@ -1792,10 +1793,10 @@ impl<T: EthSpec> ExecutionLayer<T> {
             VariableList::new(
                 transactions
                     .into_iter()
-                    .map(ethers_tx_to_ssz::<T>)
-                    .collect::<Result<Vec<_>, BlobTxConversionError>>()?,
+                    .map(|tx| VariableList::new(tx.rlp().to_vec()))
+                    .collect::<Result<Vec<_>, ssz_types::Error>>()?,
             )
-            .map_err(BlobTxConversionError::SszError)
+            .map_err(ApiError::SszError)
         };
 
         let payload = match block {
@@ -2142,81 +2143,12 @@ fn timestamp_now() -> u64 {
         .as_secs()
 }
 
-#[derive(Debug)]
-pub enum BlobTxConversionError {
-    /// The transaction type was not set.
-    NoTransactionType,
-    /// The transaction chain ID was not set.
-    NoChainId,
-    /// The transaction nonce was too large to fit in a `u64`.
-    NonceTooLarge,
-    /// The transaction gas was too large to fit in a `u64`.
-    GasTooHigh,
-    /// Missing the `max_fee_per_gas` field.
-    MaxFeePerGasMissing,
-    /// Missing the `max_priority_fee_per_gas` field.
-    MaxPriorityFeePerGasMissing,
-    /// Missing the `access_list` field.
-    AccessListMissing,
-    /// Missing the `max_fee_per_data_gas` field.
-    MaxFeePerDataGasMissing,
-    /// Missing the `versioned_hashes` field.
-    VersionedHashesMissing,
-    /// `y_parity` field was greater than one.
-    InvalidYParity,
-    /// There was an error converting the transaction to SSZ.
-    SszError(ssz_types::Error),
-    /// There was an error converting the transaction from JSON.
-    SerdeJson(serde_json::Error),
-    /// There was an error converting the transaction from hex.
-    FromHex(String),
-    /// There was an error converting the transaction from hex.
-    FromStrRadix(FromStrRadixErr),
-    /// A `versioned_hash` did not contain 32 bytes.
-    InvalidVersionedHashBytesLen,
-}
-
-impl From<ssz_types::Error> for BlobTxConversionError {
-    fn from(value: ssz_types::Error) -> Self {
-        Self::SszError(value)
-    }
-}
-
-impl From<serde_json::Error> for BlobTxConversionError {
-    fn from(value: serde_json::Error) -> Self {
-        Self::SerdeJson(value)
-    }
-}
-
-fn random_valid_tx<T: EthSpec>(
-) -> Result<Transaction<T::MaxBytesPerTransaction>, BlobTxConversionError> {
-    // Calculate transaction bytes. We don't care about the contents of the transaction.
-    let transaction: EthersTransaction = serde_json::from_str(
-        r#"{
-            "blockHash":"0x1d59ff54b1eb26b013ce3cb5fc9dab3705b415a67127a003c3e61eb445bb8df2",
-            "blockNumber":"0x5daf3b",
-            "from":"0xa7d9ddbe1f17865597fbd27ec712455208b6b76d",
-            "gas":"0xc350",
-            "gasPrice":"0x4a817c800",
-            "hash":"0x88df016429689c079f3b2f6ad39fa052532c56795b733da78a91ebe6a713944b",
-            "input":"0x68656c6c6f21",
-            "nonce":"0x15",
-            "to":"0xf02c1c8e6114b1dbe8937a39260b5b0a374432bb",
-            "transactionIndex":"0x41",
-            "value":"0xf3dbb76162000",
-            "v":"0x25",
-            "r":"0x1b5e176d927f8e9ab405058b2d2457392da3e20f328b16ddabcebc33eaac5fea",
-            "s":"0x4ba69724e8f69de52f0125ad8b3c5c2cef33019bac3249e2c0a2192766d1721c"
-         }"#,
-    )
-    .unwrap();
-    ethers_tx_to_ssz::<T>(transaction)
-}
-
-fn ethers_tx_to_ssz<T: EthSpec>(
-    tx: EthersTransaction,
-) -> Result<Transaction<T::MaxBytesPerTransaction>, BlobTxConversionError> {
-    VariableList::new(tx.rlp().to_vec()).map_err(Into::into)
+fn static_valid_tx<T: EthSpec>() -> Result<Transaction<T::MaxBytesPerTransaction>, String> {
+    // This is a real transaction hex encoded, but we don't care about the contents of the transaction.
+    let bytes = hex::decode(
+        "b87502f872041a8459682f008459682f0d8252089461815774383099e24810ab832a5b2a5425c154d58829a2241af62c000080c001a059e6b67f48fb32e7e570dfb11e042b5ad2e55e3ce3ce9cd989c7e06e07feeafda0016b83f4f980694ed2eee4d10667242b1f40dc406901b34125b008d334d47469"
+    ).map_err(|e| format!("Failed to decode transaction bytes: {:?}", e))?;
+    VariableList::new(bytes).map_err(|e| format!("Failed to convert transaction to SSZ: {:?}", e))
 }
 
 fn noop<T: EthSpec>(