Moving requests out of execution_payload into beacon_block.body

specs/electra/beacon-chain.md

@@ -30,14 +30,13 @@
     - [`WithdrawalRequest`](#withdrawalrequest)
     - [`ConsolidationRequest`](#consolidationrequest)
     - [`PendingConsolidation`](#pendingconsolidation)
+    - [`ExecutionLayerRequests`](#executionlayerrequests)
   - [Modified Containers](#modified-containers)
     - [`AttesterSlashing`](#attesterslashing)
+    - [`BeaconBlockBody`](#beaconblockbody)
   - [Extended Containers](#extended-containers)
     - [`Attestation`](#attestation)
     - [`IndexedAttestation`](#indexedattestation)
-    - [`BeaconBlockBody`](#beaconblockbody)
-    - [`ExecutionPayload`](#executionpayload)
-    - [`ExecutionPayloadHeader`](#executionpayloadheader)
     - [`BeaconState`](#beaconstate)
 - [Helper functions](#helper-functions)
   - [Predicates](#predicates)
@@ -78,8 +77,6 @@
     - [Withdrawals](#withdrawals)
       - [Modified `get_expected_withdrawals`](#modified-get_expected_withdrawals)
       - [Modified `process_withdrawals`](#modified-process_withdrawals)
-    - [Execution payload](#execution-payload)
-      - [Modified `process_execution_payload`](#modified-process_execution_payload)
     - [Operations](#operations)
       - [Modified `process_operations`](#modified-process_operations)
       - [Attestations](#attestations)
@@ -258,36 +255,26 @@ class PendingConsolidation(Container):
     target_index: ValidatorIndex
 ```
 
-### Modified Containers
+#### `ExecutionLayerRequests`
 
-#### `AttesterSlashing`
+*Note*: This container contains request from the execution layer that are received in the Execution Payload via
+Engine API. These requests are required for CL state transition (see **BeaconBlockBody**).
 
 ```python
-class AttesterSlashing(Container):
-    attestation_1: IndexedAttestation  # [Modified in Electra:EIP7549]
-    attestation_2: IndexedAttestation  # [Modified in Electra:EIP7549]
+class ExecutionLayerRequests(Container):
+    deposits: List[DepositRequest, MAX_DEPOSIT_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP6110]
+    withdrawals: List[WithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP7002:EIP7251]
+    consolidations: List[ConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP7251]
 ```
 
-### Extended Containers
-
-#### `Attestation`
-
-```python
-class Attestation(Container):
-    aggregation_bits: Bitlist[MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]  # [Modified in Electra:EIP7549]
-    data: AttestationData
-    signature: BLSSignature
-    committee_bits: Bitvector[MAX_COMMITTEES_PER_SLOT]  # [New in Electra:EIP7549]
-```
+### Modified Containers
 
-#### `IndexedAttestation`
+#### `AttesterSlashing`
 
 ```python
-class IndexedAttestation(Container):
-    # [Modified in Electra:EIP7549]
-    attesting_indices: List[ValidatorIndex, MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]
-    data: AttestationData
-    signature: BLSSignature
+class AttesterSlashing(Container):
+    attestation_1: IndexedAttestation  # [Modified in Electra:EIP7549]
+    attestation_2: IndexedAttestation  # [Modified in Electra:EIP7549]
 ```
 
 #### `BeaconBlockBody`
@@ -305,67 +292,32 @@ class BeaconBlockBody(Container):
     voluntary_exits: List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]
     sync_aggregate: SyncAggregate
     # Execution
-    execution_payload: ExecutionPayload  # [Modified in Electra:EIP6110:EIP7002]
+    execution_payload: ExecutionPayload
     bls_to_execution_changes: List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]
     blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
+    requests: ExecutionLayerRequests  # [New in Electra]
 ```
 
-#### `ExecutionPayload`
+### Extended Containers
+
+#### `Attestation`
 
 ```python
-class ExecutionPayload(Container):
-    # Execution block header fields
-    parent_hash: Hash32
-    fee_recipient: ExecutionAddress
-    state_root: Bytes32
-    receipts_root: Bytes32
-    logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
-    prev_randao: Bytes32
-    block_number: uint64
-    gas_limit: uint64
-    gas_used: uint64
-    timestamp: uint64
-    extra_data: ByteList[MAX_EXTRA_DATA_BYTES]
-    base_fee_per_gas: uint256
-    # Extra payload fields
-    block_hash: Hash32
-    transactions: List[Transaction, MAX_TRANSACTIONS_PER_PAYLOAD]
-    withdrawals: List[Withdrawal, MAX_WITHDRAWALS_PER_PAYLOAD]
-    blob_gas_used: uint64
-    excess_blob_gas: uint64
-    deposit_requests: List[DepositRequest, MAX_DEPOSIT_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP6110]
-    # [New in Electra:EIP7002:EIP7251]
-    withdrawal_requests: List[WithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD]
-    # [New in Electra:EIP7251]
-    consolidation_requests: List[ConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD]
+class Attestation(Container):
+    aggregation_bits: Bitlist[MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]  # [Modified in Electra:EIP7549]
+    data: AttestationData
+    signature: BLSSignature
+    committee_bits: Bitvector[MAX_COMMITTEES_PER_SLOT]  # [New in Electra:EIP7549]
 ```
 
-#### `ExecutionPayloadHeader`
+#### `IndexedAttestation`
 
 ```python
-class ExecutionPayloadHeader(Container):
-    # Execution block header fields
-    parent_hash: Hash32
-    fee_recipient: ExecutionAddress
-    state_root: Bytes32
-    receipts_root: Bytes32
-    logs_bloom: ByteVector[BYTES_PER_LOGS_BLOOM]
-    prev_randao: Bytes32
-    block_number: uint64
-    gas_limit: uint64
-    gas_used: uint64
-    timestamp: uint64
-    extra_data: ByteList[MAX_EXTRA_DATA_BYTES]
-    base_fee_per_gas: uint256
-    # Extra payload fields
-    block_hash: Hash32
-    transactions_root: Root
-    withdrawals_root: Root
-    blob_gas_used: uint64
-    excess_blob_gas: uint64
-    deposit_requests_root: Root  # [New in Electra:EIP6110]
-    withdrawal_requests_root: Root  # [New in Electra:EIP7002:EIP7251]
-    consolidation_requests_root: Root  # [New in Electra:EIP7251]
+class IndexedAttestation(Container):
+    # [Modified in Electra:EIP7549]
+    attesting_indices: List[ValidatorIndex, MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]
+    data: AttestationData
+    signature: BLSSignature
 ```
 
 #### `BeaconState`
@@ -875,7 +827,7 @@ def process_pending_balance_deposits(state: BeaconState) -> None:
             if processed_amount + deposit.amount > available_for_processing:
                 break
             # Deposit fits in the churn, process it. Increase balance and consume churn.
-            else: 
+            else:
                 increase_balance(state, deposit.index, deposit.amount)
                 processed_amount += deposit.amount
         # Regardless of how the deposit was handled, we move on in the queue.
@@ -1047,59 +999,6 @@ def process_withdrawals(state: BeaconState, payload: ExecutionPayload) -> None:
         next_validator_index = ValidatorIndex(next_index % len(state.validators))
         state.next_withdrawal_validator_index = next_validator_index
 ```
-
-#### Execution payload
-
-##### Modified `process_execution_payload`
-
-*Note*: The function `process_execution_payload` is modified to use the new `ExecutionPayloadHeader` type.
-
-```python
-def process_execution_payload(state: BeaconState, body: BeaconBlockBody, execution_engine: ExecutionEngine) -> None:
-    payload = body.execution_payload
-
-    # Verify consistency of the parent hash with respect to the previous execution payload header
-    assert payload.parent_hash == state.latest_execution_payload_header.block_hash
-    # Verify prev_randao
-    assert payload.prev_randao == get_randao_mix(state, get_current_epoch(state))
-    # Verify timestamp
-    assert payload.timestamp == compute_timestamp_at_slot(state, state.slot)
-    # Verify commitments are under limit
-    assert len(body.blob_kzg_commitments) <= MAX_BLOBS_PER_BLOCK
-    # Verify the execution payload is valid
-    versioned_hashes = [kzg_commitment_to_versioned_hash(commitment) for commitment in body.blob_kzg_commitments]
-    assert execution_engine.verify_and_notify_new_payload(
-        NewPayloadRequest(
-            execution_payload=payload,
-            versioned_hashes=versioned_hashes,
-            parent_beacon_block_root=state.latest_block_header.parent_root,
-        )
-    )
-    # Cache execution payload header
-    state.latest_execution_payload_header = ExecutionPayloadHeader(
-        parent_hash=payload.parent_hash,
-        fee_recipient=payload.fee_recipient,
-        state_root=payload.state_root,
-        receipts_root=payload.receipts_root,
-        logs_bloom=payload.logs_bloom,
-        prev_randao=payload.prev_randao,
-        block_number=payload.block_number,
-        gas_limit=payload.gas_limit,
-        gas_used=payload.gas_used,
-        timestamp=payload.timestamp,
-        extra_data=payload.extra_data,
-        base_fee_per_gas=payload.base_fee_per_gas,
-        block_hash=payload.block_hash,
-        transactions_root=hash_tree_root(payload.transactions),
-        withdrawals_root=hash_tree_root(payload.withdrawals),
-        blob_gas_used=payload.blob_gas_used,
-        excess_blob_gas=payload.excess_blob_gas,
-        deposit_requests_root=hash_tree_root(payload.deposit_requests),  # [New in Electra:EIP6110]
-        withdrawal_requests_root=hash_tree_root(payload.withdrawal_requests),  # [New in Electra:EIP7002:EIP7251]
-        consolidation_requests_root=hash_tree_root(payload.consolidation_requests),  # [New in Electra:EIP7251]
-    )
-```
-
 #### Operations
 
 ##### Modified `process_operations`
@@ -1126,11 +1025,11 @@ def process_operations(state: BeaconState, body: BeaconBlockBody) -> None:
     for_ops(body.deposits, process_deposit)  # [Modified in Electra:EIP7251]
     for_ops(body.voluntary_exits, process_voluntary_exit)  # [Modified in Electra:EIP7251]
     for_ops(body.bls_to_execution_changes, process_bls_to_execution_change)
-    for_ops(body.execution_payload.deposit_requests, process_deposit_request)  # [New in Electra:EIP6110]
+    for_ops(body.requests.deposits, process_deposit_request)  # [New in Electra:EIP6110]
     # [New in Electra:EIP7002:EIP7251]
-    for_ops(body.execution_payload.withdrawal_requests, process_withdrawal_request)
+    for_ops(body.requests.withdrawals, process_withdrawal_request)
     # [New in Electra:EIP7251]
-    for_ops(body.execution_payload.consolidation_requests, process_consolidation_request)
+    for_ops(body.requests.consolidations, process_consolidation_request)
 ```
 
 ##### Attestations

specs/electra/fork.md

@@ -72,28 +72,7 @@ an irregular state change is made to upgrade to Electra.
 ```python
 def upgrade_to_electra(pre: deneb.BeaconState) -> BeaconState:
     epoch = deneb.get_current_epoch(pre)
-    latest_execution_payload_header = ExecutionPayloadHeader(
-        parent_hash=pre.latest_execution_payload_header.parent_hash,
-        fee_recipient=pre.latest_execution_payload_header.fee_recipient,
-        state_root=pre.latest_execution_payload_header.state_root,
-        receipts_root=pre.latest_execution_payload_header.receipts_root,
-        logs_bloom=pre.latest_execution_payload_header.logs_bloom,
-        prev_randao=pre.latest_execution_payload_header.prev_randao,
-        block_number=pre.latest_execution_payload_header.block_number,
-        gas_limit=pre.latest_execution_payload_header.gas_limit,
-        gas_used=pre.latest_execution_payload_header.gas_used,
-        timestamp=pre.latest_execution_payload_header.timestamp,
-        extra_data=pre.latest_execution_payload_header.extra_data,
-        base_fee_per_gas=pre.latest_execution_payload_header.base_fee_per_gas,
-        block_hash=pre.latest_execution_payload_header.block_hash,
-        transactions_root=pre.latest_execution_payload_header.transactions_root,
-        withdrawals_root=pre.latest_execution_payload_header.withdrawals_root,
-        blob_gas_used=pre.latest_execution_payload_header.blob_gas_used,
-        excess_blob_gas=pre.latest_execution_payload_header.excess_blob_gas,
-        deposit_requests_root=Root(),  # [New in Electra:EIP6110]
-        withdrawal_requests_root=Root(),  # [New in Electra:EIP7002]
-        consolidation_requests_root=Root(),  # [New in Electra:EIP7251]
-    )
+    latest_execution_payload_header = pre.latest_execution_payload_header
 
     exit_epochs = [v.exit_epoch for v in pre.validators if v.exit_epoch != FAR_FUTURE_EPOCH]
     if not exit_epochs:

specs/electra/light-client/fork.md

@@ -39,28 +39,7 @@ A Electra `LightClientStore` can still process earlier light client data. In ord
 def upgrade_lc_header_to_electra(pre: deneb.LightClientHeader) -> LightClientHeader:
     return LightClientHeader(
         beacon=pre.beacon,
-        execution=ExecutionPayloadHeader(
-            parent_hash=pre.execution.parent_hash,
-            fee_recipient=pre.execution.fee_recipient,
-            state_root=pre.execution.state_root,
-            receipts_root=pre.execution.receipts_root,
-            logs_bloom=pre.execution.logs_bloom,
-            prev_randao=pre.execution.prev_randao,
-            block_number=pre.execution.block_number,
-            gas_limit=pre.execution.gas_limit,
-            gas_used=pre.execution.gas_used,
-            timestamp=pre.execution.timestamp,
-            extra_data=pre.execution.extra_data,
-            base_fee_per_gas=pre.execution.base_fee_per_gas,
-            block_hash=pre.execution.block_hash,
-            transactions_root=pre.execution.transactions_root,
-            withdrawals_root=pre.execution.withdrawals_root,
-            blob_gas_used=pre.execution.blob_gas_used,
-            excess_blob_gas=pre.execution.blob_gas_used,
-            deposit_requests_root=Root(),  # [New in Electra:EIP6110]
-            withdrawal_requests_root=Root(),  # [New in Electra:EIP7002:EIP7251]
-            consolidation_requests_root=Root(),  # [New in Electra:EIP7251]
-        ),
+        execution=pre.execution,
         execution_branch=pre.execution_branch,
     )
 ```

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

@@ -50,12 +50,6 @@ def block_to_light_client_header(block: SignedBeaconBlock) -> LightClientHeader:
             execution_header.blob_gas_used = payload.blob_gas_used
             execution_header.excess_blob_gas = payload.excess_blob_gas
 
-        # [New in Electra:EIP6110:EIP7002:EIP7251]
-        if epoch >= ELECTRA_FORK_EPOCH:
-            execution_header.deposit_requests_root = hash_tree_root(payload.deposit_requests)
-            execution_header.withdrawal_requests_root = hash_tree_root(payload.withdrawal_requests)
-            execution_header.consolidation_requests_root = hash_tree_root(payload.consolidation_requests)
-
         execution_branch = ExecutionBranch(
             compute_merkle_proof(block.message.body, EXECUTION_PAYLOAD_GINDEX))
     else:

specs/electra/light-client/sync-protocol.md

@@ -159,15 +159,6 @@ def get_lc_execution_root(header: LightClientHeader) -> Root:
 def is_valid_light_client_header(header: LightClientHeader) -> bool:
     epoch = compute_epoch_at_slot(header.beacon.slot)
 
-    # [New in Electra:EIP6110:EIP7002:EIP7251]
-    if epoch < ELECTRA_FORK_EPOCH:
-        if (
-            header.execution.deposit_requests_root != Root()
-            or header.execution.withdrawal_requests_root != Root()
-            or header.execution.consolidation_requests_root != Root()
-        ):
-            return False
-
     if epoch < DENEB_FORK_EPOCH:
         if header.execution.blob_gas_used != uint64(0) or header.execution.excess_blob_gas != uint64(0):
             return False

tests/core/pyspec/eth2spec/test/electra/sanity/blocks/test_blocks.py

@@ -41,7 +41,7 @@ def test_basic_el_withdrawal_request(spec, state):
         validator_pubkey=validator_pubkey,
     )
     block = build_empty_block_for_next_slot(spec, state)
-    block.body.execution_payload.withdrawal_requests = [withdrawal_request]
+    block.body.requests.withdrawals = [withdrawal_request]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload, state)
     signed_block = state_transition_and_sign_block(spec, state, block)
 
@@ -77,7 +77,7 @@ def test_basic_btec_and_el_withdrawal_request_in_same_block(spec, state):
         source_address=address,
         validator_pubkey=validator_pubkey,
     )
-    block.body.execution_payload.withdrawal_requests = [withdrawal_request]
+    block.body.requests.withdrawals = [withdrawal_request]
 
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload, state)
     signed_block = state_transition_and_sign_block(spec, state, block)
@@ -130,7 +130,7 @@ def test_basic_btec_before_el_withdrawal_request(spec, state):
         validator_pubkey=validator_pubkey,
     )
     block_2 = build_empty_block_for_next_slot(spec, state)
-    block_2.body.execution_payload.withdrawal_requests = [withdrawal_request]
+    block_2.body.requests.withdrawals = [withdrawal_request]
     block_2.body.execution_payload.block_hash = compute_el_block_hash(spec, block_2.body.execution_payload, state)
     signed_block_2 = state_transition_and_sign_block(spec, state, block_2)
 
@@ -163,7 +163,7 @@ def test_cl_exit_and_el_withdrawal_request_in_same_block(spec, state):
     )
     block = build_empty_block_for_next_slot(spec, state)
     block.body.voluntary_exits = signed_voluntary_exits
-    block.body.execution_payload.withdrawal_requests = [withdrawal_request]
+    block.body.requests.withdrawals = [withdrawal_request]
     block.body.execution_payload.block_hash = compute_el_block_hash(spec, block.body.execution_payload, state)
     signed_block = state_transition_and_sign_block(spec, state, block)