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

cleanup withdrawals processing

Browse Source
This commit is contained in:
realbigsean
2024-05-06 21:25:47 -04:00
parent e2e82ff1b9
commit e0abede1d1
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -547,7 +547,13 @@ pub fn get_expected_withdrawals<E: EthSpec>(
withdrawals.push(Withdrawal { withdrawals.push(Withdrawal {
index: withdrawal_index, index: withdrawal_index,
validator_index: withdrawal.index, validator_index: withdrawal.index,
address: Address::from_slice(&validator.withdrawal_credentials[12..]), address: Address::from_slice(
validator
.withdrawal_credentials
.0
.get(12..)
.ok_or(BeaconStateError::IndexNotSupported(12))?,
),
amount: withdrawable_balance, amount: withdrawable_balance,
}); });
withdrawal_index.safe_add_assign(1)?; withdrawal_index.safe_add_assign(1)?;
@@ -634,12 +640,9 @@ pub fn process_withdrawals<E: EthSpec, Payload: AbstractExecPayload<E>>(
if let Some(partial_withdrawals_count) = partial_withdrawals_count { if let Some(partial_withdrawals_count) = partial_withdrawals_count {
let new_partial_withdrawals = state let new_partial_withdrawals = state
.pending_partial_withdrawals()? .pending_partial_withdrawals()?
.to_vec() .iter_from(partial_withdrawals_count)?
.get(partial_withdrawals_count..) .cloned()
.ok_or(BeaconStateError::PartialWithdrawalCountInvalid( .collect::<Vec<_>>();
partial_withdrawals_count,
))?
.to_vec();
*state.pending_partial_withdrawals_mut()? = List::new(new_partial_withdrawals)?; *state.pending_partial_withdrawals_mut()? = List::new(new_partial_withdrawals)?;
} }