Merge pull request #889 from lxcmyf/feature/dev_4.9.2

fix(msg): optimize prompt information

Author: lvs0075

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

@@ -200,10 +200,6 @@ private void editPermission(Permission permission, String name) {
     editKeys(permission);
   }
 
-  /**
-   * editKeys: 支持 add/modify/delete，包含 addressValid 与 weight 校验，
-   * 修改和添加时都可用 'q' 退出回上一层。
-   */
   private void editKeys(Permission permission) {
     if (permission == null) return;
     while (true) {
@@ -261,16 +257,7 @@ private void editKeys(Permission permission) {
             continue;
           }
 
-          long totalWeight = permission.getKeys().stream()
-              .mapToLong(Key::getWeight)
-              .sum();
-          if (totalWeight + weight < permission.getThreshold()) {
-            System.out.println(redBoldHighlight("The sum of address weights must be greater than or equal to the threshold"));
-            continue;
-          }
-
           permission.getKeys().add(new Key(addr, weight));
-
           System.out.println("Added key: " + addr + " (weight=" + weight + ")");
 
           break;
@@ -310,15 +297,6 @@ private void editKeys(Permission permission) {
               try {
                 long w = Long.parseLong(newWeight);
                 long threshold = permission.getThreshold();
-                List<Key> keys = permission.getKeys();
-                long remainWeight = IntStream.range(0, keys.size())
-                    .filter(i -> i != midx)
-                    .mapToLong(i -> keys.get(i).getWeight())
-                    .sum();
-                if (remainWeight + w < permission.getThreshold()) {
-                  System.out.println(redBoldHighlight("The sum of address weights must be greater than or equal to the threshold"));
-                  continue;
-                }
                 if (w <= 0 || w > threshold) {
                   System.out.println("Weight must be > 0 and <= threshold(" + threshold + "). Skip changing weight.");
                 } else {
@@ -721,6 +699,9 @@ private String showFinalSummary() {
 
       switch (input) {
         case "y":
+          if (!validateAllPermissionWeights(data)) {
+            return EMPTY;
+          }
           System.out.println("Confirmed. Preparing final JSON...");
           return JSON.toJSONString(data.toTronJson());
         case "n":
@@ -732,6 +713,35 @@ private String showFinalSummary() {
     }
   }
 
+  private boolean validateAllPermissionWeights(PermissionData data) {
+    // valid owner permission
+    if (!validateSinglePermission(data.getOwnerPermission())) {
+      System.out.println(redBoldHighlight("Owner permission key weight sum must >= threshold!"));
+      return false;
+    }
+
+    // valid active permissions
+    for (Permission p : data.getActivePermissions()) {
+      if (!validateSinglePermission(p)) {
+        System.out.println(redBoldHighlight("Active permission '" + p.getPermissionName()
+            + "' key weight sum must >= threshold!"));
+        return false;
+      }
+    }
+
+    return true;
+  }
+
+  private boolean validateSinglePermission(Permission p) {
+    if (p == null) return false;
+    int totalWeight = 0;
+    for (Key k : p.getKeys()) {
+      totalWeight += k.getWeight();
+    }
+    return totalWeight >= p.getThreshold();
+  }
+
+
   private void printPermissionData(PermissionData data) {
     System.out.println("\n=============== Preview of Updated Account Permissions ===============\n");
 

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

@@ -75,7 +75,6 @@
 import org.jline.reader.impl.DefaultParser;
 import org.jline.reader.impl.completer.ArgumentCompleter;
 import org.jline.reader.impl.completer.NullCompleter;
-import org.jline.reader.impl.completer.StringsCompleter;
 import org.jline.terminal.Terminal;
 import org.jline.terminal.TerminalBuilder;
 import org.tron.api.GrpcAPI.AddressPrKeyPairMessage;

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

@@ -2464,7 +2464,7 @@ public Triple<Boolean, Long, Long> triggerContract(
           long calculateBandwidth = calculateBandwidth(transaction);
           String s = new String(builder.build().getResult().getMessage().toByteArray(), StandardCharsets.UTF_8);
           if ("REVERT opcode executed".equals(s)) {
-            System.out.println(redBoldHighlight("The transaction may be reversed."));
+            System.out.println(redBoldHighlight("The transaction may be reverted."));
           }
           System.out.println("It is estimated that " + greenBoldHighlight(calculateBandwidth) + " bandwidth and " + greenBoldHighlight(energyUsed) + " energy will be consumed.");
         } else {