From 0cedf2477f024e73526315a3433c6e0006e14da0 Mon Sep 17 00:00:00 2001
From: Jim McDonald <Jim@mcdee.net>
Date: Fri, 12 Apr 2024 10:59:34 +0100
Subject: [PATCH 1/4] Clarify use of 206 status code for node health.

The 206 return code for the node health endpoint does not take into
account the situation where the consensus node may be synced by the
execution node is optimistic.  Clarify that this situation should return
the 206 status code.
---
 apis/node/health.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apis/node/health.yaml b/apis/node/health.yaml
index 19f18a8e..1d373ea3 100644
--- 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 consensus node is syncing, or its execution node is optimistic, so data served may be incorrect
     "400":
       description: Invalid syncing status code
     "503":

From 5757bc26fa86338e5c6890f4a2a3b61167f5c6db Mon Sep 17 00:00:00 2001
From: Jim McDonald <Jim@mcdee.net>
Date: Fri, 12 Apr 2024 12:04:01 +0100
Subject: [PATCH 2/4] Update apis/node/health.yaml

Co-authored-by: Nico Flaig <nflaig@protonmail.com>
---
 apis/node/health.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apis/node/health.yaml b/apis/node/health.yaml
index 1d373ea3..0aa363a7 100644
--- a/apis/node/health.yaml
+++ b/apis/node/health.yaml
@@ -17,7 +17,7 @@ get:
     "200":
       description: Node is ready
     "206":
-      description: Either the consensus node is syncing, or its execution node is optimistic, so data served may be incorrect
+      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":

From 5bbd01eb203b443466291d6cc80090cf0bd05a70 Mon Sep 17 00:00:00 2001
From: Nico Flaig <nflaig@protonmail.com>
Date: Mon, 15 Apr 2024 11:14:28 +0100
Subject: [PATCH 3/4] Add metadata fields to getBlobSidecars response (#441)

---
 apis/beacon/blob_sidecars/blob_sidecars.yaml | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/apis/beacon/blob_sidecars/blob_sidecars.yaml b/apis/beacon/blob_sidecars/blob_sidecars.yaml
index 957bd4a8..40321774 100644
--- a/apis/beacon/blob_sidecars/blob_sidecars.yaml
+++ b/apis/beacon/blob_sidecars/blob_sidecars.yaml
@@ -26,6 +26,10 @@ 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:
@@ -33,6 +37,14 @@ get:
             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:

From 3132da1c570a72792c0a5e4d0b412a856fbd4854 Mon Sep 17 00:00:00 2001
From: Nico Flaig <nflaig@protonmail.com>
Date: Mon, 6 May 2024 09:40:04 +0100
Subject: [PATCH 4/4] Rename excess_data_gas to excess_blob_gas in execution
 payload (#446)

---
 types/deneb/execution_payload.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/types/deneb/execution_payload.yaml b/types/deneb/execution_payload.yaml
index be4ef871..6d7f594b 100644
--- 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'