@reyaxyz/sdk 0.124.4 → 0.124.5

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-9.3%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-4.26%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-5.49%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.7%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-9.29%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-4.21%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-5.49%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.69%25-red.svg?style=flat) |
 

package/dist/services/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAEzD,0CAAyE;AACzE,0CAA0D;AAC1D,iCAA6C;AAC7C,gBAAgB;AAChB,wGAAwG;AACxG,KAAK;AACE,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CAAC,IAAA,mBAAU,EAAC,oBAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EAAC,oBAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,IAAM,0BAA0B,GAAG,UACxC,iBAAyB,EACzB,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,uBAAuB,EACnC,CAAC,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EACpC,CAAC,EACD,CAAC,CACF,CACF,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,QAAgB,EAChB,SAAiB,EACjB,IAAc,EACd,QAAkB,EAClB,UAAoB,EACpB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,4DAA4D;IAC5D,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,YAAY,EACxB,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,EACnD,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,WAAwB,EACxB,SAAiB,EACjB,mBAA2B;IAE3B,IAAM,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAM,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,gBAAO,CAAC,CAAC;IACzC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","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 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: number,\n  amountOut: number,\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":";AAAA,yDAAyD;;;AAEzD,0CAAyE;AACzE,0CAA0D;AAC1D,iCAA6C;AAC7C,gBAAgB;AAChB,wGAAwG;AACxG,KAAK;AACE,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CAAC,IAAA,mBAAU,EAAC,oBAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AAChF,CAAC,CAAC;AANW,QAAA,mBAAmB,uBAM9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EAAC,oBAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CACxD,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,IAAM,0BAA0B,GAAG,UACxC,iBAAyB,EACzB,KAAa,EACb,MAAc,EACd,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,uBAAuB,EACnC,CAAC,CAAC,iBAAiB,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,EACpC,CAAC,EACD,CAAC,CACF,CACF,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,0BAA0B,8BAcrC;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,QAAgB,EAChB,SAAiB,EACjB,IAAc,EACd,QAAkB,EAClB,UAAoB,EACpB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,4DAA4D;IAC5D,WAAW,CAAC,SAAS,CACnB,IAAA,mBAAU,EACR,oBAAW,CAAC,YAAY,EACxB,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,EACnD,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAnBW,QAAA,gBAAgB,oBAmB3B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,WAAwB,EACxB,SAAiB,EACjB,mBAA2B;IAE3B,IAAM,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAM,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,gBAAO,CAAC,CAAC;IACzC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","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 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"]}

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

