@polymeshassociation/polymesh-sdk 31.0.0 → 31.1.0-beta.10

package/middleware/queries/events.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { Event } from '../../middleware/types';
+import { Event, EventsOrderBy } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 type EventArgs = 'moduleId' | 'eventId' | 'eventArg0' | 'eventArg1' | 'eventArg2';
 /**
@@ -8,6 +8,6 @@ type EventArgs = 'moduleId' | 'eventId' | 'eventArg0' | 'eventArg1' | 'eventArg2
  *
  * Get a single event by any of its indexed arguments
  */
-export declare function eventsByArgs(filters: QueryArgs<Event, EventArgs>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<Event, EventArgs>>>;
+export declare function eventsByArgs(filters: QueryArgs<Event, EventArgs>, size?: BigNumber, start?: BigNumber, orderBy?: EventsOrderBy | EventsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<Event, EventArgs>>>;
 export {};
 //# sourceMappingURL=events.d.ts.map

package/middleware/queries/events.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,KAAK,EAAiB,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D,KAAK,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AAElF;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,EACpC,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAkC/D"}
+{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/events.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D,KAAK,SAAS,GAAG,UAAU,GAAG,SAAS,GAAG,WAAW,GAAG,WAAW,GAAG,WAAW,CAAC;AAElF;;;;GAIG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,EACpC,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,aAAa,GAAG,aAAa,EAAE,GACxC,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAmC/D"}

package/middleware/queries/events.js

@@ -12,19 +12,20 @@ const types_1 = require("../../middleware/types");
  *
  * Get a single event by any of its indexed arguments
  */
-function eventsByArgs(filters, size, start) {
+function eventsByArgs(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
         moduleId: 'ModuleIdEnum',
         eventId: 'EventIdEnum',
     });
-    const orderBy = `${types_1.EventsOrderBy.BlockIdAsc}`;
+    // `id` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.EventsOrderBy.IdAsc]);
     const query = (0, graphql_tag_1.default) `
     query EventsQuery
       ${args}
      {
       events(
         ${filter}
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
         first: $size
         offset: $start
       ) {

package/middleware/queries/events.js.map

@@ -1 +1 @@
-{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/middleware/queries/events.ts"],"names":[],"mappings":";;;;;AAeA,oCAsCC;AAnDD,8DAA8B;AAE9B,wDAAqF;AACrF,8CAA0D;AAK1D;;;;GAIG;AACH,SAAgB,YAAY,CAC1B,OAAoC,EACpC,IAAgB,EAChB,KAAiB;IAEjB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,QAAQ,EAAE,cAAc;QACxB,OAAO,EAAE,aAAa;KACvB,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,GAAG,qBAAa,CAAC,UAAU,EAAE,CAAC;IAE9C,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;oBACI,OAAO;;;;;;;;;;;;;;GAcxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../src/middleware/queries/events.ts"],"names":[],"mappings":";;;;;AAeA,oCAwCC;AArDD,8DAA8B;AAE9B,wDAAoG;AACpG,8CAA0D;AAK1D;;;;GAIG;AACH,SAAgB,YAAY,CAC1B,OAAoC,EACpC,IAAgB,EAChB,KAAiB,EACjB,OAAyC;IAEzC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,QAAQ,EAAE,cAAc;QACxB,OAAO,EAAE,aAAa;KACvB,CAAC,CAAC;IAEH,wEAAwE;IACxE,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,qBAAa,CAAC,KAAK,CAAC,CAAC,CAAC;IAE/D,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;oBACI,QAAQ;;;;;;;;;;;;;;GAczB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}

package/middleware/queries/externalAgents.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { TickerExternalAgent, TickerExternalAgentAction, TickerExternalAgentHistory } from '../../middleware/types';
+import { TickerExternalAgent, TickerExternalAgentAction, TickerExternalAgentActionsOrderBy, TickerExternalAgentHistory } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 /**
  * @hidden
@@ -20,6 +20,6 @@ type TickerExternalAgentActionArgs = 'assetId' | 'callerId' | 'palletName' | 'ev
  *
  * Get list of Events triggered by actions (from the set of actions that can only be performed by external agents) that have been performed on a specific Asset
  */
-export declare function tickerExternalAgentActionsQuery(filters: QueryArgs<TickerExternalAgentAction, TickerExternalAgentActionArgs>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<TickerExternalAgentAction, TickerExternalAgentActionArgs>>>;
+export declare function tickerExternalAgentActionsQuery(filters: QueryArgs<TickerExternalAgentAction, TickerExternalAgentActionArgs>, size?: BigNumber, start?: BigNumber, orderBy?: TickerExternalAgentActionsOrderBy | TickerExternalAgentActionsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<TickerExternalAgentAction, TickerExternalAgentActionArgs>>>;
 export {};
 //# sourceMappingURL=externalAgents.d.ts.map

package/middleware/queries/externalAgents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"externalAgents.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/externalAgents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EAGzB,0BAA0B,EAE3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,SAAS,CAAC,mBAAmB,EAAE,SAAS,CAAC,GACnD,YAAY,CAAC,SAAS,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC,CA0BzD;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,SAAS,CAAC,0BAA0B,EAAE,SAAS,CAAC,GAC1D,YAAY,CAAC,SAAS,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC,CA0BhE;AAED,KAAK,6BAA6B,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvF;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,EAC5E,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CACb,kBAAkB,CAAC,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,CAAC,CACxF,CAiCA"}
+{"version":3,"file":"externalAgents.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/externalAgents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,mBAAmB,EACnB,yBAAyB,EACzB,iCAAiC,EAEjC,0BAA0B,EAE3B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,SAAS,EAAE,SAAS,CAAC,mBAAmB,EAAE,SAAS,CAAC,GACnD,YAAY,CAAC,SAAS,CAAC,mBAAmB,EAAE,SAAS,CAAC,CAAC,CA0BzD;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,SAAS,EAAE,SAAS,CAAC,0BAA0B,EAAE,SAAS,CAAC,GAC1D,YAAY,CAAC,SAAS,CAAC,0BAA0B,EAAE,SAAS,CAAC,CAAC,CA0BhE;AAED,KAAK,6BAA6B,GAAG,SAAS,GAAG,UAAU,GAAG,YAAY,GAAG,SAAS,CAAC;AAEvF;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,OAAO,EAAE,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,EAC5E,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,iCAAiC,GAAG,iCAAiC,EAAE,GAChF,YAAY,CACb,kBAAkB,CAAC,SAAS,CAAC,yBAAyB,EAAE,6BAA6B,CAAC,CAAC,CACxF,CAoCA"}

package/middleware/queries/externalAgents.js

@@ -74,9 +74,10 @@ function tickerExternalAgentHistoryQuery(variables) {
  *
  * Get list of Events triggered by actions (from the set of actions that can only be performed by external agents) that have been performed on a specific Asset
  */
-function tickerExternalAgentActionsQuery(filters, size, start) {
+function tickerExternalAgentActionsQuery(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, { eventId: 'EventIdEnum' });
-    const orderBy = `${types_1.TickerExternalAgentActionsOrderBy.CreatedBlockIdDesc}`;
+    // `id` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.TickerExternalAgentActionsOrderBy.IdDesc]);
     const query = (0, graphql_tag_1.default) `
     query TickerExternalAgentActionsQuery
       ${args}
@@ -85,7 +86,7 @@ function tickerExternalAgentActionsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {

package/middleware/queries/externalAgents.js.map

@@ -1 +1 @@
-{"version":3,"file":"externalAgents.js","sourceRoot":"","sources":["../../../src/middleware/queries/externalAgents.ts"],"names":[],"mappings":";;;;;AAoBA,8DA4BC;AAOD,0EA4BC;AASD,0EAuCC;AAjID,8DAA8B;AAE9B,wDAAqF;AACrF,8CAO4B;AAG5B;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,SAAoD;IAEpD,MAAM,OAAO,GAAG,GAAG,mCAA2B,CAAC,kBAAkB,EAAE,CAAC;IAEpE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;oBAIC,OAAO;;;;;;;;;;;;;GAaxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,SAA2D;IAE3D,MAAM,OAAO,GAAG,GAAG,2CAAmC,CAAC,iBAAiB,EAAE,CAAC;IAE3E,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;oBAIC,OAAO;;;;;;;;;;;;;GAaxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAID;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,OAA4E,EAC5E,IAAgB,EAChB,KAAiB;IAIjB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACnF,MAAM,OAAO,GAAG,GAAG,yCAAiC,CAAC,kBAAkB,EAAE,CAAC;IAC1E,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,OAAO;;;;;;;;;;;;;;;;GAgBxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"externalAgents.js","sourceRoot":"","sources":["../../../src/middleware/queries/externalAgents.ts"],"names":[],"mappings":";;;;;AAoBA,8DA4BC;AAOD,0EA4BC;AASD,0EA2CC;AArID,8DAA8B;AAE9B,wDAAoG;AACpG,8CAO4B;AAG5B;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,SAAoD;IAEpD,MAAM,OAAO,GAAG,GAAG,mCAA2B,CAAC,kBAAkB,EAAE,CAAC;IAEpE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;oBAIC,OAAO;;;;;;;;;;;;;GAaxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,SAA2D;IAE3D,MAAM,OAAO,GAAG,GAAG,2CAAmC,CAAC,iBAAiB,EAAE,CAAC;IAE3E,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;oBAIC,OAAO;;;;;;;;;;;;;GAaxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAID;;;;GAIG;AACH,SAAgB,+BAA+B,CAC7C,OAA4E,EAC5E,IAAgB,EAChB,KAAiB,EACjB,OAAiF;IAIjF,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IAEnF,wEAAwE;IACxE,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,yCAAiC,CAAC,MAAM,CAAC,CAAC,CAAC;IAEpF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;;;GAgBzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}

package/middleware/queries/extrinsics.d.ts

@@ -14,6 +14,6 @@ type ExtrinsicArgs = 'blockId' | 'address' | 'moduleId' | 'callId' | 'success';
  *
  * Get transactions
  */
-export declare function extrinsicsByArgs(filters: QueryArgs<Extrinsic, ExtrinsicArgs>, size?: BigNumber, start?: BigNumber, orderBy?: ExtrinsicsOrderBy): QueryOptions<PaginatedQueryArgs<QueryArgs<Extrinsic, ExtrinsicArgs>>>;
+export declare function extrinsicsByArgs(filters: QueryArgs<Extrinsic, ExtrinsicArgs>, size?: BigNumber, start?: BigNumber, orderBy?: ExtrinsicsOrderBy | ExtrinsicsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<Extrinsic, ExtrinsicArgs>>>;
 export {};
 //# sourceMappingURL=extrinsics.d.ts.map

package/middleware/queries/extrinsics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extrinsics.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/extrinsics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAQrC,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,GAC/C,YAAY,CAAC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CA4BrD;AAED,KAAK,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE/E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,EAC5C,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,GAAE,iBAAgD,GACxD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,CAiDvE"}
+{"version":3,"file":"extrinsics.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/extrinsics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAUrC,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,eAAe,CAC7B,SAAS,EAAE,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,GAC/C,YAAY,CAAC,SAAS,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CA4BrD;AAED,KAAK,aAAa,GAAG,SAAS,GAAG,SAAS,GAAG,UAAU,GAAG,QAAQ,GAAG,SAAS,CAAC;AAE/E;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,EAC5C,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAChD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC,CAAC,CAyDvE"}

package/middleware/queries/extrinsics.js

@@ -46,25 +46,31 @@ function extrinsicByHash(variables) {
  *
  * Get transactions
  */
-function extrinsicsByArgs(filters, size, start, orderBy = types_1.ExtrinsicsOrderBy.BlockIdAsc) {
+function extrinsicsByArgs(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
         moduleId: 'ModuleIdEnum',
         callId: 'CallIdEnum',
         success: 'Int',
     });
-    if (orderBy === types_1.ExtrinsicsOrderBy.CreatedAtAsc) {
-        orderBy = types_1.ExtrinsicsOrderBy.BlockIdAsc;
-    }
-    if (orderBy === types_1.ExtrinsicsOrderBy.CreatedAtDesc) {
-        orderBy = types_1.ExtrinsicsOrderBy.BlockIdDesc;
-    }
+    // the indexer exposes no `createdAt` ordering; both map onto block order
+    const supplied = (0, common_1.toOrderByList)(orderBy).map(key => {
+        if (key === types_1.ExtrinsicsOrderBy.CreatedAtAsc) {
+            return types_1.ExtrinsicsOrderBy.IdAsc;
+        }
+        if (key === types_1.ExtrinsicsOrderBy.CreatedAtDesc) {
+            return types_1.ExtrinsicsOrderBy.IdDesc;
+        }
+        return key;
+    });
+    // `id` is `<block>/<extrinsic index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(supplied, [types_1.ExtrinsicsOrderBy.IdAsc]);
     const query = (0, graphql_tag_1.default) `
     query TransactionsQuery
       ${args}
      {
       extrinsics(
         ${filter}
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
         first: $size
         offset: $start
       ) {

package/middleware/queries/extrinsics.js.map

@@ -1 +1 @@
-{"version":3,"file":"extrinsics.js","sourceRoot":"","sources":["../../../src/middleware/queries/extrinsics.ts"],"names":[],"mappings":";;;;;AAiBA,0CA8BC;AASD,4CAsDC;AA5GD,8DAA8B;AAE9B,wDAIqC;AACrC,8CAAkE;AAGlE;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,SAAgD;IAEhD,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;GAqBhB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAID;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,OAA4C,EAC5C,IAAgB,EAChB,KAAiB,EACjB,UAA6B,yBAAiB,CAAC,UAAU;IAEzD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,QAAQ,EAAE,cAAc;QACxB,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,IAAI,OAAO,KAAK,yBAAiB,CAAC,YAAY,EAAE,CAAC;QAC/C,OAAO,GAAG,yBAAiB,CAAC,UAAU,CAAC;IACzC,CAAC;IACD,IAAI,OAAO,KAAK,yBAAiB,CAAC,aAAa,EAAE,CAAC;QAChD,OAAO,GAAG,yBAAiB,CAAC,WAAW,CAAC;IAC1C,CAAC;IAED,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;oBACI,OAAO;;;;;;;;;;;;;;;;;;;;;;;GAuBxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,EAAE,IAAA,8BAAqB,kCAAM,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,EAAG;KACnF,CAAC;AACJ,CAAC"}
+{"version":3,"file":"extrinsics.js","sourceRoot":"","sources":["../../../src/middleware/queries/extrinsics.ts"],"names":[],"mappings":";;;;;AAmBA,0CA8BC;AASD,4CA8DC;AAtHD,8DAA8B;AAE9B,wDAMqC;AACrC,8CAAkE;AAGlE;;;;GAIG;AACH,SAAgB,eAAe,CAC7B,SAAgD;IAEhD,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;GAqBhB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAID;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,OAA4C,EAC5C,IAAgB,EAChB,KAAiB,EACjB,OAAiD;IAEjD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,QAAQ,EAAE,cAAc;QACxB,MAAM,EAAE,YAAY;QACpB,OAAO,EAAE,KAAK;KACf,CAAC,CAAC;IAEH,yEAAyE;IACzE,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QAChD,IAAI,GAAG,KAAK,yBAAiB,CAAC,YAAY,EAAE,CAAC;YAC3C,OAAO,yBAAiB,CAAC,KAAK,CAAC;QACjC,CAAC;QACD,IAAI,GAAG,KAAK,yBAAiB,CAAC,aAAa,EAAE,CAAC;YAC5C,OAAO,yBAAiB,CAAC,MAAM,CAAC;QAClC,CAAC;QAED,OAAO,GAAG,CAAC;IACb,CAAC,CAAC,CAAC;IAEH,4EAA4E;IAC5E,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,QAAQ,EAAE,CAAC,yBAAiB,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;oBACI,QAAQ;;;;;;;;;;;;;;;;;;;;;;;GAuBzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,EAAE,IAAA,8BAAqB,kCAAM,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,EAAG;KACnF,CAAC;AACJ,CAAC"}

package/middleware/queries/multisigs.d.ts

@@ -1,6 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { MultiSigProposal, MultiSigProposalVote } from '../../middleware/types';
+import { MultiSigProposal, MultiSigProposalsOrderBy, MultiSigProposalVote } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 /**
  * @hidden
@@ -14,14 +14,10 @@ export declare function multiSigProposalQuery(variables: QueryArgs<MultiSigPropo
  * Get MultiSig proposal votes for a given proposalId ({multiSigAddress}/{proposalId})
  */
 export declare function multiSigProposalVotesQuery(variables: QueryArgs<MultiSigProposalVote, 'proposalId'>): QueryOptions<QueryArgs<MultiSigProposalVote, 'proposalId'>>;
-type MultiSigProposalQueryParameters = {
-    multisigId: string;
-};
 /**
  * @hidden
  *
  * Get MultiSig Proposals history for a given MultiSig address
  */
-export declare function multiSigProposalsQuery(multisigId: string, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<MultiSigProposalQueryParameters>>;
-export {};
+export declare function multiSigProposalsQuery(filters: QueryArgs<MultiSigProposal, 'multisigId' | 'status'>, size?: BigNumber, start?: BigNumber, orderBy?: MultiSigProposalsOrderBy | MultiSigProposalsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<MultiSigProposal, 'multisigId' | 'status'>>>;
 //# sourceMappingURL=multisigs.d.ts.map

package/middleware/queries/multisigs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"multisigs.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/multisigs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,gBAAgB,EAChB,oBAAoB,EAErB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,SAAS,CAAC,gBAAgB,EAAE,YAAY,GAAG,YAAY,CAAC,GAClE,YAAY,CAAC,SAAS,CAAC,gBAAgB,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAwCxE;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC,GACvD,YAAY,CAAC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC,CA+B7D;AAED,KAAK,+BAA+B,GAAG;IACrC,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,EAAE,MAAM,EAClB,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,+BAA+B,CAAC,CAAC,CA0BnE"}
+{"version":3,"file":"multisigs.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/multisigs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EACL,gBAAgB,EAChB,wBAAwB,EACxB,oBAAoB,EAErB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,qBAAqB,CACnC,SAAS,EAAE,SAAS,CAAC,gBAAgB,EAAE,YAAY,GAAG,YAAY,CAAC,GAClE,YAAY,CAAC,SAAS,CAAC,gBAAgB,EAAE,YAAY,GAAG,YAAY,CAAC,CAAC,CAwCxE;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CACxC,SAAS,EAAE,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC,GACvD,YAAY,CAAC,SAAS,CAAC,oBAAoB,EAAE,YAAY,CAAC,CAAC,CA+B7D;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,SAAS,CAAC,gBAAgB,EAAE,YAAY,GAAG,QAAQ,CAAC,EAC7D,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,wBAAwB,GAAG,wBAAwB,EAAE,GAC9D,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,gBAAgB,EAAE,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAkCxF"}

package/middleware/queries/multisigs.js

@@ -93,13 +93,19 @@ function multiSigProposalVotesQuery(variables) {
  *
  * Get MultiSig Proposals history for a given MultiSig address
  */
-function multiSigProposalsQuery(multisigId, size, start) {
+function multiSigProposalsQuery(filters, size, start, orderBy) {
+    const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {});
+    // `id` embeds an unpadded proposal number; `proposalId` is an Int, and unique per multisig
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.MultiSigProposalsOrderBy.ProposalIdDesc]);
     const query = (0, graphql_tag_1.default) `
-    query MultiSigProposalsQuery($size: Int, $start: Int, $multisigId: String!) {
+    query MultiSigProposalsQuery
+      ${args}
+     {
       multiSigProposals(
-        filter: { multisigId: { equalTo: $multisigId } }
+        ${filter}
         first: $size
         offset: $start
+        orderBy: [${ordering}]
       ) {
         nodes {
           id
@@ -116,7 +122,7 @@ function multiSigProposalsQuery(multisigId, size, start) {
   `;
     return {
         query,
-        variables: Object.assign(Object.assign({}, (0, common_1.getSizeAndOffset)(size, start)), { multisigId }),
+        variables: Object.assign(Object.assign({}, filters), (0, common_1.getSizeAndOffset)(size, start)),
     };
 }
 //# sourceMappingURL=multisigs.js.map

package/middleware/queries/multisigs.js.map

@@ -1 +1 @@
-{"version":3,"file":"multisigs.js","sourceRoot":"","sources":["../../../src/middleware/queries/multisigs.ts"],"names":[],"mappings":";;;;;AAiBA,sDA0CC;AAOD,gEAiCC;AAWD,wDA8BC;AA1ID,8DAA8B;AAE9B,wDAA+D;AAC/D,8CAI4B;AAG5B;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,SAAmE;IAEnE,MAAM,OAAO,GAAG,GAAG,oCAA4B,CAAC,iBAAiB,KAAK,oCAA4B,CAAC,WAAW,EAAE,CAAC;IAEjH,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;4BAcS,OAAO;;;;;;;;;;;;;;;;;GAiBhC,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CACxC,SAAwD;IAExD,MAAM,OAAO,GAAG,GAAG,oCAA4B,CAAC,iBAAiB,KAAK,oCAA4B,CAAC,WAAW,EAAE,CAAC;IAEjH,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;oBAIC,OAAO;;;;;;;;;;;;;;;;;;GAkBxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAMD;;;;GAIG;AACH,SAAgB,sBAAsB,CACpC,UAAkB,EAClB,IAAgB,EAChB,KAAiB;IAEjB,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;;;;;;GAmBhB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,KAAE,UAAU,GAAE;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"multisigs.js","sourceRoot":"","sources":["../../../src/middleware/queries/multisigs.ts"],"names":[],"mappings":";;;;;AAkBA,sDA0CC;AAOD,gEAiCC;AAOD,wDAuCC;AAhJD,8DAA8B;AAE9B,wDAAoG;AACpG,8CAK4B;AAG5B;;;;GAIG;AACH,SAAgB,qBAAqB,CACnC,SAAmE;IAEnE,MAAM,OAAO,GAAG,GAAG,oCAA4B,CAAC,iBAAiB,KAAK,oCAA4B,CAAC,WAAW,EAAE,CAAC;IAEjH,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;;;;;;;;4BAcS,OAAO;;;;;;;;;;;;;;;;;GAiBhC,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,0BAA0B,CACxC,SAAwD;IAExD,MAAM,OAAO,GAAG,GAAG,oCAA4B,CAAC,iBAAiB,KAAK,oCAA4B,CAAC,WAAW,EAAE,CAAC;IAEjH,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;oBAIC,OAAO;;;;;;;;;;;;;;;;;;GAkBxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CACpC,OAA6D,EAC7D,IAAgB,EAChB,KAAiB,EACjB,OAA+D;IAE/D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAE3D,2FAA2F;IAC3F,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,gCAAwB,CAAC,cAAc,CAAC,CAAC,CAAC;IAEnF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;GAczB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}

package/middleware/queries/polyxTransactions.d.ts

@@ -1,5 +1,6 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
+import { PolyxTransactionsOrderBy } from '../../middleware/types';
 import { PaginatedQueryArgs } from '../../types/utils';
 export interface QueryPolyxTransactionFilters {
     identityId?: string | undefined;
@@ -10,5 +11,5 @@ export interface QueryPolyxTransactionFilters {
  *
  * Get POLYX transactions where an Account or an Identity is involved
  */
-export declare function polyxTransactionsQuery(filters: QueryPolyxTransactionFilters, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryPolyxTransactionFilters>>;
+export declare function polyxTransactionsQuery(filters: QueryPolyxTransactionFilters, size?: BigNumber, start?: BigNumber, orderBy?: PolyxTransactionsOrderBy | PolyxTransactionsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryPolyxTransactionFilters>>;
 //# sourceMappingURL=polyxTransactions.d.ts.map

package/middleware/queries/polyxTransactions.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polyxTransactions.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/polyxTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAKrC,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAClC;AAuCD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,4BAA4B,EACrC,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,CAAC,CA8ChE"}
+{"version":3,"file":"polyxTransactions.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/polyxTransactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,wBAAwB,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAEnD,MAAM,WAAW,4BAA4B;IAC3C,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,EAAE,GAAG,SAAS,CAAC;CAClC;AAuCD;;;;GAIG;AACH,wBAAgB,sBAAsB,CACpC,OAAO,EAAE,4BAA4B,EACrC,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,wBAAwB,GAAG,wBAAwB,EAAE,GAC9D,YAAY,CAAC,kBAAkB,CAAC,4BAA4B,CAAC,CAAC,CAgDhE"}

package/middleware/queries/polyxTransactions.js

@@ -40,9 +40,10 @@ function createPolyxTransactionFilters({ identityId, addresses }) {
  *
  * Get POLYX transactions where an Account or an Identity is involved
  */
-function polyxTransactionsQuery(filters, size, start) {
+function polyxTransactionsQuery(filters, size, start, orderBy) {
     const { args, filter, variables } = createPolyxTransactionFilters(filters);
-    const orderBy = `${types_1.PolyxTransactionsOrderBy.CreatedBlockIdAsc}`;
+    // `id` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.PolyxTransactionsOrderBy.IdDesc]);
     const query = (0, graphql_tag_1.default) `
     query PolyxTransactionsQuery
       ${args}
@@ -51,8 +52,9 @@ function polyxTransactionsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
       ) {
+        totalCount
         nodes {
           id
           identityId

package/middleware/queries/polyxTransactions.js.map

@@ -1 +1 @@
-{"version":3,"file":"polyxTransactions.js","sourceRoot":"","sources":["../../../src/middleware/queries/polyxTransactions.ts"],"names":[],"mappings":";;;;;AAuDA,wDAkDC;AAvGD,8DAA8B;AAE9B,wDAA+D;AAC/D,8CAA8D;AAQ9D;;GAEG;AACH,SAAS,6BAA6B,CAAC,EAAE,UAAU,EAAE,SAAS,EAAgC;IAK5F,MAAM,IAAI,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAiC,EAAE,CAAC;IAEnD,IAAI,UAAU,EAAE,CAAC;QACf,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClC,aAAa,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QAC3D,WAAW,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE,CAAC;QACtB,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACpC,aAAa,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAClD,WAAW,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACpD,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EACJ,aAAa,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM;YACxC,CAAC,CAAC,qBAAqB,aAAa,CAAC,IAAI,EAAE,SAAS,WAAW,CAAC,IAAI,EAAE,QAAQ;YAC9E,CAAC,CAAC,EAAE;QACR,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CACpC,OAAqC,EACrC,IAAgB,EAChB,KAAiB;IAEjB,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAE3E,MAAM,OAAO,GAAG,GAAG,gCAAwB,CAAC,iBAAiB,EAAE,CAAC;IAEhE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BxB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,SAAS,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC9D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"polyxTransactions.js","sourceRoot":"","sources":["../../../src/middleware/queries/polyxTransactions.ts"],"names":[],"mappings":";;;;;AAuDA,wDAqDC;AA1GD,8DAA8B;AAE9B,wDAA8E;AAC9E,8CAA8D;AAQ9D;;GAEG;AACH,SAAS,6BAA6B,CAAC,EAAE,UAAU,EAAE,SAAS,EAAgC;IAK5F,MAAM,IAAI,GAAG,CAAC,yBAAyB,CAAC,CAAC;IACzC,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG,EAAE,CAAC;IACvB,MAAM,SAAS,GAAiC,EAAE,CAAC;IAEnD,IAAI,UAAU,EAAE,CAAC;QACf,SAAS,CAAC,UAAU,GAAG,UAAU,CAAC;QAClC,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC;QAClC,aAAa,CAAC,IAAI,CAAC,sCAAsC,CAAC,CAAC;QAC3D,WAAW,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;IACrD,CAAC;IAED,IAAI,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,MAAM,EAAE,CAAC;QACtB,SAAS,CAAC,SAAS,GAAG,SAAS,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACpC,aAAa,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAClD,WAAW,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;IACpD,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EACJ,aAAa,CAAC,MAAM,IAAI,WAAW,CAAC,MAAM;YACxC,CAAC,CAAC,qBAAqB,aAAa,CAAC,IAAI,EAAE,SAAS,WAAW,CAAC,IAAI,EAAE,QAAQ;YAC9E,CAAC,CAAC,EAAE;QACR,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,sBAAsB,CACpC,OAAqC,EACrC,IAAgB,EAChB,KAAiB,EACjB,OAA+D;IAE/D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,6BAA6B,CAAC,OAAO,CAAC,CAAC;IAE3E,wEAAwE;IACxE,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,gCAAwB,CAAC,MAAM,CAAC,CAAC,CAAC;IAE3E,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,SAAS,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC9D,CAAC;AACJ,CAAC"}

package/middleware/queries/settlements.d.ts

@@ -1,11 +1,11 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
 import { Context } from '../../internal';
-import { Instruction, InstructionAffirmation, InstructionEvent, InstructionStatusEnum, Leg } from '../../middleware/types';
+import { Instruction, InstructionAffirmation, InstructionAffirmationsOrderBy, InstructionEvent, InstructionEventsOrderBy, InstructionsOrderBy, InstructionStatusEnum, Leg, LegsOrderBy } from '../../middleware/types';
 import { HistoricalInstructionFilters } from '../../types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 type InstructionArgs = 'id' | 'venueId' | 'status';
-type InstructionPartiesVariables = Partial<Record<keyof Omit<HistoricalInstructionFilters, 'status' | 'size' | 'start'>, string> & {
+type InstructionPartiesVariables = Partial<Record<keyof Omit<HistoricalInstructionFilters, 'status' | 'size' | 'start' | 'orderBy'>, string> & {
     status?: InstructionStatusEnum;
     size?: number;
     start?: number;
@@ -13,20 +13,20 @@ type InstructionPartiesVariables = Partial<Record<keyof Omit<HistoricalInstructi
 /**
  * Query to get event details about instruction events
  */
-export declare function instructionEventsQuery(filters: QueryArgs<InstructionEvent, 'event' | 'instructionId'>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<InstructionEvent, 'event' | 'instructionId'>>>;
+export declare function instructionEventsQuery(filters: QueryArgs<InstructionEvent, 'event' | 'instructionId'>, size?: BigNumber, start?: BigNumber, orderBy?: InstructionEventsOrderBy | InstructionEventsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<InstructionEvent, 'event' | 'instructionId'>>>;
 /**
  * @hidden
  *
  * Get a specific instruction within a venue for a specific event
  */
-export declare function instructionsQuery(filters: QueryArgs<Instruction, InstructionArgs>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<Instruction, InstructionArgs>>>;
+export declare function instructionsQuery(filters: QueryArgs<Instruction, InstructionArgs>, size?: BigNumber, start?: BigNumber, orderBy?: InstructionsOrderBy | InstructionsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<Instruction, InstructionArgs>>>;
 type InstructionAffirmationArgs = 'instructionId' | 'status' | 'identity' | 'isMediator';
 /**
  * @hidden
  *
  * Get a specific instruction within a venue for a specific event
  */
-export declare function instructionAffirmationsQuery(filters: QueryArgs<InstructionAffirmation, InstructionAffirmationArgs>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<InstructionAffirmation, InstructionAffirmationArgs>>>;
+export declare function instructionAffirmationsQuery(filters: QueryArgs<InstructionAffirmation, InstructionAffirmationArgs>, size?: BigNumber, start?: BigNumber, orderBy?: InstructionAffirmationsOrderBy | InstructionAffirmationsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<InstructionAffirmation, InstructionAffirmationArgs>>>;
 /**
  * @hidden
  *
@@ -38,7 +38,7 @@ export declare function offChainAffirmationsQuery(filters: QueryArgs<Instruction
  *
  * Get a specific instruction within a venue for a specific event
  */
-export declare function legsQuery(filters: QueryArgs<Leg, 'instructionId' | 'legType' | 'legIndex'>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<Leg, 'instructionId' | 'legType'>>>;
+export declare function legsQuery(filters: QueryArgs<Leg, 'instructionId' | 'legType' | 'legIndex'>, size?: BigNumber, start?: BigNumber, orderBy?: LegsOrderBy | LegsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<Leg, 'instructionId' | 'legType'>>>;
 /**
  * @hidden
  *
@@ -53,7 +53,7 @@ export declare const buildHistoricalInstructionsQueryFilter: (filters: Historica
  *
  * Get Instructions where an identity is involved
  */
-export declare function historicalInstructionsQuery(filters: HistoricalInstructionFilters, context: Context): Promise<QueryOptions<PaginatedQueryArgs<Omit<HistoricalInstructionFilters, 'size' | 'start'>>>>;
+export declare function historicalInstructionsQuery(filters: HistoricalInstructionFilters, context: Context, orderBy?: InstructionsOrderBy | InstructionsOrderBy[]): Promise<QueryOptions<PaginatedQueryArgs<Omit<HistoricalInstructionFilters, 'size' | 'start' | 'orderBy'>>>>;
 export interface QuerySettlementFilters {
     identityId: string;
     portfolioId?: BigNumber | undefined;

package/middleware/queries/settlements.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"settlements.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/settlements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settlements.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/settlements.ts"],"names":[],"mappings":"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"}

package/middleware/queries/settlements.js

@@ -96,11 +96,12 @@ const instructionAffirmationAttributes = `
 /**
  * Query to get event details about instruction events
  */
-function instructionEventsQuery(filters, size, start) {
+function instructionEventsQuery(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
         event: 'InstructionEventEnum',
     });
-    const orderBy = `[${types_1.InstructionEventsOrderBy.CreatedEventIdDesc}]`;
+    // `createdEventId` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.InstructionEventsOrderBy.CreatedEventIdDesc]);
     const query = (0, graphql_tag_1.default) `
     query InstructionEventsQuery
       ${args}
@@ -109,7 +110,7 @@ function instructionEventsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: ${orderBy}
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {
@@ -149,11 +150,12 @@ function instructionEventsQuery(filters, size, start) {
  *
  * Get a specific instruction within a venue for a specific event
  */
-function instructionsQuery(filters, size, start) {
+function instructionsQuery(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
         status: 'InstructionStatusEnum',
     });
-    const orderBy = `[${types_1.InstructionsOrderBy.CreatedEventIdDesc}]`;
+    // `createdEventId` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.InstructionsOrderBy.CreatedEventIdDesc]);
     const query = (0, graphql_tag_1.default) `
     query InstructionsQuery
       ${args}
@@ -162,7 +164,7 @@ function instructionsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: ${orderBy}
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {
@@ -181,12 +183,16 @@ function instructionsQuery(filters, size, start) {
  *
  * Get a specific instruction within a venue for a specific event
  */
-function instructionAffirmationsQuery(filters, size, start) {
+function instructionAffirmationsQuery(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
         status: 'AffirmStatusEnum',
         isMediator: 'Boolean',
     });
-    const orderBy = `[${types_1.InstructionAffirmationsOrderBy.CreatedBlockIdDesc}]`;
+    // an affirmation's `id` is not time ordered, so it serves only as a tiebreaker
+    const ordering = (0, common_1.orderByClause)(orderBy, [
+        types_1.InstructionAffirmationsOrderBy.CreatedBlockIdDesc,
+        types_1.InstructionAffirmationsOrderBy.IdDesc,
+    ]);
     const query = (0, graphql_tag_1.default) `
     query InstructionAffirmationsQuery
       ${args}
@@ -195,7 +201,7 @@ function instructionAffirmationsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: ${orderBy}
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {
@@ -241,11 +247,13 @@ function offChainAffirmationsQuery(filters) {
  *
  * Get a specific instruction within a venue for a specific event
  */
-function legsQuery(filters, size, start) {
+function legsQuery(filters, size, start, orderBy) {
     const { args, filter } = (0, common_1.createArgsAndFilters)(filters, {
         legType: 'LegTypeEnum',
         legIndex: 'Int',
     });
+    // `legIndex` is unique within the instruction this query always filters by
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.LegsOrderBy.LegIndexAsc]);
     const query = (0, graphql_tag_1.default) `
     query LegsQuery
       ${args}
@@ -254,7 +262,7 @@ function legsQuery(filters, size, start) {
         ${filter}
         first: $size
         offset: $start
-        orderBy: [${types_1.LegsOrderBy.LegIndexAsc}]
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {
@@ -332,17 +340,18 @@ exports.buildHistoricalInstructionsQueryFilter = buildHistoricalInstructionsQuer
  *
  * Get Instructions where an identity is involved
  */
-function historicalInstructionsQuery(filters, context) {
+function historicalInstructionsQuery(filters, context, orderBy) {
     return __awaiter(this, void 0, void 0, function* () {
         const { args, filter, variables } = yield (0, exports.buildHistoricalInstructionsQueryFilter)(filters, context);
-        const orderBy = `[${types_1.InstructionsOrderBy.CreatedBlockIdAsc}]`;
+        // `createdEventId` is `<block>/<event index>`, zero padded: block order, and unique
+        const ordering = (0, common_1.orderByClause)(orderBy, [types_1.InstructionsOrderBy.CreatedEventIdAsc]);
         const query = (0, graphql_tag_1.default) `
     query InstructionsQuery
     ${args}
      {
       instructions(
         ${filter}
-        orderBy: ${orderBy}
+        orderBy: [${ordering}]
         first: $size
         offset: $start
       ) {

package/middleware/queries/settlements.js.map

@@ -1 +1 @@
-{"version":3,"file":"settlements.js","sourceRoot":"","sources":["../../../src/middleware/queries/settlements.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"settlements.js","sourceRoot":"","sources":["../../../src/middleware/queries/settlements.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AA4GA,wDAwDC;AAOD,8CAmCC;AASD,oEA2CC;AAOD,8DAyBC;AAOD,8BAuCC;AA8FD,kEAqCC;AA2FD,4CAUC;AAOD,4EAUC;AAxkBD,gEAAqC;AACrC,8DAA8B;AAG9B,wDAAoG;AACpG,8CAU4B;AAG5B,iDAA0D;AAC1D,+CAAoD;AAEpD,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;;;CAoBrB,CAAC;AAEF,MAAM,qBAAqB,GAAG;;;;;;;;;;;;gBAYd,aAAa;;;;;;;;;;;;;;CAc5B,CAAC;AAEF,MAAM,gCAAgC,GAAG;;;;;;;;;;;;;;;;;CAiBxC,CAAC;AAgBF;;GAEG;AACH,SAAgB,sBAAsB,CACpC,OAA+D,EAC/D,IAAgB,EAChB,KAAiB,EACjB,OAA+D;IAE/D,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,KAAK,EAAE,sBAAsB;KAC9B,CAAC,CAAC;IAEH,oFAAoF;IACpF,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,gCAAwB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAEvF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BzB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,iBAAiB,CAC/B,OAAgD,EAChD,IAAgB,EAChB,KAAiB,EACjB,OAAqD;IAErD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,MAAM,EAAE,uBAAuB;KAChC,CAAC,CAAC;IAEH,oFAAoF;IACpF,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,2BAAmB,CAAC,kBAAkB,CAAC,CAAC,CAAC;IAElF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;YAIhB,qBAAqB;;;;GAI9B,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC;AAID;;;;GAIG;AACH,SAAgB,4BAA4B,CAC1C,OAAsE,EACtE,IAAgB,EAChB,KAAiB,EACjB,OAA2E;IAE3E,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,MAAM,EAAE,kBAAkB;QAC1B,UAAU,EAAE,SAAS;KACtB,CAAC,CAAC;IAEH,+EAA+E;IAC/E,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE;QACtC,sCAA8B,CAAC,kBAAkB;QACjD,sCAA8B,CAAC,MAAM;KACtC,CAAC,CAAC;IAEH,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;YAIhB,gCAAgC;;;;GAIzC,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,gDACJ,OAAO,GACP,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACvC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC9C;KACF,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CACvC,OAA2D;IAE3D,MAAM,OAAO,GAAG,GAAG,sCAA8B,CAAC,iBAAiB,EAAE,CAAC;IAEtE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;;oBAOC,OAAO;;;YAGf,gCAAgC;;;;GAIzC,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,oBAAO,OAAO,CAAE;KAC1B,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,SAAS,CACvB,OAAiE,EACjE,IAAgB,EAChB,KAAiB,EACjB,OAAqC;IAErC,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE;QACrD,OAAO,EAAE,aAAa;QACtB,QAAQ,EAAE,KAAK;KAChB,CAAC,CAAC;IAEH,2EAA2E;IAC3E,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,mBAAW,CAAC,WAAW,CAAC,CAAC,CAAC;IACnE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;YAIhB,aAAa;;;;GAItB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,gDACJ,OAAO,GACP,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GACvC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAC9C;KACF,CAAC;AACJ,CAAC;AAED;;;GAGG;AACI,MAAM,sCAAsC,GAAG,CACpD,OAAqC,EACrC,OAAgB,EAKf,EAAE;IACH,MAAM,EACJ,QAAQ,EACR,KAAK,EACL,MAAM,EACN,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,KAAK,EACL,IAAI,GAAG,IAAI,sBAAS,CAAC,iCAAqB,CAAC,EAC3C,KAAK,GAAG,IAAI,sBAAS,CAAC,CAAC,CAAC,GACzB,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;IAC3C,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,wBAAwB,GAAG,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,EAAE,CAAC;IACtB,MAAM,SAAS,GAAgC,EAAE,CAAC;IAElD,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChC,wBAAwB,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;QAClE,SAAS,CAAC,QAAQ,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChC,UAAU,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC;QACzD,SAAS,CAAC,QAAQ,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,iCAAiC,CAAC,CAAC;QAC7C,UAAU,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAChD,SAAS,CAAC,MAAM,GAAG,MAAM,CAAC;IAC5B,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7B,wBAAwB,CAAC,IAAI,CAAC,+BAA+B,CAAC,CAAC;QAC/D,SAAS,CAAC,KAAK,GAAG,IAAA,gBAAK,EAAC,KAAK,CAAC,CAAC;IACjC,CAAC;IAED,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAC7B,UAAU,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;QAChD,SAAS,CAAC,KAAK,GAAG,MAAM,IAAA,oBAAS,EAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;QAC9B,UAAU,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC9C,SAAS,CAAC,MAAM,GAAG,IAAA,gBAAK,EAAC,MAAM,CAAC,CAAC;IACnC,CAAC;IAED,IAAI,QAAQ,EAAE,CAAC;QACb,IAAI,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAC;QAChC,UAAU,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAC;QAC9C,SAAS,CAAC,QAAQ,GAAG,IAAA,gBAAK,EAAC,QAAQ,CAAC,CAAC;IACvC,CAAC;IAED,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtB,UAAU,CAAC,IAAI,CAAC,mBAAmB,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAClE,CAAC;IAED,IAAI,wBAAwB,CAAC,MAAM,EAAE,CAAC;QACpC,UAAU,CAAC,IAAI,CAAC,sBAAsB,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACnF,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EAAE,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,aAAa,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;QACvE,SAAS,kCAAO,SAAS,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC9D,CAAC;AACJ,CAAC,CAAA,CAAC;AAjFW,QAAA,sCAAsC,0CAiFjD;AAEF;;;;GAIG;AACH,SAAsB,2BAA2B,CAC/C,OAAqC,EACrC,OAAgB,EAChB,OAAqD;;QAIrD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAA,8CAAsC,EAC9E,OAAO,EACP,OAAO,CACR,CAAC;QAEF,oFAAoF;QACpF,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,2BAAmB,CAAC,iBAAiB,CAAC,CAAC,CAAC;QAEjF,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;MAEb,IAAI;;;UAGA,MAAM;oBACI,QAAQ;;;;;cAKd,qBAAqB;;;;;GAKhC,CAAC;QAEF,OAAO;YACL,KAAK;YACL,SAAS;SACV,CAAC;IACJ,CAAC;CAAA;AAWD;;GAEG;AACH,SAAS,gBAAgB,CACvB,EAAE,UAAU,EAAE,WAAW,EAAE,OAAO,EAAE,OAAO,EAA0B,EACrE,QAAkB;IAMlB,MAAM,IAAI,GAAa,CAAC,8BAA8B,CAAC,CAAC;IACxD,MAAM,aAAa,GAAG,CAAC,0BAA0B,CAAC,CAAC;IACnD,MAAM,WAAW,GAAG,CAAC,sBAAsB,CAAC,CAAC;IAC7C,MAAM,eAAe,GAAG,WAAW,CAAC,CAAC,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IACjE,MAAM,SAAS,GAA4B;QACzC,IAAI,EAAE,UAAU;QAChB,EAAE,EAAE,UAAU;KACf,CAAC;IAEF,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,SAAS,CAAC,aAAa,GAAG,eAAe,CAAC;QAC1C,SAAS,CAAC,WAAW,GAAG,eAAe,CAAC;QACxC,IAAI,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;QACpD,aAAa,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;QACjE,WAAW,CAAC,IAAI,CAAC,wCAAwC,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,OAAO,GAAG,OAAO,CAAC;QAC5B,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;QAC/B,MAAM,aAAa,GAAG,gCAAgC,CAAC;QACvD,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAED,IAAI,OAAO,EAAE,CAAC;QACZ,SAAS,CAAC,SAAS,GAAG,CAAC,OAAO,CAAC,CAAC;QAChC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;QACpC,MAAM,aAAa,GAAG,+BAA+B,CAAC;QACtD,WAAW,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChC,aAAa,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACpC,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG;QACxB,MAAM,EAAE,oBAAoB,aAAa,CAAC,IAAI,EAAE,SAAS,WAAW,CAAC,IAAI,EAAE,QAAQ;QACnF,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,SAAS,qBAAqB,CAAC,IAAY,EAAE,MAAc;IACzD,MAAM,OAAO,GAAG,IAAI,mBAAW,CAAC,iBAAiB,GAAG,CAAC;IAErD,OAAO,IAAA,qBAAG,EAAA;;MAEN,IAAI;;;QAGF,MAAM;iBACG,OAAO;;;;YAIZ,qBAAqB;;;;;CAKhC,CAAC;AACF,CAAC;AAED;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,OAA+B;IAE/B,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC9D,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAElD,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,SAAgB,gCAAgC,CAC9C,OAAoD;IAEpD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,GAAG,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACpE,MAAM,KAAK,GAAG,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAElD,OAAO;QACL,KAAK;QACL,SAAS;KACV,CAAC;AACJ,CAAC"}

package/middleware/queries/stos.d.ts

@@ -1,11 +1,11 @@
 import { QueryOptions } from '@apollo/client/core';
 import BigNumber from 'bignumber.js';
-import { Investment } from '../../middleware/types';
+import { Investment, InvestmentsOrderBy } from '../../middleware/types';
 import { PaginatedQueryArgs, QueryArgs } from '../../types/utils';
 /**
  * @hidden
  *
  * Get all investments for a given offering
  */
-export declare function investmentsQuery(filters: QueryArgs<Investment, 'stoId' | 'offeringAssetId'>, size?: BigNumber, start?: BigNumber): QueryOptions<PaginatedQueryArgs<QueryArgs<Investment, 'stoId' | 'offeringAssetId'>>>;
+export declare function investmentsQuery(filters: QueryArgs<Investment, 'stoId' | 'offeringAssetId'>, size?: BigNumber, start?: BigNumber, orderBy?: InvestmentsOrderBy | InvestmentsOrderBy[]): QueryOptions<PaginatedQueryArgs<QueryArgs<Investment, 'stoId' | 'offeringAssetId'>>>;
 //# sourceMappingURL=stos.d.ts.map

package/middleware/queries/stos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"stos.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/stos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,UAAU,EAAsB,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,OAAO,GAAG,iBAAiB,CAAC,EAC3D,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,GAChB,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,CA8BtF"}
+{"version":3,"file":"stos.d.ts","sourceRoot":"","sources":["../../../src/middleware/queries/stos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AACnD,OAAO,SAAS,MAAM,cAAc,CAAC;AAIrC,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAE9D;;;;GAIG;AACH,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,SAAS,CAAC,UAAU,EAAE,OAAO,GAAG,iBAAiB,CAAC,EAC3D,IAAI,CAAC,EAAE,SAAS,EAChB,KAAK,CAAC,EAAE,SAAS,EACjB,OAAO,CAAC,EAAE,kBAAkB,GAAG,kBAAkB,EAAE,GAClD,YAAY,CAAC,kBAAkB,CAAC,SAAS,CAAC,UAAU,EAAE,OAAO,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAmCtF"}

package/middleware/queries/stos.js

@@ -12,15 +12,19 @@ const types_1 = require("../../middleware/types");
  *
  * Get all investments for a given offering
  */
-function investmentsQuery(filters, size, start) {
-    const orderBy = `${types_1.InvestmentsOrderBy.CreatedBlockIdAsc}`;
+function investmentsQuery(filters, size, start, orderBy) {
+    const { args, filter } = (0, common_1.createArgsAndFilters)(filters, { stoId: 'Int' });
+    // `id` is `<block>/<event index>`, zero padded: block order, and unique
+    const ordering = (0, common_1.orderByClause)(orderBy, [types_1.InvestmentsOrderBy.IdAsc]);
     const query = (0, graphql_tag_1.default) `
-    query InvestmentsQuery($stoId: Int!, $offeringAssetId: String!, $size: Int, $start: Int) {
+    query InvestmentsQuery
+      ${args}
+     {
       investments(
-        filter: { stoId: { equalTo: $stoId }, offeringAssetId: { equalTo: $offeringAssetId } }
+        ${filter}
         first: $size
         offset: $start
-        orderBy: [${orderBy}]
+        orderBy: [${ordering}]
       ) {
         totalCount
         nodes {

package/middleware/queries/stos.js.map

@@ -1 +1 @@
-{"version":3,"file":"stos.js","sourceRoot":"","sources":["../../../src/middleware/queries/stos.ts"],"names":[],"mappings":";;;;;AAaA,4CAkCC;AA7CD,8DAA8B;AAE9B,wDAA+D;AAC/D,8CAAoE;AAGpE;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,OAA2D,EAC3D,IAAgB,EAChB,KAAiB;IAEjB,MAAM,OAAO,GAAG,GAAG,0BAAkB,CAAC,iBAAiB,EAAE,CAAC;IAE1D,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;;;;;oBAMC,OAAO;;;;;;;;;;;;;;;GAexB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}
+{"version":3,"file":"stos.js","sourceRoot":"","sources":["../../../src/middleware/queries/stos.ts"],"names":[],"mappings":";;;;;AAaA,4CAwCC;AAnDD,8DAA8B;AAE9B,wDAAoG;AACpG,8CAAoE;AAGpE;;;;GAIG;AACH,SAAgB,gBAAgB,CAC9B,OAA2D,EAC3D,IAAgB,EAChB,KAAiB,EACjB,OAAmD;IAEnD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,IAAA,6BAAoB,EAAC,OAAO,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;IAEzE,wEAAwE;IACxE,MAAM,QAAQ,GAAG,IAAA,sBAAa,EAAC,OAAO,EAAE,CAAC,0BAAkB,CAAC,KAAK,CAAC,CAAC,CAAC;IAEpE,MAAM,KAAK,GAAG,IAAA,qBAAG,EAAA;;QAEX,IAAI;;;UAGF,MAAM;;;oBAGI,QAAQ;;;;;;;;;;;;;;;GAezB,CAAC;IAEF,OAAO;QACL,KAAK;QACL,SAAS,kCAAO,OAAO,GAAK,IAAA,yBAAgB,EAAC,IAAI,EAAE,KAAK,CAAC,CAAE;KAC5D,CAAC;AACJ,CAAC"}