From 2588e1c85c46aed9827818d50c50ba25917fc48c Mon Sep 17 00:00:00 2001 From: sean-liu55 Date: Mon, 15 Mar 2021 11:59:01 +0800 Subject: [PATCH 1/5] 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 c1b2fa70bb2184c12d4d632d07219a4675c60eea Mon Sep 17 00:00:00 2001 From: sean-liu55 Date: Tue, 16 Mar 2021 16:54:55 +0800 Subject: [PATCH 2/5] change parameter name --- core/Tron.proto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/Tron.proto b/core/Tron.proto index bd2da84f5..4f2480dbe 100644 --- a/core/Tron.proto +++ b/core/Tron.proto @@ -211,7 +211,7 @@ message Account { repeated Permission active_permission = 33; //vote power,include frozen bandwidth and frozen energy - int64 vote_power_413 = 60; + int64 old_vote_power = 60; } From 7c2ba351708ed4ebcdbfe751cd7744bb57d93bc0 Mon Sep 17 00:00:00 2001 From: liukai Date: Wed, 17 Mar 2021 16:41:23 +0800 Subject: [PATCH 3/5] add Pending --- api/api.proto | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/api/api.proto b/api/api.proto index 13e269761..06fc8fc0c 100644 --- a/api/api.proto +++ b/api/api.proto @@ -780,6 +780,15 @@ service Wallet { rpc GetBurnTrx (EmptyMessage) returns (NumberMessage) { } + + rpc GetTransactionFromPending (BytesMessage) returns (Transaction) { + } + + rpc GetTransactionListFromPending (EmptyMessage) returns (TransactionList) { + } + + rpc GetPendingSize (EmptyMessage) returns (NumberMessage) { + } }; service WalletSolidity { From d5775cfd652dcf1e39ff9535e7d34bd3a876c924 Mon Sep 17 00:00:00 2001 From: liukai Date: Wed, 17 Mar 2021 19:33:27 +0800 Subject: [PATCH 4/5] add param --- api/api.proto | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/api.proto b/api/api.proto index 06fc8fc0c..c6073d364 100644 --- a/api/api.proto +++ b/api/api.proto @@ -784,7 +784,7 @@ service Wallet { rpc GetTransactionFromPending (BytesMessage) returns (Transaction) { } - rpc GetTransactionListFromPending (EmptyMessage) returns (TransactionList) { + rpc GetTransactionListFromPending (EmptyMessage) returns (TransactionIdList) { } rpc GetPendingSize (EmptyMessage) returns (NumberMessage) { @@ -1084,6 +1084,9 @@ message BlockList { message TransactionList { repeated Transaction transaction = 1; } +message TransactionIdList { + repeated string txId = 1; +} message DelegatedResourceMessage { bytes fromAddress = 1; bytes toAddress = 2; From a87c5efc026f6ef052568bb1e93e8113a974431e Mon Sep 17 00:00:00 2001 From: sean-liu55 Date: Thu, 18 Mar 2021 16:18:03 +0800 Subject: [PATCH 5/5] rm old_vote_power parameter --- core/Tron.proto | 3 --- 1 file changed, 3 deletions(-) diff --git a/core/Tron.proto b/core/Tron.proto index 4f2480dbe..ea86f2d1b 100644 --- a/core/Tron.proto +++ b/core/Tron.proto @@ -209,9 +209,6 @@ message Account { Permission owner_permission = 31; Permission witness_permission = 32; repeated Permission active_permission = 33; - - //vote power,include frozen bandwidth and frozen energy - int64 old_vote_power = 60; }