@nadohq/indexer-client 0.1.0-alpha.3 → 0.1.0-alpha.5

package/src/IndexerBaseClient.ts

@@ -4,23 +4,21 @@ import {
   getDefaultRecvTime,
   getNadoEIP712Values,
   getSignedTransactionRequest,
+  getValidatedHex,
+  mapValues,
+  nowInSeconds,
+  removeDecimals,
   SignableRequestType,
   SignableRequestTypeToParams,
   SignedTx,
   subaccountFromHex,
   subaccountToHex,
-  WalletClientWithAccount,
-} from '@nadohq/contracts';
-import {
-  getValidatedHex,
-  mapValues,
-  nowInSeconds,
-  removeDecimals,
   toBigDecimal,
   toBigInt,
   toIntegerString,
+  WalletClientWithAccount,
   WalletNotProvidedError,
-} from '@nadohq/utils';
+} from '@nadohq/shared';
 import axios, { AxiosInstance, AxiosResponse } from 'axios';
 import {
   mapIndexerCandlesticks,
@@ -33,11 +31,11 @@ import {
   mapIndexerMakerStatistics,
   mapIndexerMarketSnapshot,
   mapIndexerMatchEventBalances,
+  mapIndexerNlpSnapshot,
   mapIndexerOrder,
   mapIndexerPerpPrices,
   mapIndexerProductPayment,
   mapIndexerServerProduct,
-  mapIndexerNlpSnapshot,
   mapSnapshotsIntervalToServerParams,
 } from './dataMappers';
 import {
@@ -80,6 +78,8 @@ import {
   GetIndexerMultiProductSnapshotsResponse,
   GetIndexerMultiSubaccountSnapshotsParams,
   GetIndexerMultiSubaccountSnapshotsResponse,
+  GetIndexerNlpSnapshotsParams,
+  GetIndexerNlpSnapshotsResponse,
   GetIndexerOraclePricesParams,
   GetIndexerOraclePricesResponse,
   GetIndexerOrdersParams,
@@ -91,8 +91,8 @@ import {
   GetIndexerQuotePriceResponse,
   GetIndexerReferralCodeParams,
   GetIndexerReferralCodeResponse,
-  GetIndexerNlpSnapshotsParams,
-  GetIndexerNlpSnapshotsResponse,
+  GetIndexerSubaccountDDAParams,
+  GetIndexerSubaccountDDAResponse,
   IndexerEventWithTx,
   IndexerMatchEvent,
   IndexerOraclePrice,
@@ -104,10 +104,8 @@ import {
   IndexerSubaccountSnapshot,
   ListIndexerSubaccountsParams,
   ListIndexerSubaccountsResponse,
-  GetIndexerSubaccountDDAParams,
   UpdateIndexerLeaderboardRegistrationParams,
   UpdateIndexerLeaderboardRegistrationResponse,
-  GetIndexerSubaccountDDAResponse,
 } from './types';
 
 export interface IndexerClientOpts {
@@ -132,6 +130,8 @@ export class IndexerBaseClient {
     this.opts = opts;
     this.axiosInstance = axios.create({
       withCredentials: true,
+      // We have custom logic to validate response status and create an appropriate error
+      validateStatus: () => true,
     });
     this.v2Url = opts.v2Url ? opts.v2Url : opts.url.replace('v1', 'v2');
   }
@@ -797,10 +797,7 @@ 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 {

package/src/IndexerClient.ts

@@ -3,8 +3,8 @@ import {
   QUOTE_PRODUCT_ID,
   subaccountFromHex,
   NLP_PRODUCT_ID,
-} from '@nadohq/contracts';
-import { toBigDecimal, toIntegerString } from '@nadohq/utils';
+} from '@nadohq/shared';
+import { toBigDecimal, toIntegerString } from '@nadohq/shared';
 
 import { IndexerBaseClient } from './IndexerBaseClient';
 import {

package/src/dataMappers.ts

@@ -1,22 +1,20 @@
-import {
-  getRecvTimeFromOrderNonce,
-  Market,
-  parseRawExpirationTimestamp,
-  PerpMarket,
-  ProductEngineType,
-  SpotMarket,
-  subaccountFromHex,
-} from '@nadohq/contracts';
 import {
   mapEngineServerPerpProduct,
   mapEngineServerSpotProduct,
 } from '@nadohq/engine-client';
 import {
+  getRecvTimeFromOrderNonce,
   mapValues,
+  Market,
+  PerpMarket,
+  ProductEngineType,
   removeDecimals,
+  SpotMarket,
+  subaccountFromHex,
   toBigDecimal,
   toIntegerString,
-} from '@nadohq/utils';
+  unpackOrderAppendix,
+} from '@nadohq/shared';
 import {
   Candlestick,
   IndexerEvent,
@@ -28,6 +26,7 @@ import {
   IndexerMaker,
   IndexerMarketSnapshot,
   IndexerMatchEventBalances,
+  IndexerNlpSnapshot,
   IndexerOrder,
   IndexerPerpBalance,
   IndexerPerpPrices,
@@ -42,16 +41,15 @@ import {
   IndexerServerMaker,
   IndexerServerMarketSnapshot,
   IndexerServerMatchEventBalances,
+  IndexerServerNlpSnapshot,
   IndexerServerOrder,
   IndexerServerPerpPrices,
   IndexerServerProduct,
   IndexerServerProductPayment,
   IndexerServerSnapshotsInterval,
   IndexerServerTx,
-  IndexerServerNlpSnapshot,
   IndexerSnapshotsIntervalParams,
   IndexerSpotBalance,
-  IndexerNlpSnapshot,
 } from './types';
 
 export function mapSnapshotsIntervalToServerParams(
@@ -92,16 +90,13 @@ export function mapIndexerServerBalance(
 }
 
 export function mapIndexerOrder(order: IndexerServerOrder): IndexerOrder {
-  const expiration = toBigDecimal(order.expiration);
-  const expirationEncodedData = parseRawExpirationTimestamp(order.expiration);
+  const appendix = unpackOrderAppendix(order.appendix);
   return {
     amount: toBigDecimal(order.amount),
     digest: order.digest,
     isolated: order.isolated,
-    rawExpiration: expiration,
-    isReduceOnly: expirationEncodedData.reduceOnly,
-    expiration: expirationEncodedData.expirationTime,
-    orderType: expirationEncodedData.type,
+    expiration: Number(order.expiration),
+    appendix,
     nonce: toBigDecimal(order.nonce),
     recvTimeSeconds: getRecvTimeFromOrderNonce(order.nonce) / 1000,
     price: removeDecimals(order.price_x18),

package/src/endpoints.ts

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

package/src/types/clientTypes.ts

@@ -1,24 +1,24 @@
 import {
+  BigDecimal,
   EIP712OrderValues,
   Market,
-  OrderExpirationType,
+  OrderAppendix,
   PerpBalance,
   PerpMarket,
   ProductEngineType,
   SpotBalance,
   SpotMarket,
   Subaccount,
-} from '@nadohq/contracts';
-import { BigDecimal } from '@nadohq/utils';
+} from '@nadohq/shared';
 import { Hex } from 'viem';
 import { CandlestickPeriod } from './CandlestickPeriod';
 import { IndexerEventType } from './IndexerEventType';
 import { IndexerLeaderboardRankType } from './IndexerLeaderboardType';
+import { NadoTx, NadoWithdrawCollateralTx } from './NadoTx';
 import {
   IndexerServerFastWithdrawalSignatureParams,
   IndexerServerListSubaccountsParams,
 } from './serverTypes';
-import { NadoTx, NadoWithdrawCollateralTx } from './NadoTx';
 
 /**
  * Base types
@@ -354,11 +354,9 @@ export interface IndexerOrder {
   submissionIndex: string;
   amount: BigDecimal;
   price: BigDecimal;
-  // This includes the order type
-  rawExpiration: BigDecimal;
-  isReduceOnly: boolean;
-  orderType: OrderExpirationType;
   expiration: number;
+  // Order metadata from appendix
+  appendix: OrderAppendix;
   nonce: BigDecimal;
   // Derived from the nonce
   recvTimeSeconds: number;
@@ -678,7 +676,9 @@ export interface GetIndexerBacklogResponse {
   txsPerSecond: BigDecimal | null;
 }
 
-export type GetIndexerSubaccountDDAParams = Subaccount;
+export interface GetIndexerSubaccountDDAParams {
+  subaccount: Subaccount;
+}
 
 export interface GetIndexerSubaccountDDAResponse {
   address: string;

package/src/types/paginatedEventsTypes.ts

@@ -1,5 +1,4 @@
-import { Subaccount } from '@nadohq/contracts';
-import { BigDecimal } from '@nadohq/utils';
+import { BigDecimal, Subaccount } from '@nadohq/shared';
 import {
   GetIndexerInterestFundingPaymentsParams,
   GetIndexerInterestFundingPaymentsResponse,

package/src/types/serverModelTypes.ts

@@ -1,4 +1,4 @@
-import { EIP712OrderValues } from '@nadohq/contracts';
+import { EIP712OrderValues } from '@nadohq/shared';
 import {
   EngineServerPerpBalance,
   EngineServerPerpProduct,
@@ -99,6 +99,7 @@ export interface IndexerServerOrder {
   amount: string;
   price_x18: string;
   expiration: string;
+  appendix: string;
   nonce: string;
   base_filled: string;
   // Includes fee

package/src/types/serverTypes.ts

@@ -1,7 +1,7 @@
 import {
   EIP712LeaderboardAuthenticationValues,
   SignedTx,
-} from '@nadohq/contracts';
+} from '@nadohq/shared';
 import { IndexerEventType } from './IndexerEventType';
 import { IndexerLeaderboardRankType } from './IndexerLeaderboardType';
 import { NadoWithdrawCollateralTx } from './NadoTx';

package/src/utils/indexerBalanceValue.ts

@@ -1,4 +1,4 @@
-import { BigDecimal } from '@nadohq/utils';
+import { BigDecimal } from '@nadohq/shared';
 import { IndexerPerpBalance, IndexerSpotBalance } from '../types';
 
 /**