Merge pull request #1920 from rvullriede/feature/eth-base-fee

add the eth_baseFee call
hyperledger · Aug 2, 2023 · dca2524 · dca2524
2 parents 99fb8f7 + d58612c
commit dca2524
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 1 deletion.
diff --git a/core/src/main/java/org/web3j/protocol/core/Ethereum.java b/core/src/main/java/org/web3j/protocol/core/Ethereum.java
@@ -22,6 +22,7 @@
 import org.web3j.protocol.core.methods.response.DbPutHex;
 import org.web3j.protocol.core.methods.response.DbPutString;
 import org.web3j.protocol.core.methods.response.EthAccounts;
+import org.web3j.protocol.core.methods.response.EthBaseFee;
 import org.web3j.protocol.core.methods.response.EthBlock;
 import org.web3j.protocol.core.methods.response.EthBlockNumber;
 import org.web3j.protocol.core.methods.response.EthChainId;
@@ -112,6 +113,8 @@ public interface Ethereum {
 
     Request<?, EthMaxPriorityFeePerGas> ethMaxPriorityFeePerGas();
 
+    Request<?, EthBaseFee> ethBaseFee();
+
     Request<?, EthFeeHistory> ethFeeHistory(
             int blockCount, DefaultBlockParameter newestBlock, List<Double> rewardPercentiles);
 

diff --git a/core/src/main/java/org/web3j/protocol/core/JsonRpc2_0Web3j.java b/core/src/main/java/org/web3j/protocol/core/JsonRpc2_0Web3j.java
@@ -34,6 +34,7 @@
 import org.web3j.protocol.core.methods.response.DbPutHex;
 import org.web3j.protocol.core.methods.response.DbPutString;
 import org.web3j.protocol.core.methods.response.EthAccounts;
+import org.web3j.protocol.core.methods.response.EthBaseFee;
 import org.web3j.protocol.core.methods.response.EthBlock;
 import org.web3j.protocol.core.methods.response.EthBlockNumber;
 import org.web3j.protocol.core.methods.response.EthChainId;
@@ -233,6 +234,12 @@ public Request<?, EthMaxPriorityFeePerGas> ethMaxPriorityFeePerGas() {
                 EthMaxPriorityFeePerGas.class);
     }
 
+    @Override
+    public Request<?, EthBaseFee> ethBaseFee() {
+        return new Request<>(
+                "eth_baseFee", Collections.<String>emptyList(), web3jService, EthBaseFee.class);
+    }
+
     @Override
     public Request<?, EthFeeHistory> ethFeeHistory(
             int blockCount, DefaultBlockParameter newestBlock, List<Double> rewardPercentiles) {

diff --git a/core/src/main/java/org/web3j/protocol/core/methods/response/EthBaseFee.java b/core/src/main/java/org/web3j/protocol/core/methods/response/EthBaseFee.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2019 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.methods.response;
+
+import java.math.BigInteger;
+
+import org.web3j.protocol.core.Response;
+import org.web3j.utils.Numeric;
+
+/** eth_baseFee. */
+public class EthBaseFee extends Response<String> {
+
+    public BigInteger getBaseFee() {
+        return Numeric.decodeQuantity(getResult());
+    }
+}
diff --git a/core/src/test/java/org/web3j/protocol/core/RequestTest.java b/core/src/test/java/org/web3j/protocol/core/RequestTest.java
@@ -154,6 +154,13 @@ public void testEthMaxPriorityFeePerGas() throws Exception {
                 "{\"jsonrpc\":\"2.0\",\"method\":\"eth_maxPriorityFeePerGas\",\"params\":[],\"id\":1}");
     }
 
+    @Test
+    public void testEthBaseFee() throws Exception {
+        web3j.ethBaseFee().send();
+
+        verifyResult("{\"jsonrpc\":\"2.0\",\"method\":\"eth_baseFee\",\"params\":[],\"id\":1}");
+    }
+
     @Test
     public void testEthFeeHistory() throws Exception {
         web3j.ethFeeHistory(1, DefaultBlockParameterName.LATEST, null).send();

diff --git a/core/src/test/java/org/web3j/protocol/core/ResponseTest.java b/core/src/test/java/org/web3j/protocol/core/ResponseTest.java
@@ -32,6 +32,7 @@
 import org.web3j.protocol.core.methods.response.DbPutHex;
 import org.web3j.protocol.core.methods.response.DbPutString;
 import org.web3j.protocol.core.methods.response.EthAccounts;
+import org.web3j.protocol.core.methods.response.EthBaseFee;
 import org.web3j.protocol.core.methods.response.EthBlock;
 import org.web3j.protocol.core.methods.response.EthBlockNumber;
 import org.web3j.protocol.core.methods.response.EthCall;
@@ -599,6 +600,19 @@ public void testEthEstimateGas() {
         assertEquals(ethEstimateGas.getAmountUsed(), (BigInteger.valueOf(21000)));
     }
 
+    @Test
+    public void testEthBaseFee() {
+        buildResponse(
+                "{\n"
+                        + "  \"id\":1,\n"
+                        + "  \"jsonrpc\": \"2.0\",\n"
+                        + "  \"result\": \"0x5d21dba00\"\n"
+                        + "}");
+
+        EthBaseFee ethBaseFee = deserialiseResponse(EthBaseFee.class);
+        assertEquals(ethBaseFee.getBaseFee(), (BigInteger.valueOf(25000000000L)));
+    }
+
     @Test
     public void testEthBlockTransactionHashes() {
 

diff --git a/gradle/publish/build.gradle b/gradle/publish/build.gradle
@@ -87,4 +87,4 @@ signing {
     if (signingKey.exists()) {
         useInMemoryPgpKeys(signingKey.getText('UTF-8'), System.getenv('GPG_PASSPHRASE'))
     }
-}
+}