Moving requests out of execution_payload into beacon_block.body

specs/electra/beacon-chain.md

@@ -30,12 +30,14 @@
     - [`WithdrawalRequest`](#withdrawalrequest)
     - [`ConsolidationRequest`](#consolidationrequest)
     - [`PendingConsolidation`](#pendingconsolidation)
+    - [`ValidatorRequests`](#validatorrequests)
+    - [`ExecutionPayloadEnvelope`](#executionpayloadenvelope)
   - [Modified Containers](#modified-containers)
     - [`AttesterSlashing`](#attesterslashing)
+    - [`BeaconBlockBody`](#beaconblockbody)
   - [Extended Containers](#extended-containers)
     - [`Attestation`](#attestation)
     - [`IndexedAttestation`](#indexedattestation)
-    - [`BeaconBlockBody`](#beaconblockbody)
     - [`ExecutionPayload`](#executionpayload)
     - [`ExecutionPayloadHeader`](#executionpayloadheader)
     - [`BeaconState`](#beaconstate)
@@ -258,36 +260,35 @@ class PendingConsolidation(Container):
     target_index: ValidatorIndex
 ```
 
-### Modified Containers
+#### `ValidatorRequests`
 
-#### `AttesterSlashing`
+*Note*: The container is new in EIP????.
 
 ```python
-class AttesterSlashing(Container):
-    attestation_1: IndexedAttestation  # [Modified in Electra:EIP7549]
-    attestation_2: IndexedAttestation  # [Modified in Electra:EIP7549]
+class ValidatorRequests(Container):
+    deposit_requests: List[DepositRequest, MAX_DEPOSIT_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP6110]
+    withdrawal_requests: List[WithdrawalRequest, MAX_WITHDRAWAL_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP7002:EIP7251]
+    consolidation_requests: List[ConsolidationRequest, MAX_CONSOLIDATION_REQUESTS_PER_PAYLOAD]  # [New in Electra:EIP7251]
 ```
 
-### Extended Containers
+#### `ExecutionPayloadEnvelope`
 
-#### `Attestation`
+*Note*: The container is new in EIP????.
 
 ```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]
+class ExecutionPayloadEnvelope(Container):
+    execution_payload: ExecutionPayload  # [Modified in Electra:EIP6110:EIP7002]
+    requests: ValidatorRequests
 ```
 
-#### `IndexedAttestation`
+### Modified Containers
+
+#### `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,11 +306,33 @@ class BeaconBlockBody(Container):
     voluntary_exits: List[SignedVoluntaryExit, MAX_VOLUNTARY_EXITS]
     sync_aggregate: SyncAggregate
     # Execution
-    execution_payload: ExecutionPayload  # [Modified in Electra:EIP6110:EIP7002]
+    execution_payload_envelope: ExecutionPayloadEnvelope  # [Modified in Electra:EIP????]
     bls_to_execution_changes: List[SignedBLSToExecutionChange, MAX_BLS_TO_EXECUTION_CHANGES]
     blob_kzg_commitments: List[KZGCommitment, MAX_BLOB_COMMITMENTS_PER_BLOCK]
 ```
 
+### 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]
+```
+
+#### `IndexedAttestation`
+
+```python
+class IndexedAttestation(Container):
+    # [Modified in Electra:EIP7549]
+    attesting_indices: List[ValidatorIndex, MAX_VALIDATORS_PER_COMMITTEE * MAX_COMMITTEES_PER_SLOT]
+    data: AttestationData
+    signature: BLSSignature
+```
+
 #### `ExecutionPayload`
 
 ```python
@@ -875,7 +898,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.
@@ -946,8 +969,8 @@ def process_effective_balance_updates(state: BeaconState) -> None:
 ```python
 def process_block(state: BeaconState, block: BeaconBlock) -> None:
     process_block_header(state, block)
-    process_withdrawals(state, block.body.execution_payload)  # [Modified in Electra:EIP7251]
-    process_execution_payload(state, block.body, EXECUTION_ENGINE)  # [Modified in Electra:EIP6110]
+    process_withdrawals(state, block.body.execution_payload_envelope.execution_payload)  # [Modified in Electra:EIP7251:EIP????]
+    process_execution_payload(state, block.body, EXECUTION_ENGINE)  # [Modified in Electra:EIP6110:EIP????]
     process_randao(state, block.body)
     process_eth1_data(state, block.body)
     process_operations(state, block.body)  # [Modified in Electra:EIP6110:EIP7002:EIP7549:EIP7251]
@@ -1052,11 +1075,11 @@ def process_withdrawals(state: BeaconState, payload: ExecutionPayload) -> None:
 
 ##### Modified `process_execution_payload`
 
-*Note*: The function `process_execution_payload` is modified to use the new `ExecutionPayloadHeader` type.
+*Note*: The function `process_execution_payload` is modified to use the new `ExecutionPayloadHeader` and `ExecutionPayloadEnveloped` types.
 
 ```python
 def process_execution_payload(state: BeaconState, body: BeaconBlockBody, execution_engine: ExecutionEngine) -> None:
-    payload = body.execution_payload
+    payload = body.execution_payload_envelope.execution_payload   # [Modified in EIP????]
 
     # 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
@@ -1126,11 +1149,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]
-    # [New in Electra:EIP7002:EIP7251]
-    for_ops(body.execution_payload.withdrawal_requests, process_withdrawal_request)
-    # [New in Electra:EIP7251]
-    for_ops(body.execution_payload.consolidation_requests, process_consolidation_request)
+    for_ops(body.execution_payload_envelope.requests.deposit_requests, process_deposit_request)  # [New in Electra:EIP6110:EIP????]
+    # [New in Electra:EIP7002:EIP7251:EIP????]
+    for_ops(body.execution_payload_envelope.requests.withdrawal_requests, process_withdrawal_request)
+    # [New in Electra:EIP7251:EIP????]
+    for_ops(body.execution_payload_envelope.requests.consolidation_requests, process_consolidation_request)
 ```
 
 ##### Attestations