From 2606fe21d3c05deea2bcd0127f9726d605d1011a Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 11:16:22 +0800
Subject: [PATCH 1/5] fix: rename.

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

diff --git a/api/api.proto b/api/api.proto
index 49c3dd3dfdd..4e69db241b6 100644
--- a/api/api.proto
+++ b/api/api.proto
@@ -82,7 +82,7 @@ message WitnessList {
 }
 
 message AssetIssueList {
-  repeated AssetIssueContract witnesses = 1;
+  repeated AssetIssueContract assetIssue = 1;
 }
 
 // Gossip node list

From 3518ad4c051a791637ec04f9ed76b85404217a25 Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 11:28:13 +0800
Subject: [PATCH 2/5] fix: rename.

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

diff --git a/core/Contract.proto b/core/Contract.proto
index c8a2e32066f..f45445506ac 100644
--- a/core/Contract.proto
+++ b/core/Contract.proto
@@ -34,7 +34,7 @@ message TransferContract {
   int64 amount = 3;
 }
 
-message TransferAssertContract {
+message TransferAssetContract {
   bytes assert_name = 1;
   bytes owner_address = 2;
   bytes to_address = 3;

From 09c4f722beee563ef5349ad9cb43b94230694994 Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 11:30:37 +0800
Subject: [PATCH 3/5] fix: rename.

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

diff --git a/api/api.proto b/api/api.proto
index 4e69db241b6..520e6396b65 100644
--- a/api/api.proto
+++ b/api/api.proto
@@ -48,7 +48,7 @@ service Wallet {
 
   };
 
-  rpc TransferAssert (TransferAssertContract) returns (Transaction) {
+  rpc TransferAssert (TransferAssetContract) returns (Transaction) {
 
   }
   rpc TransferTokenToAssert (TransferTokenToAssetContract) returns (Transaction) {

From 7cc8e5a7778b7652ab077409ad480317630a70be Mon Sep 17 00:00:00 2001
From: Heng Zhang <zhangheng1536@gmail.com>
Date: Tue, 20 Mar 2018 11:36:02 +0800
Subject: [PATCH 4/5] fix: rename.

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

diff --git a/api/api.proto b/api/api.proto
index 520e6396b65..dfa0f8f63a6 100644
--- a/api/api.proto
+++ b/api/api.proto
@@ -48,10 +48,10 @@ service Wallet {
 
   };
 
-  rpc TransferAssert (TransferAssetContract) returns (Transaction) {
+  rpc TransferAsset (TransferAssetContract) returns (Transaction) {
 
   }
-  rpc TransferTokenToAssert (TransferTokenToAssetContract) returns (Transaction) {
+  rpc TransferTokenToAsset (TransferTokenToAssetContract) returns (Transaction) {
 
   }
 
diff --git a/core/Contract.proto b/core/Contract.proto
index f45445506ac..d30b1a04e49 100644
--- a/core/Contract.proto
+++ b/core/Contract.proto
@@ -35,7 +35,7 @@ message TransferContract {
 }
 
 message TransferAssetContract {
-  bytes assert_name = 1;
+  bytes asset_name = 1;
   bytes owner_address = 2;
   bytes to_address = 3;
   int64 amount = 4;
diff --git a/core/Tron.proto b/core/Tron.proto
index a529e733b64..c6c98a8a2c1 100644
--- 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;

From f63eda3db1b4386128cbc6235c3b95a72fbf0ba0 Mon Sep 17 00:00:00 2001
From: sasaxie <xiexiaodong917@163.com>
Date: Tue, 20 Mar 2018 12:49:34 +0800
Subject: [PATCH 5/5] delete useless code

---
 core/Message.proto | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/core/Message.proto b/core/Message.proto
index a25c21506f6..324b91ac968 100644
--- 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;
 }