Merge pull request #858 from lxcmyf/feature/trident_access

feat(prompt): highlight prompt information

Author: lvs0075

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

@@ -4031,7 +4031,7 @@ private void run() {
             }
             default: {
               System.out.println("Invalid cmd: " + cmd);
-              help(parameters);
+              help(new String[]{});
             }
           }
         } catch (CipherException | CancelException | IOException | IllegalException e) {

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

@@ -16,6 +16,7 @@
 import static org.tron.common.utils.Utils.inputPassword;
 import static org.tron.common.utils.Utils.isValid;
 import static org.tron.common.utils.Utils.redBoldHighlight;
+import static org.tron.common.utils.Utils.yellowBoldHighlight;
 import static org.tron.gasfree.GasFreeApi.concat;
 import static org.tron.gasfree.GasFreeApi.gasFreeSubmit;
 import static org.tron.gasfree.GasFreeApi.getDomainSeparator;
@@ -44,7 +45,6 @@
 import com.typesafe.config.Config;
 import java.io.File;
 import java.io.IOException;
-import java.math.BigInteger;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
 import java.util.ArrayList;
@@ -71,8 +71,6 @@
 import org.jline.terminal.TerminalBuilder;
 import org.tron.common.enums.NetType;
 import org.tron.common.utils.AbiUtil;
-import org.tron.common.utils.ByteArray;
-import org.tron.common.utils.ByteUtil;
 import org.tron.common.utils.Utils;
 import org.tron.core.config.Configuration;
 import org.tron.core.exception.CancelException;
@@ -1569,7 +1567,7 @@ private Pair<ApiClient, NetType> getApiClientAndNetType(String netWorkSymbol, St
       if (isEmpty(fullNode) && !isEmpty(solidityNode)) {
         fullNode = solidityNode;
         isFullnodeEmpty = true;
-        System.out.println("If only soliditynode.ip.list is configured, transactions and other operations will not be available.");
+        System.out.println(yellowBoldHighlight("If only soliditynode.ip.list is configured, transactions and other operations will not be available."));
       } else if (!isEmpty(fullNode) && isEmpty(solidityNode)) {
         solidityNode = fullNode;
         isSoliditynodeEmpty = true;
@@ -1619,7 +1617,7 @@ private Pair<ApiClient, NetType> getApiClientAndNetType(String netWorkSymbol, St
         if (isEmpty(fullNode) && !isEmpty(solidityNode)) {
           fullNode = solidityNode;
           isFullnodeEmpty = true;
-          System.out.println("If only soliditynode.ip.list is configured, transactions and other operations will not be available.");
+          System.out.println(yellowBoldHighlight("If only soliditynode.ip.list is configured, transactions and other operations will not be available."));
         } else if (!isEmpty(fullNode) && isEmpty(solidityNode)) {
           solidityNode = fullNode;
           isSoliditynodeEmpty = true;
@@ -1754,6 +1752,10 @@ private Pair<ApiClient, NetType> getApiClientAndNetType(String netWorkSymbol, St
 //  }
 
   public boolean getGasFreeInfo(String address) throws Exception {
+    if (wallet == null || !wallet.isLoginState()) {
+      System.out.println("Warning: getGasFreeInfo " + failedHighlight() + ",  Please login first !!");
+      return false;
+    }
     if (WalletApi.getCurrentNetwork() != MAIN && WalletApi.getCurrentNetwork() != NILE) {
       System.out.println(GAS_FREE_SUPPORT_NETWORK_TIP);
       return false;

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

@@ -15,6 +15,7 @@
 import static org.tron.common.utils.Utils.greenBoldHighlight;
 import static org.tron.common.utils.Utils.inputPassword;
 import static org.tron.common.utils.Utils.redBoldHighlight;
+import static org.tron.common.utils.Utils.yellowBoldHighlight;
 import static org.tron.core.config.Parameter.CommonConstant.ADD_PRE_FIX_BYTE_MAINNET;
 import static org.tron.core.config.Parameter.CommonConstant.ADD_PRE_FIX_BYTE_TESTNET;
 import static org.tron.keystore.StringUtils.char2Byte;
@@ -62,9 +63,7 @@
 import org.apache.commons.lang3.tuple.Pair;
 import org.bouncycastle.util.encoders.Hex;
 import org.hid4java.HidDevice;
-import org.tron.api.GrpcAPI;
 import org.tron.api.GrpcAPI.TransactionSignWeight;
-import org.tron.api.GrpcAPI.TransactionSignWeight.Result.response_code;
 import org.tron.common.crypto.ECKey;
 import org.tron.common.crypto.Hash;
 import org.tron.common.crypto.Sha256Sm3Hash;
@@ -94,7 +93,6 @@
 import org.tron.mnemonic.Mnemonic;
 import org.tron.mnemonic.MnemonicFile;
 import org.tron.mnemonic.MnemonicUtils;
-import org.tron.protos.Protocol;
 import org.tron.protos.Protocol.Transaction;
 import org.tron.protos.contract.AccountContract.AccountCreateContract;
 import org.tron.protos.contract.AccountContract.AccountUpdateContract;
@@ -191,7 +189,7 @@ public static ApiClient initApiCli() {
     if (isEmpty(fullNode) && !isEmpty(solidityNode)) {
       fullNode = solidityNode;
       isFullnodeEmpty = true;
-      System.out.println("If only soliditynode.ip.list is configured, transactions and other operations will not be available.");
+      System.out.println(yellowBoldHighlight("If only soliditynode.ip.list is configured, transactions and other operations will not be available."));
     } else if (!isEmpty(fullNode) && isEmpty(solidityNode)) {
       solidityNode = fullNode;
       isSoliditynodeEmpty = true;