Fixed compiling with withdrawals enabled

consensus/state_processing/src/per_block_processing/process_operations.rs

@@ -300,7 +300,9 @@ pub fn process_bls_to_execution_changes<'a, T: EthSpec, Payload: AbstractExecPay
         | BeaconBlockBodyRef::Altair(_)
         | BeaconBlockBodyRef::Merge(_) => Ok(()),
         BeaconBlockBodyRef::Capella(_) | BeaconBlockBodyRef::Eip4844(_) => {
-            for (i, signed_address_change) in block_body.bls_to_execution_changes()?.enumerate() {
+            for (i, signed_address_change) in
+                block_body.bls_to_execution_changes()?.iter().enumerate()
+            {
                 verify_bls_to_execution_change(
                     state,
                     &signed_address_change,
@@ -310,9 +312,9 @@ pub fn process_bls_to_execution_changes<'a, T: EthSpec, Payload: AbstractExecPay
                 .map_err(|e| e.into_with_index(i))?;
 
                 state
-                    .get_validator_mut(signed_address_change.message.validator_index)?
+                    .get_validator_mut(signed_address_change.message.validator_index as usize)?
                     .change_withdrawal_credentials(
-                        signed_address_change.message.to_execution_address,
+                        &signed_address_change.message.to_execution_address,
                         spec,
                     );
             }

consensus/state_processing/src/per_block_processing/verify_bls_to_execution_change.rs

@@ -0,0 +1,57 @@
+use super::errors::{BlockOperationError, BlsExecutionChangeInvalid as Invalid};
+use crate::per_block_processing::signature_sets::bls_execution_change_signature_set;
+use crate::VerifySignatures;
+use eth2_hashing::hash;
+use types::*;
+
+type Result<T> = std::result::Result<T, BlockOperationError<Invalid>>;
+
+fn error(reason: Invalid) -> BlockOperationError<Invalid> {
+    BlockOperationError::invalid(reason)
+}
+
+/// Indicates if a `BlsToExecutionChange` is valid to be included in a block in the current epoch of the given
+/// state.
+///
+/// Returns `Ok(())` if the `SignedBlsToExecutionChange` is valid, otherwise indicates the reason for invalidity.
+pub fn verify_bls_to_execution_change<T: EthSpec>(
+    state: &BeaconState<T>,
+    signed_address_change: &SignedBlsToExecutionChange,
+    verify_signatures: VerifySignatures,
+    spec: &ChainSpec,
+) -> Result<()> {
+    let address_change = &signed_address_change.message;
+
+    let validator = state
+        .validators()
+        .get(address_change.validator_index as usize)
+        .ok_or_else(|| error(Invalid::ValidatorUnknown(address_change.validator_index)))?;
+
+    verify!(
+        validator
+            .withdrawal_credentials
+            .as_bytes()
+            .first()
+            .map(|byte| *byte == spec.bls_withdrawal_prefix_byte)
+            .unwrap_or(false),
+        Invalid::NonBlsWithdrawalCredentials
+    );
+
+    let pubkey_hash = hash(address_change.from_bls_pubkey.as_serialized());
+
+    // FIXME: Should this check be put inside the verify_signatures.is_true() condition?
+    //        I believe that's used for fuzzing so this is a Mehdi question..
+    verify!(
+        validator.withdrawal_credentials.as_bytes()[1..] == pubkey_hash[1..],
+        Invalid::WithdrawalCredentialsMismatch
+    );
+
+    if verify_signatures.is_true() {
+        verify!(
+            bls_execution_change_signature_set(state, signed_address_change, spec,)?.verify(),
+            Invalid::BadSignature
+        );
+    }
+
+    Ok(())
+}

consensus/state_processing/src/upgrade/capella.rs

@@ -58,11 +58,9 @@ pub fn upgrade_to_capella<E: EthSpec>(
         latest_execution_payload_header: pre.latest_execution_payload_header.upgrade_to_capella(),
         // Withdrawals
         #[cfg(feature = "withdrawals")]
-        withdrawal_queue: VariableList::empty(),
-        #[cfg(feature = "withdrawals")]
         next_withdrawal_index: 0,
         #[cfg(feature = "withdrawals")]
-        next_partial_withdrawal_validator_index: 0,
+        latest_withdrawal_validator_index: 0,
         // Caches
         total_active_balance: pre.total_active_balance,
         committee_caches: mem::take(&mut pre.committee_caches),

consensus/state_processing/src/upgrade/eip4844.rs

@@ -65,11 +65,9 @@ pub fn upgrade_to_eip4844<E: EthSpec>(
         latest_execution_payload_header: pre.latest_execution_payload_header.upgrade_to_eip4844(),
         // Withdrawals
         #[cfg(feature = "withdrawals")]
-        withdrawal_queue: mem::take(&mut pre.withdrawal_queue),
-        #[cfg(feature = "withdrawals")]
         next_withdrawal_index: pre.next_withdrawal_index,
         #[cfg(feature = "withdrawals")]
-        next_partial_withdrawal_validator_index: pre.next_partial_withdrawal_validator_index,
+        latest_withdrawal_validator_index: 0,
         // Caches
         total_active_balance: pre.total_active_balance,
         committee_caches: mem::take(&mut pre.committee_caches),