extending TxPaginationMeta (#63)

* extended tx pagination meta queries added

Signed-off-by: Piotr Pawlowski <[email protected]>

* semicolon removed

Signed-off-by: Piotr Pawlowski <[email protected]>

* proto donwgraded

Signed-off-by: Piotr Pawlowski <[email protected]>

* example changed, args ordering updated, Pending txs updated

Signed-off-by: Piotr Pawlowski <[email protected]>

* params description added

Signed-off-by: Piotr Pawlowski <[email protected]>

* setField fixed

Signed-off-by: Piotr Pawlowski <[email protected]>

* version fixed

Signed-off-by: Piotr Pawlowski <[email protected]>

* version fixed

Signed-off-by: Piotr Pawlowski <[email protected]>

* yarn.lock fixed

Signed-off-by: Piotr Pawlowski <[email protected]>

* fix

Signed-off-by: Piotr Pawlowski <[email protected]>

example/chain.ts

@@ -2,10 +2,12 @@
 
 import grpc from 'grpc'
 import {
+ QueryService_v1Client as QueryService,
  CommandService_v1Client as CommandService
 } from '../lib/proto/endpoint_grpc_pb'
 
 import { TxBuilder, BatchBuilder } from '../lib/chain'
+import queries from '../lib/queries'
 
 const IROHA_ADDRESS = 'localhost:50051'
 
@@ -17,9 +19,14 @@ const commandService = new CommandService(
  grpc.credentials.createInsecure()
 )
 
+const queryService = new QueryService(
+ IROHA_ADDRESS,
+ grpc.credentials.createInsecure()
+)
+
 const firstTx = new TxBuilder()
  .createAccount({
- accountName: 'user1',
+ accountName: 'usera',
  domainId: 'test',
  publicKey: '0000000000000000000000000000000000000000000000000000000000000000'
  })
@@ -28,7 +35,7 @@ const firstTx = new TxBuilder()
 
 const secondTx = new TxBuilder()
  .createAccount({
- accountName: 'user2',
+ accountName: 'userb',
  domainId: 'test',
  publicKey: '0000000000000000000000000000000000000000000000000000000000000000'
  })
@@ -45,3 +52,26 @@ new BatchBuilder([
  .send(commandService)
  .then(res => console.log(res))
  .catch(err => console.error(err))
+
+Promise.all([
+ queries.getAccountTransactions({
+ privateKey: adminPriv,
+ creatorAccountId: 'admin@test',
+ queryService,
+ timeoutLimit: 5000
+ }, {
+ accountId: 'admin@test',
+ pageSize: 10,
+ firstTxHash: undefined,
+ ordering: {
+ field: undefined,
+ direction: undefined
+ },
+ firstTxTime: undefined,
+ lastTxTime: undefined,
+ firstTxHeight: 1,
+ lastTxHeight: 3
+ })
+])
+ .then(a => console.log(a))
+ .catch(e => console.error(e))

example/index.ts

@@ -100,6 +100,10 @@ Promise.all([
  accountId: 'admin@test',
  pageSize: 5,
  firstTxHash: undefined,
+ firstTxTime: undefined,
+ lastTxTime: undefined,
+ firstTxHeight: undefined,
+ lastTxHeight: undefined,
  ordering: {
  field: undefined,
  direction: undefined

example/tls.ts

@@ -61,6 +61,10 @@ queries.getAccountTransactions({
  accountId: 'admin@test',
  firstTxHash: null,
  pageSize: 100,
+ firstTxTime: null,
+ lastTxTime: null,
+ firstTxHeight: null,
+ lastTxHeight: null,
  ordering: {
  field: 0,
  direction: 1

src/proto/queries_pb.d.ts

@@ -3,6 +3,7 @@
 
 import * as jspb from "google-protobuf";
 import * as primitive_pb from "./primitive_pb";
+import * as google_protobuf_timestamp_pb from "google-protobuf/google/protobuf/timestamp_pb";
 
 export class Ordering extends jspb.Message {
  clearSequenceList(): void;
@@ -64,7 +65,31 @@ export class TxPaginationMeta extends jspb.Message {
  getOrdering(): Ordering | undefined;
  setOrdering(value?: Ordering): void;
 
+ hasFirstTxTime(): boolean;
+ clearFirstTxTime(): void;
+ getFirstTxTime(): google_protobuf_timestamp_pb.Timestamp | undefined;
+ setFirstTxTime(value?: google_protobuf_timestamp_pb.Timestamp): void;
+
+ hasLastTxTime(): boolean;
+ clearLastTxTime(): void;
+ getLastTxTime(): google_protobuf_timestamp_pb.Timestamp | undefined;
+ setLastTxTime(value?: google_protobuf_timestamp_pb.Timestamp): void;
+
+ hasFirstTxHeight(): boolean;
+ clearFirstTxHeight(): void;
+ getFirstTxHeight(): number;
+ setFirstTxHeight(value: number): void;
+
+ hasLastTxHeight(): boolean;
+ clearLastTxHeight(): void;
+ getLastTxHeight(): number;
+ setLastTxHeight(value: number): void;
+
  getOptFirstTxHashCase(): TxPaginationMeta.OptFirstTxHashCase;
+ getOptFirstTxTimeCase(): TxPaginationMeta.OptFirstTxTimeCase;
+ getOptLastTxTimeCase(): TxPaginationMeta.OptLastTxTimeCase;
+ getOptFirstTxHeightCase(): TxPaginationMeta.OptFirstTxHeightCase;
+ getOptLastTxHeightCase(): TxPaginationMeta.OptLastTxHeightCase;
  serializeBinary(): Uint8Array;
  toObject(includeInstance?: boolean): TxPaginationMeta.AsObject;
  static toObject(includeInstance: boolean, msg: TxPaginationMeta): TxPaginationMeta.AsObject;
@@ -80,12 +105,36 @@ export namespace TxPaginationMeta {
  pageSize: number,
  firstTxHash: string,
  ordering?: Ordering.AsObject,
+ firstTxTime?: google_protobuf_timestamp_pb.Timestamp.AsObject,
+ lastTxTime?: google_protobuf_timestamp_pb.Timestamp.AsObject,
+ firstTxHeight: number,
+ lastTxHeight: number,
  }
 
  export enum OptFirstTxHashCase {
  OPT_FIRST_TX_HASH_NOT_SET = 0,
  FIRST_TX_HASH = 2,
  }
+
+ export enum OptFirstTxTimeCase {
+ OPT_FIRST_TX_TIME_NOT_SET = 0,
+ FIRST_TX_TIME = 4,
+ }
+
+ export enum OptLastTxTimeCase {
+ OPT_LAST_TX_TIME_NOT_SET = 0,
+ LAST_TX_TIME = 5,
+ }
+
+ export enum OptFirstTxHeightCase {
+ OPT_FIRST_TX_HEIGHT_NOT_SET = 0,
+ FIRST_TX_HEIGHT = 6,
+ }
+
+ export enum OptLastTxHeightCase {
+ OPT_LAST_TX_HEIGHT_NOT_SET = 0,
+ LAST_TX_HEIGHT = 7,
+ }
 }
 
 export class AssetPaginationMeta extends jspb.Message {