Merge commit 'f63eda3db1b4386128cbc6235c3b95a72fbf0ba0' into p2p

tronprotocol · Mar 20, 2018 · cf487bb · cf487bb
2 parents 8901f2c + f63eda3
commit cf487bb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 13 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) {
 
   }
 
@@ -82,7 +82,7 @@ message WitnessList {
 }
 
 message AssetIssueList {
-  repeated AssetIssueContract witnesses = 1;
+  repeated AssetIssueContract assetIssue = 1;
 }
 
 // Gossip node list

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/Message.proto b/core/Message.proto
@@ -6,11 +6,6 @@ package protocol;
 option java_package = "org.tron.protos"; //Specify the name of the package that generated the Java file
 option java_outer_classname = "Message"; //Specify the class name of the generated Java file
 
-message Capability {
-  string name = 1;
-  int32 version = 2;
-}
-
 enum ReasonCode {
   REQUESTED = 0;
   TCP_ERROR = 1;
@@ -32,7 +27,6 @@ message Peer {
   bytes address = 1;
   int32 port = 2;
   string peerId = 3;
-  repeated Capability capabilities = 4;
 }
 
 message DisconnectMessage {
@@ -42,7 +36,6 @@ message DisconnectMessage {
 message HelloMessage {
   int32 p2pVersion = 1;
   string clientId = 2;
-  repeated Capability capabilities = 3;
   int32 listenPort = 4;
   string peerId = 5;
 }

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;