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

package/dist/types/clientModelTypes.d.cts

@@ -40,8 +40,6 @@ type TriggerCriteria = {
 };
 type TriggerCriteriaType = TriggerCriteria['type'];
 type TriggerOrderStatus = {
-    type: 'pending';
-} | {
     type: 'cancelled';
     reason: string;
 } | {
@@ -50,6 +48,20 @@ 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;
 };
 
 export type { PriceTriggerCriteria, PriceTriggerDependency, PriceTriggerRequirementType, TimeTriggerCriteria, TriggerCriteria, TriggerCriteriaType, TriggerOrderStatus };

package/dist/types/clientModelTypes.d.ts

@@ -40,8 +40,6 @@ type TriggerCriteria = {
 };
 type TriggerCriteriaType = TriggerCriteria['type'];
 type TriggerOrderStatus = {
-    type: 'pending';
-} | {
     type: 'cancelled';
     reason: string;
 } | {
@@ -50,6 +48,20 @@ 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;
 };
 
 export type { PriceTriggerCriteria, PriceTriggerDependency, PriceTriggerRequirementType, TimeTriggerCriteria, TriggerCriteria, TriggerCriteriaType, TriggerOrderStatus };

package/dist/types/clientTypes.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/clientTypes.ts"],"sourcesContent":["import {\n  EIP712CancelOrdersParams,\n  EIP712CancelProductOrdersParams,\n  OrderAppendix,\n  Subaccount,\n} from '@nadohq/shared';\nimport { EngineOrderParams } from '@nadohq/engine-client';\nimport { BigDecimal } from '@nadohq/shared';\nimport { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes';\nimport {\n  TriggerServerOrder,\n  TriggerServerTriggerTypeFilter,\n} from './serverQueryTypes';\n\ntype WithOptionalNonce<T> = Omit<T, 'nonce'> & { nonce?: string };\n\ninterface SignatureParams {\n  /**\n   * Address derived from productId for placement (see getOrderVerifyingAddr)\n   * endpoint address for cancellation & listing\n   */\n  verifyingAddr: string;\n  chainId: number;\n}\n\n/**\n * Executes\n */\n\nexport interface TriggerPlaceOrderParams extends SignatureParams {\n  id?: number;\n  productId: number;\n  order: EngineOrderParams;\n  triggerCriteria: TriggerCriteria;\n  // If not given, engine defaults to true (leverage/borrow enabled)\n  spotLeverage?: boolean;\n  // For isolated orders, this specifies whether margin can be borrowed (i.e. whether the cross account can have a negative USDC balance)\n  borrowMargin?: boolean;\n  digest?: string;\n  nonce?: string;\n}\n\nexport type TriggerCancelOrdersParams = SignatureParams &\n  WithOptionalNonce<EIP712CancelOrdersParams>;\n\nexport type TriggerCancelProductOrdersParams = SignatureParams &\n  WithOptionalNonce<EIP712CancelProductOrdersParams>;\n\n/**\n * Queries\n */\n\nexport interface TriggerListOrdersParams extends Subaccount, SignatureParams {\n  // In millis, defaults to 90s in the future\n  recvTime?: BigDecimal;\n  // If not given, defaults to all products\n  productId?: number;\n  // Pending trigger orders only, ignores cancelled & triggered orders\n  pending: boolean;\n  // In seconds\n  maxUpdateTimeInclusive?: number;\n  // When provided, the associated trigger orders are returned regardless of other filters\n  digests?: string[];\n  limit?: number;\n  // Filter by trigger types\n  triggerTypes?: TriggerServerTriggerTypeFilter[];\n  // Filter by reduce-only orders\n  reduceOnly?: boolean;\n}\n\nexport interface TriggerOrder {\n  productId: number;\n  triggerCriteria: TriggerCriteria;\n  price: BigDecimal;\n  amount: BigDecimal;\n  expiration: number;\n  nonce: string;\n  digest: string;\n  appendix: OrderAppendix;\n}\n\nexport interface TriggerOrderInfo {\n  order: TriggerOrder;\n  serverOrder: TriggerServerOrder;\n  status: TriggerOrderStatus;\n  updatedAt: number;\n}\n\nexport interface TriggerListOrdersResponse {\n  orders: TriggerOrderInfo[];\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/types/clientTypes.ts"],"sourcesContent":["import {\n  EIP712CancelOrdersParams,\n  EIP712CancelProductOrdersParams,\n  OrderAppendix,\n  Subaccount,\n} from '@nadohq/shared';\nimport {\n  EngineOrderParams,\n  EngineServerExecuteResult,\n} from '@nadohq/engine-client';\nimport { BigDecimal } from '@nadohq/shared';\nimport { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes';\nimport {\n  TriggerServerOrder,\n  TriggerServerTriggerTypeFilter,\n} from './serverQueryTypes';\n\ntype WithOptionalNonce<T> = Omit<T, 'nonce'> & { nonce?: string };\n\ninterface SignatureParams {\n  /**\n   * Address derived from productId for placement (see getOrderVerifyingAddr)\n   * endpoint address for cancellation & listing\n   */\n  verifyingAddr: string;\n  chainId: number;\n}\n\n/**\n * Executes\n */\n\nexport interface TriggerPlaceOrderParams extends SignatureParams {\n  id?: number;\n  productId: number;\n  order: EngineOrderParams;\n  triggerCriteria: TriggerCriteria;\n  // If not given, engine defaults to true (leverage/borrow enabled)\n  spotLeverage?: boolean;\n  // For isolated orders, this specifies whether margin can be borrowed (i.e. whether the cross account can have a negative USDC balance)\n  borrowMargin?: boolean;\n  digest?: string;\n  nonce?: string;\n}\n\nexport type TriggerCancelOrdersParams = SignatureParams &\n  WithOptionalNonce<EIP712CancelOrdersParams>;\n\nexport type TriggerCancelProductOrdersParams = SignatureParams &\n  WithOptionalNonce<EIP712CancelProductOrdersParams>;\n\n/**\n * Queries\n */\n\nexport interface TriggerListOrdersParams extends Subaccount, SignatureParams {\n  // In millis, defaults to 90s in the future\n  recvTime?: BigDecimal;\n  // If not given, defaults to all products\n  productId?: number;\n  // Pending trigger orders only, ignores cancelled & triggered orders\n  pending: boolean;\n  // In seconds\n  maxUpdateTimeInclusive?: number;\n  // When provided, the associated trigger orders are returned regardless of other filters\n  digests?: string[];\n  limit?: number;\n  // Filter by trigger types\n  triggerTypes?: TriggerServerTriggerTypeFilter[];\n  // Filter by reduce-only orders\n  reduceOnly?: boolean;\n}\n\nexport interface TriggerOrder {\n  productId: number;\n  triggerCriteria: TriggerCriteria;\n  price: BigDecimal;\n  amount: BigDecimal;\n  expiration: number;\n  nonce: string;\n  digest: string;\n  appendix: OrderAppendix;\n}\n\nexport interface TriggerOrderInfo {\n  order: TriggerOrder;\n  serverOrder: TriggerServerOrder;\n  status: TriggerOrderStatus;\n  updatedAt: number;\n}\n\nexport interface TriggerListOrdersResponse {\n  orders: TriggerOrderInfo[];\n}\n\nexport interface TriggerListTwapExecutionsParams {\n  digest: string;\n}\n\nexport type TwapExecutionStatus =\n  | {\n      type: 'pending';\n    }\n  | {\n      type: 'executed';\n      executedTime: number;\n      executeResponse: EngineServerExecuteResult;\n    }\n  | {\n      type: 'failed';\n      error: string;\n    }\n  | {\n      type: 'cancelled';\n      reason: string;\n    };\n\nexport interface TwapExecutionInfo {\n  executionId: number;\n  scheduledTime: number;\n  status: TwapExecutionStatus;\n  updatedAt: number;\n}\n\nexport interface TriggerListTwapExecutionsResponse {\n  executions: TwapExecutionInfo[];\n}\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/types/clientTypes.d.cts

@@ -1,5 +1,5 @@
 import { EIP712CancelOrdersParams, EIP712CancelProductOrdersParams, Subaccount, BigDecimal, OrderAppendix } from '@nadohq/shared';
-import { EngineOrderParams } from '@nadohq/engine-client';
+import { EngineOrderParams, EngineServerExecuteResult } from '@nadohq/engine-client';
 import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes.cjs';
 import { TriggerServerTriggerTypeFilter, TriggerServerOrder } from './serverQueryTypes.cjs';
 import './serverExecuteTypes.cjs';
@@ -63,5 +63,30 @@ interface TriggerOrderInfo {
 interface TriggerListOrdersResponse {
     orders: TriggerOrderInfo[];
 }
+interface TriggerListTwapExecutionsParams {
+    digest: string;
+}
+type TwapExecutionStatus = {
+    type: 'pending';
+} | {
+    type: 'executed';
+    executedTime: number;
+    executeResponse: EngineServerExecuteResult;
+} | {
+    type: 'failed';
+    error: string;
+} | {
+    type: 'cancelled';
+    reason: string;
+};
+interface TwapExecutionInfo {
+    executionId: number;
+    scheduledTime: number;
+    status: TwapExecutionStatus;
+    updatedAt: number;
+}
+interface TriggerListTwapExecutionsResponse {
+    executions: TwapExecutionInfo[];
+}
 
-export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams };
+export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerListTwapExecutionsParams, TriggerListTwapExecutionsResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams, TwapExecutionInfo, TwapExecutionStatus };

package/dist/types/clientTypes.d.ts

@@ -1,5 +1,5 @@
 import { EIP712CancelOrdersParams, EIP712CancelProductOrdersParams, Subaccount, BigDecimal, OrderAppendix } from '@nadohq/shared';
-import { EngineOrderParams } from '@nadohq/engine-client';
+import { EngineOrderParams, EngineServerExecuteResult } from '@nadohq/engine-client';
 import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes.js';
 import { TriggerServerTriggerTypeFilter, TriggerServerOrder } from './serverQueryTypes.js';
 import './serverExecuteTypes.js';
@@ -63,5 +63,30 @@ interface TriggerOrderInfo {
 interface TriggerListOrdersResponse {
     orders: TriggerOrderInfo[];
 }
+interface TriggerListTwapExecutionsParams {
+    digest: string;
+}
+type TwapExecutionStatus = {
+    type: 'pending';
+} | {
+    type: 'executed';
+    executedTime: number;
+    executeResponse: EngineServerExecuteResult;
+} | {
+    type: 'failed';
+    error: string;
+} | {
+    type: 'cancelled';
+    reason: string;
+};
+interface TwapExecutionInfo {
+    executionId: number;
+    scheduledTime: number;
+    status: TwapExecutionStatus;
+    updatedAt: number;
+}
+interface TriggerListTwapExecutionsResponse {
+    executions: TwapExecutionInfo[];
+}
 
-export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams };
+export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerListTwapExecutionsParams, TriggerListTwapExecutionsResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams, TwapExecutionInfo, TwapExecutionStatus };

