@reyaxyz/sdk 0.129.5 → 0.130.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-7.91%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-3.7%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-3.37%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-7.61%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-8.79%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-4.08%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-3.89%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.45%25-red.svg?style=flat) |
 

package/dist/config/index.js

@@ -116,13 +116,6 @@ var GeneralRestModule = /** @class */ (function (_super) {
     function GeneralRestModule() {
         return _super !== null && _super.apply(this, arguments) || this;
     }
-    GeneralRestModule.prototype.getSpotMarkets = function () {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.get('/api/spot-markets')];
-            });
-        });
-    };
     GeneralRestModule.prototype.getCollateralInfo = function () {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {

package/dist/config/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  RestClient,\n  ServiceConfig,\n  TransactionExecutionMetadata,\n  TransactionExecutionOutput,\n  SpotMarketEntity,\n  CollateralWithHaircut,\n  getApiClientConfig,\n} from '@reyaxyz/common';\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\n\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractAddress: string,\n    metadata: TransactionExecutionMetadata,\n  ): Promise<TransactionExecutionOutput> {\n    const isReyaExecutorEnabled =\n      process.env.IS_REYA_EXECUTOR_ENABLED === 'true' || false;\n\n    if (isReyaExecutorEnabled) {\n      try {\n        const result = await this.post<TransactionExecutionOutput>(\n          '/api/transaction-gelato/executeReya',\n          {},\n          {\n            txData: txData,\n            contractAddress,\n            metadata,\n          },\n        );\n\n        if (result.txHash) {\n          return result;\n        }\n      } catch (error) {\n        console.warn('Reya executor failed', error);\n      }\n    }\n\n    return this.post<TransactionExecutionOutput>(\n      '/api/transaction-gelato/executeGelato',\n      {},\n      {\n        txData: txData,\n        contractAddress,\n        metadata,\n      },\n    );\n  }\n\n  async pushPendingTransaction(\n    marginAccountId: number,\n    transactionHash: string,\n    sourceChainId: number,\n    amount: number,\n    assetId: string,\n    type: string,\n  ) {\n    const uri = `/api/accounts/${marginAccountId}/push-pending-transaction`;\n    return this.post<{ successful: boolean }>(\n      uri,\n      {},\n      {\n        tx_hash: transactionHash,\n        source_chain_id: sourceChainId,\n        amount,\n        asset_id: assetId,\n        type: type,\n      },\n    );\n  }\n}\n\nexport class GeneralRestModule extends RestClient {\n  async getSpotMarkets(): Promise<SpotMarketEntity[]> {\n    return this.get<SpotMarketEntity[]>('/api/spot-markets');\n  }\n\n  async getCollateralInfo(): Promise<CollateralWithHaircut[]> {\n    return this.get<CollateralWithHaircut[]>(\n      `/api/tokens/available-collaterals/excluding-rusd/${false}`,\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet generalRestModule: GeneralRestModule = new GeneralRestModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet config: ServiceConfig;\n\nexport const getSdkConfig = (): ServiceConfig => {\n  return config;\n};\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  config = getApiClientConfig(environment);\n  transactionModule = new TransactionModule(config.apiEndpoint);\n  generalRestModule = new GeneralRestModule(config.apiEndpoint);\n};\n\nexport const getTransactionModuleClient = (): TransactionModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return transactionModule;\n};\n\nexport const getGeneralRestModuleClient = (): GeneralRestModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return generalRestModule;\n};\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  RestClient,\n  ServiceConfig,\n  TransactionExecutionMetadata,\n  TransactionExecutionOutput,\n  CollateralWithHaircut,\n  getApiClientConfig,\n} from '@reyaxyz/common';\n\nexport type TxData = {\n  to: string;\n  data: string;\n};\n\nexport class TransactionModule extends RestClient {\n  async executeTransaction(\n    txData: TxData,\n    contractAddress: string,\n    metadata: TransactionExecutionMetadata,\n  ): Promise<TransactionExecutionOutput> {\n    const isReyaExecutorEnabled =\n      process.env.IS_REYA_EXECUTOR_ENABLED === 'true' || false;\n\n    if (isReyaExecutorEnabled) {\n      try {\n        const result = await this.post<TransactionExecutionOutput>(\n          '/api/transaction-gelato/executeReya',\n          {},\n          {\n            txData: txData,\n            contractAddress,\n            metadata,\n          },\n        );\n\n        if (result.txHash) {\n          return result;\n        }\n      } catch (error) {\n        console.warn('Reya executor failed', error);\n      }\n    }\n\n    return this.post<TransactionExecutionOutput>(\n      '/api/transaction-gelato/executeGelato',\n      {},\n      {\n        txData: txData,\n        contractAddress,\n        metadata,\n      },\n    );\n  }\n\n  async pushPendingTransaction(\n    marginAccountId: number,\n    transactionHash: string,\n    sourceChainId: number,\n    amount: number,\n    assetId: string,\n    type: string,\n  ) {\n    const uri = `/api/accounts/${marginAccountId}/push-pending-transaction`;\n    return this.post<{ successful: boolean }>(\n      uri,\n      {},\n      {\n        tx_hash: transactionHash,\n        source_chain_id: sourceChainId,\n        amount,\n        asset_id: assetId,\n        type: type,\n      },\n    );\n  }\n}\n\nexport class GeneralRestModule extends RestClient {\n  async getCollateralInfo(): Promise<CollateralWithHaircut[]> {\n    return this.get<CollateralWithHaircut[]>(\n      `/api/tokens/available-collaterals/excluding-rusd/${false}`,\n    );\n  }\n}\n\n// Internal state\nlet transactionModule: TransactionModule = new TransactionModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet generalRestModule: GeneralRestModule = new GeneralRestModule(\n  getApiClientConfig('test').apiEndpoint,\n);\n\nlet config: ServiceConfig;\n\nexport const getSdkConfig = (): ServiceConfig => {\n  return config;\n};\n\n// Function to configure the SDK\nexport const configureSDK = (\n  environment: ServiceConfig['environment'],\n): void => {\n  config = getApiClientConfig(environment);\n  transactionModule = new TransactionModule(config.apiEndpoint);\n  generalRestModule = new GeneralRestModule(config.apiEndpoint);\n};\n\nexport const getTransactionModuleClient = (): TransactionModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return transactionModule;\n};\n\nexport const getGeneralRestModuleClient = (): GeneralRestModule => {\n  if (!transactionModule)\n    throw new Error('SDK is not configured! Call configureSDK()');\n  return generalRestModule;\n};\n"]}

