Merge pull request #877 from lxcmyf/feature/dev_491

feat(readme): improve the readme information

Author: lvs0075

README.md

@@ -2116,7 +2116,7 @@ Modify Wallet Name  successful !!
 ### View backup records
 > ViewBackupRecords
 
-View backup records.
+View backup records. You can configure the maximum number of records that `maxRecords` can retain in `config.conf`, excluding the number of buffer records.
 
 Example:
 ```console
@@ -2130,13 +2130,13 @@ Choose an option (1-2): 1
 ### View transaction history
 > ViewTransactionHistory
 
-View transaction history.
+View transaction history. You can configure the maximum number of records that `maxRecords` can retain in `config.conf`, excluding the number of buffer records.
 
 Example:
 ```console
 wallet> ViewTransactionHistory
 ====================================
-   COMPLETE TRANSACTION VIEWER
+        TRANSACTION VIEWER
 ====================================
 
 MAIN MENU:

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

@@ -1375,8 +1375,8 @@ public static void listWallets(List<WalletFile> walletFileList) {
           WalletFile wf = walletFileList.get(i);
           return formatLine(
               String.valueOf(i + 1),
-              wf.getName(),
               wf.getAddress(),
+              wf.getName(),
               4, 42, 76);
         })
         .forEach(System.out::println);

src/main/java/org/tron/keystore/WalletUtils.java

@@ -108,7 +108,14 @@ public static void updateWalletFile(
 
   public static String generateWalletFile(WalletFile walletFile, File destinationDirectory)
       throws IOException {
-    String fileName = getWalletFileName(walletFile);
+    String name = walletFile.getName();
+    String fileName;
+    if (StringUtils.isNotEmpty(name) && name.startsWith("Ledger-")) {
+      fileName = getLegerWalletFileName(walletFile);
+    } else {
+      fileName = getWalletFileName(walletFile);
+    }
+
     File destination = new File(destinationDirectory, fileName);
     objectMapper.writeValue(destination, walletFile);
     if (StringUtils.isEmpty(walletFile.getName())) {

src/main/java/org/tron/walletserver/WalletApi.java

@@ -2795,7 +2795,12 @@ public void cleanup() {
   }
 
   public boolean modifyWalletName(String newName) throws IOException {
-    WalletFile wf = this.walletFile.get(0);
+    WalletFile wf = getWalletFile();
+    String originalName = wf.getName();
+    if (originalName != null && originalName.startsWith("Ledger-") &&
+        !newName.startsWith("Ledger-")) {
+      newName = "Ledger-" + newName;
+    }
     wf.setName(newName);
     String keystoreName = WalletApi.store2Keystore(wf);
     return StringUtils.isNotEmpty(keystoreName);

src/main/resources/commands.txt

@@ -763,12 +763,12 @@ wallet> ModifyWalletName myNewWallet
 Syntax:
 ViewBackupRecords
 Summary:
-View backup records.
+View backup records. You can configure the maximum number of records that `maxRecords` can retain in `config.conf`, excluding the number of buffer records.
 Usage example:
 wallet> ViewBackupRecords
 Syntax:
 ViewTransactionHistory
 Summary:
-View transaction history.
+View transaction history. You can configure the maximum number of records that `maxRecords` can retain in `config.conf`, excluding the number of buffer records.
 Usage example:
 wallet> ViewTransactionHistory