Merge branch 'master' into feature/add_free_operation_limit

# Conflicts:
#	api/api.proto

api/api.proto

@@ -387,7 +387,7 @@ service WalletSolidity {
       }
     };
   }
-  rpc GetTransactionsByTimestamp (TimeMessage) returns (TransactionList) {
+  rpc GetTransactionsByTimestamp (TimePaginatedMessage) returns (TransactionList) {
     option (google.api.http) = {
       post: "/walletsolidity/gettransactionsbytimestamp"
       body: "*"
@@ -396,7 +396,16 @@ service WalletSolidity {
       }
     };
   }
-  rpc GetTransactionsFromThis (Account) returns (TransactionList) {
+  rpc GetTransactionsByTimestampCount (TimeMessage) returns (NumberMessage) {
+    option (google.api.http) = {
+      post: "/walletsolidity/gettransactionsbytimestampcount"
+      body: "*"
+      additional_bindings {
+        get: "/walletsolidity/gettransactionsbytimestampcount"
+      }
+    };
+  }
+  rpc GetTransactionsFromThis (AccountPaginated) returns (TransactionList) {
     option (google.api.http) = {
       post: "/walletsolidity/gettransactionsfromthis"
       body: "*"
@@ -405,7 +414,7 @@ service WalletSolidity {
       }
     };
   }
-  rpc GetTransactionsToThis (Account) returns (TransactionList) {
+  rpc GetTransactionsToThis (AccountPaginated) returns (TransactionList) {
     option (google.api.http) = {
       post: "/walletsolidity/gettransactionstothis"
       body: "*"
@@ -414,6 +423,24 @@ service WalletSolidity {
       }
     };
   }
+  rpc GetTransactionsFromThisCount (Account) returns (NumberMessage) {
+    option (google.api.http) = {
+      post: "/walletsolidity/gettransactionsfromthiscount"
+      body: "*"
+      additional_bindings {
+        get: "/walletsolidity/gettransactionsfromthiscount"
+      }
+    };
+  }
+  rpc GetTransactionsToThisCount (Account) returns (NumberMessage) {
+    option (google.api.http) = {
+      post: "/walletsolidity/gettransactionstothiscount"
+      body: "*"
+      additional_bindings {
+        get: "/walletsolidity/gettransactionstothiscount"
+      }
+    };
+  }
 };
 
 // the api of tron's db
@@ -512,6 +539,16 @@ message TransactionLimit {
   bytes transactionId = 1;
   int64 limitNum = 2;
 }
+message AccountPaginated {
+  Account account = 1;
+  int64 offset = 2;
+  int64 limit = 3;
+}
+message TimePaginatedMessage {
+  TimeMessage timeMessage = 1;
+  int64 offset = 2;
+  int64 limit = 3;
+}
 message AccountNetMessage {
   int64 freeNetUsed = 1;
   int64 freeNetLimit = 2;