Fix Bug In Block Processing with 0x02 Credentials

realbigsean · Jun 25, 2024 · 40b4328 · 40b4328
1 parent 30fa472
commit 40b4328
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 14 deletions.
diff --git a/consensus/state_processing/src/per_block_processing.rs b/consensus/state_processing/src/per_block_processing.rs
@@ -566,7 +566,7 @@ pub fn get_expected_withdrawals<E: EthSpec>(
                 index: withdrawal_index,
                 validator_index,
                 address: validator
-                    .get_eth1_withdrawal_address(spec)
+                    .get_execution_withdrawal_address(spec)
                     .ok_or(BlockProcessingError::WithdrawalCredentialsInvalid)?,
                 amount: balance,
             });
@@ -576,7 +576,7 @@ pub fn get_expected_withdrawals<E: EthSpec>(
                 index: withdrawal_index,
                 validator_index,
                 address: validator
-                    .get_eth1_withdrawal_address(spec)
+                    .get_execution_withdrawal_address(spec)
                     .ok_or(BlockProcessingError::WithdrawalCredentialsInvalid)?,
                 amount: balance.safe_sub(
                     validator

diff --git a/consensus/types/src/validator.rs b/consensus/types/src/validator.rs
@@ -130,18 +130,6 @@ impl Validator {
         is_compounding_withdrawal_credential(self.withdrawal_credentials, spec)
     }
 
-    /// Get the eth1 withdrawal address if this validator has one initialized.
-    pub fn get_eth1_withdrawal_address(&self, spec: &ChainSpec) -> Option<Address> {
-        self.has_eth1_withdrawal_credential(spec)
-            .then(|| {
-                self.withdrawal_credentials
-                    .as_bytes()
-                    .get(12..)
-                    .map(Address::from_slice)
-            })
-            .flatten()
-    }
-
     /// Get the execution withdrawal address if this validator has one initialized.
     pub fn get_execution_withdrawal_address(&self, spec: &ChainSpec) -> Option<Address> {
         self.has_execution_withdrawal_credential(spec)