@nadohq/indexer-client 0.1.0-alpha.4 → 0.1.0-alpha.40

package/dist/types/serverTypes.d.cts

@@ -54,7 +54,7 @@ interface IndexerServerMultiProductsParams {
     max_time: number[];
 }
 interface IndexerServerEventsParams {
-    subaccount?: string;
+    subaccounts?: string[];
     product_ids?: number[];
     isolated?: boolean;
     event_types?: IndexerEventType[];
@@ -67,9 +67,11 @@ interface IndexerServerEventsParams {
         txs: number;
     };
 }
+type IndexerServerTriggerTypeFilter = 'none' | 'price_trigger' | 'time_trigger';
 interface IndexerServerOrdersParams {
-    subaccount?: string;
+    subaccounts?: string[];
     product_ids?: number[];
+    trigger_types?: IndexerServerTriggerTypeFilter[];
     digests?: string[];
     max_time?: number;
     limit?: number;
@@ -77,7 +79,7 @@ interface IndexerServerOrdersParams {
     idx?: string;
 }
 interface IndexerServerMatchEventsParams {
-    subaccount?: string;
+    subaccounts?: string[];
     product_ids?: number[];
     isolated?: boolean;
     max_time?: number;
@@ -164,7 +166,7 @@ interface IndexerServerQueryRequestByType {
     products: IndexerServerProductsParams;
     referral_code: IndexerServerReferralCodeParams;
     subaccounts: IndexerServerListSubaccountsParams;
-    usdc_price: Record<string, never>;
+    quote_price: Record<string, never>;
     nlp_snapshots: IndexerServerNlpSnapshotsParams;
 }
 type IndexerServerQueryRequestType = keyof IndexerServerQueryRequestByType;
@@ -175,6 +177,8 @@ interface IndexerServerListSubaccountsResponse {
     subaccounts: {
         id: string;
         subaccount: string;
+        created_at: string;
+        isolated: boolean;
     }[];
 }
 interface IndexerServerMultiSubaccountSnapshotsResponse {
@@ -221,7 +225,7 @@ interface IndexerServerMatchEventsResponse {
     matches: IndexerServerMatchEvent[];
     txs: IndexerServerTx[];
 }
-interface IndexerServerUsdcPriceResponse {
+interface IndexerServerQuotePriceResponse {
     price_x18: string;
 }
 interface IndexerServerLinkedSignerResponse {
@@ -305,8 +309,29 @@ interface IndexerServerQueryResponseByType {
     products: IndexerServerProductsResponse;
     referral_code: IndexerServerReferralCodeResponse;
     subaccounts: IndexerServerListSubaccountsResponse;
-    usdc_price: IndexerServerUsdcPriceResponse;
+    quote_price: IndexerServerQuotePriceResponse;
     nlp_snapshots: IndexerServerNlpSnapshotsResponse;
 }
+/**
+ * V2 API Types
+ */
+/**
+ * Individual ticker data from v2 indexer endpoint (server format)
+ */
+interface IndexerServerV2TickerResponse {
+    product_id: number;
+    ticker_id: string;
+    base_currency: string;
+    quote_currency: string;
+    last_price: number;
+    base_volume: number;
+    quote_volume: number;
+    price_change_percent_24h: number;
+}
+/**
+ * Response from v2 tickers endpoint (server format)
+ * Maps ticker IDs to their respective ticker data
+ */
+type IndexerServerV2TickersResponse = Record<string, IndexerServerV2TickerResponse>;
 
-export type { IndexerEdgeServerCandlesticksParams, IndexerEdgeServerCandlesticksResponse, IndexerEdgeServerMarketSnapshotsParams, IndexerEdgeServerMarketSnapshotsResponse, IndexerServerBacklogResponse, IndexerServerCandlesticksParams, IndexerServerCandlesticksResponse, IndexerServerDDAQueryParams, IndexerServerDDAResponse, IndexerServerEventsParams, IndexerServerEventsResponse, IndexerServerFastWithdrawalSignatureParams, IndexerServerFastWithdrawalSignatureResponse, IndexerServerFundingRate, IndexerServerFundingRateParams, IndexerServerFundingRateResponse, IndexerServerFundingRatesParams, IndexerServerFundingRatesResponse, IndexerServerInterestFundingParams, IndexerServerInterestFundingResponse, IndexerServerLeaderboardContestsParams, IndexerServerLeaderboardContestsResponse, IndexerServerLeaderboardParams, IndexerServerLeaderboardRankParams, IndexerServerLeaderboardRankResponse, IndexerServerLeaderboardRegistrationParams, IndexerServerLeaderboardRegistrationResponse, IndexerServerLeaderboardResponse, IndexerServerLinkedSignerParams, IndexerServerLinkedSignerResponse, IndexerServerListSubaccountsParams, IndexerServerListSubaccountsResponse, IndexerServerMakerStatisticsParams, IndexerServerMakerStatisticsResponse, IndexerServerMarketSnapshotsParams, IndexerServerMarketSnapshotsResponse, IndexerServerMatchEventsParams, IndexerServerMatchEventsResponse, IndexerServerMultiProductsParams, IndexerServerMultiProductsResponse, IndexerServerMultiSubaccountSnapshotsParams, IndexerServerMultiSubaccountSnapshotsResponse, IndexerServerNlpSnapshotsParams, IndexerServerNlpSnapshotsResponse, IndexerServerOraclePricesParams, IndexerServerOraclePricesResponse, IndexerServerOrdersParams, IndexerServerOrdersResponse, IndexerServerPerpPrices, IndexerServerPerpPricesParams, IndexerServerPerpPricesResponse, IndexerServerPriceParams, IndexerServerPriceResponse, IndexerServerProductsParams, IndexerServerProductsResponse, IndexerServerQueryRequestByType, IndexerServerQueryRequestType, IndexerServerQueryResponseByType, IndexerServerReferralCodeParams, IndexerServerReferralCodeResponse, IndexerServerUsdcPriceResponse };
+export type { IndexerEdgeServerCandlesticksParams, IndexerEdgeServerCandlesticksResponse, IndexerEdgeServerMarketSnapshotsParams, IndexerEdgeServerMarketSnapshotsResponse, IndexerServerBacklogResponse, IndexerServerCandlesticksParams, IndexerServerCandlesticksResponse, IndexerServerDDAQueryParams, IndexerServerDDAResponse, IndexerServerEventsParams, IndexerServerEventsResponse, IndexerServerFastWithdrawalSignatureParams, IndexerServerFastWithdrawalSignatureResponse, IndexerServerFundingRate, IndexerServerFundingRateParams, IndexerServerFundingRateResponse, IndexerServerFundingRatesParams, IndexerServerFundingRatesResponse, IndexerServerInterestFundingParams, IndexerServerInterestFundingResponse, IndexerServerLeaderboardContestsParams, IndexerServerLeaderboardContestsResponse, IndexerServerLeaderboardParams, IndexerServerLeaderboardRankParams, IndexerServerLeaderboardRankResponse, IndexerServerLeaderboardRegistrationParams, IndexerServerLeaderboardRegistrationResponse, IndexerServerLeaderboardResponse, IndexerServerLinkedSignerParams, IndexerServerLinkedSignerResponse, IndexerServerListSubaccountsParams, IndexerServerListSubaccountsResponse, IndexerServerMakerStatisticsParams, IndexerServerMakerStatisticsResponse, IndexerServerMarketSnapshotsParams, IndexerServerMarketSnapshotsResponse, IndexerServerMatchEventsParams, IndexerServerMatchEventsResponse, IndexerServerMultiProductsParams, IndexerServerMultiProductsResponse, IndexerServerMultiSubaccountSnapshotsParams, IndexerServerMultiSubaccountSnapshotsResponse, IndexerServerNlpSnapshotsParams, IndexerServerNlpSnapshotsResponse, IndexerServerOraclePricesParams, IndexerServerOraclePricesResponse, IndexerServerOrdersParams, IndexerServerOrdersResponse, IndexerServerPerpPrices, IndexerServerPerpPricesParams, IndexerServerPerpPricesResponse, IndexerServerPriceParams, IndexerServerPriceResponse, IndexerServerProductsParams, IndexerServerProductsResponse, IndexerServerQueryRequestByType, IndexerServerQueryRequestType, IndexerServerQueryResponseByType, IndexerServerQuotePriceResponse, IndexerServerReferralCodeParams, IndexerServerReferralCodeResponse, IndexerServerTriggerTypeFilter, IndexerServerV2TickerResponse, IndexerServerV2TickersResponse };

package/dist/types/serverTypes.d.ts

@@ -54,7 +54,7 @@ interface IndexerServerMultiProductsParams {
     max_time: number[];
 }
 interface IndexerServerEventsParams {
-    subaccount?: string;
+    subaccounts?: string[];
     product_ids?: number[];
     isolated?: boolean;
     event_types?: IndexerEventType[];
@@ -67,9 +67,11 @@ interface IndexerServerEventsParams {
         txs: number;
     };
 }
+type IndexerServerTriggerTypeFilter = 'none' | 'price_trigger' | 'time_trigger';
 interface IndexerServerOrdersParams {
-    subaccount?: string;
+    subaccounts?: string[];
     product_ids?: number[];
+    trigger_types?: IndexerServerTriggerTypeFilter[];
     digests?: string[];
     max_time?: number;
     limit?: number;
@@ -77,7 +79,7 @@ interface IndexerServerOrdersParams {
     idx?: string;
 }
 interface IndexerServerMatchEventsParams {
-    subaccount?: string;
+    subaccounts?: string[];
     product_ids?: number[];
     isolated?: boolean;
     max_time?: number;
@@ -164,7 +166,7 @@ interface IndexerServerQueryRequestByType {
     products: IndexerServerProductsParams;
     referral_code: IndexerServerReferralCodeParams;
     subaccounts: IndexerServerListSubaccountsParams;
-    usdc_price: Record<string, never>;
+    quote_price: Record<string, never>;
     nlp_snapshots: IndexerServerNlpSnapshotsParams;
 }
 type IndexerServerQueryRequestType = keyof IndexerServerQueryRequestByType;
@@ -175,6 +177,8 @@ interface IndexerServerListSubaccountsResponse {
     subaccounts: {
         id: string;
         subaccount: string;
+        created_at: string;
+        isolated: boolean;
     }[];
 }
 interface IndexerServerMultiSubaccountSnapshotsResponse {
@@ -221,7 +225,7 @@ interface IndexerServerMatchEventsResponse {
     matches: IndexerServerMatchEvent[];
     txs: IndexerServerTx[];
 }
-interface IndexerServerUsdcPriceResponse {
+interface IndexerServerQuotePriceResponse {
     price_x18: string;
 }
 interface IndexerServerLinkedSignerResponse {
@@ -305,8 +309,29 @@ interface IndexerServerQueryResponseByType {
     products: IndexerServerProductsResponse;
     referral_code: IndexerServerReferralCodeResponse;
     subaccounts: IndexerServerListSubaccountsResponse;
-    usdc_price: IndexerServerUsdcPriceResponse;
+    quote_price: IndexerServerQuotePriceResponse;
     nlp_snapshots: IndexerServerNlpSnapshotsResponse;
 }
+/**
+ * V2 API Types
+ */
+/**
+ * Individual ticker data from v2 indexer endpoint (server format)
+ */
+interface IndexerServerV2TickerResponse {
+    product_id: number;
+    ticker_id: string;
+    base_currency: string;
+    quote_currency: string;
+    last_price: number;
+    base_volume: number;
+    quote_volume: number;
+    price_change_percent_24h: number;
+}
+/**
+ * Response from v2 tickers endpoint (server format)
+ * Maps ticker IDs to their respective ticker data
+ */
+type IndexerServerV2TickersResponse = Record<string, IndexerServerV2TickerResponse>;
 
-export type { IndexerEdgeServerCandlesticksParams, IndexerEdgeServerCandlesticksResponse, IndexerEdgeServerMarketSnapshotsParams, IndexerEdgeServerMarketSnapshotsResponse, IndexerServerBacklogResponse, IndexerServerCandlesticksParams, IndexerServerCandlesticksResponse, IndexerServerDDAQueryParams, IndexerServerDDAResponse, IndexerServerEventsParams, IndexerServerEventsResponse, IndexerServerFastWithdrawalSignatureParams, IndexerServerFastWithdrawalSignatureResponse, IndexerServerFundingRate, IndexerServerFundingRateParams, IndexerServerFundingRateResponse, IndexerServerFundingRatesParams, IndexerServerFundingRatesResponse, IndexerServerInterestFundingParams, IndexerServerInterestFundingResponse, IndexerServerLeaderboardContestsParams, IndexerServerLeaderboardContestsResponse, IndexerServerLeaderboardParams, IndexerServerLeaderboardRankParams, IndexerServerLeaderboardRankResponse, IndexerServerLeaderboardRegistrationParams, IndexerServerLeaderboardRegistrationResponse, IndexerServerLeaderboardResponse, IndexerServerLinkedSignerParams, IndexerServerLinkedSignerResponse, IndexerServerListSubaccountsParams, IndexerServerListSubaccountsResponse, IndexerServerMakerStatisticsParams, IndexerServerMakerStatisticsResponse, IndexerServerMarketSnapshotsParams, IndexerServerMarketSnapshotsResponse, IndexerServerMatchEventsParams, IndexerServerMatchEventsResponse, IndexerServerMultiProductsParams, IndexerServerMultiProductsResponse, IndexerServerMultiSubaccountSnapshotsParams, IndexerServerMultiSubaccountSnapshotsResponse, IndexerServerNlpSnapshotsParams, IndexerServerNlpSnapshotsResponse, IndexerServerOraclePricesParams, IndexerServerOraclePricesResponse, IndexerServerOrdersParams, IndexerServerOrdersResponse, IndexerServerPerpPrices, IndexerServerPerpPricesParams, IndexerServerPerpPricesResponse, IndexerServerPriceParams, IndexerServerPriceResponse, IndexerServerProductsParams, IndexerServerProductsResponse, IndexerServerQueryRequestByType, IndexerServerQueryRequestType, IndexerServerQueryResponseByType, IndexerServerReferralCodeParams, IndexerServerReferralCodeResponse, IndexerServerUsdcPriceResponse };
+export type { IndexerEdgeServerCandlesticksParams, IndexerEdgeServerCandlesticksResponse, IndexerEdgeServerMarketSnapshotsParams, IndexerEdgeServerMarketSnapshotsResponse, IndexerServerBacklogResponse, IndexerServerCandlesticksParams, IndexerServerCandlesticksResponse, IndexerServerDDAQueryParams, IndexerServerDDAResponse, IndexerServerEventsParams, IndexerServerEventsResponse, IndexerServerFastWithdrawalSignatureParams, IndexerServerFastWithdrawalSignatureResponse, IndexerServerFundingRate, IndexerServerFundingRateParams, IndexerServerFundingRateResponse, IndexerServerFundingRatesParams, IndexerServerFundingRatesResponse, IndexerServerInterestFundingParams, IndexerServerInterestFundingResponse, IndexerServerLeaderboardContestsParams, IndexerServerLeaderboardContestsResponse, IndexerServerLeaderboardParams, IndexerServerLeaderboardRankParams, IndexerServerLeaderboardRankResponse, IndexerServerLeaderboardRegistrationParams, IndexerServerLeaderboardRegistrationResponse, IndexerServerLeaderboardResponse, IndexerServerLinkedSignerParams, IndexerServerLinkedSignerResponse, IndexerServerListSubaccountsParams, IndexerServerListSubaccountsResponse, IndexerServerMakerStatisticsParams, IndexerServerMakerStatisticsResponse, IndexerServerMarketSnapshotsParams, IndexerServerMarketSnapshotsResponse, IndexerServerMatchEventsParams, IndexerServerMatchEventsResponse, IndexerServerMultiProductsParams, IndexerServerMultiProductsResponse, IndexerServerMultiSubaccountSnapshotsParams, IndexerServerMultiSubaccountSnapshotsResponse, IndexerServerNlpSnapshotsParams, IndexerServerNlpSnapshotsResponse, IndexerServerOraclePricesParams, IndexerServerOraclePricesResponse, IndexerServerOrdersParams, IndexerServerOrdersResponse, IndexerServerPerpPrices, IndexerServerPerpPricesParams, IndexerServerPerpPricesResponse, IndexerServerPriceParams, IndexerServerPriceResponse, IndexerServerProductsParams, IndexerServerProductsResponse, IndexerServerQueryRequestByType, IndexerServerQueryRequestType, IndexerServerQueryResponseByType, IndexerServerQuotePriceResponse, IndexerServerReferralCodeParams, IndexerServerReferralCodeResponse, IndexerServerTriggerTypeFilter, IndexerServerV2TickerResponse, IndexerServerV2TickersResponse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nadohq/indexer-client",
-  "version": "0.1.0-alpha.4",
+  "version": "0.1.0-alpha.40",
   "type": "module",
   "sideEffects": false,
   "description": "> TODO: description",
@@ -36,9 +36,13 @@
       }
     }
   },
+  "react-native": "./dist/index.js",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "dependencies": {
-    "@nadohq/engine-client": "^0.1.0-alpha.4",
-    "@nadohq/shared": "^0.1.0-alpha.4",
+    "@nadohq/engine-client": "^0.1.0-alpha.40",
+    "@nadohq/shared": "^0.1.0-alpha.40",
     "axios": "*",
     "ts-mixer": "*"
   },
@@ -48,5 +52,5 @@
   "devDependencies": {
     "viem": "*"
   },
-  "gitHead": "b852ce36b851303225d3f4b81739ac667c64cf8c"
+  "gitHead": "5dad68b2e53c49a0cfc95a1d8c6abfc1ee2a6f3b"
 }

package/src/IndexerBaseClient.ts

@@ -4,6 +4,7 @@ import {
   getDefaultRecvTime,
   getNadoEIP712Values,
   getSignedTransactionRequest,
+  getValidatedAddress,
   getValidatedHex,
   mapValues,
   nowInSeconds,
@@ -36,6 +37,7 @@ import {
   mapIndexerPerpPrices,
   mapIndexerProductPayment,
   mapIndexerServerProduct,
+  mapIndexerV2Ticker,
   mapSnapshotsIntervalToServerParams,
 } from './dataMappers';
 import {
@@ -93,6 +95,8 @@ import {
   GetIndexerReferralCodeResponse,
   GetIndexerSubaccountDDAParams,
   GetIndexerSubaccountDDAResponse,
+  GetIndexerV2TickersParams,
+  GetIndexerV2TickersResponse,
   IndexerEventWithTx,
   IndexerMatchEvent,
   IndexerOraclePrice,
@@ -100,6 +104,7 @@ import {
   IndexerServerQueryRequestByType,
   IndexerServerQueryRequestType,
   IndexerServerQueryResponseByType,
+  IndexerServerV2TickersResponse,
   IndexerSnapshotBalance,
   IndexerSubaccountSnapshot,
   ListIndexerSubaccountsParams,
@@ -150,6 +155,8 @@ export class IndexerBaseClient {
       const subaccount = subaccountFromHex(item.subaccount);
       return {
         hexId: item.subaccount,
+        createdAt: Number(item.created_at),
+        isolated: item.isolated,
         ...subaccount,
       };
     });
@@ -402,12 +409,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,
@@ -437,13 +444,14 @@ 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,
       digests: params.digests,
       max_time: params.maxTimestampInclusive,
@@ -464,12 +472,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,
@@ -513,6 +521,7 @@ export class IndexerBaseClient {
         preBalances: mapIndexerMatchEventBalances(matchEvent.pre_balance),
         postBalances,
         tx,
+        isTaker: matchEvent.is_taker,
         ...subaccountFromHex(matchEvent.order.sender),
       };
     });
@@ -552,10 +561,10 @@ export class IndexerBaseClient {
   }
 
   /**
-   * Gets quote (USDC) price in terms of USD
+   * Gets quote (USDT) price in terms of USD
    */
   async getQuotePrice(): Promise<GetIndexerQuotePriceResponse> {
-    const baseResponse = await this.query('usdc_price', {});
+    const baseResponse = await this.query('quote_price', {});
     return {
       price: removeDecimals(baseResponse.price_x18),
     };
@@ -797,14 +806,11 @@ export class IndexerBaseClient {
     params: GetIndexerSubaccountDDAParams,
   ): Promise<GetIndexerSubaccountDDAResponse> {
     const baseResponse = await this.query('direct_deposit_address', {
-      subaccount: subaccountToHex({
-        subaccountOwner: params.subaccountOwner,
-        subaccountName: params.subaccountName,
-      }),
+      subaccount: subaccountToHex(params.subaccount),
     });
 
     return {
-      address: baseResponse.v1_address,
+      address: getValidatedAddress(baseResponse.v1_address),
     };
   }
 
@@ -825,6 +831,24 @@ export class IndexerBaseClient {
     };
   }
 
+  /**
+   * Get tickers from the v2 indexer endpoint
+   * @param params
+   */
+  async getV2Tickers(
+    params: GetIndexerV2TickersParams,
+  ): Promise<GetIndexerV2TickersResponse> {
+    const response =
+      await this.axiosInstance.get<IndexerServerV2TickersResponse>(
+        `${this.v2Url}/tickers`,
+        { params },
+      );
+
+    this.checkResponseStatus(response);
+
+    return mapValues(response.data, mapIndexerV2Ticker);
+  }
+
   protected async query<TRequestType extends IndexerServerQueryRequestType>(
     requestType: TRequestType,
     params: IndexerServerQueryRequestByType[TRequestType],

package/src/IndexerClient.ts

@@ -1,10 +1,11 @@
 import {
+  NLP_PRODUCT_ID,
   ProductEngineType,
   QUOTE_PRODUCT_ID,
   subaccountFromHex,
-  NLP_PRODUCT_ID,
+  toBigDecimal,
+  toIntegerString,
 } from '@nadohq/shared';
-import { toBigDecimal, toIntegerString } from '@nadohq/shared';
 
 import { IndexerBaseClient } from './IndexerBaseClient';
 import {
@@ -22,17 +23,17 @@ import {
   GetIndexerSubaccountLiquidationEventsResponse,
   GetIndexerSubaccountMatchEventParams,
   GetIndexerSubaccountMatchEventsResponse,
-  GetIndexerSubaccountSettlementEventsParams,
-  GetIndexerSubaccountSettlementEventsResponse,
   GetIndexerSubaccountNlpEventsParams,
   GetIndexerSubaccountNlpEventsResponse,
+  GetIndexerSubaccountSettlementEventsParams,
+  GetIndexerSubaccountSettlementEventsResponse,
   IndexerCollateralEvent,
   IndexerEventPerpStateSnapshot,
   IndexerEventSpotStateSnapshot,
   IndexerEventWithTx,
   IndexerLiquidationEvent,
-  IndexerSettlementEvent,
   IndexerNlpEvent,
+  IndexerSettlementEvent,
   PaginatedIndexerEventsResponse,
 } from './types';
 
@@ -58,7 +59,7 @@ export class IndexerClient extends IndexerBaseClient {
       startCursor,
       maxTimestampInclusive,
       limit,
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
       productIds,
       isolated,
     });
@@ -87,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
@@ -158,7 +159,7 @@ export class IndexerClient extends IndexerBaseClient {
         type: 'txs',
         value: limit,
       },
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
       isolated,
     });
 
@@ -195,6 +196,7 @@ export class IndexerClient extends IndexerBaseClient {
       subaccountName,
       subaccountOwner,
       productIds,
+      triggerTypes,
       isolated,
     } = params;
 
@@ -202,9 +204,10 @@ export class IndexerClient extends IndexerBaseClient {
     const baseResponse = await this.getOrders({
       startCursor,
       maxTimestampInclusive,
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
       limit,
       productIds,
+      triggerTypes,
       isolated,
     });
 
@@ -241,7 +244,7 @@ export class IndexerClient extends IndexerBaseClient {
         type: 'txs',
         value: limit,
       },
-      subaccount: { subaccountName, subaccountOwner },
+      subaccounts: [{ subaccountName, subaccountOwner }],
     });
 
     const events = baseResponse
@@ -295,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/dataMappers.ts

@@ -1,21 +1,19 @@
-import {
-  getRecvTimeFromOrderNonce,
-  Market,
-  PerpMarket,
-  ProductEngineType,
-  SpotMarket,
-  subaccountFromHex,
-  unpackOrderAppendix,
-} from '@nadohq/shared';
 import {
   mapEngineServerPerpProduct,
   mapEngineServerSpotProduct,
 } from '@nadohq/engine-client';
 import {
+  getRecvTimeFromOrderNonce,
   mapValues,
+  Market,
+  PerpMarket,
+  ProductEngineType,
   removeDecimals,
+  SpotMarket,
+  subaccountFromHex,
   toBigDecimal,
   toIntegerString,
+  unpackOrderAppendix,
 } from '@nadohq/shared';
 import {
   Candlestick,
@@ -50,8 +48,10 @@ import {
   IndexerServerProductPayment,
   IndexerServerSnapshotsInterval,
   IndexerServerTx,
+  IndexerServerV2TickerResponse,
   IndexerSnapshotsIntervalParams,
   IndexerSpotBalance,
+  IndexerV2TickerResponse,
 } from './types';
 
 export function mapSnapshotsIntervalToServerParams(
@@ -96,7 +96,6 @@ export function mapIndexerOrder(order: IndexerServerOrder): IndexerOrder {
   return {
     amount: toBigDecimal(order.amount),
     digest: order.digest,
-    isolated: order.isolated,
     expiration: Number(order.expiration),
     appendix,
     nonce: toBigDecimal(order.nonce),
@@ -153,6 +152,7 @@ export function mapIndexerEvent(event: IndexerServerEvent): IndexerEvent {
       netFundingUnrealized: toBigDecimal(event.net_funding_unrealized),
       netInterestCumulative: toBigDecimal(event.net_interest_cumulative),
       netInterestUnrealized: toBigDecimal(event.net_interest_unrealized),
+      quoteVolumeCumulative: toBigDecimal(event.quote_volume_cumulative),
     },
   };
 }
@@ -347,8 +347,8 @@ export function mapIndexerNlpSnapshot(
   return {
     submissionIndex: snapshot.submission_idx,
     timestamp: toBigDecimal(snapshot.timestamp),
-    cumulativeBurnAmountUsdc: toBigDecimal(snapshot.cumulative_burn_usdc),
-    cumulativeMintAmountUsdc: toBigDecimal(snapshot.cumulative_mint_usdc),
+    cumulativeBurnAmountQuote: toBigDecimal(snapshot.cumulative_burn_quote),
+    cumulativeMintAmountQuote: toBigDecimal(snapshot.cumulative_mint_quote),
     cumulativePnl: toBigDecimal(snapshot.cumulative_pnl),
     cumulativeTrades: toBigDecimal(snapshot.cumulative_trades),
     cumulativeVolume: toBigDecimal(snapshot.cumulative_volume),
@@ -357,3 +357,18 @@ export function mapIndexerNlpSnapshot(
     tvl: toBigDecimal(snapshot.tvl),
   };
 }
+
+export function mapIndexerV2Ticker(
+  ticker: IndexerServerV2TickerResponse,
+): IndexerV2TickerResponse {
+  return {
+    productId: ticker.product_id,
+    tickerId: ticker.ticker_id,
+    baseCurrency: ticker.base_currency,
+    quoteCurrency: ticker.quote_currency,
+    lastPrice: ticker.last_price,
+    baseVolume: ticker.base_volume,
+    quoteVolume: ticker.quote_volume,
+    priceChangePercent24h: ticker.price_change_percent_24h,
+  };
+}

package/src/endpoints.ts

@@ -2,6 +2,6 @@ import { ChainEnv } from '@nadohq/shared';
 
 export const INDEXER_CLIENT_ENDPOINTS: Record<ChainEnv, string> = {
   local: 'http://localhost:8000/indexer',
-  arbitrum: 'https://archive.prod.vertexprotocol.com/v1',
-  inkTestnet: 'https://archive.test.nado-backend.xyz/v1',
+  inkTestnet: 'https://archive.test.nado.xyz/v1',
+  inkMainnet: 'https://archive.prod.nado.xyz/v1',
 };

package/src/index.ts

@@ -1,4 +1,5 @@
-export * from './types';
-export * from './IndexerClient';
 export * from './endpoints';
+export * from './IndexerBaseClient';
+export * from './IndexerClient';
+export * from './types';
 export * from './utils';