Merge branch 'master' into nflaig/remove-block-apis

Author: nflaig

apis/beacon/pool/attestations.v2.yaml

@@ -56,7 +56,7 @@ post:
   operationId: submitPoolAttestationsV2
   summary: Submit Attestation objects to node
   description: |
-    Submits Attestation objects to the node. Each attestation in the request body is processed individually.
+    Submits attestations to the node. Each attestation in the request body is processed individually.
     
     If an attestation is validated successfully, the node MUST publish that attestation on the appropriate subnet.
 
@@ -82,7 +82,7 @@ post:
                 $ref: '../../../beacon-node-oapi.yaml#/components/schemas/Attestation'
             - type: array
               items:
-                $ref: '../../../beacon-node-oapi.yaml#/components/schemas/Electra.Attestation'
+                $ref: '../../../beacon-node-oapi.yaml#/components/schemas/Electra.SingleAttestation'
   responses:
     "200":
       description: Attestations are stored in pool and broadcast on the appropriate subnet

apis/debug/fork_choice.yaml

@@ -13,7 +13,7 @@ get:
             title: GetForkChoiceResponse
             type: object
             description: "Debugging context of fork choice"
-            required: [justified_checkpoint, finalized_checkpoint]
+            required: [justified_checkpoint, finalized_checkpoint, fork_choice_nodes]
             properties:
               justified_checkpoint:
                 $ref: '../../beacon-node-oapi.yaml#/components/schemas/Checkpoint'
@@ -28,4 +28,4 @@ get:
               extra_data:
                 $ref: "../../beacon-node-oapi.yaml#/components/schemas/ExtraData"
     "500":
-      $ref: "../../beacon-node-oapi.yaml#/components/responses/InternalError"
+      $ref: "../../beacon-node-oapi.yaml#/components/responses/InternalError"

apis/eventstream/index.yaml

@@ -26,6 +26,7 @@ get:
             - block
             - block_gossip
             - attestation
+            - single_attestation
             - voluntary_exit
             - bls_to_execution_change
             - proposer_slashing