package/dist/index.js

@@ -22,7 +22,6 @@ __exportStar(require("./services/orders"), exports);
 __exportStar(require("./services/conditional-orders"), exports);
 __exportStar(require("./services/isolated-order"), exports);
 __exportStar(require("./services/token"), exports);
-__exportStar(require("./services/swaps"), exports);
 var config_1 = require("./config");
 Object.defineProperty(exports, "configureSDK", { enumerable: true, get: function () { return config_1.configureSDK; } });
 Object.defineProperty(exports, "getTransactionModuleClient", { enumerable: true, get: function () { return config_1.getTransactionModuleClient; } });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,gEAA8C;AAC9C,4DAA0C;AAC1C,mDAAiC;AACjC,mDAAiC;AACjC,mCAAoE;AAA3D,sGAAA,YAAY,OAAA;AAAE,oHAAA,0BAA0B,OAAA","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/conditional-orders';\nexport * from './services/isolated-order';\nexport * from './services/token';\nexport * from './services/swaps';\nexport { configureSDK, getTransactionModuleClient } from './config';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,gEAA8C;AAC9C,4DAA0C;AAC1C,mDAAiC;AACjC,mCAAoE;AAA3D,sGAAA,YAAY,OAAA;AAAE,oHAAA,0BAA0B,OAAA","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/conditional-orders';\nexport * from './services/isolated-order';\nexport * from './services/token';\nexport { configureSDK, getTransactionModuleClient } from './config';\n"]}

package/dist/services/encode.js

@@ -1,7 +1,7 @@
 "use strict";
 ////////////////////  ENCODE SINGLE  ////////////////////
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeRouterCall = exports.encodeSingleSwap = exports.encodeSingleTrade = exports.encodeSingleStakeFromMarginAccount = exports.encodeSingleUnstakeFromMarginAccount = exports.encodeSingleTransferMargin = exports.encodeSingleWithdraw = exports.encodeSingleDeposit = void 0;
+exports.encodeRouterCall = exports.encodeSingleTrade = exports.encodeSingleStakeFromMarginAccount = exports.encodeSingleUnstakeFromMarginAccount = exports.encodeSingleTransferMargin = exports.encodeSingleWithdraw = exports.encodeSingleDeposit = void 0;
 var common_1 = require("@reyaxyz/common");
 var common_2 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
@@ -36,11 +36,6 @@ var encodeSingleTrade = function (counterpartyAccountIds, orderBase, orderPriceL
     multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.MATCH_ORDER, [counterpartyAccountIds, encodedBasePrice], marketId, exchangeId));
 };
 exports.encodeSingleTrade = encodeSingleTrade;
