Merge pull request #228 from tronprotocol/release_v4.7.2

feat(merge): merge release v4.7.2 into masger
tronprotocol · Jul 1, 2023 · 244c835 · 244c835
2 parents fe5eb7c + c0a4fce
commit 244c835
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/api/api.proto b/api/api.proto
@@ -281,6 +281,9 @@ service Wallet {
   rpc UnDelegateResource (UnDelegateResourceContract) returns (TransactionExtention) {
   }
 
+  rpc CancelAllUnfreezeV2 (CancelAllUnfreezeV2Contract) returns (TransactionExtention) {
+  }
+
   //Please use UpdateAsset2 instead of this function.
   rpc UpdateAsset (UpdateAssetContract) returns (Transaction) {
     option (google.api.http) = {

diff --git a/core/Tron.proto b/core/Tron.proto
@@ -193,6 +193,7 @@ message Account {
   bytes account_id = 23;
 
   int64 net_window_size = 24;
+  bool net_window_optimized = 25;
 
   message AccountResource {
     // energy resource, get from frozen
@@ -215,6 +216,7 @@ message Account {
 
     int64 delegated_frozenV2_balance_for_energy = 10;
     int64 acquired_delegated_frozenV2_balance_for_energy = 11;
+    bool energy_window_optimized = 12;
   }
   AccountResource account_resource = 26;
   bytes codeHash = 30;
@@ -374,6 +376,7 @@ message Transaction {
       WithdrawExpireUnfreezeContract = 56;
       DelegateResourceContract = 57;
       UnDelegateResourceContract = 58;
+      CancelAllUnfreezeV2Contract = 59;
     }
     ContractType type = 1;
     google.protobuf.Any parameter = 2;
@@ -422,6 +425,7 @@ message Transaction {
     bytes orderId = 25;
     repeated MarketOrderDetail orderDetails = 26;
     int64 withdraw_expire_amount = 27;
+    map<string, int64> cancel_unfreezeV2_amount = 28;
   }
 
   message raw {
@@ -482,6 +486,7 @@ message TransactionInfo {
   int64 packingFee = 27;
 
   int64 withdraw_expire_amount = 28;
+  map<string, int64> cancel_unfreezeV2_amount = 29;
 }
 
 message TransactionRet {
@@ -595,6 +600,7 @@ enum ReasonCode {
   CONNECT_FAIL = 0x21;
   TOO_MANY_PEERS_WITH_SAME_IP = 0x22;
   LIGHT_NODE_SYNC_FAIL = 0x23;
+  BELOW_THAN_ME = 0X24;
   UNKNOWN = 0xFF;
 }
 

diff --git a/core/contract/balance_contract.proto b/core/contract/balance_contract.proto
@@ -103,11 +103,16 @@ message DelegateResourceContract {
   int64 balance = 3;
   bytes receiver_address = 4;
   bool  lock = 5;
+  int64 lock_period = 6;
 }
 
 message UnDelegateResourceContract {
   bytes owner_address = 1;
   ResourceCode resource = 2;
   int64 balance = 3;
   bytes receiver_address = 4;
+}
+
+message CancelAllUnfreezeV2Contract {
+  bytes owner_address = 1;
 }