@reyaxyz/api-sdk 0.112.1 → 0.114.0

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

@@ -116,7 +116,7 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds, params.orderSize)];
+                    case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds, params.amountInBase)];
                     case 1:
                         inputs = _d.sent();
                         uri = "/api/conditional-orders/create-or-update-order";
@@ -125,20 +125,21 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                             {}];
                         _c = {
                             accountId: params.marginAccountId,
+                            poolId: params.supportingParams.counterpartyAccountIds[0],
+                            deadline: inputs.deadline,
+                            exchangeId: params.supportingParams.exchangeId,
+                            isLong: inputs.actualAmountInBase > 0,
                             marketId: params.marketId,
-                            isLong: inputs.actualOrderSize > 0,
+                            nonce: inputs.nonce.toString(),
+                            orderPriceLimit: inputs.orderPriceLimit.toString(),
                             orderType: params.orderType,
-                            triggerPrice: params.triggerPrice
+                            signature: inputs.signature
                         };
                         return [4 /*yield*/, params.signer.getAddress()];
                     case 2: return [4 /*yield*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
-                                _c.nonce = inputs.nonce.toString(),
-                                _c.signature = inputs.signature,
-                                _c.deadline = inputs.deadline,
-                                _c.orderPriceLimit = inputs.orderPriceLimit.toString(),
-                                _c.exchangeId = params.supportingParams.exchangeId,
-                                _c.poolId = params.supportingParams.counterpartyAccountIds[0],
                                 _c.timestampMs = inputs.creationTimestampMs,
+                                _c.triggerPrice = params.triggerPrice,
+                                _c.orderBase = params.amountInBase,
                                 _c)]))];
                     case 3:
                         result = _d.sent();
@@ -153,7 +154,7 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             var _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
-                    case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds)];
+                    case 0: return [4 /*yield*/, this.parseConditionalOrderInputs(params.signer, params.marginAccountId, params.marketId, params.orderType, params.triggerPrice, params.supportingParams.exchangeId, params.supportingParams.counterpartyAccountIds, params.amountInBase)];
                     case 1:
                         inputs = _d.sent();
                         uri = "/api/conditional-orders/create-or-update-order";
@@ -162,21 +163,22 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                             {}];
                         _c = {
                             accountId: params.marginAccountId,
+                            poolId: params.supportingParams.counterpartyAccountIds[0],
+                            deadline: inputs.deadline,
+                            exchangeId: params.supportingParams.exchangeId,
+                            isLong: inputs.actualAmountInBase > 0,
                             marketId: params.marketId,
-                            isLong: inputs.actualOrderSize > 0,
+                            nonce: inputs.nonce.toString(),
+                            orderPriceLimit: inputs.orderPriceLimit.toString(),
                             orderType: params.orderType,
-                            triggerPrice: params.triggerPrice
+                            signature: inputs.signature
                         };
                         return [4 /*yield*/, params.signer.getAddress()];
                     case 2: return [4 /*yield*/, _a.apply(this, _b.concat([(_c.signerWallet = _d.sent(),
-                                _c.nonce = inputs.nonce.toString(),
-                                _c.signature = inputs.signature,
-                                _c.deadline = inputs.deadline,
-                                _c.orderPriceLimit = inputs.orderPriceLimit.toString(),
-                                _c.exchangeId = params.supportingParams.exchangeId,
-                                _c.poolId = params.supportingParams.counterpartyAccountIds[0],
                                 _c.timestampMs = inputs.creationTimestampMs,
+                                _c.triggerPrice = params.triggerPrice,
                                 _c.cancelOrderId = params.cancelOrderId,
+                                _c.orderBase = params.amountInBase,
                                 _c)]))];
                     case 3:
                         result = _d.sent();
@@ -194,23 +196,23 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
             });
         });
     };
