Adopt EIP-7688: Forward compatible consensus data structures

EIP-4788 exposes the beacon root to smart contracts, but smart contracts
using it need to be redeployed / upgraded whenever the indexing changes
during a fork, even if that fork does not touch any used functionality.

This problem expands further to bridges on other blockchains, or even
into wallet apps on a phone that verify data from the beacon chain
instead of trusting the server. It is quite unrealistic to expect such
projects to all align their release cadence with Ethereum's forks.

EIP-7688 fixes this by defining forward compatibility for beacon chain
data structures. Electra `Profile` retain their Merkleization even when
rebased to `StableContainer` definitions from future forks, enabling
decentralized protocols to drop the requirement for trusted parties to
periodically upgrade beacon state proof verifiers.

Author: etan-status

presets/mainnet/electra.yaml

@@ -48,3 +48,8 @@ MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: 8
 # ---------------------------------------------------------------
 # 2**4 ( = 4) pending deposits
 MAX_PENDING_DEPOSITS_PER_EPOCH: 16
+
+# Misc
+# ---------------------------------------------------------------
+# `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 7 + 1 + 12 = 20
+KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_ELECTRA: 20

presets/mainnet/fulu.yaml

@@ -7,4 +7,4 @@ FIELD_ELEMENTS_PER_CELL: 64
 # `uint64(2 * 4096)` (= 8192)
 FIELD_ELEMENTS_PER_EXT_BLOB: 8192
 # uint64(floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments'))
-KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 4
+KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 7

presets/minimal/electra.yaml

@@ -48,3 +48,8 @@ MAX_PENDING_PARTIALS_PER_WITHDRAWALS_SWEEP: 2
 # ---------------------------------------------------------------
 # 2**4 ( = 4) pending deposits
 MAX_PENDING_DEPOSITS_PER_EPOCH: 16
+
+# Misc
+# ---------------------------------------------------------------
+# [customized] `floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments')) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 7 + 1 + 5 = 13
+KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_ELECTRA: 13

presets/minimal/fulu.yaml

@@ -7,4 +7,4 @@ FIELD_ELEMENTS_PER_CELL: 64
 # `uint64(2 * 4096)` (= 8192)
 FIELD_ELEMENTS_PER_EXT_BLOB: 8192
 # uint64(floorlog2(get_generalized_index(BeaconBlockBody, 'blob_kzg_commitments'))
-KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 4
+KZG_COMMITMENTS_INCLUSION_PROOF_DEPTH: 7

pysetup/spec_builders/deneb.py

@@ -87,10 +87,5 @@ def hardcoded_custom_type_dep_constants(cls, spec_object) -> Dict[str, str]:
             'FIELD_ELEMENTS_PER_BLOB': spec_object.preset_vars['FIELD_ELEMENTS_PER_BLOB'].value,
             'MAX_BLOBS_PER_BLOCK': spec_object.config_vars['MAX_BLOBS_PER_BLOCK'].value,
             'MAX_BLOB_COMMITMENTS_PER_BLOCK': spec_object.preset_vars['MAX_BLOB_COMMITMENTS_PER_BLOCK'].value,
-        }
-
-    @classmethod
-    def hardcoded_func_dep_presets(cls, spec_object) -> Dict[str, str]:
-        return {
             'KZG_COMMITMENT_INCLUSION_PROOF_DEPTH': spec_object.preset_vars['KZG_COMMITMENT_INCLUSION_PROOF_DEPTH'].value,
         }

pysetup/spec_builders/eip7732.py

@@ -35,11 +35,11 @@ def hardcoded_custom_type_dep_constants(cls, spec_object) -> Dict[str, str]:
     @classmethod
     def deprecate_constants(cls) -> Set[str]:
         return set([
-            'EXECUTION_PAYLOAD_GINDEX',
+            'EXECUTION_PAYLOAD_GINDEX_ELECTRA',
         ])
 
     @classmethod
     def deprecate_presets(cls) -> Set[str]:
         return set([
-            'KZG_COMMITMENT_INCLUSION_PROOF_DEPTH',
+            'KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_ELECTRA',
         ])

