@reyaxyz/sdk 0.8.1 → 0.9.0

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":";;;AACA,iCAAmC;AAEnC,mBAAmB;AACnB,IAAM,mBAAmB,GAAG;IAC1B,2GAA2G;CAC5G,CAAC;AAEF,mBAAmB;AACnB,IAAM,kBAAkB,GAAG;IACzB,kGAAkG;CACnG,CAAC;AACK,IAAM,0BAA0B,GAAG,UACxC,MAAc,EACd,YAAoB,EACpB,MAAc,EACd,SAAiB;IAEjB,IAAM,iBAAiB,GAAG,cAAc,CAAC;IACzC,IAAM,UAAU,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAC7D,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,mBAAmB,CAAC,CAAC;IACrD,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAXW,QAAA,0BAA0B,8BAWrC;AAEK,IAAM,yBAAyB,GAAG,UACvC,MAAc,EACd,YAAoB,EACpB,MAAc;IAEd,IAAM,iBAAiB,GAAG,iBAAiB,CAAC;IAC5C,IAAM,UAAU,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAClD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,kBAAkB,CAAC,CAAC;IACpD,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAVW,QAAA,yBAAyB,6BAUpC","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\n\n// @todo Update ABI\nconst provideLiquidityAbi = [\n  'function addLiquidity(uint128 poolId, address owner, uint256 amount, uint256 minShares) returns (uint256)',\n];\n\n// @todo Update ABI\nconst removeLiquidityabi = [\n  'function removeLiquidity(uint128 poolId, uint256 sharesAmount, uint256 minOut) returns (uint256)',\n];\nexport const encodeProvideLiquidityCall = (\n  poolId: number,\n  accountOwner: string,\n  amount: number,\n  minShares: number,\n): MethodParameters => {\n  const functionSignature = 'addLiquidity';\n  const parameters = [poolId, accountOwner, amount, minShares];\n  const INTERFACE = new Interface(provideLiquidityAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeRemoveLiquidityCall = (\n  poolId: number,\n  sharesAmount: number,\n  minOut: number,\n): MethodParameters => {\n  const functionSignature = 'removeLiquidity';\n  const parameters = [poolId, sharesAmount, minOut];\n  const INTERFACE = new Interface(removeLiquidityabi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":";;;AACA,iCAAmC;AAEnC,mBAAmB;AACnB,IAAM,mBAAmB,GAAG;IAC1B,2GAA2G;CAC5G,CAAC;AAEF,mBAAmB;AACnB,IAAM,kBAAkB,GAAG;IACzB,kGAAkG;CACnG,CAAC;AACK,IAAM,0BAA0B,GAAG,UACxC,MAAc,EACd,YAAoB,EACpB,MAAc,EACd,SAAiB;IAEjB,IAAM,iBAAiB,GAAG,cAAc,CAAC;IACzC,IAAM,UAAU,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,SAAS,CAAC,CAAC;IAC7D,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,mBAAmB,CAAC,CAAC;IACrD,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAXW,QAAA,0BAA0B,8BAWrC;AAEK,IAAM,yBAAyB,GAAG,UACvC,MAAc,EACd,YAAoB,EACpB,MAAc;IAEd,IAAM,iBAAiB,GAAG,iBAAiB,CAAC;IAC5C,IAAM,UAAU,GAAG,CAAC,MAAM,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;IAClD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,kBAAkB,CAAC,CAAC;IACpD,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAC;AAC/D,CAAC,CAAC;AAVW,QAAA,yBAAyB,6BAUpC","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\n\n// @todo Update ABI\nconst provideLiquidityAbi = [\n  'function addLiquidity(uint128 poolId, address owner, uint256 amount, uint256 minShares) returns (uint256)',\n];\n\n// @todo Update ABI\nconst removeLiquidityabi = [\n  'function removeLiquidity(uint128 poolId, uint256 sharesAmount, uint256 minOut) returns (uint256)',\n];\nexport const encodeProvideLiquidityCall = (\n  poolId: number,\n  accountOwner: string,\n  amount: bigint,\n  minShares: number,\n): MethodParameters => {\n  const functionSignature = 'addLiquidity';\n  const parameters = [poolId, accountOwner, amount, minShares];\n  const INTERFACE = new Interface(provideLiquidityAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeRemoveLiquidityCall = (\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: number,\n): MethodParameters => {\n  const functionSignature = 'removeLiquidity';\n  const parameters = [poolId, sharesAmount, minOut];\n  const INTERFACE = new Interface(removeLiquidityabi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n"]}

package/dist/services/lp/lp.js

@@ -57,7 +57,7 @@ var provideLiquidity = function (params) { return __awaiter(void 0, void 0, void
                 if (params.amount === 0) {
                     throw new Error('LP amount can not be 0');
                 }
-                amount = (0, lp_1.expandLpAmount)(params.amount);
+                amount = (0, lp_1.expandLpAmount)(params.amount, 6);
                 _a = (0, encode_1.encodeProvideLiquidityCall)(params.poolId, ownerAddrees, amount, minShares), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.LP)];
             case 3:
