Merge pull request #875 from lxcmyf/feature/dev_491

feat(backup): optimize backup records

Author: lvs0075

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

@@ -81,7 +81,7 @@ public void viewBackupRecords() {
 
   private void printRecords(List<BackupRecord> records) {
     System.out.printf("%-33s %-52s %-47s %-25s%n",
-        greenBoldHighlight("COMMAND"), greenBoldHighlight("FILE NAME"), greenBoldHighlight("LOGIN ADDRESS"), greenBoldHighlight("TIMESTAMP"));
+        greenBoldHighlight("COMMAND"), greenBoldHighlight("FILE NAME"), greenBoldHighlight("ADDRESS"), greenBoldHighlight("TIMESTAMP"));
     System.out.println("-------------------------------------------------------------------------------------------------------------------");
 
     for (BackupRecord br : records) {

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

@@ -649,13 +649,15 @@ public byte[] backupWallet(String cmdName) throws IOException, CipherException {
     char[] password = Utils.inputPassword(false);
     byte[] passwd = char2Byte(password);
     clear(password);
-    byte[] privateKey = wallet.getPrivateBytes(passwd);
+    Pair<byte[], WalletFile> pair = wallet.getPair(passwd);
     clear(passwd);
+    byte[] privateKey = pair.getLeft();
+    WalletFile wf = pair.getRight();
     if (ArrayUtils.isNotEmpty(privateKey)) {
       new BackupRecordManager().saveRecord(new BackupRecord(
           cmdName,
-          wallet.getWalletFile().getSourceFile().getName(),
-          encode58Check(wallet.getAddress()),
+          wf.getSourceFile().getName(),
+          wf.getAddress(),
           LocalDateTime.now()));
     }
     return privateKey;

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

@@ -378,10 +378,16 @@ public byte[] getPrivateBytes(byte[] password) throws CipherException, IOExcepti
     return decrypt2PrivateBytes(password, loadWalletFile());
   }
 
+  public Pair<byte[], WalletFile> getPair(byte[] password) throws CipherException, IOException {
+    WalletFile wf = loadWalletFile();
+    byte[] bytes = decrypt2PrivateBytes(password, wf);
+    return Pair.of(bytes, wf);
+  }
+
   public String exportKeystore(String walletChannel, File exportFullDir) throws IOException {
     String ret;
     try {
-      WalletFile wf = this.walletFile.get(0);
+      WalletFile wf = getWalletFile();
       String walletAddress = wf.getAddress();
       String walletHexAddress = getHexAddress(wf.getAddress());
       String originalAddress = wf.getAddress();