@nadohq/trigger-client 0.1.0-alpha.2 → 0.1.0-alpha.20

package/dist/types/serverQueryTypes.d.cts

@@ -1,26 +1,45 @@
-import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/contracts';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
+import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes.cjs';
+import './serverModelTypes.cjs';
 
-type TriggerServerOrderStatus = 'pending' | {
-    triggered: EngineServerExecuteResult;
+type TriggerServerOrderStatus = {
+    cancelled: TriggerServerCancelReason;
 } | {
-    cancelled: string;
+    triggered: EngineServerExecuteResult;
 } | {
     internal_error: string;
+} | 'triggering' | 'waiting_price' | 'waiting_dependency' | {
+    twap_executing: {
+        current_execution: number;
+        total_executions: number;
+    };
+} | {
+    twap_completed: {
+        executed: number;
+        total: number;
+    };
 };
 /**
  * Request types
  */
+type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';
+type TriggerServerStatusTypeFilter = 'cancelled' | 'triggered' | 'internal_error' | 'triggering' | 'waiting_price' | 'waiting_dependency' | 'twap_executing' | 'twap_completed';
 interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
-    pending: boolean;
-    product_id?: number;
+    product_ids?: number[];
     max_update_time?: number;
     digests?: string[];
     limit?: number;
+    trigger_types?: TriggerServerTriggerTypeFilter[];
+    status_types?: TriggerServerStatusTypeFilter[];
+    reduce_only?: boolean;
+}
+interface TriggerServerListTwapExecutionsParams {
+    digest: string;
 }
 interface TriggerServerQueryRequestByType {
     list_trigger_orders: TriggerServerListTriggerOrdersParams;
+    list_twap_executions: TriggerServerListTwapExecutionsParams;
 }
 type TriggerServerQueryRequestType = keyof TriggerServerQueryRequestByType;
 /**
@@ -33,12 +52,34 @@ interface TriggerServerOrderInfo {
     order: TriggerServerOrder;
     status: TriggerServerOrderStatus;
     updated_at: number;
+    placed_at: number;
 }
 interface TriggerServerListTriggerOrdersResponse {
     orders: TriggerServerOrderInfo[];
 }
+type TriggerServerCancelReason = 'user_requested' | 'linked_signer_changed' | 'expired' | 'account_health' | 'isolated_subaccount_closed' | 'dependent_order_cancelled';
+type TriggerServerTwapExecutionStatus = 'pending' | {
+    executed: {
+        executed_time: number;
+        execute_response: EngineServerExecuteResult;
+    };
+} | {
+    failed: string;
+} | {
+    cancelled: TriggerServerCancelReason;
+};
+interface TriggerServerTwapExecutionInfo {
+    execution_id: number;
+    scheduled_time: number;
+    status: TriggerServerTwapExecutionStatus;
+    updated_at: number;
+}
+interface TriggerServerTwapExecutionsResponse {
+    executions: TriggerServerTwapExecutionInfo[];
+}
 interface TriggerServerQueryResponseByType {
     list_trigger_orders: TriggerServerListTriggerOrdersResponse;
+    list_twap_executions: TriggerServerTwapExecutionsResponse;
 }
 interface TriggerServerQuerySuccessResponse<TQueryType extends keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType> {
     status: 'success';
@@ -51,4 +92,4 @@ interface TriggerServerQueryFailureResponse {
 }
 type TriggerServerQueryResponse<TQueryType extends keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType> = TriggerServerQuerySuccessResponse<TQueryType> | TriggerServerQueryFailureResponse;
 
-export type { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse };
+export type { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerStatusTypeFilter, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse };

package/dist/types/serverQueryTypes.d.ts

@@ -1,26 +1,45 @@
-import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/contracts';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
+import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes.js';
+import './serverModelTypes.js';
 
-type TriggerServerOrderStatus = 'pending' | {
-    triggered: EngineServerExecuteResult;
+type TriggerServerOrderStatus = {
+    cancelled: TriggerServerCancelReason;
 } | {
-    cancelled: string;
+    triggered: EngineServerExecuteResult;
 } | {
     internal_error: string;
+} | 'triggering' | 'waiting_price' | 'waiting_dependency' | {
+    twap_executing: {
+        current_execution: number;
+        total_executions: number;
+    };
+} | {
+    twap_completed: {
+        executed: number;
+        total: number;
+    };
 };
 /**
  * Request types
  */