pysetup/spec_builders/electra.py

@@ -11,14 +11,22 @@ def imports(cls, preset_name: str):
         return f'''
 from eth2spec.deneb import {preset_name} as deneb
 from eth2spec.utils.ssz.ssz_impl import ssz_serialize, ssz_deserialize
+from eth2spec.utils.ssz.ssz_typing import StableContainer, Profile
 '''
 
     @classmethod
     def hardcoded_ssz_dep_constants(cls) -> Dict[str, str]:
         return {
-            'FINALIZED_ROOT_GINDEX_ELECTRA': 'GeneralizedIndex(169)',
-            'CURRENT_SYNC_COMMITTEE_GINDEX_ELECTRA': 'GeneralizedIndex(86)',
-            'NEXT_SYNC_COMMITTEE_GINDEX_ELECTRA': 'GeneralizedIndex(87)',
+            'FINALIZED_ROOT_GINDEX_ELECTRA': 'GeneralizedIndex(553)',
+            'CURRENT_SYNC_COMMITTEE_GINDEX_ELECTRA': 'GeneralizedIndex(278)',
+            'NEXT_SYNC_COMMITTEE_GINDEX_ELECTRA': 'GeneralizedIndex(279)',
+            'EXECUTION_PAYLOAD_GINDEX_ELECTRA': 'GeneralizedIndex(137)',
+        }
+
+    @classmethod
+    def hardcoded_custom_type_dep_constants(cls, spec_object) -> Dict[str, str]:
+        return {
+            'KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_ELECTRA': spec_object.preset_vars['KZG_COMMITMENT_INCLUSION_PROOF_DEPTH_ELECTRA'].value,
         }
 
 
