From 3261557078c63f6cad9bf0071d42391136d8f46b Mon Sep 17 00:00:00 2001
From: Mehdi AOUADI <mehdi.aouadi@consensys.net>
Date: Thu, 27 Jun 2024 18:14:50 +0200
Subject: [PATCH] rebase master

---
 apis/beacon/blocks/attestations.v2.yaml | 1 -
 apis/beacon/pool/attestations.v2.yaml   | 2 +-
 beacon-node-oapi.yaml                   | 2 --
 types/attestation.yaml                  | 1 +
 types/attestation_data.yaml             | 2 +-
 types/electra/attestation.yaml          | 7 ++++---
 6 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apis/beacon/blocks/attestations.v2.yaml b/apis/beacon/blocks/attestations.v2.yaml
index 8727bd05..785ed096 100644
--- a/apis/beacon/blocks/attestations.v2.yaml
+++ b/apis/beacon/blocks/attestations.v2.yaml
@@ -9,7 +9,6 @@ get:
       in: path
       required: true
       $ref: '../../../beacon-node-oapi.yaml#/components/parameters/BlockId'
-
   responses:
     "200":
       description: Success
diff --git a/apis/beacon/pool/attestations.v2.yaml b/apis/beacon/pool/attestations.v2.yaml
index e1bdbe6c..7a8be747 100644
--- a/apis/beacon/pool/attestations.v2.yaml
+++ b/apis/beacon/pool/attestations.v2.yaml
@@ -67,7 +67,7 @@ post:
         $ref: '../../../beacon-node-oapi.yaml#/components/schemas/ConsensusVersion'
       required: true
       name: Eth-Consensus-Version
-      description: "Version of the attestation being submitted."
+      description: "Version of the attestations being submitted."
   tags:
     - Beacon
     - ValidatorRequiredApi
diff --git a/beacon-node-oapi.yaml b/beacon-node-oapi.yaml
index c8feea51..8ead8a63 100644
--- a/beacon-node-oapi.yaml
+++ b/beacon-node-oapi.yaml
@@ -383,8 +383,6 @@ components:
       $ref: './types/primitive.yaml#/Blob'
     Deneb.BlobSidecars:
       $ref: './types/deneb/blob_sidecar.yaml#/Deneb/BlobSidecars'
-    Electra.Attestation:
-      $ref: './types/electra/attestation.yaml#/Electra/Attestation'
     Node:
       $ref: './types/fork_choice.yaml#/Node'
     ExtraData:
diff --git a/types/attestation.yaml b/types/attestation.yaml
index a71b07b6..b31beba4 100644
--- a/types/attestation.yaml
+++ b/types/attestation.yaml
@@ -1,6 +1,7 @@
 IndexedAttestation:
   type: object
   description: "The [`IndexedAttestation`](https://github.com/ethereum/consensus-specs/blob/v1.3.0/specs/phase0/beacon-chain.md#indexedattestation) object from the CL spec."
+  required: [attesting_indices, signature, data]
   properties:
     attesting_indices:
       type: array
diff --git a/types/attestation_data.yaml b/types/attestation_data.yaml
index d8e42d3f..38675d97 100644
--- a/types/attestation_data.yaml
+++ b/types/attestation_data.yaml
@@ -13,4 +13,4 @@ AttestationData:
     source:
       $ref: "./misc.yaml#/Checkpoint"
     target:
-      $ref: "./misc.yaml#/Checkpoint"
\ No newline at end of file
+      $ref: "./misc.yaml#/Checkpoint"
diff --git a/types/electra/attestation.yaml b/types/electra/attestation.yaml
index 40377956..f5997415 100644
--- a/types/electra/attestation.yaml
+++ b/types/electra/attestation.yaml
@@ -2,6 +2,7 @@ Electra:
   IndexedAttestation:
     type: object
     description: "The [`IndexedAttestation`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.2/specs/electra/beacon-chain.md#indexedattestation) object from the CL spec."
+    required: [attesting_indices, signature, data]
     properties:
       attesting_indices:
         type: array
@@ -17,8 +18,8 @@ Electra:
 
   Attestation:
     type: object
-    description: "The [`Attestation`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.2/specs/electra/beacon-chain.md#attestation) object from the CL spec."
-    required: [aggregation_bits, signature, committee_bits, data]
+    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."
+    required: [aggregation_bits, data, signature, committee_bits]
     properties:
       aggregation_bits:
         $ref: "../primitive.yaml#/BitList"
@@ -31,4 +32,4 @@ Electra:
       committee_bits:
         $ref: "../primitive.yaml#/Bitvector"
         description: "Committee bits."
-        example: "0x000000000000000000000000000000000000000000000000000
\ No newline at end of file
+        example: "0x000000000000000000000000000000000000000000000000000"