@reyaxyz/api-sdk 0.104.0 → 0.104.1

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

@@ -61,6 +61,23 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
         _this.reyaChainId = reyaChainId;
         return _this;
     }
+    ConditionalOrdersClient.prototype.alreadyGaveTradePermissions = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            var uri, response;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        uri = "/api/conditional-orders/gave-trade-permission/".concat(params.accountId);
+                        return [4 /*yield*/, this.get(uri)];
+                    case 1:
+                        response = _a.sent();
+                        return [2 /*return*/, {
+                                permissionGiven: response,
+                            }];
+                }
+            });
+        });
+    };
     ConditionalOrdersClient.prototype.getPendingSLOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
             var uri, response;
@@ -100,44 +117,32 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
     };
     ConditionalOrdersClient.prototype.registerSLOrder = function (params) {
         return __awaiter(this, void 0, void 0, function () {
-            var position, positionBase, orderPriceLimit, inputs, creationTimestampMs, nonce, deadline, signature, uri, _a, _b;
+            var inputs, uri, _a, _b;
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.getPosition(params.marginAccountId, params.market.id)];
+                    case 0: return [4 /*yield*/, this.parseSlOrderInputs(params.signer, params.marginAccountId, params.marketId, params.stopLossPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds)];
                     case 1:
-                        position = _d.sent();
-                        positionBase = position.base;
-                        if (positionBase === 0) {
-                            throw new Error('Position with no exposure');
-                        }
-                        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();
+                        inputs = _d.sent();
                         uri = "/api/conditional-orders/sl/create-order";
                         _a = this.post;
                         _b = [uri,
                             {}];
                         _c = {
                             accountId: params.marginAccountId,
-                            marketId: params.market.id,
-                            isLong: positionBase > 0,
+                            marketId: params.marketId,
+                            isLong: inputs.positionBase > 0,
                             stopPrice: params.stopLossPrice
                         };
                         return [4 /*yield*/, params.signer.getAddress()];
-                    case 3: return [2 /*return*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
-                                _c.nonce = nonce,
-                                _c.signature = signature,
-                                _c.deadline = deadline,
-                                _c.orderPriceLimit = orderPriceLimit,
-                                _c.exchangeId = params.market.exchangeId,
-                                _c.poolId = params.market.counterpartyAccountIds[0],
-                                _c.timestampMs = creationTimestampMs,
+                    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,
+                                _c.exchangeId = params.supportingParams.exchangeId,
+                                _c.poolId = params.supportingParams.counterpartyAccountIds[0],
+                                _c.timestampMs = inputs.creationTimestampMs,
                                 _c)]))];
                 }
             });
@@ -145,10 +150,33 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
     };
     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()];
+            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,
+                                _c.exchangeId = params.supportingParams.exchangeId,
+                                _c.poolId = params.supportingParams.counterpartyAccountIds[0],
+                                _c.timestampMs = inputs.creationTimestampMs,
+                                _c)]))];
                 }
             });
         });
@@ -173,7 +201,39 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
         var hashUint256 = (BigInt(accountId) << BigInt(98)) |
             (BigInt(timestampMs) << BigInt(32)) |
             BigInt(marketId);
-        return hashUint256.toString();
+        return hashUint256;
+    };
+    ConditionalOrdersClient.prototype.parseSlOrderInputs = function (signer, accountId, marketId, stopLossPrice, exchangeId, counterpartyAccountIds) {
+        return __awaiter(this, void 0, void 0, function () {
+            var position, positionBase, orderPriceLimit, inputs, creationTimestampMs, nonce, deadline, 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');
+                        }
+                        orderPriceLimit = Number((0, common_1.calculateMaxPriceLimit)(positionBase < 0));
+                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['uint256', 'uint256'], [(0, common_1.scale)(18)(stopLossPrice), orderPriceLimit]);
+                        creationTimestampMs = Date.now();
+                        nonce = this.createNonce(accountId, marketId, creationTimestampMs);
+                        deadline = Math.pow(10, 18);
+                        return [4 /*yield*/, (0, common_1.signConditionalOrder)(signer, this.reyaChainId, accountId, marketId, exchangeId, counterpartyAccountIds, types_1.ConditionalOrderType.StopLoss, inputs, nonce, deadline)];
+                    case 2:
+                        signature = _a.sent();
+                        return [2 /*return*/, {
+                                signature: signature,
+                                positionBase: positionBase,
+                                orderPriceLimit: orderPriceLimit,
+                                nonce: nonce,
+                                deadline: deadline,
+                                creationTimestampMs: creationTimestampMs,
+                            }];
+                }
+            });
+        });
     };
     return ConditionalOrdersClient;
 }(common_1.RestClient));

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":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAUyB;AACzB,iCAAkC;AAClC,iCAUiB;AAEjB;IAAqD,2CAAU;IAG7D,iCAAY,WAAwB,EAAE,IAAY;QAChD,YAAA,MAAK,YAAC,IAAI,CAAC,SAAC;QACZ,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;;IACjC,CAAC;IAEK,mDAAiB,GAAvB,UACE,MAA+B;;;;;;wBAEzB,GAAG,GAAG,4DAAqD,4BAAmB,CAAC,OAAO,cAAI,MAAM,CAAC,QAAQ,cAAI,MAAM,CAAC,SAAS,CAAE,CAAC;wBACrH,qBAAM,IAAI,CAAC,GAAG,CAA4B,GAAG,CAAC,EAAA;;wBAAzD,QAAQ,GAAG,SAA8C;wBAE/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;wBACrE,CAAC;wBAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;4BAAE,sBAAO,IAAI,EAAC;wBAEvC,sBAAO,QAAQ,CAAC,CAAC,CAAC,EAAC;;;;KACpB;IAEK,+CAAa,GAAnB,UACE,MAA2B;;;;;4BAET,qBAAM,IAAA,mCAA0B,EAChD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CACf,EAAA;;wBAHK,SAAS,GAAG,SAGjB;wBAEK,GAAG,GAAG,yCAAyC,CAAC;wBACtD,sBAAO,IAAI,CAAC,GAAG,CACb,GAAG,EACH,EAAE,EACF;gCACE,OAAO,EAAE,MAAM,CAAC,OAAO;gCACvB,aAAa,EAAE,SAAS;6BACzB,CACF,EAAC;;;;KACH;IAEK,iDAAe,GAArB,UACE,MAA6B;;;;;;4BAEZ,qBAAM,IAAI,CAAC,WAAW,CACrC,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,MAAM,CAAC,EAAE,CACjB,EAAA;;wBAHK,QAAQ,GAAG,SAGhB;wBACK,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;wBAEnC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;4BACvB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;wBAC/C,CAAC;wBAEK,eAAe,GAAG,MAAM,CAAC,IAAA,+BAAsB,EAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;wBAEnE,MAAM,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAC9C,CAAC,SAAS,EAAE,SAAS,CAAC,EACtB,CAAC,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC,CACnD,CAAC;wBACI,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;wBACjC,KAAK,GAAG,IAAI,CAAC,WAAW,CAC5B,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,mBAAmB,CACpB,CAAC;wBACI,QAAQ,GAAG,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;wBAER,qBAAM,IAAA,6BAAoB,EAC1C,MAAM,CAAC,MAAM,EACb,IAAI,CAAC,WAAW,EAChB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,EACxB,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,4BAAoB,CAAC,QAAQ,EAC7B,MAAM,EACN,KAAK,EACL,QAAQ,CACT,EAAA;;wBAXK,SAAS,GAAG,SAWjB;wBAGK,GAAG,GAAG,yCAAyC,CAAC;wBAC/C,KAAA,IAAI,CAAC,IAAI,CAAA;8BACd,GAAG;4BACH,EAAE;;4BAEA,SAAS,EAAE,MAAM,CAAC,eAAe;4BACjC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE;4BAC1B,MAAM,EAAE,YAAY,GAAG,CAAC;4BACxB,SAAS,EAAE,MAAM,CAAC,aAAa;;wBACjB,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;4BARlD,sBAAO,SAAA,IAAI,cAQP,eAAY,GAAE,SAAgC;gCAC9C,QAAK,GAAE,KAAK;gCACZ,YAAS,GAAE,SAAS;gCACpB,WAAQ,GAAE,QAAQ;gCAClB,kBAAe,GAAE,eAAe;gCAChC,aAAU,GAAE,MAAM,CAAC,MAAM,CAAC,UAAU;gCACpC,SAAM,GAAE,MAAM,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC,CAAC;gCAC/C,cAAW,GAAE,mBAAmB;sCAEnC,EAAC;;;;KACH;IAEK,+CAAa,GAAnB,UACE,MAA2B;;;;4BAEpB,qBAAM,IAAI,CAAC,eAAe,CAAC,MAA+B,CAAC,EAAA;4BAAlE,sBAAO,SAA2D,EAAC;;;;KACpE;IAEa,6CAAW,GAAzB,UACE,SAAiB,EACjB,QAAgB;;;;gBAEV,GAAG,GAAG,8CAAuC,SAAS,cAAI,QAAQ,CAAE,CAAC;gBAC3E,sBAAO,IAAI,CAAC,GAAG,CAAiB,GAAG,CAAC,EAAC;;;KACtC;IAEO,6CAAW,GAAnB,UACE,SAAiB,EACjB,QAAgB,EAChB,WAAmB;QAEnB,4BAA4B;QAC5B,IAAI,QAAQ,GAAG,CAAC,IAAI,QAAQ,IAAI,SAAA,CAAC,EAAI,EAAE,CAAA;YACrC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,IAAI,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,SAAA,CAAC,EAAI,GAAG,CAAA;YAChD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,IAAI,WAAW,GAAG,CAAC,IAAI,WAAW,IAAI,SAAA,CAAC,EAAI,EAAE,CAAA;YAC3C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE/C,IAAM,WAAW,GACf,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;YACjC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC,QAAQ,EAAE,CAAC;IAChC,CAAC;IACH,8BAAC;AAAD,CAAC,AA1ID,CAAqD,mBAAU,GA0I9D","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"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAUyB;AACzB,iCAAkC;AAElC,iCAYiB;AAEjB;IAAqD,2CAAU;IAG7D,iCAAY,WAAwB,EAAE,IAAY;QAChD,YAAA,MAAK,YAAC,IAAI,CAAC,SAAC;QACZ,KAAI,CAAC,WAAW,GAAG,WAAW,CAAC;;IACjC,CAAC;IAEK,6DAA2B,GAAjC,UACE,MAAwC;;;;;;wBAElC,GAAG,GAAG,wDAAiD,MAAM,CAAC,SAAS,CAAE,CAAC;wBAC/D,qBAAM,IAAI,CAAC,GAAG,CAAU,GAAG,CAAC,EAAA;;wBAAvC,QAAQ,GAAG,SAA4B;wBAE7C,sBAAO;gCACL,eAAe,EAAE,QAAQ;6BAC1B,EAAC;;;;KACH;IAEK,mDAAiB,GAAvB,UACE,MAA+B;;;;;;wBAEzB,GAAG,GAAG,4DAAqD,4BAAmB,CAAC,OAAO,cAAI,MAAM,CAAC,QAAQ,cAAI,MAAM,CAAC,SAAS,CAAE,CAAC;wBACrH,qBAAM,IAAI,CAAC,GAAG,CAA4B,GAAG,CAAC,EAAA;;wBAAzD,QAAQ,GAAG,SAA8C;wBAE/D,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;4BACxB,MAAM,IAAI,KAAK,CAAC,iDAAiD,CAAC,CAAC;wBACrE,CAAC;wBAED,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;4BAAE,sBAAO,IAAI,EAAC;wBAEvC,sBAAO,QAAQ,CAAC,CAAC,CAAC,EAAC;;;;KACpB;IAEK,+CAAa,GAAnB,UACE,MAA2B;;;;;4BAET,qBAAM,IAAA,mCAA0B,EAChD,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,OAAO,CACf,EAAA;;wBAHK,SAAS,GAAG,SAGjB;wBAEK,GAAG,GAAG,yCAAyC,CAAC;wBACtD,sBAAO,IAAI,CAAC,GAAG,CACb,GAAG,EACH,EAAE,EACF;gCACE,OAAO,EAAE,MAAM,CAAC,OAAO;gCACvB,aAAa,EAAE,SAAS;6BACzB,CACF,EAAC;;;;KACH;IAEK,iDAAe,GAArB,UACE,MAA6B;;;;;;4BAEd,qBAAM,IAAI,CAAC,kBAAkB,CAC1C,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAClC,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,CAC/C,EAAA;;wBAPK,MAAM,GAAG,SAOd;wBAGK,GAAG,GAAG,yCAAyC,CAAC;wBAC/C,KAAA,IAAI,CAAC,IAAI,CAAA;8BACd,GAAG;4BACH,EAAE;;4BAEA,SAAS,EAAE,MAAM,CAAC,eAAe;4BACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,MAAM,EAAE,MAAM,CAAC,YAAY,GAAG,CAAC;4BAC/B,SAAS,EAAE,MAAM,CAAC,aAAa;;wBACjB,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;4BARlD,sBAAO,SAAA,IAAI,cAQP,eAAY,GAAE,SAAgC;gCAC9C,QAAK,GAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE;gCAC9B,YAAS,GAAE,MAAM,CAAC,SAAS;gCAC3B,WAAQ,GAAE,MAAM,CAAC,QAAQ;gCACzB,kBAAe,GAAE,MAAM,CAAC,eAAe;gCACvC,aAAU,GAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU;gCAC9C,SAAM,GAAE,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAC;gCACzD,cAAW,GAAE,MAAM,CAAC,mBAAmB;sCAE1C,EAAC;;;;KACH;IAEK,+CAAa,GAAnB,UACE,MAA2B;;;;;;4BAEZ,qBAAM,IAAI,CAAC,kBAAkB,CAC1C,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,aAAa,EACpB,MAAM,CAAC,gBAAgB,CAAC,UAAU,EAClC,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,CAC/C,EAAA;;wBAPK,MAAM,GAAG,SAOd;wBAGK,GAAG,GAAG,yCAAyC,CAAC;wBAC/C,KAAA,IAAI,CAAC,IAAI,CAAA;8BACd,GAAG;4BACH,EAAE;;4BAEA,SAAS,EAAE,MAAM,CAAC,eAAe;4BACjC,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,MAAM,EAAE,MAAM,CAAC,YAAY,GAAG,CAAC;4BAC/B,SAAS,EAAE,MAAM,CAAC,aAAa;;wBACjB,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;4BARlD,sBAAO,SAAA,IAAI,cAQP,eAAY,GAAE,SAAgC;gCAC9C,QAAK,GAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE;gCAC9B,YAAS,GAAE,MAAM,CAAC,SAAS;gCAC3B,WAAQ,GAAE,MAAM,CAAC,QAAQ;gCACzB,kBAAe,GAAE,MAAM,CAAC,eAAe;gCACvC,aAAU,GAAE,MAAM,CAAC,gBAAgB,CAAC,UAAU;gCAC9C,SAAM,GAAE,MAAM,CAAC,gBAAgB,CAAC,sBAAsB,CAAC,CAAC,CAAC;gCACzD,cAAW,GAAE,MAAM,CAAC,mBAAmB;sCAE1C,EAAC;;;;KACH;IAEa,6CAAW,GAAzB,UACE,SAAiB,EACjB,QAAgB;;;;gBAEV,GAAG,GAAG,8CAAuC,SAAS,cAAI,QAAQ,CAAE,CAAC;gBAC3E,sBAAO,IAAI,CAAC,GAAG,CAAiB,GAAG,CAAC,EAAC;;;KACtC;IAEO,6CAAW,GAAnB,UACE,SAAiB,EACjB,QAAgB,EAChB,WAAmB;QAEnB,4BAA4B;QAC5B,IAAI,QAAQ,GAAG,CAAC,IAAI,QAAQ,IAAI,SAAA,CAAC,EAAI,EAAE,CAAA;YACrC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;QAC9C,IAAI,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,SAAS,IAAI,SAAA,CAAC,EAAI,GAAG,CAAA;YAChD,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAC/C,IAAI,WAAW,GAAG,CAAC,IAAI,WAAW,IAAI,SAAA,CAAC,EAAI,EAAE,CAAA;YAC3C,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;QAE/C,IAAM,WAAW,GACf,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;YACjC,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAEnB,OAAO,WAAW,CAAC;IACrB,CAAC;IAEa,oDAAkB,GAAhC,UACE,MAA8B,EAC9B,SAAiB,EACjB,QAAgB,EAChB,aAAqB,EACrB,UAAkB,EAClB,sBAAgC;;;;;4BASf,qBAAM,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAA;;wBAAtD,QAAQ,GAAG,SAA2C;wBACtD,YAAY,GAAG,QAAQ,CAAC,IAAI,CAAC;wBAEnC,IAAI,YAAY,KAAK,CAAC,EAAE,CAAC;4BACvB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;wBAC/C,CAAC;wBAEK,eAAe,GAAG,MAAM,CAAC,IAAA,+BAAsB,EAAC,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC;wBAEnE,MAAM,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAC9C,CAAC,SAAS,EAAE,SAAS,CAAC,EACtB,CAAC,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,aAAa,CAAC,EAAE,eAAe,CAAC,CAC5C,CAAC;wBACI,mBAAmB,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;wBACjC,KAAK,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAC;wBACnE,QAAQ,GAAG,SAAA,EAAE,EAAI,EAAE,CAAA,CAAC;wBAER,qBAAM,IAAA,6BAAoB,EAC1C,MAAM,EACN,IAAI,CAAC,WAAW,EAChB,SAAS,EACT,QAAQ,EACR,UAAU,EACV,sBAAsB,EACtB,4BAAoB,CAAC,QAAQ,EAC7B,MAAM,EACN,KAAK,EACL,QAAQ,CACT,EAAA;;wBAXK,SAAS,GAAG,SAWjB;wBAED,sBAAO;gCACL,SAAS,WAAA;gCACT,YAAY,cAAA;gCACZ,eAAe,iBAAA;gCACf,KAAK,OAAA;gCACL,QAAQ,UAAA;gCACR,mBAAmB,qBAAA;6BACpB,EAAC;;;;KACH;IACH,8BAAC;AAAD,CAAC,AA5MD,CAAqD,mBAAU,GA4M9D","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 { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  AlreadyGaveTradePermissionParams,\n  AlreadyGaveTradePermissionResult,\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 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 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 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,\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\n      },\n    );\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,\n        exchangeId: params.supportingParams.exchangeId,\n        poolId: params.supportingParams.counterpartyAccountIds[0],\n        timestampMs: inputs.creationTimestampMs,\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  private createNonce(\n    accountId: number,\n    marketId: number,\n    timestampMs: number,\n  ): bigint {\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;\n  }\n\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: number;\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 orderPriceLimit = Number(calculateMaxPriceLimit(positionBase < 0));\n\n    const inputs = AbiCoder.defaultAbiCoder().encode(\n      ['uint256', 'uint256'],\n      [scale(18)(stopLossPrice), orderPriceLimit],\n    );\n    const creationTimestampMs = Date.now();\n    const nonce = this.createNonce(accountId, marketId, creationTimestampMs);\n    const deadline = 10 ** 18; // very big number for timestamp in seconds - infinite deadline\n\n    const signature = await signConditionalOrder(\n      signer,\n      this.reyaChainId,\n      accountId,\n      marketId,\n      exchangeId,\n      counterpartyAccountIds,\n      ConditionalOrderType.StopLoss,\n      inputs,\n      nonce,\n      deadline,\n    );\n\n    return {\n      signature,\n      positionBase,\n      orderPriceLimit,\n      nonce,\n      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":";;;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"]}
+{"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: string;\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: bigint;\n};\n\nexport type OrderSupportingParams = {\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  marketId: number;\n  supportingParams: OrderSupportingParams;\n};\n\nexport type UpdateSLOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  stopLossPrice: number;\n  marketId: number;\n  supportingParams: OrderSupportingParams;\n};\n\nexport type RegisterSLOrderResult = StopLossOrder;\nexport type UpdateSLOrderResult = StopLossOrder;\n\nexport type AlreadyGaveTradePermissionParams = {\n  accountId: number;\n};\n\nexport type AlreadyGaveTradePermissionResult = {\n  permissionGiven: boolean;\n};\n"]}

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

