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

Address some more review comments

Browse Source
This commit is contained in:
Pawan Dhananjay
2024-06-28 15:10:27 +05:30
parent 806a5ebe1f
commit 033457ce89
1 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
beacon_node/execution_layer/src/engine_api.rs
View File

@@ -64,7 +64,6 @@ pub enum Error {
ExecutionHeadBlockNotFound, ExecutionHeadBlockNotFound,
ParentHashEqualsBlockHash(ExecutionBlockHash), ParentHashEqualsBlockHash(ExecutionBlockHash),
PayloadIdUnavailable, PayloadIdUnavailable,
TransitionConfigurationMismatch,
SszError(ssz_types::Error), SszError(ssz_types::Error),
DeserializeWithdrawals(ssz_types::Error), DeserializeWithdrawals(ssz_types::Error),
DeserializeDepositRequests(ssz_types::Error), DeserializeDepositRequests(ssz_types::Error),
@@ -635,17 +634,14 @@ impl<E: EthSpec> ExecutionPayloadBodyV1<E> {
} }
} }
ExecutionPayloadHeader::Electra(header) => { ExecutionPayloadHeader::Electra(header) => {
let (Some(withdrawals), Some(deposit_requests), Some(withdrawal_requests)) = ( let withdrawals_exist = self.withdrawals.is_some();
let deposit_requests_exist = self.deposit_requests.is_some();
let withdrawal_requests_exist = self.withdrawal_requests.is_some();
if let (Some(withdrawals), Some(deposit_requests), Some(withdrawal_requests)) = (
self.withdrawals, self.withdrawals,
self.deposit_requests, self.deposit_requests,
self.withdrawal_requests, self.withdrawal_requests,
) else { ) {
return Err(format!(
"block {} is post-electra but payload body doesn't have withdrawals/deposit_requests/withdrawal_requests \
Check that ELs are returning receipts and withdrawal_requests in getPayloadBody requests",
header.block_hash
));
};
Ok(ExecutionPayload::Electra(ExecutionPayloadElectra { Ok(ExecutionPayload::Electra(ExecutionPayloadElectra {
parent_hash: header.parent_hash, parent_hash: header.parent_hash,
fee_recipient: header.fee_recipient, fee_recipient: header.fee_recipient,
@@ -667,6 +663,13 @@ impl<E: EthSpec> ExecutionPayloadBodyV1<E> {
deposit_requests, deposit_requests,
withdrawal_requests, withdrawal_requests,
})) }))
} else {
Err(format!(
"block {} is post-electra but payload body doesn't have withdrawals/deposit_requests/withdrawal_requests \
withdrawals: {}, deposit_requests: {}, withdrawal_requests: {}",
header.block_hash, withdrawals_exist, deposit_requests_exist, withdrawal_requests_exist
))
}
} }
} }
} }