Merge pull request #874 from lxcmyf/feature/dev_491

feat(prompt): optimize prompt information

Author: lvs0075

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

@@ -22,6 +22,7 @@
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 import static org.tron.common.utils.ByteArray.toHexString;
 import static org.tron.common.utils.DomainValidator.isDomainOrIP;
+import static org.tron.core.manager.TxHistoryManager.DASH;
 import static org.tron.keystore.StringUtils.byte2String;
 import static org.tron.ledger.console.ConsoleColor.ANSI_BLUE;
 import static org.tron.ledger.console.ConsoleColor.ANSI_BOLD;
@@ -42,6 +43,7 @@
 import java.io.Console;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigInteger;
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
 import java.nio.charset.Charset;
@@ -57,6 +59,7 @@
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
+import org.bouncycastle.util.encoders.Hex;
 import org.jetbrains.annotations.Nullable;
 import org.tron.api.GrpcAPI.BlockExtention;
 import org.tron.api.GrpcAPI.BlockList;
@@ -128,6 +131,8 @@ public class Utils {
 
   public static final int MIN_LENGTH = 2;
   public static final int MAX_LENGTH = 14;
+  public static final String VERSION = " v4.9.1";
+  public static final String TRANSFER_METHOD_ID = "a9059cbb";
 
   private static SecureRandom random = new SecureRandom();
 
@@ -605,6 +610,7 @@ public static Tx getTx(Chain.Transaction transaction) {
             tx.setType(contract.getType().name());
             tx.setFrom(encode58Check(triggerSmartContract.getOwnerAddress().toByteArray()));
             tx.setTo(encode58Check(triggerSmartContract.getContractAddress().toByteArray()));
+            setTransferParams(tx, triggerSmartContract);
             break;
           case UpdateSettingContract:
             UpdateSettingContract updateSettingContract =
@@ -778,6 +784,35 @@ public static Tx getTx(Chain.Transaction transaction) {
     return tx;
   }
 
+  private static void setTransferParams(Tx tx, TriggerSmartContract triggerSmartContract) {
+    try {
+      byte[] data = triggerSmartContract.getData().toByteArray();
+      byte[] methodId = Arrays.copyOfRange(data, 0, 4);
+      if (TRANSFER_METHOD_ID.equals(Hex.toHexString(methodId))) {
+        byte[] toBytes = Arrays.copyOfRange(data, 4, 36);
+        byte[] addressBytes = Arrays.copyOfRange(toBytes, 12, 32);
+        byte[] tronAddressBytes = new byte[21];
+        tronAddressBytes[0] = 0x41;
+        System.arraycopy(addressBytes, 0, tronAddressBytes, 1, 20);
+        String to = encode58Check(tronAddressBytes);
+        byte[] amountBytes = Arrays.copyOfRange(data, 36, 68);
+        tx.setTo(to);
+        tx.setAmount(parseAmountToLongStr(amountBytes));
+      }
+    } catch (Exception e) {
+      System.out.println(e.getMessage());
+    }
+  }
+
+  public static String parseAmountToLongStr(byte[] amountBytes) {
+    BigInteger amount = new BigInteger(1, amountBytes);
+    if (amount.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) > 0) {
+      System.out.println("Amount exceeds long capacity: " + amount);
+      return DASH;
+    }
+    return String.valueOf(amount.longValue());
+  }
+
   public static JSONObject printTransactionToJSON(Protocol.Transaction transaction, boolean selfType) {
     JSONObject jsonTransaction =
         JSON.parseObject(JsonFormat.printToString(transaction, selfType));
@@ -1175,7 +1210,7 @@ public static void printBanner() {
     try (InputStream inputStream = Client.class.getResourceAsStream("/banner.txt")) {
       if (inputStream != null) {
         String banner = new String(readAllBytes(inputStream), StandardCharsets.UTF_8);
-        System.out.println(blueBoldHighlight(banner));
+        System.out.println(blueBoldHighlight(banner) + blueBoldHighlight(VERSION));
       } else {
         System.out.println("No banner.txt found!");
       }

src/main/java/org/tron/core/manager/BackupRecordManager.java

@@ -120,8 +120,8 @@ public List<BackupRecord> loadAllRecords() {
 
   public List<BackupRecord> getRecordsByTimeRange(LocalDateTime start, LocalDateTime end) {
     return loadAllRecords().stream()
-        .filter(br -> br.getTimestamp().isBefore(end))
-        .filter(br -> br.getTimestamp().isAfter(start))
+        .filter(br -> !br.getTimestamp().isBefore(start))
+        .filter(br -> !br.getTimestamp().isAfter(end))
         .sorted(Comparator.comparing(BackupRecord::getTimestamp).reversed())
         .collect(Collectors.toList());
   }

src/main/java/org/tron/core/manager/TxHistoryManager.java

@@ -144,8 +144,8 @@ public List<Tx> getUserTransactionsByTimeRange(NetType network, LocalDateTime st
           .filter(Optional::isPresent)
           .map(Optional::get)
           .filter(tx -> tx.isRelatedTo(currentUserAddress))
-          .filter(tx -> tx.getTimestamp().isBefore(end))
-          .filter(tx -> tx.getTimestamp().isAfter(start))
+          .filter(tx -> !tx.getTimestamp().isBefore(start))
+          .filter(tx -> !tx.getTimestamp().isAfter(end))
           .sorted(Comparator.comparing(Tx::getTimestamp).reversed())
           .skip((page - 1L) * PAGE_SIZE)
           .limit(PAGE_SIZE)
@@ -197,8 +197,8 @@ public int getUserTotalPagesByTimeRange(NetType network, LocalDateTime start, Lo
           .filter(Optional::isPresent)
           .map(Optional::get)
           .filter(tx -> tx.isRelatedTo(currentUserAddress))
-          .filter(tx -> tx.getTimestamp().isBefore(end))
-          .filter(tx -> tx.getTimestamp().isAfter(start))
+          .filter(tx -> !tx.getTimestamp().isBefore(start))
+          .filter(tx -> !tx.getTimestamp().isAfter(end))
           .count();
 
       return (int) Math.ceil((double) count / PAGE_SIZE);

src/main/java/org/tron/core/viewer/TxHistoryViewer.java

@@ -42,7 +42,7 @@ public void startInteractiveViewer(NetType netType) {
 
   private void printWelcome() {
     System.out.println("====================================");
-    System.out.println("   COMPLETE TRANSACTION VIEWER");
+    System.out.println("        TRANSACTION VIEWER");
     System.out.println("====================================");
   }
 
@@ -168,10 +168,10 @@ private void printTransactionPage(List<Tx> transactions, int currentPage, int to
 
   private void printHelp() {
     System.out.println("\n=== HELP ===");
-    System.out.println("1. View all transactions - Shows complete transaction history");
+    System.out.println("1. View all transactions - Shows transaction history");
     System.out.println("2. Filter by time range - Filters transactions between two timestamps");
     System.out.println("3. Help - Shows this help message");
-    System.out.println("4. Exit - Quits the application");
+    System.out.println("4. Exit - Quits the current view");
     System.out.println("\nWhile browsing pages:");
     System.out.println("n - Next page");
     System.out.println("p - Previous page");

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

@@ -4,6 +4,7 @@
 import static org.tron.common.enums.NetType.CUSTOM;
 import static org.tron.common.utils.CommandHelpUtil.getCommandHelp;
 import static org.tron.common.utils.Utils.EMPTY_STR;
+import static org.tron.common.utils.Utils.VERSION;
 import static org.tron.common.utils.Utils.blueBoldHighlight;
 import static org.tron.common.utils.Utils.failedHighlight;
 import static org.tron.common.utils.Utils.getLong;
@@ -3371,12 +3372,13 @@ public static String[] getCmd(String cmdLine) {
 
   private void run() {
     if (version) {
-      System.out.println("Version 4.9.1");
+      System.out.println("Version" + VERSION);
       System.exit(0);
     }
-    System.out.println(" ");
+    System.out.println();
     System.out.println("Welcome to Tron " + blueBoldHighlight("Wallet-Cli"));
     printBanner();
+    System.out.println();
     System.out.println("Please type one of the following commands to proceed.");
     System.out.println(greenBoldHighlight("Login") + ", " + greenBoldHighlight("LoginAll")
         + ", " + greenBoldHighlight("RegisterWallet")

src/main/resources/banner.txt

@@ -2,4 +2,4 @@
  __      ____ _| | | ___| |_       ___| (_)
  \ \ /\ / / _` | | |/ _ \ __|____ / __| | |
   \ V  V / (_| | | |  __/ ||_____| (__| | |
-   \_/\_/ \__,_|_|_|\___|\__|     \___|_|_|
+   \_/\_/ \__,_|_|_|\___|\__|     \___|_|_|

src/main/resources/config.conf

@@ -4,7 +4,7 @@ net {
 
 fullnode = {
   ip.list = [
-    "127.0.0.1:50051"
+
   ]
 }
 

src/main/resources/help_summary.txt

@@ -140,7 +140,7 @@
 | ExportWalletMnemonic                              | Export wallet mnemonic words                                            |
 | BackupWallet                                      | Backup the current wallet as private key                                |
 | BackupWallet2Base64                               | Backup wallet in base64 format                                          |
-| ViewBackupRecords                                 | View transaction history                                                |
+| ViewBackupRecords                                 | View backup records                                                     |
 | ClearWalletKeystore                               | Delete the keystore file and mnemonic words file                        |
 | ResetWallet                                       | Delete all keystore files and mnemonic words files                      |
 | CurrentNetwork                                    | Display current network                                                 |