@nadohq/trigger-client 0.1.0-alpha.8 → 0.1.0

package/dist/types/serverQueryTypes.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/serverQueryTypes.ts"],"sourcesContent":["import { EIP712ListTriggerOrdersValues, SignedTx } from '@nadohq/shared';\nimport { EngineServerExecuteResult } from '@nadohq/engine-client';\nimport { TriggerServerPlaceOrderParams } from './serverExecuteTypes';\n\nexport type TriggerServerOrderStatus =\n  | {\n      cancelled: TriggerServerCancelReason;\n    }\n  | {\n      triggered: EngineServerExecuteResult;\n    }\n  | {\n      internal_error: string;\n    }\n  | 'triggering'\n  | 'waiting_price'\n  | 'waiting_dependency'\n  | {\n      twap_executing: {\n        current_execution: number;\n        total_executions: number;\n      };\n    }\n  | {\n      twap_completed: {\n        executed: number;\n        total: number;\n      };\n    };\n\n/**\n * Request types\n */\n\nexport type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';\n\nexport interface TriggerServerListTriggerOrdersParams\n  extends SignedTx<EIP712ListTriggerOrdersValues> {\n  pending: boolean;\n  // If not given, defaults to all products\n  product_id?: number;\n  max_update_time?: number;\n  digests?: string[];\n  limit?: number;\n  trigger_types?: TriggerServerTriggerTypeFilter[];\n  reduce_only?: boolean;\n}\n\nexport interface TriggerServerListTwapExecutionsParams {\n  digest: string;\n}\n\nexport interface TriggerServerQueryRequestByType {\n  list_trigger_orders: TriggerServerListTriggerOrdersParams;\n  list_twap_executions: TriggerServerListTwapExecutionsParams;\n}\n\nexport type TriggerServerQueryRequestType =\n  keyof TriggerServerQueryRequestByType;\n\n/**\n * Response types\n */\n\nexport type TriggerServerOrder = TriggerServerPlaceOrderParams & {\n  // Digest is always populated here\n  digest: string;\n};\n\nexport interface TriggerServerOrderInfo {\n  order: TriggerServerOrder;\n  status: TriggerServerOrderStatus;\n  updated_at: number;\n}\n\nexport interface TriggerServerListTriggerOrdersResponse {\n  orders: TriggerServerOrderInfo[];\n}\n\nexport type TriggerServerCancelReason =\n  | 'user_requested'\n  | 'linked_signer_changed'\n  | 'expired'\n  | 'account_health'\n  | 'isolated_subaccount_closed'\n  | 'dependent_order_cancelled';\n\nexport type TriggerServerTwapExecutionStatus =\n  | 'pending'\n  | {\n      executed: {\n        executed_time: number;\n        execute_response: EngineServerExecuteResult;\n      };\n    }\n  | {\n      failed: string;\n    }\n  | {\n      cancelled: TriggerServerCancelReason;\n    };\n\nexport interface TriggerServerTwapExecutionInfo {\n  execution_id: number;\n  scheduled_time: number;\n  status: TriggerServerTwapExecutionStatus;\n  updated_at: number;\n}\n\nexport interface TriggerServerTwapExecutionsResponse {\n  executions: TriggerServerTwapExecutionInfo[];\n}\n\nexport interface TriggerServerQueryResponseByType {\n  list_trigger_orders: TriggerServerListTriggerOrdersResponse;\n  list_twap_executions: TriggerServerTwapExecutionsResponse;\n}\n\nexport interface TriggerServerQuerySuccessResponse<\n  TQueryType extends\n    keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType,\n> {\n  status: 'success';\n  data: TriggerServerQueryResponseByType[TQueryType];\n}\n\nexport interface TriggerServerQueryFailureResponse {\n  status: 'failure';\n  error: string;\n  error_code: number;\n}\n\nexport type TriggerServerQueryResponse<\n  TQueryType extends\n    keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType,\n> =\n  | TriggerServerQuerySuccessResponse<TQueryType>\n  | TriggerServerQueryFailureResponse;\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/types/serverQueryTypes.ts"],"sourcesContent":["import { EngineServerExecuteResult } from '@nadohq/engine-client';\nimport { EIP712ListTriggerOrdersValues, SignedTx } from '@nadohq/shared';\nimport { TriggerServerPlaceOrderParams } from './serverExecuteTypes';\n\nexport type TriggerServerOrderStatus =\n  | {\n      cancelled: TriggerServerCancelReason;\n    }\n  | {\n      triggered: EngineServerExecuteResult;\n    }\n  | {\n      internal_error: string;\n    }\n  | 'triggering'\n  | 'waiting_price'\n  | 'waiting_dependency'\n  | {\n      twap_executing: {\n        current_execution: number;\n        total_executions: number;\n      };\n    }\n  | {\n      twap_completed: {\n        executed: number;\n        total: number;\n      };\n    };\n\n/**\n * Request types\n */\n\nexport type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';\n\nexport type TriggerServerStatusTypeFilter =\n  | 'cancelled'\n  | 'triggered'\n  | 'internal_error'\n  | 'triggering'\n  | 'waiting_price'\n  | 'waiting_dependency'\n  | 'twap_executing'\n  | 'twap_completed';\n\nexport interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {\n  // If not given, defaults to all products\n  product_ids?: number[];\n  max_update_time?: number;\n  digests?: string[];\n  limit?: number;\n  trigger_types?: TriggerServerTriggerTypeFilter[];\n  status_types?: TriggerServerStatusTypeFilter[];\n  reduce_only?: boolean;\n}\n\nexport interface TriggerServerListTwapExecutionsParams {\n  digest: string;\n}\n\nexport interface TriggerServerQueryRequestByType {\n  list_trigger_orders: TriggerServerListTriggerOrdersParams;\n  list_twap_executions: TriggerServerListTwapExecutionsParams;\n}\n\nexport type TriggerServerQueryRequestType =\n  keyof TriggerServerQueryRequestByType;\n\n/**\n * Response types\n */\n\nexport type TriggerServerOrder = TriggerServerPlaceOrderParams & {\n  // Digest is always populated here\n  digest: string;\n};\n\nexport interface TriggerServerOrderInfo {\n  order: TriggerServerOrder;\n  status: TriggerServerOrderStatus;\n  updated_at: number;\n  placed_at: number;\n}\n\nexport interface TriggerServerListTriggerOrdersResponse {\n  orders: TriggerServerOrderInfo[];\n}\n\nexport type TriggerServerCancelReason =\n  | 'user_requested'\n  | 'linked_signer_changed'\n  | 'expired'\n  | 'account_health'\n  | 'isolated_subaccount_closed'\n  | 'dependent_order_cancelled';\n\nexport type TriggerServerTwapExecutionStatus =\n  | 'pending'\n  | {\n      executed: {\n        executed_time: number;\n        execute_response: EngineServerExecuteResult;\n      };\n    }\n  | {\n      failed: string;\n    }\n  | {\n      cancelled: TriggerServerCancelReason;\n    };\n\nexport interface TriggerServerTwapExecutionInfo {\n  execution_id: number;\n  scheduled_time: number;\n  status: TriggerServerTwapExecutionStatus;\n  updated_at: number;\n}\n\nexport interface TriggerServerTwapExecutionsResponse {\n  executions: TriggerServerTwapExecutionInfo[];\n}\n\nexport interface TriggerServerQueryResponseByType {\n  list_trigger_orders: TriggerServerListTriggerOrdersResponse;\n  list_twap_executions: TriggerServerTwapExecutionsResponse;\n}\n\nexport interface TriggerServerQuerySuccessResponse<\n  TQueryType extends keyof TriggerServerQueryResponseByType =\n    TriggerServerQueryRequestType,\n> {\n  status: 'success';\n  data: TriggerServerQueryResponseByType[TQueryType];\n}\n\nexport interface TriggerServerQueryFailureResponse {\n  status: 'failure';\n  error: string;\n  error_code: number;\n}\n\nexport type TriggerServerQueryResponse<\n  TQueryType extends keyof TriggerServerQueryResponseByType =\n    TriggerServerQueryRequestType,\n> =\n  | TriggerServerQuerySuccessResponse<TQueryType>\n  | TriggerServerQueryFailureResponse;\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/types/serverQueryTypes.d.cts

@@ -1,5 +1,5 @@
-import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
+import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes.cjs';
 import './serverModelTypes.cjs';
 
@@ -24,13 +24,14 @@ type TriggerServerOrderStatus = {
  * 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 {
@@ -51,6 +52,7 @@ interface TriggerServerOrderInfo {
     order: TriggerServerOrder;
     status: TriggerServerOrderStatus;
     updated_at: number;
+    placed_at: number;
 }
 interface TriggerServerListTriggerOrdersResponse {
     orders: TriggerServerOrderInfo[];
@@ -90,4 +92,4 @@ interface TriggerServerQueryFailureResponse {
 }
 type TriggerServerQueryResponse<TQueryType extends keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType> = TriggerServerQuerySuccessResponse<TQueryType> | TriggerServerQueryFailureResponse;
 
-export type { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse };
+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,5 +1,5 @@
-import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
+import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes.js';
 import './serverModelTypes.js';
 
@@ -24,13 +24,14 @@ type TriggerServerOrderStatus = {
  * 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 {
@@ -51,6 +52,7 @@ interface TriggerServerOrderInfo {
     order: TriggerServerOrder;
     status: TriggerServerOrderStatus;
     updated_at: number;
+    placed_at: number;
 }
 interface TriggerServerListTriggerOrdersResponse {
     orders: TriggerServerOrderInfo[];
@@ -90,4 +92,4 @@ interface TriggerServerQueryFailureResponse {
 }
 type TriggerServerQueryResponse<TQueryType extends keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType> = TriggerServerQuerySuccessResponse<TQueryType> | TriggerServerQueryFailureResponse;
 
-export type { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse };
+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.8",
+  "version": "0.1.0",
   "type": "module",
   "sideEffects": false,
   "description": "> TODO: description",
@@ -36,17 +36,23 @@
       }
     }
   },
+  "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.8",
-    "@nadohq/shared": "^0.1.0-alpha.8",
-    "axios": "*",
-    "ts-mixer": "*"
+    "@nadohq/engine-client": "0.1.0",
+    "@nadohq/shared": "0.1.0",
+    "axios": "catalog:",
+    "ts-mixer": "catalog:"
   },
   "peerDependencies": {
-    "viem": "*"
+    "bignumber.js": "catalog:",
+    "viem": "catalog:"
   },
   "devDependencies": {
-    "viem": "*"
+    "bignumber.js": "catalog:",
+    "viem": "catalog:"
   },
-  "gitHead": "3488a83313ef5c199b2fc9a3cd70f477e80e74db"
+  "gitHead": "be24947f588c4fcc294607e985e572c81760f45a"
 }

package/src/TriggerClient.ts

@@ -28,6 +28,7 @@ import {
   TriggerListTwapExecutionsResponse,
   TriggerOrderInfo,
   TriggerPlaceOrderParams,
+  TriggerPlaceOrdersParams,
   TriggerServerExecuteRequestByType,
   TriggerServerExecuteRequestType,
   TriggerServerExecuteResult,
@@ -82,34 +83,23 @@ export class TriggerClient {
    */
 
   async placeTriggerOrder(params: TriggerPlaceOrderParams) {
-    const orderParams: EIP712OrderParams = {
-      amount: params.order.amount,
-      expiration: params.order.expiration,
-      price: params.order.price,
-      subaccountName: params.order.subaccountName,
-      subaccountOwner: params.order.subaccountOwner,
-      nonce: params.nonce ?? getOrderNonce(),
-      appendix: params.order.appendix,
-    };
-    const signature = await this.sign(
+    return this.execute(
       'place_order',
-      params.verifyingAddr,
-      params.chainId,
-      orderParams,
+      await this.buildPlaceOrderExecuteParams(params),
     );
+  }
 
-    const executeParams: TriggerServerExecuteRequestByType['place_order'] = {
-      id: params.id ?? null,
-      order: getNadoEIP712Values('place_order', orderParams),
-      trigger: mapTriggerCriteria(params.triggerCriteria),
-      signature,
-      product_id: params.productId,
-      spot_leverage: params.spotLeverage ?? null,
-      digest: params.digest ?? null,
-      borrow_margin: params.borrowMargin ?? null,
+  async placeTriggerOrders(params: TriggerPlaceOrdersParams) {
+    const executeParams: TriggerServerExecuteRequestByType['place_orders'] = {
+      orders: await Promise.all(
+        params.orders.map(async (orderParam) =>
+          this.buildPlaceOrderExecuteParams(orderParam),
+        ),
+      ),
+      stop_on_failure: params.stopOnFailure ?? null,
     };
 
-    return this.execute('place_order', executeParams);
+    return this.execute('place_orders', executeParams);
   }
 
   async cancelTriggerOrders(params: TriggerCancelOrdersParams) {
@@ -186,8 +176,8 @@ 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,
@@ -232,6 +222,38 @@ export class TriggerClient {
   /*
   Base Fns
    */
+
+  async buildPlaceOrderExecuteParams(
+    params: TriggerPlaceOrderParams,
+  ): Promise<TriggerServerExecuteRequestByType['place_order']> {
+    const orderParams: EIP712OrderParams = {
+      amount: params.order.amount,
+      expiration: params.order.expiration,
+      price: params.order.price,
+      subaccountName: params.order.subaccountName,
+      subaccountOwner: params.order.subaccountOwner,
+      nonce: params.nonce ?? getOrderNonce(),
+      appendix: params.order.appendix,
+    };
+    const signature = await this.sign(
+      'place_order',
+      params.verifyingAddr,
+      params.chainId,
+      orderParams,
+    );
+
+    return {
+      id: params.id ?? null,
+      order: getNadoEIP712Values('place_order', orderParams),
+      trigger: mapTriggerCriteria(params.triggerCriteria),
+      signature,
+      product_id: params.productId,
+      spot_leverage: params.spotLeverage ?? null,
+      digest: params.digest ?? null,
+      borrow_margin: params.borrowMargin ?? null,
+    };
+  }
+
   protected async sign<T extends SignableRequestType>(
     requestType: T,
     verifyingContract: string,

package/src/dataMappers.ts

@@ -1,9 +1,9 @@
-import { unpackOrderAppendix } from '@nadohq/shared';
 import {
   addDecimals,
   removeDecimals,
-  toBigDecimal,
+  toBigNumber,
   toIntegerString,
+  unpackOrderAppendix,
 } from '@nadohq/shared';
 import {
   PriceTriggerCriteria,
@@ -83,7 +83,7 @@ function mapTimeTriggerCriteria(
   criteria: TimeTriggerCriteria,
 ): TriggerServerTimeTriggerCriteria {
   return {
-    interval: toIntegerString(criteria.interval),
+    interval: Number(criteria.interval),
     amounts: criteria.amounts?.map((amount) => toIntegerString(amount)),
   };
 }
@@ -97,12 +97,12 @@ function mapTimeTriggerCriteria(
 export function mapServerOrderInfo(
   info: TriggerServerOrderInfo,
 ): TriggerOrderInfo {
-  const { order: serverOrder, status, updated_at } = info;
+  const { order: serverOrder, status, updated_at, placed_at } = info;
   const order: TriggerOrder = {
-    amount: toBigDecimal(serverOrder.order.amount),
+    amount: toBigNumber(serverOrder.order.amount),
     expiration: Number(serverOrder.order.expiration),
     nonce: serverOrder.order.nonce,
-    price: removeDecimals(toBigDecimal(serverOrder.order.priceX18)),
+    price: removeDecimals(toBigNumber(serverOrder.order.priceX18)),
     digest: serverOrder.digest,
     productId: serverOrder.product_id,
     triggerCriteria: mapServerTriggerCriteria(serverOrder.trigger),
@@ -113,6 +113,7 @@ export function mapServerOrderInfo(
     order,
     status: mapTriggerServerOrderStatus(status),
     updatedAt: updated_at,
+    placementTime: placed_at,
   };
 }
 
@@ -242,9 +243,9 @@ function mapServerTimeTriggerCriteria(
   serverCriteria: TriggerServerTimeTriggerCriteria,
 ): TimeTriggerCriteria {
   return {
-    interval: toBigDecimal(serverCriteria.interval),
+    interval: toBigNumber(serverCriteria.interval),
     amounts: serverCriteria.amounts?.map((amount: string) =>
-      toBigDecimal(amount),
+      toBigNumber(amount),
     ),
   };
 }

package/src/endpoints.ts

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

package/src/index.ts

@@ -1,3 +1,3 @@
-export * from './types';
-export * from './TriggerClient';
 export * from './endpoints';
+export * from './TriggerClient';
+export * from './types';

package/src/types/clientModelTypes.ts

@@ -1,5 +1,5 @@
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
-import { BigDecimalish } from '@nadohq/shared';
+import { BigNumberish } from '@nadohq/shared';
 
 /*
 Price trigger
@@ -26,7 +26,7 @@ export interface PriceTriggerDependency {
 
 export interface PriceTriggerCriteria {
   type: PriceTriggerRequirementType;
-  triggerPrice: BigDecimalish;
+  triggerPrice: BigNumberish;
   dependency?: PriceTriggerDependency;
 }
 
@@ -38,12 +38,12 @@ export interface TimeTriggerCriteria {
   /**
    * For TWAP: Trigger interval in seconds
    */
-  interval: BigDecimalish;
+  interval: BigNumberish;
   /**
    * For TWAP: By default, trigger service will split up orders as per total amount / interval
    * If you want to specify the amounts for each interval, you can provide them here.
    */
-  amounts?: BigDecimalish[];
+  amounts?: BigNumberish[];
 }
 
 /**

package/src/types/clientTypes.ts

@@ -1,17 +1,18 @@
+import {
+  EngineOrderParams,
+  EngineServerExecuteResult,
+} from '@nadohq/engine-client';
 import {
   EIP712CancelOrdersParams,
   EIP712CancelProductOrdersParams,
   OrderAppendix,
   Subaccount,
 } from '@nadohq/shared';
-import {
-  EngineOrderParams,
-  EngineServerExecuteResult,
-} from '@nadohq/engine-client';
-import { BigDecimal } from '@nadohq/shared';
+import BigNumber from 'bignumber.js';
 import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes';
 import {
   TriggerServerOrder,
+  TriggerServerStatusTypeFilter,
   TriggerServerTriggerTypeFilter,
 } from './serverQueryTypes';
 
@@ -37,12 +38,21 @@ export interface TriggerPlaceOrderParams extends SignatureParams {
   triggerCriteria: TriggerCriteria;
   // If not given, engine defaults to true (leverage/borrow enabled)
   spotLeverage?: boolean;
-  // For isolated orders, this specifies whether margin can be borrowed (i.e. whether the cross account can have a negative USDC balance)
+  // For isolated orders, this specifies whether margin can be borrowed (i.e. whether the cross account can have a negative USDT balance)
   borrowMargin?: boolean;
   digest?: string;
   nonce?: string;
 }
 
+export interface TriggerPlaceOrdersParams {
+  orders: TriggerPlaceOrderParams[];
+  /**
+   * If `true`, aborts the batch after the first failed order; if `false`, remaining orders continue to execute.
+   * If not provided, the default value is `false`.
+   */
+  stopOnFailure?: boolean;
+}
+
 export type TriggerCancelOrdersParams = SignatureParams &
   WithOptionalNonce<EIP712CancelOrdersParams>;
 
@@ -55,16 +65,16 @@ export type TriggerCancelProductOrdersParams = SignatureParams &
 
 export interface TriggerListOrdersParams extends Subaccount, SignatureParams {
   // In millis, defaults to 90s in the future
-  recvTime?: BigDecimal;
+  recvTime?: BigNumber;
   // If not given, defaults to all products
-  productId?: number;
-  // Pending trigger orders only, ignores cancelled & triggered orders
-  pending: boolean;
+  productIds?: number[];
   // In seconds
   maxUpdateTimeInclusive?: number;
   // When provided, the associated trigger orders are returned regardless of other filters
   digests?: string[];
   limit?: number;
+  // Filter by status types
+  statusTypes?: TriggerServerStatusTypeFilter[];
   // Filter by trigger types
   triggerTypes?: TriggerServerTriggerTypeFilter[];
   // Filter by reduce-only orders
@@ -74,8 +84,8 @@ export interface TriggerListOrdersParams extends Subaccount, SignatureParams {
 export interface TriggerOrder {
   productId: number;
   triggerCriteria: TriggerCriteria;
-  price: BigDecimal;
-  amount: BigDecimal;
+  price: BigNumber;
+  amount: BigNumber;
   expiration: number;
   nonce: string;
   digest: string;
@@ -87,6 +97,7 @@ export interface TriggerOrderInfo {
   serverOrder: TriggerServerOrder;
   status: TriggerOrderStatus;
   updatedAt: number;
+  placementTime: number;
 }
 
 export interface TriggerListOrdersResponse {

package/src/types/index.ts

@@ -1,6 +1,6 @@
 export * from './clientModelTypes';
 export * from './clientTypes';
-export * from './serverModelTypes';
 export * from './serverExecuteTypes';
+export * from './serverModelTypes';
 export * from './serverQueryTypes';
 export * from './TriggerServerFailureError';

package/src/types/serverExecuteTypes.ts

@@ -1,9 +1,9 @@
-import { EIP712OrderValues } from '@nadohq/shared';
 import {
   EngineServerExecuteFailureResult,
   EngineServerExecuteRequestByType,
   EngineServerExecuteSuccessResult,
 } from '@nadohq/engine-client';
+import { EIP712OrderValues } from '@nadohq/shared';
 import { TriggerServerTriggerCriteria } from './serverModelTypes';
 
 export interface TriggerServerPlaceOrderParams {
@@ -24,8 +24,14 @@ export type TriggerServerCancelOrdersParams =
 export type TriggerServerCancelProductOrdersParams =
   EngineServerExecuteRequestByType['cancel_product_orders'];
 
+export interface TriggerServerPlaceOrdersParams {
+  orders: TriggerServerPlaceOrderParams[];
+  stop_on_failure: boolean | null;
+}
+
 export interface TriggerServerExecuteRequestByType {
   place_order: TriggerServerPlaceOrderParams;
+  place_orders: TriggerServerPlaceOrdersParams;
   cancel_orders: TriggerServerCancelOrdersParams;
   cancel_product_orders: TriggerServerCancelProductOrdersParams;
 }

package/src/types/serverModelTypes.ts

@@ -38,7 +38,7 @@ export interface TriggerServerTimeTriggerCriteria {
   /**
    * Trigger interval in seconds
    */
-  interval: string;
+  interval: number;
   /**
    * By default, trigger service will split up orders as per total amount / interval
    * If you want to specify the amounts for each interval, you can provide them here.

package/src/types/serverQueryTypes.ts

@@ -1,5 +1,5 @@
-import { EIP712ListTriggerOrdersValues, SignedTx } from '@nadohq/shared';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
+import { EIP712ListTriggerOrdersValues, SignedTx } from '@nadohq/shared';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes';
 
 export type TriggerServerOrderStatus =
@@ -34,15 +34,24 @@ export type TriggerServerOrderStatus =
 
 export type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';
 
-export interface TriggerServerListTriggerOrdersParams
-  extends SignedTx<EIP712ListTriggerOrdersValues> {
-  pending: boolean;
+export type TriggerServerStatusTypeFilter =
+  | 'cancelled'
+  | 'triggered'
+  | 'internal_error'
+  | 'triggering'
+  | 'waiting_price'
+  | 'waiting_dependency'
+  | 'twap_executing'
+  | 'twap_completed';
+
+export interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
   // If not given, defaults to all products
-  product_id?: number;
+  product_ids?: number[];
   max_update_time?: number;
   digests?: string[];
   limit?: number;
   trigger_types?: TriggerServerTriggerTypeFilter[];
+  status_types?: TriggerServerStatusTypeFilter[];
   reduce_only?: boolean;
 }
 
@@ -71,6 +80,7 @@ export interface TriggerServerOrderInfo {
   order: TriggerServerOrder;
   status: TriggerServerOrderStatus;
   updated_at: number;
+  placed_at: number;
 }
 
 export interface TriggerServerListTriggerOrdersResponse {
@@ -117,8 +127,8 @@ export interface TriggerServerQueryResponseByType {
 }
 
 export interface TriggerServerQuerySuccessResponse<
-  TQueryType extends
-    keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType,
+  TQueryType extends keyof TriggerServerQueryResponseByType =
+    TriggerServerQueryRequestType,
 > {
   status: 'success';
   data: TriggerServerQueryResponseByType[TQueryType];
@@ -131,8 +141,8 @@ export interface TriggerServerQueryFailureResponse {
 }
 
 export type TriggerServerQueryResponse<
-  TQueryType extends
-    keyof TriggerServerQueryResponseByType = TriggerServerQueryRequestType,
+  TQueryType extends keyof TriggerServerQueryResponseByType =
+    TriggerServerQueryRequestType,
 > =
   | TriggerServerQuerySuccessResponse<TQueryType>
   | TriggerServerQueryFailureResponse;