-var encodeSingleSwap = function (amountIn, amountOut, path, adapters, recipients, marketId, exchangeId, multiAction) {
-    // Trade memory trade = abi.decode(command.inputs, (Trade));
-    multiAction.newAction((0, common_2.getCommand)(common_2.CommandType.CAMELOT_SWAP, [[amountIn, amountOut, path, adapters, recipients]], marketId, exchangeId));
-};
-exports.encodeSingleSwap = encodeSingleSwap;
 var encodeRouterCall = function (multiAction, accountId, nativeCurrencyValue) {
     var functionSignature = 'execute';
     var parameters = [accountId, multiAction.commands];

package/dist/services/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"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","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction, CoreAbi } from '@reyaxyz/common';\nimport { CommandType, getCommand } from '@reyaxyz/common';\nimport { AbiCoder, Interface } from 'ethers';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(getCommand(CommandType.DEPOSIT, [token, amount], 0, 0));\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], 0, 0),\n  );\n};\n\nexport const encodeSingleTransferMargin = (\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(\n      CommandType.TRANSFER_MARGIN_ACCOUNT,\n      [[toMarginAccountId, token, amount]],\n      0,\n      0,\n    ),\n  );\n};\n\nexport const encodeSingleUnstakeFromMarginAccount = (\n  poolId: number,\n  srusdAmount: bigint,\n  minOut: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedUnstakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, srusdAmount, minOut],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [1, encodedUnstakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleStakeFromMarginAccount = (\n  poolId: number,\n  amount: bigint,\n  minShares: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedStakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, amount, minShares],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [0, encodedStakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeSingleSwap = (\n  amountIn: string,\n  amountOut: string,\n  path: string[],\n  adapters: string[],\n  recipients: string[],\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // Trade memory trade = abi.decode(command.inputs, (Trade));\n  multiAction.newAction(\n    getCommand(\n      CommandType.CAMELOT_SWAP,\n      [[amountIn, amountOut, path, adapters, recipients]],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"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","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction, CoreAbi } from '@reyaxyz/common';\nimport { CommandType, getCommand } from '@reyaxyz/common';\nimport { AbiCoder, Interface } from 'ethers';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(getCommand(CommandType.DEPOSIT, [token, amount], 0, 0));\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], 0, 0),\n  );\n};\n\nexport const encodeSingleTransferMargin = (\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(\n      CommandType.TRANSFER_MARGIN_ACCOUNT,\n      [[toMarginAccountId, token, amount]],\n      0,\n      0,\n    ),\n  );\n};\n\nexport const encodeSingleUnstakeFromMarginAccount = (\n  poolId: number,\n  srusdAmount: bigint,\n  minOut: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedUnstakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, srusdAmount, minOut],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [1, encodedUnstakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleStakeFromMarginAccount = (\n  poolId: number,\n  amount: bigint,\n  minShares: bigint,\n  multiAction: MultiAction,\n): void => {\n  const encodedStakeInputs = AbiCoder.defaultAbiCoder().encode(\n    ['uint128', 'uint256', 'uint256'],\n    [poolId, amount, minShares],\n  );\n\n  multiAction.newAction(\n    getCommand(CommandType.MANAGE_POOL_STAKE, [0, encodedStakeInputs], 0, 0),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}

package/dist/services/orders/order.js

@@ -107,20 +107,34 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
 }); };
 exports.matchOrder = matchOrder;
 var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var base, slippageFactor, orderPriceLimit, chainId, _a, data, eip712Payload, eip712Signature, result;
