@reyaxyz/api-sdk 0.112.0 → 0.112.1

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-1.67%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-7.96%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-0.64%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-1.68%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-1.71%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-7.75%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-0.66%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-1.72%25-red.svg?style=flat) |
 

package/dist/clients/modules/conditional-orders/index.js

@@ -73,18 +73,6 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
-    ConditionalOrdersClient.prototype.getConditionalOrdersHistoryForMarginAccountPaginated = function (params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var uri;
-            return __generator(this, function (_a) {
-                uri = "/api/conditional-orders/get-orders-by-account/".concat(params.marginAccountId, "/paginated");
-                return [2 /*return*/, this.get(uri, {
-                        page: params.page,
-                        perPage: params.perPage,
-                    })];
-            });
-        });
-    };
     ConditionalOrdersClient.prototype.alreadyGaveTradePermissions = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var uri, response;
@@ -102,23 +90,6 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
-    ConditionalOrdersClient.prototype.cancelSLOrder = function (params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var signature, uri;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, (0, common_1.signCancelConditionalOrder)(params.signer, params.orderId)];
-                    case 1:
-                        signature = _a.sent();
-                        uri = "/api/conditional-orders/sl/cancel-order";
-                        return [2 /*return*/, this.put(uri, {}, {
-                                orderId: params.orderId,
-                                userSignature: signature,
-                            })];
-                }
-            });
-        });
-    };
     ConditionalOrdersClient.prototype.cancelConditionalOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var signature, uri, res;
@@ -139,58 +110,23 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
-    ConditionalOrdersClient.prototype.registerSLOrder = function (params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var inputs, uri, _a, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.parseSlOrderInputs(params.signer, params.marginAccountId, params.marketId, params.stopLossPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds)];
-                    case 1:
-                        inputs = _d.sent();
-                        uri = "/api/conditional-orders/sl/create-order";
-                        _a = this.post;
-                        _b = [uri,
-                            {}];
-                        _c = {
-                            accountId: params.marginAccountId,
-                            marketId: params.marketId,
-                            isLong: inputs.positionBase < 0,
-                            stopPrice: params.stopLossPrice
-                        };
-                        return [4 /*yield*/, params.signer.getAddress()];
-                    case 2: return [2 /*return*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
-                                _c.nonce = inputs.nonce.toString(),
-                                _c.signature = inputs.signature,
-                                _c.deadline = inputs.deadline,
-                                _c.orderPriceLimit = inputs.orderPriceLimit.toString(),
-                                _c.exchangeId = params.supportingParams.exchangeId,
-                                _c.poolId = params.supportingParams.counterpartyAccountIds[0],
-                                _c.timestampMs = inputs.creationTimestampMs,
-                                _c)]))];
-                }
-            });
-        });
-    };
     ConditionalOrdersClient.prototype.registerConditionalOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var inputs, uri, result, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds, 
-                        // TODO: @Costin to fix implementation
-                        params.orderSize)];
+                    case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds, params.orderSize)];
                     case 1:
                         inputs = _d.sent();
-                        uri = "/api/conditional-orders/create-order";
+                        uri = "/api/conditional-orders/create-or-update-order";
                         _a = this.post;
                         _b = [uri,
                             {}];
                         _c = {
                             accountId: params.marginAccountId,
                             marketId: params.marketId,
-                            isLong: inputs.positionBase < 0,
+                            isLong: inputs.actualOrderSize > 0,
                             orderType: params.orderType,
                             triggerPrice: params.triggerPrice
                         };
@@ -211,39 +147,6 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
-    ConditionalOrdersClient.prototype.updateSLOrder = function (params) {
-        return __awaiter(this, void 0, void 0, function () {
-            var inputs, uri, _a, _b;
-            var _c;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.parseSlOrderInputs(params.signer, params.marginAccountId, params.marketId, params.stopLossPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds)];
-                    case 1:
-                        inputs = _d.sent();
-                        uri = "/api/conditional-orders/sl/update-order";
-                        _a = this.post;
-                        _b = [uri,
-                            {}];
-                        _c = {
-                            accountId: params.marginAccountId,
-                            marketId: params.marketId,
-                            isLong: inputs.positionBase < 0,
-                            stopPrice: params.stopLossPrice
-                        };
-                        return [4 /*yield*/, params.signer.getAddress()];
-                    case 2: return [2 /*return*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
-                                _c.nonce = inputs.nonce.toString(),
-                                _c.signature = inputs.signature,
-                                _c.deadline = inputs.deadline,
-                                _c.orderPriceLimit = inputs.orderPriceLimit.toString(),
-                                _c.exchangeId = params.supportingParams.exchangeId,
-                                _c.poolId = params.supportingParams.counterpartyAccountIds[0],
-                                _c.timestampMs = inputs.creationTimestampMs,
-                                _c)]))];
-                }
-            });
-        });
-    };
     ConditionalOrdersClient.prototype.updateConditionalOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var inputs, uri, result, _a, _b;
@@ -253,14 +156,14 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                     case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds)];
                     case 1:
                         inputs = _d.sent();
-                        uri = "/api/conditional-orders/update-order";
+                        uri = "/api/conditional-orders/create-or-update-order";
                         _a = this.post;
                         _b = [uri,
                             {}];
                         _c = {
                             accountId: params.marginAccountId,
                             marketId: params.marketId,
-                            isLong: inputs.positionBase < 0,
+                            isLong: inputs.actualOrderSize > 0,
                             orderType: params.orderType,
                             triggerPrice: params.triggerPrice
                         };
@@ -273,6 +176,7 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                                 _c.exchangeId = params.supportingParams.exchangeId,
                                 _c.poolId = params.supportingParams.counterpartyAccountIds[0],
                                 _c.timestampMs = inputs.creationTimestampMs,
+                                _c.cancelOrderId = params.cancelOrderId,
                                 _c)]))];
                     case 3:
                         result = _d.sent();
@@ -292,63 +196,43 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
     };
     ConditionalOrdersClient.prototype.parseConditionalOrderInputs = function (signer, accountId, marketId, orderType, triggerPrice, exchangeId, counterpartyAccountIds, orderSize) {
         return __awaiter(this, void 0, void 0, function () {
-            var position, positionBase, isLongOrder, orderPriceLimit, inputs, creationTimestampMs, nonce, signature;
+            var inputs, actualOrderSize, isLongOrder, orderPriceLimit, position, positionBase, creationTimestampMs, nonce, signature;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        // TODO: @Costin to fix implementation
-                        console.log('orderSize', orderSize);
-                        return [4 /*yield*/, this.getPosition(accountId, marketId)];
-                    case 1:
-                        position = _a.sent();
-                        positionBase = position.base;
-                        if (positionBase === 0) {
-                            throw new Error('Position with no exposure');
+                        if (!(orderType === common_1.ConditionalOrderType.LIMIT_ORDER)) return [3 /*break*/, 1];
+                        if (orderSize === undefined) {
+                            throw new Error('Order base is required for limit orders');
                         }
-                        isLongOrder = positionBase < 0;
+                        if (orderSize === 0) {
+                            throw new Error('Cannot create an empty limit order');
+                        }
+                        actualOrderSize = orderSize;
+                        isLongOrder = actualOrderSize > 0;
                         orderPriceLimit = (0, common_1.calculateMaxPriceLimit)(isLongOrder);
-                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['bool', 'uint256', 'uint256'], [isLongOrder, (0, common_1.scale)(18)(triggerPrice), orderPriceLimit]);
-                        creationTimestampMs = Date.now();
-                        nonce = (0, utils_1.createNonce)(accountId, marketId, creationTimestampMs);
-                        return [4 /*yield*/, (0, common_1.signConditionalOrder)(signer, this.reyaChainId, accountId, marketId, exchangeId, counterpartyAccountIds, orderType, inputs, nonce, common_1.CONDITIONAL_ORDER_SIG_DEADLINE)];
+                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [(0, common_1.scale)(18)(orderSize), (0, common_1.scale)(18)(triggerPrice)]);
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, this.getPosition(accountId, marketId)];
                     case 2:
