@reyaxyz/sdk 0.124.7 → 0.124.9

package/dist/services/swaps/simulation.js

@@ -172,7 +172,7 @@ var getPreSwapMarginInfo = function (marginAccountId) { return __awaiter(void 0,
     });
 }); };
 var simulateSwap = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var bestPathResult, simulatedPrice, restModule, markets, market, estimatedSlippage, marketReversed, collaterals, tokenFromHaircut, tokenToHaircut, marginInfo, adjustedAmountFrom, adjustedAmountTo, postSwapMargin, marginRatio;
+    var bestPathResult, simulatedPrice, restModule, markets, market, estimatedPriceImpact, marketReversed, collaterals, tokenFromHaircut, tokenToHaircut, marginInfo, adjustedAmountFrom, adjustedAmountTo, postSwapMargin, marginRatio;
     var _a, _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -188,9 +188,9 @@ var simulateSwap = function (params) { return __awaiter(void 0, void 0, void 0,
                     return (m.quoteToken.address == params.tokenFrom.toLowerCase() &&
                         m.underlyingAsset.address == params.tokenTo.toLowerCase());
                 });
-                estimatedSlippage = 0;
+                estimatedPriceImpact = 0;
                 if (market != undefined) {
-                    estimatedSlippage = (market.price - simulatedPrice) / market.price;
+                    estimatedPriceImpact = (market.price - simulatedPrice) / market.price;
                 }
                 else {
                     marketReversed = markets.find(function (m) {
@@ -198,7 +198,7 @@ var simulateSwap = function (params) { return __awaiter(void 0, void 0, void 0,
                             m.quoteToken.address == params.tokenTo.toLowerCase());
                     });
                     if (marketReversed != undefined) {
-                        estimatedSlippage =
+                        estimatedPriceImpact =
                             (1 / marketReversed.price - simulatedPrice) /
                                 (1 / marketReversed.price);
                     }
@@ -220,7 +220,8 @@ var simulateSwap = function (params) { return __awaiter(void 0, void 0, void 0,
                 marginRatio = (marginInfo.lmr / postSwapMargin) * 100;
                 return [2 /*return*/, {
                         bestPath: bestPathResult,
-                        estimatedSlippage: (estimatedSlippage + swap_1.DEFAULT_SLIPPAGE) * 100,
+                        estimatedPriceImpact: estimatedPriceImpact * 100,
+                        defaultSlippage: swap_1.DEFAULT_SLIPPAGE * 100,
                         marginRatio: marginRatio,
                         marginRatioHealth: common_1.ExposureCommand.evaluateHealthStatus(marginRatio),
                     }];

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

@@ -1 +1 @@
-{"version":3,"file":"simulation.js","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ContractType,\n  descale,\n  getAddress,\n  getTokenInfoByAddress,\n  scaleV2,\n  reyaChainIdRPCMapper,\n  ExposureCommand,\n  CoreAbi,\n  SpotMarketEntity,\n  CollateralWithHaircut,\n} from '@reyaxyz/common';\nimport { Contract, ethers } from 'ethers';\nimport {\n  FindBestPathResult,\n  GetPreSwapMarginInfo,\n  SimulateSwapParams,\n  SimulateSwapResult,\n} from './types';\nimport { getGeneralRestModuleClient } from '../../config';\nimport { getReyaNetwork } from '../../utils/network';\nimport { DEFAULT_SLIPPAGE } from './swap';\n\nconst CamelotAbi = [\n  {\n    inputs: [\n      {\n        internalType: 'uint256',\n        name: '_amountIn',\n        type: 'uint256',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenIn',\n        type: 'address',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenOut',\n        type: 'address',\n      },\n      {\n        internalType: 'address[]',\n        name: '_trustedTokens',\n        type: 'address[]',\n      },\n      {\n        internalType: 'uint256',\n        name: '_maxSteps',\n        type: 'uint256',\n      },\n    ],\n    name: 'findBestPath',\n    outputs: [\n      {\n        components: [\n          {\n            internalType: 'uint256[]',\n            name: 'amounts',\n            type: 'uint256[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'adapters',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'path',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'recipients',\n            type: 'address[]',\n          },\n          {\n            internalType: 'uint256',\n            name: 'gasEstimate',\n            type: 'uint256',\n          },\n        ],\n        internalType: 'struct FormattedOffer',\n        name: '',\n        type: 'tuple',\n      },\n    ],\n    stateMutability: 'view',\n    type: 'function',\n  },\n];\n\nexport const findBestPath = async (\n  amountFrom: number,\n  tokenFrom: string,\n  tokenTo: string,\n  maxSteps?: number,\n): Promise<FindBestPathResult> => {\n  const chainId = getReyaNetwork();\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n  const camelotAddress = getAddress(chainId, ContractType.CAMELOT_YAK_ROUTER);\n  const camelot = new Contract(camelotAddress, CamelotAbi, provider);\n\n  const tokenInfoFrom = getTokenInfoByAddress(tokenFrom);\n  const tokenInfoTo = getTokenInfoByAddress(tokenTo);\n  const amountFromScaled = scaleV2(tokenInfoFrom.decimals)(amountFrom);\n\n  // amountFrom\n  // tokenFrom\n  // tokenTo\n  // trustedTokens\n  // maxSteps\n  const result = await camelot.findBestPath(\n    amountFromScaled,\n    tokenFrom,\n    tokenTo,\n    [],\n    maxSteps || 4,\n  );\n\n  // It can happen that the amount from results in a zero  amount out\n  // dues to smaller precision of amount out, resulting in no path\n  if (result.amounts.length == 0) {\n    return {\n      amountFrom: amountFrom,\n      amountTo: 0,\n      amountInBase: Number(amountFromScaled),\n      amountOutBase: 0,\n      adapters: [],\n      path: [tokenFrom, tokenTo],\n      recipients: [],\n    };\n  }\n\n  return {\n    amountFrom: descale(tokenInfoFrom.decimals)(result.amounts[0]),\n    amountTo: descale(tokenInfoTo.decimals)(result.amounts[1]),\n    amountInBase: result.amounts[0],\n    amountOutBase: result.amounts[1],\n    adapters: Array.from(result[1]),\n    path: Array.from(result[2]),\n    recipients: Array.from(result[3]),\n  };\n};\n\n// Simulates sending the swap directly to Core using the publisher as msg.sender\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst getPreSwapMarginInfo = async (\n  marginAccountId: number,\n): Promise<GetPreSwapMarginInfo> => {\n  const chainId = getReyaNetwork();\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n  const core = new Contract(\n    getAddress(chainId, ContractType.CORE_PROXY),\n    CoreAbi,\n    provider,\n  );\n\n  const result = await core.getUsdNodeMarginInfo(marginAccountId);\n  return {\n    preSwapMarginBalance: Number(result[1]),\n    lmr: Number(result[9]),\n  };\n};\n\nexport const simulateSwap = async (\n  params: SimulateSwapParams,\n): Promise<SimulateSwapResult> => {\n  const bestPathResult = await findBestPath(\n    params.amountFrom,\n    params.tokenFrom,\n    params.tokenTo,\n  );\n\n  // slippage calculation\n  const simulatedPrice = bestPathResult.amountTo / bestPathResult.amountFrom;\n  const restModule = getGeneralRestModuleClient();\n  const markets: SpotMarketEntity[] = await restModule.getSpotMarkets();\n\n  const market = markets.find((m) => {\n    return (\n      m.quoteToken.address == params.tokenFrom.toLowerCase() &&\n      m.underlyingAsset.address == params.tokenTo.toLowerCase()\n    );\n  });\n  let estimatedSlippage = 0;\n  if (market != undefined) {\n    estimatedSlippage = (market.price - simulatedPrice) / market.price;\n  } else {\n    const marketReversed = markets.find((m) => {\n      return (\n        m.underlyingAsset.address == params.tokenFrom.toLowerCase() &&\n        m.quoteToken.address == params.tokenTo.toLowerCase()\n      );\n    });\n    if (marketReversed != undefined) {\n      estimatedSlippage =\n        (1 / marketReversed.price - simulatedPrice) /\n        (1 / marketReversed.price);\n    }\n  }\n\n  const collaterals: CollateralWithHaircut[] =\n    await restModule.getCollateralInfo();\n  const tokenFromHaircut = collaterals.find(\n    (c) => c.address == params.tokenFrom.toLowerCase(),\n  )?.priceHaircut;\n  const tokenToHaircut = collaterals.find(\n    (c) => c.address == params.tokenFrom.toLowerCase(),\n  )?.priceHaircut;\n\n  if (tokenFromHaircut === undefined || tokenToHaircut === undefined) {\n    throw new Error('Cannot find collateral tokens');\n  }\n\n  const marginInfo = await getPreSwapMarginInfo(params.marginAccountId);\n  const adjustedAmountFrom = bestPathResult.amountFrom * (1 - tokenFromHaircut);\n  const adjustedAmountTo = bestPathResult.amountTo * (1 - tokenToHaircut);\n\n  const postSwapMargin =\n    marginInfo.preSwapMarginBalance - adjustedAmountFrom + adjustedAmountTo;\n\n  // Calculate the margin ratio\n  const marginRatio = (marginInfo.lmr / postSwapMargin) * 100;\n\n  return {\n    bestPath: bestPathResult,\n    estimatedSlippage: (estimatedSlippage + DEFAULT_SLIPPAGE) * 100,\n    marginRatio: marginRatio,\n    marginRatioHealth: ExposureCommand.evaluateHealthStatus(marginRatio),\n  };\n};\n"]}
+{"version":3,"file":"simulation.js","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ContractType,\n  descale,\n  getAddress,\n  getTokenInfoByAddress,\n  scaleV2,\n  reyaChainIdRPCMapper,\n  ExposureCommand,\n  CoreAbi,\n  SpotMarketEntity,\n  CollateralWithHaircut,\n} from '@reyaxyz/common';\nimport { Contract, ethers } from 'ethers';\nimport {\n  FindBestPathResult,\n  GetPreSwapMarginInfo,\n  SimulateSwapParams,\n  SimulateSwapResult,\n} from './types';\nimport { getGeneralRestModuleClient } from '../../config';\nimport { getReyaNetwork } from '../../utils/network';\nimport { DEFAULT_SLIPPAGE } from './swap';\n\nconst CamelotAbi = [\n  {\n    inputs: [\n      {\n        internalType: 'uint256',\n        name: '_amountIn',\n        type: 'uint256',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenIn',\n        type: 'address',\n      },\n      {\n        internalType: 'address',\n        name: '_tokenOut',\n        type: 'address',\n      },\n      {\n        internalType: 'address[]',\n        name: '_trustedTokens',\n        type: 'address[]',\n      },\n      {\n        internalType: 'uint256',\n        name: '_maxSteps',\n        type: 'uint256',\n      },\n    ],\n    name: 'findBestPath',\n    outputs: [\n      {\n        components: [\n          {\n            internalType: 'uint256[]',\n            name: 'amounts',\n            type: 'uint256[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'adapters',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'path',\n            type: 'address[]',\n          },\n          {\n            internalType: 'address[]',\n            name: 'recipients',\n            type: 'address[]',\n          },\n          {\n            internalType: 'uint256',\n            name: 'gasEstimate',\n            type: 'uint256',\n          },\n        ],\n        internalType: 'struct FormattedOffer',\n        name: '',\n        type: 'tuple',\n      },\n    ],\n    stateMutability: 'view',\n    type: 'function',\n  },\n];\n\nexport const findBestPath = async (\n  amountFrom: number,\n  tokenFrom: string,\n  tokenTo: string,\n  maxSteps?: number,\n): Promise<FindBestPathResult> => {\n  const chainId = getReyaNetwork();\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n  const camelotAddress = getAddress(chainId, ContractType.CAMELOT_YAK_ROUTER);\n  const camelot = new Contract(camelotAddress, CamelotAbi, provider);\n\n  const tokenInfoFrom = getTokenInfoByAddress(tokenFrom);\n  const tokenInfoTo = getTokenInfoByAddress(tokenTo);\n  const amountFromScaled = scaleV2(tokenInfoFrom.decimals)(amountFrom);\n\n  // amountFrom\n  // tokenFrom\n  // tokenTo\n  // trustedTokens\n  // maxSteps\n  const result = await camelot.findBestPath(\n    amountFromScaled,\n    tokenFrom,\n    tokenTo,\n    [],\n    maxSteps || 4,\n  );\n\n  // It can happen that the amount from results in a zero  amount out\n  // dues to smaller precision of amount out, resulting in no path\n  if (result.amounts.length == 0) {\n    return {\n      amountFrom: amountFrom,\n      amountTo: 0,\n      amountInBase: Number(amountFromScaled),\n      amountOutBase: 0,\n      adapters: [],\n      path: [tokenFrom, tokenTo],\n      recipients: [],\n    };\n  }\n\n  return {\n    amountFrom: descale(tokenInfoFrom.decimals)(result.amounts[0]),\n    amountTo: descale(tokenInfoTo.decimals)(result.amounts[1]),\n    amountInBase: result.amounts[0],\n    amountOutBase: result.amounts[1],\n    adapters: Array.from(result[1]),\n    path: Array.from(result[2]),\n    recipients: Array.from(result[3]),\n  };\n};\n\n// Simulates sending the swap directly to Core using the publisher as msg.sender\n// eslint-disable-next-line @typescript-eslint/no-unused-vars\nconst getPreSwapMarginInfo = async (\n  marginAccountId: number,\n): Promise<GetPreSwapMarginInfo> => {\n  const chainId = getReyaNetwork();\n  const provider = ethers.getDefaultProvider(\n    reyaChainIdRPCMapper[chainId] as string,\n  );\n  const core = new Contract(\n    getAddress(chainId, ContractType.CORE_PROXY),\n    CoreAbi,\n    provider,\n  );\n\n  const result = await core.getUsdNodeMarginInfo(marginAccountId);\n  return {\n    preSwapMarginBalance: Number(result[1]),\n    lmr: Number(result[9]),\n  };\n};\n\nexport const simulateSwap = async (\n  params: SimulateSwapParams,\n): Promise<SimulateSwapResult> => {\n  const bestPathResult = await findBestPath(\n    params.amountFrom,\n    params.tokenFrom,\n    params.tokenTo,\n  );\n\n  // slippage calculation\n  const simulatedPrice = bestPathResult.amountTo / bestPathResult.amountFrom;\n  const restModule = getGeneralRestModuleClient();\n  const markets: SpotMarketEntity[] = await restModule.getSpotMarkets();\n\n  const market = markets.find((m) => {\n    return (\n      m.quoteToken.address == params.tokenFrom.toLowerCase() &&\n      m.underlyingAsset.address == params.tokenTo.toLowerCase()\n    );\n  });\n  let estimatedPriceImpact = 0;\n  if (market != undefined) {\n    estimatedPriceImpact = (market.price - simulatedPrice) / market.price;\n  } else {\n    const marketReversed = markets.find((m) => {\n      return (\n        m.underlyingAsset.address == params.tokenFrom.toLowerCase() &&\n        m.quoteToken.address == params.tokenTo.toLowerCase()\n      );\n    });\n    if (marketReversed != undefined) {\n      estimatedPriceImpact =\n        (1 / marketReversed.price - simulatedPrice) /\n        (1 / marketReversed.price);\n    }\n  }\n\n  const collaterals: CollateralWithHaircut[] =\n    await restModule.getCollateralInfo();\n  const tokenFromHaircut = collaterals.find(\n    (c) => c.address == params.tokenFrom.toLowerCase(),\n  )?.priceHaircut;\n  const tokenToHaircut = collaterals.find(\n    (c) => c.address == params.tokenFrom.toLowerCase(),\n  )?.priceHaircut;\n\n  if (tokenFromHaircut === undefined || tokenToHaircut === undefined) {\n    throw new Error('Cannot find collateral tokens');\n  }\n\n  const marginInfo = await getPreSwapMarginInfo(params.marginAccountId);\n  const adjustedAmountFrom = bestPathResult.amountFrom * (1 - tokenFromHaircut);\n  const adjustedAmountTo = bestPathResult.amountTo * (1 - tokenToHaircut);\n\n  const postSwapMargin =\n    marginInfo.preSwapMarginBalance - adjustedAmountFrom + adjustedAmountTo;\n\n  // Calculate the margin ratio\n  const marginRatio = (marginInfo.lmr / postSwapMargin) * 100;\n\n  return {\n    bestPath: bestPathResult,\n    estimatedPriceImpact: estimatedPriceImpact * 100,\n    defaultSlippage: DEFAULT_SLIPPAGE * 100,\n    marginRatio: marginRatio,\n    marginRatioHealth: ExposureCommand.evaluateHealthStatus(marginRatio),\n  };\n};\n"]}

package/dist/services/swaps/swap.js

@@ -43,7 +43,7 @@ var encode_1 = require("./encode");
 var network_1 = require("../../utils/network");
 exports.DEFAULT_SLIPPAGE = 0.01;
 var swap = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var chainId, price, _a, data, eip712Payload, eip712Signature, result;
+    var chainId, priceWithSlippage, minAmountOutBase, _a, data, eip712Payload, eip712Signature, result;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -51,13 +51,13 @@ var swap = function (params) { return __awaiter(void 0, void 0, void 0, function
                     throw new Error('Swap amount cannot be 0');
                 }
                 chainId = (0, network_1.getReyaNetwork)();
-                price = Number(params.amountOutBase / params.amountInBase) *
+                priceWithSlippage = Number(params.amountOutBase / params.amountInBase) *
                     (1 -
                         (params.slippage == undefined
                             ? exports.DEFAULT_SLIPPAGE
                             : params.slippage / 100));
-                params.amountOutBase = Math.round(price * Number(params.amountInBase));
-                return [4 /*yield*/, (0, encode_1.encodeSwap)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, params.amountInBase.toString(), params.amountOutBase.toString(), params.path, params.adapters, params.recipients, 0, // 0 for marketID
+                minAmountOutBase = Math.round(priceWithSlippage * Number(params.amountInBase));
+                return [4 /*yield*/, (0, encode_1.encodeSwap)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, params.amountInBase.toString(), minAmountOutBase.toString(), params.path, params.adapters, params.recipients, 0, // 0 for marketID
                     0)];
             case 1:
                 _a = _b.sent(), data = _a.calldata, eip712Payload = _a.payload, eip712Signature = _a.signature;

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

@@ -1 +1 @@
-{"version":3,"file":"swap.js","sourceRoot":"/","sources":["services/swaps/swap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAsC;AAEtC,+CAAqD;AAExC,QAAA,gBAAgB,GAAG,IAAI,CAAC;AAE9B,IAAM,IAAI,GAAG,UAAO,MAAkB;;;;;gBAC3C,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC7C,CAAC;gBAEK,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAG3B,KAAK,GACT,MAAM,CAAC,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;oBAClD,CAAC,CAAC;wBACA,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS;4BAC3B,CAAC,CAAC,wBAAgB;4BAClB,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC;gBAChC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;gBAMnE,qBAAM,IAAA,mBAAU,EAClB,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EAC9B,MAAM,CAAC,aAAa,CAAC,QAAQ,EAAE,EAC/B,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,UAAU,EACjB,CAAC,EAAE,iBAAiB;oBACpB,CAAC,CACF,EAAA;;gBAhBK,KAIF,SAYH,EAfW,IAAI,cAAA,EACL,aAAa,aAAA,EACX,eAAe,eAAA;gBAeb,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,eAAe,EAC5B;wBACE,MAAM,EAAE,MAAM;wBACd,SAAS,EAAE,MAAM,CAAC,eAAe;wBACjC,QAAQ,EAAE,CAAC;wBACX,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,UAAU,EAAE;4BACV,mBAAmB,EAAE,eAAe;4BACpC,aAAa,eAAA;yBACd;qBACF,CACF,EAAA;;gBAdK,MAAM,GAAG,SAcd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AAtDW,QAAA,IAAI,QAsDf","sourcesContent":["import { ContractType } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeSwap } from './encode';\nimport { SwapParams, SwapResult } from './types';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport const DEFAULT_SLIPPAGE = 0.01;\n\nexport const swap = async (params: SwapParams): Promise<SwapResult> => {\n  if (params.amountInBase === 0) {\n    throw new Error('Swap amount cannot be 0');\n  }\n\n  const chainId = getReyaNetwork();\n\n  // TODO: custom slippage should actually be applied to get amountOut?\n  const price =\n    Number(params.amountOutBase / params.amountInBase) *\n    (1 -\n      (params.slippage == undefined\n        ? DEFAULT_SLIPPAGE\n        : params.slippage / 100));\n  params.amountOutBase = Math.round(price * Number(params.amountInBase));\n\n  const {\n    calldata: data,\n    payload: eip712Payload,\n    signature: eip712Signature,\n  } = await encodeSwap(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    params.amountInBase.toString(),\n    params.amountOutBase.toString(),\n    params.path,\n    params.adapters,\n    params.recipients,\n    0, // 0 for marketID\n    0, // 0 for exchangeID\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      action: 'swap',\n      accountId: params.marginAccountId,\n      marketId: 0,\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  };\n};\n"]}
+{"version":3,"file":"swap.js","sourceRoot":"/","sources":["services/swaps/swap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+C;AAC/C,8EAA6E;AAC7E,mCAAsC;AAEtC,+CAAqD;AAExC,QAAA,gBAAgB,GAAG,IAAI,CAAC;AAE9B,IAAM,IAAI,GAAG,UAAO,MAAkB;;;;;gBAC3C,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;gBAC7C,CAAC;gBAEK,OAAO,GAAG,IAAA,wBAAc,GAAE,CAAC;gBAI3B,iBAAiB,GACrB,MAAM,CAAC,MAAM,CAAC,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC;oBAClD,CAAC,CAAC;wBACA,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS;4BAC3B,CAAC,CAAC,wBAAgB;4BAClB,CAAC,CAAC,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC,CAAC,CAAC;gBAC1B,gBAAgB,GAAG,IAAI,CAAC,KAAK,CACjC,iBAAiB,GAAG,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAChD,CAAC;gBAME,qBAAM,IAAA,mBAAU,EAClB,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EAC9B,gBAAgB,CAAC,QAAQ,EAAE,EAC3B,MAAM,CAAC,IAAI,EACX,MAAM,CAAC,QAAQ,EACf,MAAM,CAAC,UAAU,EACjB,CAAC,EAAE,iBAAiB;oBACpB,CAAC,CACF,EAAA;;gBAhBK,KAIF,SAYH,EAfW,IAAI,cAAA,EACL,aAAa,aAAA,EACX,eAAe,eAAA;gBAeb,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,OAAO,EACP,qBAAY,CAAC,eAAe,EAC5B;wBACE,MAAM,EAAE,MAAM;wBACd,SAAS,EAAE,MAAM,CAAC,eAAe;wBACjC,QAAQ,EAAE,CAAC;wBACX,WAAW,EAAE,MAAM,CAAC,WAAW;wBAC/B,UAAU,EAAE;4BACV,mBAAmB,EAAE,eAAe;4BACpC,aAAa,eAAA;yBACd;qBACF,CACF,EAAA;;gBAdK,MAAM,GAAG,SAcd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AAzDW,QAAA,IAAI,QAyDf","sourcesContent":["import { ContractType } from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { encodeSwap } from './encode';\nimport { SwapParams, SwapResult } from './types';\nimport { getReyaNetwork } from '../../utils/network';\n\nexport const DEFAULT_SLIPPAGE = 0.01;\n\nexport const swap = async (params: SwapParams): Promise<SwapResult> => {\n  if (params.amountInBase === 0) {\n    throw new Error('Swap amount cannot be 0');\n  }\n\n  const chainId = getReyaNetwork();\n\n  // Add custom slippage set my the user\n  // Default is 1% to account for price movements\n  const priceWithSlippage =\n    Number(params.amountOutBase / params.amountInBase) *\n    (1 -\n      (params.slippage == undefined\n        ? DEFAULT_SLIPPAGE\n        : params.slippage / 100));\n  const minAmountOutBase = Math.round(\n    priceWithSlippage * Number(params.amountInBase),\n  );\n\n  const {\n    calldata: data,\n    payload: eip712Payload,\n    signature: eip712Signature,\n  } = await encodeSwap(\n    params.signer,\n    chainId,\n    params.owner.coreSigNonce,\n    params.marginAccountId,\n    params.amountInBase.toString(),\n    minAmountOutBase.toString(),\n    params.path,\n    params.adapters,\n    params.recipients,\n    0, // 0 for marketID\n    0, // 0 for exchangeID\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      action: 'swap',\n      accountId: params.marginAccountId,\n      marketId: 0,\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  };\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/swaps/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';\n\nexport type SwapParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountInBase: FindBestPathResult['amountInBase'];\n  amountOutBase: FindBestPathResult['amountOutBase'];\n  path: FindBestPathResult['path'];\n  adapters: FindBestPathResult['adapters'];\n  recipients: FindBestPathResult['recipients'];\n  tradeSource?: 'reya' | 'rage' | 'other';\n  slippage?: number;\n};\n\nexport type SwapResult = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type FindBestPathResult = {\n  amountFrom: number;\n  amountTo: number;\n  amountInBase: SimulateSwapParams['amountFrom'];\n  amountOutBase: SimulateSwapParams['amountFrom'];\n  path: SimulateSwapParams['tokenFrom'][];\n  adapters: string[];\n  recipients: string[];\n};\n\nexport type SimulateSwapParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountFrom: number;\n  tokenFrom: string;\n  tokenTo: string;\n};\n\nexport type SimulateSwapResult = {\n  bestPath: FindBestPathResult;\n  estimatedSlippage: number;\n  marginRatio: number;\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n};\n\nexport type GetPreSwapMarginInfo = {\n  preSwapMarginBalance: number;\n  lmr: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/swaps/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { MarginAccountEntity, OwnerMetadataEntity } from '@reyaxyz/common';\n\nexport type SwapParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountInBase: FindBestPathResult['amountInBase'];\n  amountOutBase: FindBestPathResult['amountOutBase'];\n  path: FindBestPathResult['path'];\n  adapters: FindBestPathResult['adapters'];\n  recipients: FindBestPathResult['recipients'];\n  tradeSource?: 'reya' | 'rage' | 'other';\n  slippage?: number;\n};\n\nexport type SwapResult = {\n  transactionHash: string | null;\n  coreSigNonce: number | null;\n};\n\nexport type FindBestPathResult = {\n  amountFrom: number;\n  amountTo: number;\n  amountInBase: SimulateSwapParams['amountFrom'];\n  amountOutBase: SimulateSwapParams['amountFrom'];\n  path: SimulateSwapParams['tokenFrom'][];\n  adapters: string[];\n  recipients: string[];\n};\n\nexport type SimulateSwapParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  amountFrom: number;\n  tokenFrom: string;\n  tokenTo: string;\n};\n\nexport type SimulateSwapResult = {\n  bestPath: FindBestPathResult;\n  estimatedPriceImpact: number;\n  defaultSlippage: number;\n  marginRatio: number;\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n};\n\nexport type GetPreSwapMarginInfo = {\n  preSwapMarginBalance: number;\n  lmr: number;\n};\n"]}

package/dist/types/services/swaps/simulation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"simulation.d.ts","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AA0EjB,eAAO,MAAM,YAAY,eACX,MAAM,aACP,MAAM,WACR,MAAM,aACJ,MAAM,KAChB,QAAQ,kBAAkB,CAgD5B,CAAC;AAwBF,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,kBAAkB,CAgE5B,CAAC"}
+{"version":3,"file":"simulation.d.ts","sourceRoot":"/","sources":["services/swaps/simulation.ts"],"names":[],"mappings":"AAaA,OAAO,EACL,kBAAkB,EAElB,kBAAkB,EAClB,kBAAkB,EACnB,MAAM,SAAS,CAAC;AA0EjB,eAAO,MAAM,YAAY,eACX,MAAM,aACP,MAAM,WACR,MAAM,aACJ,MAAM,KAChB,QAAQ,kBAAkB,CAgD5B,CAAC;AAwBF,eAAO,MAAM,YAAY,WACf,kBAAkB,KACzB,QAAQ,kBAAkB,CAiE5B,CAAC"}

package/dist/types/services/swaps/swap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"swap.d.ts","sourceRoot":"/","sources":["services/swaps/swap.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGjD,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC,eAAO,MAAM,IAAI,WAAkB,UAAU,KAAG,QAAQ,UAAU,CAsDjE,CAAC"}
+{"version":3,"file":"swap.d.ts","sourceRoot":"/","sources":["services/swaps/swap.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAGjD,eAAO,MAAM,gBAAgB,OAAO,CAAC;AAErC,eAAO,MAAM,IAAI,WAAkB,UAAU,KAAG,QAAQ,UAAU,CAyDjE,CAAC"}

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

@@ -35,7 +35,8 @@ export type SimulateSwapParams = {
 };
 export type SimulateSwapResult = {
     bestPath: FindBestPathResult;
-    estimatedSlippage: number;
+    estimatedPriceImpact: number;
+    defaultSlippage: number;
     marginRatio: number;
     marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
 };

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/swaps/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,MAAM,MAAM,UAAU,GAAG;IACvB,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,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACjD,aAAa,EAAE,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACzC,UAAU,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC/C,aAAa,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAChD,IAAI,EAAE,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;IACxC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,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,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,iBAAiB,EAAE,MAAM,CAAC;IAC1B,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;CAC7D,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/swaps/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAE3E,MAAM,MAAM,UAAU,GAAG;IACvB,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,kBAAkB,CAAC,cAAc,CAAC,CAAC;IACjD,aAAa,EAAE,kBAAkB,CAAC,eAAe,CAAC,CAAC;IACnD,IAAI,EAAE,kBAAkB,CAAC,MAAM,CAAC,CAAC;IACjC,QAAQ,EAAE,kBAAkB,CAAC,UAAU,CAAC,CAAC;IACzC,UAAU,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC7C,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACxC,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACvB,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAC/C,aAAa,EAAE,kBAAkB,CAAC,YAAY,CAAC,CAAC;IAChD,IAAI,EAAE,kBAAkB,CAAC,WAAW,CAAC,EAAE,CAAC;IACxC,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,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,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,oBAAoB,EAAE,MAAM,CAAC;IAC7B,eAAe,EAAE,MAAM,CAAC;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;CAC7D,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.124.7",
+  "version": "0.124.9",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.229.1",
+    "@reyaxyz/common": "0.230.0",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "638433b4e99693f2e9ad1ed50ca653526ca1a2f7"
+  "gitHead": "535fb6356a154bbe5dd57eecc42d7c0ba920c8b0"
 }

package/src/services/swaps/simulation.ts

@@ -187,9 +187,9 @@ export const simulateSwap = async (
       m.underlyingAsset.address == params.tokenTo.toLowerCase()
     );
   });
-  let estimatedSlippage = 0;
+  let estimatedPriceImpact = 0;
   if (market != undefined) {
-    estimatedSlippage = (market.price - simulatedPrice) / market.price;
+    estimatedPriceImpact = (market.price - simulatedPrice) / market.price;
   } else {
     const marketReversed = markets.find((m) => {
       return (
@@ -198,7 +198,7 @@ export const simulateSwap = async (
       );
     });
     if (marketReversed != undefined) {
-      estimatedSlippage =
+      estimatedPriceImpact =
         (1 / marketReversed.price - simulatedPrice) /
         (1 / marketReversed.price);
     }
@@ -229,7 +229,8 @@ export const simulateSwap = async (
 
   return {
     bestPath: bestPathResult,
-    estimatedSlippage: (estimatedSlippage + DEFAULT_SLIPPAGE) * 100,
+    estimatedPriceImpact: estimatedPriceImpact * 100,
+    defaultSlippage: DEFAULT_SLIPPAGE * 100,
     marginRatio: marginRatio,
     marginRatioHealth: ExposureCommand.evaluateHealthStatus(marginRatio),
   };

package/src/services/swaps/swap.ts

@@ -13,14 +13,17 @@ export const swap = async (params: SwapParams): Promise<SwapResult> => {
 
   const chainId = getReyaNetwork();
 
-  // TODO: custom slippage should actually be applied to get amountOut?
-  const price =
+  // Add custom slippage set my the user
+  // Default is 1% to account for price movements
+  const priceWithSlippage =
     Number(params.amountOutBase / params.amountInBase) *
     (1 -
       (params.slippage == undefined
         ? DEFAULT_SLIPPAGE
         : params.slippage / 100));
-  params.amountOutBase = Math.round(price * Number(params.amountInBase));
+  const minAmountOutBase = Math.round(
+    priceWithSlippage * Number(params.amountInBase),
+  );
 
   const {
     calldata: data,
@@ -32,7 +35,7 @@ export const swap = async (params: SwapParams): Promise<SwapResult> => {
     params.owner.coreSigNonce,
     params.marginAccountId,
     params.amountInBase.toString(),
-    params.amountOutBase.toString(),
+    minAmountOutBase.toString(),
     params.path,
     params.adapters,
     params.recipients,

package/src/services/swaps/types.ts

@@ -40,7 +40,8 @@ export type SimulateSwapParams = {
 
 export type SimulateSwapResult = {
   bestPath: FindBestPathResult;
-  estimatedSlippage: number;
+  estimatedPriceImpact: number;
+  defaultSlippage: number;
   marginRatio: number;
   marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
 };