eth, internal: datagasused -> blobgasused

marioevz · Jul 27, 2023 · 9b621f5 · 9b621f5
1 parent 1adfef2
commit 9b621f5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/eth/catalyst/api.go b/eth/catalyst/api.go
@@ -451,7 +451,7 @@ func (api *ConsensusAPI) NewPayloadV3(params engine.ExecutableData, versionedHas
  }
 
  if params.ExcessBlobGas == nil {
- return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(fmt.Errorf("nil excessDataGas post-cancun"))
+ return engine.PayloadStatusV1{Status: engine.INVALID}, engine.InvalidParams.With(fmt.Errorf("nil excessBlobGas post-cancun"))
  }
  var hashes []common.Hash
  if versionedHashes != nil {

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -1372,7 +1372,7 @@ type RPCTransaction struct {
  GasPrice *hexutil.Big `json:"gasPrice"`
  GasFeeCap *hexutil.Big `json:"maxFeePerGas,omitempty"`
  GasTipCap *hexutil.Big `json:"maxPriorityFeePerGas,omitempty"`
- MaxFeePerDataGas *hexutil.Big `json:"maxFeePerDataGas,omitempty"`
+ MaxFeePerBlobGas *hexutil.Big `json:"maxFeePerBlobGas,omitempty"`
  Hash common.Hash `json:"hash"`
  Input hexutil.Bytes `json:"input"`
  Nonce hexutil.Uint64 `json:"nonce"`
@@ -1451,7 +1451,7 @@ func newRPCTransaction(tx *types.Transaction, blockHash common.Hash, blockNumber
  } else {
  result.GasPrice = (*hexutil.Big)(tx.GasFeeCap())
  }
- result.MaxFeePerDataGas = (*hexutil.Big)(tx.BlobGasFeeCap())
+ result.MaxFeePerBlobGas = (*hexutil.Big)(tx.BlobGasFeeCap())
  result.BlobVersionedHashes = tx.BlobHashes()
  }
  return result