@reyaxyz/api-sdk 0.103.3 → 0.103.4

package/dist/clients/modules/account/index.js

@@ -81,13 +81,6 @@ var AccountClient = /** @class */ (function (_super) {
                             })];
                     case 1:
                         response = _a.sent();
-                        response.forEach(function (account) {
-                            account.positions.forEach(function (position) {
-                                if (Math.random() > 0.5) {
-                                    position.stopLossPrice = Math.random() * 1000;
-                                }
-                            });
-                        });
                         return [2 /*return*/, response];
                 }
             });

package/dist/clients/modules/account/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["clients/modules/account/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  GetMarginAccountParams,\n  GetMarginAccountResult,\n  GetMarginAccountsParams,\n  GetMarginAccountsResult,\n  GetMarginAccountTransactionHistoryParams,\n  GetMarginAccountTransactionHistoryResult,\n  GetMaxOrderSizeAvailableParams,\n  GetMaxOrderSizeAvailableResult,\n  GetMaxWithdrawBalanceForAccountParams,\n  GetMaxWithdrawBalanceForAccountResult,\n  GetPositionsForMarginAccountParams,\n  GetPositionsForMarginAccountResult,\n  GetTransactionSimulationInitialDataParams,\n  GetMarginAccountBalanceChartDataParams,\n  GetMarginAccountCollateralsBalanceChartDataParams,\n  GetAllMarginAccountsBalanceChartDataParams,\n  EditMarginAccountParams,\n  CloseMarginAccountParams,\n  GetAllMarginAccountsSummaryResult,\n  GetAllMarginAccountsSummaryParams,\n  GetEditCollateralSimulationInitialDataParams,\n  EditMarginAccountResult,\n  CloseMarginAccountResult,\n  GetIsolatedOrderMaxSizeAvailableParams,\n  GetIsolatedOrderMaxSizeAvailableResult,\n  GetPositionsHistoryForMarginAccountPaginatedParams,\n  GetPositionsHistoryForMarginAccountPaginatedResult,\n  GetLiquidationHistoryForOwnerAddressResult,\n  GetLiquidationHistoryForOwnerAddressParams,\n} from './types';\nimport {\n  EditCollateralSimulationState,\n  TradeSimulationState,\n  GetMarginAccountCollateralsBalanceChartDataResult,\n  GetMarginAccountBalanceChartDataResult,\n  GetAllMarginAccountsBalanceChartDataResult,\n  RestClient,\n} from '@reyaxyz/common';\n\nexport default class AccountClient extends RestClient {\n  /**\n   * Asynchronously retrieves a list of margin accounts associated with a specific address.\n   *\n   * This method makes a request to the API endpoint to fetch collateral account data. The data is filtered\n   * based on the provided Ethereum address. An optional limit can be specified to control the number of\n   * collateral accounts returned in the response.\n   *\n   * @param {GetMarginAccountsParams} params\n   * @returns {Promise<GetMarginAccountsResult>} A promise that resolves to the response containing the margin\n   *                                                   account data.\n   * @memberof account\n   * */\n\n  async getMarginAccounts(\n    params: GetMarginAccountsParams,\n  ): Promise<GetMarginAccountsResult> {\n    const uri = `/api/accounts/${params.address}`;\n    const response: GetMarginAccountsResult = await this.get(uri, {\n      limit: params.limit,\n    });\n\n    response.forEach((account) => {\n      account.positions.forEach((position) => {\n        if (Math.random() > 0.5) {\n          position.stopLossPrice = Math.random() * 1000;\n        }\n      });\n    });\n\n    return response;\n  }\n\n  /**\n   * Asynchronously retrieves details of a specific collateral account for a given Ethereum address.\n   *\n   * This method sends a request to the API to obtain detailed information about a specific collateral account\n   * associated with the provided Ethereum address. The account is identified using the collateral account number.\n   *\n   * @param {GetMarginAccountParams} params\n   * @returns {Promise<GetMarginAccountResult>} A promise that resolves to the response containing the detailed\n   *                                               information of the specified margin account.\n   * @memberof account\n   */\n\n  async getMarginAccount(\n    params: GetMarginAccountParams,\n  ): Promise<GetMarginAccountResult> {\n    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}`;\n    return this.get(uri);\n  }\n\n  async getPositionsForMarginAccount(\n    params: GetPositionsForMarginAccountParams,\n  ): Promise<GetPositionsForMarginAccountResult> {\n    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}/positions`;\n    return this.get(uri, { limit: params.limit });\n  }\n\n  async getPositionsHistoryForMarginAccountPaginated(\n    params: GetPositionsHistoryForMarginAccountPaginatedParams,\n  ): Promise<GetPositionsHistoryForMarginAccountPaginatedResult> {\n    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}/positions/history/paginated`;\n    return this.get(uri, {\n      type: params.type,\n      page: params.page,\n      perPage: params.perPage,\n    });\n  }\n\n  async getLiquidationHistoryForOwnerAddress(\n    params: GetLiquidationHistoryForOwnerAddressParams,\n  ): Promise<GetLiquidationHistoryForOwnerAddressResult> {\n    const uri = `/api/accounts/${params.address}/positions/liquidations`;\n    return this.get(uri, {\n      timestampFromMS: params.timestampFromMS,\n    });\n  }\n\n  async getMaxOrderSizeAvailable(\n    params: GetMaxOrderSizeAvailableParams,\n  ): Promise<GetMaxOrderSizeAvailableResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/max-order-size`;\n    return this.get(uri, {\n      marketId: params.marketId,\n      direction: params.direction,\n    });\n  }\n\n  async getIsolatedOrderMaxSizeAvailable(\n    params: GetIsolatedOrderMaxSizeAvailableParams,\n  ): Promise<GetIsolatedOrderMaxSizeAvailableResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/max-order-size-isolated`;\n    return this.get(uri, {\n      marketId: params.marketId,\n      direction: params.direction,\n    });\n  }\n\n  async getTransactionSimulationInitialData(\n    params: GetTransactionSimulationInitialDataParams,\n  ): Promise<TradeSimulationState> {\n    const uri = `/api/accounts/${params.marginAccountId}/trade-simulation-data`;\n    return this.get(uri, {\n      marketId: params.marketId,\n    });\n  }\n\n  async getEditCollateralSimulationInitialData(\n    params: GetEditCollateralSimulationInitialDataParams,\n  ): Promise<EditCollateralSimulationState> {\n    const uri = `/api/accounts/${params.marginAccountId}/edit-collateral-simulation-data`;\n    return this.get(uri);\n  }\n\n  async getMarginAccountTransactionHistory(\n    params: GetMarginAccountTransactionHistoryParams,\n  ): Promise<GetMarginAccountTransactionHistoryResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/transaction-history`;\n    return this.get(uri, {\n      limit: params.limit,\n    });\n  }\n\n  async getMaxWithdrawBalanceForAccount(\n    params: GetMaxWithdrawBalanceForAccountParams,\n  ): Promise<GetMaxWithdrawBalanceForAccountResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/max-withdraw-amount`;\n    return this.get(uri, {\n      assetAddress: params.tokenAddress,\n    });\n  }\n\n  async getMarginAccountBalanceChartData(\n    params: GetMarginAccountBalanceChartDataParams,\n  ): Promise<GetMarginAccountBalanceChartDataResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/balance-chart-data`;\n    return this.get(uri, {\n      timeframeMs: params.filters.timeframeMs,\n      granularity: params.filters.granularity,\n    });\n  }\n\n  async getMarginAccountCollateralsBalanceChartData(\n    params: GetMarginAccountCollateralsBalanceChartDataParams,\n  ): Promise<GetMarginAccountCollateralsBalanceChartDataResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/collaterals-balance-chart-data`;\n    return this.get(uri, {\n      timeframeMs: params.filters.timeframeMs,\n      granularity: params.filters.granularity,\n    });\n  }\n\n  async getAllMarginAccountsBalanceChart(\n    params: GetAllMarginAccountsBalanceChartDataParams,\n  ): Promise<GetAllMarginAccountsBalanceChartDataResult> {\n    const uri = `/api/accounts/owner/${params.ownerAddress}/balance`;\n    return this.get(uri, {\n      timeframeMs: params.filters.timeframeMs,\n      granularity: params.filters.granularity,\n    });\n  }\n\n  async getAllMarginAccountsSummary(\n    params: GetAllMarginAccountsSummaryParams,\n  ): Promise<GetAllMarginAccountsSummaryResult> {\n    const uri = `/api/accounts/owner/${params.ownerAddress}/summary`;\n    return this.get(uri);\n  }\n\n  // TODO: Milan validate\n  async editMarginAccount(\n    params: EditMarginAccountParams,\n  ): Promise<EditMarginAccountResult> {\n    const name = (params.name || '').trim();\n    if (!params.id) {\n      throw new Error('Missing margin account id');\n    }\n    if (name.length === 0 || name.length > 25) {\n      throw new Error('Max size 25 characters');\n    }\n\n    const uri = `/api/accounts/${params.id}/edit`;\n    return this.put(uri, {\n      id: params.id,\n      name: params.name,\n    });\n  }\n  async closeMarginAccount(\n    params: CloseMarginAccountParams,\n  ): Promise<CloseMarginAccountResult> {\n    if (!params.id) {\n      throw new Error('Missing margin account id');\n    }\n\n    const uri = `/api/accounts/${params.id}/close`;\n    return this.delete(uri, {\n      id: params.id,\n    });\n  }\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["clients/modules/account/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  GetMarginAccountParams,\n  GetMarginAccountResult,\n  GetMarginAccountsParams,\n  GetMarginAccountsResult,\n  GetMarginAccountTransactionHistoryParams,\n  GetMarginAccountTransactionHistoryResult,\n  GetMaxOrderSizeAvailableParams,\n  GetMaxOrderSizeAvailableResult,\n  GetMaxWithdrawBalanceForAccountParams,\n  GetMaxWithdrawBalanceForAccountResult,\n  GetPositionsForMarginAccountParams,\n  GetPositionsForMarginAccountResult,\n  GetTransactionSimulationInitialDataParams,\n  GetMarginAccountBalanceChartDataParams,\n  GetMarginAccountCollateralsBalanceChartDataParams,\n  GetAllMarginAccountsBalanceChartDataParams,\n  EditMarginAccountParams,\n  CloseMarginAccountParams,\n  GetAllMarginAccountsSummaryResult,\n  GetAllMarginAccountsSummaryParams,\n  GetEditCollateralSimulationInitialDataParams,\n  EditMarginAccountResult,\n  CloseMarginAccountResult,\n  GetIsolatedOrderMaxSizeAvailableParams,\n  GetIsolatedOrderMaxSizeAvailableResult,\n  GetPositionsHistoryForMarginAccountPaginatedParams,\n  GetPositionsHistoryForMarginAccountPaginatedResult,\n  GetLiquidationHistoryForOwnerAddressResult,\n  GetLiquidationHistoryForOwnerAddressParams,\n} from './types';\nimport {\n  EditCollateralSimulationState,\n  TradeSimulationState,\n  GetMarginAccountCollateralsBalanceChartDataResult,\n  GetMarginAccountBalanceChartDataResult,\n  GetAllMarginAccountsBalanceChartDataResult,\n  RestClient,\n} from '@reyaxyz/common';\n\nexport default class AccountClient extends RestClient {\n  /**\n   * Asynchronously retrieves a list of margin accounts associated with a specific address.\n   *\n   * This method makes a request to the API endpoint to fetch collateral account data. The data is filtered\n   * based on the provided Ethereum address. An optional limit can be specified to control the number of\n   * collateral accounts returned in the response.\n   *\n   * @param {GetMarginAccountsParams} params\n   * @returns {Promise<GetMarginAccountsResult>} A promise that resolves to the response containing the margin\n   *                                                   account data.\n   * @memberof account\n   * */\n\n  async getMarginAccounts(\n    params: GetMarginAccountsParams,\n  ): Promise<GetMarginAccountsResult> {\n    const uri = `/api/accounts/${params.address}`;\n    const response: GetMarginAccountsResult = await this.get(uri, {\n      limit: params.limit,\n    });\n\n    return response;\n  }\n\n  /**\n   * Asynchronously retrieves details of a specific collateral account for a given Ethereum address.\n   *\n   * This method sends a request to the API to obtain detailed information about a specific collateral account\n   * associated with the provided Ethereum address. The account is identified using the collateral account number.\n   *\n   * @param {GetMarginAccountParams} params\n   * @returns {Promise<GetMarginAccountResult>} A promise that resolves to the response containing the detailed\n   *                                               information of the specified margin account.\n   * @memberof account\n   */\n\n  async getMarginAccount(\n    params: GetMarginAccountParams,\n  ): Promise<GetMarginAccountResult> {\n    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}`;\n    return this.get(uri);\n  }\n\n  async getPositionsForMarginAccount(\n    params: GetPositionsForMarginAccountParams,\n  ): Promise<GetPositionsForMarginAccountResult> {\n    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}/positions`;\n    return this.get(uri, { limit: params.limit });\n  }\n\n  async getPositionsHistoryForMarginAccountPaginated(\n    params: GetPositionsHistoryForMarginAccountPaginatedParams,\n  ): Promise<GetPositionsHistoryForMarginAccountPaginatedResult> {\n    const uri = `/api/accounts/${params.address}/marginAccount/${params.marginAccountId}/positions/history/paginated`;\n    return this.get(uri, {\n      type: params.type,\n      page: params.page,\n      perPage: params.perPage,\n    });\n  }\n\n  async getLiquidationHistoryForOwnerAddress(\n    params: GetLiquidationHistoryForOwnerAddressParams,\n  ): Promise<GetLiquidationHistoryForOwnerAddressResult> {\n    const uri = `/api/accounts/${params.address}/positions/liquidations`;\n    return this.get(uri, {\n      timestampFromMS: params.timestampFromMS,\n    });\n  }\n\n  async getMaxOrderSizeAvailable(\n    params: GetMaxOrderSizeAvailableParams,\n  ): Promise<GetMaxOrderSizeAvailableResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/max-order-size`;\n    return this.get(uri, {\n      marketId: params.marketId,\n      direction: params.direction,\n    });\n  }\n\n  async getIsolatedOrderMaxSizeAvailable(\n    params: GetIsolatedOrderMaxSizeAvailableParams,\n  ): Promise<GetIsolatedOrderMaxSizeAvailableResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/max-order-size-isolated`;\n    return this.get(uri, {\n      marketId: params.marketId,\n      direction: params.direction,\n    });\n  }\n\n  async getTransactionSimulationInitialData(\n    params: GetTransactionSimulationInitialDataParams,\n  ): Promise<TradeSimulationState> {\n    const uri = `/api/accounts/${params.marginAccountId}/trade-simulation-data`;\n    return this.get(uri, {\n      marketId: params.marketId,\n    });\n  }\n\n  async getEditCollateralSimulationInitialData(\n    params: GetEditCollateralSimulationInitialDataParams,\n  ): Promise<EditCollateralSimulationState> {\n    const uri = `/api/accounts/${params.marginAccountId}/edit-collateral-simulation-data`;\n    return this.get(uri);\n  }\n\n  async getMarginAccountTransactionHistory(\n    params: GetMarginAccountTransactionHistoryParams,\n  ): Promise<GetMarginAccountTransactionHistoryResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/transaction-history`;\n    return this.get(uri, {\n      limit: params.limit,\n    });\n  }\n\n  async getMaxWithdrawBalanceForAccount(\n    params: GetMaxWithdrawBalanceForAccountParams,\n  ): Promise<GetMaxWithdrawBalanceForAccountResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/max-withdraw-amount`;\n    return this.get(uri, {\n      assetAddress: params.tokenAddress,\n    });\n  }\n\n  async getMarginAccountBalanceChartData(\n    params: GetMarginAccountBalanceChartDataParams,\n  ): Promise<GetMarginAccountBalanceChartDataResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/balance-chart-data`;\n    return this.get(uri, {\n      timeframeMs: params.filters.timeframeMs,\n      granularity: params.filters.granularity,\n    });\n  }\n\n  async getMarginAccountCollateralsBalanceChartData(\n    params: GetMarginAccountCollateralsBalanceChartDataParams,\n  ): Promise<GetMarginAccountCollateralsBalanceChartDataResult> {\n    const uri = `/api/accounts/${params.marginAccountId}/collaterals-balance-chart-data`;\n    return this.get(uri, {\n      timeframeMs: params.filters.timeframeMs,\n      granularity: params.filters.granularity,\n    });\n  }\n\n  async getAllMarginAccountsBalanceChart(\n    params: GetAllMarginAccountsBalanceChartDataParams,\n  ): Promise<GetAllMarginAccountsBalanceChartDataResult> {\n    const uri = `/api/accounts/owner/${params.ownerAddress}/balance`;\n    return this.get(uri, {\n      timeframeMs: params.filters.timeframeMs,\n      granularity: params.filters.granularity,\n    });\n  }\n\n  async getAllMarginAccountsSummary(\n    params: GetAllMarginAccountsSummaryParams,\n  ): Promise<GetAllMarginAccountsSummaryResult> {\n    const uri = `/api/accounts/owner/${params.ownerAddress}/summary`;\n    return this.get(uri);\n  }\n\n  // TODO: Milan validate\n  async editMarginAccount(\n    params: EditMarginAccountParams,\n  ): Promise<EditMarginAccountResult> {\n    const name = (params.name || '').trim();\n    if (!params.id) {\n      throw new Error('Missing margin account id');\n    }\n    if (name.length === 0 || name.length > 25) {\n      throw new Error('Max size 25 characters');\n    }\n\n    const uri = `/api/accounts/${params.id}/edit`;\n    return this.put(uri, {\n      id: params.id,\n      name: params.name,\n    });\n  }\n  async closeMarginAccount(\n    params: CloseMarginAccountParams,\n  ): Promise<CloseMarginAccountResult> {\n    if (!params.id) {\n      throw new Error('Missing margin account id');\n    }\n\n    const uri = `/api/accounts/${params.id}/close`;\n    return this.delete(uri, {\n      id: params.id,\n    });\n  }\n}\n"]}

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

@@ -67,7 +67,7 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        uri = "/api/conditional-orders/sl/get-orders-by-position/".concat(common_1.StopLossOrderStatus.NEW, "/").concat(params.marketId, "/").concat(params.accountId);
+                        uri = "/api/conditional-orders/sl/get-orders-by-position/".concat(common_1.StopLossOrderStatus.PENDING, "/").concat(params.marketId, "/").concat(params.accountId);
                         return [4 /*yield*/, this.get(uri)];
                     case 1:
                         response = _a.sent();
@@ -81,22 +81,26 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
-    // todo: need authentication
     ConditionalOrdersClient.prototype.cancelSLOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var uri;
+            var signature, uri;
             return __generator(this, function (_a) {
-                uri = "/api/conditional-orders/sl/set-order-status";
-                return [2 /*return*/, this.post(uri, {}, {
-                        orderId: params.orderId,
-                        status: common_1.StopLossOrderStatus.CANCELLED,
-                    })];
+                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.registerSLOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var position, positionBase, orderPriceLimit, inputs, nonce, signature, order, uri, _a, _b;
+            var position, positionBase, orderPriceLimit, inputs, creationTimestampMs, nonce, deadline, signature, uri, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
@@ -107,25 +111,14 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                         if (positionBase === 0) {
                             throw new Error('Position with no exposure');
                         }
-                        orderPriceLimit = (0, common_1.calculatePriceLimitForTrade)(params.market.currentPrice, positionBase);
-                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['uint256', 'uint256'], [params.stopLossPrice, orderPriceLimit]);
-                        nonce = 0;
-                        return [4 /*yield*/, (0, common_1.signConditionalOrder)(params.signer, this.reyaChainId, params.marginAccountId, params.market.id, params.market.exchangeId, params.market.counterpartyAccountIds, types_1.ConditionalOrderType.StopLoss, inputs, nonce, Number.MAX_VALUE)];
+                        orderPriceLimit = Number((0, common_1.calculateMaxPriceLimit)(positionBase < 0));
+                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['uint256', 'uint256'], [(0, common_1.scale)(18)(params.stopLossPrice), orderPriceLimit]);
+                        creationTimestampMs = Date.now();
+                        nonce = this.createNonce(params.marginAccountId, params.market.id, creationTimestampMs);
+                        deadline = Math.pow(10, 18);
+                        return [4 /*yield*/, (0, common_1.signConditionalOrder)(params.signer, this.reyaChainId, params.marginAccountId, params.market.id, params.market.exchangeId, params.market.counterpartyAccountIds, types_1.ConditionalOrderType.StopLoss, inputs, nonce, deadline)];
                     case 2:
                         signature = _d.sent();
-                        if (!position.stopLossPrice) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.getPendingSLOrder({
-                                accountId: params.marginAccountId,
-                                marketId: params.market.id,
-                            })];
-                    case 3:
-                        order = _d.sent();
-                        if (!(order != null)) return [3 /*break*/, 5];
-                        return [4 /*yield*/, this.cancelSLOrder({ orderId: order.orderId })];
-                    case 4:
-                        _d.sent();
-                        _d.label = 5;
-                    case 5:
                         uri = "/api/conditional-orders/sl/create-order";
                         _a = this.post;
                         _b = [uri,
@@ -137,15 +130,29 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                             stopPrice: params.stopLossPrice
                         };
                         return [4 /*yield*/, params.signer.getAddress()];
-                    case 6: return [2 /*return*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
+                    case 3: return [2 /*return*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
                                 _c.nonce = nonce,
-                                _c.signature = signature.r,
-                                _c.status = common_1.StopLossOrderStatus.NEW,
+                                _c.signature = signature,
+                                _c.deadline = deadline,
+                                _c.orderPriceLimit = orderPriceLimit,
+                                _c.exchangeId = params.market.exchangeId,
+                                _c.poolId = params.market.counterpartyAccountIds[0],
+                                _c.timestampMs = creationTimestampMs,
                                 _c)]))];
                 }
             });
         });
     };
+    ConditionalOrdersClient.prototype.updateSLOrder = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.registerSLOrder(params)];
+                    case 1: return [2 /*return*/, _a.sent()];
+                }
+            });
+        });
+    };
     ConditionalOrdersClient.prototype.getPosition = function (accountId, marketId) {
         return __awaiter(this, void 0, void 0, function () {
             var uri;
@@ -155,6 +162,19 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
+    ConditionalOrdersClient.prototype.createNonce = function (accountId, marketId, timestampMs) {
+        // Validate the input ranges
+        if (marketId < 0 || marketId >= Math.pow(2, 32))
+            throw new Error('marketId is out of range');
+        if (accountId < BigInt(0) || accountId >= Math.pow(2, 128))
+            throw new Error('accountId is out of range');
+        if (timestampMs < 0 || timestampMs >= Math.pow(2, 64))
+            throw new Error('timestamp is out of range');
+        var hashUint256 = (BigInt(accountId) << BigInt(98)) |
+            (BigInt(timestampMs) << BigInt(32)) |
+            BigInt(marketId);
+        return hashUint256.toString();
+    };
     return ConditionalOrdersClient;
 }(common_1.RestClient));
 exports.default = ConditionalOrdersClient;

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  calculatePriceLimitForTrade,\n  PositionEntity,\n  RestClient,\n  ReyaChainId,\n  signConditionalOrder,\n  StopLossOrder,\n  StopLossOrderStatus,\n} from '@reyaxyz/common';\nimport { AbiCoder } from 'ethers';\nimport {\n  CancelSLOrderParams,\n  CancelSLOrderResult,\n  ConditionalOrderType,\n  GetPendingSLOrderParams,\n  GetPendingSLOrderResult,\n  RegisterSLOrderParams,\n  RegisterSLOrderResult,\n} from './types';\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  async getPendingSLOrder(\n    params: GetPendingSLOrderParams,\n  ): Promise<GetPendingSLOrderResult> {\n    const uri = `/api/conditional-orders/sl/get-orders-by-position/${StopLossOrderStatus.NEW}/${params.marketId}/${params.accountId}`;\n    const response = await this.get<GetPendingSLOrderResult[]>(uri);\n\n    if (response.length > 1) {\n      throw new Error('Multiple SL pending orders on a single position');\n    }\n\n    if (response.length === 0) return null;\n\n    return response[0];\n  }\n\n  // todo: need authentication\n  async cancelSLOrder(\n    params: CancelSLOrderParams,\n  ): Promise<CancelSLOrderResult> {\n    const uri = `/api/conditional-orders/sl/set-order-status`;\n    return this.post<StopLossOrder>(\n      uri,\n      {},\n      {\n        orderId: params.orderId,\n        status: StopLossOrderStatus.CANCELLED,\n      },\n    );\n  }\n\n  async registerSLOrder(\n    params: RegisterSLOrderParams,\n  ): Promise<RegisterSLOrderResult> {\n    const position = await this.getPosition(\n      params.marginAccountId,\n      params.market.id,\n    );\n    const positionBase = position.base;\n\n    if (positionBase === 0) {\n      throw new Error('Position with no exposure');\n    }\n\n    const orderPriceLimit = calculatePriceLimitForTrade(\n      params.market.currentPrice,\n      positionBase,\n    );\n\n    const inputs = AbiCoder.defaultAbiCoder().encode(\n      ['uint256', 'uint256'],\n      [params.stopLossPrice, orderPriceLimit],\n    );\n    const nonce = 0; // todo derive\n\n    const signature = await signConditionalOrder(\n      params.signer,\n      this.reyaChainId,\n      params.marginAccountId,\n      params.market.id,\n      params.market.exchangeId,\n      params.market.counterpartyAccountIds,\n      ConditionalOrderType.StopLoss,\n      inputs,\n      nonce,\n      Number.MAX_VALUE,\n    );\n\n    // cancel old order existing order\n    if (position.stopLossPrice) {\n      const order = await this.getPendingSLOrder({\n        accountId: params.marginAccountId,\n        marketId: params.market.id,\n      });\n      if (order != null) {\n        await this.cancelSLOrder({ orderId: order.orderId });\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.market.id,\n        isLong: positionBase > 0,\n        stopPrice: params.stopLossPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: nonce,\n        signature: signature.r,\n        status: StopLossOrderStatus.NEW,\n      },\n    );\n  }\n\n  private async getPosition(\n    accountId: number,\n    marketId: number,\n  ): Promise<PositionEntity> {\n    const uri = `/api/account/marginAccount/position/${accountId}/${marketId}`;\n    return this.get<PositionEntity>(uri);\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  StopLossOrder,\n  StopLossOrderStatus,\n  scale,\n} from '@reyaxyz/common';\nimport { AbiCoder } from 'ethers';\nimport {\n  CancelSLOrderParams,\n  CancelSLOrderResult,\n  ConditionalOrderType,\n  GetPendingSLOrderParams,\n  GetPendingSLOrderResult,\n  RegisterSLOrderParams,\n  RegisterSLOrderResult,\n  UpdateSLOrderParams,\n  UpdateSLOrderResult,\n} from './types';\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  async getPendingSLOrder(\n    params: GetPendingSLOrderParams,\n  ): Promise<GetPendingSLOrderResult> {\n    const uri = `/api/conditional-orders/sl/get-orders-by-position/${StopLossOrderStatus.PENDING}/${params.marketId}/${params.accountId}`;\n    const response = await this.get<GetPendingSLOrderResult[]>(uri);\n\n    if (response.length > 1) {\n      throw new Error('Multiple SL pending orders on a single position');\n    }\n\n    if (response.length === 0) return null;\n\n    return response[0];\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 registerSLOrder(\n    params: RegisterSLOrderParams,\n  ): Promise<RegisterSLOrderResult> {\n    const position = await this.getPosition(\n      params.marginAccountId,\n      params.market.id,\n    );\n    const positionBase = position.base;\n\n    if (positionBase === 0) {\n      throw new Error('Position with no exposure');\n    }\n\n    const orderPriceLimit = Number(calculateMaxPriceLimit(positionBase < 0));\n\n    const inputs = AbiCoder.defaultAbiCoder().encode(\n      ['uint256', 'uint256'],\n      [scale(18)(params.stopLossPrice), orderPriceLimit],\n    );\n    const creationTimestampMs = Date.now();\n    const nonce = this.createNonce(\n      params.marginAccountId,\n      params.market.id,\n      creationTimestampMs,\n    );\n    const deadline = 10 ** 18; // very big number for timestamp in seconds - infinite deadline\n\n    const signature = await signConditionalOrder(\n      params.signer,\n      this.reyaChainId,\n      params.marginAccountId,\n      params.market.id,\n      params.market.exchangeId,\n      params.market.counterpartyAccountIds,\n      ConditionalOrderType.StopLoss,\n      inputs,\n      nonce,\n      deadline,\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.market.id,\n        isLong: positionBase > 0,\n        stopPrice: params.stopLossPrice,\n        signerWallet: await params.signer.getAddress(),\n        nonce: nonce,\n        signature: signature,\n        deadline: deadline,\n        orderPriceLimit: orderPriceLimit,\n        exchangeId: params.market.exchangeId,\n        poolId: params.market.counterpartyAccountIds[0],\n        timestampMs: creationTimestampMs,\n      },\n    );\n  }\n\n  async updateSLOrder(\n    params: UpdateSLOrderParams,\n  ): Promise<UpdateSLOrderResult> {\n    return await this.registerSLOrder(params as RegisterSLOrderParams);\n  }\n\n  private async getPosition(\n    accountId: number,\n    marketId: number,\n  ): Promise<PositionEntity> {\n    const uri = `/api/account/marginAccount/position/${accountId}/${marketId}`;\n    return this.get<PositionEntity>(uri);\n  }\n\n  private createNonce(\n    accountId: number,\n    marketId: number,\n    timestampMs: number,\n  ): string {\n    // Validate the input ranges\n    if (marketId < 0 || marketId >= 2 ** 32)\n      throw new Error('marketId is out of range');\n    if (accountId < BigInt(0) || accountId >= 2 ** 128)\n      throw new Error('accountId is out of range');\n    if (timestampMs < 0 || timestampMs >= 2 ** 64)\n      throw new Error('timestamp is out of range');\n\n    const hashUint256 =\n      (BigInt(accountId) << BigInt(98)) |\n      (BigInt(timestampMs) << BigInt(32)) |\n      BigInt(marketId);\n\n    return hashUint256.toString();\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":";;;AAiBA,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,uEAAc,CAAA;AAChB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B","sourcesContent":["import { StopLossOrder } from '@reyaxyz/common';\nimport { Signer, JsonRpcSigner } from 'ethers';\nimport { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';\n\nexport type CancelSLOrderParams = {\n  orderId: number;\n};\n\nexport type CancelSLOrderResult = StopLossOrder;\n\nexport type GetPendingSLOrderParams = {\n  accountId: number;\n  marketId: number;\n};\n\nexport type GetPendingSLOrderResult = StopLossOrder | null;\n\nexport enum ConditionalOrderType {\n  'StopLoss' = 0,\n}\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: number;\n};\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\nexport type RegisterSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  stopLossPrice: number;\n  market: MarketParams;\n};\n\nexport type RegisterSLOrderResult = StopLossOrder;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["clients/modules/conditional-orders/types.ts"],"names":[],"mappings":";;;AAkBA,IAAY,oBAEX;AAFD,WAAY,oBAAoB;IAC9B,uEAAc,CAAA;AAChB,CAAC,EAFW,oBAAoB,oCAApB,oBAAoB,QAE/B","sourcesContent":["import { StopLossOrder } from '@reyaxyz/common';\nimport { Signer, JsonRpcSigner } from 'ethers';\nimport { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';\n\nexport type CancelSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  orderId: number;\n};\n\nexport type CancelSLOrderResult = StopLossOrder;\n\nexport type GetPendingSLOrderParams = {\n  accountId: number;\n  marketId: number;\n};\n\nexport type GetPendingSLOrderResult = StopLossOrder | null;\n\nexport enum ConditionalOrderType {\n  'StopLoss' = 0,\n}\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: string;\n};\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\nexport type RegisterSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  stopLossPrice: number;\n  market: MarketParams;\n};\n\nexport type UpdateSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  orderId: number;\n  marginAccountId: MarginAccountEntity['id'];\n  stopLossPrice: number;\n  market: MarketParams;\n};\n\nexport type RegisterSLOrderResult = StopLossOrder;\nexport type UpdateSLOrderResult = StopLossOrder;\n"]}

package/dist/clients/types.js

@@ -26,6 +26,7 @@ Object.defineProperty(exports, "MarginAccountCollateralsBalanceGranularity", { e
 Object.defineProperty(exports, "AllMarginAccountsBalanceGranularity", { enumerable: true, get: function () { return common_1.AllMarginAccountsBalanceGranularity; } });
 Object.defineProperty(exports, "FundingRateHistoryGranularity", { enumerable: true, get: function () { return common_1.FundingRateHistoryGranularity; } });
 __exportStar(require("./modules/account/types"), exports);
+__exportStar(require("./modules/conditional-orders/types"), exports);
 __exportStar(require("./modules/lp/types"), exports);
 __exportStar(require("./modules/markets/types"), exports);
 __exportStar(require("./modules/tokens/types"), exports);

package/dist/clients/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["clients/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD,0CA4ByB;AA1BvB,2GAAA,iBAAiB,OAAA;AAYjB,qGAAA,WAAW,OAAA;AACX,2GAAA,iBAAiB,OAAA;AAGjB,8GAAA,oBAAoB,OAAA;AACpB,yHAAA,+BAA+B,OAAA;AAE/B,oIAAA,0CAA0C,OAAA;AAG1C,6HAAA,mCAAmC,OAAA;AAEnC,uHAAA,6BAA6B,OAAA;AAG/B,0DAAwC;AACxC,qDAAmC;AACnC,0DAAwC;AACxC,yDAAuC;AACvC,mEAAiD;AACjD,wDAAsC;AACtC,iFAA+D;AAC/D,4EAA0D;AAC1D,kFAAgE;AAChE,6EAA2D;AAC3D,yEAAuD;AACvD,mFAAiE;AACjE,yFAAuE;AACvE,8EAA4D;AAC5D,+DAA6C;AAC7C,yEAAuD;AACvD,kFAAgE;AAChE,4EAA0D","sourcesContent":["// reexporting what we want to share with integrators\nexport {\n  Candle,\n  CandlesResolution,\n  MarketEntity,\n  LpTransactionHistoryEntity,\n  TradingHistoryEntity,\n  PositionHistoryEntity,\n  PositionEntity,\n  TransactionHistoryType,\n  MarginAccountTransactionHistoryType,\n  MarginAccountTransactionHistoryEntity,\n  MarginAccountEntity,\n  LpPositionEntity,\n  LpPoolEntity,\n  ReyaChainId,\n  MoneyInOutChainId,\n  GetLpPoolPerformanceChartDataResult,\n  GetLpPoolBalanceChartDataResult,\n  LpBalanceGranularity,\n  MarginAccountBalanceGranularity,\n  GetMarginAccountBalanceChartDataResult,\n  MarginAccountCollateralsBalanceGranularity,\n  GetMarginAccountCollateralsBalanceChartDataResult,\n  GetAllMarginAccountsBalanceChartDataResult,\n  AllMarginAccountsBalanceGranularity,\n  GetFundingRateChartDataResult,\n  FundingRateHistoryGranularity,\n  MoneyInOutConfigurationPerTokenName,\n} from '@reyaxyz/common';\nexport * from './modules/account/types';\nexport * from './modules/lp/types';\nexport * from './modules/markets/types';\nexport * from './modules/tokens/types';\nexport * from './modules/trade.simulation/types';\nexport * from './modules/owner/types';\nexport * from './modules/deposit-existing-MA.simulation/types';\nexport * from './modules/deposit-new-MA.simulation/types';\nexport * from './modules/deposit-passive-pool.simulation/types';\nexport * from './modules/edit-collateral.simulation/types';\nexport * from './modules/withdraw-MA.simulation/types';\nexport * from './modules/withdraw-passive-pool.simulation/types';\nexport * from './modules/transfer-margin-between-MAs.simulation/types';\nexport * from './modules/transfer-MA-Pool.simulation/types';\nexport * from './modules/funding-rate/types';\nexport * from './modules/depth-chart.simulation/types';\nexport * from './modules/deposit-passive-pool.simulation/types';\nexport * from './modules/isolated-order.simulation/types';\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["clients/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,qDAAqD;AACrD,0CA4ByB;AA1BvB,2GAAA,iBAAiB,OAAA;AAYjB,qGAAA,WAAW,OAAA;AACX,2GAAA,iBAAiB,OAAA;AAGjB,8GAAA,oBAAoB,OAAA;AACpB,yHAAA,+BAA+B,OAAA;AAE/B,oIAAA,0CAA0C,OAAA;AAG1C,6HAAA,mCAAmC,OAAA;AAEnC,uHAAA,6BAA6B,OAAA;AAG/B,0DAAwC;AACxC,qEAAmD;AACnD,qDAAmC;AACnC,0DAAwC;AACxC,yDAAuC;AACvC,mEAAiD;AACjD,wDAAsC;AACtC,iFAA+D;AAC/D,4EAA0D;AAC1D,kFAAgE;AAChE,6EAA2D;AAC3D,yEAAuD;AACvD,mFAAiE;AACjE,yFAAuE;AACvE,8EAA4D;AAC5D,+DAA6C;AAC7C,yEAAuD;AACvD,kFAAgE;AAChE,4EAA0D","sourcesContent":["// reexporting what we want to share with integrators\nexport {\n  Candle,\n  CandlesResolution,\n  MarketEntity,\n  LpTransactionHistoryEntity,\n  TradingHistoryEntity,\n  PositionHistoryEntity,\n  PositionEntity,\n  TransactionHistoryType,\n  MarginAccountTransactionHistoryType,\n  MarginAccountTransactionHistoryEntity,\n  MarginAccountEntity,\n  LpPositionEntity,\n  LpPoolEntity,\n  ReyaChainId,\n  MoneyInOutChainId,\n  GetLpPoolPerformanceChartDataResult,\n  GetLpPoolBalanceChartDataResult,\n  LpBalanceGranularity,\n  MarginAccountBalanceGranularity,\n  GetMarginAccountBalanceChartDataResult,\n  MarginAccountCollateralsBalanceGranularity,\n  GetMarginAccountCollateralsBalanceChartDataResult,\n  GetAllMarginAccountsBalanceChartDataResult,\n  AllMarginAccountsBalanceGranularity,\n  GetFundingRateChartDataResult,\n  FundingRateHistoryGranularity,\n  MoneyInOutConfigurationPerTokenName,\n} from '@reyaxyz/common';\nexport * from './modules/account/types';\nexport * from './modules/conditional-orders/types';\nexport * from './modules/lp/types';\nexport * from './modules/markets/types';\nexport * from './modules/tokens/types';\nexport * from './modules/trade.simulation/types';\nexport * from './modules/owner/types';\nexport * from './modules/deposit-existing-MA.simulation/types';\nexport * from './modules/deposit-new-MA.simulation/types';\nexport * from './modules/deposit-passive-pool.simulation/types';\nexport * from './modules/edit-collateral.simulation/types';\nexport * from './modules/withdraw-MA.simulation/types';\nexport * from './modules/withdraw-passive-pool.simulation/types';\nexport * from './modules/transfer-margin-between-MAs.simulation/types';\nexport * from './modules/transfer-MA-Pool.simulation/types';\nexport * from './modules/funding-rate/types';\nexport * from './modules/depth-chart.simulation/types';\nexport * from './modules/deposit-passive-pool.simulation/types';\nexport * from './modules/isolated-order.simulation/types';\n"]}

package/dist/types/clients/modules/account/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/account/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,wCAAwC,EACxC,wCAAwC,EACxC,8BAA8B,EAC9B,8BAA8B,EAC9B,qCAAqC,EACrC,qCAAqC,EACrC,kCAAkC,EAClC,kCAAkC,EAClC,yCAAyC,EACzC,sCAAsC,EACtC,iDAAiD,EACjD,0CAA0C,EAC1C,uBAAuB,EACvB,wBAAwB,EACxB,iCAAiC,EACjC,iCAAiC,EACjC,4CAA4C,EAC5C,uBAAuB,EACvB,wBAAwB,EACxB,sCAAsC,EACtC,sCAAsC,EACtC,kDAAkD,EAClD,kDAAkD,EAClD,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,iDAAiD,EACjD,sCAAsC,EACtC,0CAA0C,EAC1C,UAAU,EACX,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD;;;;;;;;;;;SAWK;IAEC,iBAAiB,CACrB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IAiBnC;;;;;;;;;;OAUG;IAEG,gBAAgB,CACpB,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,sBAAsB,CAAC;IAK5B,4BAA4B,CAChC,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,kCAAkC,CAAC;IAKxC,4CAA4C,CAChD,MAAM,EAAE,kDAAkD,GACzD,OAAO,CAAC,kDAAkD,CAAC;IASxD,oCAAoC,CACxC,MAAM,EAAE,0CAA0C,GACjD,OAAO,CAAC,0CAA0C,CAAC;IAOhD,wBAAwB,CAC5B,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC;IAQpC,gCAAgC,CACpC,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,sCAAsC,CAAC;IAQ5C,mCAAmC,CACvC,MAAM,EAAE,yCAAyC,GAChD,OAAO,CAAC,oBAAoB,CAAC;IAO1B,sCAAsC,CAC1C,MAAM,EAAE,4CAA4C,GACnD,OAAO,CAAC,6BAA6B,CAAC;IAKnC,kCAAkC,CACtC,MAAM,EAAE,wCAAwC,GAC/C,OAAO,CAAC,wCAAwC,CAAC;IAO9C,+BAA+B,CACnC,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,qCAAqC,CAAC;IAO3C,gCAAgC,CACpC,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,sCAAsC,CAAC;IAQ5C,2CAA2C,CAC/C,MAAM,EAAE,iDAAiD,GACxD,OAAO,CAAC,iDAAiD,CAAC;IAQvD,gCAAgC,CACpC,MAAM,EAAE,0CAA0C,GACjD,OAAO,CAAC,0CAA0C,CAAC;IAQhD,2BAA2B,CAC/B,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,iCAAiC,CAAC;IAMvC,iBAAiB,CACrB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IAe7B,kBAAkB,CACtB,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,wBAAwB,CAAC;CAUrC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/account/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,uBAAuB,EACvB,uBAAuB,EACvB,wCAAwC,EACxC,wCAAwC,EACxC,8BAA8B,EAC9B,8BAA8B,EAC9B,qCAAqC,EACrC,qCAAqC,EACrC,kCAAkC,EAClC,kCAAkC,EAClC,yCAAyC,EACzC,sCAAsC,EACtC,iDAAiD,EACjD,0CAA0C,EAC1C,uBAAuB,EACvB,wBAAwB,EACxB,iCAAiC,EACjC,iCAAiC,EACjC,4CAA4C,EAC5C,uBAAuB,EACvB,wBAAwB,EACxB,sCAAsC,EACtC,sCAAsC,EACtC,kDAAkD,EAClD,kDAAkD,EAClD,0CAA0C,EAC1C,0CAA0C,EAC3C,MAAM,SAAS,CAAC;AACjB,OAAO,EACL,6BAA6B,EAC7B,oBAAoB,EACpB,iDAAiD,EACjD,sCAAsC,EACtC,0CAA0C,EAC1C,UAAU,EACX,MAAM,iBAAiB,CAAC;AAEzB,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,UAAU;IACnD;;;;;;;;;;;SAWK;IAEC,iBAAiB,CACrB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IASnC;;;;;;;;;;OAUG;IAEG,gBAAgB,CACpB,MAAM,EAAE,sBAAsB,GAC7B,OAAO,CAAC,sBAAsB,CAAC;IAK5B,4BAA4B,CAChC,MAAM,EAAE,kCAAkC,GACzC,OAAO,CAAC,kCAAkC,CAAC;IAKxC,4CAA4C,CAChD,MAAM,EAAE,kDAAkD,GACzD,OAAO,CAAC,kDAAkD,CAAC;IASxD,oCAAoC,CACxC,MAAM,EAAE,0CAA0C,GACjD,OAAO,CAAC,0CAA0C,CAAC;IAOhD,wBAAwB,CAC5B,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC;IAQpC,gCAAgC,CACpC,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,sCAAsC,CAAC;IAQ5C,mCAAmC,CACvC,MAAM,EAAE,yCAAyC,GAChD,OAAO,CAAC,oBAAoB,CAAC;IAO1B,sCAAsC,CAC1C,MAAM,EAAE,4CAA4C,GACnD,OAAO,CAAC,6BAA6B,CAAC;IAKnC,kCAAkC,CACtC,MAAM,EAAE,wCAAwC,GAC/C,OAAO,CAAC,wCAAwC,CAAC;IAO9C,+BAA+B,CACnC,MAAM,EAAE,qCAAqC,GAC5C,OAAO,CAAC,qCAAqC,CAAC;IAO3C,gCAAgC,CACpC,MAAM,EAAE,sCAAsC,GAC7C,OAAO,CAAC,sCAAsC,CAAC;IAQ5C,2CAA2C,CAC/C,MAAM,EAAE,iDAAiD,GACxD,OAAO,CAAC,iDAAiD,CAAC;IAQvD,gCAAgC,CACpC,MAAM,EAAE,0CAA0C,GACjD,OAAO,CAAC,0CAA0C,CAAC;IAQhD,2BAA2B,CAC/B,MAAM,EAAE,iCAAiC,GACxC,OAAO,CAAC,iCAAiC,CAAC;IAMvC,iBAAiB,CACrB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IAe7B,kBAAkB,CACtB,MAAM,EAAE,wBAAwB,GAC/B,OAAO,CAAC,wBAAwB,CAAC;CAUrC"}

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

@@ -1,11 +1,13 @@
 import { RestClient, ReyaChainId } from '@reyaxyz/common';
-import { CancelSLOrderParams, CancelSLOrderResult, GetPendingSLOrderParams, GetPendingSLOrderResult, RegisterSLOrderParams, RegisterSLOrderResult } from './types';
+import { CancelSLOrderParams, CancelSLOrderResult, GetPendingSLOrderParams, GetPendingSLOrderResult, RegisterSLOrderParams, RegisterSLOrderResult, UpdateSLOrderParams, UpdateSLOrderResult } from './types';
 export default class ConditionalOrdersClient extends RestClient {
     private reyaChainId;
     constructor(reyaChainId: ReyaChainId, host: string);
     getPendingSLOrder(params: GetPendingSLOrderParams): Promise<GetPendingSLOrderResult>;
     cancelSLOrder(params: CancelSLOrderParams): Promise<CancelSLOrderResult>;
     registerSLOrder(params: RegisterSLOrderParams): Promise<RegisterSLOrderResult>;
+    updateSLOrder(params: UpdateSLOrderParams): Promise<UpdateSLOrderResult>;
     private getPosition;
+    private createNonce;
 }
 //# 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,EAIZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EAEnB,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;IAK5C,iBAAiB,CACrB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IAc7B,aAAa,CACjB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAYzB,eAAe,CACnB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,qBAAqB,CAAC;YA+DnB,WAAW;CAO1B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,WAAW,EAMZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EACL,mBAAmB,EACnB,mBAAmB,EAEnB,uBAAuB,EACvB,uBAAuB,EACvB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,mBAAmB,EACpB,MAAM,SAAS,CAAC;AAEjB,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;IAK5C,iBAAiB,CACrB,MAAM,EAAE,uBAAuB,GAC9B,OAAO,CAAC,uBAAuB,CAAC;IAa7B,aAAa,CACjB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;IAiBzB,eAAe,CACnB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,qBAAqB,CAAC;IA4D3B,aAAa,CACjB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;YAIjB,WAAW;IAQzB,OAAO,CAAC,WAAW;CAoBpB"}

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

@@ -2,6 +2,7 @@ import { StopLossOrder } from '@reyaxyz/common';
 import { Signer, JsonRpcSigner } from 'ethers';
 import { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';
 export type CancelSLOrderParams = {
+    signer: Signer | JsonRpcSigner;
     orderId: number;
 };
 export type CancelSLOrderResult = StopLossOrder;
@@ -21,7 +22,7 @@ export type ConditionalOrderDetails = {
     orderType: number;
     inputs: string;
     signer: string;
-    nonce: number;
+    nonce: string;
 };
 export type MarketParams = {
     id: MarketEntity['id'];
@@ -35,5 +36,13 @@ export type RegisterSLOrderParams = {
     stopLossPrice: number;
     market: MarketParams;
 };
+export type UpdateSLOrderParams = {
+    signer: Signer | JsonRpcSigner;
+    orderId: number;
+    marginAccountId: MarginAccountEntity['id'];
+    stopLossPrice: number;
+    market: MarketParams;
+};
 export type RegisterSLOrderResult = StopLossOrder;
+export type UpdateSLOrderResult = StopLossOrder;
 //# 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":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC;AAEhD,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,aAAa,GAAG,IAAI,CAAC;AAE3D,oBAAY,oBAAoB;IAC9B,UAAU,IAAI;CACf;AAED,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,YAAY,GAAG;IACzB,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACvB,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,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,aAAa,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAEpE,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC;AAEhD,MAAM,MAAM,uBAAuB,GAAG;IACpC,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG,aAAa,GAAG,IAAI,CAAC;AAE3D,oBAAY,oBAAoB;IAC9B,UAAU,IAAI;CACf;AAED,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,YAAY,GAAG;IACzB,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACvB,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,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAClD,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC"}

package/dist/types/clients/types.d.ts

@@ -1,5 +1,6 @@
 export { Candle, CandlesResolution, MarketEntity, LpTransactionHistoryEntity, TradingHistoryEntity, PositionHistoryEntity, PositionEntity, TransactionHistoryType, MarginAccountTransactionHistoryType, MarginAccountTransactionHistoryEntity, MarginAccountEntity, LpPositionEntity, LpPoolEntity, ReyaChainId, MoneyInOutChainId, GetLpPoolPerformanceChartDataResult, GetLpPoolBalanceChartDataResult, LpBalanceGranularity, MarginAccountBalanceGranularity, GetMarginAccountBalanceChartDataResult, MarginAccountCollateralsBalanceGranularity, GetMarginAccountCollateralsBalanceChartDataResult, GetAllMarginAccountsBalanceChartDataResult, AllMarginAccountsBalanceGranularity, GetFundingRateChartDataResult, FundingRateHistoryGranularity, MoneyInOutConfigurationPerTokenName, } from '@reyaxyz/common';
 export * from './modules/account/types';
+export * from './modules/conditional-orders/types';
 export * from './modules/lp/types';
 export * from './modules/markets/types';
 export * from './modules/tokens/types';

package/dist/types/clients/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/types.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,cAAc,EACd,sBAAsB,EACtB,mCAAmC,EACnC,qCAAqC,EACrC,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,+BAA+B,EAC/B,sCAAsC,EACtC,0CAA0C,EAC1C,iDAAiD,EACjD,0CAA0C,EAC1C,mCAAmC,EACnC,6BAA6B,EAC7B,6BAA6B,EAC7B,mCAAmC,GACpC,MAAM,iBAAiB,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,kDAAkD,CAAC;AACjE,cAAc,wDAAwD,CAAC;AACvE,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,2CAA2C,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["clients/types.ts"],"names":[],"mappings":"AACA,OAAO,EACL,MAAM,EACN,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC1B,oBAAoB,EACpB,qBAAqB,EACrB,cAAc,EACd,sBAAsB,EACtB,mCAAmC,EACnC,qCAAqC,EACrC,mBAAmB,EACnB,gBAAgB,EAChB,YAAY,EACZ,WAAW,EACX,iBAAiB,EACjB,mCAAmC,EACnC,+BAA+B,EAC/B,oBAAoB,EACpB,+BAA+B,EAC/B,sCAAsC,EACtC,0CAA0C,EAC1C,iDAAiD,EACjD,0CAA0C,EAC1C,mCAAmC,EACnC,6BAA6B,EAC7B,6BAA6B,EAC7B,mCAAmC,GACpC,MAAM,iBAAiB,CAAC;AACzB,cAAc,yBAAyB,CAAC;AACxC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,kCAAkC,CAAC;AACjD,cAAc,uBAAuB,CAAC;AACtC,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,iDAAiD,CAAC;AAChE,cAAc,4CAA4C,CAAC;AAC3D,cAAc,wCAAwC,CAAC;AACvD,cAAc,kDAAkD,CAAC;AACjE,cAAc,wDAAwD,CAAC;AACvE,cAAc,6CAA6C,CAAC;AAC5D,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wCAAwC,CAAC;AACvD,cAAc,iDAAiD,CAAC;AAChE,cAAc,2CAA2C,CAAC"}

package/package.json

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

package/src/clients/modules/account/index.ts

@@ -60,14 +60,6 @@ export default class AccountClient extends RestClient {
       limit: params.limit,
     });
 
-    response.forEach((account) => {
-      account.positions.forEach((position) => {
-        if (Math.random() > 0.5) {
-          position.stopLossPrice = Math.random() * 1000;
-        }
-      });
-    });
-
     return response;
   }
 

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

@@ -1,11 +1,13 @@
 import {
-  calculatePriceLimitForTrade,
+  calculateMaxPriceLimit,
   PositionEntity,
   RestClient,
   ReyaChainId,
   signConditionalOrder,
+  signCancelConditionalOrder,
   StopLossOrder,
   StopLossOrderStatus,
+  scale,
 } from '@reyaxyz/common';
 import { AbiCoder } from 'ethers';
 import {
@@ -16,6 +18,8 @@ import {
   GetPendingSLOrderResult,
   RegisterSLOrderParams,
   RegisterSLOrderResult,
+  UpdateSLOrderParams,
+  UpdateSLOrderResult,
 } from './types';
 
 export default class ConditionalOrdersClient extends RestClient {
@@ -29,7 +33,7 @@ export default class ConditionalOrdersClient extends RestClient {
   async getPendingSLOrder(
     params: GetPendingSLOrderParams,
   ): Promise<GetPendingSLOrderResult> {
-    const uri = `/api/conditional-orders/sl/get-orders-by-position/${StopLossOrderStatus.NEW}/${params.marketId}/${params.accountId}`;
+    const uri = `/api/conditional-orders/sl/get-orders-by-position/${StopLossOrderStatus.PENDING}/${params.marketId}/${params.accountId}`;
     const response = await this.get<GetPendingSLOrderResult[]>(uri);
 
     if (response.length > 1) {
@@ -41,17 +45,21 @@ export default class ConditionalOrdersClient extends RestClient {
     return response[0];
   }
 
-  // todo: need authentication
   async cancelSLOrder(
     params: CancelSLOrderParams,
   ): Promise<CancelSLOrderResult> {
-    const uri = `/api/conditional-orders/sl/set-order-status`;
-    return this.post<StopLossOrder>(
+    const signature = await signCancelConditionalOrder(
+      params.signer,
+      params.orderId,
+    );
+
+    const uri = `/api/conditional-orders/sl/cancel-order`;
+    return this.put<StopLossOrder>(
       uri,
       {},
       {
         orderId: params.orderId,
-        status: StopLossOrderStatus.CANCELLED,
+        userSignature: signature,
       },
     );
   }
@@ -69,16 +77,19 @@ export default class ConditionalOrdersClient extends RestClient {
       throw new Error('Position with no exposure');
     }
 
-    const orderPriceLimit = calculatePriceLimitForTrade(
-      params.market.currentPrice,
-      positionBase,
-    );
+    const orderPriceLimit = Number(calculateMaxPriceLimit(positionBase < 0));
 
     const inputs = AbiCoder.defaultAbiCoder().encode(
       ['uint256', 'uint256'],
-      [params.stopLossPrice, orderPriceLimit],
+      [scale(18)(params.stopLossPrice), orderPriceLimit],
     );
-    const nonce = 0; // todo derive
+    const creationTimestampMs = Date.now();
+    const nonce = this.createNonce(
+      params.marginAccountId,
+      params.market.id,
+      creationTimestampMs,
+    );
+    const deadline = 10 ** 18; // very big number for timestamp in seconds - infinite deadline
 
     const signature = await signConditionalOrder(
       params.signer,
@@ -90,19 +101,9 @@ export default class ConditionalOrdersClient extends RestClient {
       ConditionalOrderType.StopLoss,
       inputs,
       nonce,
-      Number.MAX_VALUE,
+      deadline,
     );
 
-    // cancel old order existing order
-    if (position.stopLossPrice) {
-      const order = await this.getPendingSLOrder({
-        accountId: params.marginAccountId,
-        marketId: params.market.id,
-      });
-      if (order != null) {
-        await this.cancelSLOrder({ orderId: order.orderId });
-      }
-    }
     // create new entry
     const uri = `/api/conditional-orders/sl/create-order`;
     return this.post<StopLossOrder>(
@@ -115,12 +116,22 @@ export default class ConditionalOrdersClient extends RestClient {
         stopPrice: params.stopLossPrice,
         signerWallet: await params.signer.getAddress(),
         nonce: nonce,
-        signature: signature.r,
-        status: StopLossOrderStatus.NEW,
+        signature: signature,
+        deadline: deadline,
+        orderPriceLimit: orderPriceLimit,
+        exchangeId: params.market.exchangeId,
+        poolId: params.market.counterpartyAccountIds[0],
+        timestampMs: creationTimestampMs,
       },
     );
   }
 
+  async updateSLOrder(
+    params: UpdateSLOrderParams,
+  ): Promise<UpdateSLOrderResult> {
+    return await this.registerSLOrder(params as RegisterSLOrderParams);
+  }
+
   private async getPosition(
     accountId: number,
     marketId: number,
@@ -128,4 +139,25 @@ export default class ConditionalOrdersClient extends RestClient {
     const uri = `/api/account/marginAccount/position/${accountId}/${marketId}`;
     return this.get<PositionEntity>(uri);
   }
+
+  private createNonce(
+    accountId: number,
+    marketId: number,
+    timestampMs: number,
+  ): string {
+    // Validate the input ranges
+    if (marketId < 0 || marketId >= 2 ** 32)
+      throw new Error('marketId is out of range');
+    if (accountId < BigInt(0) || accountId >= 2 ** 128)
+      throw new Error('accountId is out of range');
+    if (timestampMs < 0 || timestampMs >= 2 ** 64)
+      throw new Error('timestamp is out of range');
+
+    const hashUint256 =
+      (BigInt(accountId) << BigInt(98)) |
+      (BigInt(timestampMs) << BigInt(32)) |
+      BigInt(marketId);
+
+    return hashUint256.toString();
+  }
 }

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

@@ -3,6 +3,7 @@ import { Signer, JsonRpcSigner } from 'ethers';
 import { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';
 
 export type CancelSLOrderParams = {
+  signer: Signer | JsonRpcSigner;
   orderId: number;
 };
 
@@ -27,7 +28,7 @@ export type ConditionalOrderDetails = {
   orderType: number;
   inputs: string;
   signer: string;
-  nonce: number;
+  nonce: string;
 };
 
 export type MarketParams = {
@@ -44,4 +45,13 @@ export type RegisterSLOrderParams = {
   market: MarketParams;
 };
 
+export type UpdateSLOrderParams = {
+  signer: Signer | JsonRpcSigner;
+  orderId: number;
+  marginAccountId: MarginAccountEntity['id'];
+  stopLossPrice: number;
+  market: MarketParams;
+};
+
 export type RegisterSLOrderResult = StopLossOrder;
+export type UpdateSLOrderResult = StopLossOrder;

package/src/clients/types.ts

@@ -29,6 +29,7 @@ export {
   MoneyInOutConfigurationPerTokenName,
 } from '@reyaxyz/common';
 export * from './modules/account/types';
+export * from './modules/conditional-orders/types';
 export * from './modules/lp/types';
 export * from './modules/markets/types';
 export * from './modules/tokens/types';