@nadohq/trigger-client 0.1.0-alpha.3 → 0.1.0-alpha.4

package/dist/types/clientTypes.d.cts

@@ -1,30 +1,18 @@
-import { EIP712CancelOrdersParams, EIP712CancelProductOrdersParams, Subaccount } from '@nadohq/contracts';
-import { EngineOrderParams, EngineServerExecuteResult } from '@nadohq/engine-client';
-import { BigDecimalish, BigDecimal } from '@nadohq/utils';
-import { TriggerServerOrder } from './serverQueryTypes.cjs';
+import { EIP712CancelOrdersParams, EIP712CancelProductOrdersParams, Subaccount, BigDecimal, OrderAppendix } from '@nadohq/shared';
+import { EngineOrderParams } from '@nadohq/engine-client';
+import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes.cjs';
+import { TriggerServerTriggerTypeFilter, TriggerServerOrder } from './serverQueryTypes.cjs';
 import './serverExecuteTypes.cjs';
+import './serverModelTypes.cjs';
 
 type WithOptionalNonce<T> = Omit<T, 'nonce'> & {
     nonce?: string;
 };
-type TriggerCriteriaType = 'oracle_price_above' | 'oracle_price_below' | 'last_price_above' | 'last_price_below' | 'mid_price_above' | 'mid_price_below';
-type TriggerCriteria = {
-    type: TriggerCriteriaType;
-    triggerPrice: BigDecimalish;
-};
-type TriggerOrderStatus = {
-    type: 'pending';
-} | {
-    type: 'cancelled';
-    reason: string;
-} | {
-    type: 'triggered';
-    result: EngineServerExecuteResult;
-} | {
-    type: 'internal_error';
-    error: string;
-};
 interface SignatureParams {
+    /**
+     * Address derived from productId for placement (see getOrderVerifyingAddr)
+     * endpoint address for cancellation & listing
+     */
     verifyingAddr: string;
     chainId: number;
 }
@@ -37,6 +25,7 @@ interface TriggerPlaceOrderParams extends SignatureParams {
     order: EngineOrderParams;
     triggerCriteria: TriggerCriteria;
     spotLeverage?: boolean;
+    borrowMargin?: boolean;
     digest?: string;
     nonce?: string;
 }
@@ -52,15 +41,18 @@ interface TriggerListOrdersParams extends Subaccount, SignatureParams {
     maxUpdateTimeInclusive?: number;
     digests?: string[];
     limit?: number;
+    triggerTypes?: TriggerServerTriggerTypeFilter[];
+    reduceOnly?: boolean;
 }
 interface TriggerOrder {
     productId: number;
     triggerCriteria: TriggerCriteria;
     price: BigDecimal;
     amount: BigDecimal;
-    expiration: BigDecimal;
+    expiration: number;
     nonce: string;
     digest: string;
+    appendix: OrderAppendix;
 }
 interface TriggerOrderInfo {
     order: TriggerOrder;
@@ -72,4 +64,4 @@ interface TriggerListOrdersResponse {
     orders: TriggerOrderInfo[];
 }
 
-export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerCriteria, TriggerCriteriaType, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerOrderStatus, TriggerPlaceOrderParams };
+export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams };

package/dist/types/clientTypes.d.ts

@@ -1,30 +1,18 @@
-import { EIP712CancelOrdersParams, EIP712CancelProductOrdersParams, Subaccount } from '@nadohq/contracts';
-import { EngineOrderParams, EngineServerExecuteResult } from '@nadohq/engine-client';
-import { BigDecimalish, BigDecimal } from '@nadohq/utils';
-import { TriggerServerOrder } from './serverQueryTypes.js';
+import { EIP712CancelOrdersParams, EIP712CancelProductOrdersParams, Subaccount, BigDecimal, OrderAppendix } from '@nadohq/shared';
+import { EngineOrderParams } from '@nadohq/engine-client';
+import { TriggerCriteria, TriggerOrderStatus } from './clientModelTypes.js';
+import { TriggerServerTriggerTypeFilter, TriggerServerOrder } from './serverQueryTypes.js';
 import './serverExecuteTypes.js';
+import './serverModelTypes.js';
 
 type WithOptionalNonce<T> = Omit<T, 'nonce'> & {
     nonce?: string;
 };
