Merge commit '9ac2d9b122b1e5ce429b4cc607741c56fbe27d4c' into p2p

tronprotocol · Mar 23, 2018 · 4e5ce06 · 4e5ce06
2 parents 3f78d1b + 9ac2d9b
commit 4e5ce06
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -52,6 +52,7 @@ service Wallet {
   rpc TransferAsset (TransferAssetContract) returns (Transaction) {
 
   }
+
   rpc ParticipateAssetIssue (ParticipateAssetIssueContract) returns (Transaction) {
 
   }
@@ -61,6 +62,9 @@ service Wallet {
   }
   rpc GetAssetIssueList (EmptyMessage) returns (AssetIssueList) {
 
+  }
+  rpc GetAssetIssueByAccount (Account) returns (AssetIssueList) {
+
   }
   rpc GetNowBlock (EmptyMessage) returns (Block) {
 

diff --git a/core/Discover.proto b/core/Discover.proto
@@ -13,9 +13,9 @@ message Endpoint {
 }
 
 message PingMessage {
-  int32 version = 1;
-  Endpoint from = 2;
-  Endpoint to = 3;
+  Endpoint from = 1;
+  Endpoint to = 2;
+  int32 version = 3;
   int64 timestamp = 4;
 }
 

diff --git a/core/Tron.proto b/core/Tron.proto
@@ -1,6 +1,7 @@
 syntax = "proto3";
 
 import "google/protobuf/any.proto";
+import "core/Discover.proto";
 
 package protocol;
 
@@ -194,16 +195,17 @@ enum ReasonCode {
   LOCAL_IDENTITY = 10;
   PING_TIMEOUT = 11;
   USER_REASON = 12;
-  UNKNOWN = 13;
+  UNKNOWN = 255;
 }
 
 message DisconnectMessage {
   ReasonCode reason = 1;
 }
 
 message HelloMessage {
-  int32 p2pVersion = 1;
-  string clientId = 2;
+  Endpoint from = 1;
+  int32 version = 2;
+  string clientId = 3;
   int32 listenPort = 4;
   string peerId = 5;
 }