sigp
diff --git a/‎beacon_node/beacon_chain/src/eth1_chain.rs‎
Lines changed: 2 additions & 2 deletions b/‎beacon_node/beacon_chain/src/eth1_chain.rs‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎consensus/state_processing/src/common/initiate_validator_exit.rs‎
Lines changed: 1 addition & 1 deletion b/‎consensus/state_processing/src/common/initiate_validator_exit.rs‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎consensus/state_processing/src/genesis.rs‎
Lines changed: 3 additions & 2 deletions b/‎consensus/state_processing/src/genesis.rs‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎consensus/state_processing/src/per_epoch_processing/single_pass.rs‎
Lines changed: 7 additions & 0 deletions b/‎consensus/state_processing/src/per_epoch_processing/single_pass.rs‎
Lines changed: 7 additions & 0 deletions
diff --git a/‎consensus/state_processing/src/upgrade/electra.rs‎
Lines changed: 57 additions & 40 deletions b/‎consensus/state_processing/src/upgrade/electra.rs‎
Lines changed: 57 additions & 40 deletions
diff --git a/‎consensus/types/src/beacon_state.rs‎
Lines changed: 11 additions & 1 deletion b/‎consensus/types/src/beacon_state.rs‎
Lines changed: 11 additions & 1 deletion
diff --git a/‎consensus/types/src/chain_spec.rs‎
Lines changed: 8 additions & 0 deletions b/‎consensus/types/src/chain_spec.rs‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎consensus/types/src/deposit_receipt.rs‎ renamed to ‎consensus/types/src/deposit_request.rs‎ b/‎consensus/types/src/deposit_receipt.rs‎ renamed to ‎consensus/types/src/deposit_request.rs‎
diff --git a/‎consensus/types/src/execution_payload.rs‎
Lines changed: 2 additions & 0 deletions b/‎consensus/types/src/execution_payload.rs‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎consensus/types/src/execution_payload_header.rs‎
Lines changed: 5 additions & 3 deletions b/‎consensus/types/src/execution_payload_header.rs‎
Lines changed: 5 additions & 3 deletions
@@ -548,8 +548,8 @@ impl<E: EthSpec> Eth1ChainBackend<E> for CachingEth1Backend<E> {
 
         // [New in Electra:EIP6110]
         let deposit_index_limit =
-            if let Ok(deposit_receipts_start_index) = state.deposit_requests_start_index() {
-                std::cmp::min(deposit_count, deposit_receipts_start_index)
+            if let Ok(deposit_requests_start_index) = state.deposit_requests_start_index() {
+                std::cmp::min(deposit_count, deposit_requests_start_index)
             } else {
                 deposit_count
             };
 
@@ -20,7 +20,7 @@ pub fn initiate_validator_exit<E: EthSpec>(
 
     // Compute exit queue epoch
     let exit_queue_epoch = if state.fork_name_unchecked() >= ForkName::Electra {
-        let effective_balance = state.get_validator(index)?.effective_balance;
+        let effective_balance = state.get_effective_balance(index)?;
         state.compute_exit_epoch_and_update_churn(effective_balance, spec)?
     } else {
         let delayed_epoch = state.compute_activation_exit_epoch(state.current_epoch(), spec)?;
 
@@ -2,9 +2,9 @@ use super::per_block_processing::{
     errors::BlockProcessingError, process_operations::apply_deposit,
 };
 use crate::common::DepositDataTree;
+use crate::upgrade::electra::upgrade_state_to_electra;
 use crate::upgrade::{
     upgrade_to_altair, upgrade_to_bellatrix, upgrade_to_capella, upgrade_to_deneb,
-    upgrade_to_electra,
 };
 use safe_arith::{ArithError, SafeArith};
 use tree_hash::TreeHash;
@@ -116,7 +116,8 @@ pub fn initialize_beacon_state_from_eth1<E: EthSpec>(
         .electra_fork_epoch
         .map_or(false, |fork_epoch| fork_epoch == E::genesis_epoch())
     {
-        upgrade_to_electra(&mut state, spec)?;
+        let post = upgrade_state_to_electra(&mut state, Epoch::new(0), Epoch::new(0), spec)?;
+        state = post;
 
         // Remove intermediate Deneb fork from `state.fork`.
         state.fork_mut().previous_version = spec.electra_fork_version;
 
@@ -359,6 +359,7 @@ pub fn process_epoch_single_pass<E: EthSpec>(
             state,
             &mut next_epoch_cache,
             effective_balances_ctxt,
+            conf.effective_balance_updates,
             state_ctxt,
             spec,
         )?;
@@ -859,6 +860,7 @@ fn process_pending_consolidations<E: EthSpec>(
     state: &mut BeaconState<E>,
     next_epoch_cache: &mut PreEpochCache,
     effective_balances_ctxt: &EffectiveBalancesContext,
+    perform_effective_balance_updates: bool,
     state_ctxt: &StateContext,
     spec: &ChainSpec,
 ) -> Result<(), Error> {
@@ -910,6 +912,11 @@ fn process_pending_consolidations<E: EthSpec>(
     )?;
     *state.pending_consolidations_mut()? = new_pending_consolidations;
 
+    // the spec tests require we don't perform effective balance updates when testing pending_consolidations
+    if !perform_effective_balance_updates {
+        return Ok(());
+    }
+
     // Re-process effective balance updates for validators affected by consolidations.
     let (validators, balances, _, current_epoch_participation, _, progressive_balances, _, _) =
         state.mutable_validator_fields()?;
 
@@ -1,8 +1,8 @@
 use safe_arith::SafeArith;
 use std::mem;
 use types::{
-    BeaconState, BeaconStateElectra, BeaconStateError as Error, ChainSpec, EpochCache, EthSpec,
-    Fork,
+    BeaconState, BeaconStateElectra, BeaconStateError as Error, ChainSpec, Epoch, EpochCache,
+    EthSpec, Fork,
 };
 
 /// Transform a `Deneb` state into an `Electra` state.
@@ -26,13 +26,66 @@ pub fn upgrade_to_electra<E: EthSpec>(
     pre_state.build_total_active_balance_cache(spec)?;
     let earliest_consolidation_epoch = spec.compute_activation_exit_epoch(epoch)?;
 
+    let mut post = upgrade_state_to_electra(
+        pre_state,
+        earliest_exit_epoch,
+        earliest_consolidation_epoch,
+        spec,
+    )?;
+
+    *post.exit_balance_to_consume_mut()? = post.get_activation_exit_churn_limit(spec)?;
+    *post.consolidation_balance_to_consume_mut()? = post.get_consolidation_churn_limit(spec)?;
+
+    // Add validators that are not yet active to pending balance deposits
+    let validators = post.validators().clone();
+    let mut pre_activation = validators
+        .iter()
+        .enumerate()
+        .filter(|(_, validator)| validator.activation_epoch == spec.far_future_epoch)
+        .collect::<Vec<_>>();
+
+    // Sort the indices by activation_eligibility_epoch and then by index
+    pre_activation.sort_by(|(index_a, val_a), (index_b, val_b)| {
+        if val_a.activation_eligibility_epoch == val_b.activation_eligibility_epoch {
+            index_a.cmp(index_b)
+        } else {
+            val_a
+                .activation_eligibility_epoch
+                .cmp(&val_b.activation_eligibility_epoch)
+        }
+    });
+
+    // Process validators to queue entire balance and reset them
+    for (index, _) in pre_activation {
+        post.queue_entire_balance_and_reset_validator(index, spec)?;
+    }
+
+    // Ensure early adopters of compounding credentials go through the activation churn
+    for (index, validator) in validators.iter().enumerate() {
+        if validator.has_compounding_withdrawal_credential(spec) {
+            post.queue_excess_active_balance(index, spec)?;
+        }
+    }
+
+    *pre_state = post;
+
+    Ok(())
+}
+
+pub fn upgrade_state_to_electra<E: EthSpec>(
+    pre_state: &mut BeaconState<E>,
+    earliest_exit_epoch: Epoch,
+    earliest_consolidation_epoch: Epoch,
+    spec: &ChainSpec,
+) -> Result<BeaconState<E>, Error> {
+    let epoch = pre_state.current_epoch();
     let pre = pre_state.as_deneb_mut()?;
     // Where possible, use something like `mem::take` to move fields from behind the &mut
     // reference. For other fields that don't have a good default value, use `clone`.
     //
     // Fixed size vectors get cloned because replacing them would require the same size
     // allocation as cloning.
-    let mut post = BeaconState::Electra(BeaconStateElectra {
+    let post = BeaconState::Electra(BeaconStateElectra {
         // Versioning
         genesis_time: pre.genesis_time,
         genesis_validators_root: pre.genesis_validators_root,
@@ -96,41 +149,5 @@ pub fn upgrade_to_electra<E: EthSpec>(
         slashings_cache: mem::take(&mut pre.slashings_cache),
         epoch_cache: EpochCache::default(),
     });
-    *post.exit_balance_to_consume_mut()? = post.get_activation_exit_churn_limit(spec)?;
-    *post.consolidation_balance_to_consume_mut()? = post.get_consolidation_churn_limit(spec)?;
-
-    // Add validators that are not yet active to pending balance deposits
-    let validators = post.validators().clone();
-    let mut pre_activation = validators
-        .iter()
-        .enumerate()
-        .filter(|(_, validator)| validator.activation_epoch == spec.far_future_epoch)
-        .collect::<Vec<_>>();
-
-    // Sort the indices by activation_eligibility_epoch and then by index
-    pre_activation.sort_by(|(index_a, val_a), (index_b, val_b)| {
-        if val_a.activation_eligibility_epoch == val_b.activation_eligibility_epoch {
-            index_a.cmp(index_b)
-        } else {
-            val_a
-                .activation_eligibility_epoch
-                .cmp(&val_b.activation_eligibility_epoch)
-        }
-    });
-
-    // Process validators to queue entire balance and reset them
-    for (index, _) in pre_activation {
-        post.queue_entire_balance_and_reset_validator(index, spec)?;
-    }
-
-    // Ensure early adopters of compounding credentials go through the activation churn
-    for (index, validator) in validators.iter().enumerate() {
-        if validator.has_compounding_withdrawal_credential(spec) {
-            post.queue_excess_active_balance(index, spec)?;
-        }
-    }
-
-    *pre_state = post;
-
-    Ok(())
+    Ok(post)
 }
@@ -380,6 +380,7 @@ where
     pub eth1_deposit_index: u64,
 
     // Registry
+    #[compare_fields(as_iter)]
     #[test_random(default)]
     pub validators: List<Validator, E::ValidatorRegistryLimit>,
     #[serde(with = "ssz_types::serde_utils::quoted_u64_var_list")]
@@ -405,8 +406,10 @@ where
     pub current_epoch_attestations: List<PendingAttestation<E>, E::MaxPendingAttestations>,
 
     // Participation (Altair and later)
+    #[compare_fields(as_iter)]
     #[superstruct(only(Altair, Bellatrix, Capella, Deneb, Electra))]
     #[test_random(default)]
+    #[compare_fields(as_iter)]
     pub previous_epoch_participation: List<ParticipationFlags, E::ValidatorRegistryLimit>,
     #[superstruct(only(Altair, Bellatrix, Capella, Deneb, Electra))]
     #[test_random(default)]
@@ -483,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))]
@@ -503,13 +510,16 @@ where
     #[superstruct(only(Electra), partial_getter(copy))]
     #[metastruct(exclude_from(tree_lists))]
     pub earliest_consolidation_epoch: Epoch,
+    #[compare_fields(as_iter)]
     #[test_random(default)]
     #[superstruct(only(Electra))]
     pub pending_balance_deposits: List<PendingBalanceDeposit, E::PendingBalanceDepositsLimit>,
+    #[compare_fields(as_iter)]
     #[test_random(default)]
     #[superstruct(only(Electra))]
     pub pending_partial_withdrawals:
         List<PendingPartialWithdrawal, E::PendingPartialWithdrawalsLimit>,
+    #[compare_fields(as_iter)]
     #[test_random(default)]
     #[superstruct(only(Electra))]
     pub pending_consolidations: List<PendingConsolidation, E::PendingConsolidationsLimit>,
 
@@ -880,6 +880,14 @@ impl ChainSpec {
             electra_fork_epoch: None,
             max_pending_partials_per_withdrawals_sweep: u64::checked_pow(2, 0)
                 .expect("pow does not overflow"),
+            min_per_epoch_churn_limit_electra: option_wrapper(|| {
+                u64::checked_pow(2, 6)?.checked_mul(u64::checked_pow(10, 9)?)
+            })
+            .expect("calculation does not overflow"),
+            max_per_epoch_activation_exit_churn_limit: option_wrapper(|| {
+                u64::checked_pow(2, 7)?.checked_mul(u64::checked_pow(10, 9)?)
+            })
+            .expect("calculation does not overflow"),
             // Other
             network_id: 2, // lighthouse testnet network id
             deposit_chain_id: 5,
 
@@ -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:
 
@@ -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(),
         }
     }
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,9 @@ pub struct ExecutionPayloadHeader<E: EthSpec> {`
`86`	`86`	`#[serde(with = "serde_utils::quoted_u64")]`
`87`	`87`	`pub excess_blob_gas: u64,`
`88`	`88`	`#[superstruct(only(Electra), partial_getter(copy))]`
`89`		`- pub deposit_receipts_root: Hash256,`
	`89`	`+ //TODO(electra) remove alias once EF tests are updates with correct name`
	`90`	`+ #[serde(alias = "deposit_receipts_root")]`
	`91`	`+ pub deposit_requests_root: Hash256,`
`90`	`92`	`#[superstruct(only(Electra), partial_getter(copy))]`
`91`	`93`	`pub withdrawal_requests_root: Hash256,`
`92`	`94`	`}`
`@@ -202,7 +204,7 @@ impl<E: EthSpec> ExecutionPayloadHeaderDeneb<E> {`
`202`	`204`	`withdrawals_root: self.withdrawals_root,`
`203`	`205`	`blob_gas_used: self.blob_gas_used,`
`204`	`206`	`excess_blob_gas: self.excess_blob_gas,`
`205`		`- deposit_receipts_root: Hash256::zero(),`
	`207`	`+ deposit_requests_root: Hash256::zero(),`
`206`	`208`	`withdrawal_requests_root: Hash256::zero(),`
`207`	`209`	`}`
`208`	`210`	`}`
`@@ -295,7 +297,7 @@ impl<'a, E: EthSpec> From<&'a ExecutionPayloadElectra<E>> for ExecutionPayloadHe`
`295`	`297`	`withdrawals_root: payload.withdrawals.tree_hash_root(),`
`296`	`298`	`blob_gas_used: payload.blob_gas_used,`
`297`	`299`	`excess_blob_gas: payload.excess_blob_gas,`
`298`		`- deposit_receipts_root: payload.deposit_requests.tree_hash_root(),`
	`300`	`+ deposit_requests_root: payload.deposit_requests.tree_hash_root(),`
`299`	`301`	`withdrawal_requests_root: payload.withdrawal_requests.tree_hash_root(),`
`300`	`302`	`}`
`301`	`303`	`}`