Merge commit 'c3b07944ee8eb47d7461fd304520364db41671ad' into develop

# Conflicts:
#	src/main/protos/core/Tron.proto

api/api.proto

@@ -105,6 +105,27 @@ service Wallet {
     };
   }
 
+  rpc FreezeBalance (FreezeBalanceContract) returns (Transaction) {
+    option (google.api.http) = {
+      post: "/wallet/freezebalance"
+      body: "*"
+    };
+  }
+
+  rpc UnfreezeBalance (UnfreezeBalanceContract) returns (Transaction) {
+    option (google.api.http) = {
+      post: "/wallet/unfreezebalance"
+      body: "*"
+    };
+  }
+
+  rpc WithdrawBalance (WithdrawBalanceContract) returns (Transaction) {
+    option (google.api.http) = {
+      post: "/wallet/withdrawbalance"
+      body: "*"
+    };
+  }
+
   rpc ListNodes (EmptyMessage) returns (NodeList) {
     option (google.api.http) = {
       post: "/wallet/listnodes"

core/Contract.proto

@@ -102,3 +102,16 @@ message DeployContract {
   bytes script = 2;
 }
 
+message FreezeBalanceContract {
+  bytes owner_address = 1;
+  int64 frozen_balance = 2;
+  int64 frozen_duration = 3;
+}
+
+message UnfreezeBalanceContract {
+  bytes owner_address = 1;
+}
+
+message WithdrawBalanceContract {
+  bytes owner_address = 1;
+}

core/Tron.proto

@@ -31,6 +31,14 @@ message Account {
     // the vote num to this super rep.
     int64 vote_count = 2;
   }
+  // frozen balance
+  message Frozen {
+    // the frozen trx balance
+    int64 frozen_balance = 1;
+    // the expire time
+    int64 expire_time = 2;
+  }
+
   bytes account_name = 1;
   AccountType type = 2;
   // the create adress
@@ -41,10 +49,19 @@ message Account {
   repeated Vote votes = 5;
   // the other asset owned by this account
   map<string, int64> asset = 6;
+  // the frozen balance
+  repeated Frozen frozen = 7;
+  // bandwidth, get from frozen
+  int64 bandwidth = 8;
   // this account create time
   int64 create_time = 9;
   // this last opration time, including transfer, voting and so on.
   int64 latest_opration_time = 10;
+
+  // witness block producing allowance
+  int64 allowance = 11;
+  // last withdraw time
+  int64 latest_withdraw_time = 12;
   // not used so far
   bytes code = 13;
 }
@@ -114,6 +131,9 @@ message Transaction {
       WitnessUpdateContract = 8;
       ParticipateAssetIssueContract = 9;
       AccountUpdateContract = 10;
+      FreezeBalanceContract = 11;
+      UnfreezeBalanceContract = 12;
+      WithdrawBalanceContract = 13;
       CustomContract = 20;
     }
     ContractType type = 1;