@@ -58,4 +66,4 @@ def verify_and_notify_new_payload(self: ExecutionEngine,
         return True
 
 
-EXECUTION_ENGINE = NoopExecutionEngine()"""
+EXECUTION_ENGINE = NoopExecutionEngine()"""

setup.py

@@ -571,7 +571,7 @@ def run(self):
         "pycryptodome>=3.19.1",
         "py_ecc==6.0.0",
         "milagro_bls_binding==1.9.0",
-        "remerkleable==0.1.28",
+        "remerkleable @ git+https://github.com/etan-status/remerkleable@dev/etan/sc-default",
         "trie>=3,<4",
         RUAMEL_YAML_VERSION,
         "lru-dict==1.2.0",

specs/_features/eip7732/beacon-chain.md

@@ -23,8 +23,11 @@
     - [`ExecutionPayloadEnvelope`](#executionpayloadenvelope)
     - [`SignedExecutionPayloadEnvelope`](#signedexecutionpayloadenvelope)
   - [Modified containers](#modified-containers)
+    - [`StableBeaconBlockBody`](#stablebeaconblockbody)
     - [`BeaconBlockBody`](#beaconblockbody)
+    - [`StableExecutionPayloadHeader`](#stableexecutionpayloadheader)
     - [`ExecutionPayloadHeader`](#executionpayloadheader)
+    - [`StableBeaconState`](#stablebeaconstate)
     - [`BeaconState`](#beaconstate)
 - [Helper functions](#helper-functions)
   - [Math](#math)
@@ -175,12 +178,34 @@ class SignedExecutionPayloadEnvelope(Container):
 
 ### Modified containers
 
-#### `BeaconBlockBody`
+#### `StableBeaconBlockBody`
 
 **Note:** The Beacon Block body is modified to contain a `Signed ExecutionPayloadHeader`. The containers `BeaconBlock` and `SignedBeaconBlock` are modified indirectly. The field `execution_requests` is removed from the beacon block body and moved into the signed execution payload envelope.
 
 ```python
-class BeaconBlockBody(Container):
+class StableBeaconBlockBody(StableContainer[MAX_BEACON_BLOCK_BODY_FIELDS]):
+    randao_reveal: Optional[BLSSignature]
+    eth1_data: Optional[Eth1Data]  # Eth1 data vote
+    graffiti: Optional[Bytes32]  # Arbitrary data
+    proposer_slashings: Optional[List[ProposerSlashing, MAX_PROPOSER_SLASHINGS]]
+    attester_slashings: Optional[List[StableAttesterSlashing, MAX_ATTESTER_SLASHINGS_ELECTRA]]
+    attestations: Optional[List[Attestation, MAX_ATTESTATIONS_ELECTRA]]
+    deposits: Optional[List[Deposit, MAX_DEPOSITS]]
+    voluntary_exits: Optional[List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]]
+    sync_aggregate: Optional[SyncAggregate]
+    execution_payload: Optional[StableExecutionPayload]  # [Removed in EIP-7732]
+    bls_to_execution_changes: Optional[List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]]
+    blob_kzg_commitments: Optional[List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]]  # [Removed in EIP-7732]
+    execution_requests: Optional[StableExecutionRequests]  # [Removed in EIP-7732]
+    # PBS
+    signed_execution_payload_header: Optional[SignedExecutionPayloadHeader]   # [New in EIP-7732]
+    payload_attestations: Optional[List[PayloadAttestation, MAX_PAYLOAD_ATTESTATIONS]]  # [New in EIP-7732]
+```
+
+#### `BeaconBlockBody`
+
+```python
+class BeaconBlockBody(Profile[StableBeaconBlockBody]):
     randao_reveal: BLSSignature
     eth1_data: Eth1Data  # Eth1 data vote
     graffiti: Bytes32  # Arbitrary data
@@ -201,12 +226,26 @@ class BeaconBlockBody(Container):
     payload_attestations: List[PayloadAttestation, MAX_PAYLOAD_ATTESTATIONS]  # [New in EIP-7732]
 ```
 
+#### `StableExecutionPayloadHeader`
+
+```python
+class StableExecutionPayloadHeader(StableContainer[MAX_EXECUTION_PAYLOAD_FIELDS]):
+    parent_block_hash: Optional[Hash32]
+    parent_block_root: Optional[Root]
+    block_hash: Optional[Hash32]
+    gas_limit: Optional[uint64]
+    builder_index: Optional[ValidatorIndex]
+    slot: Optional[Slot]
+    value: Optional[Gwei]
+    blob_kzg_commitments_root: Optional[Root]
+```
+
 #### `ExecutionPayloadHeader`
 
 **Note:** The `ExecutionPayloadHeader` is modified to only contain the block hash of the committed `ExecutionPayload` in addition to the builder's payment information, gas limit and KZG commitments root to verify the inclusion proofs.
 
 ```python
-class ExecutionPayloadHeader(Container):
+class ExecutionPayloadHeader(Profile[StableExecutionPayloadHeader]):
     parent_block_hash: Hash32
     parent_block_root: Root
     block_hash: Hash32
@@ -217,12 +256,73 @@ class ExecutionPayloadHeader(Container):
     blob_kzg_commitments_root: Root
 ```
 
+#### `StableBeaconState`
+
+```python
+class StableBeaconState(StableContainer[MAX_BEACON_STATE_FIELDS]):
+    # Versioning
+    genesis_time: Optional[uint64]
+    genesis_validators_root: Optional[Root]
+    slot: Optional[Slot]
+    fork: Optional[Fork]
+    # History
+    latest_block_header: Optional[BeaconBlockHeader]
+    block_roots: Optional[Vector[Root, SLOTS_PER_HISTORICAL_ROOT]]
+    state_roots: Optional[Vector[Root, SLOTS_PER_HISTORICAL_ROOT]]
+    # Frozen in Capella, replaced by historical_summaries
+    historical_roots: Optional[List[Root, HISTORICAL_ROOTS_LIMIT]]
+    # Eth1
+    eth1_data: Optional[Eth1Data]
+    eth1_data_votes: Optional[List[Eth1Data, EPOCHS_PER_ETH1_VOTING_PERIOD * SLOTS_PER_EPOCH]]
+    eth1_deposit_index: Optional[uint64]
+    # Registry
+    validators: Optional[List[Validator, VALIDATOR_REGISTRY_LIMIT]]
+    balances: Optional[List[Gwei, VALIDATOR_REGISTRY_LIMIT]]
+    # Randomness
+    randao_mixes: Optional[Vector[Bytes32, EPOCHS_PER_HISTORICAL_VECTOR]]
+    # Slashings
+    slashings: Optional[Vector[Gwei, EPOCHS_PER_SLASHINGS_VECTOR]]  # Per-epoch sums of slashed effective balances
+    # Participation
+    previous_epoch_participation: Optional[List[ParticipationFlags, VALIDATOR_REGISTRY_LIMIT]]
+    current_epoch_participation: Optional[List[ParticipationFlags, VALIDATOR_REGISTRY_LIMIT]]
+    # Finality
+    justification_bits: Optional[Bitvector[JUSTIFICATION_BITS_LENGTH]]  # Bit set for every recent justified epoch
+    previous_justified_checkpoint: Optional[Checkpoint]
+    current_justified_checkpoint: Optional[Checkpoint]
+    finalized_checkpoint: Optional[Checkpoint]
+    # Inactivity
+    inactivity_scores: Optional[List[uint64, VALIDATOR_REGISTRY_LIMIT]]
+    # Sync
+    current_sync_committee: Optional[SyncCommittee]
+    next_sync_committee: Optional[SyncCommittee]
+    # Execution
+    latest_execution_payload_header: Optional[StableExecutionPayloadHeader]
+    # Withdrawals
+    next_withdrawal_index: Optional[WithdrawalIndex]
+    next_withdrawal_validator_index: Optional[ValidatorIndex]
+    # Deep history valid from Capella onwards
+    historical_summaries: Optional[List[HistoricalSummary, HISTORICAL_ROOTS_LIMIT]]
+    deposit_requests_start_index: Optional[uint64]
+    deposit_balance_to_consume: Optional[Gwei]
+    exit_balance_to_consume: Optional[Gwei]
+    earliest_exit_epoch: Optional[Epoch]
+    consolidation_balance_to_consume: Optional[Gwei]
+    earliest_consolidation_epoch: Optional[Epoch]
+    pending_deposits: Optional[List[PendingDeposit, PENDING_DEPOSITS_LIMIT]]
+    pending_partial_withdrawals: Optional[List[PendingPartialWithdrawal, PENDING_PARTIAL_WITHDRAWALS_LIMIT]]
+    pending_consolidations: Optional[List[PendingConsolidation, PENDING_CONSOLIDATIONS_LIMIT]]
+    # PBS
+    latest_block_hash: Optional[Hash32]  # [New in EIP-7732]
+    latest_full_slot: Optional[Slot]  # [New in EIP-7732]
+    latest_withdrawals_root: Optional[Root]  # [New in EIP-7732]
+```
+
 #### `BeaconState`
 
 *Note*: The `BeaconState` is modified to track the last withdrawals honored in the CL. The `latest_execution_payload_header` is modified semantically to refer not to a past committed `ExecutionPayload` but instead it corresponds to the state's slot builder's bid. Another addition is to track the last committed block hash and the last slot that was full, that is in which there were both consensus and execution blocks included.
 
 ```python
-class BeaconState(Container):
+class BeaconState(Profile[StableBeaconState]):
     # Versioning
     genesis_time: uint64
     genesis_validators_root: Root

specs/capella/light-client/full-node.md

@@ -47,7 +47,7 @@ def block_to_light_client_header(block: SignedBeaconBlock) -> LightClientHeader:
             withdrawals_root=hash_tree_root(payload.withdrawals),
         )
         execution_branch = ExecutionBranch(
-            compute_merkle_proof(block.message.body, EXECUTION_PAYLOAD_GINDEX))
+            compute_merkle_proof(block.message.body, execution_payload_gindex_at_slot(block.message.slot)))
     else:
         # Note that during fork transitions, `finalized_header` may still point to earlier forks.
         # While Bellatrix blocks also contain an `ExecutionPayload` (minus `withdrawals_root`),