+type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';
+type TriggerServerStatusTypeFilter = 'cancelled' | 'triggered' | 'internal_error' | 'triggering' | 'waiting_price' | 'waiting_dependency' | 'twap_executing' | 'twap_completed';
 interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
-    pending: boolean;
-    product_id?: number;
+    product_ids?: number[];
     max_update_time?: number;
     digests?: string[];
     limit?: number;
+    trigger_types?: TriggerServerTriggerTypeFilter[];
+    status_types?: TriggerServerStatusTypeFilter[];
+    reduce_only?: boolean;
+}
+interface TriggerServerListTwapExecutionsParams {
+    digest: string;
 }
 interface TriggerServerQueryRequestByType {
     list_trigger_orders: TriggerServerListTriggerOrdersParams;
+    list_twap_executions: TriggerServerListTwapExecutionsParams;
 }
 type TriggerServerQueryRequestType = keyof TriggerServerQueryRequestByType;
 /**
@@ -33,12 +52,34 @@ interface TriggerServerOrderInfo {
     order: TriggerServerOrder;
     status: TriggerServerOrderStatus;
     updated_at: number;
+    placed_at: number;
 }
 interface TriggerServerListTriggerOrdersResponse {
     orders: TriggerServerOrderInfo[];
 }
+type TriggerServerCancelReason = 'user_requested' | 'linked_signer_changed' | 'expired' | 'account_health' | 'isolated_subaccount_closed' | 'dependent_order_cancelled';
+type TriggerServerTwapExecutionStatus = 'pending' | {
+    executed: {
+        executed_time: number;
+        execute_response: EngineServerExecuteResult;
+    };
+} | {
+    failed: string;
+} | {
+    cancelled: TriggerServerCancelReason;
+};
+interface TriggerServerTwapExecutionInfo {
+    execution_id: number;
+    scheduled_time: number;
+    status: TriggerServerTwapExecutionStatus;
+    updated_at: number;
+}
+interface TriggerServerTwapExecutionsResponse {
+    executions: TriggerServerTwapExecutionInfo[];
+}
 interface TriggerServerQueryResponseByType {
     list_trigger_orders: TriggerServerListTriggerOrdersResponse;
+    list_twap_executions: TriggerServerTwapExecutionsResponse;
 }
 interface TriggerServerQuerySuccessResponse<TQueryType extends keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType> {
     status: 'success';
@@ -51,4 +92,4 @@ interface TriggerServerQueryFailureResponse {
 }
 type TriggerServerQueryResponse<TQueryType extends keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType> = TriggerServerQuerySuccessResponse<TQueryType> | TriggerServerQueryFailureResponse;
 
-export type { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse };
+export type { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerStatusTypeFilter, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nadohq/trigger-client",
-  "version": "0.1.0-alpha.2",
+  "version": "0.1.0-alpha.20",
   "type": "module",
   "sideEffects": false,
   "description": "> TODO: description",
@@ -37,9 +37,8 @@
     }
   },
   "dependencies": {
-    "@nadohq/contracts": "^0.1.0-alpha.2",
-    "@nadohq/engine-client": "^0.1.0-alpha.2",
-    "@nadohq/utils": "^0.1.0-alpha.2",
+    "@nadohq/engine-client": "^0.1.0-alpha.20",
+    "@nadohq/shared": "^0.1.0-alpha.20",
     "axios": "*",
     "ts-mixer": "*"
   },
@@ -49,5 +48,5 @@
   "devDependencies": {
     "viem": "*"
   },
-  "gitHead": "7ec8ff9383dc6734bb64511b87b0687438d01618"
+  "gitHead": "59a3e0df21791fd31860080fc9fa920129e4170d"
 }

package/src/TriggerClient.ts

@@ -7,19 +7,25 @@ import {
   getNadoEIP712Values,
   getOrderNonce,
   getSignedTransactionRequest,
-  getTriggerOrderNonce,
   SignableRequestType,
   SignableRequestTypeToParams,
+  toIntegerString,
   WalletClientWithAccount,
-} from '@nadohq/contracts';
-import { toIntegerString, WalletNotProvidedError } from '@nadohq/utils';
+  WalletNotProvidedError,
+} from '@nadohq/shared';
 import axios, { AxiosInstance, AxiosResponse } from 'axios';
-import { mapServerOrderInfo, mapTriggerCriteria } from './dataMappers';
+import {
+  mapServerOrderInfo,
+  mapTriggerCriteria,
+  mapTwapExecutionStatus,
+} from './dataMappers';
 import {
   TriggerCancelOrdersParams,
   TriggerCancelProductOrdersParams,
   TriggerListOrdersParams,
   TriggerListOrdersResponse,
+  TriggerListTwapExecutionsParams,
+  TriggerListTwapExecutionsResponse,
   TriggerOrderInfo,
   TriggerPlaceOrderParams,
   TriggerServerExecuteRequestByType,
@@ -31,6 +37,7 @@ import {
   TriggerServerQueryResponse,
   TriggerServerQueryResponseByType,
   TriggerServerQuerySuccessResponse,
+  TwapExecutionInfo,
 } from './types';
 import { TriggerServerFailureError } from './types/TriggerServerFailureError';
 
@@ -52,7 +59,11 @@ export class TriggerClient {
 
   constructor(opts: TriggerClientOpts) {
     this.opts = opts;
-    this.axiosInstance = axios.create({ withCredentials: true });
+    this.axiosInstance = axios.create({
+      withCredentials: true,
+      // We have custom logic to validate response status and create an appropriate error
+      validateStatus: () => true,
+    });
   }
 
   /**
@@ -77,7 +88,8 @@ export class TriggerClient {
       price: params.order.price,
       subaccountName: params.order.subaccountName,
       subaccountOwner: params.order.subaccountOwner,
-      nonce: params.nonce ?? getTriggerOrderNonce(),
+      nonce: params.nonce ?? getOrderNonce(),
+      appendix: params.order.appendix,
     };
     const signature = await this.sign(
       'place_order',
@@ -94,6 +106,7 @@ export class TriggerClient {
       product_id: params.productId,
       spot_leverage: params.spotLeverage ?? null,
       digest: params.digest ?? null,
+      borrow_margin: params.borrowMargin ?? null,
     };
 
     return this.execute('place_order', executeParams);
@@ -173,9 +186,11 @@ export class TriggerClient {
       {
         limit: params.limit,
         max_update_time: params.maxUpdateTimeInclusive,
-        pending: params.pending,
-        product_id: params.productId,
+        status_types: params.statusTypes,
+        product_ids: params.productIds,
         digests: params.digests,
+        trigger_types: params.triggerTypes,
+        reduce_only: params.reduceOnly,
         signature,
         tx,
       };
@@ -190,6 +205,30 @@ export class TriggerClient {
     };
   }
 
+  async listTwapExecutions(
+    params: TriggerListTwapExecutionsParams,
+  ): Promise<TriggerListTwapExecutionsResponse> {
+    const queryParams: TriggerServerQueryRequestByType['list_twap_executions'] =
+      {
+        digest: params.digest,
+      };
+
+    const baseResponse = await this.query('list_twap_executions', queryParams);
+
+    const executions: TwapExecutionInfo[] = baseResponse.executions.map(
+      (execution) => ({
+        executionId: execution.execution_id,
+        scheduledTime: execution.scheduled_time,
+        status: mapTwapExecutionStatus(execution.status),
+        updatedAt: execution.updated_at,
+      }),
+    );
+
+    return {
+      executions,
+    };
+  }
+
   /*
   Base Fns
    */