package/dist/types/index.d.cts

@@ -1,8 +1,8 @@
 export { PriceTriggerCriteria, PriceTriggerDependency, PriceTriggerRequirementType, TimeTriggerCriteria, TriggerCriteria, TriggerCriteriaType, TriggerOrderStatus } from './clientModelTypes.cjs';
-export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams } from './clientTypes.cjs';
+export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerListTwapExecutionsParams, TriggerListTwapExecutionsResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams, TwapExecutionInfo, TwapExecutionStatus } from './clientTypes.cjs';
 export { TriggerServerDependency, TriggerServerPriceRequirement, TriggerServerPriceTriggerCriteria, TriggerServerTimeTriggerCriteria, TriggerServerTriggerCriteria } from './serverModelTypes.cjs';
 export { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams } from './serverExecuteTypes.cjs';
-export { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter } from './serverQueryTypes.cjs';
+export { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse } from './serverQueryTypes.cjs';
 export { TriggerServerFailureError } from './TriggerServerFailureError.cjs';
 import '@nadohq/engine-client';
 import '@nadohq/shared';

package/dist/types/index.d.ts

@@ -1,8 +1,8 @@
 export { PriceTriggerCriteria, PriceTriggerDependency, PriceTriggerRequirementType, TimeTriggerCriteria, TriggerCriteria, TriggerCriteriaType, TriggerOrderStatus } from './clientModelTypes.js';
