Merge pull request #422 from tronprotocol/develop

release 4.2

Author: sean-liu55

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

@@ -165,7 +165,7 @@ public static String printTransactionInfoList(TransactionInfoList transactionInf
     List<TransactionInfo> infoList = transactionInfoList.getTransactionInfoList();
     infoList.stream()
         .forEach(
-            transactionInfo -> jsonArray.add(formatMessageString(transactionInfo))
+            transactionInfo -> jsonArray.add(printTransactionInfoToJSON(transactionInfo))
         );
     return JsonFormatUtil.formatJson(jsonArray.toJSONString());
   }
@@ -610,6 +610,10 @@ public static JSONObject printTransactionToJSON(Transaction transaction, boolean
     return jsonTransaction;
   }
 
+  public static JSONObject printTransactionInfoToJSON(TransactionInfo transactioninfo) {
+    return JSONObject.parseObject(JsonFormat.printToString(transactioninfo, true));
+  }
+
   public static boolean confirmEncrption() {
     System.out.println(
         "Please confirm encryption module,if input y or Y means default Eckey, other means SM2.");

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

@@ -1204,7 +1204,7 @@ private void freezeBalance(String[] parameters)
         || parameters.length == 4 || parameters.length == 5)) {
       System.out.println("Use freezeBalance command with below syntax: ");
       System.out.println("freezeBalance [OwnerAddress] frozen_balance frozen_duration "
-          + "[ResourceCode:0 BANDWIDTH,1 ENERGY] [receiverAddress]");
+          + "[ResourceCode:0 BANDWIDTH,1 ENERGY,2 TRON_POWER] [receiverAddress]");
       return;
     }
 
@@ -1247,7 +1247,7 @@ private void unfreezeBalance(String[] parameters)
     if (parameters == null || parameters.length < 1 || parameters.length > 3) {
       System.out.println("Use unfreezeBalance command with below syntax: ");
       System.out.println(
-          "unfreezeBalance [OwnerAddress] ResourceCode(0 BANDWIDTH,1 CPU) [receiverAddress]");
+          "unfreezeBalance [OwnerAddress] ResourceCode(0 BANDWIDTH,1 ENERGY,2 TRON_POWER) [receiverAddress]");
       return;
     }
 
@@ -2028,7 +2028,6 @@ private void getBrokerage(String[] parameters) {
 
   private void getTransactionInfoByBlockNum(String[] parameters) {
     if (parameters.length != 1) {
-      System.out.println("Too many parameters !!!");
       System.out.println("You need input number with the following syntax:");
       System.out.println("GetTransactionInfoByBlockNum number");
       return;
@@ -3344,7 +3343,7 @@ private void resetShieldedTRC20Note() {
   private void scanShieldedTRC20NoteByIvk(String[] parameters) {
     if (parameters == null || parameters.length < 6) {
       System.out.println("ScanShieldedTRC20NoteByIvk command needs at least 6 parameters like: ");
-      System.out.println("ScanShieldedTRC20NoteByIvk shieldedTRC20ContractAddress ivk ak nk " +
+      System.out.println("ScanShieldedTRC20NoteByIvk shieldedContractAddress ivk ak nk " +
               "startNum endNum [event1] [event2]");
       return;
     }
@@ -4251,6 +4250,7 @@ private void run() {
             }
             case "gettransactioninfobyblocknum": {
               getTransactionInfoByBlockNum(parameters);
+              break;
             }
             case "marketsellasset": {
               marketSellAsset(parameters);

src/main/protos/api/api.proto

@@ -1135,6 +1135,9 @@ message AccountResourceMessage {
   map<string, int64> assetNetLimit = 6;
   int64 TotalNetLimit = 7;
   int64 TotalNetWeight = 8;
+  int64 TotalTronPowerWeight = 9;
+  int64 tronPowerUsed = 10;
+  int64 tronPowerLimit = 11;
 
   int64 EnergyUsed = 13;
   int64 EnergyLimit = 14;

src/main/protos/core/Tron.proto

@@ -97,6 +97,9 @@ message Account {
   //Freeze and provide balances to other accounts
   int64 delegated_frozen_balance_for_bandwidth = 42;
 
+  int64 old_tron_power = 46;
+  Frozen tron_power = 47;
+
   // this account create time
   int64 create_time = 0x09;
   // this last operation time, including transfer, voting and so on. //FIXME fix grammar

src/main/protos/core/contract/common.proto

@@ -9,4 +9,5 @@ option go_package = "github.com/tronprotocol/grpc-gateway/core";
 enum ResourceCode {
     BANDWIDTH = 0x00;
     ENERGY = 0x01;
+    TRON_POWER = 0x02;
 }