Merge pull request #912 from tronprotocol/release_v4.9.3

Release v4.9.3

Author: lvs0075

README.md

@@ -67,6 +67,26 @@ grpc = {
   }
 }
 
+# Set the maximum number of transactions and backup records that can be retained
+maxRecords = 1000
+
+# To use the tronlink multi-sign feature, please first apply for an secretId and secretKey.
+# For details, please refer to
+# https://docs.google.com/forms/d/e/1FAIpQLSc5EB1X8JN7LA4SAVAG99VziXEY6Kv6JxmlBry9rUBlwI-GaQ/viewform
+# If you prefer not to apply, a speed-limited secretId and secretKey will be provided for use: 
+# secretId = "TEST", secretKey = "TESTTESTTEST", channel = "test".
+tronlink = {
+  mainnet = {
+    secretId = ""
+    secretKey = ""
+    channel = ""
+  }
+  testnet = {
+    secretId = ""
+    secretKey = ""
+    channel = ""
+  }
+}
 ```
 
 ### Run a web wallet
@@ -139,7 +159,8 @@ For more information on a specific command, just type the command in the termina
 | [UpdateAccountPermission](#How-to-use-the-multi-signature-feature-of-wallet-cli) |                 [UpdateAsset](#Update-parameters-of-trc10-token)                  |                            [UpdateBrokerage](#Brokerage)                            |
 |              [UpdateEnergyLimit](#Update-smart-contract-parameters)              |                [UpdateSetting](#Update-smart-contract-parameters)                 |                          [UpdateWitness](#update-witness)                           |
 |                    [ViewBackupRecords](#View-backup-records)                     |                [ViewTransactionHistory](#View-transaction-history)                |                             [VoteWitness](#How-to-vote)                             |
-|                       [WithdrawBalance](#withdraw-balance)                       |                [WithdrawExpireUnfreeze](#withdraw-expire-unfreeze)                |                                                                                     |                                                 
+|                       [WithdrawBalance](#withdraw-balance)                       |                [WithdrawExpireUnfreeze](#withdraw-expire-unfreeze)                |                      [TronlinkMultiSign](#tronlink-multi-sign)                      |                                                 
+|                     [EncodingConverter](#encoding-converter)                     |        [GetPrivateKeyByMnemonic](#How-to-get-privateKey-through-mnemonic)         |                                                                                     |                                                 
 
 
 Type any one of the listed commands, to display how-to tips.
@@ -1803,7 +1824,6 @@ wallet> loginall
 Please input your password.
 password: 
 Use user defined config file in current dir
-WalletApi getRpcVsersion: 2
 [========================================] 100%
 The 1th keystore file name is TJEEKTmaVTYSpJAxahtyuofnDSpe2seajB.json
 The 2th keystore file name is TX1L9xonuUo1AHsjUZ3QzH8wCRmKm56Xew.json
@@ -2621,4 +2641,52 @@ After sign transaction hex string is 0ad4010a0208c72208c02252c2ae3b92e1409fb0b9d
 TxId is 9c8d4b84e9a71ccaad86b0a96f790067d3fc7ea85c26b425e5d748b81d31a8b8
 Transfer 1 to TR311sD6KasRnofj5RnFiFBA2rH8RH2kYk broadcast  successful.
 Please check the given transaction id to get the result on blockchain using getTransactionInfoById command.
+```
+### tronlink multi sign
+> TronlinkMultiSign
+
+Create multi sign transactions and view the multi sign transaction list through the tronlink service.
+
+Example:
+```console
+wallet> tronlinkmultisign
+
+=== Multi-Sign Manager ===
+1. Multi-sign transaction list
+2. Create multi-sign transaction
+0. Exit
+Please enter the number to operate:
+```
+
+### encoding converter
+> EncodingConverter
+
+A Useful Encoding Converter.
+
+Example:
+```console
+wallet> EncodingConverter
+
+==============================
+  Encoding Converter (CLI)
+==============================
+1) TRON - EVM Address
+2) Base64 Encode / Decode
+3) Base58Check Encode / Decode
+4) Public Key -> Address
+5) Private Key -> Public Key & Address
+0) Exit
+> 
+```
+
+### How to get privateKey through mnemonic
+> GetPrivateKeyByMnemonic
+
+Get the private key through mnemonics.
+
+Example:
+```console
+wallet> GetPrivateKeyByMnemonic
+
+Please enter 12 or 24 words (separated by spaces) [Attempt 1/3]:
 ```

build.gradle

@@ -101,6 +101,7 @@ dependencies {
         exclude group: "com.google.guava", module: "guava"
     }
     implementation 'javax.annotation:javax.annotation-api:1.3.2'