-                        signature = _a.sent();
-                        return [2 /*return*/, {
-                                signature: signature,
-                                positionBase: positionBase,
-                                orderPriceLimit: orderPriceLimit,
-                                nonce: nonce,
-                                deadline: common_1.CONDITIONAL_ORDER_SIG_DEADLINE,
-                                creationTimestampMs: creationTimestampMs,
-                            }];
-                }
-            });
-        });
-    };
-    // todo: IR deprecate
-    ConditionalOrdersClient.prototype.parseSlOrderInputs = function (signer, accountId, marketId, stopLossPrice, exchangeId, counterpartyAccountIds) {
-        return __awaiter(this, void 0, void 0, function () {
-            var position, positionBase, isLongOrder, orderPriceLimit, inputs, creationTimestampMs, nonce, signature;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.getPosition(accountId, marketId)];
-                    case 1:
                         position = _a.sent();
                         positionBase = position.base;
                         if (positionBase === 0) {
-                            throw new Error('Position with no exposure');
+                            throw new Error('Cannot create SL or TP order for closed positions');
                         }
-                        isLongOrder = positionBase < 0;
+                        actualOrderSize = -positionBase;
+                        isLongOrder = actualOrderSize > 0;
                         orderPriceLimit = (0, common_1.calculateMaxPriceLimit)(isLongOrder);
-                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['bool', 'uint256', 'uint256'], [isLongOrder, (0, common_1.scale)(18)(stopLossPrice), orderPriceLimit]);
+                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['bool', 'uint256', 'uint256'], [isLongOrder, (0, common_1.scale)(18)(triggerPrice), orderPriceLimit]);
+                        _a.label = 3;
+                    case 3:
                         creationTimestampMs = Date.now();
                         nonce = (0, utils_1.createNonce)(accountId, marketId, creationTimestampMs);
