Merge pull request #418 from tronprotocol/develop

Release 4.1.2

Author: sean-liu55

src/main/protos/api/api.proto

@@ -41,6 +41,28 @@ service Wallet {
     };
   };
 
+
+  rpc GetAccountBalance (AccountBalanceRequest) returns (AccountBalanceResponse) {
+    option (google.api.http) = {
+      post: "/wallet/getaccountbalance"
+      body: "*"
+      additional_bindings {
+        get: "/wallet/getaccountbalance"
+      }
+    };
+  };
+
+  rpc GetBlockBalanceTrace (BlockBalanceTrace.BlockIdentifier) returns (BlockBalanceTrace) {
+    option (google.api.http) = {
+      post: "/wallet/getblockbalancetrace"
+      body: "*"
+      additional_bindings {
+        get: "/wallet/getblockbalancetrace"
+      }
+    };
+  };
+
+
   //Please use CreateTransaction2 instead of this function.
   rpc CreateTransaction (TransferContract) returns (Transaction) {
     option (google.api.http) = {

src/main/protos/core/Tron.proto

@@ -383,6 +383,7 @@ message TransactionInfo {
 
   bytes orderId = 25;
   repeated MarketOrderDetail orderDetails = 26;
+  int64 packingFee = 27;
 }
 
 message TransactionRet {

src/main/protos/core/contract/balance_contract.proto

@@ -34,3 +34,50 @@ message TransferContract {
     bytes to_address = 2;
     int64 amount = 3;
 }
+
+
+message TransactionBalanceTrace {
+    message Operation {
+        int64 operation_identifier = 1;
+        bytes address = 2;
+        int64 amount = 3;
+    }
+
+    bytes transaction_identifier = 1;
+    repeated Operation operation = 2;
+    string type = 3;
+    string status = 4;
+}
+
+
+
+message BlockBalanceTrace {
+    message BlockIdentifier {
+        bytes hash = 1;
+        int64 number = 2;
+    }
+
+    BlockIdentifier block_identifier = 1;
+    int64 timestamp = 2;
+    repeated TransactionBalanceTrace transaction_balance_trace = 3;
+    //  BlockIdentifier parent_block_identifier = 4;
+}
+
+message AccountTrace {
+    int64 balance = 1;
+    int64 placeholder = 99;
+}
+
+message AccountIdentifier {
+    bytes address = 1;
+}
+
+message AccountBalanceRequest {
+    AccountIdentifier account_identifier = 1;
+    BlockBalanceTrace.BlockIdentifier block_identifier = 2;
+}
+
+message AccountBalanceResponse {
+    int64 balance = 1;
+    BlockBalanceTrace.BlockIdentifier block_identifier = 2;
+}