Merge branch 'LFDT-web3j:main' into wmjae-patch

Author: wmjae

CHANGELOG.md

@@ -3,16 +3,35 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
-# [4.12.4]() (Upcoming)
+# [4.13.1]() (2025-03-05)
 
 ### Bug Fixes
 
+* 
+### Features
+
+* bump snapshot version to 4.13.1 [#2160](https://github.com/hyperledger-web3j/web3j/pull/2160)
+
+
+### BREAKING CHANGES
+
+*
+
+# [4.13.0](https://github.com/hyperledger-web3j/web3j/releases/tag/v4.13.0) (2025-03-05)
+
+### 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)
+* Fix pipeline by disabling failing integration tests [#2159](https://github.com/hyperledger-web3j/web3j/pull/2159)
 
 ### Features
 
 * bump snapshot version to 4.12.4 [#2132](https://github.com/hyperledger-web3j/web3j/pull/2132)
-* Added LineaEstimateGas api [#2150](https://github.com/hyperledger-web3j/web3j/pull/2150)
+* 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)
 
 
 ### BREAKING CHANGES

README.md

@@ -1,4 +1,4 @@
-Web3j: Web3 Java Ethereum Ðapp API
+Web3j: Web3 Java Ethereum Dapp API
 ==================================
 
 [![Documentation Status](https://readthedocs.org/projects/web3j-docs/badge/?version=latest)](https://docs.web3j.io)
@@ -118,7 +118,7 @@ Java:
 <dependency>
   <groupId>org.web3j</groupId>
   <artifactId>core</artifactId>
-  <version>4.12.2</version>
+  <version>4.13.0</version>
 </dependency>
 ```
 
@@ -131,7 +131,7 @@ Android:
 <dependency>
   <groupId>org.web3j</groupId>
   <artifactId>core</artifactId>
-  <version>4.8.9-android</version>
+  <version>4.12.3-android</version>
 </dependency>
 ```
 
@@ -141,13 +141,13 @@ Gradle
 Java:
 
 ```groovy
-implementation ('org.web3j:core:4.12.2')
+implementation ('org.web3j:core:4.13.0')
 ```
 
 Android:
 
 ```groovy
-implementation ('org.web3j:core:4.8.9-android')
+implementation ('org.web3j:core:4.12.3-android')
 ```
 
 Build instructions

core/src/main/java/org/web3j/dto/EnsGatewayRequestDTO.java

@@ -16,18 +16,32 @@
 public class EnsGatewayRequestDTO {
 
     private String data;
+    private String sender;
 
     public EnsGatewayRequestDTO() {}
 
     public EnsGatewayRequestDTO(String data) {
         this.data = data;
     }
 
+    public EnsGatewayRequestDTO(String data, String sender) {
+        this.data = data;
+        this.sender = sender;
+    }
+
     public String getData() {
         return data;
     }
 
     public void setData(String data) {
         this.data = data;
     }
+
+    public String getSender() {
+        return sender;
+    }
+
+    public void setSender(String sender) {
+        this.sender = sender;
+    }
 }

core/src/main/java/org/web3j/ens/EnsResolver.java

@@ -30,7 +30,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import org.web3j.abi.DefaultFunctionEncoder;
 import org.web3j.abi.DefaultFunctionReturnDecoder;
+import org.web3j.abi.datatypes.DynamicBytes;
+import org.web3j.abi.datatypes.Type;
 import org.web3j.abi.datatypes.ens.OffchainLookup;
 import org.web3j.crypto.Credentials;
 import org.web3j.crypto.Keys;
@@ -259,12 +262,16 @@ protected String resolveOffchain(
             ObjectMapper objectMapper = ObjectMapperFactory.getObjectMapper();
             EnsGatewayResponseDTO gatewayResponseDTO =
                     objectMapper.readValue(gatewayResult, EnsGatewayResponseDTO.class);
+            String callbackSelector = Numeric.toHexString(offchainLookup.getCallbackFunction());
+            List<Type> parameters =
+                    Arrays.asList(
+                            new DynamicBytes(
+                                    Numeric.hexStringToByteArray(gatewayResponseDTO.getData())),
+                            new DynamicBytes(offchainLookup.getExtraData()));
 
-            String resolvedNameHex =
-                    resolver.resolveWithProof(
-                                    Numeric.hexStringToByteArray(gatewayResponseDTO.getData()),
-                                    offchainLookup.getExtraData())
-                            .send();
+            String encodedParams = new DefaultFunctionEncoder().encodeParameters(parameters);
+            String encodedFunction = callbackSelector + encodedParams;
+            String resolvedNameHex = resolver.executeCallWithoutDecoding(encodedFunction);
 
             // This protocol can result in multiple lookups being requested by the same contract.
             if (EnsUtils.isEIP3668(resolvedNameHex)) {
@@ -344,19 +351,27 @@ protected Request buildRequest(String url, String sender, String data)
         if (data == null) {
             throw new EnsResolutionException("Data is null");
         }
-        if (!url.contains("{sender}")) {
-            throw new EnsResolutionException("Url is not valid, sender parameter is not exist");
-        }
 
         // URL expansion
-        String href = url.replace("{sender}", sender).replace("{data}", data);
+        String href = url;
+
+        if (url.contains("{sender}")) {
+            href = href.replace("{sender}", sender);
+        }
+
+        if (url.contains("{data}")) {
+            href = href.replace("{data}", data);
+        }
 
         Request.Builder builder = new Request.Builder().url(href);
 
+        // According to ERC-3668:
+        // - If URL contains {data}, use GET
+        // - Otherwise, use POST with JSON payload containing data and sender
         if (url.contains("{data}")) {
             return builder.get().build();
         } else {
-            EnsGatewayRequestDTO requestDTO = new EnsGatewayRequestDTO(data);
+            EnsGatewayRequestDTO requestDTO = new EnsGatewayRequestDTO(data, sender);
             ObjectMapper om = ObjectMapperFactory.getObjectMapper();
 
             return builder.post(RequestBody.create(om.writeValueAsString(requestDTO), JSON))

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

@@ -42,6 +42,7 @@
 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;
@@ -72,7 +73,6 @@ 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;
@@ -392,18 +392,18 @@ TransactionReceipt executeTransaction(
             if (gasProvider instanceof ContractEIP1559GasProvider) {
                 ContractEIP1559GasProvider eip1559GasProvider =
                         (ContractEIP1559GasProvider) gasProvider;
-                if (eip1559GasProvider.isEIP1559Enabled()) {
-                    receipt =
-                            sendEIP1559(
-                                    eip1559GasProvider.getChainId(),
-                                    contractAddress,
-                                    data,
-                                    weiValue,
-                                    eip1559GasProvider.getGasLimit(funcName),
-                                    eip1559GasProvider.getMaxPriorityFeePerGas(funcName),
-                                    eip1559GasProvider.getMaxFeePerGas(funcName),
-                                    constructor);
-                }
+
+                receipt =
+                        sendEIP1559(
+                                eip1559GasProvider.getChainId(),
+                                contractAddress,
+                                data,
+                                weiValue,
+                                eip1559GasProvider.getGasLimit(
+                                        getGenericTransaction(data, constructor)),
+                                eip1559GasProvider.getMaxPriorityFeePerGas(),
+                                eip1559GasProvider.getMaxFeePerGas(),
+                                constructor);
             }
 
             if (receipt == null) {
@@ -412,8 +412,8 @@ TransactionReceipt executeTransaction(
                                 contractAddress,
                                 data,
                                 weiValue,
-                                gasProvider.getGasPrice(funcName),
-                                gasProvider.getGasLimit(funcName),
+                                gasProvider.getGasPrice(),
+                                gasProvider.getGasLimit(getGenericTransaction(data, constructor)),
                                 constructor);
             }
         } catch (JsonRpcError error) {
@@ -447,6 +447,24 @@ 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,11 +15,9 @@
 import java.math.BigInteger;
 
 public interface ContractEIP1559GasProvider extends ContractGasProvider {
-    boolean isEIP1559Enabled();
-
     long getChainId();
 
-    BigInteger getMaxFeePerGas(String contractFunc);
+    BigInteger getMaxFeePerGas();
 
-    BigInteger getMaxPriorityFeePerGas(String contractFunc);
+    BigInteger getMaxPriorityFeePerGas();
 }

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

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