@@ -267,7 +306,7 @@ export class TriggerClient {
   private checkResponseStatus(response: AxiosResponse) {
     if (response.status !== 200 || !response.data) {
       throw Error(
-        `Unexpected response from server: ${response.status} ${response.statusText}`,
+        `Unexpected response from server: ${response.status} ${response.statusText}. Data: ${response.data}`,
       );
     }
   }

package/src/dataMappers.ts

@@ -3,122 +3,276 @@ import {
   removeDecimals,
   toBigDecimal,
   toIntegerString,
-} from '@nadohq/utils';
+  unpackOrderAppendix,
+} from '@nadohq/shared';
 import {
+  PriceTriggerCriteria,
+  PriceTriggerRequirementType,
+  TimeTriggerCriteria,
   TriggerCriteria,
   TriggerOrder,
   TriggerOrderInfo,
   TriggerOrderStatus,
   TriggerServerOrderInfo,
   TriggerServerOrderStatus,
+  TriggerServerPriceRequirement,
+  TriggerServerPriceTriggerCriteria,
+  TriggerServerTimeTriggerCriteria,
   TriggerServerTriggerCriteria,
+  TriggerServerTwapExecutionStatus,
+  TwapExecutionStatus,
 } from './types';
 
-export function mapTriggerServerOrderStatus(
+/**
+ * Maps client-side trigger criteria to server-side trigger criteria format.
+ * Converts price and time triggers to their respective server representations
+ * with proper decimal scaling and field name transformations.
+ *
+ * @param criteria - The client-side trigger criteria (price or time based)
+ * @returns The server-formatted trigger criteria ready for API transmission
+ */
+export function mapTriggerCriteria(
+  criteria: TriggerCriteria,
+): TriggerServerTriggerCriteria {
+  switch (criteria.type) {
+    case 'price':
+      return {
+        price_trigger: mapPriceTriggerCriteria(criteria.criteria),
+      };
+    case 'time':
+      return {
+        time_trigger: mapTimeTriggerCriteria(criteria.criteria),
+      };
+  }
+}
+
+function mapPriceTriggerCriteria(
+  criteria: PriceTriggerCriteria,
+): TriggerServerPriceTriggerCriteria {
+  const priceValue = toIntegerString(addDecimals(criteria.triggerPrice));
+
+  const price_requirement = ((): TriggerServerPriceRequirement => {
+    switch (criteria.type) {
+      case 'oracle_price_above':
+        return { oracle_price_above: priceValue };
+      case 'oracle_price_below':
+        return { oracle_price_below: priceValue };
+      case 'last_price_above':
+        return { last_price_above: priceValue };
+      case 'last_price_below':
+        return { last_price_below: priceValue };
+      case 'mid_price_above':
+        return { mid_price_above: priceValue };
+      case 'mid_price_below':
+        return { mid_price_below: priceValue };
+    }
+  })();
+
+  return {
+    price_requirement,
+    dependency: criteria.dependency
+      ? {
+          digest: criteria.dependency.digest,
+          on_partial_fill: criteria.dependency.onPartialFill,
+        }
+      : undefined,
+  };
+}
+
+function mapTimeTriggerCriteria(
+  criteria: TimeTriggerCriteria,
+): TriggerServerTimeTriggerCriteria {
+  return {
+    interval: Number(criteria.interval),
+    amounts: criteria.amounts?.map((amount) => toIntegerString(amount)),
+  };
+}
+
+/**
+ * Maps complete server-side trigger order information to client-side format.
+ *
+ * @param info - The complete server-side trigger order information including order, status, and timestamps
+ * @returns The client-side trigger order information with converted values and normalized structure
+ */
+export function mapServerOrderInfo(
+  info: TriggerServerOrderInfo,
+): TriggerOrderInfo {
+  const { order: serverOrder, status, updated_at, placed_at } = info;
+  const order: TriggerOrder = {
+    amount: toBigDecimal(serverOrder.order.amount),
+    expiration: Number(serverOrder.order.expiration),
+    nonce: serverOrder.order.nonce,
+    price: removeDecimals(toBigDecimal(serverOrder.order.priceX18)),
+    digest: serverOrder.digest,
+    productId: serverOrder.product_id,
+    triggerCriteria: mapServerTriggerCriteria(serverOrder.trigger),
+    appendix: unpackOrderAppendix(serverOrder.order.appendix),
+  };
+  return {
+    serverOrder,
+    order,
+    status: mapTriggerServerOrderStatus(status),
+    updatedAt: updated_at,
+    placementTime: placed_at,
+  };
+}
+
+function mapTriggerServerOrderStatus(
   status: TriggerServerOrderStatus,
 ): TriggerOrderStatus {
-  if (status === 'pending') {
+  if (status === 'triggering') {
     return {
-      type: 'pending',
+      type: 'triggering',
+    };
+  } else if (status === 'waiting_price') {
+    return {
+      type: 'waiting_price',
+    };
+  } else if (status === 'waiting_dependency') {
+    return {
+      type: 'waiting_dependency',
     };
   } else if ('cancelled' in status) {
     return {
       type: 'cancelled',
       reason: status.cancelled,
     };
+  } else if ('triggered' in status) {
+    return {
+      type: 'triggered',
+      result: status.triggered,
+    };
   } else if ('internal_error' in status) {
     return {
       type: 'internal_error',
       error: status.internal_error,
     };
-  } else if ('triggered' in status) {
+  } else if ('twap_executing' in status) {
     return {
-      type: 'triggered',
-      result: status.triggered,
+      type: 'twap_executing',
+      currentExecution: status.twap_executing.current_execution,
+      totalExecutions: status.twap_executing.total_executions,
+    };
+  } else if ('twap_completed' in status) {
+    return {
+      type: 'twap_completed',
+      executed: status.twap_completed.executed,
+      total: status.twap_completed.total,
     };
   }
   throw Error(`Unknown trigger order status: ${JSON.stringify(status)}`);
 }
 
-export function mapTriggerCriteria(
-  criteria: TriggerCriteria,
-): TriggerServerTriggerCriteria {
-  const priceValue = toIntegerString(addDecimals(criteria.triggerPrice));
-  switch (criteria.type) {
-    case 'oracle_price_above':
-      return { price_above: priceValue };
-    case 'oracle_price_below':
-      return { price_below: priceValue };
-    case 'last_price_above':
-      return { last_price_above: priceValue };
-    case 'last_price_below':
-      return { last_price_below: priceValue };
-    case 'mid_price_above':
-      return { mid_price_above: priceValue };
-    case 'mid_price_below':
-      return { mid_price_below: priceValue };
-  }
-}
-
-export function mapServerTriggerCriteria(
+function mapServerTriggerCriteria(
   criteria: TriggerServerTriggerCriteria,
 ): TriggerCriteria {
-  if ('price_above' in criteria) {
+  if ('price_trigger' in criteria) {
     return {
-      type: 'oracle_price_above',
-      triggerPrice: removeDecimals(criteria.price_above),
+      type: 'price',
+      criteria: mapServerPriceTriggerCriteria(criteria.price_trigger),
     };
   }
-  if ('price_below' in criteria) {
+  if ('time_trigger' in criteria) {
     return {
-      type: 'oracle_price_below',
-      triggerPrice: removeDecimals(criteria.price_below),
+      type: 'time',
+      criteria: mapServerTimeTriggerCriteria(criteria.time_trigger),
     };
   }
-  if ('last_price_above' in criteria) {
+  throw new Error(`Unknown trigger criteria: ${JSON.stringify(criteria)}`);
+}
+
+function mapServerPriceTriggerCriteria(
+  serverCriteria: TriggerServerPriceTriggerCriteria,
+): PriceTriggerCriteria {
+  const { price_requirement, dependency } = serverCriteria;
+
+  const { type, triggerPrice } = ((): {
+    type: PriceTriggerRequirementType;
+    triggerPrice: string;
+  } => {
+    if ('oracle_price_above' in price_requirement) {
+      return {
+        type: 'oracle_price_above',
+        triggerPrice: price_requirement.oracle_price_above,
+      };
+    } else if ('oracle_price_below' in price_requirement) {
+      return {
+        type: 'oracle_price_below',
+        triggerPrice: price_requirement.oracle_price_below,
+      };
+    } else if ('last_price_above' in price_requirement) {
+      return {
+        type: 'last_price_above',
+        triggerPrice: price_requirement.last_price_above,
+      };
+    } else if ('last_price_below' in price_requirement) {
+      return {
+        type: 'last_price_below',
+        triggerPrice: price_requirement.last_price_below,
+      };
+    } else if ('mid_price_above' in price_requirement) {
+      return {
+        type: 'mid_price_above',
+        triggerPrice: price_requirement.mid_price_above,
+      };
+    } else if ('mid_price_below' in price_requirement) {
+      return {
+        type: 'mid_price_below',
+        triggerPrice: price_requirement.mid_price_below,
+      };
+    } else {
+      throw new Error(
+        `Unknown price requirement: ${JSON.stringify(price_requirement)}`,
+      );
+    }
+  })();
+
+  return {
+    type,
+    triggerPrice: removeDecimals(triggerPrice),
+    dependency: dependency
+      ? {
+          digest: dependency.digest,
+          onPartialFill: dependency.on_partial_fill,
+        }
+      : undefined,
+  };
+}
+
+function mapServerTimeTriggerCriteria(
+  serverCriteria: TriggerServerTimeTriggerCriteria,
+): TimeTriggerCriteria {
+  return {
+    interval: toBigDecimal(serverCriteria.interval),
+    amounts: serverCriteria.amounts?.map((amount: string) =>
+      toBigDecimal(amount),
+    ),
+  };
+}
+
+export function mapTwapExecutionStatus(
+  status: TriggerServerTwapExecutionStatus,
+): TwapExecutionStatus {
+  if (status === 'pending') {
     return {
-      type: 'last_price_above',
-      triggerPrice: removeDecimals(criteria.last_price_above),
+      type: 'pending',
     };
-  }
-  if ('last_price_below' in criteria) {
+  } else if ('executed' in status) {
     return {
-      type: 'last_price_below',
-      triggerPrice: removeDecimals(criteria.last_price_below),
+      type: 'executed',
+      executedTime: status.executed.executed_time,
+      executeResponse: status.executed.execute_response,
     };
-  }
-  if ('mid_price_above' in criteria) {
+  } else if ('failed' in status) {
     return {
-      type: 'mid_price_above',
-      triggerPrice: removeDecimals(criteria.mid_price_above),
+      type: 'failed',
+      error: status.failed,
     };
-  }
-  if ('mid_price_below' in criteria) {
+  } else if ('cancelled' in status) {
     return {
-      type: 'mid_price_below',
-      triggerPrice: removeDecimals(criteria.mid_price_below),
+      type: 'cancelled',
+      reason: status.cancelled,
     };
   }
-  throw new Error(`Unknown trigger criteria: ${JSON.stringify(criteria)}`);
-}
-
-export function mapServerOrderInfo(
-  info: TriggerServerOrderInfo,
-): TriggerOrderInfo {
-  const { order: serverOrder, status, updated_at } = info;
-  const order: TriggerOrder = {
-    amount: toBigDecimal(serverOrder.order.amount),
-    expiration: toBigDecimal(serverOrder.order.expiration),
-    nonce: serverOrder.order.nonce,
-    price: removeDecimals(toBigDecimal(serverOrder.order.priceX18)),
-    digest: serverOrder.digest,
-    productId: serverOrder.product_id,
-    triggerCriteria: mapServerTriggerCriteria(serverOrder.trigger),
-  };
-  return {
-    serverOrder,
-    order,
-    status: mapTriggerServerOrderStatus(status),
-    updatedAt: updated_at,
-  };
+  throw Error(`Unknown TWAP execution status: ${JSON.stringify(status)}`);
 }

package/src/endpoints.ts

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