-type TriggerCriteriaType = 'oracle_price_above' | 'oracle_price_below' | 'last_price_above' | 'last_price_below' | 'mid_price_above' | 'mid_price_below';
-type TriggerCriteria = {
-    type: TriggerCriteriaType;
-    triggerPrice: BigDecimalish;
-};
-type TriggerOrderStatus = {
-    type: 'pending';
-} | {
-    type: 'cancelled';
-    reason: string;
-} | {
-    type: 'triggered';
-    result: EngineServerExecuteResult;
-} | {
-    type: 'internal_error';
-    error: string;
-};
 interface SignatureParams {
+    /**
+     * Address derived from productId for placement (see getOrderVerifyingAddr)
+     * endpoint address for cancellation & listing
+     */
     verifyingAddr: string;
     chainId: number;
 }
@@ -37,6 +25,7 @@ interface TriggerPlaceOrderParams extends SignatureParams {
     order: EngineOrderParams;
     triggerCriteria: TriggerCriteria;
     spotLeverage?: boolean;
+    borrowMargin?: boolean;
     digest?: string;
     nonce?: string;
 }
@@ -52,15 +41,18 @@ interface TriggerListOrdersParams extends Subaccount, SignatureParams {
     maxUpdateTimeInclusive?: number;
     digests?: string[];
     limit?: number;
+    triggerTypes?: TriggerServerTriggerTypeFilter[];
+    reduceOnly?: boolean;
 }
 interface TriggerOrder {
     productId: number;
     triggerCriteria: TriggerCriteria;
     price: BigDecimal;
     amount: BigDecimal;
-    expiration: BigDecimal;
+    expiration: number;
     nonce: string;
     digest: string;
+    appendix: OrderAppendix;
 }
 interface TriggerOrderInfo {
     order: TriggerOrder;
@@ -72,4 +64,4 @@ interface TriggerListOrdersResponse {
     orders: TriggerOrderInfo[];
 }
 
-export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerCriteria, TriggerCriteriaType, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerOrderStatus, TriggerPlaceOrderParams };
+export type { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams };

package/dist/types/index.cjs

@@ -17,13 +17,17 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/types/index.ts
 var types_exports = {};
 module.exports = __toCommonJS(types_exports);
+__reExport(types_exports, require("./clientModelTypes.cjs"), module.exports);
 __reExport(types_exports, require("./clientTypes.cjs"), module.exports);
+__reExport(types_exports, require("./serverModelTypes.cjs"), module.exports);
 __reExport(types_exports, require("./serverExecuteTypes.cjs"), module.exports);
 __reExport(types_exports, require("./serverQueryTypes.cjs"), module.exports);
 __reExport(types_exports, require("./TriggerServerFailureError.cjs"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ...require("./clientModelTypes.cjs"),
   ...require("./clientTypes.cjs"),
+  ...require("./serverModelTypes.cjs"),
   ...require("./serverExecuteTypes.cjs"),
   ...require("./serverQueryTypes.cjs"),
   ...require("./TriggerServerFailureError.cjs")

package/dist/types/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/index.ts"],"sourcesContent":["export * from './clientTypes';\nexport * from './serverExecuteTypes';\nexport * from './serverQueryTypes';\nexport * from './TriggerServerFailureError';\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,8BAAd;AACA,0BAAc,qCADd;AAEA,0BAAc,mCAFd;AAGA,0BAAc,4CAHd;","names":[]}
+{"version":3,"sources":["../../src/types/index.ts"],"sourcesContent":["export * from './clientModelTypes';\nexport * from './clientTypes';\nexport * from './serverModelTypes';\nexport * from './serverExecuteTypes';\nexport * from './serverQueryTypes';\nexport * from './TriggerServerFailureError';\n"],"mappings":";;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA,0BAAc,mCAAd;AACA,0BAAc,8BADd;AAEA,0BAAc,mCAFd;AAGA,0BAAc,qCAHd;AAIA,0BAAc,mCAJd;AAKA,0BAAc,4CALd;","names":[]}

package/dist/types/index.d.cts

@@ -1,7 +1,8 @@
-export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerCriteria, TriggerCriteriaType, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerOrderStatus, TriggerPlaceOrderParams } from './clientTypes.cjs';
-export { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams, TriggerServerTriggerCriteria } from './serverExecuteTypes.cjs';
-export { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse } from './serverQueryTypes.cjs';
+export { PriceTriggerCriteria, PriceTriggerDependency, PriceTriggerRequirementType, TimeTriggerCriteria, TriggerCriteria, TriggerCriteriaType, TriggerOrderStatus } from './clientModelTypes.cjs';
+export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams } 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 { TriggerServerFailureError } from './TriggerServerFailureError.cjs';
-import '@nadohq/contracts';
 import '@nadohq/engine-client';