+    implementation 'org.java-websocket:Java-WebSocket:1.5.3'
 }
 
 protobuf {

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

@@ -20,17 +20,17 @@ public enum NetType {
           "TFFAMQLZybALaLb4uxHA9RBE7pxhUAjF3U",
           "https://open.gasfree.io",
           "/tron"),
-      "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t"
-  ),
+      "TR7NHqjeKQxGTCi8q8ZY4pL8otSzgjLj6t",
+      "https://api.walletadapter.org"),
   NILE("https://nile.trongrid.io",
       new Grpc(FULLNODE_NILE, FULLNODE_NILE_SOLIDITY),
       new GasFree(
           3448148188L,
           "THQGuFzL87ZqhxkgqYEryRAd7gqFqL5rdc",
           "https://open-test.gasfree.io",
           "/nile"),
-      "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf"
-  ),
+      "TXYZopYRdj2D9XRtbG411XZZ3kM5VkAeBf",
+      "https://apinile.walletadapter.org"),
   SHASTA(
       "https://api.shasta.trongrid.io",
       new Grpc(TRONGRID_SHASTA, TRONGRID_SHASTA_SOLIDITY),
@@ -39,20 +39,22 @@ public enum NetType {
           "TSwCtDum13k1PodgNgTWx5be7k1c6eWaNP",
           "https://open-test.gasfree.io",
           "/shasta"),
-      "TG3XXyExBkPp9nzdajDZsozEu4BkaSJozs"
-  ),
-  CUSTOM(null, null, null, null);
+      "TG3XXyExBkPp9nzdajDZsozEu4BkaSJozs",
+      "https://apishasta.walletadapter.org"),
+  CUSTOM(null, null, null, null, null);
 
   private final String http;
   private final Grpc grpc;
   private final GasFree gasFree;
   private final String usdtAddress;
+  private final String tronlinkUrl;
 