-                        return [4 /*yield*/, (0, common_1.signConditionalOrder)(signer, this.reyaChainId, accountId, marketId, exchangeId, counterpartyAccountIds, common_1.ConditionalOrderType.STOP_LOSS, inputs, nonce, common_1.CONDITIONAL_ORDER_SIG_DEADLINE)];
-                    case 2:
+                        return [4 /*yield*/, (0, common_1.signConditionalOrder)(signer, this.reyaChainId, accountId, marketId, exchangeId, counterpartyAccountIds, orderType, inputs, nonce, common_1.CONDITIONAL_ORDER_SIG_DEADLINE)];
+                    case 4:
                         signature = _a.sent();
                         return [2 /*return*/, {
                                 signature: signature,
-                                positionBase: positionBase,
+                                actualOrderSize: actualOrderSize,
                                 orderPriceLimit: orderPriceLimit,
                                 nonce: nonce,
                                 deadline: common_1.CONDITIONAL_ORDER_SIG_DEADLINE,

package/dist/clients/modules/conditional-orders/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  calculateMaxPriceLimit,\n  PositionEntity,\n  RestClient,\n  ReyaChainId,\n  signConditionalOrder,\n  signCancelConditionalOrder,\n  StopLossOrder,\n  ConditionalOrder,\n  ConditionalOrderType,\n  scale,\n  CONDITIONAL_ORDER_SIG_DEADLINE,\n} from '@reyaxyz/common';\nimport { AbiCoder } from 'ethers';\nimport { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  AlreadyGaveTradePermissionParams,\n  AlreadyGaveTradePermissionResult,\n  CancelConditionalOrderParams,\n  CancelConditionalOrderResult,\n  CancelSLOrderParams,\n  CancelSLOrderResult,\n  GetConditionalOrdersHistoryForMarginAccountPaginatedParams,\n  GetConditionalOrdersHistoryForMarginAccountPaginatedResult,\n  GetConditionalOrdersHistoryForMarginAccountParams,\n  GetConditionalOrdersHistoryForMarginAccountResult,\n  RegisterConditionalOrderParams,\n  RegisterConditionalOrderResult,\n  RegisterSLOrderParams,\n  RegisterSLOrderResult,\n  UpdateConditionalOrderParams,\n  UpdateConditionalOrderResult,\n  UpdateSLOrderParams,\n  UpdateSLOrderResult,\n} from './types';\nimport { createNonce } from './utils';\n\nexport default class ConditionalOrdersClient extends RestClient {\n  private reyaChainId: ReyaChainId;\n\n  constructor(reyaChainId: ReyaChainId, host: string) {\n    super(host);\n    this.reyaChainId = reyaChainId;\n  }\n\n  //  ------ Conditional Orders History ---\n  async getConditionalOrdersHistoryForMarginAccount(\n    params: GetConditionalOrdersHistoryForMarginAccountParams,\n  ): Promise<GetConditionalOrdersHistoryForMarginAccountResult> {\n    const uri = `/api/conditional-orders/get-orders-by-account/${params.marginAccountId}`;\n    return this.get<GetConditionalOrdersHistoryForMarginAccountResult>(uri, {\n      limit: params.limit,\n    });\n  }\n\n  async getConditionalOrdersHistoryForMarginAccountPaginated(\n    params: GetConditionalOrdersHistoryForMarginAccountPaginatedParams,\n  ): Promise<GetConditionalOrdersHistoryForMarginAccountPaginatedResult> {\n    const uri = `/api/conditional-orders/get-orders-by-account/${params.marginAccountId}/paginated`;\n    return this.get<GetConditionalOrdersHistoryForMarginAccountPaginatedResult>(\n      uri,\n      {\n        page: params.page,\n        perPage: params.perPage,\n      },\n    );\n  }\n\n  async alreadyGaveTradePermissions(\n    params: AlreadyGaveTradePermissionParams,\n  ): Promise<AlreadyGaveTradePermissionResult> {\n    const uri = `/api/conditional-orders/gave-trade-permission/${params.accountId}`;\n    const response = await this.get<boolean>(uri);\n\n    return {\n      permissionGiven: response,\n    };\n  }\n\n  async cancelSLOrder(\n    params: CancelSLOrderParams,\n  ): Promise<CancelSLOrderResult> {\n    const signature = await signCancelConditionalOrder(\n      params.signer,\n      params.orderId,\n    );\n\n    const uri = `/api/conditional-orders/sl/cancel-order`;\n    return this.put<StopLossOrder>(\n      uri,\n      {},\n      {\n        orderId: params.orderId,\n        userSignature: signature,\n      },\n    );\n  }\n\n  async cancelConditionalOrder(\n    params: CancelConditionalOrderParams,\n  ): Promise<CancelConditionalOrderResult> {\n    const signature = await signCancelConditionalOrder(\n      params.signer,\n      params.orderId,\n    );\n\n    const uri = `/api/conditional-orders/cancel-order`;\n    const res = await this.put<ConditionalOrder>(\n      uri,\n      {},\n      {\n        orderId: params.orderId,\n        userSignature: signature,\n      },\n    );\n    return res;\n  }\n\n  async registerSLOrder(\n    params: RegisterSLOrderParams,\n  ): Promise<RegisterSLOrderResult> {\n    const inputs = await this.parseSlOrderInputs(\n      params.signer,\n      params.marginAccountId,\n      params.marketId,\n      params.stopLossPrice,\n      params.supportingParams.exchangeId,\n      params.supportingParams.counterpartyAccountIds,\n    );\n\n    // create new entry\n    const uri = `/api/conditional-orders/sl/create-order`;\n    return this.post<StopLossOrder>(\n      uri,\n      {},\n      {\n        accountId: params.marginAccountId,\n        marketId: params.marketId,\n        isLong: inputs.positionBase < 0,\n        stopPrice: params.stopLossPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: inputs.nonce.toString(),\n        signature: inputs.signature,\n        deadline: inputs.deadline,\n        orderPriceLimit: inputs.orderPriceLimit.toString(),\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n      },\n    );\n  }\n\n  async registerConditionalOrder(\n    params: RegisterConditionalOrderParams,\n  ): Promise<RegisterConditionalOrderResult> {\n    const inputs = await this.parseConditionalOrderInputs(\n      params.signer,\n      params.marginAccountId,\n      params.marketId,\n      params.orderType,\n      params.triggerPrice,\n      params.supportingParams.exchangeId,\n      params.supportingParams.counterpartyAccountIds,\n      // TODO: @Costin to fix implementation\n      params.orderSize,\n    );\n\n    // create new entry\n    const uri = `/api/conditional-orders/create-order`;\n    const result = await this.post<ConditionalOrder>(\n      uri,\n      {},\n      {\n        accountId: params.marginAccountId,\n        marketId: params.marketId,\n        isLong: inputs.positionBase < 0,\n        orderType: params.orderType,\n        triggerPrice: params.triggerPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: inputs.nonce.toString(),\n        signature: inputs.signature,\n        deadline: inputs.deadline,\n        orderPriceLimit: inputs.orderPriceLimit.toString(),\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n      },\n    );\n    return result;\n  }\n\n  async updateSLOrder(\n    params: UpdateSLOrderParams,\n  ): Promise<UpdateSLOrderResult> {\n    const inputs = await this.parseSlOrderInputs(\n      params.signer,\n      params.marginAccountId,\n      params.marketId,\n      params.stopLossPrice,\n      params.supportingParams.exchangeId,\n      params.supportingParams.counterpartyAccountIds,\n    );\n\n    // create new entry\n    const uri = `/api/conditional-orders/sl/update-order`;\n    return this.post<StopLossOrder>(\n      uri,\n      {},\n      {\n        accountId: params.marginAccountId,\n        marketId: params.marketId,\n        isLong: inputs.positionBase < 0,\n        stopPrice: params.stopLossPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: inputs.nonce.toString(),\n        signature: inputs.signature,\n        deadline: inputs.deadline,\n        orderPriceLimit: inputs.orderPriceLimit.toString(),\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n      },\n    );\n  }\n\n  async updateConditionalOrder(\n    params: UpdateConditionalOrderParams,\n  ): Promise<UpdateConditionalOrderResult> {\n    const inputs = await this.parseConditionalOrderInputs(\n      params.signer,\n      params.marginAccountId,\n      params.marketId,\n      params.orderType,\n      params.triggerPrice,\n      params.supportingParams.exchangeId,\n      params.supportingParams.counterpartyAccountIds,\n    );\n\n    // create new entry\n    const uri = `/api/conditional-orders/update-order`;\n    const result = await this.post<ConditionalOrder>(\n      uri,\n      {},\n      {\n        accountId: params.marginAccountId,\n        marketId: params.marketId,\n        isLong: inputs.positionBase < 0,\n        orderType: params.orderType,\n        triggerPrice: params.triggerPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: inputs.nonce.toString(),\n        signature: inputs.signature,\n        deadline: inputs.deadline,\n        orderPriceLimit: inputs.orderPriceLimit.toString(),\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n      },\n    );\n    return result;\n  }\n\n  private async getPosition(\n    accountId: number,\n    marketId: number,\n  ): Promise<PositionEntity> {\n    const uri = `/api/accounts/marginAccount/position/${accountId}/${marketId}`;\n    return this.get<PositionEntity>(uri);\n  }\n\n  private async parseConditionalOrderInputs(\n    signer: Signer | JsonRpcSigner,\n    accountId: number,\n    marketId: number,\n    orderType: ConditionalOrderType,\n    triggerPrice: number,\n    exchangeId: number,\n    counterpartyAccountIds: number[],\n    orderSize?: number,\n  ): Promise<{\n    signature: string;\n    positionBase: number;\n    orderPriceLimit: bigint;\n    nonce: bigint;\n    deadline: number;\n    creationTimestampMs: number;\n    orderSize?: number;\n  }> {\n    // TODO: @Costin to fix implementation\n    console.log('orderSize', orderSize);\n\n    const position = await this.getPosition(accountId, marketId);\n    const positionBase = position.base;\n\n    if (positionBase === 0) {\n      throw new Error('Position with no exposure');\n    }\n\n    const isLongOrder = positionBase < 0;\n    const orderPriceLimit = calculateMaxPriceLimit(isLongOrder);\n\n    const inputs = AbiCoder.defaultAbiCoder().encode(\n      ['bool', 'uint256', 'uint256'],\n      [isLongOrder, scale(18)(triggerPrice), orderPriceLimit],\n    );\n    const creationTimestampMs = Date.now();\n    const nonce = createNonce(accountId, marketId, creationTimestampMs);\n\n    const signature = await signConditionalOrder(\n      signer,\n      this.reyaChainId,\n      accountId,\n      marketId,\n      exchangeId,\n      counterpartyAccountIds,\n      orderType,\n      inputs,\n      nonce,\n      CONDITIONAL_ORDER_SIG_DEADLINE,\n    );\n\n    return {\n      signature,\n      positionBase,\n      orderPriceLimit,\n      nonce,\n      deadline: CONDITIONAL_ORDER_SIG_DEADLINE,\n      creationTimestampMs,\n    };\n  }\n\n  // todo: IR deprecate\n  private async parseSlOrderInputs(\n    signer: Signer | JsonRpcSigner,\n    accountId: number,\n    marketId: number,\n    stopLossPrice: number,\n    exchangeId: number,\n    counterpartyAccountIds: number[],\n  ): Promise<{\n    signature: string;\n    positionBase: number;\n    orderPriceLimit: bigint;\n    nonce: bigint;\n    deadline: number;\n    creationTimestampMs: number;\n  }> {\n    const position = await this.getPosition(accountId, marketId);\n    const positionBase = position.base;\n\n    if (positionBase === 0) {\n      throw new Error('Position with no exposure');\n    }\n\n    const isLongOrder = positionBase < 0;\n    const orderPriceLimit = calculateMaxPriceLimit(isLongOrder);\n\n    const inputs = AbiCoder.defaultAbiCoder().encode(\n      ['bool', 'uint256', 'uint256'],\n      [isLongOrder, scale(18)(stopLossPrice), orderPriceLimit],\n    );\n    const creationTimestampMs = Date.now();\n    const nonce = createNonce(accountId, marketId, creationTimestampMs);\n\n    const signature = await signConditionalOrder(\n      signer,\n      this.reyaChainId,\n      accountId,\n      marketId,\n      exchangeId,\n      counterpartyAccountIds,\n      ConditionalOrderType.STOP_LOSS,\n      inputs,\n      nonce,\n      CONDITIONAL_ORDER_SIG_DEADLINE,\n    );\n\n    return {\n      signature,\n      positionBase,\n      orderPriceLimit,\n      nonce,\n      deadline: CONDITIONAL_ORDER_SIG_DEADLINE,\n      creationTimestampMs,\n    };\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  calculateMaxPriceLimit,\n  PositionEntity,\n  RestClient,\n  ReyaChainId,\n  signConditionalOrder,\n  signCancelConditionalOrder,\n  ConditionalOrder,\n  ConditionalOrderType,\n  scale,\n  CONDITIONAL_ORDER_SIG_DEADLINE,\n} from '@reyaxyz/common';\nimport { AbiCoder } from 'ethers';\nimport { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  AlreadyGaveTradePermissionParams,\n  AlreadyGaveTradePermissionResult,\n  CancelConditionalOrderParams,\n  CancelConditionalOrderResult,\n  GetConditionalOrdersHistoryForMarginAccountParams,\n  GetConditionalOrdersHistoryForMarginAccountResult,\n  RegisterConditionalOrderParams,\n  RegisterConditionalOrderResult,\n  UpdateConditionalOrderParams,\n  UpdateConditionalOrderResult,\n} from './types';\nimport { createNonce } from './utils';\n\nexport default class ConditionalOrdersClient extends RestClient {\n  private reyaChainId: ReyaChainId;\n\n  constructor(reyaChainId: ReyaChainId, host: string) {\n    super(host);\n    this.reyaChainId = reyaChainId;\n  }\n\n  //  ------ Conditional Orders History ---\n  async getConditionalOrdersHistoryForMarginAccount(\n    params: GetConditionalOrdersHistoryForMarginAccountParams,\n  ): Promise<GetConditionalOrdersHistoryForMarginAccountResult> {\n    const uri = `/api/conditional-orders/get-orders-by-account/${params.marginAccountId}`;\n    return this.get<GetConditionalOrdersHistoryForMarginAccountResult>(uri, {\n      limit: params.limit,\n    });\n  }\n\n  async alreadyGaveTradePermissions(\n    params: AlreadyGaveTradePermissionParams,\n  ): Promise<AlreadyGaveTradePermissionResult> {\n    const uri = `/api/conditional-orders/gave-trade-permission/${params.accountId}`;\n    const response = await this.get<boolean>(uri);\n\n    return {\n      permissionGiven: response,\n    };\n  }\n\n  async cancelConditionalOrder(\n    params: CancelConditionalOrderParams,\n  ): Promise<CancelConditionalOrderResult> {\n    const signature = await signCancelConditionalOrder(\n      params.signer,\n      params.orderId,\n    );\n\n    const uri = `/api/conditional-orders/cancel-order`;\n    const res = await this.put<ConditionalOrder>(\n      uri,\n      {},\n      {\n        orderId: params.orderId,\n        userSignature: signature,\n      },\n    );\n    return res;\n  }\n\n  async registerConditionalOrder(\n    params: RegisterConditionalOrderParams,\n  ): Promise<RegisterConditionalOrderResult> {\n    const inputs = await this.parseConditionalOrderInputs(\n      params.signer,\n      params.marginAccountId,\n      params.marketId,\n      params.orderType,\n      params.triggerPrice,\n      params.supportingParams.exchangeId,\n      params.supportingParams.counterpartyAccountIds,\n      params.orderSize,\n    );\n\n    // create new entry\n    const uri = `/api/conditional-orders/create-or-update-order`;\n    const result = await this.post<ConditionalOrder>(\n      uri,\n      {},\n      {\n        accountId: params.marginAccountId,\n        marketId: params.marketId,\n        isLong: inputs.actualOrderSize > 0,\n        orderType: params.orderType,\n        triggerPrice: params.triggerPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: inputs.nonce.toString(),\n        signature: inputs.signature,\n        deadline: inputs.deadline,\n        orderPriceLimit: inputs.orderPriceLimit.toString(),\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n      },\n    );\n    return result;\n  }\n\n  async updateConditionalOrder(\n    params: UpdateConditionalOrderParams,\n  ): Promise<UpdateConditionalOrderResult> {\n    const inputs = await this.parseConditionalOrderInputs(\n      params.signer,\n      params.marginAccountId,\n      params.marketId,\n      params.orderType,\n      params.triggerPrice,\n      params.supportingParams.exchangeId,\n      params.supportingParams.counterpartyAccountIds,\n    );\n\n    // create new entry\n    const uri = `/api/conditional-orders/create-or-update-order`;\n    const result = await this.post<ConditionalOrder>(\n      uri,\n      {},\n      {\n        accountId: params.marginAccountId,\n        marketId: params.marketId,\n        isLong: inputs.actualOrderSize > 0,\n        orderType: params.orderType,\n        triggerPrice: params.triggerPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: inputs.nonce.toString(),\n        signature: inputs.signature,\n        deadline: inputs.deadline,\n        orderPriceLimit: inputs.orderPriceLimit.toString(),\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n        cancelOrderId: params.cancelOrderId,\n      },\n    );\n    return result;\n  }\n\n  private async getPosition(\n    accountId: number,\n    marketId: number,\n  ): Promise<PositionEntity> {\n    const uri = `/api/accounts/marginAccount/position/${accountId}/${marketId}`;\n    return this.get<PositionEntity>(uri);\n  }\n\n  private async parseConditionalOrderInputs(\n    signer: Signer | JsonRpcSigner,\n    accountId: number,\n    marketId: number,\n    orderType: ConditionalOrderType,\n    triggerPrice: number,\n    exchangeId: number,\n    counterpartyAccountIds: number[],\n    orderSize?: number,\n  ): Promise<{\n    signature: string;\n    actualOrderSize: number;\n    orderPriceLimit: bigint;\n    nonce: bigint;\n    deadline: number;\n    creationTimestampMs: number;\n  }> {\n    let inputs: string;\n    let actualOrderSize: number;\n    let isLongOrder: boolean;\n    let orderPriceLimit: bigint;\n\n    if (orderType === ConditionalOrderType.LIMIT_ORDER) {\n      if (orderSize === undefined) {\n        throw new Error('Order base is required for limit orders');\n      }\n\n      if (orderSize === 0) {\n        throw new Error('Cannot create an empty limit order');\n      }\n\n      actualOrderSize = orderSize;\n      isLongOrder = actualOrderSize > 0;\n      orderPriceLimit = calculateMaxPriceLimit(isLongOrder);\n\n      inputs = AbiCoder.defaultAbiCoder().encode(\n        ['int256', 'uint256'],\n        [scale(18)(orderSize), scale(18)(triggerPrice)],\n      );\n    } else {\n      const position = await this.getPosition(accountId, marketId);\n      const positionBase = position.base;\n\n      if (positionBase === 0) {\n        throw new Error('Cannot create SL or TP order for closed positions');\n      }\n\n      actualOrderSize = -positionBase;\n      isLongOrder = actualOrderSize > 0;\n      orderPriceLimit = calculateMaxPriceLimit(isLongOrder);\n\n      inputs = AbiCoder.defaultAbiCoder().encode(\n        ['bool', 'uint256', 'uint256'],\n        [isLongOrder, scale(18)(triggerPrice), orderPriceLimit],\n      );\n    }\n\n    const creationTimestampMs = Date.now();\n    const nonce = createNonce(accountId, marketId, creationTimestampMs);\n\n    const signature = await signConditionalOrder(\n      signer,\n      this.reyaChainId,\n      accountId,\n      marketId,\n      exchangeId,\n      counterpartyAccountIds,\n      orderType,\n      inputs,\n      nonce,\n      CONDITIONAL_ORDER_SIG_DEADLINE,\n    );\n\n    return {\n      signature,\n      actualOrderSize,\n      orderPriceLimit,\n      nonce,\n      deadline: CONDITIONAL_ORDER_SIG_DEADLINE,\n      creationTimestampMs,\n    };\n  }\n}\n"]}

package/dist/clients/modules/conditional-orders/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["clients/modules/conditional-orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import {\n  StopLossOrder,\n  ConditionalOrder,\n  UnifiedConditionalOrderType,\n  ConditionalOrderType,\n} from '@reyaxyz/common';\nimport { Signer, JsonRpcSigner } from 'ethers';\nimport { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';\n\n// todo: IR to deprecate\nexport type CancelSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  orderId: string;\n};\n\n// todo: IR to deprecate\nexport type CancelSLOrderResult = StopLossOrder;\n\nexport type CancelConditionalOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  orderId: string;\n};\n\nexport type CancelConditionalOrderResult = ConditionalOrder;\n\nexport type ConditionalOrderDetails = {\n  accountId: number;\n  marketId: number;\n  exchangeId: number;\n  counterpartyAccountIds: number[];\n  orderType: number;\n  inputs: string;\n  signer: string;\n  nonce: bigint;\n};\n\nexport type OrderSupportingParams = {\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\n// todo: IR to deprecate\nexport type RegisterSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  stopLossPrice: number;\n  marketId: number;\n  supportingParams: OrderSupportingParams;\n};\n\nexport type RegisterConditionalOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  triggerPrice: number;\n  orderType: ConditionalOrderType;\n  marketId: number;\n  supportingParams: OrderSupportingParams;\n  orderSize?: number;\n};\n\n// todo: IR to deprecate\nexport type UpdateSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  stopLossPrice: number;\n  marketId: number;\n  supportingParams: OrderSupportingParams;\n};\n\nexport type UpdateConditionalOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  triggerPrice: number;\n  orderType: ConditionalOrderType;\n  marketId: number;\n  supportingParams: OrderSupportingParams;\n};\n\n// todo: IR to deprecate\nexport type RegisterSLOrderResult = StopLossOrder;\nexport type UpdateSLOrderResult = StopLossOrder;\n\nexport type RegisterConditionalOrderResult = ConditionalOrder;\nexport type UpdateConditionalOrderResult = ConditionalOrder;\n\nexport type AlreadyGaveTradePermissionParams = {\n  accountId: number;\n};\n\nexport type AlreadyGaveTradePermissionResult = {\n  permissionGiven: boolean;\n};\n\n// ---- Conditional Orders History ---\nexport type GetConditionalOrdersHistoryForMarginAccountParams = {\n  address: string;\n  marginAccountId: MarginAccountEntity['id'];\n  limit?: number;\n};\nexport type GetConditionalOrdersHistoryForMarginAccountPaginatedParams = {\n  address: string;\n  marginAccountId: MarginAccountEntity['id'];\n  page: number;\n  perPage: number;\n};\n\nexport type GetConditionalOrdersHistoryForMarginAccountResult =\n  UnifiedConditionalOrderType[];\nexport type GetConditionalOrdersHistoryForMarginAccountPaginatedResult = {\n  data: UnifiedConditionalOrderType[];\n  totalCount: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["clients/modules/conditional-orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import {\n  ConditionalOrder,\n  UnifiedConditionalOrderType,\n  ConditionalOrderType,\n} from '@reyaxyz/common';\nimport { Signer, JsonRpcSigner } from 'ethers';\nimport { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';\n\nexport type CancelConditionalOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  orderId: string;\n};\n\nexport type CancelConditionalOrderResult = ConditionalOrder;\n\nexport type ConditionalOrderDetails = {\n  accountId: number;\n  marketId: number;\n  exchangeId: number;\n  counterpartyAccountIds: number[];\n  orderType: number;\n  inputs: string;\n  signer: string;\n  nonce: bigint;\n};\n\nexport type OrderSupportingParams = {\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\nexport type RegisterConditionalOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  triggerPrice: number;\n  orderType: ConditionalOrderType;\n  marketId: number;\n  supportingParams: OrderSupportingParams;\n  orderSize?: number;\n};\n\nexport type UpdateConditionalOrderParams = {\n  cancelOrderId: string;\n} & RegisterConditionalOrderParams;\n\nexport type RegisterConditionalOrderResult = ConditionalOrder;\nexport type UpdateConditionalOrderResult = ConditionalOrder;\n\nexport type AlreadyGaveTradePermissionParams = {\n  accountId: number;\n};\n\nexport type AlreadyGaveTradePermissionResult = {\n  permissionGiven: boolean;\n};\n\n// ---- Conditional Orders History ---\nexport type GetConditionalOrdersHistoryForMarginAccountParams = {\n  address: string;\n  marginAccountId: MarginAccountEntity['id'];\n  limit?: number;\n};\n\nexport type GetConditionalOrdersHistoryForMarginAccountResult =\n  UnifiedConditionalOrderType[];\n"]}

package/dist/types/clients/modules/conditional-orders/index.d.ts

@@ -1,19 +1,14 @@
 import { RestClient, ReyaChainId } from '@reyaxyz/common';
-import { AlreadyGaveTradePermissionParams, AlreadyGaveTradePermissionResult, CancelConditionalOrderParams, CancelConditionalOrderResult, CancelSLOrderParams, CancelSLOrderResult, GetConditionalOrdersHistoryForMarginAccountPaginatedParams, GetConditionalOrdersHistoryForMarginAccountPaginatedResult, GetConditionalOrdersHistoryForMarginAccountParams, GetConditionalOrdersHistoryForMarginAccountResult, RegisterConditionalOrderParams, RegisterConditionalOrderResult, RegisterSLOrderParams, RegisterSLOrderResult, UpdateConditionalOrderParams, UpdateConditionalOrderResult, UpdateSLOrderParams, UpdateSLOrderResult } from './types';
+import { AlreadyGaveTradePermissionParams, AlreadyGaveTradePermissionResult, CancelConditionalOrderParams, CancelConditionalOrderResult, GetConditionalOrdersHistoryForMarginAccountParams, GetConditionalOrdersHistoryForMarginAccountResult, RegisterConditionalOrderParams, RegisterConditionalOrderResult, UpdateConditionalOrderParams, UpdateConditionalOrderResult } from './types';
 export default class ConditionalOrdersClient extends RestClient {
     private reyaChainId;
     constructor(reyaChainId: ReyaChainId, host: string);
     getConditionalOrdersHistoryForMarginAccount(params: GetConditionalOrdersHistoryForMarginAccountParams): Promise<GetConditionalOrdersHistoryForMarginAccountResult>;
-    getConditionalOrdersHistoryForMarginAccountPaginated(params: GetConditionalOrdersHistoryForMarginAccountPaginatedParams): Promise<GetConditionalOrdersHistoryForMarginAccountPaginatedResult>;
     alreadyGaveTradePermissions(params: AlreadyGaveTradePermissionParams): Promise<AlreadyGaveTradePermissionResult>;
-    cancelSLOrder(params: CancelSLOrderParams): Promise<CancelSLOrderResult>;
     cancelConditionalOrder(params: CancelConditionalOrderParams): Promise<CancelConditionalOrderResult>;
-    registerSLOrder(params: RegisterSLOrderParams): Promise<RegisterSLOrderResult>;
     registerConditionalOrder(params: RegisterConditionalOrderParams): Promise<RegisterConditionalOrderResult>;
-    updateSLOrder(params: UpdateSLOrderParams): Promise<UpdateSLOrderResult>;
     updateConditionalOrder(params: UpdateConditionalOrderParams): Promise<UpdateConditionalOrderResult>;
     private getPosition;
     private parseConditionalOrderInputs;
-    private parseSlOrderInputs;
 }
 //# sourceMappingURL=index.d.ts.map

package/dist/types/clients/modules/conditional-orders/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,WAAW,EAQZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,4BAA4B,EAC5B,4BAA4B,EAC5B,mBAAmB,EACnB,mBAAmB,EACnB,0DAA0D,EAC1D,0DAA0D,EAC1D,iDAAiD,EACjD,iDAAiD,EACjD,8BAA8B,EAC9B,8BAA8B,EAC9B,qBAAqB,EACrB,qBAAqB,EACrB,4BAA4B,EAC5B,4BAA4B,EAC5B,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,SAAS,CAAC;AAGjB,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;IAM5C,2CAA2C,CAC/C,MAAM,EAAE,iDAAiD,GACxD,OAAO,CAAC,iDAAiD,CAAC;IAOvD,oDAAoD,CACxD,MAAM,EAAE,0DAA0D,GACjE,OAAO,CAAC,0DAA0D,CAAC;IAWhE,2BAA2B,CAC/B,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC;IAStC,aAAa,CACjB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAiBzB,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;IAkBlC,eAAe,CACnB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IAgC3B,wBAAwB,CAC5B,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC;IAqCpC,aAAa,CACjB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAgCzB,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;YAmC1B,WAAW;YAQX,2BAA2B;YA8D3B,kBAAkB;CAsDjC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,WAAW,EAOZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,4BAA4B,EAC5B,4BAA4B,EAC5B,iDAAiD,EACjD,iDAAiD,EACjD,8BAA8B,EAC9B,8BAA8B,EAC9B,4BAA4B,EAC5B,4BAA4B,EAC7B,MAAM,SAAS,CAAC;AAGjB,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;IAM5C,2CAA2C,CAC/C,MAAM,EAAE,iDAAiD,GACxD,OAAO,CAAC,iDAAiD,CAAC;IAOvD,2BAA2B,CAC/B,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC;IAStC,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;IAkBlC,wBAAwB,CAC5B,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC;IAoCpC,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;YAoC1B,WAAW;YAQX,2BAA2B;CAkF1C"}

package/dist/types/clients/modules/conditional-orders/types.d.ts

@@ -1,11 +1,6 @@
-import { StopLossOrder, ConditionalOrder, UnifiedConditionalOrderType, ConditionalOrderType } from '@reyaxyz/common';
+import { ConditionalOrder, UnifiedConditionalOrderType, ConditionalOrderType } from '@reyaxyz/common';
 import { Signer, JsonRpcSigner } from 'ethers';
 import { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';
-export type CancelSLOrderParams = {
-    signer: Signer | JsonRpcSigner;
-    orderId: string;
-};
-export type CancelSLOrderResult = StopLossOrder;
 export type CancelConditionalOrderParams = {
     signer: Signer | JsonRpcSigner;
     orderId: string;
@@ -26,13 +21,6 @@ export type OrderSupportingParams = {
     counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
     currentPrice: number;
 };
-export type RegisterSLOrderParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: MarginAccountEntity['id'];
-    stopLossPrice: number;
-    marketId: number;
-    supportingParams: OrderSupportingParams;
-};
 export type RegisterConditionalOrderParams = {
     signer: Signer | JsonRpcSigner;
     marginAccountId: MarginAccountEntity['id'];
@@ -42,23 +30,9 @@ export type RegisterConditionalOrderParams = {
     supportingParams: OrderSupportingParams;
     orderSize?: number;
 };
-export type UpdateSLOrderParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: MarginAccountEntity['id'];
-    stopLossPrice: number;
-    marketId: number;
-    supportingParams: OrderSupportingParams;
-};
 export type UpdateConditionalOrderParams = {
-    signer: Signer | JsonRpcSigner;
-    marginAccountId: MarginAccountEntity['id'];
-    triggerPrice: number;
-    orderType: ConditionalOrderType;
-    marketId: number;
-    supportingParams: OrderSupportingParams;
-};
-export type RegisterSLOrderResult = StopLossOrder;
-export type UpdateSLOrderResult = StopLossOrder;
+    cancelOrderId: string;
+} & RegisterConditionalOrderParams;
 export type RegisterConditionalOrderResult = ConditionalOrder;
 export type UpdateConditionalOrderResult = ConditionalOrder;
 export type AlreadyGaveTradePermissionParams = {
@@ -72,15 +46,5 @@ export type GetConditionalOrdersHistoryForMarginAccountParams = {
     marginAccountId: MarginAccountEntity['id'];
     limit?: number;
 };
-export type GetConditionalOrdersHistoryForMarginAccountPaginatedParams = {
-    address: string;
-    marginAccountId: MarginAccountEntity['id'];
-    page: number;
-    perPage: number;
-};
 export type GetConditionalOrdersHistoryForMarginAccountResult = UnifiedConditionalOrderType[];
-export type GetConditionalOrdersHistoryForMarginAccountPaginatedResult = {
-    data: UnifiedConditionalOrderType[];
-    totalCount: number;
-};
 //# sourceMappingURL=types.d.ts.map

package/dist/types/clients/modules/conditional-orders/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,2BAA2B,EAC3B,oBAAoB,EACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,MAAM,4BAA4B,GAAG;IACzC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,CAAC;AAE5D,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;IACpD,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC5E,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,oBAAoB,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,qBAAqB,CAAC;IACxC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,4BAA4B,GAAG;IACzC,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,8BAA8B,CAAC;AAEnC,MAAM,MAAM,8BAA8B,GAAG,gBAAgB,CAAC;AAC9D,MAAM,MAAM,4BAA4B,GAAG,gBAAgB,CAAC;AAE5D,MAAM,MAAM,gCAAgC,GAAG;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC;AAGF,MAAM,MAAM,iDAAiD,GAAG;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,iDAAiD,GAC3D,2BAA2B,EAAE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/api-sdk",
-  "version": "0.112.0",
+  "version": "0.112.1",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -33,14 +33,14 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.172.0",
+    "@reyaxyz/common": "0.172.1",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.16.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "f442b34d02817bd553e3169c41b146bb06474086",
+  "gitHead": "c7053b78e27781ced35be45a7f5b663f2a2592c8",
   "devDependencies": {
     "@types/ws": "8.5.10"
   }

package/src/clients/modules/conditional-orders/index.ts

@@ -5,7 +5,6 @@ import {
   ReyaChainId,
   signConditionalOrder,
   signCancelConditionalOrder,
-  StopLossOrder,
   ConditionalOrder,
   ConditionalOrderType,
   scale,
@@ -18,20 +17,12 @@ import {
   AlreadyGaveTradePermissionResult,
   CancelConditionalOrderParams,
   CancelConditionalOrderResult,
-  CancelSLOrderParams,
-  CancelSLOrderResult,
-  GetConditionalOrdersHistoryForMarginAccountPaginatedParams,
-  GetConditionalOrdersHistoryForMarginAccountPaginatedResult,
   GetConditionalOrdersHistoryForMarginAccountParams,
   GetConditionalOrdersHistoryForMarginAccountResult,
   RegisterConditionalOrderParams,
   RegisterConditionalOrderResult,
-  RegisterSLOrderParams,
-  RegisterSLOrderResult,
   UpdateConditionalOrderParams,
   UpdateConditionalOrderResult,
-  UpdateSLOrderParams,
-  UpdateSLOrderResult,
 } from './types';
 import { createNonce } from './utils';
 
@@ -53,19 +44,6 @@ export default class ConditionalOrdersClient extends RestClient {
     });
   }
 
-  async getConditionalOrdersHistoryForMarginAccountPaginated(
-    params: GetConditionalOrdersHistoryForMarginAccountPaginatedParams,
-  ): Promise<GetConditionalOrdersHistoryForMarginAccountPaginatedResult> {
-    const uri = `/api/conditional-orders/get-orders-by-account/${params.marginAccountId}/paginated`;
-    return this.get<GetConditionalOrdersHistoryForMarginAccountPaginatedResult>(
-      uri,
-      {
-        page: params.page,
-        perPage: params.perPage,
-      },
-    );
-  }
-
   async alreadyGaveTradePermissions(
     params: AlreadyGaveTradePermissionParams,
   ): Promise<AlreadyGaveTradePermissionResult> {
@@ -77,25 +55,6 @@ export default class ConditionalOrdersClient extends RestClient {
     };
   }
 
-  async cancelSLOrder(
-    params: CancelSLOrderParams,
-  ): Promise<CancelSLOrderResult> {
-    const signature = await signCancelConditionalOrder(
-      params.signer,
-      params.orderId,
-    );
-
-    const uri = `/api/conditional-orders/sl/cancel-order`;
-    return this.put<StopLossOrder>(
-      uri,
-      {},
-      {
-        orderId: params.orderId,
-        userSignature: signature,
-      },
-    );
-  }
-
   async cancelConditionalOrder(
     params: CancelConditionalOrderParams,
   ): Promise<CancelConditionalOrderResult> {
@@ -116,40 +75,6 @@ export default class ConditionalOrdersClient extends RestClient {
     return res;
   }
 
-  async registerSLOrder(
-    params: RegisterSLOrderParams,
-  ): Promise<RegisterSLOrderResult> {
-    const inputs = await this.parseSlOrderInputs(
-      params.signer,
-      params.marginAccountId,
-      params.marketId,
-      params.stopLossPrice,
-      params.supportingParams.exchangeId,
-      params.supportingParams.counterpartyAccountIds,
-    );
-
-    // create new entry
-    const uri = `/api/conditional-orders/sl/create-order`;
-    return this.post<StopLossOrder>(
-      uri,
-      {},
-      {
-        accountId: params.marginAccountId,
-        marketId: params.marketId,
-        isLong: inputs.positionBase < 0,
-        stopPrice: params.stopLossPrice,
-        signerWallet: await params.signer.getAddress(),
-        nonce: inputs.nonce.toString(),
-        signature: inputs.signature,
-        deadline: inputs.deadline,
-        orderPriceLimit: inputs.orderPriceLimit.toString(),
-        exchangeId: params.supportingParams.exchangeId,
-        poolId: params.supportingParams.counterpartyAccountIds[0],
-        timestampMs: inputs.creationTimestampMs,
-      },
-    );
-  }
-
   async registerConditionalOrder(
     params: RegisterConditionalOrderParams,
   ): Promise<RegisterConditionalOrderResult> {
@@ -161,19 +86,18 @@ export default class ConditionalOrdersClient extends RestClient {
       params.triggerPrice,
       params.supportingParams.exchangeId,
       params.supportingParams.counterpartyAccountIds,
-      // TODO: @Costin to fix implementation
       params.orderSize,
     );
 
     // create new entry
-    const uri = `/api/conditional-orders/create-order`;
+    const uri = `/api/conditional-orders/create-or-update-order`;
     const result = await this.post<ConditionalOrder>(
       uri,
       {},
       {
         accountId: params.marginAccountId,
         marketId: params.marketId,
-        isLong: inputs.positionBase < 0,
+        isLong: inputs.actualOrderSize > 0,
         orderType: params.orderType,
         triggerPrice: params.triggerPrice,
         signerWallet: await params.signer.getAddress(),
@@ -189,40 +113,6 @@ export default class ConditionalOrdersClient extends RestClient {
     return result;
   }
 
-  async updateSLOrder(
-    params: UpdateSLOrderParams,
-  ): Promise<UpdateSLOrderResult> {
-    const inputs = await this.parseSlOrderInputs(
-      params.signer,
-      params.marginAccountId,
-      params.marketId,
-      params.stopLossPrice,
-      params.supportingParams.exchangeId,
-      params.supportingParams.counterpartyAccountIds,
-    );
-
-    // create new entry
-    const uri = `/api/conditional-orders/sl/update-order`;
-    return this.post<StopLossOrder>(
-      uri,
-      {},
-      {
-        accountId: params.marginAccountId,
-        marketId: params.marketId,
-        isLong: inputs.positionBase < 0,
-        stopPrice: params.stopLossPrice,
-        signerWallet: await params.signer.getAddress(),
-        nonce: inputs.nonce.toString(),
-        signature: inputs.signature,
-        deadline: inputs.deadline,
-        orderPriceLimit: inputs.orderPriceLimit.toString(),
-        exchangeId: params.supportingParams.exchangeId,
-        poolId: params.supportingParams.counterpartyAccountIds[0],
-        timestampMs: inputs.creationTimestampMs,
-      },
-    );
-  }
-
   async updateConditionalOrder(
     params: UpdateConditionalOrderParams,
   ): Promise<UpdateConditionalOrderResult> {
@@ -237,14 +127,14 @@ export default class ConditionalOrdersClient extends RestClient {
     );
 
     // create new entry
-    const uri = `/api/conditional-orders/update-order`;
+    const uri = `/api/conditional-orders/create-or-update-order`;
     const result = await this.post<ConditionalOrder>(
       uri,
       {},
       {
         accountId: params.marginAccountId,
         marketId: params.marketId,
-        isLong: inputs.positionBase < 0,
+        isLong: inputs.actualOrderSize > 0,
         orderType: params.orderType,
         triggerPrice: params.triggerPrice,
         signerWallet: await params.signer.getAddress(),
@@ -255,6 +145,7 @@ export default class ConditionalOrdersClient extends RestClient {
         exchangeId: params.supportingParams.exchangeId,
         poolId: params.supportingParams.counterpartyAccountIds[0],
         timestampMs: inputs.creationTimestampMs,
+        cancelOrderId: params.cancelOrderId,
       },
     );
     return result;
@@ -279,30 +170,52 @@ export default class ConditionalOrdersClient extends RestClient {
     orderSize?: number,
   ): Promise<{
     signature: string;
-    positionBase: number;
+    actualOrderSize: number;
     orderPriceLimit: bigint;
     nonce: bigint;
     deadline: number;
     creationTimestampMs: number;
-    orderSize?: number;
   }> {
-    // TODO: @Costin to fix implementation
-    console.log('orderSize', orderSize);
-
-    const position = await this.getPosition(accountId, marketId);
-    const positionBase = position.base;
-
-    if (positionBase === 0) {
-      throw new Error('Position with no exposure');
+    let inputs: string;
+    let actualOrderSize: number;
+    let isLongOrder: boolean;
+    let orderPriceLimit: bigint;
+
+    if (orderType === ConditionalOrderType.LIMIT_ORDER) {
+      if (orderSize === undefined) {
+        throw new Error('Order base is required for limit orders');
+      }
+
+      if (orderSize === 0) {
+        throw new Error('Cannot create an empty limit order');
+      }
+
+      actualOrderSize = orderSize;
+      isLongOrder = actualOrderSize > 0;
+      orderPriceLimit = calculateMaxPriceLimit(isLongOrder);
+
+      inputs = AbiCoder.defaultAbiCoder().encode(
+        ['int256', 'uint256'],
+        [scale(18)(orderSize), scale(18)(triggerPrice)],
+      );
+    } else {
+      const position = await this.getPosition(accountId, marketId);
+      const positionBase = position.base;
+
+      if (positionBase === 0) {
+        throw new Error('Cannot create SL or TP order for closed positions');
+      }
+
+      actualOrderSize = -positionBase;
+      isLongOrder = actualOrderSize > 0;
+      orderPriceLimit = calculateMaxPriceLimit(isLongOrder);
+
+      inputs = AbiCoder.defaultAbiCoder().encode(
+        ['bool', 'uint256', 'uint256'],
+        [isLongOrder, scale(18)(triggerPrice), orderPriceLimit],
+      );
     }
 
-    const isLongOrder = positionBase < 0;
-    const orderPriceLimit = calculateMaxPriceLimit(isLongOrder);
-
-    const inputs = AbiCoder.defaultAbiCoder().encode(
-      ['bool', 'uint256', 'uint256'],
-      [isLongOrder, scale(18)(triggerPrice), orderPriceLimit],
-    );
     const creationTimestampMs = Date.now();
     const nonce = createNonce(accountId, marketId, creationTimestampMs);
 
@@ -321,63 +234,7 @@ export default class ConditionalOrdersClient extends RestClient {
 
     return {
       signature,
-      positionBase,
-      orderPriceLimit,
-      nonce,
-      deadline: CONDITIONAL_ORDER_SIG_DEADLINE,
-      creationTimestampMs,
-    };
-  }
-
-  // todo: IR deprecate
-  private async parseSlOrderInputs(
-    signer: Signer | JsonRpcSigner,
-    accountId: number,
-    marketId: number,
-    stopLossPrice: number,
-    exchangeId: number,
-    counterpartyAccountIds: number[],
-  ): Promise<{
-    signature: string;
-    positionBase: number;
-    orderPriceLimit: bigint;
-    nonce: bigint;
-    deadline: number;
-    creationTimestampMs: number;
-  }> {
-    const position = await this.getPosition(accountId, marketId);
-    const positionBase = position.base;
-
-    if (positionBase === 0) {
-      throw new Error('Position with no exposure');
-    }
-
-    const isLongOrder = positionBase < 0;
-    const orderPriceLimit = calculateMaxPriceLimit(isLongOrder);
-
-    const inputs = AbiCoder.defaultAbiCoder().encode(
-      ['bool', 'uint256', 'uint256'],
-      [isLongOrder, scale(18)(stopLossPrice), orderPriceLimit],
-    );
-    const creationTimestampMs = Date.now();
-    const nonce = createNonce(accountId, marketId, creationTimestampMs);
-
-    const signature = await signConditionalOrder(
-      signer,
-      this.reyaChainId,
-      accountId,
-      marketId,
-      exchangeId,
-      counterpartyAccountIds,
-      ConditionalOrderType.STOP_LOSS,
-      inputs,
-      nonce,
-      CONDITIONAL_ORDER_SIG_DEADLINE,
-    );
-
-    return {
-      signature,
-      positionBase,
+      actualOrderSize,
       orderPriceLimit,
       nonce,
       deadline: CONDITIONAL_ORDER_SIG_DEADLINE,

package/src/clients/modules/conditional-orders/types.ts

@@ -1,5 +1,4 @@
 import {
-  StopLossOrder,
   ConditionalOrder,
   UnifiedConditionalOrderType,
   ConditionalOrderType,
@@ -7,15 +6,6 @@ import {
 import { Signer, JsonRpcSigner } from 'ethers';
 import { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';
 
-// todo: IR to deprecate
-export type CancelSLOrderParams = {
-  signer: Signer | JsonRpcSigner;
-  orderId: string;
-};
-
-// todo: IR to deprecate
-export type CancelSLOrderResult = StopLossOrder;
-
 export type CancelConditionalOrderParams = {
   signer: Signer | JsonRpcSigner;
   orderId: string;
@@ -40,15 +30,6 @@ export type OrderSupportingParams = {
   currentPrice: number;
 };
 
-// todo: IR to deprecate
-export type RegisterSLOrderParams = {
-  signer: Signer | JsonRpcSigner;
-  marginAccountId: MarginAccountEntity['id'];
-  stopLossPrice: number;
-  marketId: number;
-  supportingParams: OrderSupportingParams;
-};
-
 export type RegisterConditionalOrderParams = {
   signer: Signer | JsonRpcSigner;
   marginAccountId: MarginAccountEntity['id'];
@@ -59,27 +40,9 @@ export type RegisterConditionalOrderParams = {
   orderSize?: number;
 };
 
-// todo: IR to deprecate
-export type UpdateSLOrderParams = {
-  signer: Signer | JsonRpcSigner;
-  marginAccountId: MarginAccountEntity['id'];
-  stopLossPrice: number;
-  marketId: number;
-  supportingParams: OrderSupportingParams;
-};
-
 export type UpdateConditionalOrderParams = {
-  signer: Signer | JsonRpcSigner;
-  marginAccountId: MarginAccountEntity['id'];
-  triggerPrice: number;
-  orderType: ConditionalOrderType;
-  marketId: number;
-  supportingParams: OrderSupportingParams;
-};
-
-// todo: IR to deprecate
-export type RegisterSLOrderResult = StopLossOrder;
-export type UpdateSLOrderResult = StopLossOrder;
+  cancelOrderId: string;
+} & RegisterConditionalOrderParams;
 
 export type RegisterConditionalOrderResult = ConditionalOrder;
 export type UpdateConditionalOrderResult = ConditionalOrder;
@@ -98,16 +61,6 @@ export type GetConditionalOrdersHistoryForMarginAccountParams = {
   marginAccountId: MarginAccountEntity['id'];
   limit?: number;
 };
-export type GetConditionalOrdersHistoryForMarginAccountPaginatedParams = {
-  address: string;
-  marginAccountId: MarginAccountEntity['id'];
-  page: number;
-  perPage: number;
-};
 
 export type GetConditionalOrdersHistoryForMarginAccountResult =
   UnifiedConditionalOrderType[];
-export type GetConditionalOrdersHistoryForMarginAccountPaginatedResult = {
-  data: UnifiedConditionalOrderType[];
-  totalCount: number;
-};