Merge pull request #847 from tronprotocol/master

Master merge into develop

Author: lvs0075

README.md

@@ -104,7 +104,9 @@ For more information on a specific command, just type the command on terminal wh
 |                   [GenerateSubAccount](#generate-sub-account)                    |                   [ClearWalletKeystore](#clear-wallet-keystore)                   |               [ExportWalletKeystore](#export-import-wallet-keystore)                |
 |             [ImportWalletByKeystore](#export-import-wallet-keystore)             |                 [ImportWalletByLedger](#import-wallet-by-ledger)                  |                               [LoginAll](#login-all)                                |
 |                                  [Lock](#lock)                                   |                                 [Unlock](#unlock)                                 |                            [ResetWallet](#reset-wallet)                             |
-|                         [CreateAccount](#create-account)                         |                          [SwitchWallet](#switch-wallet)                           |
+|                         [CreateAccount](#create-account)                         |                          [SwitchWallet](#switch-wallet)                           |                          [SwitchNetwork](#switch-network)                           |
+|                        [CurrentNetwork](#current-network)                        |                           [GasFreeInfo](#gas-free-info)                           |                        [GasFreeTransfer](#gas-free-transfer)                        |
+|                         [GasFreeTrace](#gas-free-trace)                          |                                                                                   |                                                                                     |
 
 
 Type any one of the listed commands, to display how-to tips.
@@ -1640,6 +1642,156 @@ password:
 unlock  successful !!!
 ```
 
+## switch network
+    > SwitchNetwork
+>This command allows for flexible network switching at any time. Unlocking can specify parameters in seconds.
+>`switchnetwork local` will switch to the network configured in local config.conf.
+
+Example:
+```console
+wallet> switchnetwork
+Please select network：
+1. MAIN
+2. NILE
+3. SHASTA
+Enter numbers to select a network (1-3):1
+Now, current network is : MAIN
+SwitchNetwork  successful !!!
+```
+```console
+wallet> switchnetwork main
+Now, current network is : MAIN
+SwitchNetwork  successful !!!
+```
+
+```console
+wallet> switchnetwork empty localhost:50052
+Now, current network is : CUSTOM
+SwitchNetwork  successful !!!
+```
+
+## current network
+    > CurrentNetwork
+>View current network.
+
+Example:
+```console
+wallet> currentnetwork
+currentNetwork: NILE
+```
+
+```console
+wallet> currentnetwork
+current network: CUSTOM
+fullNode: EMPTY, solidityNode: localhost:50052
+```
+
+## gas free info
+    > GasFreeInfo
+>Get gasfree info of the current address.
+
+Example:
+```console
+wallet> gasfreeinfo
+balanceOf(address):70a08231
+{
+	"gasFreeAddress":"TCtSt8fCkZcVdrGpaVHUr6P8EmdjysswMF",
+	"active":true,
+	"tokenBalance":998696000,
+	"activateFee":0,
+	"transferFee":2000,
+	"maxTransferValue":998694000
+}
+gasFreeInfo:  successful !!
+```
+
+```console
+wallet> gasfreeinfo TRvVXgqddDGYRMx3FWf2tpVxXQQXDZxJQe
+balanceOf(address):70a08231
+{
+	"gasFreeAddress":"TCtSt8fCkZcVdrGpaVHUr6P8EmdjysswMF",
+	"active":true,
+	"tokenBalance":998696000,
+	"activateFee":0,
+	"transferFee":2000,
+	"maxTransferValue":998694000
+}
+gasFreeInfo:  successful !!
+```
+
+## gas free transfer
+    > GasFreeTransfer
+>Transfer funds through gas-free.
+
+Example:
+```console
+wallet> gasfreetransfer TEkj3ndMVEmFLYaFrATMwMjBRZ1EAZkucT 100000
+
+GasFreeTransfer result: {
+	"code":200,
+	"data":{
+		"amount":100000,
+		"providerAddress":"TKtWbdzEq5ss9vTS9kwRhBp5mXmBfBns3E",
+		"apiKey":"",
+		"accountAddress":"TUUSMd58eC3fKx3fn7whxJyr1FR56tgaP8",
+		"signature":"",
+		"targetAddress":"TEkj3ndMVEmFLYaFrATMwMjBRZ1EAZkucT",
+		"maxFee":2000000,
+		"version":1,
+		"nonce":8,
+		"tokenAddress":"TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf",
+		"createdAt":1747909635678,
+		"expiredAt":1747909695000,
+		"estimatedTransferFee":2000,
+		"id":"6c3ff67e-0bf4-4c09-91ca-0c7c254b01a0",
+		"state":"WAITING",
+		"estimatedActivateFee":0,
+		"gasFreeAddress":"TNER12mMVWruqopsW9FQtKxCGfZcEtb3ER",
+		"updatedAt":1747909635678
+	}
+}
+GasFreeTransfer  successful !!!
+```
+
+## gas free trace
+    > GasFreeTrace
+>Query GasFreeTrace to obtain transfer details by using the transaction ID returned by GasFreeTransfer as the traceId.
+
+Example:
+```console
+wallet> gasfreetrace 6c3ff67e-0bf4-4c09-91ca-0c7c254b01a0
+GasFreeTrace result: {
+	"code":200,
+	"data":{
+		"amount":100000,
+		"providerAddress":"TKtWbdzEq5ss9vTS9kwRhBp5mXmBfBns3E",
+		"txnTotalCost":102000,
+		"accountAddress":"TUUSMd58eC3fKx3fn7whxJyr1FR56tgaP8",
+		"txnActivateFee":0,
+		"estimatedTotalCost":102000,
+		"targetAddress":"TEkj3ndMVEmFLYaFrATMwMjBRZ1EAZkucT",
+		"txnBlockTimestamp":1747909638000,
+		"txnTotalFee":2000,
+		"nonce":8,
+		"estimatedTotalFee":2000,
+		"tokenAddress":"TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf",
+		"txnHash":"858f9a00776163b1f8a34467b9c5727657f8971a9f4e9d492f0a247fac0384f9",
+		"txnBlockNum":57175988,
+		"createdAt":1747909635678,
+		"expiredAt":1747909695000,
+		"estimatedTransferFee":2000,
+		"txnState":"ON_CHAIN",
+		"id":"6c3ff67e-0bf4-4c09-91ca-0c7c254b01a0",
+		"state":"CONFIRMING",
+		"estimatedActivateFee":0,
+		"gasFreeAddress":"TNER12mMVWruqopsW9FQtKxCGfZcEtb3ER",
+		"txnTransferFee":2000,
+		"txnAmount":100000
+	}
+}
+GasFreeTrace:  successful!!
+```
+
 ## switch wallet
     > SwitchWallet
 >After logging in with the LoginAll command, you can switch wallets

build.gradle

@@ -93,6 +93,11 @@ dependencies {
     }
     implementation group: 'org.hid4java', name: 'hid4java', version: '0.8.0'
     //implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    implementation("com.squareup.okhttp3:okhttp:4.12.0")
+    implementation("io.github.tronprotocol:trident:0.10.0") {
+        exclude group: "com.google.guava", module: "guava"
+    }
+
 }
 
 protobuf {

src/main/java/org/tron/common/crypto/ECKey.java

@@ -179,7 +179,7 @@ public ECKey(SecureRandom secureRandom) {
    * <p>All private key operations will use the provider.
    */
 
-  // isPrivateKey true 私钥 其他公钥
+  // isPrivateKey true
   public ECKey(byte[] key, boolean isPrivateKey) {
     if (isPrivateKey) {
       BigInteger pk = new BigInteger(1, key);

src/main/java/org/tron/common/enums/NetType.java

@@ -0,0 +1,77 @@
+package org.tron.common.enums;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+public enum NetType {
+  MAIN(
+      "https://api.trongrid.io",
+      new Grpc("grpc.trongrid.io:50051", "grpc.trongrid.io:50052"),
+      new GasFree(
+          728126428L,
+          "TFFAMQLZybALaLb4uxHA9RBE7pxhUAjF3U",
+          "https://open.gasfree.io",
+          "/tron")
+  ),
+  NILE("https://nile.trongrid.io",
+      new Grpc("grpc.nile.trongrid.io:50051", "grpc.nile.trongrid.io:50061"),
+      new GasFree(
+          3448148188L,
+          "THQGuFzL87ZqhxkgqYEryRAd7gqFqL5rdc",
+          "https://open-test.gasfree.io",
+          "/nile")
+  ),
+  SHASTA(
+      "https://api.shasta.trongrid.io",
+      new Grpc("grpc.shasta.trongrid.io:50051", "grpc.shasta.trongrid.io:50052"),
+      new GasFree(
+          2494104990L,
+          "TSwCtDum13k1PodgNgTWx5be7k1c6eWaNP",
+          "https://open-test.gasfree.io",
+          "/shasta")
+  ),
+  CUSTOM(null, null, null);
+
+  private final String http;
+  private final Grpc grpc;
+  private final GasFree gasFree;
+
+  NetType(String http, Grpc grpc, GasFree gasFree) {
+    this.http = http;
+    this.grpc = grpc;
+    this.gasFree = gasFree;
+  }
+
+  @Setter
+  @Getter
+  public static class Grpc {
+    public Grpc(String fullNode, String solidityNode) {
+      this.fullNode = fullNode;
+      this.solidityNode = solidityNode;
+    }
+
+    private String fullNode;
+    private String solidityNode;
+  }
+
+  @Setter
+  @Getter
+  public static class GasFree {
+    private long chainId;
+    private String verifyingContract;
+    private String httpUrl;
+    private String apiPrefix;
+
+    public GasFree(long chainId, String verifyingContract, String httpUrl, String apiPrefix) {
+      this.chainId = chainId;
+      this.verifyingContract = verifyingContract;
+      this.httpUrl = httpUrl;
+      this.apiPrefix = apiPrefix;
+    }
+
+
+  }
+}
+
+

src/main/java/org/tron/common/utils/DomainValidator.java

@@ -0,0 +1,41 @@
+package org.tron.common.utils;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.regex.Pattern;
+
+public class DomainValidator {
+  private static final Pattern DOMAIN_PATTERN = Pattern.compile(
+      "^((?!-)[A-Za-z0-9-]{1,63}(?<!-)\\.)+" +
+          "([A-Za-z]{2,63}|xn--[A-Za-z0-9]{1,59})$"
+  );
+
+  // IPv4
+  private static final Pattern IPV4_PATTERN = Pattern.compile(
+      "^((25[0-5]|2[0-4]\\d|1\\d{2}|[1-9]?\\d)(\\.|$)){4}$"
+  );
+
+  // IPv6
+  public static boolean isIPv6(String input) {
+    try {
+      InetAddress address = InetAddress.getByName(input);
+      return address.getHostAddress().contains(":");
+    } catch (UnknownHostException e) {
+      return false;
+    }
+  }
+
+  public static boolean isIPv4(String input) {
+    return IPV4_PATTERN.matcher(input).matches();
+  }
+
+  public static boolean isDomain(String input) {
+    return DOMAIN_PATTERN.matcher(input).matches();
+  }
+
+  public static boolean isDomainOrIP(String input) {
+    if (input == null || input.isEmpty()) return false;
+    if ("localhost".equalsIgnoreCase(input)) return true;
+    return isIPv4(input) || isDomain(input);
+  }
+}

src/main/java/org/tron/common/utils/HttpUtils.java

@@ -0,0 +1,80 @@
+package org.tron.common.utils;
+
+import static org.apache.commons.lang3.StringUtils.EMPTY;
+import static org.tron.common.utils.Utils.greenBoldHighlight;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+import okhttp3.MediaType;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.RequestBody;
+import okhttp3.Response;
+import okhttp3.ResponseBody;
+import org.apache.commons.lang3.StringUtils;
+
+public class HttpUtils {
+
+  private static final OkHttpClient client = new OkHttpClient.Builder()
+      .connectTimeout(10, TimeUnit.SECONDS)
+      .readTimeout(15, TimeUnit.SECONDS)
+      .writeTimeout(15, TimeUnit.SECONDS)
+      .build();
+
+  private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
+
+  public static String get(String url, Map<String, String> headers) throws IOException {
+    Request.Builder builder = new Request.Builder().url(url).get();
+    if (headers != null) {
+      headers.forEach(builder::addHeader);
+    }
+    Request request = builder.build();
+    try (Response response = client.newCall(request).execute()) {
+      return responseBodyToString(response);
+    }
+  }
+
+  public static String postJson(String url, String jsonBody, Map<String, String> headers) throws IOException {
+    RequestBody body = RequestBody.create(jsonBody, JSON);
+    Request.Builder builder = new Request.Builder().url(url).post(body);
+    if (headers != null) {
+      headers.forEach(builder::addHeader);
+    }
+    Request request = builder.build();
+    try (Response response = client.newCall(request).execute()) {
+      return responseBodyToString(response);
+    }
+  }
+
+  public static String postJson(String url, String jsonBody) throws IOException {
+    return postJson(url, jsonBody, null);
+  }
+
+  private static String responseBodyToString(Response response) throws IOException {
+    if (!response.isSuccessful()) {
+      String msg = response.message();
+      if (StringUtils.isEmpty(msg) ) {
+        msg = Optional.ofNullable(response.body()).map(body -> {
+              try {
+                return body.string();
+              } catch (Exception e) {
+                return EMPTY;
+              }
+        }).orElse(EMPTY);
+      }
+      if (response.code() == 502) {
+        throw new IOException("Unexpected HTTP code " + response.code() + ": Bad Gateway.");
+      }
+      throw new IOException(
+          "Unexpected HTTP code " + response.code() + ": " + msg + "\nAPI authentication failed, "
+              + "please check the " + greenBoldHighlight("apikey") + " and "
+              + greenBoldHighlight("apiSecret") + " configured in config.conf.");
+    }
+    ResponseBody body = response.body();
+    return body != null ? body.string() : EMPTY;
+  }
+}
+
+