Integration Tests fix

CHANGELOG.md

@@ -7,16 +7,12 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ### Bug Fixes
 
-* fix Transaction.getChainId when v=27 must return null [#2133](https://github.com/hyperledger-web3j/web3j/pull/2133)
-* Fix android scripts [#2138](https://github.com/hyperledger-web3j/web3j/pull/2138)
 * fixed subscription id conflict [#2127](https://github.com/hyperledger/web3j/pull/2127)
 
 ### Features
 
 * bump snapshot version to 4.12.4 [#2132](https://github.com/hyperledger-web3j/web3j/pull/2132)
-* ENS - Label Hash function added [#2140](https://github.com/hyperledger-web3j/web3j/pull/2140)
-* Added Dynamic gas providers [#2142](https://github.com/hyperledger-web3j/web3j/pull/2142)
-* Added Linea RPC APIs [#2150](https://github.com/hyperledger-web3j/web3j/pull/2150)
+* Added LineaEstimateGas api [#2150](https://github.com/hyperledger-web3j/web3j/pull/2150)
 
 
 ### BREAKING CHANGES

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

@@ -20,6 +20,11 @@
 /** eth_estimateGas. */
 public class EthEstimateGas extends Response<String> {
     public BigInteger getAmountUsed() {
+        if (getResult().isEmpty() || getResult() == null) {
+            System.out.println("Empty/null result for EthEstimateGas");
+            return BigInteger.ONE;
+        }
+
         return Numeric.decodeQuantity(getResult());
     }
 }

core/src/main/java/org/web3j/tx/Contract.java

@@ -42,7 +42,6 @@
 import org.web3j.protocol.core.DefaultBlockParameterName;
 import org.web3j.protocol.core.RemoteCall;
 import org.web3j.protocol.core.RemoteFunctionCall;
-import org.web3j.protocol.core.methods.request.Transaction;
 import org.web3j.protocol.core.methods.response.EthGetCode;
 import org.web3j.protocol.core.methods.response.Log;
 import org.web3j.protocol.core.methods.response.TransactionReceipt;
@@ -73,6 +72,7 @@ public abstract class Contract extends ManagedTransaction {
 
     public static final String BIN_NOT_PROVIDED = "Bin file was not provided";
     public static final String FUNC_DEPLOY = "deploy";
+
     protected final String contractBinary;
     protected String contractAddress;
     protected ContractGasProvider gasProvider;
@@ -389,21 +389,22 @@ TransactionReceipt executeTransaction(
 
         TransactionReceipt receipt = null;
         try {
+
             if (gasProvider instanceof ContractEIP1559GasProvider) {
                 ContractEIP1559GasProvider eip1559GasProvider =
                         (ContractEIP1559GasProvider) gasProvider;
-
-                receipt =
-                        sendEIP1559(
-                                eip1559GasProvider.getChainId(),
-                                contractAddress,
-                                data,
-                                weiValue,
-                                eip1559GasProvider.getGasLimit(
-                                        getGenericTransaction(data, constructor)),
-                                eip1559GasProvider.getMaxPriorityFeePerGas(),
-                                eip1559GasProvider.getMaxFeePerGas(),
-                                constructor);
+                if (eip1559GasProvider.isEIP1559Enabled()) {
+                    receipt =
+                            sendEIP1559(
+                                    eip1559GasProvider.getChainId(),
+                                    contractAddress,
+                                    data,
+                                    weiValue,
+                                    eip1559GasProvider.getGasLimit(funcName),
+                                    eip1559GasProvider.getMaxPriorityFeePerGas(funcName),
+                                    eip1559GasProvider.getMaxFeePerGas(funcName),
+                                    constructor);
+                }
             }
 
             if (receipt == null) {
@@ -412,8 +413,8 @@ TransactionReceipt executeTransaction(
                                 contractAddress,
                                 data,
                                 weiValue,
-                                gasProvider.getGasPrice(),
-                                gasProvider.getGasLimit(getGenericTransaction(data, constructor)),
+                                gasProvider.getGasPrice(funcName),
+                                gasProvider.getGasLimit(funcName),
                                 constructor);
             }
         } catch (JsonRpcError error) {
@@ -447,24 +448,6 @@ TransactionReceipt executeTransaction(
         return receipt;
     }
 
-    protected Transaction getGenericTransaction(String data, boolean constructor) {
-        if (constructor) {
-            return Transaction.createContractTransaction(
-                    this.transactionManager.getFromAddress(),
-                    BigInteger.ONE,
-                    gasProvider.getGasPrice(),
-                    data);
-        } else {
-            return Transaction.createFunctionCallTransaction(
-                    this.transactionManager.getFromAddress(),
-                    BigInteger.ONE,
-                    gasProvider.getGasPrice(),
-                    gasProvider.getGasLimit(),
-                    contractAddress,
-                    data);
-        }
-    }
-
     protected <T extends Type> RemoteFunctionCall<T> executeRemoteCallSingleValueReturn(
             Function function) {
         return new RemoteFunctionCall<>(function, () -> executeCallSingleValueReturn(function));

core/src/main/java/org/web3j/tx/gas/ContractEIP1559GasProvider.java

@@ -15,9 +15,11 @@
 import java.math.BigInteger;
 
 public interface ContractEIP1559GasProvider extends ContractGasProvider {
+    boolean isEIP1559Enabled();
+
     long getChainId();
 
-    BigInteger getMaxFeePerGas();
+    BigInteger getMaxFeePerGas(String contractFunc);
 
-    BigInteger getMaxPriorityFeePerGas();
+    BigInteger getMaxPriorityFeePerGas(String contractFunc);
 }

core/src/main/java/org/web3j/tx/gas/ContractGasProvider.java

@@ -14,13 +14,14 @@
 
 import java.math.BigInteger;
 
-import org.web3j.protocol.core.methods.request.Transaction;
-
 public interface ContractGasProvider {
+    BigInteger getGasPrice(String contractFunc);
 
+    @Deprecated
     BigInteger getGasPrice();
 
-    BigInteger getGasLimit(Transaction transaction);
+    BigInteger getGasLimit(String contractFunc);
 
+    @Deprecated
     BigInteger getGasLimit();
 }