@nadohq/indexer-client 0.1.0-alpha.30 → 0.1.0-alpha.32

package/src/IndexerBaseClient.ts

@@ -407,12 +407,12 @@ export class IndexerBaseClient {
     })();
 
     const baseResponse = await this.query('events', {
-      subaccount: params.subaccount
-        ? subaccountToHex({
-            subaccountOwner: params.subaccount.subaccountOwner,
-            subaccountName: params.subaccount.subaccountName,
-          })
-        : undefined,
+      subaccounts: params.subaccounts?.map((subaccount) =>
+        subaccountToHex({
+          subaccountOwner: subaccount.subaccountOwner,
+          subaccountName: subaccount.subaccountName,
+        }),
+      ),
       product_ids: params.productIds,
       isolated: params.isolated,
       event_types: params.eventTypes,
@@ -442,12 +442,12 @@ export class IndexerBaseClient {
     params: GetIndexerOrdersParams,
   ): Promise<GetIndexerOrdersResponse> {
     const baseResponse = await this.query('orders', {
-      subaccount: params.subaccount
-        ? subaccountToHex({
-            subaccountOwner: params.subaccount.subaccountOwner,
-            subaccountName: params.subaccount.subaccountName,
-          })
-        : undefined,
+      subaccounts: params?.subaccounts?.map((subaccount) =>
+        subaccountToHex({
+          subaccountOwner: subaccount.subaccountOwner,
+          subaccountName: subaccount.subaccountName,
+        }),
+      ),
       product_ids: params.productIds,
       trigger_types: params.triggerTypes,
       isolated: params.isolated,
@@ -470,12 +470,12 @@ export class IndexerBaseClient {
     params: GetIndexerMatchEventsParams,
   ): Promise<GetIndexerMatchEventsResponse> {
     const baseResponse = await this.query('matches', {
-      subaccount: params.subaccount
-        ? subaccountToHex({
-            subaccountOwner: params.subaccount.subaccountOwner,
-            subaccountName: params.subaccount.subaccountName,
-          })
-        : undefined,
+      subaccounts: params?.subaccounts?.map((subaccount) =>
+        subaccountToHex({
+          subaccountOwner: subaccount.subaccountOwner,
+          subaccountName: subaccount.subaccountName,
+        }),
+      ),
       product_ids: params.productIds,
       isolated: params.isolated,
       max_time: params.maxTimestampInclusive,

package/src/IndexerClient.ts

@@ -59,7 +59,7 @@ export class IndexerClient extends IndexerBaseClient {
       startCursor,
       maxTimestampInclusive,
       limit,
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
       productIds,
       isolated,
     });
@@ -88,7 +88,7 @@ export class IndexerClient extends IndexerBaseClient {
         type: 'txs',
         value: limit,
       },
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
     });
 
     // Now aggregate results by the submission index, use map to maintain insertion order
@@ -159,7 +159,7 @@ export class IndexerClient extends IndexerBaseClient {
         type: 'txs',
         value: limit,
       },
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
       isolated,
     });
 
@@ -204,7 +204,7 @@ export class IndexerClient extends IndexerBaseClient {
     const baseResponse = await this.getOrders({
       startCursor,
       maxTimestampInclusive,
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
       limit,
       productIds,
       triggerTypes,
@@ -244,7 +244,7 @@ export class IndexerClient extends IndexerBaseClient {
         type: 'txs',
         value: limit,
       },
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
     });
 
     const events = baseResponse
@@ -298,7 +298,7 @@ export class IndexerClient extends IndexerBaseClient {
         type: 'txs',
         value: limit,
       },
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
     });
 
     // Now aggregate results by the submission index, use map to maintain insertion order

package/src/types/clientTypes.ts

@@ -315,7 +315,7 @@ export type GetIndexerEventsLimitType = 'events' | 'txs';
 export interface GetIndexerEventsParams {
   // Max submission index, inclusive
   startCursor?: string;
-  subaccount?: Subaccount;
+  subaccounts?: Subaccount[];
   productIds?: number[];
   // If not given, will return both isolated & non-iso events
   isolated?: boolean;
@@ -338,7 +338,7 @@ export type GetIndexerEventsResponse = IndexerEventWithTx[];
 export interface GetIndexerOrdersParams {
   // Max submission index, inclusive
   startCursor?: string;
-  subaccount?: Subaccount;
+  subaccounts?: Subaccount[];
   minTimestampInclusive?: number;
   maxTimestampInclusive?: number;
   limit?: number;
@@ -378,7 +378,7 @@ export type GetIndexerOrdersResponse = IndexerOrder[];
 
 export interface GetIndexerMatchEventsParams {
   // When not given, will return all maker events
-  subaccount?: Subaccount;
+  subaccounts?: Subaccount[];
   productIds?: number[];
   // If not given, will return both isolated & non-iso events
   isolated?: boolean;

package/src/types/serverTypes.ts

@@ -93,7 +93,7 @@ export interface IndexerServerMultiProductsParams {
 }
 
 export interface IndexerServerEventsParams {
-  subaccount?: string;
+  subaccounts?: string[];
   product_ids?: number[];
   // If not given, will return both isolated & non-iso events
   isolated?: boolean;
@@ -118,7 +118,7 @@ export type IndexerServerTriggerTypeFilter =
   | 'time_trigger';
 
 export interface IndexerServerOrdersParams {
-  subaccount?: string;
+  subaccounts?: string[];
   product_ids?: number[];
   trigger_types?: IndexerServerTriggerTypeFilter[];
   digests?: string[];
@@ -131,7 +131,7 @@ export interface IndexerServerOrdersParams {
 }
 
 export interface IndexerServerMatchEventsParams {
-  subaccount?: string;
+  subaccounts?: string[];
   product_ids?: number[];
   // If not given, will return both isolated & non-iso events
   isolated?: boolean;