@@ -1 +1 @@
-{"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: number,\n  amountOut: number,\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"]}
+{"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/simulation.js

@@ -41,6 +41,7 @@ var common_1 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var config_1 = require("../../config");
 var network_1 = require("../../utils/network");
+var swap_1 = require("./swap");
 var CamelotAbi = [
     {
         inputs: [
@@ -219,7 +220,7 @@ var simulateSwap = function (params) { return __awaiter(void 0, void 0, void 0,
                 marginRatio = (marginInfo.lmr / postSwapMargin) * 100;
                 return [2 /*return*/, {
                         bestPath: bestPathResult,
-                        estimatedSlippage: estimatedSlippage,
+                        estimatedSlippage: (estimatedSlippage + 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';\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,\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 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"]}

package/dist/services/swaps/swap.js

@@ -36,13 +36,14 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.swap = void 0;
+exports.swap = exports.DEFAULT_SLIPPAGE = void 0;
 var common_1 = require("@reyaxyz/common");
 var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
 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, slippageBufferMultiplier, _a, data, eip712Payload, eip712Signature, result;
+    var chainId, price, _a, data, eip712Payload, eip712Signature, result;
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
@@ -50,9 +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)();
-                slippageBufferMultiplier = 1.01;
-                params.amountOutBase = Math.round(Number(params.amountOutBase) * slippageBufferMultiplier);
-                return [4 /*yield*/, (0, encode_1.encodeSwap)(params.signer, chainId, params.owner.coreSigNonce, params.marginAccountId, params.amountInBase, params.amountOutBase, params.path, params.adapters, params.recipients, 0, // 0 for marketID
+                price = 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
                     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;AAE9C,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;gBAE3B,wBAAwB,GAAG,IAAI,CAAC;gBACtC,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC,KAAK,CAC/B,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,GAAG,wBAAwB,CACxD,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,EACnB,MAAM,CAAC,aAAa,EACpB,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;AAlDW,QAAA,IAAI,QAkDf","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 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  const slippageBufferMultiplier = 1.01; // 1% buffer\n  params.amountOutBase = Math.round(\n    Number(params.amountOutBase) * slippageBufferMultiplier,\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,\n    params.amountOutBase,\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;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"]}

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

@@ -3,6 +3,6 @@ export declare const encodeSingleDeposit: (token: string, amount: bigint, multiA
 export declare const encodeSingleWithdraw: (token: string, amount: bigint, multiAction: MultiAction) => void;
 export declare const encodeSingleTransferMargin: (toMarginAccountId: number, token: string, amount: 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: number, amountOut: number, path: string[], adapters: string[], recipients: string[], 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/swaps/encode.d.ts

@@ -1,6 +1,6 @@
 import { Signer } from 'ethers';
 import { MethodParametersAndEIP712Payload } from '../orders';
 import { MethodParameters } from '@reyaxyz/common';
-export declare const encodeSwap: (signer: Signer, chainId: number, coreSigNonce: number, accountId: number, amountIn: number, amountOut: number, path: string[], adapters: string[], recipients: string[], marketId: number, exchangeId: number) => Promise<MethodParametersAndEIP712Payload>;
+export declare const encodeSwap: (signer: Signer, chainId: number, coreSigNonce: number, accountId: number, amountIn: string, amountOut: string, path: string[], adapters: string[], recipients: string[], marketId: number, exchangeId: number) => Promise<MethodParametersAndEIP712Payload>;
 export declare const encodeGetUsdMarginInfo: (accountId: number) => Promise<MethodParameters>;
 //# sourceMappingURL=encode.d.ts.map

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;AAyEjB,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,CAgE5B,CAAC"}

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

@@ -1,3 +1,4 @@
 import { SwapParams, SwapResult } from './types';
+export declare const DEFAULT_SLIPPAGE = 0.01;
 export declare const swap: (params: SwapParams) => Promise<SwapResult>;
 //# sourceMappingURL=swap.d.ts.map

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,IAAI,WAAkB,UAAU,KAAG,QAAQ,UAAU,CAkDjE,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,CAsDjE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.124.4",
+  "version": "0.124.5",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -35,5 +35,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "92fbb770c46c7b9b244fb41da4c81a36e72a9960"
+  "gitHead": "35846fd1a901620519c3c533ecbd419fc2b80f23"
 }

package/src/services/encode.ts

@@ -65,8 +65,8 @@ export const encodeSingleTrade = (
 };
 
 export const encodeSingleSwap = (
-  amountIn: number,
-  amountOut: number,
+  amountIn: string,
+  amountOut: string,
   path: string[],
   adapters: string[],
   recipients: string[],

package/src/services/swaps/encode.ts

@@ -17,8 +17,8 @@ export const encodeSwap = async (
   chainId: number,
   coreSigNonce: number,
   accountId: number,
-  amountIn: number,
-  amountOut: number,
+  amountIn: string,
+  amountOut: string,
   path: string[],
   adapters: string[],
   recipients: string[],

package/src/services/swaps/simulation.ts

@@ -19,6 +19,7 @@ import {
 } from './types';
 import { getGeneralRestModuleClient } from '../../config';
 import { getReyaNetwork } from '../../utils/network';
+import { DEFAULT_SLIPPAGE } from './swap';
 
 const CamelotAbi = [
   {
@@ -228,7 +229,7 @@ export const simulateSwap = async (
 
   return {
     bestPath: bestPathResult,
-    estimatedSlippage: estimatedSlippage,
+    estimatedSlippage: (estimatedSlippage + DEFAULT_SLIPPAGE) * 100,
     marginRatio: marginRatio,
     marginRatioHealth: ExposureCommand.evaluateHealthStatus(marginRatio),
   };

package/src/services/swaps/swap.ts

@@ -4,6 +4,8 @@ import { encodeSwap } from './encode';
 import { SwapParams, SwapResult } from './types';
 import { getReyaNetwork } from '../../utils/network';
 
+export const DEFAULT_SLIPPAGE = 0.01;
+
 export const swap = async (params: SwapParams): Promise<SwapResult> => {
   if (params.amountInBase === 0) {
     throw new Error('Swap amount cannot be 0');
@@ -11,10 +13,14 @@ export const swap = async (params: SwapParams): Promise<SwapResult> => {
 
   const chainId = getReyaNetwork();
 
-  const slippageBufferMultiplier = 1.01; // 1% buffer
-  params.amountOutBase = Math.round(
-    Number(params.amountOutBase) * slippageBufferMultiplier,
-  );
+  // TODO: custom slippage should actually be applied to get amountOut?
+  const price =
+    Number(params.amountOutBase / params.amountInBase) *
+    (1 -
+      (params.slippage == undefined
+        ? DEFAULT_SLIPPAGE
+        : params.slippage / 100));
+  params.amountOutBase = Math.round(price * Number(params.amountInBase));
 
   const {
     calldata: data,
@@ -25,8 +31,8 @@ export const swap = async (params: SwapParams): Promise<SwapResult> => {
     chainId,
     params.owner.coreSigNonce,
     params.marginAccountId,
-    params.amountInBase,
-    params.amountOutBase,
+    params.amountInBase.toString(),
+    params.amountOutBase.toString(),
     params.path,
     params.adapters,
     params.recipients,