diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 661d333faa..5b818d5a26 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -24,8 +24,8 @@ - [`ExecutionPayloadHeader`](#executionpayloadheader) - [Helper functions](#helper-functions) - [Predicates](#predicates) - - [`is_merge_complete`](#is_merge_complete) - - [`is_merge_block`](#is_merge_block) + - [`is_merge_transition_complete`](#is_merge_transition_complete) + - [`is_merge_transition_block`](#is_merge_transition_block) - [`is_execution_enabled`](#is_execution_enabled) - [Misc](#misc) - [`compute_timestamp_at_slot`](#compute_timestamp_at_slot) @@ -209,25 +209,25 @@ class ExecutionPayloadHeader(Container): ### Predicates -#### `is_merge_complete` +#### `is_merge_transition_complete` ```python -def is_merge_complete(state: BeaconState) -> bool: +def is_merge_transition_complete(state: BeaconState) -> bool: return state.latest_execution_payload_header != ExecutionPayloadHeader() ``` -#### `is_merge_block` +#### `is_merge_transition_block` ```python -def is_merge_block(state: BeaconState, body: BeaconBlockBody) -> bool: - return not is_merge_complete(state) and body.execution_payload != ExecutionPayload() +def is_merge_transition_block(state: BeaconState, body: BeaconBlockBody) -> bool: + return not is_merge_transition_complete(state) and body.execution_payload != ExecutionPayload() ``` #### `is_execution_enabled` ```python def is_execution_enabled(state: BeaconState, body: BeaconBlockBody) -> bool: - return is_merge_block(state, body) or is_merge_complete(state) + return is_merge_transition_block(state, body) or is_merge_transition_complete(state) ``` ### Misc @@ -346,7 +346,7 @@ def process_block(state: BeaconState, block: BeaconBlock) -> None: ```python def process_execution_payload(state: BeaconState, payload: ExecutionPayload, execution_engine: ExecutionEngine) -> None: # Verify consistency of the parent hash with respect to the previous execution payload header - if is_merge_complete(state): + if is_merge_transition_complete(state): assert payload.parent_hash == state.latest_execution_payload_header.block_hash # Verify random assert payload.random == get_randao_mix(state, get_current_epoch(state)) diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md index 8c5bc13128..c4aa821632 100644 --- a/specs/merge/fork-choice.md +++ b/specs/merge/fork-choice.md @@ -167,7 +167,7 @@ def on_block(store: Store, signed_block: SignedBeaconBlock) -> None: state_transition(state, signed_block, True) # [New in Merge] - if is_merge_block(pre_state, block.body): + if is_merge_transition_block(pre_state, block.body): validate_merge_block(block) # Add new block to the store diff --git a/specs/merge/validator.md b/specs/merge/validator.md index 27fb263528..12f003f441 100644 --- a/specs/merge/validator.md +++ b/specs/merge/validator.md @@ -123,7 +123,7 @@ def prepare_execution_payload(state: BeaconState, finalized_block_hash: Hash32, suggested_fee_recipient: ExecutionAddress, execution_engine: ExecutionEngine) -> Optional[PayloadId]: - if not is_merge_complete(state): + if not is_merge_transition_complete(state): is_terminal_block_hash_set = TERMINAL_BLOCK_HASH != Hash32() is_activation_epoch_reached = get_current_epoch(state.slot) >= TERMINAL_BLOCK_HASH_ACTIVATION_EPOCH if is_terminal_block_hash_set and not is_activation_epoch_reached: