@nadohq/trigger-client 0.1.0-alpha.7 → 0.1.0-alpha.9

package/src/types/clientModelTypes.ts

@@ -62,9 +62,6 @@ export type TriggerCriteria =
 export type TriggerCriteriaType = TriggerCriteria['type'];
 
 export type TriggerOrderStatus =
-  | {
-      type: 'pending';
-    }
   | {
       type: 'cancelled';
       reason: string;
@@ -76,4 +73,23 @@ export type TriggerOrderStatus =
   | {
       type: 'internal_error';
       error: string;
+    }
+  | {
+      type: 'triggering';
+    }
+  | {
+      type: 'waiting_price';
+    }
+  | {
+      type: 'waiting_dependency';
+    }
+  | {
+      type: 'twap_executing';
+      currentExecution: number;
+      totalExecutions: number;
+    }
+  | {
+      type: 'twap_completed';
+      executed: number;
+      total: number;
     };

package/src/types/clientTypes.ts

@@ -1,14 +1,18 @@
 import {
+  EngineOrderParams,
+  EngineServerExecuteResult,
+} from '@nadohq/engine-client';
+import {
+  BigDecimal,
   EIP712CancelOrdersParams,
   EIP712CancelProductOrdersParams,
   OrderAppendix,
   Subaccount,
 } from '@nadohq/shared';
-import { EngineOrderParams } from '@nadohq/engine-client';
-import { BigDecimal } from '@nadohq/shared';
 import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes';
 import {
   TriggerServerOrder,
+  TriggerServerStatusTypeFilter,
   TriggerServerTriggerTypeFilter,
 } from './serverQueryTypes';
 
@@ -55,13 +59,13 @@ export interface TriggerListOrdersParams extends Subaccount, SignatureParams {
   recvTime?: BigDecimal;
   // If not given, defaults to all products
   productId?: number;
-  // Pending trigger orders only, ignores cancelled & triggered orders
-  pending: boolean;
   // 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
@@ -89,3 +93,36 @@ export interface TriggerOrderInfo {
 export interface TriggerListOrdersResponse {
   orders: TriggerOrderInfo[];
 }
+
+export interface TriggerListTwapExecutionsParams {
+  digest: string;
+}
+
+export type TwapExecutionStatus =
+  | {
+      type: 'pending';
+    }
+  | {
+      type: 'executed';
+      executedTime: number;
+      executeResponse: EngineServerExecuteResult;
+    }
+  | {
+      type: 'failed';
+      error: string;
+    }
+  | {
+      type: 'cancelled';
+      reason: string;
+    };
+
+export interface TwapExecutionInfo {
+  executionId: number;
+  scheduledTime: number;
+  status: TwapExecutionStatus;
+  updatedAt: number;
+}
+
+export interface TriggerListTwapExecutionsResponse {
+  executions: TwapExecutionInfo[];
+}

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,42 +1,68 @@
-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 =
-  | 'pending'
   | {
-      // Result from sending to engine
-      triggered: EngineServerExecuteResult;
+      cancelled: TriggerServerCancelReason;
     }
   | {
-      // Reason string
-      cancelled: string;
+      triggered: EngineServerExecuteResult;
     }
   | {
-      // Error message
       internal_error: string;
+    }
+  | 'triggering'
+  | 'waiting_price'
+  | 'waiting_dependency'
+  | {
+      twap_executing: {
+        current_execution: number;
+        total_executions: number;
+      };
+    }
+  | {
+      twap_completed: {
+        executed: number;
+        total: number;
+      };
     };
 
 /**
  * Request types
  */
 
-export type TriggerServerTriggerTypeFilter = 'price_trigger' | 'twap';
+export type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';
+
+export type TriggerServerStatusTypeFilter =
+  | 'cancelled'
+  | 'triggered'
+  | 'internal_error'
+  | 'triggering'
+  | 'waiting_price'
+  | 'waiting_dependency'
+  | 'twap_executing'
+  | 'twap_completed';
 
 export interface TriggerServerListTriggerOrdersParams
   extends SignedTx<EIP712ListTriggerOrdersValues> {
-  pending: boolean;
   // If not given, defaults to all products
   product_id?: number;
   max_update_time?: number;
   digests?: string[];
   limit?: number;
   trigger_types?: TriggerServerTriggerTypeFilter[];
+  status_types?: TriggerServerStatusTypeFilter[];
   reduce_only?: boolean;
 }
 
+export interface TriggerServerListTwapExecutionsParams {
+  digest: string;
+}
+
 export interface TriggerServerQueryRequestByType {
   list_trigger_orders: TriggerServerListTriggerOrdersParams;
+  list_twap_executions: TriggerServerListTwapExecutionsParams;
 }
 
 export type TriggerServerQueryRequestType =
@@ -61,8 +87,43 @@ export interface TriggerServerListTriggerOrdersResponse {
   orders: TriggerServerOrderInfo[];
 }
 
+export type TriggerServerCancelReason =
+  | 'user_requested'
+  | 'linked_signer_changed'
+  | 'expired'
+  | 'account_health'
+  | 'isolated_subaccount_closed'
+  | 'dependent_order_cancelled';
+
+export type TriggerServerTwapExecutionStatus =
+  | 'pending'
+  | {
+      executed: {
+        executed_time: number;
+        execute_response: EngineServerExecuteResult;
+      };
+    }
+  | {
+      failed: string;
+    }
+  | {
+      cancelled: TriggerServerCancelReason;
+    };
+
+export interface TriggerServerTwapExecutionInfo {
+  execution_id: number;
+  scheduled_time: number;
+  status: TriggerServerTwapExecutionStatus;
+  updated_at: number;
+}
+
+export interface TriggerServerTwapExecutionsResponse {
+  executions: TriggerServerTwapExecutionInfo[];
+}
+
 export interface TriggerServerQueryResponseByType {
   list_trigger_orders: TriggerServerListTriggerOrdersResponse;
+  list_twap_executions: TriggerServerTwapExecutionsResponse;
 }
 
 export interface TriggerServerQuerySuccessResponse<