diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index ab08f46aa..5bad1529c 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -21,6 +21,7 @@ - [`BeaconState`](#beaconstate) - [New containers](#new-containers) - [`ApplicationPayload`](#applicationpayload) + - [`ApplicationBlockHeader`](#applicationblockheader) - [Helper functions](#helper-functions) - [Misc](#misc) - [`is_transition_completed`](#is_transition_completed) @@ -81,14 +82,12 @@ class BeaconBlockBody(phase0.BeaconBlockBody): #### `BeaconState` -*Note*: `BeaconState` fields remain unchanged other than addition of application payload fields. +*Note*: `BeaconState` fields remain unchanged other than addition of `latest_application_block_header`. ```python class BeaconState(phase0.BeaconState): # Application-layer - application_state_root: Bytes32 # [New in Merge] - application_block_hash: Bytes32 # [New in Merge] - application_block_number: uint64 # [New in Merge] + latest_application_block_header: ApplicationBlockHeader # [New in Merge] ``` ### New containers @@ -111,6 +110,25 @@ class ApplicationPayload(Container): transactions: List[OpaqueTransaction, MAX_APPLICATION_TRANSACTIONS] ``` +#### `ApplicationBlockHeader` + +The application block header included in a `BeaconState`. + +*Note:* Holds application payload data without transaction list. + +```python +class ApplicationBlockHeader(Container): + block_hash: Bytes32 # Hash of application block + parent_hash: Bytes32 + coinbase: Bytes20 + state_root: Bytes32 + number: uint64 + gas_limit: uint64 + gas_used: uint64 + receipt_root: Bytes32 + logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM] +``` + ## Helper functions ### Misc @@ -119,14 +137,14 @@ class ApplicationPayload(Container): ```python def is_transition_completed(state: BeaconState) -> boolean: - return state.application_block_hash != Bytes32() + return state.latest_application_block_header.block_hash != Bytes32() ``` #### `is_transition_block` ```python def is_transition_block(state: BeaconState, block_body: BeaconBlockBody) -> boolean: - return state.application_block_hash == Bytes32() and block_body.application_payload.block_hash != Bytes32() + return state.latest_application_block_header.block_hash == Bytes32() and block_body.application_payload.block_hash != Bytes32() ``` ### Block processing @@ -169,13 +187,21 @@ def process_application_payload(state: BeaconState, body: BeaconBlockBody) -> No return if not is_transition_block(state, body): - assert body.application_payload.parent_hash == state.application_block_hash - assert body.application_payload.number == state.application_block_number + 1 + assert body.application_payload.parent_hash == state.latest_application_block_header.block_hash + assert body.application_payload.number == state.latest_application_block_header.number + 1 - application_state = get_application_state(state.application_state_root) + application_state = get_application_state(state.latest_application_block_header.state_root) application_state_transition(application_state, body.application_payload) - state.application_state_root = body.application_payload.state_root - state.application_block_hash = body.application_payload.block_hash - state.application_block_number = body.application_payload.number + state.latest_application_block_header = ApplicationBlockHeader( + block_hash=application_payload.block_hash, + parent_hash=application_payload.parent_hash, + coinbase=application_payload.coinbase, + state_root=application_payload.state_root, + number=application_payload.number, + gas_limit=application_payload.gas_limit, + gas_used=application_payload.gas_used, + receipt_root=application_payload.receipt_root, + logs_bloom=application_payload.logs_bloom, + ) ``` diff --git a/specs/merge/validator.md b/specs/merge/validator.md index 46deec5b4..1c43c9dd6 100644 --- a/specs/merge/validator.md +++ b/specs/merge/validator.md @@ -65,6 +65,6 @@ def get_application_payload(state: BeaconState) -> ApplicationPayload: return produce_application_payload(pow_block.block_hash) # Post-merge, normal payload - application_parent_hash = state.application_block_hash + application_parent_hash = state.latest_application_block_header.block_hash return produce_application_payload(application_parent_hash) ```