Merge branch 'master' into 404-no-sync-committee-contribution

nflaig · Jun 18, 2024 · 43aece4 · 43aece4
2 parents 706d976 + 3132da1
commit 43aece4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/apis/beacon/blob_sidecars/blob_sidecars.yaml b/apis/beacon/blob_sidecars/blob_sidecars.yaml
@@ -26,13 +26,25 @@ get:
   responses:
     "200":
       description: "Successful response"
+      headers:
+        Eth-Consensus-Version:
+          $ref: '../../../beacon-node-oapi.yaml#/components/headers/Eth-Consensus-Version'
+          required: false
       content:
         application/json:
           schema:
             title: GetBlobSidecarsResponse
             type: object
             required: [data]
             properties:
+              version:
+                type: string
+                enum: [phase0, altair, bellatrix, capella, deneb]
+                example: "deneb"
+              execution_optimistic:
+                $ref: "../../../beacon-node-oapi.yaml#/components/schemas/ExecutionOptimistic"
+              finalized:
+                $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Finalized"
               data:
                 $ref: "../../../beacon-node-oapi.yaml#/components/schemas/Deneb.BlobSidecars"
         application/octet-stream:

diff --git a/apis/node/health.yaml b/apis/node/health.yaml
@@ -17,7 +17,7 @@ get:
     "200":
       description: Node is ready
     "206":
-      description: Node is syncing but can serve incomplete data
+      description: Either the beacon node is syncing, or its execution node is optimistic, so data served may be incorrect
     "400":
       description: Invalid syncing status code
     "503":

diff --git a/types/deneb/execution_payload.yaml b/types/deneb/execution_payload.yaml
@@ -3,7 +3,7 @@ Deneb:
     # An abstract object to collect the common fields between the ExecutionPayload and the ExecutionPayloadHeader objects.
     type: object
     description: "The [`ExecutionPayload`](https://github.com/ethereum/consensus-specs/blob/master/specs/deneb/beacon-chain.md#executionpayload) object from the CL Deneb spec."
-    required: [parent_hash, fee_recipient, state_root, receipts_root, logs_bloom, prev_randao, block_number, gas_limit, gas_used, timestamp, extra_data, base_fee_per_gas, excess_data_gas, block_hash]
+    required: [parent_hash, fee_recipient, state_root, receipts_root, logs_bloom, prev_randao, block_number, gas_limit, gas_used, timestamp, extra_data, base_fee_per_gas, excess_blob_gas, block_hash]
     properties:
       parent_hash:
         $ref: '../primitive.yaml#/Root'
@@ -29,7 +29,7 @@ Deneb:
         $ref: '../primitive.yaml#/ExtraData'
       base_fee_per_gas:
         $ref: '../primitive.yaml#/Uint256'
-      excess_data_gas:
+      excess_blob_gas:
         $ref: '../primitive.yaml#/Uint256'  
       block_hash:
         $ref: '../primitive.yaml#/Root'