@@ -82,7 +82,7 @@ var removeLiquidity = function (params) { return __awaiter(void 0, void 0, void
                     throw new Error('Shares amount can not be 0');
                 }
                 minOut = (0, lp_1.calculateMinOutForLp)(params.sharesAmount);
-                amount = (0, lp_1.expandLpAmount)(params.sharesAmount);
+                amount = (0, lp_1.expandLpAmount)(params.sharesAmount, 30);
                 _a = (0, encode_1.encodeRemoveLiquidityCall)(params.poolId, amount, minOut), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.LP)];
             case 2:

package/dist/services/lp/lp.js.map

@@ -1 +1 @@
-{"version":3,"file":"lp.js","sourceRoot":"/","sources":["services/lp/lp.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAC3D,mCAGkB;AAOlB,6CAAqD;AACrD,qCAIwB;AAEjB,IAAM,gBAAgB,GAAG,UAC9B,MAA8B;;;;;oBAET,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAA/C,YAAY,GAAG,SAAgC;gBAErC,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBACnC,SAAS,GAAG,IAAA,4BAAuB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEzD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC5C,CAAC;gBAEK,MAAM,GAAG,IAAA,mBAAc,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEvC,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,MAAM,EACb,YAAY,EACZ,MAAM,EACN,SAAS,CACV,EALiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAK3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,EAAE,CACnB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAjCW,QAAA,gBAAgB,oBAiC3B;AAEK,IAAM,eAAe,GAAG,UAC7B,MAA6B;;;;;oBAEb,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEzC,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEK,MAAM,GAAG,IAAA,yBAAoB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAEnD,MAAM,GAAG,IAAA,mBAAc,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAC7C,KAA4B,IAAA,kCAAyB,EACzD,MAAM,CAAC,MAAM,EACb,MAAM,EACN,MAAM,CACP,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,EAAE,CACnB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9BW,QAAA,eAAe,mBA8B1B","sourcesContent":["import { executeTransaction } from '../executeTransaction';\nimport {\n  encodeProvideLiquidityCall,\n  encodeRemoveLiquidityCall,\n} from './encode';\nimport {\n  ProvideLiquidityParams,\n  ProvideLiquidityResult,\n  RemoveLiquidityParams,\n  RemoveLiquidityResult,\n} from './types';\nimport { TransactionType } from '../../utils/consts';\nimport {\n  calculateMinOutForLp,\n  calculateMinSharesForLp,\n  expandLpAmount,\n} from '../../utils/lp';\n\nexport const provideLiquidity = async (\n  params: ProvideLiquidityParams,\n): Promise<ProvideLiquidityResult> => {\n  const ownerAddrees = await params.signer.getAddress();\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const minShares = calculateMinSharesForLp(params.amount);\n\n  if (params.amount === 0) {\n    throw new Error('LP amount can not be 0');\n  }\n\n  const amount = expandLpAmount(params.amount);\n\n  const { calldata: data, value } = encodeProvideLiquidityCall(\n    params.poolId,\n    ownerAddrees,\n    amount,\n    minShares,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.LP,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const removeLiquidity = async (\n  params: RemoveLiquidityParams,\n): Promise<RemoveLiquidityResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  if (params.sharesAmount === 0) {\n    throw new Error('Shares amount can not be 0');\n  }\n\n  const minOut = calculateMinOutForLp(params.sharesAmount);\n\n  const amount = expandLpAmount(params.sharesAmount);\n  const { calldata: data, value } = encodeRemoveLiquidityCall(\n    params.poolId,\n    amount,\n    minOut,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.LP,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"lp.js","sourceRoot":"/","sources":["services/lp/lp.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAC3D,mCAGkB;AAOlB,6CAAqD;AACrD,qCAIwB;AAEjB,IAAM,gBAAgB,GAAG,UAC9B,MAA8B;;;;;oBAET,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAA/C,YAAY,GAAG,SAAgC;gBAErC,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBACnC,SAAS,GAAG,IAAA,4BAAuB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAEzD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBAC5C,CAAC;gBAEK,MAAM,GAAG,IAAA,mBAAc,EAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAE1C,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,MAAM,EACb,YAAY,EACZ,MAAM,EACN,SAAS,CACV,EALiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAK3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,EAAE,CACnB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAjCW,QAAA,gBAAgB,oBAiC3B;AAEK,IAAM,eAAe,GAAG,UAC7B,MAA6B;;;;;oBAEb,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEzC,IAAI,MAAM,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;oBAC9B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEK,MAAM,GAAG,IAAA,yBAAoB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAEnD,MAAM,GAAG,IAAA,mBAAc,EAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBACjD,KAA4B,IAAA,kCAAyB,EACzD,MAAM,CAAC,MAAM,EACb,MAAM,EACN,MAAM,CACP,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,EAAE,CACnB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9BW,QAAA,eAAe,mBA8B1B","sourcesContent":["import { executeTransaction } from '../executeTransaction';\nimport {\n  encodeProvideLiquidityCall,\n  encodeRemoveLiquidityCall,\n} from './encode';\nimport {\n  ProvideLiquidityParams,\n  ProvideLiquidityResult,\n  RemoveLiquidityParams,\n  RemoveLiquidityResult,\n} from './types';\nimport { TransactionType } from '../../utils/consts';\nimport {\n  calculateMinOutForLp,\n  calculateMinSharesForLp,\n  expandLpAmount,\n} from '../../utils/lp';\n\nexport const provideLiquidity = async (\n  params: ProvideLiquidityParams,\n): Promise<ProvideLiquidityResult> => {\n  const ownerAddrees = await params.signer.getAddress();\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const minShares = calculateMinSharesForLp(params.amount);\n\n  if (params.amount === 0) {\n    throw new Error('LP amount can not be 0');\n  }\n\n  const amount = expandLpAmount(params.amount, 6);\n\n  const { calldata: data, value } = encodeProvideLiquidityCall(\n    params.poolId,\n    ownerAddrees,\n    amount,\n    minShares,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.LP,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const removeLiquidity = async (\n  params: RemoveLiquidityParams,\n): Promise<RemoveLiquidityResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  if (params.sharesAmount === 0) {\n    throw new Error('Shares amount can not be 0');\n  }\n\n  const minOut = calculateMinOutForLp(params.sharesAmount);\n\n  const amount = expandLpAmount(params.sharesAmount, 30); // shares have 30 decimals\n  const { calldata: data, value } = encodeRemoveLiquidityCall(\n    params.poolId,\n    amount,\n    minOut,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.LP,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/margin-accounts/deposit.js

@@ -47,11 +47,11 @@ var deposit = function (params) { return __awaiter(void 0, void 0, void 0, funct
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                tokenDecimals = (0, common_1.getTokenDetails)(params.token).tokenDecimals;
+                tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
                 amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 marketId = 0;
                 exchangeId = 0;
-                _a = (0, encode_1.encodeDeposit)(params.accountId, params.token, amount, marketId, exchangeId), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeDeposit)(params.accountId, params.tokenAddress, amount, marketId, exchangeId), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
                 network = _c.sent();

package/dist/services/margin-accounts/deposit.js.map

@@ -1 +1 @@
-{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,6CAAqD;AACrD,0CAAyD;AAElD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEb,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,KAAK,CAAC,cAAlC,CAAmC;gBAClD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,QAAQ,GAAG,CAAC,CAAC;gBACb,UAAU,GAAG,CAAC,CAAC;gBACf,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,EACN,QAAQ,EACR,UAAU,CACX,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEc,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,OAAO,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA7BW,QAAA,OAAO,WA6BlB","sourcesContent":["import { DepositParams, DepositResult } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport { getTokenDetails, scale } from '../token/common';\n\nexport const deposit = async (\n  params: DepositParams,\n): Promise<DepositResult> => {\n  const { tokenDecimals } = getTokenDetails(params.token);\n  const amount = scale(tokenDecimals)(params.amount);\n  const marketId = 0;\n  const exchangeId = 0;\n  const { calldata: data, value } = encodeDeposit(\n    params.accountId,\n    params.token,\n    amount,\n    marketId,\n    exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.DEPOSIT,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,6CAAqD;AACrD,0CAAyD;AAElD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEb,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,QAAQ,GAAG,CAAC,CAAC;gBACb,UAAU,GAAG,CAAC,CAAC;gBACf,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,QAAQ,EACR,UAAU,CACX,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEc,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,OAAO,CACxB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA7BW,QAAA,OAAO,WA6BlB","sourcesContent":["import { DepositParams, DepositResult } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport { getTokenDetails, scale } from '../token/common';\n\nexport const deposit = async (\n  params: DepositParams,\n): Promise<DepositResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n  const marketId = 0;\n  const exchangeId = 0;\n  const { calldata: data, value } = encodeDeposit(\n    params.accountId,\n    params.tokenAddress,\n    amount,\n    marketId,\n    exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.DEPOSIT,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/margin-accounts/index.js

@@ -17,5 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./account"), exports);
 __exportStar(require("./deposit"), exports);
+__exportStar(require("./simulateDeposit"), exports);
+__exportStar(require("./simulateWithdraw"), exports);
 __exportStar(require("./withdraw"), exports);
 //# sourceMappingURL=index.js.map

package/dist/services/margin-accounts/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,6CAA2B","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './withdraw';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,oDAAkC;AAClC,qDAAmC;AACnC,6CAA2B","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './simulateDeposit';\nexport * from './simulateWithdraw';\nexport * from './withdraw';\n"]}

package/dist/services/margin-accounts/simulateDeposit.js

@@ -0,0 +1,68 @@
+"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.simulateDeposit = void 0;
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+var randomSimulation = function () {
+    return {
+        bridgeGasFees: getRandomIntInclusive(1000, 100000),
+        marginRatio: getRandomIntInclusive(1, 100),
+        marginRatioHealth: 'danger',
+    };
+};
+var simulateDeposit = function (
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+params) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, new Promise(function (resolve) {
+                    setTimeout(function () {
+                        resolve(randomSimulation());
+                    }, Math.random() * 100 + 1000);
+                })];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+exports.simulateDeposit = simulateDeposit;
+//# sourceMappingURL=simulateDeposit.js.map

package/dist/services/margin-accounts/simulateDeposit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simulateDeposit.js","sourceRoot":"/","sources":["services/margin-accounts/simulateDeposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;QAClD,WAAW,EAAE,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC;QAC1C,iBAAiB,EAAE,QAAQ;KAC5B,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,eAAe,GAAG;AAC7B,6DAA6D;AAC7D,MAA6B;;;oBAEtB,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,eAAe,mBAY1B","sourcesContent":["import { SimulateDepositParams, SimulateDepositResult } from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n  min = Math.ceil(min);\n  max = Math.floor(max);\n  return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateDepositResult => {\n  return {\n    bridgeGasFees: getRandomIntInclusive(1000, 100000),\n    marginRatio: getRandomIntInclusive(1, 100),\n    marginRatioHealth: 'danger',\n  };\n};\n\nexport const simulateDeposit = async (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateDepositParams,\n): Promise<SimulateDepositResult> => {\n  return await new Promise((resolve) => {\n    setTimeout(\n      () => {\n        resolve(randomSimulation());\n      },\n      Math.random() * 100 + 1000,\n    );\n  });\n};\n"]}

package/dist/services/margin-accounts/simulateWithdraw.js

@@ -0,0 +1,68 @@
+"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.simulateWithdraw = void 0;
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min, max) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min + 1) + min);
+}
+var randomSimulation = function () {
+    return {
+        bridgeGasFees: getRandomIntInclusive(1000, 100000),
+        marginRatio: getRandomIntInclusive(1, 100),
+        marginRatioHealth: 'danger',
+    };
+};
+var simulateWithdraw = function (
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+params) { return __awaiter(void 0, void 0, void 0, function () {
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, new Promise(function (resolve) {
+                    setTimeout(function () {
+                        resolve(randomSimulation());
+                    }, Math.random() * 100 + 1000);
+                })];
+            case 1: return [2 /*return*/, _a.sent()];
+        }
+    });
+}); };
+exports.simulateWithdraw = simulateWithdraw;
+//# sourceMappingURL=simulateWithdraw.js.map

package/dist/services/margin-accounts/simulateWithdraw.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simulateWithdraw.js","sourceRoot":"/","sources":["services/margin-accounts/simulateWithdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;QAClD,WAAW,EAAE,qBAAqB,CAAC,CAAC,EAAE,GAAG,CAAC;QAC1C,iBAAiB,EAAE,QAAQ;KAC5B,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,gBAAgB,GAAG;AAC9B,6DAA6D;AAC7D,MAA8B;;;oBAEvB,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,gBAAgB,oBAY3B","sourcesContent":["import { SimulateWithdrawParams, SimulateWithdrawResult } from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n  min = Math.ceil(min);\n  max = Math.floor(max);\n  return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateWithdrawResult => {\n  return {\n    bridgeGasFees: getRandomIntInclusive(1000, 100000),\n    marginRatio: getRandomIntInclusive(1, 100),\n    marginRatioHealth: 'danger',\n  };\n};\n\nexport const simulateWithdraw = async (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateWithdrawParams,\n): Promise<SimulateWithdrawResult> => {\n  return await new Promise((resolve) => {\n    setTimeout(\n      () => {\n        resolve(randomSimulation());\n      },\n      Math.random() * 100 + 1000,\n    );\n  });\n};\n"]}

package/dist/services/margin-accounts/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type CreateAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  token: string;\n  amount: number;\n};\n\nexport type DepositResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  token: string;\n  amount: number;\n};\n\nexport type WithdrawResult = {\n  transactionHash: string | null;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type CreateAccountParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: string;\n};\n\nexport type CreateAccountResult = {\n  transactionHash: string | null;\n};\n\nexport type DepositParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  tokenAddress: string;\n  amount: number;\n};\n\nexport type DepositResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  tokenAddress: string;\n  amount: number;\n};\n\nexport type WithdrawResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateDepositResult = {\n  bridgeGasFees: number;\n  marginRatioHealth: 'danger' | 'healthy' | 'warning'; // MarginAccountEntity['marginRatioPercentage'];\n  marginRatio: number; // MarginAccountEntity['marginRatioHealth'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateDepositParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  tokenAddress: string;\n  amount: number;\n};\n\nexport type SimulateWithdrawResult = {\n  bridgeGasFees: number;\n  marginRatioHealth: 'danger' | 'healthy' | 'warning'; // MarginAccountEntity['marginRatioPercentage'];\n  marginRatio: number; // MarginAccountEntity['marginRatioHealth'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateWithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  accountId: number;\n  tokenAddress: string;\n  amount: number;\n};\n"]}

package/dist/services/margin-accounts/withdraw.js

@@ -47,11 +47,11 @@ var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, func
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                tokenDecimals = (0, common_1.getTokenDetails)(params.token).tokenDecimals;
+                tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
                 amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 marketId = 0;
                 exchangeId = 0;
-                _a = (0, encode_1.encodeWithdraw)(params.accountId, params.token, BigInt(amount), marketId, exchangeId), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeWithdraw)(params.accountId, params.tokenAddress, BigInt(amount), marketId, exchangeId), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
                 network = _c.sent();

