new approach to calculate blobBaseFee

Signed-off-by: Nischal Sharma <[email protected]>

core/build.gradle

@@ -21,6 +21,7 @@ dependencies {
             "io.github.adraffy:ens-normalize:$ensAdraffyVersion",
             "io.tmio:tuweni-bytes:$tuweniVersion",
             "io.tmio:tuweni-units:$tuweniVersion"
+    "io.vertx:vertx-core:YourVertxVersion:4.4.6"
     testImplementation project(path: ':crypto', configuration: 'testArtifacts'),
     "nl.jqno.equalsverifier:equalsverifier:$equalsverifierVersion",
     "ch.qos.logback:logback-classic:$logbackVersion"

core/src/main/java/org/web3j/protocol/Web3j.java

@@ -15,12 +15,13 @@
 import java.util.concurrent.ScheduledExecutorService;
 
 import org.web3j.protocol.core.Batcher;
+import org.web3j.protocol.core.BlobFee;
 import org.web3j.protocol.core.Ethereum;
 import org.web3j.protocol.core.JsonRpc2_0Web3j;
 import org.web3j.protocol.rx.Web3jRx;
 
 /** JSON-RPC Request object building factory. */
-public interface Web3j extends Ethereum, Web3jRx, Batcher {
+public interface Web3j extends Ethereum, Web3jRx, Batcher, BlobFee {
 
     /**
      * Construct a new Web3j instance.

core/src/main/java/org/web3j/protocol/core/BlobFee.java

@@ -0,0 +1,24 @@
+/*
+ * Copyright 2024 Web3 Labs Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on
+ * an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+package org.web3j.protocol.core;
+
+import java.math.BigInteger;
+
+public interface BlobFee {
+    /**
+     * Calculating Base Fee per Blob Gas
+     *
+     * @return baseFee value.
+     */
+    BigInteger ethGetBaseFeePerBlobGas();
+}

core/src/main/java/org/web3j/protocol/core/JsonRpc2_0Web3j.java

@@ -99,6 +99,8 @@
 public class JsonRpc2_0Web3j implements Web3j {
 
     public static final int DEFAULT_BLOCK_TIME = 15 * 1000;
+    private static final BigInteger MIN_BLOB_BASE_FEE = new BigInteger("1");
+    private static final BigInteger BLOB_BASE_FEE_UPDATE_FRACTION = new BigInteger("3338477");
 
     protected final Web3jService web3jService;
     private final JsonRpc2_0Rx web3jRx;
@@ -876,4 +878,32 @@ public void shutdown() {
     public BatchRequest newBatch() {
         return new BatchRequest(web3jService);
     }
+
+    @Override
+    public BigInteger ethGetBaseFeePerBlobGas() {
+        try {
+            EthBlock ethBlock =
+                    web3jService.send(
+                            ethGetBlockByNumber(DefaultBlockParameter.valueOf("latest"), false),
+                            EthBlock.class);
+            return fakeExponential(ethBlock.getBlock().getExcessBlobGas());
+        } catch (IOException e) {
+            throw new RuntimeException("Failed to get baseFeePerBlobGas value", e);
+        }
+    }
+
+    private static BigInteger fakeExponential(BigInteger numerator) {
+        BigInteger i = BigInteger.ONE;
+        BigInteger output = BigInteger.ZERO;
+        BigInteger numeratorAccum = MIN_BLOB_BASE_FEE.multiply(BLOB_BASE_FEE_UPDATE_FRACTION);
+        while (numeratorAccum.compareTo(BigInteger.ZERO) > 0) {
+            output = output.add(numeratorAccum);
+            numeratorAccum =
+                    numeratorAccum
+                            .multiply(numerator)
+                            .divide(BLOB_BASE_FEE_UPDATE_FRACTION.multiply(i));
+            i = i.add(BigInteger.ONE);
+        }
+        return output.divide(BLOB_BASE_FEE_UPDATE_FRACTION);
+    }
 }

core/src/main/java/org/web3j/protocol/core/methods/request/Transaction.java

@@ -13,11 +13,9 @@
 package org.web3j.protocol.core.methods.request;
 
 import java.math.BigInteger;
-import java.util.List;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.web3j.utils.Numeric;
 
 /**

core/src/main/java/org/web3j/protocol/core/methods/response/EthBlock.java

@@ -29,7 +29,6 @@
 import org.web3j.protocol.ObjectMapperFactory;
 import org.web3j.protocol.core.Response;
 import org.web3j.utils.Numeric;
-import org.apache.tuweni.bytes.Bytes;
 
 /**
  * Block object returned by:
@@ -147,6 +146,59 @@ public Block(
             this.excessBlobGas = excessBlobGas;
         }
 
+        public Block(
+                String number,
+                String hash,
+                String parentHash,
+                String nonce,
+                String sha3Uncles,
+                String logsBloom,
+                String transactionsRoot,
+                String stateRoot,
+                String receiptsRoot,
+                String author,
+                String miner,
+                String mixHash,
+                String difficulty,
+                String totalDifficulty,
+                String extraData,
+                String size,
+                String gasLimit,
+                String gasUsed,
+                String timestamp,
+                List<TransactionResult> transactions,
+                List<String> uncles,
+                List<String> sealFields,
+                String baseFeePerGas,
+                String withdrawalsRoot,
+                List<Withdrawal> withdrawals) {
+            this.number = number;
+            this.hash = hash;
+            this.parentHash = parentHash;
+            this.nonce = nonce;
+            this.sha3Uncles = sha3Uncles;
+            this.logsBloom = logsBloom;
+            this.transactionsRoot = transactionsRoot;
+            this.stateRoot = stateRoot;
+            this.receiptsRoot = receiptsRoot;
+            this.author = author;
+            this.miner = miner;
+            this.mixHash = mixHash;
+            this.difficulty = difficulty;
+            this.totalDifficulty = totalDifficulty;
+            this.extraData = extraData;
+            this.size = size;
+            this.gasLimit = gasLimit;
+            this.gasUsed = gasUsed;
+            this.timestamp = timestamp;
+            this.transactions = transactions;
+            this.uncles = uncles;
+            this.sealFields = sealFields;
+            this.baseFeePerGas = baseFeePerGas;
+            this.withdrawalsRoot = withdrawalsRoot;
+            this.withdrawals = withdrawals;
+        }
+
         public BigInteger getNumber() {
             return Numeric.decodeQuantity(number);
         }
@@ -556,8 +608,6 @@ public boolean equals(Object o) {
             return getWithdrawals() != null
                     ? getWithdrawals().equals(block.getWithdrawals())
                     : block.getWithdrawals() == null;
-
-
         }
 
         @Override
@@ -601,8 +651,14 @@ public int hashCode() {
                     31 * result
                             + (getWithdrawalsRoot() != null ? getWithdrawalsRoot().hashCode() : 0);
             result = 31 * result + (getWithdrawals() != null ? getWithdrawals().hashCode() : 0);
-            result = 31 * result + (getBlobGasUsedRaw() != null ? getBlobGasUsedRaw().hashCode() : 0);
-            result = 31 * result + (getExcessBlobGasRaw() != null ? getExcessBlobGasRaw().hashCode() : 0);
+            result =
+                    31 * result
+                            + (getBlobGasUsedRaw() != null ? getBlobGasUsedRaw().hashCode() : 0);
+            result =
+                    31 * result
+                            + (getExcessBlobGasRaw() != null
+                                    ? getExcessBlobGasRaw().hashCode()
+                                    : 0);
             return result;
         }
     }
@@ -776,7 +832,7 @@ public TransactionObject(
                 String maxPriorityFeePerGas,
                 List<AccessListObject> accessList,
                 String maxFeePerBlobGas,
-                List<Bytes> versionedHashes) {
+                List<String> versionedHashes) {
             super(
                     hash,
                     nonce,

core/src/main/java/org/web3j/protocol/core/methods/response/Transaction.java

@@ -15,7 +15,6 @@
 import java.math.BigInteger;
 import java.util.List;
 
-import org.apache.tuweni.bytes.Bytes;
 import org.web3j.crypto.TransactionUtils;
 import org.web3j.utils.Numeric;
 
@@ -45,7 +44,7 @@ public class Transaction {
     private String maxPriorityFeePerGas;
     private List<AccessListObject> accessList;
     private String maxFeePerBlobGas;
-    private List<Bytes> versionedHashes;
+    private List<String> versionedHashes;
 
     public Transaction() {}
 
@@ -170,7 +169,7 @@ public Transaction(
             String maxPriorityFeePerGas,
             List accessList,
             String maxFeePerBlobGas,
-            List<Bytes> versionedHashes) {
+            List versionedHashes) {
         this.hash = hash;
         this.nonce = nonce;
         this.blockHash = blockHash;
@@ -450,11 +449,11 @@ public void setMaxFeePerBlobGas(String maxFeePerBlobGas) {
         this.maxFeePerBlobGas = maxFeePerBlobGas;
     }
 
-    public List<Bytes> getVersionedHashes() {
+    public List<String> getVersionedHashes() {
         return versionedHashes;
     }
 
-    public void setVersionedHashes(List<Bytes> versionedHashes) {
+    public void setVersionedHashes(List<String> versionedHashes) {
         this.versionedHashes = versionedHashes;
     }
 
@@ -611,7 +610,11 @@ public int hashCode() {
                         + (getMaxPriorityFeePerGasRaw() != null
                                 ? getMaxPriorityFeePerGasRaw().hashCode()
                                 : 0);
-        result = 31 * result + (getMaxFeePerBlobGasRaw() != null ? getMaxFeePerBlobGasRaw().hashCode() : 0);
+        result =
+                31 * result
+                        + (getMaxFeePerBlobGasRaw() != null
+                                ? getMaxFeePerBlobGasRaw().hashCode()
+                                : 0);
         result = 31 * result + (getVersionedHashes() != null ? getVersionedHashes().hashCode() : 0);
         result = 31 * result + (getAccessList() != null ? getAccessList().hashCode() : 0);
         return result;

core/src/main/java/org/web3j/protocol/core/methods/response/TransactionReceipt.java

@@ -37,6 +37,8 @@ public class TransactionReceipt {
     private String revertReason;
     private String type;
     private String effectiveGasPrice;
+    private String blobGasPrice;
+    private String blobGasUsed;
 
     public TransactionReceipt() {}
 
@@ -75,6 +77,45 @@ public TransactionReceipt(
         this.effectiveGasPrice = effectiveGasPrice;
     }
 
+    public TransactionReceipt(
+            String transactionHash,
+            String transactionIndex,
+            String blockHash,
+            String blockNumber,
+            String cumulativeGasUsed,
+            String gasUsed,
+            String contractAddress,
+            String root,
+            String status,
+            String from,
+            String to,
+            List<Log> logs,
+            String logsBloom,
+            String revertReason,
+            String type,
+            String effectiveGasPrice,
+            String blobGasPrice,
+            String blobGasUsed) {
+        this.transactionHash = transactionHash;
+        this.transactionIndex = transactionIndex;
+        this.blockHash = blockHash;
+        this.blockNumber = blockNumber;
+        this.cumulativeGasUsed = cumulativeGasUsed;
+        this.gasUsed = gasUsed;
+        this.contractAddress = contractAddress;
+        this.root = root;
+        this.status = status;
+        this.from = from;
+        this.to = to;
+        this.logs = logs;
+        this.logsBloom = logsBloom;
+        this.revertReason = revertReason;
+        this.type = type;
+        this.effectiveGasPrice = effectiveGasPrice;
+        this.blobGasPrice = blobGasPrice;
+        this.blobGasUsed = blobGasUsed;
+    }
+
     public String getTransactionHash() {
         return transactionHash;
     }
@@ -227,6 +268,22 @@ public void setEffectiveGasPrice(String effectiveGasPrice) {
         this.effectiveGasPrice = effectiveGasPrice;
     }
 
+    public String getBlobGasPrice() {
+        return blobGasPrice;
+    }
+
+    public void setBlobGasPrice(String blobGasPrice) {
+        this.blobGasPrice = blobGasPrice;
+    }
+
+    public String getBlobGasUsed() {
+        return blobGasUsed;
+    }
+
+    public void setBlobGasUsed(String blobGasUsed) {
+        this.blobGasUsed = blobGasUsed;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -302,6 +359,18 @@ public boolean equals(Object o) {
                 : that.getEffectiveGasPrice() != null) {
             return false;
         }
+
+        if (blobGasPrice != null
+                ? !blobGasPrice.equals(that.blobGasPrice)
+                : that.blobGasPrice != null) {
+            return false;
+        }
+
+        if (blobGasUsed != null
+                ? !blobGasUsed.equals(that.blobGasUsed)
+                : that.blobGasUsed != null) {
+            return false;
+        }
         return getRevertReason() != null
                 ? getRevertReason().equals(that.getRevertReason())
                 : that.getRevertReason() == null;
@@ -327,6 +396,8 @@ public int hashCode() {
         result =
                 31 * result
                         + (getEffectiveGasPrice() != null ? getEffectiveGasPrice().hashCode() : 0);
+        result = 31 * result + (blobGasPrice != null ? blobGasPrice.hashCode() : 0);
+        result = 31 * result + (blobGasUsed != null ? blobGasUsed.hashCode() : 0);
         return result;
     }
 
@@ -380,6 +451,12 @@ public String toString() {
                 + ", effectiveGasPrice='"
                 + effectiveGasPrice
                 + '\''
+                + ", blobGasPrice='"
+                + blobGasPrice
+                + '\''
+                + ", blobGasused='"
+                + blobGasUsed
+                + '\''
                 + '}';
     }
 }