Merge commit '79c9b333f22367d3792f3faa2970b8dbbcf646b0' into feature/…

…devforEvan
tronprotocol · Mar 20, 2018 · dc9c1bb · dc9c1bb
2 parents 7abfb54 + 79c9b33
commit dc9c1bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -48,10 +48,10 @@ service Wallet {
 
   };
 
-  rpc TransferAssert (TransferAssertContract) returns (Transaction) {
+  rpc TransferAsset (TransferAssetContract) returns (Transaction) {
 
   }
-  rpc TransferTokenToAssert (TransferTokenToAssetContract) returns (Transaction) {
+  rpc TransferTokenToAsset (TransferTokenToAssetContract) returns (Transaction) {
 
   }
 

diff --git a/core/Contract.proto b/core/Contract.proto
@@ -34,8 +34,8 @@ message TransferContract {
   int64 amount = 3;
 }
 
-message TransferAssertContract {
-  bytes assert_name = 1;
+message TransferAssetContract {
+  bytes asset_name = 1;
   bytes owner_address = 2;
   bytes to_address = 3;
   int64 amount = 4;

diff --git a/core/Tron.proto b/core/Tron.proto
@@ -73,7 +73,7 @@ message Transaction {
     enum ContractType {
       AccountCreateContract = 0;
       TransferContract = 1;
-      TransferAssertContract = 2;
+      TransferAssetContract = 2;
       VoteAssetContract = 3;
       VoteWitnessContract = 4;
       WitnessCreateContract = 5;