package/dist/services/margin-accounts/withdraw.js.map

@@ -1 +1 @@
-{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,6CAAqD;AACrD,0CAAyD;AAElD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEd,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,KAAK,CAAC,cAAlC,CAAmC;gBAClD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,QAAQ,GAAG,CAAC,CAAC;gBACb,UAAU,GAAG,CAAC,CAAC;gBACf,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,MAAM,CAAC,EACd,QAAQ,EACR,UAAU,CACX,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEc,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,QAAQ,CACzB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9BW,QAAA,QAAQ,YA8BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport { getTokenDetails, scale } from '../token/common';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const { tokenDecimals } = getTokenDetails(params.token);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const marketId = 0;\n  const exchangeId = 0;\n  const { calldata: data, value } = encodeWithdraw(\n    params.accountId,\n    params.token,\n    BigInt(amount),\n    marketId,\n    exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.WITHDRAW,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"withdraw.js","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAA0C;AAC1C,4DAA2D;AAC3D,6CAAqD;AACrD,0CAAyD;AAElD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEd,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,QAAQ,GAAG,CAAC,CAAC;gBACb,UAAU,GAAG,CAAC,CAAC;gBACf,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,CAAC,EACd,QAAQ,EACR,UAAU,CACX,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEc,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAE1B,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,QAAQ,CACzB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9BW,QAAA,QAAQ,YA8BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport { getTokenDetails, scale } from '../token/common';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const marketId = 0;\n  const exchangeId = 0;\n  const { calldata: data, value } = encodeWithdraw(\n    params.accountId,\n    params.tokenAddress,\n    BigInt(amount),\n    marketId,\n    exchangeId,\n  );\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.WITHDRAW,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -1,4 +1,4 @@
 import { MethodParameters } from '../../utils/action';
-export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: number, minShares: number) => MethodParameters;
-export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: number, minOut: number) => MethodParameters;
+export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: bigint, minShares: number) => MethodParameters;
+export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: bigint, minOut: number) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

