From 3533ed418e595a4d30555912080b7d24e0b323ec Mon Sep 17 00:00:00 2001
From: realbigsean <seananderson33@gmail.com>
Date: Tue, 7 Feb 2023 08:36:35 -0500
Subject: [PATCH] pr feedback and bugfixes

---
 beacon_node/execution_layer/src/lib.rs | 9 +++++----
 consensus/types/src/transaction.rs     | 7 -------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/beacon_node/execution_layer/src/lib.rs b/beacon_node/execution_layer/src/lib.rs
index 64d46d4852..5e574cf0f9 100644
--- a/beacon_node/execution_layer/src/lib.rs
+++ b/beacon_node/execution_layer/src/lib.rs
@@ -1949,7 +1949,7 @@ pub enum BlobTxConversionError {
     AccessListMissing,
     /// Missing the `max_fee_per_data_gas` field.
     MaxFeePerDataGasMissing,
-    /// Missing the `max_data_gas` field.
+    /// Missing the `blob_versioned_hashes` field.
     BlobVersionedHashesMissing,
     /// There was an error converting the transaction to SSZ.
     SszError(ssz_types::Error),
@@ -2019,7 +2019,7 @@ fn ethers_tx_to_bytes<T: EthSpec>(
         )?;
         let max_fee_per_data_gas = transaction
             .other
-            .get("max_fee_per_data_gas")
+            .get("maxFeePerDataGas")
             .ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)?
             .as_str()
             .ok_or(BlobTxConversionError::MaxFeePerDataGasMissing)?
@@ -2028,7 +2028,7 @@ fn ethers_tx_to_bytes<T: EthSpec>(
         let blob_versioned_hashes = serde_json::from_str(
             transaction
                 .other
-                .get("blob_versioned_hashes")
+                .get("blobVersionedHashes")
                 .ok_or(BlobTxConversionError::BlobVersionedHashesMissing)?
                 .as_str()
                 .ok_or(BlobTxConversionError::BlobVersionedHashesMissing)?,
@@ -2045,7 +2045,8 @@ fn ethers_tx_to_bytes<T: EthSpec>(
             access_list,
             max_fee_per_data_gas,
             blob_versioned_hashes,
-        }.as_ssz_bytes()
+        }
+        .as_ssz_bytes()
     } else {
         transaction.rlp().to_vec()
     };
diff --git a/consensus/types/src/transaction.rs b/consensus/types/src/transaction.rs
index 73dee84ad3..797ee1dae6 100644
--- a/consensus/types/src/transaction.rs
+++ b/consensus/types/src/transaction.rs
@@ -29,10 +29,3 @@ pub struct AccessTuple {
     pub address: Address,
     pub storage_keys: VariableList<Hash256, MaxAccessListStorageKeys>,
 }
-
-#[derive(Debug, Clone, PartialEq, Encode, Decode)]
-pub struct EcdsaSignature {
-    y_parity: bool,
-    r: Uint256,
-    s: Uint256,
-}