feat(gasfree): support Ledger for gasfree

Author: lxcmyf

README.md

@@ -105,7 +105,7 @@ For more information on a specific command, just type the command on terminal wh
 |             [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)                           |                          [SwitchNetwork](#switch-network)                           |
-|                        [CurrentNetwork](#current-network)                        |                        [GasFreeAddress](#gas-free-address)                        |                        [GasFreeTransfer](#gas-free-transfer)                        |
+|                        [CurrentNetwork](#current-network)                        |                           [GasFreeInfo](#gas-free-info)                           |                        [GasFreeTransfer](#gas-free-transfer)                        |
 |                         [GasFreeTrace](#gas-free-trace)                          |                                                                                   |                                                                                     |
 
 
@@ -1645,6 +1645,7 @@ 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
@@ -1654,10 +1655,18 @@ Please select network：
 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 !!!
 ```
 
@@ -1671,14 +1680,43 @@ wallet> currentnetwork
 currentNetwork: NILE
 ```
 
-## gas free address
-    > GasFreeAddress
->Get the gas-free address of the current address.
+```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> gasfreeaddress TUUSMd58eC3fKx3fn7whxJyr1FR56tgaP8
-gas free address : TNER12mMVWruqopsW9FQtKxCGfZcEtb3ER
+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

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/utils/DomainValidator.java

@@ -36,6 +36,6 @@ public static boolean isDomain(String input) {
   public static boolean isDomainOrIP(String input) {
     if (input == null || input.isEmpty()) return false;
     if ("localhost".equalsIgnoreCase(input)) return true;
-    return isIPv4(input) || isIPv6(input) || isDomain(input);
+    return isIPv4(input) || isDomain(input);
   }
 }

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

@@ -7,7 +7,6 @@
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
-import okhttp3.FormBody;
 import okhttp3.MediaType;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
@@ -25,7 +24,6 @@ public class HttpUtils {
       .build();
 
   private static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-  private static final MediaType FORM = MediaType.parse("application/x-www-form-urlencoded; charset=utf-8");
 
   public static String get(String url, Map<String, String> headers) throws IOException {
     Request.Builder builder = new Request.Builder().url(url).get();
@@ -54,27 +52,6 @@ public static String postJson(String url, String jsonBody) throws IOException {
     return postJson(url, jsonBody, null);
   }
 
-  // POST 请求 - 表单格式
-  public static String postForm(String url, Map<String, String> formParams, Map<String, String> headers) throws IOException {
-    FormBody.Builder formBuilder = new FormBody.Builder();
-    if (formParams != null) {
-      formParams.forEach(formBuilder::add);
-    }
-
-    Request.Builder builder = new Request.Builder()
-        .url(url)
-        .post(formBuilder.build());
-
-    if (headers != null) {
-      headers.forEach(builder::addHeader);
-    }
-
-    Request request = builder.build();
-    try (Response response = client.newCall(request).execute()) {
-      return responseBodyToString(response);
-    }
-  }
-
   private static String responseBodyToString(Response response) throws IOException {
     if (!response.isSuccessful()) {
       String msg = response.message();

src/main/java/org/tron/gasfree/GasFreeApi.java

@@ -31,7 +31,6 @@
 import org.tron.gasfree.request.GasFreeSubmitRequest;
 import org.web3j.abi.FunctionEncoder;
 import org.web3j.abi.datatypes.Address;
-import org.web3j.abi.datatypes.DynamicBytes;
 import org.web3j.abi.datatypes.Function;
 import org.web3j.abi.datatypes.Type;
 import org.web3j.abi.datatypes.generated.Bytes32;
@@ -43,7 +42,6 @@
 import org.web3j.utils.Numeric;
 
 public class GasFreeApi {
-  public static final String CREATION_CODE_STR = "0x60a06040526040516105ac3803806105ac83398101604081905261002291610382565b61002c828261003e565b506001600160a01b0316608052610471565b610047826100fb565b6040516001600160a01b038316907f1cf3b03a6cf19fa2baba4df148e9dcabedea7f8a5c07840e207e5c089be95d3e905f90a28051156100ef576100ea826001600160a01b0316635c60da1b6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156100c0573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906100e4919061043d565b82610209565b505050565b6100f761027c565b5050565b806001600160a01b03163b5f0361013557604051631933b43b60e21b81526001600160a01b03821660048201526024015b60405180910390fd5b807fa3f0ad74e5423aebfd80d3ef4346578335a9a72aeaee59ff6cb3582b35133d5080546001600160a01b0319166001600160a01b0392831617905560408051635c60da1b60e01b815290515f92841691635c60da1b9160048083019260209291908290030181865afa1580156101ae573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906101d2919061043d565b9050806001600160a01b03163b5f036100f757604051634c9c8ce360e01b81526001600160a01b038216600482015260240161012c565b60605f80846001600160a01b0316846040516102259190610456565b5f60405180830381855af49150503d805f811461025d576040519150601f19603f3d011682016040523d82523d5f602084013e610262565b606091505b50909250905061027385838361029d565b95945050505050565b341561029b5760405163b398979f60e01b815260040160405180910390fd5b565b6060826102b2576102ad826102fc565b6102f5565b81511580156102c957506001600160a01b0384163b155b156102f257604051639996b31560e01b81526001600160a01b038516600482015260240161012c565b50805b9392505050565b80511561030c5780518082602001fd5b604051630a12f52160e11b815260040160405180910390fd5b80515f906001600160a81b038116811461033d575f80fd5b6001600160a01b031692915050565b634e487b7160e01b5f52604160045260245ffd5b5f5b8381101561037a578181015183820152602001610362565b50505f910152565b5f8060408385031215610393575f80fd5b61039c83610325565b60208401519092506001600160401b03808211156103b8575f80fd5b818501915085601f8301126103cb575f80fd5b8151818111156103dd576103dd61034c565b604051601f8201601f19908116603f011681019083821181831017156104055761040561034c565b8160405282815288602084870101111561041d575f80fd5b61042e836020830160208801610360565b80955050505050509250929050565b5f6020828403121561044d575f80fd5b6102f582610325565b5f8251610467818460208701610360565b9190910192915050565b6080516101246104885f395f601d01526101245ff3fe6080604052600a600c565b005b60186014601a565b609d565b565b5f7f00000000000000000000000000000000000000000000000000000000000000006001600160a01b0316635c60da1b6040518163ffffffff1660e01b8152600401602060405180830381865afa1580156076573d5f803e3d5ffd5b505050506040513d601f19601f820116820180604052508101906098919060ba565b905090565b365f80375f80365f845af43d5f803e80801560b6573d5ff35b3d5ffd5b5f6020828403121560c9575f80fd5b81516001600160a81b038116811460de575f80fd5b6001600160a01b0316939250505056fea26474726f6e582212201a19cd1340c744d4f2dd20c2563b0a588f92859265dff6c1fd5750b22eef473f64736f6c63430008140033";
   public static final String DOMAIN_TYPE_STRING = "EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)";
   public static final String PERMIT_TRANSFER_TYPE_STRING = "PermitTransfer(address token,address serviceProvider,address user,address receiver,uint256 value,uint256 maxFee,uint256 deadline,uint256 version,uint256 nonce)";
   private static final String API_PATH_TOKEN_ALL = "/api/v1/config/token/all";
@@ -106,16 +104,6 @@ public static byte[] concat(byte[]... arrays) {
     return result;
   }
 
-  public static byte[] bytecodeHash(String user, String beacon) {
-    byte[] creationCode = Numeric.hexStringToByteArray(CREATION_CODE_STR);
-    String userHex = Numeric.toHexString(tronBase58ToBytes32(user));
-    String beaconHex = Numeric.toHexString(tronBase58ToBytes32(beacon));
-    byte[] encodedCall = abiEncodeCall("initialize", new Address(userHex));
-    byte[] encodedOuter = abiEncode(new Address(beaconHex), new DynamicBytes(encodedCall));
-    byte[] packed = abiEncodePacked(creationCode, encodedOuter);
-    return Hash.sha3(packed);
-  }
-
   private static String buildApiPath(NetType netType, String apiPath) {
     String prefix = netType.getGasFree().getApiPrefix();
     return prefix + apiPath;
@@ -274,29 +262,39 @@ public static byte[] getMessage(NetType netType, GasFreeSubmitRequest gasFreeSub
     JSONObject root = JSON.parseObject(resp);
     JSONObject data = root.getJSONObject("data");
     JSONArray tokens = data.getJSONArray("tokens");
-    String tokenAddress = EMPTY;
-    long maxFee = 0;
-    long activateFee = 0;
-    long transferFee = 0;
-    if (tokens != null && !tokens.isEmpty()) {
-      JSONObject token = tokens.getJSONObject(0);
-      tokenAddress = token.getString("tokenAddress");
-      activateFee = token.getLongValue("activateFee");
-      transferFee = token.getLongValue("transferFee");
-      maxFee = activateFee + transferFee;
+    if (tokens == null || tokens.isEmpty()) {
+      System.out.println("Failed to get tokens information.");
+      return new byte[0];
     }
+    String tokenAddress;
+    long maxFee;
+    long activateFee;
+    long transferFee;
+    JSONObject tokensJSONObject = tokens.getJSONObject(0);
+    tokenAddress = tokensJSONObject.getString("tokenAddress");
+    activateFee = tokensJSONObject.getLongValue("activateFee");
+    transferFee = tokensJSONObject.getLongValue("transferFee");
+    maxFee = activateFee + transferFee;
     gasFreeSubmitRequest.setToken(tokenAddress);
     gasFreeSubmitRequest.setMaxFee(maxFee);
 
     String providerAll = providerAll(netType);
     JSONObject root1 = JSON.parseObject(providerAll);
     JSONObject data1 = root1.getJSONObject("data");
     JSONArray providers = data1.getJSONArray("providers");
-    String providerAddress = EMPTY;
-    if (providers != null && !providers.isEmpty()) {
-      JSONObject provider = providers.getJSONObject(0);
-      providerAddress = provider.getString("address");
+    if (providers == null || providers.isEmpty()) {
+      System.out.println("Failed to get providers information.");
+      return new byte[0];
+    }
+    String providerAddress;
+    long defaultDeadlineDuration;
+    JSONObject provider = providers.getJSONObject(0);
+    providerAddress = provider.getString("address");
+    JSONObject config = provider.getJSONObject("config");
+    if (config == null) {
+      return new byte[0];
     }
+    defaultDeadlineDuration = config.getLongValue("defaultDeadlineDuration");
     gasFreeSubmitRequest.setServiceProvider(providerAddress);
 
     String addressResp = address(netType, gasFreeSubmitRequest.getUser());
@@ -307,7 +305,7 @@ public static byte[] getMessage(NetType netType, GasFreeSubmitRequest gasFreeSub
     System.out.println("Activate Fee: " + (active ? 0 : activateFee));
     System.out.println("Transfer Fee: " + transferFee);
     gasFreeSubmitRequest.setNonce(nonce);
-    gasFreeSubmitRequest.setDeadline((System.currentTimeMillis() / 1000) + 300);
+    gasFreeSubmitRequest.setDeadline((System.currentTimeMillis() / 1000) + defaultDeadlineDuration);
 
     Address token = new Address(Numeric.toHexString(tronBase58ToBytes32(gasFreeSubmitRequest.getToken())));
     Address serviceProvider = new Address(Numeric.toHexString(tronBase58ToBytes32(gasFreeSubmitRequest.getServiceProvider())));

src/main/java/org/tron/ledger/LedgerSignUtil.java

@@ -18,9 +18,9 @@
 
 public class LedgerSignUtil {
 
-  public static boolean requestLedgerSignLogic(Protocol.Transaction transaction, String path, String address) {
+  public static boolean requestLedgerSignLogic(Protocol.Transaction transaction, String path, String address, boolean gasfree) {
     try {
-      if (!ContractTypeChecker.canUseLedgerSign(
+      if (!gasfree && !ContractTypeChecker.canUseLedgerSign(
           transaction.getRawData().getContract(0).getType().toString())) {
         return false;
       }
@@ -70,7 +70,7 @@ public static boolean requestLedgerSignLogic(Protocol.Transaction transaction, S
           if (hidDevice.isClosed()) {
             hidDevice.open();
           }
-          ret = LedgerEventListener.getInstance().executeSignListen(hidDevice, transaction, path);
+          ret = LedgerEventListener.getInstance().executeSignListen(hidDevice, transaction, path, gasfree);
         } catch (IllegalStateException e) {
           System.out.println(ANSI_RED + e.getMessage() + ANSI_RESET);
           if (DebugConfig.isDebugEnabled()) {

src/main/java/org/tron/ledger/listener/LedgerEventListener.java

@@ -77,10 +77,10 @@ private synchronized void shutdownHidServices() {
   }
 
 
-  public boolean executeSignListen(HidDevice hidDevice, Transaction transaction, String path) {
+  public boolean executeSignListen(HidDevice hidDevice, Transaction transaction, String path, boolean gasfree) {
     boolean ret = false;
     try {
-      byte[] sendResult = handleTransSign(hidDevice, transaction, path);
+      byte[] sendResult = handleTransSign(hidDevice, transaction, path, gasfree);
       if (sendResult == null) {
         System.out.println("Transaction sign request is sent to Ledger");
         TransactionSignManager.getInstance().setHidDevice(hidDevice);
@@ -103,7 +103,7 @@ public boolean executeSignListen(HidDevice hidDevice, Transaction transaction, S
   /**
    * @param path example "m/44'/195'/0'/0/0"
    */
-  public byte[] handleTransSign(HidDevice hidDevice, Transaction transaction, String path) {
+  public byte[] handleTransSign(HidDevice hidDevice, Transaction transaction, String path, boolean gasfree) {
     final int TIMEOUT_MILLIS = 1000;
     final int MAX_WAIT_TIME_MILLIS = 1000; // 1.5 seconds
     final int BYTE_LENGTH_THRESHOLD = 255;
@@ -115,12 +115,15 @@ public byte[] handleTransSign(HidDevice hidDevice, Transaction transaction, Stri
     String ins;
     String p1;
     String p2 = "00";
-    if (rawBytes.length < BYTE_LENGTH_THRESHOLD) {
+    if (rawBytes.length < BYTE_LENGTH_THRESHOLD && !gasfree) {
       transactionRaw = bytesToHex(rawBytes);
       ins = "04";
       p1 = "10";
     } else {
       transactionRaw = bytesToHex(getTransactionId(transaction).getBytes());
+      if (gasfree) {
+        transactionRaw = bytesToHex(transaction.getRawData().getData().toByteArray());
+      }
       ins = "05";
       p1 = "00";
     }
@@ -190,6 +193,7 @@ public void hidDataReceived(HidServicesEvent event) {
           if (DebugConfig.isDebugEnabled()) {
             System.out.println("Signature: " + CommonUtil.bytesToHex(signature));
           }
+          TransactionSignManager.getInstance().generateGasFreeSignature(signature);
           TransactionSignManager.getInstance().addTransactionSign(signature);
           LedgerSignResult.updateState(
               TransactionSignManager.getInstance().getHidDevice().getPath()

src/main/java/org/tron/ledger/listener/TransactionSignManager.java

@@ -1,12 +1,14 @@
 package org.tron.ledger.listener;
 
 import com.google.protobuf.ByteString;
+import org.bouncycastle.util.encoders.Hex;
 import org.hid4java.HidDevice;
 import org.tron.protos.Protocol;
 
 public class TransactionSignManager {
   private Protocol.Transaction transaction;
   private HidDevice hidDevice;
+  private String gasfreeSignature;
 
   private TransactionSignManager() {
 
@@ -24,6 +26,10 @@ public synchronized void setTransaction(Protocol.Transaction newTransaction) {
     this.transaction = newTransaction;
   }
 
+  public synchronized void setGasfreeSignature(String gasfreeSignature) {
+    this.gasfreeSignature = gasfreeSignature;
+  }
+
   public synchronized void setHidDevice(HidDevice hidDevice) {
     this.hidDevice = hidDevice;
   }
@@ -33,6 +39,10 @@ public synchronized Protocol.Transaction getTransaction() {
     return this.transaction;
   }
 
+  public synchronized String getGasfreeSignature() {
+    return this.gasfreeSignature;
+  }
+
   public synchronized HidDevice getHidDevice() {
     return this.hidDevice;
   }
@@ -43,4 +53,8 @@ public synchronized void addTransactionSign(byte[] signByteArr) {
     transactionBuilderSigned.addSignature(bsSign);
     transaction = transactionBuilderSigned.build();
   }
+
+  public synchronized void generateGasFreeSignature(byte[] signedHash) {
+    this.gasfreeSignature = Hex.toHexString(signedHash);
+  }
 }

src/main/java/org/tron/walletcli/Client.java

@@ -5627,6 +5627,11 @@ private void gasFreeTrace(String[] parameters) throws IOException, NoSuchAlgorit
   private void currentNetwork() {
     NetType currentNet = WalletApi.getCurrentNetwork();
     Pair<String, String> customNodes = WalletApi.getCustomNodes();
+    if (customNodes == null || (org.apache.commons.lang3.StringUtils.isEmpty(customNodes.getLeft())
+        && org.apache.commons.lang3.StringUtils.isEmpty(customNodes.getRight()))) {
+      System.out.println("The configuration of both fullnode and solidity cannot be empty at the same time.");
+      return;
+    }
     String fullNode = customNodes.getLeft();
     String solidityNode = customNodes.getRight();
     System.out.println("current network: " + blueBoldHighlight(currentNet.name()));