From 2589dd886fa0dfbb92a8a3ed0401065071e122ca Mon Sep 17 00:00:00 2001
From: xq-lu <583591aa!!>
Date: Tue, 19 Jan 2021 22:16:23 +0800
Subject: [PATCH 1/4] merge java-tron/protocol 4.1.2

---
 api/api.proto   | 5 +++++
 core/Tron.proto | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/api/api.proto b/api/api.proto
index bd49b406c..13e269761 100644
--- a/api/api.proto
+++ b/api/api.proto
@@ -777,6 +777,9 @@ service Wallet {
 
   rpc GetTransactionInfoByBlockNum (NumberMessage) returns (TransactionInfoList) {
   }
+
+  rpc GetBurnTrx (EmptyMessage) returns (NumberMessage) {
+  }
 };
 
 service WalletSolidity {
@@ -960,6 +963,8 @@ service WalletSolidity {
   rpc GetMarketPairList (EmptyMessage) returns (MarketOrderPairList) {
   }
 
+  rpc GetBurnTrx (EmptyMessage) returns (NumberMessage) {
+  }
 };
 
 service WalletExtension {
diff --git a/core/Tron.proto b/core/Tron.proto
index ccc11cde4..ea86f2d1b 100644
--- a/core/Tron.proto
+++ b/core/Tron.proto
@@ -445,7 +445,7 @@ message TransactionInfo {
 
   bytes orderId = 25;
   repeated MarketOrderDetail orderDetails = 26;
-
+  int64 packingFee = 27;
 }
 
 message TransactionRet {

From 93c4327b7a4b2c25d064dbebb048f198cb795906 Mon Sep 17 00:00:00 2001
From: taihaofu <taihao.fu@gmail.com>
Date: Tue, 19 Jan 2021 22:20:23 +0800
Subject: [PATCH 2/4] add receive

---
 core/contract/smart_contract.proto | 1 +
 1 file changed, 1 insertion(+)

diff --git a/core/contract/smart_contract.proto b/core/contract/smart_contract.proto
index 4f09e76e6..f53afa37b 100644
--- a/core/contract/smart_contract.proto
+++ b/core/contract/smart_contract.proto
@@ -17,6 +17,7 @@ message SmartContract {
         Function = 2;
         Event = 3;
         Fallback = 4;
+        Receive = 5;
       }
       message Param {
         bool indexed = 1;

From 2588e1c85c46aed9827818d50c50ba25917fc48c Mon Sep 17 00:00:00 2001
From: sean-liu55 <liushaohua9017@163.com>
Date: Mon, 15 Mar 2021 11:59:01 +0800
Subject: [PATCH 3/4] add vote_power_413 into account

---
 core/Tron.proto | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/core/Tron.proto b/core/Tron.proto
index ea86f2d1b..bd2da84f5 100644
--- a/core/Tron.proto
+++ b/core/Tron.proto
@@ -209,6 +209,9 @@ message Account {
   Permission owner_permission = 31;
   Permission witness_permission = 32;
   repeated Permission active_permission = 33;
+
+  //vote power,include frozen bandwidth and frozen energy
+  int64 vote_power_413 = 60;
 }
 
 

From da8115ab7aa68e4e9c4fd111efa43fa4cc6f6550 Mon Sep 17 00:00:00 2001
From: liukai <forfreeday@163.com>
Date: Tue, 16 Mar 2021 15:35:00 +0800
Subject: [PATCH 4/4] add AccountAssetIssue to Tron.proto

---
 core/Tron.proto | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/core/Tron.proto b/core/Tron.proto
index ea86f2d1b..edb5424d6 100644
--- a/core/Tron.proto
+++ b/core/Tron.proto
@@ -211,6 +211,36 @@ message Account {
   repeated Permission active_permission = 33;
 }
 
+/* AccountAssetIssue */
+message AccountAssetIssue {
+
+  // the create address
+  bytes address = 3;
+
+  message Frozen {
+    int64 frozen_balance = 1; // the frozen trx balance
+    int64 expire_time = 2; // the expire time
+  }
+  // the other asset owned by this account
+  map<string, int64> asset = 6;
+
+  // the other asset owned by this account，key is assetId
+  map<string, int64> assetV2 = 56;
+
+  bytes asset_issued_name = 17;
+  bytes asset_issued_ID = 57;
+
+  // frozen asset(for asset issuer)
+  repeated Frozen frozen_supply = 16;
+
+  map<string, int64> latest_asset_operation_time = 18;
+  map<string, int64> latest_asset_operation_timeV2 = 58;
+
+  map<string, int64> free_asset_net_usage = 20;
+  map<string, int64> free_asset_net_usageV2 = 59;
+
+}
+
 
 message Key {
   bytes address = 1;