get tests passing

consensus/types/src/beacon_state.rs

@@ -486,7 +486,11 @@ where
     // Electra
     #[superstruct(only(Electra), partial_getter(copy))]
     #[metastruct(exclude_from(tree_lists))]
-    #[serde(with = "serde_utils::quoted_u64")]
+    #[serde(
+        with = "serde_utils::quoted_u64",
+    //TODO(electra) remove alias when ef tests are updated
+        alias = "deposit_receipts_start_index"
+    )]
     pub deposit_requests_start_index: u64,
     #[superstruct(only(Electra), partial_getter(copy))]
     #[metastruct(exclude_from(tree_lists))]

consensus/types/src/deposit_receipt.rs

@@ -1,37 +0,0 @@
-use crate::test_utils::TestRandom;
-use crate::{Hash256, PublicKeyBytes, Signature};
-use serde::{Deserialize, Serialize};
-use ssz_derive::{Decode, Encode};
-use test_random_derive::TestRandom;
-use tree_hash_derive::TreeHash;
-
-#[derive(
-    arbitrary::Arbitrary,
-    Debug,
-    PartialEq,
-    Eq,
-    Hash,
-    Clone,
-    Serialize,
-    Deserialize,
-    Encode,
-    Decode,
-    TreeHash,
-    TestRandom,
-)]
-pub struct DepositRequest {
-    pub pubkey: PublicKeyBytes,
-    pub withdrawal_credentials: Hash256,
-    #[serde(with = "serde_utils::quoted_u64")]
-    pub amount: u64,
-    pub signature: Signature,
-    #[serde(with = "serde_utils::quoted_u64")]
-    pub index: u64,
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-
-    ssz_and_tree_hash_tests!(DepositRequest);
-}

consensus/types/src/execution_payload.rs

@@ -94,6 +94,8 @@ pub struct ExecutionPayload<E: EthSpec> {
     #[serde(with = "serde_utils::quoted_u64")]
     pub excess_blob_gas: u64,
     #[superstruct(only(Electra))]
+    //TODO(electra) remove alias once EF tests are updates with correct name
+    #[serde(alias = "deposit_receipts")]
     pub deposit_requests: VariableList<DepositRequest, E::MaxDepositRequestsPerPayload>,
     #[superstruct(only(Electra))]
     pub withdrawal_requests:

consensus/types/src/execution_payload_header.rs

@@ -86,7 +86,9 @@ pub struct ExecutionPayloadHeader<E: EthSpec> {
     #[serde(with = "serde_utils::quoted_u64")]
     pub excess_blob_gas: u64,
     #[superstruct(only(Electra), partial_getter(copy))]
-    pub deposit_receipts_root: Hash256,
+    //TODO(electra) remove alias once EF tests are updates with correct name
+    #[serde(alias = "deposit_receipts_root")]
+    pub deposit_requests_root: Hash256,
     #[superstruct(only(Electra), partial_getter(copy))]
     pub withdrawal_requests_root: Hash256,
 }
@@ -202,7 +204,7 @@ impl<E: EthSpec> ExecutionPayloadHeaderDeneb<E> {
             withdrawals_root: self.withdrawals_root,
             blob_gas_used: self.blob_gas_used,
             excess_blob_gas: self.excess_blob_gas,
-            deposit_receipts_root: Hash256::zero(),
+            deposit_requests_root: Hash256::zero(),
             withdrawal_requests_root: Hash256::zero(),
         }
     }
@@ -295,7 +297,7 @@ impl<'a, E: EthSpec> From<&'a ExecutionPayloadElectra<E>> for ExecutionPayloadHe
             withdrawals_root: payload.withdrawals.tree_hash_root(),
             blob_gas_used: payload.blob_gas_used,
             excess_blob_gas: payload.excess_blob_gas,
-            deposit_receipts_root: payload.deposit_requests.tree_hash_root(),
+            deposit_requests_root: payload.deposit_requests.tree_hash_root(),
             withdrawal_requests_root: payload.withdrawal_requests.tree_hash_root(),
         }
     }

consensus/types/src/lib.rs

@@ -33,7 +33,7 @@ pub mod contribution_and_proof;
 pub mod deposit;
 pub mod deposit_data;
 pub mod deposit_message;
-pub mod deposit_receipt;
+pub mod deposit_request;
 pub mod deposit_tree_snapshot;
 pub mod enr_fork_id;
 pub mod eth1_data;
@@ -150,7 +150,7 @@ pub use crate::contribution_and_proof::ContributionAndProof;
 pub use crate::deposit::{Deposit, DEPOSIT_TREE_DEPTH};
 pub use crate::deposit_data::DepositData;
 pub use crate::deposit_message::DepositMessage;
-pub use crate::deposit_receipt::DepositRequest;
+pub use crate::deposit_request::DepositRequest;
 pub use crate::deposit_tree_snapshot::{DepositTreeSnapshot, FinalizedExecutionBlock};
 pub use crate::enr_fork_id::EnrForkId;
 pub use crate::epoch_cache::{EpochCache, EpochCacheError, EpochCacheKey};