Merge branch 'master' into validator-identities

rolfyone · web-flow · commit 887120eb175b · 2024-09-24T09:54:21.000+10:00
diff --git a/apis/beacon/blob_sidecars/blob_sidecars.yaml b/apis/beacon/blob_sidecars/blob_sidecars.yaml
@@ -39,7 +39,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [phase0, altair, bellatrix, capella, deneb]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "deneb"
               execution_optimistic:
                 $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic"
diff --git a/apis/beacon/blocks/blinded_block.yaml b/apis/beacon/blocks/blinded_block.yaml
@@ -26,7 +26,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [phase0, altair, bellatrix, capella, deneb]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "phase0"
               execution_optimistic:
                 $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic"
@@ -39,6 +39,7 @@ get:
                   - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBlindedBeaconBlock"
                   - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBlindedBeaconBlock"
                   - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlindedBeaconBlock"
+                  - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Electra.SignedBlindedBeaconBlock"
         application/octet-stream:
           schema:
             description: "SSZ serialized block bytes. Use Accept header to choose this response type"
diff --git a/apis/beacon/blocks/blinded_blocks.v2.yaml b/apis/beacon/blocks/blinded_blocks.v2.yaml
@@ -55,6 +55,7 @@ post:
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBlindedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBlindedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlindedBeaconBlock"
+            - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Electra.SignedBlindedBeaconBlock"
       application/octet-stream:
         schema:
           description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body."
diff --git a/apis/beacon/blocks/blinded_blocks.yaml b/apis/beacon/blocks/blinded_blocks.yaml
@@ -34,6 +34,7 @@ post:
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBlindedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBlindedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlindedBeaconBlock"
+            - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Electra.SignedBlindedBeaconBlock"
       application/octet-stream:
         schema:
           description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body."
diff --git a/apis/beacon/blocks/block.v2.yaml b/apis/beacon/blocks/block.v2.yaml
@@ -26,7 +26,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [phase0, altair, bellatrix, capella, deneb]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "phase0"
               execution_optimistic:
                 $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic"
@@ -39,6 +39,7 @@ get:
                   - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBeaconBlock"
                   - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBeaconBlock"
                   - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBeaconBlock"
+                  - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Electra.SignedBeaconBlock"
         application/octet-stream:
           schema:
             description: "SSZ serialized block bytes. Use Accept header to choose this response type"
diff --git a/apis/beacon/blocks/blocks.v2.yaml b/apis/beacon/blocks/blocks.v2.yaml
@@ -54,6 +54,7 @@ post:
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlockContents"
+            - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Electra.SignedBlockContents"
       application/octet-stream:
         schema:
           description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body."
diff --git a/apis/beacon/blocks/blocks.yaml b/apis/beacon/blocks/blocks.yaml
@@ -33,6 +33,7 @@ post:
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.SignedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Capella.SignedBeaconBlock"
             - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.SignedBlockContents"
+            - $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Electra.SignedBlockContents"
       application/octet-stream:
         schema:
           description: "SSZ serialized block bytes. Use content type header to indicate that SSZ data is contained in the request body."
diff --git a/apis/debug/state.v2.yaml b/apis/debug/state.v2.yaml
@@ -26,7 +26,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [ phase0, altair, bellatrix, capella, deneb ]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "phase0"
               execution_optimistic:
                 $ref: "../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic"
@@ -39,6 +39,7 @@ get:
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BeaconState"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BeaconState"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BeaconState"
+                 - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Electra.BeaconState"
         application/octet-stream:
           schema:
             description: "SSZ serialized state bytes. Use Accept header to choose this response type"
diff --git a/apis/validator/blinded_block.yaml b/apis/validator/blinded_block.yaml
@@ -49,7 +49,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [ phase0, altair, bellatrix, capella, deneb ]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "bellatrix"
               data:
                 anyOf:
@@ -58,6 +58,7 @@ get:
                   - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BlindedBeaconBlock"
                   - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BlindedBeaconBlock"
                   - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BlindedBeaconBlock"
+                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Electra.BlindedBeaconBlock"
         application/octet-stream:
           schema:
             description: "SSZ serialized block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version`."
diff --git a/apis/validator/block.v2.yaml b/apis/validator/block.v2.yaml
@@ -46,7 +46,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [ phase0, altair, bellatrix, capella, deneb ]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "phase0"
               data:
                 anyOf:
@@ -55,6 +55,7 @@ get:
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Bellatrix.BeaconBlock"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BeaconBlock"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BlockContents"
+                 - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Electra.BlockContents"
         application/octet-stream:
           schema:
             description: "SSZ serialized block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version`."
diff --git a/apis/validator/block.v3.yaml b/apis/validator/block.v3.yaml
@@ -90,7 +90,7 @@ get:
             properties:
               version:
                 type: string
-                enum: [ phase0, altair, bellatrix, capella, deneb ]
+                enum: [phase0, altair, bellatrix, capella, deneb, electra]
                 example: "phase0"
               execution_payload_blinded:
                 type: boolean
@@ -111,6 +111,8 @@ get:
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Capella.BlindedBeaconBlock"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BlockContents"
                  - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Deneb.BlindedBeaconBlock"
+                 - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Electra.BlockContents"
+                 - $ref: "../../beacon-node-oapi.yaml#/components/schemas/Electra.BlindedBeaconBlock"
         application/octet-stream:
           schema:
             description: "SSZ serialized block or blinded block bytes. Use Accept header to choose this response type, version string is sent in header `Eth-Consensus-Version` and block type in `Eth-Blinded-Payload`."
diff --git a/beacon-node-oapi.yaml b/beacon-node-oapi.yaml
@@ -399,6 +399,18 @@ components:
       $ref: './types/primitive.yaml#/Blob'
     Deneb.BlobSidecars:
       $ref: './types/deneb/blob_sidecar.yaml#/Deneb/BlobSidecars'
+    Electra.BeaconState:
+      $ref: './types/electra/state.yaml#/Electra/BeaconState'
+    Electra.BlockContents:
+      $ref: './types/electra/block_contents.yaml#/Electra/BlockContents'
+    Electra.SignedBeaconBlock:
+      $ref: './types/electra/block.yaml#/Electra/SignedBeaconBlock'
+    Electra.SignedBlockContents:
+      $ref: './types/electra/block_contents.yaml#/Electra/SignedBlockContents'
+    Electra.BlindedBeaconBlock:
+      $ref: './types/electra/block.yaml#/Electra/BlindedBeaconBlock'
+    Electra.SignedBlindedBeaconBlock:
+      $ref: './types/electra/block.yaml#/Electra/SignedBlindedBeaconBlock'
     Electra.Attestation:
       $ref: './types/electra/attestation.yaml#/Electra/Attestation'
     Electra.AttesterSlashing:
diff --git a/types/deneb/block.yaml b/types/deneb/block.yaml
@@ -54,7 +54,7 @@ Deneb:
             $ref: './execution_payload.yaml#/Deneb/ExecutionPayload'
 
   BeaconBlock:
-    description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#beaconblock) object from the CL Deneb spec."
+    description: "The [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#beaconblock) object from the CL Deneb spec."
     allOf:
       - $ref: '../altair/block.yaml#/Altair/BeaconBlockCommon'
       - type: object
@@ -65,7 +65,7 @@ Deneb:
 
   SignedBeaconBlock:
     type: object
-    description: "The [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#signedbeaconblock) object envelope from the CL Deneb spec."
+    description: "The [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#signedbeaconblock) object envelope from the CL Deneb spec."
     required: [message, signature]
     properties:
       message:
@@ -84,7 +84,7 @@ Deneb:
             $ref: './execution_payload.yaml#/Deneb/ExecutionPayloadHeader'
 
   BlindedBeaconBlock:
