From ac68f8166f09ace2875316476e117c719fa14959 Mon Sep 17 00:00:00 2001
From: Mario Vega <marioevz@gmail.com>
Date: Wed, 26 Jul 2023 19:25:21 +0000
Subject: [PATCH] Rename "data gas" to "blob gas"

---
 src/engine/cancun.md                    |  6 +++---
 src/engine/experimental/eip6110.md      |  4 ++--
 src/engine/openrpc/schemas/payload.yaml | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/engine/cancun.md b/src/engine/cancun.md
index 6daf387a..3b4204d1 100644
--- a/src/engine/cancun.md
+++ b/src/engine/cancun.md
@@ -34,7 +34,7 @@ This specificaiton is based on and extends [Engine API - Shanghai](./shanghai.md
 
 ### ExecutionPayloadV3
 
-This structure has the syntax of [`ExecutionPayloadV2`](./shanghai.md#executionpayloadv2) and appends the new fields: `dataGasUsed` and `excessDataGas`.
+This structure has the syntax of [`ExecutionPayloadV2`](./shanghai.md#executionpayloadv2) and appends the new fields: `blobGasUsed` and `excessBlobGas`.
 
 - `parentHash`: `DATA`, 32 Bytes
 - `feeRecipient`:  `DATA`, 20 Bytes
@@ -51,8 +51,8 @@ This structure has the syntax of [`ExecutionPayloadV2`](./shanghai.md#executionp
 - `blockHash`: `DATA`, 32 Bytes
 - `transactions`: `Array of DATA` - Array of transaction objects, each object is a byte list (`DATA`) representing `TransactionType || TransactionPayload` or `LegacyTransaction` as defined in [EIP-2718](https://eips.ethereum.org/EIPS/eip-2718)
 - `withdrawals`: `Array of WithdrawalV1` - Array of withdrawals, each object is an `OBJECT` containing the fields of a `WithdrawalV1` structure.
-- `dataGasUsed`: `QUANTITY`, 64 Bits
-- `excessDataGas`: `QUANTITY`, 64 Bits
+- `blobGasUsed`: `QUANTITY`, 64 Bits
+- `excessBlobGas`: `QUANTITY`, 64 Bits
 
 ### BlobsBundleV1
 
diff --git a/src/engine/experimental/eip6110.md b/src/engine/experimental/eip6110.md
index 93918089..84a7e9d8 100644
--- a/src/engine/experimental/eip6110.md
+++ b/src/engine/experimental/eip6110.md
@@ -55,8 +55,8 @@ This structure has the syntax of [`ExecutionPayloadV3`](../cancun.md#executionpa
 - `blockHash`: `DATA`, 32 Bytes
 - `transactions`: `Array of DATA` - Array of transaction objects, each object is a byte list (`DATA`) representing `TransactionType || TransactionPayload` or `LegacyTransaction` as defined in [EIP-2718](https://eips.ethereum.org/EIPS/eip-2718)
 - `withdrawals`: `Array of WithdrawalV1` - Array of withdrawals, each object is an `OBJECT` containing the fields of a `WithdrawalV1` structure.
-- `dataGasUsed`: `QUANTITY`, 64 bits
-- `excessDataGas`: `QUANTITY`, 64 Bits
+- `blobGasUsed`: `QUANTITY`, 64 Bits
+- `excessBlobGas`: `QUANTITY`, 64 Bits
 - `depositReceipts`: `Array of DepositReceiptV1` - Array of deposits, each object is an `OBJECT` containing the fields of a `DepositReceiptV1` structure.
 
 ## Methods
diff --git a/src/engine/openrpc/schemas/payload.yaml b/src/engine/openrpc/schemas/payload.yaml
index 4681408d..a66ff57d 100644
--- a/src/engine/openrpc/schemas/payload.yaml
+++ b/src/engine/openrpc/schemas/payload.yaml
@@ -204,8 +204,8 @@ ExecutionPayloadV3:
     - blockHash
     - transactions
     - withdrawals
-    - dataGasUsed
-    - excessDataGas
+    - blobGasUsed
+    - excessBlobGas
   properties:
     parentHash:
       $ref: '#/components/schemas/ExecutionPayloadV2/properties/parentHash'
@@ -237,11 +237,11 @@ ExecutionPayloadV3:
       $ref: '#/components/schemas/ExecutionPayloadV2/properties/transactions'
     withdrawals:
       $ref: '#/components/schemas/ExecutionPayloadV2/properties/withdrawals'
-    dataGasUsed:
-      title: Data gas used
+    blobGasUsed:
+      title: Blob gas used
       $ref: '#/components/schemas/uint64'
-    excessDataGas:
-      title: Excess data gas
+    excessBlobGas:
+      title: Excess blob gas
       $ref: '#/components/schemas/uint64'
 ExecutionPayloadBodyV1:
   title: Execution payload body object V1