diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index be79cf5b5..a93076001 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -47,6 +47,7 @@ We define the following Python custom types for type hinting and readability: | Name | SSZ equivalent | Description | | - | - | - | | `OpaqueTransaction` | `ByteList[MAX_BYTES_PER_OPAQUE_TRANSACTION]` | a byte-list containing a single [typed transaction envelope](https://eips.ethereum.org/EIPS/eip-2718#opaque-byte-array-rather-than-an-rlp-array) structured as `TransactionType \|\| TransactionPayload` | +| `Hash32` | `Bytes32` | a 256-bit hash | ## Constants @@ -98,8 +99,8 @@ The execution payload included in a `BeaconBlockBody`. ```python class ExecutionPayload(Container): - block_hash: Bytes32 # Hash of execution block - parent_hash: Bytes32 + block_hash: Hash32 # Hash of execution block + parent_hash: Hash32 coinbase: Bytes20 state_root: Bytes32 number: uint64 @@ -118,8 +119,8 @@ The execution payload header included in a `BeaconState`. ```python class ExecutionPayloadHeader(Container): - block_hash: Bytes32 # Hash of execution block - parent_hash: Bytes32 + block_hash: Hash32 # Hash of execution block + parent_hash: Hash32 coinbase: Bytes20 state_root: Bytes32 number: uint64 diff --git a/specs/merge/fork-choice.md b/specs/merge/fork-choice.md index 647a663c2..df45bedd1 100644 --- a/specs/merge/fork-choice.md +++ b/specs/merge/fork-choice.md @@ -30,7 +30,7 @@ This is the modification of the fork choice according to the executable beacon c ```python class PowBlock(Container): - block_hash: Bytes32 + block_hash: Hash32 is_processed: boolean is_valid: boolean total_difficulty: uint256 @@ -38,7 +38,7 @@ class PowBlock(Container): #### `get_pow_block` -Let `get_pow_block(hash: Bytes32) -> PowBlock` be the function that given the hash of the PoW block returns its data. +Let `get_pow_block(hash: Hash32) -> PowBlock` be the function that given the hash of the PoW block returns its data. *Note*: The `eth_getBlockByHash` JSON-RPC method does not distinguish invalid blocks from blocks that haven't been processed yet. Either extending this existing method or implementing a new one is required. diff --git a/specs/merge/validator.md b/specs/merge/validator.md index 5b26a21dd..42fe7adcf 100644 --- a/specs/merge/validator.md +++ b/specs/merge/validator.md @@ -48,7 +48,7 @@ Let `get_pow_chain_head() -> PowBlock` be the function that returns the head of ###### `produce_execution_payload` -Let `produce_execution_payload(parent_hash: Bytes32) -> ExecutionPayload` be the function that produces new instance of execution payload. +Let `produce_execution_payload(parent_hash: Hash32) -> ExecutionPayload` be the function that produces new instance of execution payload. The body of this function is implementation dependent. * Set `block.body.execution_payload = get_execution_payload(state)` where: