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

Move payload status validation prior to mutations!

Browse Source
This commit is contained in:
Michael Sproul
2026-05-12 11:47:16 +10:00
parent df9399e957
commit 14a4de41e0
2 changed files with 47 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -823,6 +823,45 @@ where
}));
}
let execution_status = if let Ok(execution_payload) = block.body().execution_payload() {
let block_hash = execution_payload.block_hash();
if block_hash == ExecutionBlockHash::zero() {
// The block is post-merge-fork, but pre-terminal-PoW block. We don't need to verify
// the payload.
ExecutionStatus::irrelevant()
} else {
match payload_verification_status {
PayloadVerificationStatus::Verified => ExecutionStatus::Valid(block_hash),
PayloadVerificationStatus::Optimistic => {
ExecutionStatus::Optimistic(block_hash)
}
// It would be a logic error to declare a block irrelevant if it has an
// execution payload with a non-zero block hash.
PayloadVerificationStatus::Irrelevant => {
return Err(Error::InvalidPayloadStatus {
block_slot: block.slot(),
block_root,
payload_verification_status,
});
}
}
}
} else {
// There is no payload to verify.
ExecutionStatus::irrelevant()
};
let (execution_payload_parent_hash, execution_payload_block_hash) =
if let Ok(signed_bid) = block.body().signed_execution_payload_bid() {
(
Some(signed_bid.message.parent_block_hash),
Some(signed_bid.message.block_hash),
)
} else {
(None, None)
};
let attestation_threshold = spec.get_attestation_due::<E>(block.slot());
// Add proposer score boost if the block is the first timely block for this slot and its
@@ -956,45 +995,6 @@ where
.on_verified_block(block, block_root, state)
.map_err(Error::AfterBlockFailed)?;
let execution_status = if let Ok(execution_payload) = block.body().execution_payload() {
let block_hash = execution_payload.block_hash();
if block_hash == ExecutionBlockHash::zero() {
// The block is post-merge-fork, but pre-terminal-PoW block. We don't need to verify
// the payload.
ExecutionStatus::irrelevant()
} else {
match payload_verification_status {
PayloadVerificationStatus::Verified => ExecutionStatus::Valid(block_hash),
PayloadVerificationStatus::Optimistic => {
ExecutionStatus::Optimistic(block_hash)
}
// It would be a logic error to declare a block irrelevant if it has an
// execution payload with a non-zero block hash.
PayloadVerificationStatus::Irrelevant => {
return Err(Error::InvalidPayloadStatus {
block_slot: block.slot(),
block_root,
payload_verification_status,
});
}
}
}
} else {
// There is no payload to verify.
ExecutionStatus::irrelevant()
};
let (execution_payload_parent_hash, execution_payload_block_hash) =
if let Ok(signed_bid) = block.body().signed_execution_payload_bid() {
(
Some(signed_bid.message.parent_block_hash),
Some(signed_bid.message.block_hash),
)
} else {
(None, None)
};
// This does not apply a vote to the block, it just makes fork choice aware of the block so
// it can still be identified as the head even if it doesn't have any votes.
self.proto_array.process_block::<E>(

10
testing/ef_tests/src/cases/fork_choice.rs
View File

@@ -865,7 +865,7 @@ impl<E: EthSpec> Tester<E> {
block_root,
block_delay,
&state,
PayloadVerificationStatus::Irrelevant,
PayloadVerificationStatus::Optimistic,
block.message().proposer_index(),
&self.harness.chain.spec,
);
@@ -1249,7 +1249,13 @@ impl<E: EthSpec> Tester<E> {
actual_sorted.sort();
let mut expected_sorted: Vec<(Hash256, u8, u64)> = expected
.iter()
.map(|x| (x.root, x.payload_status.unwrap_or(FcPayloadStatus::Pending as u8), x.weight))
.map(|x| {
(
x.root,
x.payload_status.unwrap_or(FcPayloadStatus::Pending as u8),
x.weight,
)
})
.collect();
expected_sorted.sort();