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

resolve merge conflicts

Browse Source
This commit is contained in:
Eitan Seri-Levi
2026-02-17 18:10:22 -08:00
parent 81d30d576a b057cae302
commit d88f0f7b4c
57 changed files with 802 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
beacon_node/beacon_chain/src/block_verification.rs
View File

@@ -971,14 +971,12 @@ impl<T: BeaconChainTypes> GossipVerifiedBlock<T> {
if let Some(beacon_root) = fork_choice_read_lock
.proto_array()
.execution_block_hash_to_beacon_block_root(&bid.message.parent_block_hash)
&& let Some(parent_payload_block) = fork_choice_read_lock.get_block(&beacon_root)
&& parent_payload_block.execution_status.is_invalid()
{
if let Some(parent_payload_block) = fork_choice_read_lock.get_block(&beacon_root) {
if parent_payload_block.execution_status.is_invalid() {
return Err(BlockError::ParentExecutionPayloadInvalid {
parent_root: beacon_root,
});
}
}
return Err(BlockError::ParentExecutionPayloadInvalid {
parent_root: beacon_root,
});
}
}