-export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams } from './clientTypes.js';
+export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerListTwapExecutionsParams, TriggerListTwapExecutionsResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams, TwapExecutionInfo, TwapExecutionStatus } from './clientTypes.js';
 export { TriggerServerDependency, TriggerServerPriceRequirement, TriggerServerPriceTriggerCriteria, TriggerServerTimeTriggerCriteria, TriggerServerTriggerCriteria } from './serverModelTypes.js';
 export { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams } from './serverExecuteTypes.js';
-export { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter } from './serverQueryTypes.js';
+export { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse } from './serverQueryTypes.js';
 export { TriggerServerFailureError } from './TriggerServerFailureError.js';
 import '@nadohq/engine-client';
 import '@nadohq/shared';

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  | 'pending'\n  | {\n      // Result from sending to engine\n      triggered: EngineServerExecuteResult;\n    }\n  | {\n      // Reason string\n      cancelled: string;\n    }\n  | {\n      // Error message\n      internal_error: string;\n    };\n\n/**\n * Request types\n */\n\nexport type TriggerServerTriggerTypeFilter = 'price_trigger' | 'twap';\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 TriggerServerQueryRequestByType {\n  list_trigger_orders: TriggerServerListTriggerOrdersParams;\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 interface TriggerServerQueryResponseByType {\n  list_trigger_orders: TriggerServerListTriggerOrdersResponse;\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 { 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":[]}

package/dist/types/serverQueryTypes.d.cts

@@ -3,17 +3,27 @@ import { EngineServerExecuteResult } from '@nadohq/engine-client';
 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' | 'twap';
+type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';
 interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
     pending: boolean;
     product_id?: number;
@@ -23,8 +33,12 @@ interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTrigge
     trigger_types?: TriggerServerTriggerTypeFilter[];
     reduce_only?: boolean;
 }