-    ConditionalOrdersClient.prototype.parseConditionalOrderInputs = function (signer, accountId, marketId, orderType, triggerPrice, exchangeId, counterpartyAccountIds, orderSize) {
+    ConditionalOrdersClient.prototype.parseConditionalOrderInputs = function (signer, accountId, marketId, orderType, triggerPrice, exchangeId, counterpartyAccountIds, amountInBase) {
         return __awaiter(this, void 0, void 0, function () {
-            var inputs, actualOrderSize, isLongOrder, orderPriceLimit, position, positionBase, creationTimestampMs, nonce, signature;
+            var inputs, actualAmountInBase, isLongOrder, orderPriceLimit, position, positionBase, creationTimestampMs, nonce, signature;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         if (!(orderType === common_1.ConditionalOrderType.LIMIT_ORDER)) return [3 /*break*/, 1];
-                        if (orderSize === undefined) {
+                        if (amountInBase === undefined) {
                             throw new Error('Order base is required for limit orders');
                         }
-                        if (orderSize === 0) {
+                        if (amountInBase === 0) {
                             throw new Error('Cannot create an empty limit order');
                         }
-                        actualOrderSize = orderSize;
-                        isLongOrder = actualOrderSize > 0;
+                        actualAmountInBase = amountInBase;
+                        isLongOrder = actualAmountInBase > 0;
                         orderPriceLimit = (0, common_1.calculateMaxPriceLimit)(isLongOrder);
-                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [(0, common_1.scale)(18)(orderSize), (0, common_1.scale)(18)(triggerPrice)]);
+                        inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [(0, common_1.scale)(18)(amountInBase), (0, common_1.scale)(18)(triggerPrice)]);
                         return [3 /*break*/, 3];
                     case 1: return [4 /*yield*/, this.getPosition(accountId, marketId)];
                     case 2:
@@ -219,8 +221,8 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                         if (positionBase === 0) {
                             throw new Error('Cannot create SL or TP order for closed positions');
                         }
-                        actualOrderSize = -positionBase;
-                        isLongOrder = actualOrderSize > 0;
+                        actualAmountInBase = -positionBase;
+                        isLongOrder = actualAmountInBase > 0;
                         orderPriceLimit = (0, common_1.calculateMaxPriceLimit)(isLongOrder);
                         inputs = ethers_1.AbiCoder.defaultAbiCoder().encode(['bool', 'uint256', 'uint256'], [isLongOrder, (0, common_1.scale)(18)(triggerPrice), orderPriceLimit]);
                         _a.label = 3;
@@ -232,7 +234,7 @@ var ConditionalOrdersClient = /** @class */ (function (_super) {
                         signature = _a.sent();
                         return [2 /*return*/, {
                                 signature: signature,
-                                actualOrderSize: actualOrderSize,
+                                actualAmountInBase: actualAmountInBase,
                                 orderPriceLimit: orderPriceLimit,
                                 nonce: nonce,
                                 deadline: common_1.CONDITIONAL_ORDER_SIG_DEADLINE,

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

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

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

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

package/dist/types/clients/modules/conditional-orders/index.d.ts.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,EAOZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,4BAA4B,EAC5B,4BAA4B,EAC5B,iDAAiD,EACjD,iDAAiD,EACjD,8BAA8B,EAC9B,8BAA8B,EAC9B,4BAA4B,EAC5B,4BAA4B,EAC7B,MAAM,SAAS,CAAC;AAGjB,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;IAM5C,2CAA2C,CAC/C,MAAM,EAAE,iDAAiD,GACxD,OAAO,CAAC,iDAAiD,CAAC;IAOvD,2BAA2B,CAC/B,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC;IAStC,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;IAkBlC,wBAAwB,CAC5B,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC;IAoCpC,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;YAoC1B,WAAW;YAQX,2BAA2B;CAkF1C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["clients/modules/conditional-orders/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,UAAU,EACV,WAAW,EAOZ,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EACL,gCAAgC,EAChC,gCAAgC,EAChC,4BAA4B,EAC5B,4BAA4B,EAC5B,iDAAiD,EACjD,iDAAiD,EACjD,8BAA8B,EAC9B,8BAA8B,EAC9B,4BAA4B,EAC5B,4BAA4B,EAC7B,MAAM,SAAS,CAAC;AAGjB,MAAM,CAAC,OAAO,OAAO,uBAAwB,SAAQ,UAAU;IAC7D,OAAO,CAAC,WAAW,CAAc;gBAErB,WAAW,EAAE,WAAW,EAAE,IAAI,EAAE,MAAM;IAM5C,2CAA2C,CAC/C,MAAM,EAAE,iDAAiD,GACxD,OAAO,CAAC,iDAAiD,CAAC;IAOvD,2BAA2B,CAC/B,MAAM,EAAE,gCAAgC,GACvC,OAAO,CAAC,gCAAgC,CAAC;IAStC,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;IAkBlC,wBAAwB,CAC5B,MAAM,EAAE,8BAA8B,GACrC,OAAO,CAAC,8BAA8B,CAAC;IAqCpC,sBAAsB,CAC1B,MAAM,EAAE,4BAA4B,GACnC,OAAO,CAAC,4BAA4B,CAAC;YAsC1B,WAAW;YAQX,2BAA2B;CAkF1C"}

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

@@ -28,7 +28,7 @@ export type RegisterConditionalOrderParams = {
     orderType: ConditionalOrderType;
     marketId: number;
     supportingParams: OrderSupportingParams;
-    orderSize?: number;
+    amountInBase?: number;
 };
 export type UpdateConditionalOrderParams = {
     cancelOrderId: string;

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

package/package.json

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

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

@@ -86,7 +86,7 @@ export default class ConditionalOrdersClient extends RestClient {
       params.triggerPrice,
       params.supportingParams.exchangeId,
       params.supportingParams.counterpartyAccountIds,
-      params.orderSize,
+      params.amountInBase,
     );
 
     // create new entry
@@ -96,18 +96,19 @@ export default class ConditionalOrdersClient extends RestClient {
       {},
       {
         accountId: params.marginAccountId,
+        poolId: params.supportingParams.counterpartyAccountIds[0],
+        deadline: inputs.deadline,
+        exchangeId: params.supportingParams.exchangeId,
+        isLong: inputs.actualAmountInBase > 0,
         marketId: params.marketId,
-        isLong: inputs.actualOrderSize > 0,
-        orderType: params.orderType,
-        triggerPrice: params.triggerPrice,
-        signerWallet: await params.signer.getAddress(),
         nonce: inputs.nonce.toString(),
-        signature: inputs.signature,
-        deadline: inputs.deadline,
         orderPriceLimit: inputs.orderPriceLimit.toString(),
-        exchangeId: params.supportingParams.exchangeId,
-        poolId: params.supportingParams.counterpartyAccountIds[0],
+        orderType: params.orderType,
+        signature: inputs.signature,
+        signerWallet: await params.signer.getAddress(),
         timestampMs: inputs.creationTimestampMs,
+        triggerPrice: params.triggerPrice,
+        orderBase: params.amountInBase,
       },
     );
     return result;
@@ -124,6 +125,7 @@ export default class ConditionalOrdersClient extends RestClient {
       params.triggerPrice,
       params.supportingParams.exchangeId,
       params.supportingParams.counterpartyAccountIds,
+      params.amountInBase,
     );
 
     // create new entry
@@ -133,19 +135,20 @@ export default class ConditionalOrdersClient extends RestClient {
       {},
       {
         accountId: params.marginAccountId,
+        poolId: params.supportingParams.counterpartyAccountIds[0],
+        deadline: inputs.deadline,
+        exchangeId: params.supportingParams.exchangeId,
+        isLong: inputs.actualAmountInBase > 0,
         marketId: params.marketId,
-        isLong: inputs.actualOrderSize > 0,
-        orderType: params.orderType,
-        triggerPrice: params.triggerPrice,
-        signerWallet: await params.signer.getAddress(),
         nonce: inputs.nonce.toString(),
-        signature: inputs.signature,
-        deadline: inputs.deadline,
         orderPriceLimit: inputs.orderPriceLimit.toString(),
-        exchangeId: params.supportingParams.exchangeId,
-        poolId: params.supportingParams.counterpartyAccountIds[0],
+        orderType: params.orderType,
+        signature: inputs.signature,
+        signerWallet: await params.signer.getAddress(),
         timestampMs: inputs.creationTimestampMs,
+        triggerPrice: params.triggerPrice,
         cancelOrderId: params.cancelOrderId,
+        orderBase: params.amountInBase,
       },
     );
     return result;
@@ -167,36 +170,36 @@ export default class ConditionalOrdersClient extends RestClient {
     triggerPrice: number,
     exchangeId: number,
     counterpartyAccountIds: number[],
-    orderSize?: number,
+    amountInBase?: number,
   ): Promise<{
     signature: string;
-    actualOrderSize: number;
+    actualAmountInBase: number;
     orderPriceLimit: bigint;
     nonce: bigint;
     deadline: number;
     creationTimestampMs: number;
   }> {
     let inputs: string;
-    let actualOrderSize: number;
+    let actualAmountInBase: number;
     let isLongOrder: boolean;
     let orderPriceLimit: bigint;
 
     if (orderType === ConditionalOrderType.LIMIT_ORDER) {
-      if (orderSize === undefined) {
+      if (amountInBase === undefined) {
         throw new Error('Order base is required for limit orders');
       }
 
-      if (orderSize === 0) {
+      if (amountInBase === 0) {
         throw new Error('Cannot create an empty limit order');
       }
 
-      actualOrderSize = orderSize;
-      isLongOrder = actualOrderSize > 0;
+      actualAmountInBase = amountInBase;
+      isLongOrder = actualAmountInBase > 0;
       orderPriceLimit = calculateMaxPriceLimit(isLongOrder);
 
       inputs = AbiCoder.defaultAbiCoder().encode(
         ['int256', 'uint256'],
-        [scale(18)(orderSize), scale(18)(triggerPrice)],
+        [scale(18)(amountInBase), scale(18)(triggerPrice)],
       );
     } else {
       const position = await this.getPosition(accountId, marketId);
@@ -206,8 +209,8 @@ export default class ConditionalOrdersClient extends RestClient {
         throw new Error('Cannot create SL or TP order for closed positions');
       }
 
-      actualOrderSize = -positionBase;
-      isLongOrder = actualOrderSize > 0;
+      actualAmountInBase = -positionBase;
+      isLongOrder = actualAmountInBase > 0;
       orderPriceLimit = calculateMaxPriceLimit(isLongOrder);
 
       inputs = AbiCoder.defaultAbiCoder().encode(
@@ -234,7 +237,7 @@ export default class ConditionalOrdersClient extends RestClient {
 
     return {
       signature,
-      actualOrderSize,
+      actualAmountInBase,
       orderPriceLimit,
       nonce,
       deadline: CONDITIONAL_ORDER_SIG_DEADLINE,

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

@@ -37,7 +37,7 @@ export type RegisterConditionalOrderParams = {
   orderType: ConditionalOrderType;
   marketId: number;
   supportingParams: OrderSupportingParams;
-  orderSize?: number;
+  amountInBase?: number;
 };
 
 export type UpdateConditionalOrderParams = {