cerc-io/lighthouse
16
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Fix post-Bellatrix checkpoint sync (#4014)

Browse Source 
* Recognise execution in post-merge blocks

* Remove `.body()`

* Fix typo

* Use `is_default_with_empty_roots`.
This commit is contained in:
Paul Hauner 2023-02-21 18:03:24 +11:00 committed by GitHub
parent eed7d65ce7
commit 1bce7a02c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
consensus/fork_choice/src/fork_choice.rs
View File

@ -413,18 +413,18 @@ where
AttestationShufflingId::new(anchor_block_root, anchor_state, RelativeEpoch::Next) AttestationShufflingId::new(anchor_block_root, anchor_state, RelativeEpoch::Next)
.map_err(Error::BeaconStateError)?; .map_err(Error::BeaconStateError)?;
// Default any non-merge execution block hashes to 0x000..000. let execution_status = anchor_block.message().execution_payload().map_or_else(
let execution_status = anchor_block.message_merge().map_or_else( // If the block doesn't have an execution payload then it can't have
|()| ExecutionStatus::irrelevant(), // execution enabled.
|message| { |_| ExecutionStatus::irrelevant(),
let execution_payload = &message.body.execution_payload; |execution_payload| {
if execution_payload == &<_>::default() { if execution_payload.is_default_with_empty_roots() {
// A default payload does not have execution enabled. // A default payload does not have execution enabled.
ExecutionStatus::irrelevant() ExecutionStatus::irrelevant()
} else { } else {
// Assume that this payload is valid, since the anchor should be a trusted block and // Assume that this payload is valid, since the anchor should be a trusted block and
// state. // state.
ExecutionStatus::Valid(message.body.execution_payload.block_hash()) ExecutionStatus::Valid(execution_payload.block_hash())
} }
}, },
); );