-  NetType(String http, Grpc grpc, GasFree gasFree, String usdtAddress) {
+  NetType(String http, Grpc grpc, GasFree gasFree, String usdtAddress, String tronlinkUrl) {
     this.http = http;
     this.grpc = grpc;
     this.gasFree = gasFree;
     this.usdtAddress = usdtAddress;
+    this.tronlinkUrl = tronlinkUrl;
   }
 
   @Setter

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

@@ -27,6 +27,7 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.bouncycastle.util.encoders.Hex;
 
@@ -439,6 +440,24 @@ public static List<Integer> hexStringToIntegerList(String hexString) {
     return result;
   }
 
+  public static List<Integer> bytesToIntegerList(byte[] bytes) {
+    List<Integer> result = new ArrayList<>();
+    if (ArrayUtils.isEmpty(bytes)) {
+      return result;
+    }
+    for (int byteIndex = 0; byteIndex < bytes.length; byteIndex++) {
+      byte currentByte = bytes[byteIndex];
+
+      for (int bitIndex = 0; bitIndex < 8; bitIndex++) {
+        if ((currentByte & (1 << bitIndex)) != 0) {
+          int value = byteIndex * 8 + bitIndex;
+          result.add(value);
+        }
+      }
+    }
+    return result;
+  }
+
   public static String integerListToHexString(List<Integer> currentOps) {
     byte[] operations = new byte[32];
     currentOps.forEach(e -> operations[e / 8] |= (1 << e % 8));

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

@@ -75,7 +75,7 @@ private static String responseBodyToString(Response response) throws IOException
         }).orElse(EMPTY);
       }
       if (response.code() == 502) {
-        throw new IOException("Unexpected HTTP code " + response.code() + ": Bad Gateway.");
+        throw new IOException("Unexpected HTTP code " + response.code() + ": Bad Gateway. Please try again later.");
       }
       throw new IOException(
           "Unexpected HTTP code " + response.code() + ": " + msg + "\nAPI authentication failed, "

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

@@ -0,0 +1,88 @@
+package org.tron.common.utils;
+
+import static org.tron.common.utils.Utils.greenBoldHighlight;
+import static org.tron.common.utils.Utils.yellowBoldHighlight;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import java.net.URI;
+import java.util.Map;
+import org.java_websocket.client.WebSocketClient;
+import org.java_websocket.handshake.ServerHandshake;
+import org.jline.reader.LineReader;
+
+public class MultiTxWebSocketClient extends WebSocketClient {
+
+  private final LineReader lineReader;
+  private final String subscribeJson;
+
+  public MultiTxWebSocketClient(URI serverUri, Map<String, String> headers,
+                                LineReader lineReader,
+                                String address) {
+    super(serverUri, headers);
+    this.lineReader = lineReader;
+    this.subscribeJson = String.format(
+        "{\"address\":\"%s\",\"version\":\"v1\"}", address
+    );
+  }
+
+  @Override
+  public void onOpen(ServerHandshake handshake) {
+    send(subscribeJson);
+
+//    lineReader.printAbove(
+//        greenBoldHighlight("🔗 WebSocket connected, subscribed address")
+//    );
+  }
+
+  public static boolean isJsonArray(String str) {
+    if (str == null) return false;
+
+    str = str.trim();
+    if (!str.startsWith("[") || !str.endsWith("]")) {
+      return false;
+    }
+
+    try {
+      JSON.parseArray(str);
+      return true;
+    } catch (Exception e) {
+      return false;
+    }
+  }
+
+  @Override
+  public void onMessage(String message) {
+    if (!isJsonArray(message)) {
+      return;
+    }
+    JSONArray jsonArray = JSON.parseArray(message);
+    long count = jsonArray.stream()
+        .map(o -> (JSONObject) o)
+        .filter(obj -> obj.getIntValue("is_sign") == 0
+            && obj.getIntValue("state") == 0)
+        .count();
+    if (count > 0) {
+      lineReader.printAbove(
+          yellowBoldHighlight("🔔 New message: ") + "You have " + count + " transaction(s) to be signed, please view it through the " + greenBoldHighlight("TronlinkMultiSign") + " command."
+      );
+    }
+  }
+
+  @Override
+  public void onClose(int code, String reason, boolean remote) {
+//    lineReader.printAbove(
+//        redBoldHighlight("❌ WebSocket closed: " + reason)
+//    );
+  }
+
+  @Override
+  public void onError(Exception ex) {
+//    lineReader.printAbove(
+//        redBoldHighlight("❌ WebSocket error: " + ex.getMessage())
+//    );
+  }
+}
+
+

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

@@ -21,6 +21,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Scanner;
+import org.bouncycastle.util.encoders.Hex;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.crypto.ECKey.ECDSASignature;
 import org.tron.common.crypto.Sha256Sm3Hash;
@@ -69,6 +70,11 @@ public static Sha256Hash getTransactionId(Chain.Transaction transaction) {
     return Sha256Hash.of(true, transaction.getRawData().toByteArray());
   }
 
+  public static Sha256Hash getTransactionId(String rawDataHex) {
+    byte[] raw = Hex.decode(rawDataHex);
+    return Sha256Hash.of(true, raw);
+  }
+
   public static byte[] getOwner(Transaction.Contract contract) {
     ByteString owner;
     try {
@@ -364,9 +370,9 @@ public static Chain.Transaction setTimestamp(Chain.Transaction transaction) {
     return builder.build();
   }
 
-  public static Chain.Transaction setExpirationTime(Chain.Transaction transaction) {
+  public static Chain.Transaction setExpirationTime(Chain.Transaction transaction, boolean multi) {
     if (transaction.getSignatureCount() == 0) {
-      long expirationTime = System.currentTimeMillis() + 6 * 60 * 60 * 1000;
+      long expirationTime = System.currentTimeMillis() + (multi ? 24L * 3600 * 1000 : 6 * 60 * 60 * 1000);
       Chain.Transaction.Builder builder = transaction.toBuilder();
       Chain.Transaction.raw.Builder rowBuilder =
           transaction.getRawData().toBuilder();

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

@@ -20,6 +20,7 @@
 
 import static org.apache.commons.lang3.StringUtils.EMPTY;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
+import static org.apache.commons.lang3.StringUtils.isNoneBlank;
 import static org.tron.common.utils.ByteArray.toHexString;
 import static org.tron.common.utils.DomainValidator.isDomainOrIP;
 import static org.tron.core.manager.TxHistoryManager.DASH;
@@ -59,6 +60,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import org.apache.commons.lang3.tuple.Triple;
 import org.bouncycastle.util.encoders.Hex;
 import org.jetbrains.annotations.Nullable;
 import org.tron.api.GrpcAPI.BlockExtention;
@@ -132,7 +134,7 @@ public class Utils {
 
   public static final int MIN_LENGTH = 2;
   public static final int MAX_LENGTH = 14;
-  public static final String VERSION = " v4.9.2";
+  public static final String VERSION = " v4.9.3";
   public static final String TRANSFER_METHOD_ID = "a9059cbb";
 
   private static SecureRandom random = new SecureRandom();
@@ -612,7 +614,7 @@ public static Tx getTx(Chain.Transaction transaction) {
             tx.setFrom(encode58Check(triggerSmartContract.getOwnerAddress().toByteArray()));
             tx.setTo(encode58Check(triggerSmartContract.getContractAddress().toByteArray()));
             NetType netType = WalletApi.getCurrentNetwork();
-            if (netType.getUsdtAddress().equals(encode58Check(triggerSmartContract.getContractAddress().toByteArray()))) {
+            if (org.apache.commons.lang3.StringUtils.equals(netType.getUsdtAddress(), encode58Check(triggerSmartContract.getContractAddress().toByteArray()))) {
               setTransferParams(tx, triggerSmartContract);
               tx.setType(contract.getType().name() + "(transferUSDT)");
             }
@@ -1504,4 +1506,17 @@ private static boolean containsChinese(String str) {
     );
   }
 
+  public static String intToBooleanString(int value) {
+    return value == 1 ? "true" : "false";
+  }
+
+  public static boolean allNotBlank(Triple<String, String, String> triple) {
+    return triple != null
+        && isNoneBlank(
+        triple.getLeft(),
+        triple.getMiddle(),
+        triple.getRight()
+    );
+  }
+
 }