+    var closingBase, slippageFactor, orderPriceLimit, chainId, _a, data, eip712Payload, eip712Signature, result;
     var _b, _c, _d, _e, _f, _g;
     return __generator(this, function (_h) {
         switch (_h.label) {
             case 0:
                 if (params.orderBase === 0) {
-                    throw new Error('Position base can not be 0');
+                    throw new Error('Position is already closed.');
+                }
+                closingBase = 0;
+                if (params.type === 'full') {
+                    closingBase = params.orderBase;
+                }
+                else {
+                    closingBase = params.closingOrderBase;
+                    if (closingBase === 0) {
+                        throw new Error('Specified base to close is zero.');
+                    }
+                    if (closingBase * params.orderBase < 0) {
+                        throw new Error('Specified base to close is in different direction that the actual order.');
+                    }
+                    if (Math.abs(closingBase) > params.orderBase) {
+                        throw new Error('Specified base to close is larger than the actual order.');
+                    }
                 }
-                base = (0, common_3.scale)(18)(params.orderBase);
                 slippageFactor = 40;
-                orderPriceLimit = (0, common_1.calculatePriceLimitForTrade)(params.market.currentPrice, (0, bignumber_js_1.default)(params.orderBase).negated().toNumber(), // used just because of sign
-                slippageFactor);
+                orderPriceLimit = (0, common_1.calculatePriceLimitForTrade)(params.market.currentPrice, -closingBase, slippageFactor);
                 chainId = (0, network_1.getReyaNetwork)();
-                return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, -base, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId)];
+                return [4 /*yield*/, (0, encode_1.encodeMatchOrder)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, -(0, common_3.scale)(18)(closingBase), orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId)];
             case 1:
                 _a = _h.sent(), data = _a.calldata, eip712Payload = _a.payload, eip712Signature = _a.signature;
                 return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, chainId, common_2.ContractType.PERIPHERY_PROXY, {

package/dist/services/orders/order.js.map

@@ -1 +1 @@
-{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { calculatePriceLimitForTrade } from '@reyaxyz/common';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '@reyaxyz/common';\nimport { scale } from '@reyaxyz/common';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.amountInBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  let snappedAmount = BigNumber(params.amountInBase)\n    .abs()\n    .dividedBy(params.market.baseSpacing)\n    .integerValue(BigNumber.ROUND_FLOOR)\n    .multipliedBy(params.market.baseSpacing)\n    .toNumber();\n\n  if (params.amountInBase < 0) {\n    snappedAmount = -snappedAmount;\n  }\n\n  if (Math.abs(snappedAmount) < params.market.minOrderSizeBase) {\n    console.error(\n      `Minimum trade amount ${params.market.minOrderSizeBase}. Entered amount ${snappedAmount}, ${params.amountInBase}`,\n    );\n    throw new Error(`Minimum trade amount ${params.market.minOrderSizeBase}`);\n  }\n\n  const slippageFactor = 40; // 2.5%\n\n  // add rounding here\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    snappedAmount,\n    slippageFactor,\n  );\n\n  const orderBase = scale(18)(snappedAmount);\n  const chainId = getReyaNetwork();\n\n  const {\n    calldata: data,\n    payload: eip712Payload,\n    signature: eip712Signature,\n  } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      action: 'matchOrder',\n      accountId: params.marginAccountId,\n      marketId: params.market.id,\n      tradeSource: params.tradeSource,\n      matchOrder: {\n        userEIP712Signature: eip712Signature,\n        eip712Payload,\n      },\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,\n    isNftWon: result.miscellaneous?.xpNftAwarded || false,\n    marginAccountId: params.marginAccountId,\n    xpEarned: result.miscellaneous?.xpEarned || 0,\n    executionPrice: result.tradeDetails?.executionPrice || 0,\n    base: result.tradeDetails?.base || 0,\n    positions: result.positions,\n    orders: result.orders,\n    accounts: result.accounts,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = scale(18)(params.orderBase);\n  const slippageFactor = 40; // 2.5%\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    BigNumber(params.orderBase).negated().toNumber(), // used just because of sign\n    slippageFactor,\n  );\n\n  const chainId = getReyaNetwork();\n  const {\n    calldata: data,\n    payload: eip712Payload,\n    signature: eip712Signature,\n  } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    -base,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      action: 'closeOrder',\n      accountId: params.marginAccountId,\n      marketId: params.market.id,\n      matchOrder: {\n        userEIP712Signature: eip712Signature,\n        eip712Payload,\n      },\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,\n    isNftWon: result.miscellaneous?.xpNftAwarded || false,\n    marginAccountId: params.marginAccountId,\n    xpEarned: result.miscellaneous?.xpEarned || 0,\n    executionPrice: result.tradeDetails?.executionPrice || 0,\n    base: result.tradeDetails?.base || 0,\n  };\n};\n"]}
+{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { calculatePriceLimitForTrade } from '@reyaxyz/common';\nimport BigNumber from 'bignumber.js';\nimport { ContractType } from '@reyaxyz/common';\nimport { scale } from '@reyaxyz/common';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.amountInBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  let snappedAmount = BigNumber(params.amountInBase)\n    .abs()\n    .dividedBy(params.market.baseSpacing)\n    .integerValue(BigNumber.ROUND_FLOOR)\n    .multipliedBy(params.market.baseSpacing)\n    .toNumber();\n\n  if (params.amountInBase < 0) {\n    snappedAmount = -snappedAmount;\n  }\n\n  if (Math.abs(snappedAmount) < params.market.minOrderSizeBase) {\n    console.error(\n      `Minimum trade amount ${params.market.minOrderSizeBase}. Entered amount ${snappedAmount}, ${params.amountInBase}`,\n    );\n    throw new Error(`Minimum trade amount ${params.market.minOrderSizeBase}`);\n  }\n\n  const slippageFactor = 40; // 2.5%\n\n  // add rounding here\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    snappedAmount,\n    slippageFactor,\n  );\n\n  const orderBase = scale(18)(snappedAmount);\n  const chainId = getReyaNetwork();\n\n  const {\n    calldata: data,\n    payload: eip712Payload,\n    signature: eip712Signature,\n  } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      action: 'matchOrder',\n      accountId: params.marginAccountId,\n      marketId: params.market.id,\n      tradeSource: params.tradeSource,\n      matchOrder: {\n        userEIP712Signature: eip712Signature,\n        eip712Payload,\n      },\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,\n    isNftWon: result.miscellaneous?.xpNftAwarded || false,\n    marginAccountId: params.marginAccountId,\n    xpEarned: result.miscellaneous?.xpEarned || 0,\n    executionPrice: result.tradeDetails?.executionPrice || 0,\n    base: result.tradeDetails?.base || 0,\n    positions: result.positions,\n    orders: result.orders,\n    accounts: result.accounts,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position is already closed.');\n  }\n\n  let closingBase: number = 0;\n  if (params.type === 'full') {\n    closingBase = params.orderBase;\n  } else {\n    closingBase = params.closingOrderBase;\n\n    if (closingBase === 0) {\n      throw new Error('Specified base to close is zero.');\n    }\n\n    if (closingBase * params.orderBase < 0) {\n      throw new Error(\n        'Specified base to close is in different direction that the actual order.',\n      );\n    }\n\n    if (Math.abs(closingBase) > params.orderBase) {\n      throw new Error(\n        'Specified base to close is larger than the actual order.',\n      );\n    }\n  }\n\n  const slippageFactor = 40; // 2.5%\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    -closingBase,\n    slippageFactor,\n  );\n\n  const chainId = getReyaNetwork();\n  const {\n    calldata: data,\n    payload: eip712Payload,\n    signature: eip712Signature,\n  } = await encodeMatchOrder(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    -scale(18)(closingBase),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      action: 'closeOrder',\n      accountId: params.marginAccountId,\n      marketId: params.market.id,\n      matchOrder: {\n        userEIP712Signature: eip712Signature,\n        eip712Payload,\n      },\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    coreSigNonce: Number(result?.coreSigNonce) || null,\n    xpBoost: result.miscellaneous?.tradeXpBoost || 0,\n    lotteryXpBoost: result.miscellaneous?.lotteryXpBoost || 0,\n    isNftWon: result.miscellaneous?.xpNftAwarded || false,\n    marginAccountId: params.marginAccountId,\n    xpEarned: result.miscellaneous?.xpEarned || 0,\n    executionPrice: result.tradeDetails?.executionPrice || 0,\n    base: result.tradeDetails?.base || 0,\n  };\n};\n"]}

package/dist/services/orders/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  CoreCommandsEIP712SignatureAndPayload,\n  MarginAccountEntity,\n  MarketEntity,\n  MethodParameters,\n  OwnerMetadataEntity,\n  PositionEntity,\n  TransactionExecutionOutput,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n  minOrderSizeBase: MarketEntity['minOrderSizeBase'];\n  baseSpacing: MarketEntity['baseSpacing'];\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountInBase: number; // amount in base\n  market: MarketParams;\n  tradeSource?: 'reya' | 'rage' | 'other';\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  orderBase: PositionEntity['base'];\n  market: MarketParams;\n};\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n  xpBoost: number;\n  lotteryXpBoost: number;\n  isNftWon: boolean;\n  marginAccountId: MarginAccountEntity['id'];\n  xpEarned: number;\n  executionPrice: number;\n  base: number;\n  positions?: TransactionExecutionOutput['positions'];\n  orders?: TransactionExecutionOutput['orders'];\n  accounts?: TransactionExecutionOutput['accounts'];\n};\n\nexport type CloseOrderResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n  xpBoost: number;\n  lotteryXpBoost: number;\n  isNftWon: boolean;\n  marginAccountId: MarginAccountEntity['id'];\n  xpEarned: number;\n  executionPrice: number;\n  base: number;\n};\n\nexport type MethodParametersAndEIP712Payload = MethodParameters &\n  CoreCommandsEIP712SignatureAndPayload;\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  CoreCommandsEIP712SignatureAndPayload,\n  MarginAccountEntity,\n  MarketEntity,\n  MethodParameters,\n  OwnerMetadataEntity,\n  PositionEntity,\n  TransactionExecutionOutput,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n  minOrderSizeBase: MarketEntity['minOrderSizeBase'];\n  baseSpacing: MarketEntity['baseSpacing'];\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountInBase: number; // amount in base\n  market: MarketParams;\n  tradeSource?: 'reya' | 'rage' | 'other';\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  orderBase: PositionEntity['base'];\n  market: MarketParams;\n} & (\n  | {\n      type: 'full';\n    }\n  | {\n      type: 'partial';\n      closingOrderBase: number;\n    }\n);\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n  xpBoost: number;\n  lotteryXpBoost: number;\n  isNftWon: boolean;\n  marginAccountId: MarginAccountEntity['id'];\n  xpEarned: number;\n  executionPrice: number;\n  base: number;\n  positions?: TransactionExecutionOutput['positions'];\n  orders?: TransactionExecutionOutput['orders'];\n  accounts?: TransactionExecutionOutput['accounts'];\n};\n\nexport type CloseOrderResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n  xpBoost: number;\n  lotteryXpBoost: number;\n  isNftWon: boolean;\n  marginAccountId: MarginAccountEntity['id'];\n  xpEarned: number;\n  executionPrice: number;\n  base: number;\n};\n\nexport type MethodParametersAndEIP712Payload = MethodParameters &\n  CoreCommandsEIP712SignatureAndPayload;\n"]}

package/dist/types/config/index.d.ts

@@ -1,4 +1,4 @@
-import { RestClient, ServiceConfig, TransactionExecutionMetadata, TransactionExecutionOutput, SpotMarketEntity, CollateralWithHaircut } from '@reyaxyz/common';
+import { RestClient, ServiceConfig, TransactionExecutionMetadata, TransactionExecutionOutput, CollateralWithHaircut } from '@reyaxyz/common';
 export type TxData = {
     to: string;
     data: string;
@@ -10,7 +10,6 @@ export declare class TransactionModule extends RestClient {
     }>;
 }
 export declare class GeneralRestModule extends RestClient {
-    getSpotMarkets(): Promise<SpotMarketEntity[]>;
     getCollateralInfo(): Promise<CollateralWithHaircut[]>;
 }
 export declare const getSdkConfig: () => ServiceConfig;

package/dist/types/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,4BAA4B,EAC5B,0BAA0B,EAC1B,gBAAgB,EAChB,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC,0BAA0B,CAAC;IAmChC,sBAAsB,CAC1B,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;oBAGmB,OAAO;;CAYzC;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,cAAc,IAAI,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAI7C,iBAAiB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAK5D;AAaD,eAAO,MAAM,YAAY,QAAO,aAE/B,CAAC;AAGF,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["config/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,aAAa,EACb,4BAA4B,EAC5B,0BAA0B,EAC1B,qBAAqB,EAEtB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,MAAM,GAAG;IACnB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,kBAAkB,CACtB,MAAM,EAAE,MAAM,EACd,eAAe,EAAE,MAAM,EACvB,QAAQ,EAAE,4BAA4B,GACrC,OAAO,CAAC,0BAA0B,CAAC;IAmChC,sBAAsB,CAC1B,eAAe,EAAE,MAAM,EACvB,eAAe,EAAE,MAAM,EACvB,aAAa,EAAE,MAAM,EACrB,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM;oBAGmB,OAAO;;CAYzC;AAED,qBAAa,iBAAkB,SAAQ,UAAU;IACzC,iBAAiB,IAAI,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAK5D;AAaD,eAAO,MAAM,YAAY,QAAO,aAE/B,CAAC;AAGF,eAAO,MAAM,YAAY,gBACV,aAAa,CAAC,aAAa,CAAC,KACxC,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC;AAEF,eAAO,MAAM,0BAA0B,QAAO,iBAI7C,CAAC"}

package/dist/types/index.d.ts

@@ -5,6 +5,5 @@ export * from './services/orders';
 export * from './services/conditional-orders';
 export * from './services/isolated-order';
 export * from './services/token';
-export * from './services/swaps';
 export { configureSDK, getTransactionModuleClient } from './config';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,wBAAwB,CAAC;AACvC,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,YAAY,EAAE,0BAA0B,EAAE,MAAM,UAAU,CAAC"}

package/dist/types/services/encode.d.ts

@@ -5,6 +5,5 @@ export declare const encodeSingleTransferMargin: (toMarginAccountId: number, tok
 export declare const encodeSingleUnstakeFromMarginAccount: (poolId: number, srusdAmount: bigint, minOut: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleStakeFromMarginAccount: (poolId: number, amount: bigint, minShares: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleTrade: (counterpartyAccountIds: number[], orderBase: bigint, orderPriceLimit: bigint, marketId: number, exchangeId: number, multiAction: MultiAction) => void;
-export declare const encodeSingleSwap: (amountIn: string, amountOut: string, path: string[], adapters: string[], recipients: string[], marketId: number, exchangeId: number, multiAction: MultiAction) => void;
 export declare const encodeRouterCall: (multiAction: MultiAction, accountId: number, nativeCurrencyValue: bigint) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

package/dist/types/services/encode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAMzE,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAEF,CAAC;AAEF,eAAO,MAAM,oBAAoB,UACxB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,sBAClB,MAAM,SAClB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,oCAAoC,WACvC,MAAM,eACD,MAAM,UACX,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACrC,MAAM,UACN,MAAM,aACH,MAAM,eACJ,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,iBAAiB,2BACJ,MAAM,EAAE,aACrB,MAAM,mBACA,MAAM,YACb,MAAM,cACJ,MAAM,eACL,WAAW,KACvB,IAeF,CAAC;AAEF,eAAO,MAAM,gBAAgB,aACjB,MAAM,aACL,MAAM,QACX,MAAM,EAAE,YACJ,MAAM,EAAE,cACN,MAAM,EAAE,YACV,MAAM,cACJ,MAAM,eACL,WAAW,KACvB,IAUF,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBACd,WAAW,aACb,MAAM,uBACI,MAAM,KAC1B,gBAUF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,WAAW,EAAW,MAAM,iBAAiB,CAAC;AAMzE,eAAO,MAAM,mBAAmB,UACvB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAEF,CAAC;AAEF,eAAO,MAAM,oBAAoB,UACxB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IAIF,CAAC;AAEF,eAAO,MAAM,0BAA0B,sBAClB,MAAM,SAClB,MAAM,UACL,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,oCAAoC,WACvC,MAAM,eACD,MAAM,UACX,MAAM,eACD,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACrC,MAAM,UACN,MAAM,aACH,MAAM,eACJ,WAAW,KACvB,IASF,CAAC;AAEF,eAAO,MAAM,iBAAiB,2BACJ,MAAM,EAAE,aACrB,MAAM,mBACA,MAAM,YACb,MAAM,cACJ,MAAM,eACL,WAAW,KACvB,IAeF,CAAC;AAEF,eAAO,MAAM,gBAAgB,gBACd,WAAW,aACb,MAAM,uBACI,MAAM,KAC1B,gBAUF,CAAC"}

package/dist/types/services/orders/order.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AASjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAiF1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAwD1B,CAAC"}
+{"version":3,"file":"order.d.ts","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EAChB,gBAAgB,EACjB,MAAM,SAAS,CAAC;AASjB,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CAiF1B,CAAC;AAEF,eAAO,MAAM,UAAU,WACb,gBAAgB,KACvB,QAAQ,gBAAgB,CA8E1B,CAAC"}

package/dist/types/services/orders/types.d.ts

@@ -22,7 +22,12 @@ export type CloseOrderParams = {
     marginAccountId: MarginAccountEntity['id'];
     orderBase: PositionEntity['base'];
     market: MarketParams;
-};
+} & ({
+    type: 'full';
+} | {
+    type: 'partial';
+    closingOrderBase: number;
+});
 export type MatchOrderResult = {
     transactionHash: string | null;
     coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;

package/dist/types/services/orders/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,qCAAqC,EACrC,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,0BAA0B,EAC3B,MAAM,iBAAiB,CAAC;AAEzB,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;IACrB,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACnD,WAAW,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,CAAC,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC9C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG,gBAAgB,GAC7D,qCAAqC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,qCAAqC,EACrC,mBAAmB,EACnB,YAAY,EACZ,gBAAgB,EAChB,mBAAmB,EACnB,cAAc,EACd,0BAA0B,EAC3B,MAAM,iBAAiB,CAAC;AAEzB,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;IACrB,gBAAgB,EAAE,YAAY,CAAC,kBAAkB,CAAC,CAAC;IACnD,WAAW,EAAE,YAAY,CAAC,aAAa,CAAC,CAAC;CAC1C,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;CACzC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,IAAI,CAAC,mBAAmB,EAAE,cAAc,CAAC,CAAC;IACjD,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,GAAG,CACA;IACE,IAAI,EAAE,MAAM,CAAC;CACd,GACD;IACE,IAAI,EAAE,SAAS,CAAC;IAChB,gBAAgB,EAAE,MAAM,CAAC;CAC1B,CACJ,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,0BAA0B,CAAC,WAAW,CAAC,CAAC;IACpD,MAAM,CAAC,EAAE,0BAA0B,CAAC,QAAQ,CAAC,CAAC;IAC9C,QAAQ,CAAC,EAAE,0BAA0B,CAAC,UAAU,CAAC,CAAC;CACnD,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,mBAAmB,CAAC,cAAc,CAAC,GAAG,IAAI,CAAC;IACzD,OAAO,EAAE,MAAM,CAAC;IAChB,cAAc,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,OAAO,CAAC;IAClB,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,QAAQ,EAAE,MAAM,CAAC;IACjB,cAAc,EAAE,MAAM,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,gCAAgC,GAAG,gBAAgB,GAC7D,qCAAqC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.129.5",
+  "version": "0.130.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.273.0",
+    "@reyaxyz/common": "0.273.1",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "ad492b9166a0dc0b46a43ca6f1e4cf33c8dcabef"
+  "gitHead": "27bb1b0a88077a52d64b9afe29b378c4d02e5188"
 }

package/src/config/index.ts

@@ -3,7 +3,6 @@ import {
   ServiceConfig,
   TransactionExecutionMetadata,
   TransactionExecutionOutput,
-  SpotMarketEntity,
   CollateralWithHaircut,
   getApiClientConfig,
 } from '@reyaxyz/common';
@@ -77,10 +76,6 @@ export class TransactionModule extends RestClient {
 }
 
 export class GeneralRestModule extends RestClient {
-  async getSpotMarkets(): Promise<SpotMarketEntity[]> {
-    return this.get<SpotMarketEntity[]>('/api/spot-markets');
-  }
-
   async getCollateralInfo(): Promise<CollateralWithHaircut[]> {
     return this.get<CollateralWithHaircut[]>(
       `/api/tokens/available-collaterals/excluding-rusd/${false}`,

package/src/index.ts

@@ -5,5 +5,4 @@ export * from './services/orders';
 export * from './services/conditional-orders';
 export * from './services/isolated-order';
 export * from './services/token';
-export * from './services/swaps';
 export { configureSDK, getTransactionModuleClient } from './config';

package/src/services/encode.ts

@@ -96,27 +96,6 @@ export const encodeSingleTrade = (
   );
 };
 
-export const encodeSingleSwap = (
-  amountIn: string,
-  amountOut: string,
-  path: string[],
-  adapters: string[],
-  recipients: string[],
-  marketId: number,
-  exchangeId: number,
-  multiAction: MultiAction,
-): void => {
-  // Trade memory trade = abi.decode(command.inputs, (Trade));
-  multiAction.newAction(
-    getCommand(
-      CommandType.CAMELOT_SWAP,
-      [[amountIn, amountOut, path, adapters, recipients]],
-      marketId,
-      exchangeId,
-    ),
-  );
-};
-
 export const encodeRouterCall = (
   multiAction: MultiAction,
   accountId: number,

package/src/services/orders/order.ts

@@ -101,14 +101,36 @@ export const closeOrder = async (
   params: CloseOrderParams,
 ): Promise<CloseOrderResult> => {
   if (params.orderBase === 0) {
-    throw new Error('Position base can not be 0');
+    throw new Error('Position is already closed.');
+  }
+
+  let closingBase: number = 0;
+  if (params.type === 'full') {
+    closingBase = params.orderBase;
+  } else {
+    closingBase = params.closingOrderBase;
+
+    if (closingBase === 0) {
+      throw new Error('Specified base to close is zero.');
+    }
+
+    if (closingBase * params.orderBase < 0) {
+      throw new Error(
+        'Specified base to close is in different direction that the actual order.',
+      );
+    }
+
+    if (Math.abs(closingBase) > params.orderBase) {
+      throw new Error(
+        'Specified base to close is larger than the actual order.',
+      );
+    }
   }
 
-  const base = scale(18)(params.orderBase);
   const slippageFactor = 40; // 2.5%
   const orderPriceLimit = calculatePriceLimitForTrade(
     params.market.currentPrice,
-    BigNumber(params.orderBase).negated().toNumber(), // used just because of sign
+    -closingBase,
     slippageFactor,
   );
 
@@ -122,7 +144,7 @@ export const closeOrder = async (
     chainId,
     params.owner.coreSigNonce,
     params.marginAccountId,
-    -base,
+    -scale(18)(closingBase),
     orderPriceLimit,
     params.market.counterpartyAccountIds,
     params.market.id,

package/src/services/orders/types.ts

@@ -33,7 +33,15 @@ export type CloseOrderParams = {
   marginAccountId: MarginAccountEntity['id'];
   orderBase: PositionEntity['base'];
   market: MarketParams;
-};
+} & (
+  | {
+      type: 'full';
+    }
+  | {
+      type: 'partial';
+      closingOrderBase: number;
+    }
+);
 
 export type MatchOrderResult = {
   transactionHash: string | null;

package/dist/services/swaps/encode.js

@@ -1,78 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeGetUsdMarginInfo = exports.encodeSwap = void 0;
-var ethers_1 = require("ethers");
-var common_1 = require("@reyaxyz/common");
-var encode_1 = require("../encode");
-var encodeSwap = function (signer, chainId, coreSigNonce, accountId, amountIn, amountOut, path, adapters, recipients, marketId, exchangeId) { return __awaiter(void 0, void 0, void 0, function () {
-    var multiAction, _a, eip712Signature, eip712Payload, value;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                multiAction = new common_1.MultiAction();
-                (0, encode_1.encodeSingleSwap)(amountIn, amountOut, path, adapters, recipients, marketId, exchangeId, multiAction);
-                return [4 /*yield*/, (0, common_1.signCoreCommands)(signer, chainId, (0, common_1.getAddress)(chainId, common_1.ContractType.PERIPHERY_PROXY), accountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.CORE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode([], []))];
-            case 1:
-                _a = _b.sent(), eip712Signature = _a.signature, eip712Payload = _a.payload;
-                value = BigInt(0);
-                return [2 /*return*/, {
-                        calldata: '', // not sending calldata to API anymore
-                        value: BigInt(value).toString(10),
-                        signature: eip712Signature,
-                        payload: eip712Payload,
-                    }];
-        }
-    });
-}); };
-exports.encodeSwap = encodeSwap;
-var encodeGetUsdMarginInfo = function (accountId) { return __awaiter(void 0, void 0, void 0, function () {
-    var functionSignature, parameters, INTERFACE, calldata;
-    return __generator(this, function (_a) {
-        functionSignature = 'getUsdMarginInfo';
-        parameters = [accountId];
-        INTERFACE = new ethers_1.Interface(common_1.CoreAbi);
-        calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
-        return [2 /*return*/, {
-                calldata: calldata,
-                value: BigInt(0).toString(10),
-            }];
-    });
-}); };
-exports.encodeGetUsdMarginInfo = encodeGetUsdMarginInfo;
-//# sourceMappingURL=encode.js.map

package/dist/services/swaps/encode.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/swaps/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAAmD;AAEnD,0CASyB;AACzB,oCAA6C;AAEtC,IAAM,UAAU,GAAG,UACxB,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,SAAiB,EACjB,QAAgB,EAChB,SAAiB,EACjB,IAAc,EACd,QAAkB,EAClB,UAAoB,EACpB,QAAgB,EAChB,UAAkB;;;;;gBAEZ,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBAEtC,IAAA,yBAAgB,EACd,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;gBAGA,qBAAM,IAAA,yBAAgB,EACpB,MAAM,EACN,OAAO,EACP,IAAA,mBAAU,EAAC,OAAO,EAAE,qBAAY,CAAC,eAAe,CAAC,EACjD,SAAS,EACT,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,EACzD,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CACjD,EAAA;;gBAVG,KACJ,SASC,EAVgB,eAAe,eAAA,EAAW,aAAa,aAAA;gBAYpD,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAExB,sBAAO;wBACL,QAAQ,EAAE,EAAE,EAAE,sCAAsC;wBACpD,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;wBACjC,SAAS,EAAE,eAAe;wBAC1B,OAAO,EAAE,aAAa;qBACvB,EAAC;;;KACH,CAAC;AA9CW,QAAA,UAAU,cA8CrB;AAEK,IAAM,sBAAsB,GAAG,UACpC,SAAiB;;;QAEX,iBAAiB,GAAG,kBAAkB,CAAC;QACvC,UAAU,GAAG,CAAC,SAAS,CAAC,CAAC;QAEzB,SAAS,GAAG,IAAI,kBAAS,CAAC,gBAAO,CAAC,CAAC;QACnC,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;QAC7E,sBAAO;gBACL,QAAQ,EAAE,QAAQ;gBAClB,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;aAC9B,EAAC;;KACH,CAAC;AAZW,QAAA,sBAAsB,0BAYjC","sourcesContent":["import { ethers, Interface, Signer } from 'ethers';\nimport { MethodParametersAndEIP712Payload } from '../orders';\nimport {\n  ContractType,\n  CoreAbi,\n  CORE_DEADLINE_IN_SECONDS,\n  getAddress,\n  getCurrentTimestampInSeconds,\n  MultiAction,\n  signCoreCommands,\n  MethodParameters,\n} from '@reyaxyz/common';\nimport { encodeSingleSwap } from '../encode';\n\nexport const encodeSwap = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  amountIn: string,\n  amountOut: string,\n  path: string[],\n  adapters: string[],\n  recipients: string[],\n  marketId: number,\n  exchangeId: number,\n): Promise<MethodParametersAndEIP712Payload> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleSwap(\n    amountIn,\n    amountOut,\n    path,\n    adapters,\n    recipients,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n\n  const { signature: eip712Signature, payload: eip712Payload } =\n    await signCoreCommands(\n      signer,\n      chainId,\n      getAddress(chainId, ContractType.PERIPHERY_PROXY),\n      accountId,\n      multiAction.commands,\n      coreSigNonce + 1,\n      getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n      ethers.AbiCoder.defaultAbiCoder().encode([], []),\n    );\n\n  const value = BigInt(0);\n\n  return {\n    calldata: '', // not sending calldata to API anymore\n    value: BigInt(value).toString(10),\n    signature: eip712Signature,\n    payload: eip712Payload,\n  };\n};\n\nexport const encodeGetUsdMarginInfo = async (\n  accountId: number,\n): Promise<MethodParameters> => {\n  const functionSignature = 'getUsdMarginInfo';\n  const parameters = [accountId];\n\n  const INTERFACE = new Interface(CoreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(0).toString(10),\n  };\n};\n"]}

package/dist/services/swaps/index.js

@@ -1,20 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./simulation"), exports);
-__exportStar(require("./types"), exports);
-__exportStar(require("./swap"), exports);
-//# sourceMappingURL=index.js.map

package/dist/services/swaps/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/swaps/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA6B;AAC7B,0CAAwB;AACxB,yCAAuB","sourcesContent":["export * from './simulation';\nexport * from './types';\nexport * from './swap';\n"]}