-import '@nadohq/utils';
+import '@nadohq/shared';

package/dist/types/index.d.ts

@@ -1,7 +1,8 @@
-export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerCriteria, TriggerCriteriaType, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerOrderStatus, TriggerPlaceOrderParams } from './clientTypes.js';
-export { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams, TriggerServerTriggerCriteria } from './serverExecuteTypes.js';
-export { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse } from './serverQueryTypes.js';
+export { PriceTriggerCriteria, PriceTriggerDependency, PriceTriggerRequirementType, TimeTriggerCriteria, TriggerCriteria, TriggerCriteriaType, TriggerOrderStatus } from './clientModelTypes.js';
+export { TriggerCancelOrdersParams, TriggerCancelProductOrdersParams, TriggerListOrdersParams, TriggerListOrdersResponse, TriggerOrder, TriggerOrderInfo, TriggerPlaceOrderParams } 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 { TriggerServerFailureError } from './TriggerServerFailureError.js';
-import '@nadohq/contracts';
 import '@nadohq/engine-client';
-import '@nadohq/utils';
+import '@nadohq/shared';

package/dist/types/index.js

@@ -1,5 +1,7 @@
 // src/types/index.ts
+export * from "./clientModelTypes.js";
 export * from "./clientTypes.js";
+export * from "./serverModelTypes.js";
 export * from "./serverExecuteTypes.js";
 export * from "./serverQueryTypes.js";
 export * from "./TriggerServerFailureError.js";

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/index.ts"],"sourcesContent":["export * from './clientTypes';\nexport * from './serverExecuteTypes';\nexport * from './serverQueryTypes';\nexport * from './TriggerServerFailureError';\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}
+{"version":3,"sources":["../../src/types/index.ts"],"sourcesContent":["export * from './clientModelTypes';\nexport * from './clientTypes';\nexport * from './serverModelTypes';\nexport * from './serverExecuteTypes';\nexport * from './serverQueryTypes';\nexport * from './TriggerServerFailureError';\n"],"mappings":";AAAA,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;AACd,cAAc;","names":[]}