+interface TriggerServerListTwapExecutionsParams {
+    digest: string;
+}
 interface TriggerServerQueryRequestByType {
     list_trigger_orders: TriggerServerListTriggerOrdersParams;
+    list_twap_executions: TriggerServerListTwapExecutionsParams;
 }
 type TriggerServerQueryRequestType = keyof TriggerServerQueryRequestByType;
 /**
@@ -41,8 +55,29 @@ interface TriggerServerOrderInfo {
 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';
@@ -55,4 +90,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, TriggerServerTriggerTypeFilter };
+export type { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse };

package/dist/types/serverQueryTypes.d.ts

@@ -3,17 +3,27 @@ import { EngineServerExecuteResult } from '@nadohq/engine-client';
 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' | 'twap';
+type TriggerServerTriggerTypeFilter = 'price_trigger' | 'time_trigger';
 interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
     pending: boolean;
     product_id?: number;
@@ -23,8 +33,12 @@ interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTrigge
     trigger_types?: TriggerServerTriggerTypeFilter[];
     reduce_only?: boolean;
 }
+interface TriggerServerListTwapExecutionsParams {
+    digest: string;
+}
 interface TriggerServerQueryRequestByType {
     list_trigger_orders: TriggerServerListTriggerOrdersParams;
+    list_twap_executions: TriggerServerListTwapExecutionsParams;
 }
 type TriggerServerQueryRequestType = keyof TriggerServerQueryRequestByType;
 /**
@@ -41,8 +55,29 @@ interface TriggerServerOrderInfo {
 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';
@@ -55,4 +90,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, TriggerServerTriggerTypeFilter };
+export type { TriggerServerCancelReason, TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerListTwapExecutionsParams, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter, TriggerServerTwapExecutionInfo, TriggerServerTwapExecutionStatus, TriggerServerTwapExecutionsResponse };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nadohq/trigger-client",
-  "version": "0.1.0-alpha.7",
+  "version": "0.1.0-alpha.8",
   "type": "module",
   "sideEffects": false,
   "description": "> TODO: description",
@@ -37,8 +37,8 @@
     }
   },
   "dependencies": {
-    "@nadohq/engine-client": "^0.1.0-alpha.7",
-    "@nadohq/shared": "^0.1.0-alpha.7",
+    "@nadohq/engine-client": "^0.1.0-alpha.8",
+    "@nadohq/shared": "^0.1.0-alpha.8",
     "axios": "*",
     "ts-mixer": "*"
   },
@@ -48,5 +48,5 @@
   "devDependencies": {
     "viem": "*"
   },
-  "gitHead": "c6f20e82e8d20e2c7a427b54a1728b6ab8adf058"
+  "gitHead": "3488a83313ef5c199b2fc9a3cd70f477e80e74db"
 }

package/src/TriggerClient.ts

@@ -14,12 +14,18 @@ import {
   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';
 
@@ -198,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
    */

package/src/dataMappers.ts

@@ -19,6 +19,8 @@ import {
   TriggerServerPriceTriggerCriteria,
   TriggerServerTimeTriggerCriteria,
   TriggerServerTriggerCriteria,
+  TriggerServerTwapExecutionStatus,
+  TwapExecutionStatus,
 } from './types';
 
 /**
@@ -117,24 +119,44 @@ export function mapServerOrderInfo(
 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)}`);
@@ -226,3 +248,30 @@ function mapServerTimeTriggerCriteria(
     ),
   };
 }
+
+export function mapTwapExecutionStatus(
+  status: TriggerServerTwapExecutionStatus,
+): TwapExecutionStatus {
+  if (status === 'pending') {
+    return {
+      type: 'pending',
+    };
+  } else if ('executed' in status) {
+    return {
+      type: 'executed',
+      executedTime: status.executed.executed_time,
+      executeResponse: status.executed.execute_response,
+    };
+  } else if ('failed' in status) {
+    return {
+      type: 'failed',
+      error: status.failed,
+    };
+  } else if ('cancelled' in status) {
+    return {
+      type: 'cancelled',
+      reason: status.cancelled,
+    };
+  }
+  throw Error(`Unknown TWAP execution status: ${JSON.stringify(status)}`);
+}

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

@@ -4,7 +4,10 @@ import {
   OrderAppendix,
   Subaccount,
 } from '@nadohq/shared';
-import { EngineOrderParams } from '@nadohq/engine-client';
+import {
+  EngineOrderParams,
+  EngineServerExecuteResult,
+} from '@nadohq/engine-client';
 import { BigDecimal } from '@nadohq/shared';
 import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes';
 import {
@@ -89,3 +92,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[];
+}