Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename "data gas" to "blob gas" #451

Merged
merged 1 commit into from
Aug 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/engine/cancun.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions src/engine/experimental/eip6110.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 6 additions & 6 deletions src/engine/openrpc/schemas/payload.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,8 +204,8 @@ ExecutionPayloadV3:
- blockHash
- transactions
- withdrawals
- dataGasUsed
- excessDataGas
- blobGasUsed
- excessBlobGas
properties:
parentHash:
$ref: '#/components/schemas/ExecutionPayloadV2/properties/parentHash'
Expand Down Expand Up @@ -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
Expand Down
Loading