From 6d7d52eadd53a503ea672128d0b0e85604206f75 Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 17:38:11 +0800
Subject: [PATCH 1/4] fix: rename ParticipateAssetIssueContract.

---
 api/api.proto       | 2 +-
 core/Contract.proto | 6 +++---
 core/Tron.proto     | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/api/api.proto b/api/api.proto
index dfa0f8f63a6..175ce09562e 100644
--- 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 TransferTokenToAsset (ParticipateAssetIssueContract) returns (Transaction) {
 
   }
 
diff --git a/core/Contract.proto b/core/Contract.proto
index d30b1a04e49..6205622b436 100644
--- 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;
+  int32 amount = 4;
 }
 
 message DeployContract {
diff --git a/core/Tron.proto b/core/Tron.proto
index c6c98a8a2c1..83c46358491 100644
--- 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;

From 788835211cb0d817dc3488937ea19ecc649319a6 Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 18:16:10 +0800
Subject: [PATCH 2/4] fix: rename ParticipateAssetIssueContract.

---
 api/api.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/api/api.proto b/api/api.proto
index 175ce09562e..f31dc42b900 100644
--- a/api/api.proto
+++ b/api/api.proto
@@ -51,7 +51,7 @@ service Wallet {
   rpc TransferAsset (TransferAssetContract) returns (Transaction) {
 
   }
-  rpc TransferTokenToAsset (ParticipateAssetIssueContract) returns (Transaction) {
+  rpc ParticipateAssetIssue (ParticipateAssetIssueContract) returns (Transaction) {
 
   }
 

From 5be32bf840e747e7271cc4d575029f44e169f648 Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 19:06:01 +0800
Subject: [PATCH 3/4] change amount type to int64.

---
 core/Contract.proto | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/Contract.proto b/core/Contract.proto
index 6205622b436..17b262506df 100644
--- a/core/Contract.proto
+++ b/core/Contract.proto
@@ -87,7 +87,7 @@ message ParticipateAssetIssueContract {
   bytes owner_address = 1;
   bytes to_address = 2;
   bytes asset_name = 3;
-  int32 amount = 4;
+  int64 amount = 4;
 }
 
 message DeployContract {

From 044a39a4666b0428785d0501067bf417ade820c1 Mon Sep 17 00:00:00 2001
From: sasaxie <xiexiaodong917@163.com>
Date: Tue, 20 Mar 2018 21:54:33 +0800
Subject: [PATCH 4/4] modify Discover message

---
 core/Discover.proto | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/core/Discover.proto b/core/Discover.proto
index 31797f7acfc..5087456d11e 100644
--- 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;
 }
\ No newline at end of file