Merge commit '0d9e0fdb313a8d4d5d3baaaea22569b72645fc08' into feature/…

…devforEvan

api/api.proto

@@ -51,7 +51,7 @@ service Wallet {
   rpc TransferAsset (TransferAssetContract) returns (Transaction) {
 
   }
-  rpc TransferTokenToAsset (TransferTokenToAssetContract) returns (Transaction) {
+  rpc TransferTokenToAsset (ParticipateAssetIssueContract) returns (Transaction) {
 
   }
 

core/Contract.proto

@@ -83,11 +83,11 @@ message AssetIssueContract {
   bytes url = 21;
 }
 
-message TransferTokenToAssetContract {
+message ParticipateAssetIssueContract {
   bytes owner_address = 1;
   bytes to_address = 2;
-  bytes name = 3;
-  int32 trx_num = 4;
+  bytes asset_name = 3;
+  int32 amount = 4;
 }
 
 message DeployContract {

core/Message.proto → core/Discover.proto

@@ -4,12 +4,7 @@ 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;
-}
+option java_outer_classname = "Discover"; //Specify the class name of the generated Java file
 
 enum ReasonCode {
   REQUESTED = 0;
@@ -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;
 }
@@ -61,18 +54,18 @@ message PingMessage {
   int32 version = 1;
   Endpoint from = 2;
   Endpoint to = 3;
-  int32 timestamp = 4;
+  int64 timestamp = 4;
 }
 
 message PongMessage {
   Endpoint to = 1;
   int32 echo = 2;
-  int32 timestamp = 3;
+  int64 timestamp = 3;
 }
 
 message FindNeighbours {
   bytes target = 1;
-  int32 timestamp = 2;
+  int64 timestamp = 2;
 }
 
 message Neighbour {
@@ -82,5 +75,5 @@ message Neighbour {
 
 message Neighbours {
   repeated Neighbour neighbours = 1;
-  int32 timestamp = 2;
+  int64 timestamp = 2;
 }

core/Tron.proto

@@ -80,7 +80,7 @@ message Transaction {
       AssetIssueContract = 6;
       DeployContract = 7;
       WitnessUpdateContract = 8;
-      TransferTokenToAssetContract = 9;
+      ParticipateAssetIssueContract = 9;
     }
     ContractType type = 1;
     google.protobuf.Any parameter = 2;