package/dist/types/services/margin-accounts/index.d.ts

@@ -1,5 +1,7 @@
 export * from './types';
 export * from './account';
 export * from './deposit';
+export * from './simulateDeposit';
+export * from './simulateWithdraw';
 export * from './withdraw';
 //# sourceMappingURL=index.d.ts.map

package/dist/types/services/margin-accounts/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,YAAY,CAAC"}

package/dist/types/services/margin-accounts/simulateDeposit.d.ts

@@ -0,0 +1,3 @@
+import { SimulateDepositParams, SimulateDepositResult } from './types';
+export declare const simulateDeposit: (params: SimulateDepositParams) => Promise<SimulateDepositResult>;
+//# sourceMappingURL=simulateDeposit.d.ts.map

package/dist/types/services/margin-accounts/simulateDeposit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simulateDeposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/simulateDeposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAiBvE,eAAO,MAAM,eAAe,WAElB,qBAAqB,KAC5B,QAAQ,qBAAqB,CAS/B,CAAC"}

package/dist/types/services/margin-accounts/simulateWithdraw.d.ts

@@ -0,0 +1,3 @@
+import { SimulateWithdrawParams, SimulateWithdrawResult } from './types';
+export declare const simulateWithdraw: (params: SimulateWithdrawParams) => Promise<SimulateWithdrawResult>;
+//# sourceMappingURL=simulateWithdraw.d.ts.map

