Merge pull request #47 from tronprotocol/feature/add_token_freeze

Feature/add token freeze

Author: sean-liu55

api/api.proto

@@ -119,6 +119,13 @@ service Wallet {
     };
   }
 
+  rpc UnfreezeAsset (UnfreezeAssetContract) returns (Transaction) {
+    option (google.api.http) = {
+      post: "/wallet/unfreezeasset"
+      body: "*"
+    };
+  }
+
   rpc WithdrawBalance (WithdrawBalanceContract) returns (Transaction) {
     option (google.api.http) = {
       post: "/wallet/withdrawbalance"

core/Contract.proto

@@ -77,9 +77,14 @@ message WitnessUpdateContract {
 }
 
 message AssetIssueContract {
+  message FrozenSupply {
+    int64 frozen_amount = 1;
+    int64 frozen_days = 2;
+  }
   bytes owner_address = 1;
   bytes name = 2;
   int64 total_supply = 4;
+  repeated FrozenSupply frozen_supply = 5;
   int32 trx_num = 6;
   int32 num = 8;
   int64 start_time = 9;
@@ -112,6 +117,10 @@ message UnfreezeBalanceContract {
   bytes owner_address = 1;
 }
 
+message UnfreezeAssetContract {
+  bytes owner_address = 1;
+}
+
 message WithdrawBalanceContract {
   bytes owner_address = 1;
 }

core/Tron.proto

@@ -67,6 +67,10 @@ message Account {
   bytes code = 13;
   bool is_witness = 14;
   bool is_committee = 15;
+  // frozen asset(for asset issuer)
+  repeated Frozen frozen_supply = 16;
+  // asset_issued_name
+  bytes asset_issued_name = 17;
 }
 
 message acuthrity {
@@ -138,6 +142,7 @@ message Transaction {
       FreezeBalanceContract = 11;
       UnfreezeBalanceContract = 12;
       WithdrawBalanceContract = 13;
+      UnfreezeAssetContract = 14;
       CustomContract = 20;
     }
     ContractType type = 1;