Merge pull request #428 from tronprotocol/feature/new_resource_model

change protocol for new resource model

Author: sean-liu55

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;
     }
 

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;
 }