diff --git a/specs/merge/beacon-chain.md b/specs/merge/beacon-chain.md index 4e0c554d2..a508cb670 100644 --- a/specs/merge/beacon-chain.md +++ b/specs/merge/beacon-chain.md @@ -16,8 +16,6 @@ - [Transition](#transition) - [Execution](#execution) - [Containers](#containers) - - [Modified containers](#modified-containers) - - [`Eth1Data`](#eth1data) - [Extended containers](#extended-containers) - [`BeaconBlockBody`](#beaconblockbody) - [`BeaconState`](#beaconstate) @@ -49,7 +47,6 @@ 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 @@ -69,19 +66,6 @@ We define the following Python custom types for type hinting and readability: ## Containers -### Modified containers - -#### `Eth1Data` - -*Note*: The only modification is the type of `block_hash` field that is changed to `Hash32`. - -```python -class Eth1Data(Container): - deposit_root: Root - deposit_count: uint64 - block_hash: Hash32 # [Modified in Merge] -``` - ### Extended containers *Note*: Extended SSZ containers inherit all fields from the parent in the original diff --git a/specs/phase0/beacon-chain.md b/specs/phase0/beacon-chain.md index cbd085bd3..3176d543c 100644 --- a/specs/phase0/beacon-chain.md +++ b/specs/phase0/beacon-chain.md @@ -157,6 +157,7 @@ We define the following Python custom types for type hinting and readability: | `ValidatorIndex` | `uint64` | a validator registry index | | `Gwei` | `uint64` | an amount in Gwei | | `Root` | `Bytes32` | a Merkle root | +| `Hash32` | `Bytes32` | a 256-bit hash | | `Version` | `Bytes4` | a fork version number | | `DomainType` | `Bytes4` | a domain type | | `ForkDigest` | `Bytes4` | a digest of the current fork data | @@ -164,6 +165,7 @@ We define the following Python custom types for type hinting and readability: | `BLSPubkey` | `Bytes48` | a BLS12-381 public key | | `BLSSignature` | `Bytes96` | a BLS12-381 signature | + ## Constants The following values are (non-configurable) constants used throughout the specification. @@ -374,7 +376,7 @@ class PendingAttestation(Container): class Eth1Data(Container): deposit_root: Root deposit_count: uint64 - block_hash: Bytes32 + block_hash: Hash32 ``` #### `HistoricalBatch`