Merge commit '044a39a4666b0428785d0501067bf417ade820c1' into p2p

tronprotocol · Mar 20, 2018 · faabdc4 · faabdc4
2 parents 8d0790f + 044a39a
commit faabdc4
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -51,7 +51,7 @@ service Wallet {
   rpc TransferAsset (TransferAssetContract) returns (Transaction) {
 
   }
-  rpc TransferTokenToAsset (TransferTokenToAssetContract) returns (Transaction) {
+  rpc ParticipateAssetIssue (ParticipateAssetIssueContract) returns (Transaction) {
 
   }
 

diff --git a/core/Contract.proto b/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;
+  int64 amount = 4;
 }
 
 message DeployContract {

diff --git a/core/Discover.proto b/core/Discover.proto
@@ -46,8 +46,8 @@ message PeersMessage {
 
 message Endpoint {
   bytes address = 1;
-  int32 udpPort = 2;
-  int32 tcpPort = 3;
+  int32 port = 2;
+  bytes nodeId = 3;
 }
 
 message PingMessage {
@@ -64,16 +64,13 @@ message PongMessage {
 }
 
 message FindNeighbours {
-  bytes target = 1;
-  int64 timestamp = 2;
-}
-
-message Neighbour {
-  Endpoint endpoint = 1;
-  bytes nodeId = 2;
+  Endpoint from = 1;
+  bytes targetId = 2;
+  int64 timestamp = 3;
 }
 
 message Neighbours {
-  repeated Neighbour neighbours = 1;
-  int64 timestamp = 2;
+  Endpoint from = 1;
+  repeated Endpoint neighbours = 2;
+  int64 timestamp = 3;
 }
diff --git a/core/Tron.proto b/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;