package/dist/types/services/margin-accounts/simulateWithdraw.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simulateWithdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/simulateWithdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAiBzE,eAAO,MAAM,gBAAgB,WAEnB,sBAAsB,KAC7B,QAAQ,sBAAsB,CAShC,CAAC"}

package/dist/types/services/margin-accounts/types.d.ts

@@ -9,7 +9,7 @@ export type CreateAccountResult = {
 export type DepositParams = {
     signer: Signer | JsonRpcSigner;
     accountId: number;
-    token: string;
+    tokenAddress: string;
     amount: number;
 };
 export type DepositResult = {
@@ -18,10 +18,32 @@ export type DepositResult = {
 export type WithdrawParams = {
     signer: Signer | JsonRpcSigner;
     accountId: number;
-    token: string;
+    tokenAddress: string;
     amount: number;
 };
 export type WithdrawResult = {
     transactionHash: string | null;
 };
+export type SimulateDepositResult = {
+    bridgeGasFees: number;
+    marginRatioHealth: 'danger' | 'healthy' | 'warning';
+    marginRatio: number;
+};
+export type SimulateDepositParams = {
+    signer: Signer | JsonRpcSigner;
+    accountId: number;
+    tokenAddress: string;
+    amount: number;
+};
+export type SimulateWithdrawResult = {
+    bridgeGasFees: number;
+    marginRatioHealth: 'danger' | 'healthy' | 'warning';
+    marginRatio: number;
+};
+export type SimulateWithdrawParams = {
+    signer: Signer | JsonRpcSigner;
+    accountId: number;
+    tokenAddress: string;
+    amount: number;
+};
 //# sourceMappingURL=types.d.ts.map

package/dist/types/services/margin-accounts/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,mBAAmB,GAAG;IAChC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,mBAAmB,GAAG;IAChC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAC1B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IACpD,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAGF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,MAAM,CAAC;IACtB,iBAAiB,EAAE,QAAQ,GAAG,SAAS,GAAG,SAAS,CAAC;IACpD,WAAW,EAAE,MAAM,CAAC;CACrB,CAAC;AAGF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}

package/dist/types/utils/lp.d.ts

@@ -1,4 +1,4 @@
 export declare function calculateMinSharesForLp(lpAmount: number): number;
 export declare function calculateMinOutForLp(sharesAmount: number): number;
-export declare function expandLpAmount(amount: number): number;
+export declare function expandLpAmount(amount: number, decimals: number): bigint;
 //# sourceMappingURL=lp.d.ts.map

package/dist/types/utils/lp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lp.d.ts","sourceRoot":"/","sources":["utils/lp.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOhE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAOjE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAMrD"}
+{"version":3,"file":"lp.d.ts","sourceRoot":"/","sources":["utils/lp.ts"],"names":[],"mappings":"AAEA,wBAAgB,uBAAuB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOhE;AAED,wBAAgB,oBAAoB,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAOjE;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAOvE"}

package/dist/utils/lp.js

@@ -19,10 +19,11 @@ function calculateMinOutForLp(sharesAmount) {
     return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed
 }
 exports.calculateMinOutForLp = calculateMinOutForLp;
-function expandLpAmount(amount) {
-    var decimalFactor = (0, bignumber_js_1.default)('1000000'); // 10^6
-    var amountDenormalised = (0, bignumber_js_1.default)(amount).times(decimalFactor).toFixed(0);
-    return Number(amountDenormalised);
+function expandLpAmount(amount, decimals) {
+    var decimalFactor = BigInt(Math.pow(10, decimals));
+    var amountBigInt = BigInt(amount);
+    var amountDenormalised = amountBigInt * decimalFactor;
+    return amountDenormalised;
 }
 exports.expandLpAmount = expandLpAmount;
 //# sourceMappingURL=lp.js.map

package/dist/utils/lp.js.map

@@ -1 +1 @@
-{"version":3,"file":"lp.js","sourceRoot":"/","sources":["utils/lp.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,uBAAuB,CAAC,QAAgB;IACtD,IAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,QAAQ,CAAC,CAAC;IAEnC,2DAA2D;IAC3D,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,6CAA6C;AAClG,CAAC;AAPD,0DAOC;AAED,SAAgB,oBAAoB,CAAC,YAAoB;IACvD,IAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,CAAC;IAEvC,6DAA6D;IAC7D,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,6CAA6C;AAClG,CAAC;AAPD,oDAOC;AAED,SAAgB,cAAc,CAAC,MAAc;IAC3C,IAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,OAAO;IAEnD,IAAM,kBAAkB,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAE7E,OAAO,MAAM,CAAC,kBAAkB,CAAC,CAAC;AACpC,CAAC;AAND,wCAMC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculateMinSharesForLp(lpAmount: number): number {\n  const amount = BigNumber(lpAmount);\n\n  // Calculate 1% // @todo update this number once we have it\n  const offset = amount.times(0.99);\n\n  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed\n}\n\nexport function calculateMinOutForLp(sharesAmount: number): number {\n  const amount = BigNumber(sharesAmount);\n\n  // Calculate 1% // @todo update once we have the exact number\n  const offset = amount.times(0.99);\n\n  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed\n}\n\nexport function expandLpAmount(amount: number): number {\n  const decimalFactor = BigNumber('1000000'); // 10^6\n\n  const amountDenormalised = BigNumber(amount).times(decimalFactor).toFixed(0);\n\n  return Number(amountDenormalised);\n}\n"]}
+{"version":3,"file":"lp.js","sourceRoot":"/","sources":["utils/lp.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,uBAAuB,CAAC,QAAgB;IACtD,IAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,QAAQ,CAAC,CAAC;IAEnC,2DAA2D;IAC3D,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,6CAA6C;AAClG,CAAC;AAPD,0DAOC;AAED,SAAgB,oBAAoB,CAAC,YAAoB;IACvD,IAAM,MAAM,GAAG,IAAA,sBAAS,EAAC,YAAY,CAAC,CAAC;IAEvC,6DAA6D;IAC7D,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAElC,OAAO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,6CAA6C;AAClG,CAAC;AAPD,oDAOC;AAED,SAAgB,cAAc,CAAC,MAAc,EAAE,QAAgB;IAC7D,IAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;IACrD,IAAM,YAAY,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAEpC,IAAM,kBAAkB,GAAG,YAAY,GAAG,aAAa,CAAC;IAExD,OAAO,kBAAkB,CAAC;AAC5B,CAAC;AAPD,wCAOC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculateMinSharesForLp(lpAmount: number): number {\n  const amount = BigNumber(lpAmount);\n\n  // Calculate 1% // @todo update this number once we have it\n  const offset = amount.times(0.99);\n\n  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed\n}\n\nexport function calculateMinOutForLp(sharesAmount: number): number {\n  const amount = BigNumber(sharesAmount);\n\n  // Calculate 1% // @todo update once we have the exact number\n  const offset = amount.times(0.99);\n\n  return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed\n}\n\nexport function expandLpAmount(amount: number, decimals: number): bigint {\n  const decimalFactor = BigInt(Math.pow(10, decimals));\n  const amountBigInt = BigInt(amount);\n\n  const amountDenormalised = amountBigInt * decimalFactor;\n\n  return amountDenormalised;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -33,5 +33,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "8366d7bf84f63fb9f04b2c357549fed142f52cb6"
+  "gitHead": "9f2ff5ef64beccf41401f5805b3b1114865350c3"
 }

package/src/services/lp/encode.ts

@@ -13,7 +13,7 @@ const removeLiquidityabi = [
 export const encodeProvideLiquidityCall = (
   poolId: number,
   accountOwner: string,
-  amount: number,
+  amount: bigint,
   minShares: number,
 ): MethodParameters => {
   const functionSignature = 'addLiquidity';
@@ -25,7 +25,7 @@ export const encodeProvideLiquidityCall = (
 
 export const encodeRemoveLiquidityCall = (
   poolId: number,
-  sharesAmount: number,
+  sharesAmount: bigint,
   minOut: number,
 ): MethodParameters => {
   const functionSignature = 'removeLiquidity';

package/src/services/lp/lp.ts

@@ -29,7 +29,7 @@ export const provideLiquidity = async (
     throw new Error('LP amount can not be 0');
   }
 
-  const amount = expandLpAmount(params.amount);
+  const amount = expandLpAmount(params.amount, 6);
 
   const { calldata: data, value } = encodeProvideLiquidityCall(
     params.poolId,
@@ -63,7 +63,7 @@ export const removeLiquidity = async (
 
   const minOut = calculateMinOutForLp(params.sharesAmount);
 
-  const amount = expandLpAmount(params.sharesAmount);
+  const amount = expandLpAmount(params.sharesAmount, 30); // shares have 30 decimals
   const { calldata: data, value } = encodeRemoveLiquidityCall(
     params.poolId,
     amount,

package/src/services/margin-accounts/deposit.ts

@@ -7,13 +7,13 @@ import { getTokenDetails, scale } from '../token/common';
 export const deposit = async (
   params: DepositParams,
 ): Promise<DepositResult> => {
-  const { tokenDecimals } = getTokenDetails(params.token);
+  const { tokenDecimals } = getTokenDetails(params.tokenAddress);
   const amount = scale(tokenDecimals)(params.amount);
   const marketId = 0;
   const exchangeId = 0;
   const { calldata: data, value } = encodeDeposit(
     params.accountId,
-    params.token,
+    params.tokenAddress,
     amount,
     marketId,
     exchangeId,

package/src/services/margin-accounts/index.ts

@@ -1,4 +1,6 @@
 export * from './types';
 export * from './account';
 export * from './deposit';
+export * from './simulateDeposit';
+export * from './simulateWithdraw';
 export * from './withdraw';

package/src/services/margin-accounts/simulateDeposit.ts

@@ -0,0 +1,30 @@
+import { SimulateDepositParams, SimulateDepositResult } from './types';
+
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min: number, max: number) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1) + min);
+}
+
+const randomSimulation = (): SimulateDepositResult => {
+  return {
+    bridgeGasFees: getRandomIntInclusive(1000, 100000),
+    marginRatio: getRandomIntInclusive(1, 100),
+    marginRatioHealth: 'danger',
+  };
+};
+
+export const simulateDeposit = async (
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  params: SimulateDepositParams,
+): Promise<SimulateDepositResult> => {
+  return await new Promise((resolve) => {
+    setTimeout(
+      () => {
+        resolve(randomSimulation());
+      },
+      Math.random() * 100 + 1000,
+    );
+  });
+};

package/src/services/margin-accounts/simulateWithdraw.ts

@@ -0,0 +1,30 @@
+import { SimulateWithdrawParams, SimulateWithdrawResult } from './types';
+
+// The maximum is inclusive and the minimum is inclusive
+function getRandomIntInclusive(min: number, max: number) {
+  min = Math.ceil(min);
+  max = Math.floor(max);
+  return Math.floor(Math.random() * (max - min + 1) + min);
+}
+
+const randomSimulation = (): SimulateWithdrawResult => {
+  return {
+    bridgeGasFees: getRandomIntInclusive(1000, 100000),
+    marginRatio: getRandomIntInclusive(1, 100),
+    marginRatioHealth: 'danger',
+  };
+};
+
+export const simulateWithdraw = async (
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  params: SimulateWithdrawParams,
+): Promise<SimulateWithdrawResult> => {
+  return await new Promise((resolve) => {
+    setTimeout(
+      () => {
+        resolve(randomSimulation());
+      },
+      Math.random() * 100 + 1000,
+    );
+  });
+};

package/src/services/margin-accounts/types.ts

@@ -12,7 +12,7 @@ export type CreateAccountResult = {
 export type DepositParams = {
   signer: Signer | JsonRpcSigner;
   accountId: number;
-  token: string;
+  tokenAddress: string;
   amount: number;
 };
 
@@ -23,10 +23,38 @@ export type DepositResult = {
 export type WithdrawParams = {
   signer: Signer | JsonRpcSigner;
   accountId: number;
-  token: string;
+  tokenAddress: string;
   amount: number;
 };
 
 export type WithdrawResult = {
   transactionHash: string | null;
 };
+
+export type SimulateDepositResult = {
+  bridgeGasFees: number;
+  marginRatioHealth: 'danger' | 'healthy' | 'warning'; // MarginAccountEntity['marginRatioPercentage'];
+  marginRatio: number; // MarginAccountEntity['marginRatioHealth'];
+};
+
+// TODO: Milan reevaluate these params
+export type SimulateDepositParams = {
+  signer: Signer | JsonRpcSigner;
+  accountId: number;
+  tokenAddress: string;
+  amount: number;
+};
+
+export type SimulateWithdrawResult = {
+  bridgeGasFees: number;
+  marginRatioHealth: 'danger' | 'healthy' | 'warning'; // MarginAccountEntity['marginRatioPercentage'];
+  marginRatio: number; // MarginAccountEntity['marginRatioHealth'];
+};
+
+// TODO: Milan reevaluate these params
+export type SimulateWithdrawParams = {
+  signer: Signer | JsonRpcSigner;
+  accountId: number;
+  tokenAddress: string;
+  amount: number;
+};

package/src/services/margin-accounts/withdraw.ts

@@ -7,14 +7,14 @@ import { getTokenDetails, scale } from '../token/common';
 export const withdraw = async (
   params: WithdrawParams,
 ): Promise<WithdrawResult> => {
-  const { tokenDecimals } = getTokenDetails(params.token);
+  const { tokenDecimals } = getTokenDetails(params.tokenAddress);
   const amount = scale(tokenDecimals)(params.amount);
 
   const marketId = 0;
   const exchangeId = 0;
   const { calldata: data, value } = encodeWithdraw(
     params.accountId,
-    params.token,
+    params.tokenAddress,
     BigInt(amount),
     marketId,
     exchangeId,

package/src/utils/lp.ts

@@ -18,10 +18,11 @@ export function calculateMinOutForLp(sharesAmount: number): number {
   return amount.minus(offset).times(1e6).toNumber(); // rUSD/USDC has 6 decimals, change if needed
 }
 
-export function expandLpAmount(amount: number): number {
-  const decimalFactor = BigNumber('1000000'); // 10^6
+export function expandLpAmount(amount: number, decimals: number): bigint {
+  const decimalFactor = BigInt(Math.pow(10, decimals));
+  const amountBigInt = BigInt(amount);
 
-  const amountDenormalised = BigNumber(amount).times(decimalFactor).toFixed(0);
+  const amountDenormalised = amountBigInt * decimalFactor;
 
-  return Number(amountDenormalised);
+  return amountDenormalised;
 }