Skip to content

Commit af02941

Browse files
authored
chore: remove stale references to merge block (ChainSafe#8834)
1 parent f61b3fb commit af02941

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

  • packages/beacon-node/src/chain/validation

packages/beacon-node/src/chain/validation/block.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,11 +138,10 @@ export async function validateGossipBlock(
138138
// in forky condition, make sure to populate ShufflingCache with regened state
139139
chain.shufflingCache.processState(blockState);
140140

141-
// Extra conditions for merge fork blocks
142141
// [REJECT] The block's execution payload timestamp is correct with respect to the slot
143142
// -- i.e. execution_payload.timestamp == compute_timestamp_at_slot(state, block.slot).
144143
if (isForkPostBellatrix(fork) && !isForkPostGloas(fork)) {
145-
if (!isExecutionBlockBodyType(block.body)) throw Error("Not merge block type");
144+
if (!isExecutionBlockBodyType(block.body)) throw Error("Not execution block body type");
146145
const executionPayload = block.body.executionPayload;
147146
if (isExecutionStateType(blockState) && isExecutionEnabled(blockState, block)) {
148147
const expectedTimestamp = computeTimeAtSlot(config, blockSlot, chain.genesisTime);

0 commit comments

Comments
 (0)