Merge branch 'beacon-api-electra' of https://github.com/sigp/lighthouse into p2p-electra

This commit is contained in:
realbigsean
2024-05-12 15:57:41 -04:00
2 changed files with 4 additions and 5 deletions

View File

@@ -559,8 +559,8 @@ pub fn process_execution_layer_withdrawal_requests<E: EthSpec>(
let has_correct_credential = validator.has_execution_withdrawal_credential(spec);
let is_correct_source_address = validator
.get_execution_withdrawal_address(spec)
.ok_or(BeaconStateError::NonExecutionAddresWithdrawalCredential)?
== request.source_address;
.map(|addr| addr == request.source_address)
.unwrap_or(false);
if !(has_correct_credential && is_correct_source_address) {
continue;

View File

@@ -681,10 +681,9 @@ where
let source_index = consolidation.message.source_index as usize;
let target_index = consolidation.message.target_index as usize;
let domain = spec.get_domain(
consolidation.message.epoch,
let domain = spec.compute_domain(
Domain::Consolidation,
&state.fork(),
spec.genesis_fork_version,
state.genesis_validators_root(),
);