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

Use None for post-Gloas payload hashes pre-Gloas

Browse Source
This commit is contained in:
Michael Sproul
2026-04-01 12:10:11 +11:00
parent f6f9eae4ef
commit ad0f3cf89b
1 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -395,22 +395,7 @@ where
.map_err(Error::BeaconStateError)?; .map_err(Error::BeaconStateError)?;
let (execution_status, execution_payload_parent_hash, execution_payload_block_hash) = let (execution_status, execution_payload_parent_hash, execution_payload_block_hash) =
if let Ok(execution_payload) = anchor_block.message().execution_payload() { if let Ok(signed_bid) = anchor_block.message().body().signed_execution_payload_bid() {
// Pre-Gloas forks: hashes come from the execution payload.
if execution_payload.is_default_with_empty_roots() {
(ExecutionStatus::irrelevant(), None, None)
} else {
// Assume that this payload is valid, since the anchor should be a
// trusted block and state.
(
ExecutionStatus::Valid(execution_payload.block_hash()),
Some(execution_payload.parent_hash()),
Some(execution_payload.block_hash()),
)
}
} else if let Ok(signed_bid) =
anchor_block.message().body().signed_execution_payload_bid()
{
// Gloas: execution status is irrelevant post-Gloas; payload validation // Gloas: execution status is irrelevant post-Gloas; payload validation
// is decoupled from beacon blocks. // is decoupled from beacon blocks.
( (
@@ -418,6 +403,19 @@ where
Some(signed_bid.message.parent_block_hash), Some(signed_bid.message.parent_block_hash),
Some(signed_bid.message.block_hash), Some(signed_bid.message.block_hash),
) )
} else if let Ok(execution_payload) = anchor_block.message().execution_payload() {
// Pre-Gloas forks: do not set payload hashes, they are only used post-Gloas.
if execution_payload.is_default_with_empty_roots() {
(ExecutionStatus::irrelevant(), None, None)
} else {
// Assume that this payload is valid, since the anchor should be a
// trusted block and state.
(
ExecutionStatus::Valid(execution_payload.block_hash()),
None,
None,
)
}
} else { } else {
// Pre-merge: no execution payload at all. // Pre-merge: no execution payload at all.
(ExecutionStatus::irrelevant(), None, None) (ExecutionStatus::irrelevant(), None, None)