package/dist/types/serverExecuteTypes.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/serverExecuteTypes.ts"],"sourcesContent":["import { EIP712OrderValues } from '@nadohq/contracts';\nimport {\n  EngineServerExecuteFailureResult,\n  EngineServerExecuteRequestByType,\n  EngineServerExecuteSuccessResult,\n} from '@nadohq/engine-client';\n\nexport type TriggerServerTriggerCriteria =\n  // These trigger on fast oracle price\n  | {\n      price_above: string;\n    }\n  | {\n      price_below: string;\n    }\n  // These trigger on last trade price\n  | {\n      last_price_above: string;\n    }\n  | {\n      last_price_below: string;\n    }\n  // These trigger on mid-book price\n  | {\n      mid_price_above: string;\n    }\n  | {\n      mid_price_below: string;\n    };\n\nexport interface TriggerServerPlaceOrderParams {\n  id: number | null;\n  product_id: number;\n  order: EIP712OrderValues;\n  trigger: TriggerServerTriggerCriteria;\n  signature: string;\n  digest: string | null;\n  // Trigger service defaults this to true\n  spot_leverage: boolean | null;\n}\n\nexport type TriggerServerCancelOrdersParams =\n  EngineServerExecuteRequestByType['cancel_orders'];\n\nexport type TriggerServerCancelProductOrdersParams =\n  EngineServerExecuteRequestByType['cancel_product_orders'];\n\nexport interface TriggerServerExecuteRequestByType {\n  place_order: TriggerServerPlaceOrderParams;\n  cancel_orders: TriggerServerCancelOrdersParams;\n  cancel_product_orders: TriggerServerCancelProductOrdersParams;\n}\n\nexport type TriggerServerExecuteRequestType =\n  keyof TriggerServerExecuteRequestByType;\n\nexport type TriggerServerExecuteSuccessResult<\n  T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType,\n> = EngineServerExecuteSuccessResult<T>;\n\nexport type TriggerServerExecuteResult<\n  T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType,\n> = TriggerServerExecuteSuccessResult<T> | EngineServerExecuteFailureResult;\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}
+{"version":3,"sources":["../../src/types/serverExecuteTypes.ts"],"sourcesContent":["import { EIP712OrderValues } from '@nadohq/shared';\nimport {\n  EngineServerExecuteFailureResult,\n  EngineServerExecuteRequestByType,\n  EngineServerExecuteSuccessResult,\n} from '@nadohq/engine-client';\nimport { TriggerServerTriggerCriteria } from './serverModelTypes';\n\nexport interface TriggerServerPlaceOrderParams {\n  id: number | null;\n  product_id: number;\n  order: EIP712OrderValues;\n  trigger: TriggerServerTriggerCriteria;\n  signature: string;\n  digest: string | null;\n  // Trigger service defaults this to true\n  spot_leverage: boolean | null;\n  borrow_margin: boolean | null;\n}\n\nexport type TriggerServerCancelOrdersParams =\n  EngineServerExecuteRequestByType['cancel_orders'];\n\nexport type TriggerServerCancelProductOrdersParams =\n  EngineServerExecuteRequestByType['cancel_product_orders'];\n\nexport interface TriggerServerExecuteRequestByType {\n  place_order: TriggerServerPlaceOrderParams;\n  cancel_orders: TriggerServerCancelOrdersParams;\n  cancel_product_orders: TriggerServerCancelProductOrdersParams;\n}\n\nexport type TriggerServerExecuteRequestType =\n  keyof TriggerServerExecuteRequestByType;\n\nexport type TriggerServerExecuteSuccessResult<\n  T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType,\n> = EngineServerExecuteSuccessResult<T>;\n\nexport type TriggerServerExecuteResult<\n  T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType,\n> = TriggerServerExecuteSuccessResult<T> | EngineServerExecuteFailureResult;\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/types/serverExecuteTypes.d.cts

@@ -1,19 +1,7 @@
-import { EIP712OrderValues } from '@nadohq/contracts';
+import { EIP712OrderValues } from '@nadohq/shared';
 import { EngineServerExecuteRequestByType, EngineServerExecuteSuccessResult, EngineServerExecuteFailureResult } from '@nadohq/engine-client';
+import { TriggerServerTriggerCriteria } from './serverModelTypes.cjs';
 
-type TriggerServerTriggerCriteria = {
-    price_above: string;
-} | {
-    price_below: string;
-} | {
-    last_price_above: string;
-} | {
-    last_price_below: string;
-} | {
-    mid_price_above: string;
-} | {
-    mid_price_below: string;
-};
 interface TriggerServerPlaceOrderParams {
     id: number | null;
     product_id: number;
@@ -22,6 +10,7 @@ interface TriggerServerPlaceOrderParams {
     signature: string;
     digest: string | null;
     spot_leverage: boolean | null;
+    borrow_margin: boolean | null;
 }
 type TriggerServerCancelOrdersParams = EngineServerExecuteRequestByType['cancel_orders'];
 type TriggerServerCancelProductOrdersParams = EngineServerExecuteRequestByType['cancel_product_orders'];
@@ -34,4 +23,4 @@ type TriggerServerExecuteRequestType = keyof TriggerServerExecuteRequestByType;
 type TriggerServerExecuteSuccessResult<T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType> = EngineServerExecuteSuccessResult<T>;
 type TriggerServerExecuteResult<T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType> = TriggerServerExecuteSuccessResult<T> | EngineServerExecuteFailureResult;
 
-export type { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams, TriggerServerTriggerCriteria };
+export type { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams };

package/dist/types/serverExecuteTypes.d.ts

@@ -1,19 +1,7 @@
-import { EIP712OrderValues } from '@nadohq/contracts';
+import { EIP712OrderValues } from '@nadohq/shared';
 import { EngineServerExecuteRequestByType, EngineServerExecuteSuccessResult, EngineServerExecuteFailureResult } from '@nadohq/engine-client';
+import { TriggerServerTriggerCriteria } from './serverModelTypes.js';
 
-type TriggerServerTriggerCriteria = {
-    price_above: string;
-} | {
-    price_below: string;
-} | {
-    last_price_above: string;
-} | {
-    last_price_below: string;
-} | {
-    mid_price_above: string;
-} | {
-    mid_price_below: string;
-};
 interface TriggerServerPlaceOrderParams {
     id: number | null;
     product_id: number;
@@ -22,6 +10,7 @@ interface TriggerServerPlaceOrderParams {
     signature: string;
     digest: string | null;
     spot_leverage: boolean | null;
+    borrow_margin: boolean | null;
 }
 type TriggerServerCancelOrdersParams = EngineServerExecuteRequestByType['cancel_orders'];
 type TriggerServerCancelProductOrdersParams = EngineServerExecuteRequestByType['cancel_product_orders'];
@@ -34,4 +23,4 @@ type TriggerServerExecuteRequestType = keyof TriggerServerExecuteRequestByType;
 type TriggerServerExecuteSuccessResult<T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType> = EngineServerExecuteSuccessResult<T>;
 type TriggerServerExecuteResult<T extends TriggerServerExecuteRequestType = TriggerServerExecuteRequestType> = TriggerServerExecuteSuccessResult<T> | EngineServerExecuteFailureResult;
 
-export type { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams, TriggerServerTriggerCriteria };
+export type { TriggerServerCancelOrdersParams, TriggerServerCancelProductOrdersParams, TriggerServerExecuteRequestByType, TriggerServerExecuteRequestType, TriggerServerExecuteResult, TriggerServerExecuteSuccessResult, TriggerServerPlaceOrderParams };

package/dist/types/serverModelTypes.cjs

@@ -0,0 +1,19 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/types/serverModelTypes.ts
+var serverModelTypes_exports = {};
+module.exports = __toCommonJS(serverModelTypes_exports);
+//# sourceMappingURL=serverModelTypes.cjs.map

package/dist/types/serverModelTypes.cjs.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/types/serverModelTypes.ts"],"sourcesContent":["export interface TriggerServerDependency {\n  digest: string;\n  /**\n   * Whether to trigger on partial fills.\n   */\n  on_partial_fill: boolean;\n}\n\nexport type TriggerServerPriceRequirement =\n  // These trigger on fast oracle price\n  | {\n      oracle_price_above: string;\n    }\n  | {\n      oracle_price_below: string;\n    }\n  // These trigger on last trade price\n  | {\n      last_price_above: string;\n    }\n  | {\n      last_price_below: string;\n    }\n  // These trigger on mid-book price\n  | {\n      mid_price_above: string;\n    }\n  | {\n      mid_price_below: string;\n    };\n\nexport interface TriggerServerPriceTriggerCriteria {\n  price_requirement: TriggerServerPriceRequirement;\n  dependency?: TriggerServerDependency;\n}\n\nexport interface TriggerServerTimeTriggerCriteria {\n  /**\n   * Trigger interval in seconds\n   */\n  interval: string;\n  /**\n   * By default, trigger service will split up orders as per total amount / interval\n   * If you want to specify the amounts for each interval, you can provide them here.\n   */\n  amounts?: string[];\n}\n\nexport type TriggerServerTriggerCriteria =\n  | {\n      price_trigger: TriggerServerPriceTriggerCriteria;\n    }\n  | {\n      time_trigger: TriggerServerTimeTriggerCriteria;\n    };\n"],"mappings":";;;;;;;;;;;;;;;;AAAA;AAAA;","names":[]}

package/dist/types/serverModelTypes.d.cts

@@ -0,0 +1,42 @@
+interface TriggerServerDependency {
+    digest: string;
+    /**
+     * Whether to trigger on partial fills.
+     */
+    on_partial_fill: boolean;
+}
+type TriggerServerPriceRequirement = {
+    oracle_price_above: string;
+} | {
+    oracle_price_below: string;
+} | {
+    last_price_above: string;
+} | {
+    last_price_below: string;
+} | {
+    mid_price_above: string;
+} | {
+    mid_price_below: string;
+};
+interface TriggerServerPriceTriggerCriteria {
+    price_requirement: TriggerServerPriceRequirement;
+    dependency?: TriggerServerDependency;
+}
+interface TriggerServerTimeTriggerCriteria {
+    /**
+     * Trigger interval in seconds
+     */
+    interval: string;
+    /**
+     * 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?: string[];
+}
+type TriggerServerTriggerCriteria = {
+    price_trigger: TriggerServerPriceTriggerCriteria;
+} | {
+    time_trigger: TriggerServerTimeTriggerCriteria;
+};
+
+export type { TriggerServerDependency, TriggerServerPriceRequirement, TriggerServerPriceTriggerCriteria, TriggerServerTimeTriggerCriteria, TriggerServerTriggerCriteria };

package/dist/types/serverModelTypes.d.ts

@@ -0,0 +1,42 @@
+interface TriggerServerDependency {
+    digest: string;
+    /**
+     * Whether to trigger on partial fills.
+     */
+    on_partial_fill: boolean;
+}
+type TriggerServerPriceRequirement = {
+    oracle_price_above: string;
+} | {
+    oracle_price_below: string;
+} | {
+    last_price_above: string;
+} | {
+    last_price_below: string;
+} | {
+    mid_price_above: string;
+} | {
+    mid_price_below: string;
+};
+interface TriggerServerPriceTriggerCriteria {
+    price_requirement: TriggerServerPriceRequirement;
+    dependency?: TriggerServerDependency;
+}
+interface TriggerServerTimeTriggerCriteria {
+    /**
+     * Trigger interval in seconds
+     */
+    interval: string;
+    /**
+     * 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?: string[];
+}
+type TriggerServerTriggerCriteria = {
+    price_trigger: TriggerServerPriceTriggerCriteria;
+} | {
+    time_trigger: TriggerServerTimeTriggerCriteria;
+};
+
+export type { TriggerServerDependency, TriggerServerPriceRequirement, TriggerServerPriceTriggerCriteria, TriggerServerTimeTriggerCriteria, TriggerServerTriggerCriteria };

package/dist/types/serverModelTypes.js

@@ -0,0 +1 @@
+//# sourceMappingURL=serverModelTypes.js.map

package/dist/types/serverModelTypes.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":[],"sourcesContent":[],"mappings":"","names":[]}

package/dist/types/serverQueryTypes.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/types/serverQueryTypes.ts"],"sourcesContent":["import { EIP712ListTriggerOrdersValues, SignedTx } from '@nadohq/contracts';\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 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}\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  | '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":[]}

package/dist/types/serverQueryTypes.d.cts

@@ -1,6 +1,7 @@
-import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/contracts';
+import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes.cjs';
+import './serverModelTypes.cjs';
 
 type TriggerServerOrderStatus = 'pending' | {
     triggered: EngineServerExecuteResult;
@@ -12,12 +13,15 @@ type TriggerServerOrderStatus = 'pending' | {
 /**
  * Request types
  */
+type TriggerServerTriggerTypeFilter = 'price_trigger' | 'twap';
 interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
     pending: boolean;
     product_id?: number;
     max_update_time?: number;
     digests?: string[];
     limit?: number;
+    trigger_types?: TriggerServerTriggerTypeFilter[];
+    reduce_only?: boolean;
 }
 interface TriggerServerQueryRequestByType {
     list_trigger_orders: TriggerServerListTriggerOrdersParams;
@@ -51,4 +55,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 { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter };

package/dist/types/serverQueryTypes.d.ts

@@ -1,6 +1,7 @@
-import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/contracts';
+import { SignedTx, EIP712ListTriggerOrdersValues } from '@nadohq/shared';
 import { EngineServerExecuteResult } from '@nadohq/engine-client';
 import { TriggerServerPlaceOrderParams } from './serverExecuteTypes.js';
+import './serverModelTypes.js';
 
 type TriggerServerOrderStatus = 'pending' | {
     triggered: EngineServerExecuteResult;
@@ -12,12 +13,15 @@ type TriggerServerOrderStatus = 'pending' | {
 /**
  * Request types
  */
+type TriggerServerTriggerTypeFilter = 'price_trigger' | 'twap';
 interface TriggerServerListTriggerOrdersParams extends SignedTx<EIP712ListTriggerOrdersValues> {
     pending: boolean;
     product_id?: number;
     max_update_time?: number;
     digests?: string[];
     limit?: number;
+    trigger_types?: TriggerServerTriggerTypeFilter[];
+    reduce_only?: boolean;
 }
 interface TriggerServerQueryRequestByType {
     list_trigger_orders: TriggerServerListTriggerOrdersParams;
@@ -51,4 +55,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 { TriggerServerListTriggerOrdersParams, TriggerServerListTriggerOrdersResponse, TriggerServerOrder, TriggerServerOrderInfo, TriggerServerOrderStatus, TriggerServerQueryFailureResponse, TriggerServerQueryRequestByType, TriggerServerQueryRequestType, TriggerServerQueryResponse, TriggerServerQueryResponseByType, TriggerServerQuerySuccessResponse, TriggerServerTriggerTypeFilter };

package/package.json

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

package/src/TriggerClient.ts

@@ -7,12 +7,12 @@ 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 {
@@ -52,7 +52,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 +81,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 +99,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);
@@ -176,6 +182,8 @@ export class TriggerClient {
         pending: params.pending,
         product_id: params.productId,
         digests: params.digests,
+        trigger_types: params.triggerTypes,
+        reduce_only: params.reduceOnly,
         signature,
         tx,
       };
@@ -267,7 +275,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}`,
       );
     }
   }