@@ -66,6 +67,11 @@ get:
               value: |
                 event: attestation
                 data: {"aggregation_bits":"0x01", "signature":"0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505", "data":{"slot":"1", "index":"1", "beacon_block_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "source":{"epoch":"1", "root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"}, "target":{"epoch":"1", "root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"}}}
+            single_attestation:
+              description: The node has received a SingleAttestation (from P2P or API) that passes validation rules of the `beacon_attestation_{subnet_id}` topic
+              value: |
+                event: single_attestation
+                data: {"committee_index":"1", "attester_index": "1", "data":{"slot":"1", "index":"1", "beacon_block_root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2", "source":{"epoch":"1", "root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"}, "target":{"epoch":"1", "root":"0xcf8e0d4e9587369b2301d0790347320302cc0943d5a1884560367e8208d920f2"}}, "signature":"0x1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505cc411d61252fb6cb3fa0017b679f8bb2305b26a285fa2737f175668d0dff91cc1b66ac1fb663c9bc59509846d6ec05345bd908eda73e670af888da41af171505"}
             voluntary_exit:
               description: The node has received a SignedVoluntaryExit (from P2P or API) that passes validation rules of `voluntary_exit` topic
               value: |

beacon-node-oapi.yaml

@@ -409,6 +409,8 @@ components:
       $ref: './types/electra/block.yaml#/Electra/SignedBlindedBeaconBlock'
     Electra.Attestation:
       $ref: './types/electra/attestation.yaml#/Electra/Attestation'
+    Electra.SingleAttestation:
+      $ref: './types/electra/attestation.yaml#/Electra/SingleAttestation'
     Electra.AttesterSlashing:
       $ref: './types/electra/attester_slashing.yaml#/Electra/AttesterSlashing'
     Electra.SignedAggregateAndProof:

types/electra/attestation.yaml

@@ -16,6 +16,23 @@ Electra:
         $ref: '../primitive.yaml#/Signature'
         description: "The BLS signature of the `IndexedAttestation`, created by the validator of the attestation."
 
+  SingleAttestation:
+    type: object
+    description: "The [`SingleAttestation`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.9/specs/electra/beacon-chain.md#singleattestation) object from the CL spec."
+    required: [committee_index, attester_index, data, signature]
+    properties:
+      committee_index:
+        $ref: "../primitive.yaml#/Uint64"
+        description: "The attestations committee index."
+      attester_index:
+        $ref: "../primitive.yaml#/Uint64"
+        description: "The validator index that signed this attestation."
+      data:
+        $ref: '../attestation_data.yaml#/AttestationData'
+      signature:
+        $ref: '../primitive.yaml#/Signature'
+        description: "BLS aggregate signature."
+
   Attestation:
     type: object
     description: "The [`Attestation`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.3/specs/electra/beacon-chain.md#attestation) object from the CL spec."

types/electra/block.yaml

@@ -80,12 +80,12 @@ Electra:
     allOf:
       - $ref: "#/Electra/BeaconBlockBodyCommon"
       - type: object
-        required: [execution_payload_header, execution_requests_root]
+        required: [execution_payload_header, execution_requests]
         properties:
           execution_payload_header:
             $ref: "../deneb/execution_payload.yaml#/Deneb/ExecutionPayloadHeader"
-          execution_requests_root:
-            $ref: "../primitive.yaml#/Root"
+          execution_requests:
+            $ref: "./execution_requests.yaml#/Electra/ExecutionRequests"
 
   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/deposit.yaml

@@ -19,14 +19,22 @@ Electra:
         $ref: "../primitive.yaml#/Uint64"
         description: "The index of the deposit request."
 
-  PendingBalanceDeposit:
+  PendingDeposit:
     type: object
-    description: "The [`PendingBalanceDeposit`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#pendingbalancedeposit) object from the CL Electra spec."
-    required: [index, amount]
+    description: "The [`PendingDeposit`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.8/specs/electra/beacon-chain.md#pendingdeposit) object from the CL Electra spec."
+    required: [pubkey, withdrawal_credentials, amount, signature, slot]
     properties:
-      index:
-        $ref: "../primitive.yaml#/Uint64"
-        description: "Index of validator in validator registry."
+      pubkey:
+        $ref: "../primitive.yaml#/Pubkey"
+        description: "BLS public key of validator."
+      withdrawal_credentials:
+        $ref: "../primitive.yaml#/Root"
+        description: "The withdrawal credentials."
       amount:
         $ref: "../primitive.yaml#/Gwei"
         description: "The value to be deposited (gwei)."
+      signature:
+        $ref: "../primitive.yaml#/Signature"
+      slot:
+        $ref: "../primitive.yaml#/Uint64"
+        description: "The slot at which the deposit request was processed."

types/electra/state.yaml

@@ -2,7 +2,7 @@ Electra:
   BeaconState:
     type: object
     description: "The [`BeaconState`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconstate) object from the CL Electra spec."
-    required: [genesis_time, genesis_validators_root, slot, fork, latest_block_header, block_roots, state_roots, historical_roots, eth1_data, eth1_data_votes, eth1_deposit_index, validators, balances, randao_mixes, slashings, previous_epoch_participation, current_epoch_participation, justification_bits, previous_justified_checkpoint, current_justified_checkpoint, finalized_checkpoint, inactivity_scores, current_sync_committee, next_sync_committee, latest_execution_payload_header, next_withdrawal_index, next_withdrawal_validator_index, historical_summaries, deposit_requests_start_index, deposit_balance_to_consume, exit_balance_to_consume, earliest_exit_epoch, consolidation_balance_to_consume, earliest_consolidation_epoch, pending_balance_deposits, pending_partial_withdrawals, pending_consolidations]
+    required: [genesis_time, genesis_validators_root, slot, fork, latest_block_header, block_roots, state_roots, historical_roots, eth1_data, eth1_data_votes, eth1_deposit_index, validators, balances, randao_mixes, slashings, previous_epoch_participation, current_epoch_participation, justification_bits, previous_justified_checkpoint, current_justified_checkpoint, finalized_checkpoint, inactivity_scores, current_sync_committee, next_sync_committee, latest_execution_payload_header, next_withdrawal_index, next_withdrawal_validator_index, historical_summaries, deposit_requests_start_index, deposit_balance_to_consume, exit_balance_to_consume, earliest_exit_epoch, consolidation_balance_to_consume, earliest_consolidation_epoch, pending_deposits, pending_partial_withdrawals, pending_consolidations]
     properties:
       genesis_time:
         $ref: "../primitive.yaml#/Uint64"
@@ -104,10 +104,10 @@ Electra:
         $ref: "../primitive.yaml#/Gwei"
       earliest_consolidation_epoch:
         $ref: "../primitive.yaml#/Uint64"
-      pending_balance_deposits:
+      pending_deposits:
         type: array
         items:
-          $ref: "./deposit.yaml#/Electra/PendingBalanceDeposit"
+          $ref: "./deposit.yaml#/Electra/PendingDeposit"
         maxItems: 134217728
       pending_partial_withdrawals:
         type: array