Move requests out of execution_payload into beacon_block.body

types/electra/block.yaml

@@ -48,10 +48,12 @@ Electra:
     allOf:
       - $ref: "#/Electra/BeaconBlockBodyCommon"
       - type: object
-        required: [execution_payload]
+        required: [execution_payload, execution_requests]
         properties:
           execution_payload:
-            $ref: "./execution_payload.yaml#/Electra/ExecutionPayload"
+            $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayload"
+          execution_requests:
+            $ref: "./execution_requests.yaml#/Electra/ExecutionRequests"
 
   BeaconBlock:
     description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/phase0/beacon-chain.md#beaconblock) object from the CL Electra spec."
@@ -78,10 +80,12 @@ Electra:
     allOf:
       - $ref: "#/Electra/BeaconBlockBodyCommon"
       - type: object
-        required: [execution_payload_header]
+        required: [execution_payload_header, execution_requests_root]
         properties:
           execution_payload_header:
-            $ref: "./execution_payload.yaml#/Electra/ExecutionPayloadHeader"
+            $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayloadHeader"
+          execution_requests_root:
+            $ref: "../primitive.yaml#/Root"
 
   BlindedBeaconBlock:
     description: "A variant of the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/phase0/beacon-chain.md#beaconblock) object from the CL Electra spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`."

types/electra/execution_requests.yaml

@@ -0,0 +1,21 @@
+Electra:  
+  ExecutionRequests:
+    type: object
+    description: "The [`ExecutionRequests`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.6/specs/electra/beacon-chain.md#executionrequests) object from the CL Electra spec."
+    required: [deposits, withdrawals, consolidations]
+    properties:
+      deposits:
+        type: array
+        items:
+          $ref: "./deposit.yaml#/Electra/DepositRequest"
+        maxItems: 8192
+      withdrawals:
+        type: array
+        items:
+          $ref: "./withdrawal.yaml#/Electra/WithdrawalRequest"
+        maxItems: 16
+      consolidations:
+        type: array
+        items:
+          $ref: "./consolidation.yaml#/Electra/ConsolidationRequest"
+        maxItems: 1

types/electra/state.yaml

@@ -82,7 +82,7 @@ Electra:
       next_sync_committee:
         $ref: "../altair/sync_committee.yaml#/Altair/SyncCommittee"
       latest_execution_payload_header:
-        $ref: "./execution_payload.yaml#/Electra/ExecutionPayloadHeader"
+        $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayloadHeader"
       next_withdrawal_index:
         $ref: "../primitive.yaml#/Uint64"
       next_withdrawal_validator_index: