7732: Remove datagas related stuff in favour of blobgas (hyperledger#…

…7353) * 7732: Remove datagas related stuff in favour of blobgas Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net> --------- Signed-off-by: Matilda Clerke <matilda.clerke@consensys.net>
fab-10 · Jul 21, 2024 · 0269d83 · 0269d83
1 parent 30c96c7
commit 0269d83
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/...ledger/besu/ethereum/blockcreation/txselection/selectors/BlobSizeTransactionSelector.java b/...ledger/besu/ethereum/blockcreation/txselection/selectors/BlobSizeTransactionSelector.java
@@ -26,7 +26,7 @@
 /**
  * This class extends AbstractTransactionSelector and provides a specific implementation for
  * evaluating transactions based on blobs size. It checks if a transaction supports blobs, and if
- * so, checks that there is enough remaining data gas in the block to fit the blobs of the tx.
+ * so, checks that there is enough remaining blob gas in the block to fit the blobs of the tx.
  */
 public class BlobSizeTransactionSelector extends AbstractTransactionSelector {
   private static final Logger LOG = LoggerFactory.getLogger(BlobSizeTransactionSelector.class);

diff --git a/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java b/...in/java/org/hyperledger/besu/ethereum/referencetests/BlockchainReferenceTestCaseSpec.java
@@ -165,10 +165,6 @@ public ReferenceTestBlockHeader(
         @JsonProperty("nonce") final String nonce,
         @JsonProperty("withdrawalsRoot") final String withdrawalsRoot,
         @JsonProperty("requestsRoot") final String requestsRoot,
-        @JsonProperty("dataGasUsed")
-            final String dataGasUsed, // TODO: remove once reference tests have been updated
-        @JsonProperty("excessDataGas")
-            final String excessDataGas, // TODO: remove once reference tests have been updated
         @JsonProperty("blobGasUsed") final String blobGasUsed,
         @JsonProperty("excessBlobGas") final String excessBlobGas,
         @JsonProperty("parentBeaconBlockRoot") final String parentBeaconBlockRoot,
@@ -195,12 +191,8 @@ public ReferenceTestBlockHeader(
           Hash.fromHexString(mixHash), // mixHash
           Bytes.fromHexStringLenient(nonce).toLong(),
           withdrawalsRoot != null ? Hash.fromHexString(withdrawalsRoot) : null,
-          dataGasUsed != null
-              ? Long.decode(dataGasUsed)
-              : blobGasUsed != null ? Long.decode(blobGasUsed) : 0,
-          excessDataGas != null
-              ? BlobGas.fromHexString(excessDataGas)
-              : excessBlobGas != null ? BlobGas.fromHexString(excessBlobGas) : null,
+          blobGasUsed != null ? Long.decode(blobGasUsed) : 0,
+          excessBlobGas != null ? BlobGas.fromHexString(excessBlobGas) : null,
           parentBeaconBlockRoot != null ? Bytes32.fromHexString(parentBeaconBlockRoot) : null,
           requestsRoot != null ? Hash.fromHexString(requestsRoot) : null,
           new BlockHeaderFunctions() {

diff --git a/...main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java b/...main/java/org/hyperledger/besu/ethereum/referencetests/StateTestVersionedTransaction.java
@@ -103,7 +103,6 @@ public StateTestVersionedTransaction(
       @JsonDeserialize(using = StateTestAccessListDeserializer.class) @JsonProperty("accessLists")
           final List<List<AccessListEntry>> maybeAccessLists,
       @JsonProperty("maxFeePerBlobGas") final String maxFeePerBlobGas,
-      @JsonProperty("maxFeePerDataGas") final String maxFeePerDataGas,
       @JsonProperty("blobVersionedHashes") final List<String> blobVersionedHashes) {
 
     this.nonce = Bytes.fromHexStringLenient(nonce).toLong();
@@ -123,9 +122,7 @@ public StateTestVersionedTransaction(
     this.payloads = parseArray(data, Bytes::fromHexString);
     this.maybeAccessLists = Optional.ofNullable(maybeAccessLists);
     this.maxFeePerBlobGas =
-        Optional.ofNullable(maxFeePerBlobGas == null ? maxFeePerDataGas : maxFeePerBlobGas)
-            .map(Wei::fromHexString)
-            .orElse(null);
+        Optional.ofNullable(maxFeePerBlobGas).map(Wei::fromHexString).orElse(null);
     this.blobVersionedHashes = blobVersionedHashes;
   }