-    description: "A variant of the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#beaconblock) object from the CL Deneb spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`."
+    description: "A variant of the [`BeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#beaconblock) object from the CL Deneb spec, which contains a `BlindedBeaconBlockBody` rather than a `BeaconBlockBody`."
     allOf:
       - $ref: '../altair/block.yaml#/Altair/BeaconBlockCommon'
       - type: object
@@ -95,7 +95,7 @@ Deneb:
 
   SignedBlindedBeaconBlock:
     type: object
-    description: "A variant of the [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#signedbeaconblock) object envelope from the CL Deneb spec, which contains a `BlindedBeaconBlock` rather than a `BeaconBlock`."
+    description: "A variant of the [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/master/specs/phase0/beacon-chain.md#signedbeaconblock) object envelope from the CL Deneb spec, which contains a `BlindedBeaconBlock` rather than a `BeaconBlock`."
     required: [message, signature]
     properties:
       message:
diff --git a/types/electra/block.yaml b/types/electra/block.yaml
@@ -0,0 +1,108 @@
+Electra:
+  BeaconBlockBodyCommon:
+    # An abstract object to collect the common fields between the BeaconBlockBody and the BlindedBeaconBlockBody objects
+    type: object
+    description: "The [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconblockbody) object from the CL Electra spec."
+    required: [randao_reveal, eth1_data, graffiti, proposer_slashings, attester_slashings, attestations, deposits, voluntary_exits, sync_aggregate, bls_to_execution_changes, blob_kzg_commitments]
+    properties:
+      randao_reveal:
+        allOf:
+          - $ref: "../primitive.yaml#/Signature"
+          - description: "The RANDAO reveal value provided by the validator."
+      eth1_data:
+        $ref: "../eth1.yaml#/Eth1Data"
+      graffiti:
+        $ref: "../primitive.yaml#/Graffiti"
+      proposer_slashings:
+        type: array
+        items:
+          $ref: "../proposer_slashing.yaml#/ProposerSlashing"
+      attester_slashings:
+        type: array
+        items:
+          $ref: "./attester_slashing.yaml#/Electra/AttesterSlashing"
+      attestations:
+        type: array
+        items:
+          $ref: "./attestation.yaml#/Electra/Attestation"
+      deposits:
+        type: array
+        items:
+          $ref: "../deposit.yaml#/Deposit"
+      voluntary_exits:
+        type: array
+        items:
+          $ref: "../voluntary_exit.yaml#/SignedVoluntaryExit"
+      sync_aggregate:
+        $ref: "../altair/sync_aggregate.yaml#/Altair/SyncAggregate"
+      bls_to_execution_changes:
+        type: array
+        items:
+          $ref: "../bls_to_execution_change.yaml#/SignedBLSToExecutionChange"
+      blob_kzg_commitments:
+        type: array
+        items:
+          $ref: "../primitive.yaml#/KZGCommitment"
+
+  BeaconBlockBody:
+    allOf:
+      - $ref: "#/Electra/BeaconBlockBodyCommon"
+      - type: object
+        required: [execution_payload, execution_requests]
+        properties:
+          execution_payload:
+            $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."
+    allOf:
+      - $ref: "../altair/block.yaml#/Altair/BeaconBlockCommon"
+      - type: object
+        required: [body]
+        properties:
+          body:
+            $ref: "#/Electra/BeaconBlockBody"
+
+  SignedBeaconBlock:
+    type: object
+    description: "The [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/phase0/beacon-chain.md#signedbeaconblock) object envelope from the CL Electra spec."
+    required: [message, signature]
+    properties:
+      message:
+        $ref: "#/Electra/BeaconBlock"
+      signature:
+        $ref: "../primitive.yaml#/Signature"
+
+  BlindedBeaconBlockBody:
+    description: "A variant of the [`BeaconBlockBody`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#beaconblockbody) object from the CL Electra spec, which contains a transactions root rather than a full transactions list."
+    allOf:
+      - $ref: "#/Electra/BeaconBlockBodyCommon"
+      - type: object
+        required: [execution_payload_header, execution_requests_root]
+        properties:
+          execution_payload_header:
+            $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`."
+    allOf:
+      - $ref: "../altair/block.yaml#/Altair/BeaconBlockCommon"
+      - type: object
+        required: [body]
+        properties:
+          body:
+            $ref: "#/Electra/BlindedBeaconBlockBody"
+
+  SignedBlindedBeaconBlock:
+    type: object
+    description: "A variant of the [`SignedBeaconBlock`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/phase0/beacon-chain.md#signedbeaconblock) object envelope from the CL Electra spec, which contains a `BlindedBeaconBlock` rather than a `BeaconBlock`."
+    required: [message, signature]
+    properties:
+      message:
+        $ref: "#/Electra/BlindedBeaconBlock"
+      signature:
+        $ref: "../primitive.yaml#/Signature"
diff --git a/types/electra/block_contents.yaml b/types/electra/block_contents.yaml
@@ -0,0 +1,24 @@
+Electra:
+  BlockContents:
+    type: object
+    description: "The required object for block production according to the Electra CL spec."
+    required: [block, kzg_proofs, blobs]
+    properties:
+      block:
+        $ref: "./block.yaml#/Electra/BeaconBlock"
+      kzg_proofs:
+        $ref: "../deneb/block_contents.yaml#/Deneb/KZGProofs"
+      blobs:
+        $ref: "../deneb/block_contents.yaml#/Deneb/Blobs"
+
+  SignedBlockContents:
+    type: object
+    description: "The required signed components of block production according to the Electra CL spec."
+    required: [signed_block, kzg_proofs, blobs]
+    properties:
+      signed_block:
+        $ref: "./block.yaml#/Electra/SignedBeaconBlock"
+      kzg_proofs:
+        $ref: "../deneb/block_contents.yaml#/Deneb/KZGProofs"
+      blobs:
+        $ref: "../deneb/block_contents.yaml#/Deneb/Blobs"
diff --git a/types/electra/consolidation.yaml b/types/electra/consolidation.yaml
@@ -0,0 +1,27 @@
+Electra:
+  ConsolidationRequest:
+    type: object
+    description: "The [`ConsolidationRequest`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#consolidationrequest) object from the CL Electra spec."
+    required: [source_address, source_pubkey, target_pubkey]
+    properties:
+      source_address:
+        $ref: "../primitive.yaml#/ExecutionAddress"
+        description: "Execution address which sent the request."
+      source_pubkey:
+        $ref: "../primitive.yaml#/Pubkey"
+        description: "BLS public key of validator to consolidate from."
+      target_pubkey:
+        $ref: "../primitive.yaml#/Pubkey"
+        description: "BLS public key of validator to consolidate to."
+
+  PendingConsolidation:
+    type: object
+    description: "The [`PendingConsolidation`](https://github.com/ethereum/consensus-specs/blob/v1.5.0-alpha.5/specs/electra/beacon-chain.md#pendingconsolidation) object from the CL Electra spec."
+    required: [source_index, target_index]
+    properties:
+      source_index:
+        $ref: "../primitive.yaml#/Uint64"
+        description: "Index of validator to consolidate from."
+      target_index:
+        $ref: "../primitive.yaml#/Uint64"
+        description: "Index of validator to consolidate to."
diff --git a/types/electra/deposit.yaml b/types/electra/deposit.yaml
diff --git a/types/electra/execution_requests.yaml b/types/electra/execution_requests.yaml
diff --git a/types/electra/state.yaml b/types/electra/state.yaml
diff --git a/types/electra/withdrawal.yaml b/types/electra/withdrawal.yaml
