gnosis/lighthouse
1
0
Fork 0
mirror of https://github.com/sigp/lighthouse.git synced 2026-05-08 01:05:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Bug In Block Processing with 0x02 Credentials

Browse Source
This commit is contained in:
Mark Mackey
2024-05-16 12:55:03 +03:00
parent b5333b4d92
commit d197a19b57
2 changed files with 2 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
consensus/state_processing/src/per_block_processing.rs
View File

@@ -566,7 +566,7 @@ pub fn get_expected_withdrawals<E: EthSpec>(
index: withdrawal_index, index: withdrawal_index,
validator_index, validator_index,
address: validator address: validator
.get_eth1_withdrawal_address(spec) .get_execution_withdrawal_address(spec)
.ok_or(BlockProcessingError::WithdrawalCredentialsInvalid)?, .ok_or(BlockProcessingError::WithdrawalCredentialsInvalid)?,
amount: balance, amount: balance,
}); });
@@ -576,7 +576,7 @@ pub fn get_expected_withdrawals<E: EthSpec>(
index: withdrawal_index, index: withdrawal_index,
validator_index, validator_index,
address: validator address: validator
.get_eth1_withdrawal_address(spec) .get_execution_withdrawal_address(spec)
.ok_or(BlockProcessingError::WithdrawalCredentialsInvalid)?, .ok_or(BlockProcessingError::WithdrawalCredentialsInvalid)?,
amount: balance.safe_sub( amount: balance.safe_sub(
validator validator

12
consensus/types/src/validator.rs
View File

@@ -140,18 +140,6 @@ impl Validator {
is_compounding_withdrawal_credential(self.withdrawal_credentials, spec) 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. /// Get the execution withdrawal address if this validator has one initialized.
pub fn get_execution_withdrawal_address(&self, spec: &ChainSpec) -> Option<Address> { pub fn get_execution_withdrawal_address(&self, spec: &ChainSpec) -> Option<Address> {
self.has_execution_withdrawal_credential(spec) self.has_execution_withdrawal_credential(spec)