@@ -1,13 +1,15 @@
 import { RestClient, ReyaChainId } from '@reyaxyz/common';
-import { CancelSLOrderParams, CancelSLOrderResult, GetPendingSLOrderParams, GetPendingSLOrderResult, RegisterSLOrderParams, RegisterSLOrderResult, UpdateSLOrderParams, UpdateSLOrderResult } from './types';
+import { AlreadyGaveTradePermissionParams, AlreadyGaveTradePermissionResult, CancelSLOrderParams, CancelSLOrderResult, GetPendingSLOrderParams, GetPendingSLOrderResult, RegisterSLOrderParams, RegisterSLOrderResult, UpdateSLOrderParams, UpdateSLOrderResult } from './types';
 export default class ConditionalOrdersClient extends RestClient {
     private reyaChainId;
     constructor(reyaChainId: ReyaChainId, host: string);
+    alreadyGaveTradePermissions(params: AlreadyGaveTradePermissionParams): Promise<AlreadyGaveTradePermissionResult>;
     getPendingSLOrder(params: GetPendingSLOrderParams): Promise<GetPendingSLOrderResult>;
     cancelSLOrder(params: CancelSLOrderParams): Promise<CancelSLOrderResult>;
     registerSLOrder(params: RegisterSLOrderParams): Promise<RegisterSLOrderResult>;
     updateSLOrder(params: UpdateSLOrderParams): Promise<UpdateSLOrderResult>;
     private getPosition;
     private createNonce;
+    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,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"}
+{"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;AAGzB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,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,2BAA2B,CAC/B,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC;IAStC,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;IAgC3B,aAAa,CACjB,MAAM,EAAE,mBAAmB,GAC1B,OAAO,CAAC,mBAAmB,CAAC;YAgCjB,WAAW;IAQzB,OAAO,CAAC,WAAW;YAqBL,kBAAkB;CAsDjC"}

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

@@ -3,7 +3,7 @@ import { Signer, JsonRpcSigner } from 'ethers';
 import { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';
 export type CancelSLOrderParams = {
     signer: Signer | JsonRpcSigner;
-    orderId: number;
+    orderId: string;
 };
 export type CancelSLOrderResult = StopLossOrder;
 export type GetPendingSLOrderParams = {
@@ -22,10 +22,9 @@ export type ConditionalOrderDetails = {
     orderType: number;
     inputs: string;
     signer: string;
-    nonce: string;
+    nonce: bigint;
 };
-export type MarketParams = {
-    id: MarketEntity['id'];
+export type OrderSupportingParams = {
     exchangeId: MarketEntity['orderInfo']['exchangeId'];
     counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
     currentPrice: number;
@@ -34,15 +33,22 @@ export type RegisterSLOrderParams = {
     signer: Signer | JsonRpcSigner;
     marginAccountId: MarginAccountEntity['id'];
     stopLossPrice: number;
-    market: MarketParams;
+    marketId: number;
+    supportingParams: OrderSupportingParams;
 };
 export type UpdateSLOrderParams = {
     signer: Signer | JsonRpcSigner;
-    orderId: number;
     marginAccountId: MarginAccountEntity['id'];
     stopLossPrice: number;
-    market: MarketParams;
+    marketId: number;
+    supportingParams: OrderSupportingParams;
 };
 export type RegisterSLOrderResult = StopLossOrder;
 export type UpdateSLOrderResult = StopLossOrder;
+export type AlreadyGaveTradePermissionParams = {
+    accountId: number;
+};
+export type AlreadyGaveTradePermissionResult = {
+    permissionGiven: boolean;
+};
 //# 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,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"}
+{"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,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,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,qBAAqB,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,qBAAqB,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,aAAa,CAAC;AAClD,MAAM,MAAM,mBAAmB,GAAG,aAAa,CAAC;AAEhD,MAAM,MAAM,gCAAgC,GAAG;IAC7C,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG;IAC7C,eAAe,EAAE,OAAO,CAAC;CAC1B,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/api-sdk",
-  "version": "0.104.0",
+  "version": "0.104.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.155.3",
+    "@reyaxyz/common": "0.155.4",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0",
     "isomorphic-ws": "^5.0.0",
     "ws": "^8.16.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "a976b14d07232c97e81e2eee793f171ea4c92773",
+  "gitHead": "4e75716af3de0ca01c4619535861e7353e783a73",
   "devDependencies": {
     "@types/ws": "8.5.10"
   }

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

@@ -10,7 +10,10 @@ import {
   scale,
 } from '@reyaxyz/common';
 import { AbiCoder } from 'ethers';
+import { Signer, JsonRpcSigner } from 'ethers';
 import {
+  AlreadyGaveTradePermissionParams,
+  AlreadyGaveTradePermissionResult,
   CancelSLOrderParams,
   CancelSLOrderResult,
   ConditionalOrderType,
@@ -30,6 +33,17 @@ export default class ConditionalOrdersClient extends RestClient {
     this.reyaChainId = reyaChainId;
   }
 
+  async alreadyGaveTradePermissions(
+    params: AlreadyGaveTradePermissionParams,
+  ): Promise<AlreadyGaveTradePermissionResult> {
+    const uri = `/api/conditional-orders/gave-trade-permission/${params.accountId}`;
+    const response = await this.get<boolean>(uri);
+
+    return {
+      permissionGiven: response,
+    };
+  }
+
   async getPendingSLOrder(
     params: GetPendingSLOrderParams,
   ): Promise<GetPendingSLOrderResult> {
@@ -67,41 +81,13 @@ export default class ConditionalOrdersClient extends RestClient {
   async registerSLOrder(
     params: RegisterSLOrderParams,
   ): Promise<RegisterSLOrderResult> {
-    const position = await this.getPosition(
-      params.marginAccountId,
-      params.market.id,
-    );
-    const positionBase = position.base;
-
-    if (positionBase === 0) {
-      throw new Error('Position with no exposure');
-    }
-
-    const orderPriceLimit = Number(calculateMaxPriceLimit(positionBase < 0));
-
-    const inputs = AbiCoder.defaultAbiCoder().encode(
-      ['uint256', 'uint256'],
-      [scale(18)(params.stopLossPrice), orderPriceLimit],
-    );
-    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(
+    const inputs = await this.parseSlOrderInputs(
       params.signer,
-      this.reyaChainId,
       params.marginAccountId,
-      params.market.id,
-      params.market.exchangeId,
-      params.market.counterpartyAccountIds,
-      ConditionalOrderType.StopLoss,
-      inputs,
-      nonce,
-      deadline,
+      params.marketId,
+      params.stopLossPrice,
+      params.supportingParams.exchangeId,
+      params.supportingParams.counterpartyAccountIds,
     );
 
     // create new entry
@@ -111,17 +97,17 @@ export default class ConditionalOrdersClient extends RestClient {
       {},
       {
         accountId: params.marginAccountId,
-        marketId: params.market.id,
-        isLong: positionBase > 0,
+        marketId: params.marketId,
+        isLong: inputs.positionBase > 0,
         stopPrice: params.stopLossPrice,
         signerWallet: await params.signer.getAddress(),
-        nonce: nonce,
-        signature: signature,
-        deadline: deadline,
-        orderPriceLimit: orderPriceLimit,
-        exchangeId: params.market.exchangeId,
-        poolId: params.market.counterpartyAccountIds[0],
-        timestampMs: creationTimestampMs,
+        nonce: inputs.nonce.toString(),
+        signature: inputs.signature,
+        deadline: inputs.deadline,
+        orderPriceLimit: inputs.orderPriceLimit,
+        exchangeId: params.supportingParams.exchangeId,
+        poolId: params.supportingParams.counterpartyAccountIds[0],
+        timestampMs: inputs.creationTimestampMs,
       },
     );
   }
@@ -129,7 +115,35 @@ export default class ConditionalOrdersClient extends RestClient {
   async updateSLOrder(
     params: UpdateSLOrderParams,
   ): Promise<UpdateSLOrderResult> {
-    return await this.registerSLOrder(params as RegisterSLOrderParams);
+    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,
+        exchangeId: params.supportingParams.exchangeId,
+        poolId: params.supportingParams.counterpartyAccountIds[0],
+        timestampMs: inputs.creationTimestampMs,
+      },
+    );
   }
 
   private async getPosition(
@@ -144,7 +158,7 @@ export default class ConditionalOrdersClient extends RestClient {
     accountId: number,
     marketId: number,
     timestampMs: number,
-  ): string {
+  ): bigint {
     // Validate the input ranges
     if (marketId < 0 || marketId >= 2 ** 32)
       throw new Error('marketId is out of range');
@@ -158,6 +172,61 @@ export default class ConditionalOrdersClient extends RestClient {
       (BigInt(timestampMs) << BigInt(32)) |
       BigInt(marketId);
 
-    return hashUint256.toString();
+    return hashUint256;
+  }
+
+  private async parseSlOrderInputs(
+    signer: Signer | JsonRpcSigner,
+    accountId: number,
+    marketId: number,
+    stopLossPrice: number,
+    exchangeId: number,
+    counterpartyAccountIds: number[],
+  ): Promise<{
+    signature: string;
+    positionBase: number;
+    orderPriceLimit: number;
+    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 orderPriceLimit = Number(calculateMaxPriceLimit(positionBase < 0));
+
+    const inputs = AbiCoder.defaultAbiCoder().encode(
+      ['uint256', 'uint256'],
+      [scale(18)(stopLossPrice), orderPriceLimit],
+    );
+    const creationTimestampMs = Date.now();
+    const nonce = this.createNonce(accountId, marketId, creationTimestampMs);
+    const deadline = 10 ** 18; // very big number for timestamp in seconds - infinite deadline
+
+    const signature = await signConditionalOrder(
+      signer,
+      this.reyaChainId,
+      accountId,
+      marketId,
+      exchangeId,
+      counterpartyAccountIds,
+      ConditionalOrderType.StopLoss,
+      inputs,
+      nonce,
+      deadline,
+    );
+
+    return {
+      signature,
+      positionBase,
+      orderPriceLimit,
+      nonce,
+      deadline,
+      creationTimestampMs,
+    };
   }
 }

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

@@ -4,7 +4,7 @@ import { MarginAccountEntity, MarketEntity } from '@reyaxyz/common';
 
 export type CancelSLOrderParams = {
   signer: Signer | JsonRpcSigner;
-  orderId: number;
+  orderId: string;
 };
 
 export type CancelSLOrderResult = StopLossOrder;
@@ -28,11 +28,10 @@ export type ConditionalOrderDetails = {
   orderType: number;
   inputs: string;
   signer: string;
-  nonce: string;
+  nonce: bigint;
 };
 
-export type MarketParams = {
-  id: MarketEntity['id'];
+export type OrderSupportingParams = {
   exchangeId: MarketEntity['orderInfo']['exchangeId'];
   counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
   currentPrice: number;
@@ -42,16 +41,25 @@ export type RegisterSLOrderParams = {
   signer: Signer | JsonRpcSigner;
   marginAccountId: MarginAccountEntity['id'];
   stopLossPrice: number;
-  market: MarketParams;
+  marketId: number;
+  supportingParams: OrderSupportingParams;
 };
 
 export type UpdateSLOrderParams = {
   signer: Signer | JsonRpcSigner;
-  orderId: number;
   marginAccountId: MarginAccountEntity['id'];
   stopLossPrice: number;
-  market: MarketParams;
+  marketId: number;
+  supportingParams: OrderSupportingParams;
 };
 
 export type RegisterSLOrderResult = StopLossOrder;
 export type UpdateSLOrderResult = StopLossOrder;
+
+export type AlreadyGaveTradePermissionParams = {
+  accountId: number;
+};
+
+export type AlreadyGaveTradePermissionResult = {
+  permissionGiven: boolean;
+};