@reyaxyz/sdk 0.11.0 → 0.13.0

package/dist/services/lp/lp.js

@@ -58,7 +58,7 @@ var provideLiquidity = function (params) { return __awaiter(void 0, void 0, void
                     throw new Error('LP amount can not be 0');
                 }
                 amount = (0, lp_1.expandLpAmount)(params.amount, 6);
-                _a = (0, encode_1.encodeProvideLiquidityCall)(params.poolId, ownerAddrees, amount, minShares), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeProvideLiquidityCall)(params.lpPoolId, 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:
                 result = _c.sent();
@@ -78,12 +78,12 @@ var removeLiquidity = function (params) { return __awaiter(void 0, void 0, void
             case 1:
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                if (params.sharesAmount === 0) {
+                if (params.amount === 0) {
                     throw new Error('Shares amount can not be 0');
                 }
-                minOut = (0, lp_1.calculateMinOutForLp)(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;
+                minOut = (0, lp_1.calculateMinOutForLp)(params.amount);
+                amount = (0, lp_1.expandLpAmount)(params.amount, 30);
+                _a = (0, encode_1.encodeRemoveLiquidityCall)(params.lpPoolId, 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:
                 result = _c.sent();

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,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"]}
+{"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,QAAQ,EACf,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,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEK,MAAM,GAAG,IAAA,yBAAoB,EAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,MAAM,GAAG,IAAA,mBAAc,EAAC,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;gBAC3C,KAA4B,IAAA,kCAAyB,EACzD,MAAM,CAAC,QAAQ,EACf,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.lpPoolId,\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.amount === 0) {\n    throw new Error('Shares amount can not be 0');\n  }\n\n  const minOut = calculateMinOutForLp(params.amount);\n\n  const amount = expandLpAmount(params.amount, 30); // shares have 30 decimals\n  const { calldata: data, value } = encodeRemoveLiquidityCall(\n    params.lpPoolId,\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/lp/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport type ProvideLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n  poolId: number;\n};\n\nexport type RemoveLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  poolId: number;\n  sharesAmount: number;\n};\n\nexport type ProvideLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n  transactionHash: string | null;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { LpPoolEntity } from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n  lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n  transactionHash: string | null;\n};\n"]}

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

@@ -51,7 +51,7 @@ var deposit = function (params) { return __awaiter(void 0, void 0, void 0, funct
                 amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 marketId = 0;
                 exchangeId = 0;
-                _a = (0, encode_1.encodeDeposit)(params.accountId, params.tokenAddress, amount, marketId, exchangeId), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeDeposit)(params.marginAccountId, 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,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"]}
+{"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,eAAe,EACtB,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.marginAccountId,\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/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  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"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/margin-accounts/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { MarginAccountEntity, TokenEntity } from '@reyaxyz/common';\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  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type DepositResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type WithdrawResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateDepositResult = {\n  bridgeGasFees: number;\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateDepositParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n\nexport type SimulateWithdrawResult = {\n  bridgeGasFees: number;\n\n  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];\n  marginRatio: MarginAccountEntity['marginRatioPercentage'];\n};\n\n// TODO: Milan reevaluate these params\nexport type SimulateWithdrawParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  tokenAddress: TokenEntity['address'];\n  amount: number;\n};\n"]}

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

@@ -51,7 +51,7 @@ var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, func
                 amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 marketId = 0;
                 exchangeId = 0;
-                _a = (0, encode_1.encodeWithdraw)(params.accountId, params.tokenAddress, BigInt(amount), marketId, exchangeId), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeWithdraw)(params.marginAccountId, 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,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"]}
+{"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,eAAe,EACtB,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.marginAccountId,\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/services/money-flows/getAllowedChainsForMoneyInOut.js

@@ -1,23 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAllowedChainsForMoneyInOut = void 0;
-var getAllowedChainsForMoneyInOut = function (_a) {
-    var 
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    destinationChainId = _a.destinationChainId;
-    // todo: implement
-    return {
-        sourceChains: [
-            {
-                chainId: 11155111,
-                tokens: {
-                    '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238': {
-                        vaultAddress: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
-                    },
-                },
-            },
-        ],
-    };
+var common_1 = require("@reyaxyz/common");
+var getAllowedChainsForMoneyInOut = function (params) {
+    return (0, common_1.getAllowedChainsForMoneyInOut)(params);
 };
 exports.getAllowedChainsForMoneyInOut = getAllowedChainsForMoneyInOut;
 //# sourceMappingURL=getAllowedChainsForMoneyInOut.js.map

package/dist/services/money-flows/getAllowedChainsForMoneyInOut.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAllowedChainsForMoneyInOut.js","sourceRoot":"/","sources":["services/money-flows/getAllowedChainsForMoneyInOut.ts"],"names":[],"mappings":";;;AAKO,IAAM,6BAA6B,GAAG,UAAC,EAGR;;IAFpC,6DAA6D;IAC7D,kBAAkB,wBAAA;IAElB,kBAAkB;IAClB,OAAO;QACL,YAAY,EAAE;YACZ;gBACE,OAAO,EAAE,QAAQ;gBACjB,MAAM,EAAE;oBACN,4CAA4C,EAAE;wBAC5C,YAAY,EAAE,4CAA4C;qBAC3D;iBACF;aACF;SACF;KACF,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,6BAA6B,iCAiBxC","sourcesContent":["import {\n  GetAllowedChainsForMoneyInOutParams,\n  GetAllowedChainsForMoneyInOutResult,\n} from './types';\n\nexport const getAllowedChainsForMoneyInOut = ({\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  destinationChainId,\n}: GetAllowedChainsForMoneyInOutParams): GetAllowedChainsForMoneyInOutResult => {\n  // todo: implement\n  return {\n    sourceChains: [\n      {\n        chainId: 11155111,\n        tokens: {\n          '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238': {\n            vaultAddress: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',\n          },\n        },\n      },\n    ],\n  };\n};\n"]}
+{"version":3,"file":"getAllowedChainsForMoneyInOut.js","sourceRoot":"/","sources":["services/money-flows/getAllowedChainsForMoneyInOut.ts"],"names":[],"mappings":";;;AAIA,0CAAuG;AAEhG,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;IAE3C,OAAO,IAAA,sCAAmC,EAAC,MAAM,CAAC,CAAC;AACrD,CAAC,CAAC;AAJW,QAAA,6BAA6B,iCAIxC","sourcesContent":["import {\n  GetAllowedChainsForMoneyInOutParams,\n  GetAllowedChainsForMoneyInOutResult,\n} from './types';\nimport { getAllowedChainsForMoneyInOut as getAllowedChainsForMoneyInOutCommon } from '@reyaxyz/common';\n\nexport const getAllowedChainsForMoneyInOut = (\n  params: GetAllowedChainsForMoneyInOutParams,\n): GetAllowedChainsForMoneyInOutResult => {\n  return getAllowedChainsForMoneyInOutCommon(params);\n};\n"]}

package/dist/services/money-flows/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/money-flows/types.ts"],"names":[],"mappings":"","sourcesContent":["export type GetAllowedChainsForMoneyInOutParams = {\n  destinationChainId: number;\n};\n\nexport type GetAllowedChainsForMoneyInOutResult = {\n  sourceChains: {\n    chainId: number;\n    tokens: {\n      [tokenAddress: string]: {\n        vaultAddress: string;\n      };\n    };\n  }[];\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/money-flows/types.ts"],"names":[],"mappings":"","sourcesContent":["import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';\n\nexport type GetAllowedChainsForMoneyInOutParams = {\n  destinationChainId: ReyaChainId;\n};\n\nexport type GetAllowedChainsForMoneyInOutResult = MoneyInOutChainId[];\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\n\nexport type MarketParams = {\n  id: number;\n  exchangeId: number;\n  counterpartyAccountIds: number[];\n  currentPrice: number;\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  orderSize: number;\n  market: MarketParams;\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: number;\n  orderBase: number; // PositionEntity[base]\n  market: MarketParams;\n};\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n};\n\nexport type CloseOrderResult = {\n  transactionHash: string | null;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"","sourcesContent":["import { Signer, JsonRpcSigner } from 'ethers';\nimport {\n  MarginAccountEntity,\n  MarketEntity,\n  PositionEntity,\n} from '@reyaxyz/common';\n\nexport type MarketParams = {\n  id: MarketEntity['id'];\n  exchangeId: MarketEntity['orderInfo']['exchangeId'];\n  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];\n  currentPrice: number;\n};\n\nexport type MatchOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  orderSize: number;\n  market: MarketParams;\n};\n\nexport type CloseOrderParams = {\n  signer: Signer | JsonRpcSigner;\n  marginAccountId: MarginAccountEntity['id'];\n  orderBase: PositionEntity['base'];\n  market: MarketParams;\n};\n\nexport type MatchOrderResult = {\n  transactionHash: string | null;\n};\n\nexport type CloseOrderResult = {\n  transactionHash: string | null;\n};\n"]}

package/dist/services/token/approve.js

@@ -47,7 +47,7 @@ var approveTokenSpending = function (params) { return __awaiter(void 0, void 0,
     return __generator(this, function (_d) {
         switch (_d.label) {
             case 0:
-                underLyingTokenAddress = params.token;
+                underLyingTokenAddress = params.tokenAddress;
                 return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
             case 1:
                 network = _d.sent();

package/dist/services/token/approve.js.map

@@ -1 +1 @@
-{"version":3,"file":"approve.js","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,mCAAoE;AACpE,mEAA2D;AAEpD,IAAM,oBAAoB,GAAG,UAClC,MAA0B;;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,KAAK,CAAC;gBAE5B,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;gBAEnC,aAAa,GAAG,IAAA,8BAAqB,EACzC,sBAAsB,EACtB,MAAM,CAAC,MAAM,CACd,CAAC;gBAEI,oBAAoB,GACxB,MAAM,CAAC,IAAI,KAAK,oBAAY,CAAC,OAAO;oBAClC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC;oBACnC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBAG1C,YAAY,GAAG,MAAM,CACzB,gFAAgF,CACjF,CAAC;gBAE0B,qBAAM,aAAa;yBAC5C,OAAO,CAAC,oBAAoB,EAAE,YAAY,CAAC;yBAC3C,KAAK,CAAC,UAAC,KAAK;wBACX,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBAC/C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBACpD,CAAC,CAAC,EAAA;;gBANE,mBAAmB,GAAG,SAMxB;;;;gBAGF,qBAAM,mBAAmB,CAAC,IAAI,EAAE,EAAA;;gBAAhC,SAAgC,CAAC;;;;gBAEjC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;;;gBAI5B,KAAA,0BAAiB,CAAA;;gBACb,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;oBAD1C,qBAAM,mBACX,gBAAa,GAAE,SAAgC;wBAC/C,eAAY,GAAE,sBAAsB;wBACpC,iBAAc,GAAE,oBAAoB;wBACpC,UAAO,GAAE,MAAM,CAAC,MAAM;6BACtB,EAAA;oBALF,sBAAO,SAKL,EAAC;;;gBAEH,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;;qBAG5C,sBAAO,CAAC,EAAC;;;KACV,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B","sourcesContent":["import { ApprovalType, ApproveTokenParams } from './types';\nimport { getERC20Allowance, getERC20TokenContract } from './common';\nimport { getAddress } from '../../utils/contractAddresses';\n\nexport const approveTokenSpending = async (\n  params: ApproveTokenParams,\n): Promise<number> => {\n  const underLyingTokenAddress = params.token;\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const tokenContract = getERC20TokenContract(\n    underLyingTokenAddress,\n    params.signer,\n  );\n\n  const contractProxyAddress =\n    params.type === ApprovalType.DEPOSIT\n      ? getAddress(chainId, 'core_proxy')\n      : getAddress(chainId, 'passive_pool_proxy');\n\n  // @todo validate if maxAllowance should be passed from UI\n  const maxUint256Bn = BigInt(\n    '115792089237316195423570985008687907853269984665640564039457584007913129639935',\n  );\n\n  const approvalTransaction = await tokenContract\n    .approve(contractProxyAddress, maxUint256Bn)\n    .catch((error) => {\n      console.warn('Transaction Confirmation Error');\n      console.error(error);\n      throw new Error('Transaction Confirmation Error');\n    });\n\n  try {\n    await approvalTransaction.wait();\n  } catch (error) {\n    console.warn('Token approval failed');\n    throw new Error('Token approval failed');\n  }\n\n  try {\n    return await getERC20Allowance({\n      walletAddress: await params.signer.getAddress(),\n      tokenAddress: underLyingTokenAddress,\n      spenderAddress: contractProxyAddress,\n      subject: params.signer,\n    });\n  } catch (error) {\n    console.warn('Fetching allowance failed');\n  }\n\n  return 0;\n};\n"]}
+{"version":3,"file":"approve.js","sourceRoot":"/","sources":["services/token/approve.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,mCAAoE;AACpE,mEAA2D;AAEpD,IAAM,oBAAoB,GAAG,UAClC,MAA0B;;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEnC,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;gBAEnC,aAAa,GAAG,IAAA,8BAAqB,EACzC,sBAAsB,EACtB,MAAM,CAAC,MAAM,CACd,CAAC;gBAEI,oBAAoB,GACxB,MAAM,CAAC,IAAI,KAAK,oBAAY,CAAC,OAAO;oBAClC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC;oBACnC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBAG1C,YAAY,GAAG,MAAM,CACzB,gFAAgF,CACjF,CAAC;gBAE0B,qBAAM,aAAa;yBAC5C,OAAO,CAAC,oBAAoB,EAAE,YAAY,CAAC;yBAC3C,KAAK,CAAC,UAAC,KAAK;wBACX,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;wBAC/C,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;wBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;oBACpD,CAAC,CAAC,EAAA;;gBANE,mBAAmB,GAAG,SAMxB;;;;gBAGF,qBAAM,mBAAmB,CAAC,IAAI,EAAE,EAAA;;gBAAhC,SAAgC,CAAC;;;;gBAEjC,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBACtC,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;;;gBAI5B,KAAA,0BAAiB,CAAA;;gBACb,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;oBAD1C,qBAAM,mBACX,gBAAa,GAAE,SAAgC;wBAC/C,eAAY,GAAE,sBAAsB;wBACpC,iBAAc,GAAE,oBAAoB;wBACpC,UAAO,GAAE,MAAM,CAAC,MAAM;6BACtB,EAAA;oBALF,sBAAO,SAKL,EAAC;;;gBAEH,OAAO,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;;qBAG5C,sBAAO,CAAC,EAAC;;;KACV,CAAC;AAlDW,QAAA,oBAAoB,wBAkD/B","sourcesContent":["import { ApprovalType, ApproveTokenParams } from './types';\nimport { getERC20Allowance, getERC20TokenContract } from './common';\nimport { getAddress } from '../../utils/contractAddresses';\n\nexport const approveTokenSpending = async (\n  params: ApproveTokenParams,\n): Promise<number> => {\n  const underLyingTokenAddress = params.tokenAddress;\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const tokenContract = getERC20TokenContract(\n    underLyingTokenAddress,\n    params.signer,\n  );\n\n  const contractProxyAddress =\n    params.type === ApprovalType.DEPOSIT\n      ? getAddress(chainId, 'core_proxy')\n      : getAddress(chainId, 'passive_pool_proxy');\n\n  // @todo validate if maxAllowance should be passed from UI\n  const maxUint256Bn = BigInt(\n    '115792089237316195423570985008687907853269984665640564039457584007913129639935',\n  );\n\n  const approvalTransaction = await tokenContract\n    .approve(contractProxyAddress, maxUint256Bn)\n    .catch((error) => {\n      console.warn('Transaction Confirmation Error');\n      console.error(error);\n      throw new Error('Transaction Confirmation Error');\n    });\n\n  try {\n    await approvalTransaction.wait();\n  } catch (error) {\n    console.warn('Token approval failed');\n    throw new Error('Token approval failed');\n  }\n\n  try {\n    return await getERC20Allowance({\n      walletAddress: await params.signer.getAddress(),\n      tokenAddress: underLyingTokenAddress,\n      spenderAddress: contractProxyAddress,\n      subject: params.signer,\n    });\n  } catch (error) {\n    console.warn('Fetching allowance failed');\n  }\n\n  return 0;\n};\n"]}

package/dist/services/token/getAllowance.js

@@ -46,7 +46,7 @@ var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0,
     return __generator(this, function (_b) {
         switch (_b.label) {
             case 0:
-                underLyingTokenAddress = params.token;
+                underLyingTokenAddress = params.tokenAddress;
                 return [4 /*yield*/, ((_a = params.signer.provider) === null || _a === void 0 ? void 0 : _a.getNetwork())];
             case 1:
                 network = _b.sent();

package/dist/services/token/getAllowance.js.map

@@ -1 +1 @@
-{"version":3,"file":"getAllowance.js","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,mCAA6C;AAC7C,mEAA2D;AAEpD,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,KAAK,CAAC;gBAE5B,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;gBAEnC,oBAAoB,GACxB,MAAM,CAAC,IAAI,KAAK,oBAAY,CAAC,OAAO;oBAClC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC;oBACnC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBAClB,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAAxD,aAAa,GAAW,SAAgC;gBAE5C,qBAAM,IAAA,0BAAiB,EAAC;wBACxC,aAAa,eAAA;wBACb,YAAY,EAAE,sBAAsB;wBACpC,cAAc,EAAE,oBAAoB;wBACpC,OAAO,EAAE,MAAM,CAAC,MAAM;qBACvB,CAAC,EAAA;;gBALI,SAAS,GAAG,SAKhB;gBAEF,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAtBW,QAAA,YAAY,gBAsBvB","sourcesContent":["import { ApprovalType, GetAllowanceParams } from './types';\nimport { getERC20Allowance } from './common';\nimport { getAddress } from '../../utils/contractAddresses';\n\nexport const getAllowance = async (\n  params: GetAllowanceParams,\n): Promise<number> => {\n  const underLyingTokenAddress = params.token;\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const contractProxyAddress =\n    params.type === ApprovalType.DEPOSIT\n      ? getAddress(chainId, 'core_proxy')\n      : getAddress(chainId, 'passive_pool_proxy');\n  const walletAddress: string = await params.signer.getAddress();\n\n  const allowance = await getERC20Allowance({\n    walletAddress,\n    tokenAddress: underLyingTokenAddress,\n    spenderAddress: contractProxyAddress,\n    subject: params.signer,\n  });\n\n  return allowance;\n};\n"]}
+{"version":3,"file":"getAllowance.js","sourceRoot":"/","sources":["services/token/getAllowance.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,iCAA2D;AAC3D,mCAA6C;AAC7C,mEAA2D;AAEpD,IAAM,YAAY,GAAG,UAC1B,MAA0B;;;;;;gBAEpB,sBAAsB,GAAG,MAAM,CAAC,YAAY,CAAC;gBAEnC,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;gBAEnC,oBAAoB,GACxB,MAAM,CAAC,IAAI,KAAK,oBAAY,CAAC,OAAO;oBAClC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,YAAY,CAAC;oBACnC,CAAC,CAAC,IAAA,8BAAU,EAAC,OAAO,EAAE,oBAAoB,CAAC,CAAC;gBAClB,qBAAM,MAAM,CAAC,MAAM,CAAC,UAAU,EAAE,EAAA;;gBAAxD,aAAa,GAAW,SAAgC;gBAE5C,qBAAM,IAAA,0BAAiB,EAAC;wBACxC,aAAa,eAAA;wBACb,YAAY,EAAE,sBAAsB;wBACpC,cAAc,EAAE,oBAAoB;wBACpC,OAAO,EAAE,MAAM,CAAC,MAAM;qBACvB,CAAC,EAAA;;gBALI,SAAS,GAAG,SAKhB;gBAEF,sBAAO,SAAS,EAAC;;;KAClB,CAAC;AAtBW,QAAA,YAAY,gBAsBvB","sourcesContent":["import { ApprovalType, GetAllowanceParams } from './types';\nimport { getERC20Allowance } from './common';\nimport { getAddress } from '../../utils/contractAddresses';\n\nexport const getAllowance = async (\n  params: GetAllowanceParams,\n): Promise<number> => {\n  const underLyingTokenAddress = params.tokenAddress;\n\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const contractProxyAddress =\n    params.type === ApprovalType.DEPOSIT\n      ? getAddress(chainId, 'core_proxy')\n      : getAddress(chainId, 'passive_pool_proxy');\n  const walletAddress: string = await params.signer.getAddress();\n\n  const allowance = await getERC20Allowance({\n    walletAddress,\n    tokenAddress: underLyingTokenAddress,\n    spenderAddress: contractProxyAddress,\n    subject: params.signer,\n  });\n\n  return allowance;\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAEA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;AACT,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\n\nexport enum ApprovalType {\n  LP,\n  DEPOSIT,\n}\n\nexport type ApproveTokenParams = {\n  signer: Signer | JsonRpcSigner;\n  token: string; // token address\n  type: ApprovalType;\n};\n\nexport type GetAllowanceParams = {\n  signer: Signer | JsonRpcSigner;\n  token: string; //  token address\n  type: ApprovalType;\n};\n\nexport type GetERC20AllowanceParams = {\n  walletAddress: string;\n  tokenAddress: string; // LP POOL entity tokean address\n  spenderAddress: string;\n  subject: Signer;\n};\n\nexport type GetBalanceParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: string;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,YAGX;AAHD,WAAY,YAAY;IACtB,2CAAE,CAAA;IACF,qDAAO,CAAA;AACT,CAAC,EAHW,YAAY,4BAAZ,YAAY,QAGvB","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport { LpPoolEntity, TokenEntity } from '@reyaxyz/common';\n\nexport enum ApprovalType {\n  LP,\n  DEPOSIT,\n}\n\nexport type ApproveTokenParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n  type: ApprovalType;\n};\n\nexport type GetAllowanceParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n  type: ApprovalType;\n};\n\nexport type GetERC20AllowanceParams = {\n  walletAddress: string;\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  spenderAddress: string;\n  subject: Signer;\n};\n\nexport type GetBalanceParams = {\n  signer: Signer | JsonRpcSigner;\n  tokenAddress: TokenEntity['address'];\n};\n"]}

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

@@ -1,13 +1,14 @@
 import { JsonRpcSigner, Signer } from 'ethers';
+import { LpPoolEntity } from '@reyaxyz/common';
 export type ProvideLiquidityParams = {
     signer: Signer | JsonRpcSigner;
     amount: number;
-    poolId: number;
+    lpPoolId: LpPoolEntity['id'];
 };
 export type RemoveLiquidityParams = {
     signer: Signer | JsonRpcSigner;
-    poolId: number;
-    sharesAmount: number;
+    lpPoolId: LpPoolEntity['id'];
+    amount: number;
 };
 export type ProvideLiquidityResult = {
     transactionHash: string | null;

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE/C,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;CAC9B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,QAAQ,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

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

@@ -1,4 +1,5 @@
 import { JsonRpcSigner, Signer } from 'ethers';
+import { MarginAccountEntity, TokenEntity } from '@reyaxyz/common';
 export type CreateAccountParams = {
     signer: Signer | JsonRpcSigner;
     ownerAddress: string;
@@ -8,8 +9,8 @@ export type CreateAccountResult = {
 };
 export type DepositParams = {
     signer: Signer | JsonRpcSigner;
-    accountId: number;
-    tokenAddress: string;
+    marginAccountId: MarginAccountEntity['id'];
+    tokenAddress: TokenEntity['address'];
     amount: number;
 };
 export type DepositResult = {
@@ -17,8 +18,8 @@ export type DepositResult = {
 };
 export type WithdrawParams = {
     signer: Signer | JsonRpcSigner;
-    accountId: number;
-    tokenAddress: string;
+    marginAccountId: MarginAccountEntity['id'];
+    tokenAddress: TokenEntity['address'];
     amount: number;
 };
 export type WithdrawResult = {
@@ -26,24 +27,24 @@ export type WithdrawResult = {
 };
 export type SimulateDepositResult = {
     bridgeGasFees: number;
-    marginRatioHealth: 'danger' | 'healthy' | 'warning';
-    marginRatio: number;
+    marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+    marginRatio: MarginAccountEntity['marginRatioPercentage'];
 };
 export type SimulateDepositParams = {
     signer: Signer | JsonRpcSigner;
-    accountId: number;
-    tokenAddress: string;
+    marginAccountId: MarginAccountEntity['id'];
+    tokenAddress: TokenEntity['address'];
     amount: number;
 };
 export type SimulateWithdrawResult = {
     bridgeGasFees: number;
-    marginRatioHealth: 'danger' | 'healthy' | 'warning';
-    marginRatio: number;
+    marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+    marginRatio: MarginAccountEntity['marginRatioPercentage'];
 };
 export type SimulateWithdrawParams = {
     signer: Signer | JsonRpcSigner;
-    accountId: number;
-    tokenAddress: string;
+    marginAccountId: MarginAccountEntity['id'];
+    tokenAddress: TokenEntity['address'];
     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,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"}
+{"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;AAC/C,OAAO,EAAE,mBAAmB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEnE,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,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,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,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,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,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;CAC3D,CAAC;AAGF,MAAM,MAAM,qBAAqB,GAAG;IAClC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF,MAAM,MAAM,sBAAsB,GAAG;IACnC,aAAa,EAAE,MAAM,CAAC;IAEtB,iBAAiB,EAAE,mBAAmB,CAAC,mBAAmB,CAAC,CAAC;IAC5D,WAAW,EAAE,mBAAmB,CAAC,uBAAuB,CAAC,CAAC;CAC3D,CAAC;AAGF,MAAM,MAAM,sBAAsB,GAAG;IACnC,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC"}

package/dist/types/services/money-flows/getAllowedChainsForMoneyInOut.d.ts

@@ -1,3 +1,3 @@
 import { GetAllowedChainsForMoneyInOutParams, GetAllowedChainsForMoneyInOutResult } from './types';
-export declare const getAllowedChainsForMoneyInOut: ({ destinationChainId, }: GetAllowedChainsForMoneyInOutParams) => GetAllowedChainsForMoneyInOutResult;
+export declare const getAllowedChainsForMoneyInOut: (params: GetAllowedChainsForMoneyInOutParams) => GetAllowedChainsForMoneyInOutResult;
 //# sourceMappingURL=getAllowedChainsForMoneyInOut.d.ts.map

package/dist/types/services/money-flows/getAllowedChainsForMoneyInOut.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getAllowedChainsForMoneyInOut.d.ts","sourceRoot":"/","sources":["services/money-flows/getAllowedChainsForMoneyInOut.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACpC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,6BAA6B,4BAGvC,mCAAmC,KAAG,mCAcxC,CAAC"}
+{"version":3,"file":"getAllowedChainsForMoneyInOut.d.ts","sourceRoot":"/","sources":["services/money-flows/getAllowedChainsForMoneyInOut.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mCAAmC,EACnC,mCAAmC,EACpC,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,wCAG5C,CAAC"}

package/dist/types/services/money-flows/types.d.ts

@@ -1,14 +1,6 @@
+import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
 export type GetAllowedChainsForMoneyInOutParams = {
-    destinationChainId: number;
-};
-export type GetAllowedChainsForMoneyInOutResult = {
-    sourceChains: {
-        chainId: number;
-        tokens: {
-            [tokenAddress: string]: {
-                vaultAddress: string;
-            };
-        };
-    }[];
+    destinationChainId: ReyaChainId;
 };
+export type GetAllowedChainsForMoneyInOutResult = MoneyInOutChainId[];
 //# sourceMappingURL=types.d.ts.map

package/dist/types/services/money-flows/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/money-flows/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,mCAAmC,GAAG;IAChD,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG;IAChD,YAAY,EAAE;QACZ,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE;YACN,CAAC,YAAY,EAAE,MAAM,GAAG;gBACtB,YAAY,EAAE,MAAM,CAAC;aACtB,CAAC;SACH,CAAC;KACH,EAAE,CAAC;CACL,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/money-flows/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAEjE,MAAM,MAAM,mCAAmC,GAAG;IAChD,kBAAkB,EAAE,WAAW,CAAC;CACjC,CAAC;AAEF,MAAM,MAAM,mCAAmC,GAAG,iBAAiB,EAAE,CAAC"}

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

@@ -1,20 +1,21 @@
 import { Signer, JsonRpcSigner } from 'ethers';
+import { MarginAccountEntity, MarketEntity, PositionEntity } from '@reyaxyz/common';
 export type MarketParams = {
-    id: number;
-    exchangeId: number;
-    counterpartyAccountIds: number[];
+    id: MarketEntity['id'];
+    exchangeId: MarketEntity['orderInfo']['exchangeId'];
+    counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
     currentPrice: number;
 };
 export type MatchOrderParams = {
     signer: Signer | JsonRpcSigner;
-    marginAccountId: number;
+    marginAccountId: MarginAccountEntity['id'];
     orderSize: number;
     market: MarketParams;
 };
 export type CloseOrderParams = {
     signer: Signer | JsonRpcSigner;
-    marginAccountId: number;
-    orderBase: number;
+    marginAccountId: MarginAccountEntity['id'];
+    orderBase: PositionEntity['base'];
     market: MarketParams;
 };
 export type MatchOrderResult = {

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAE/C,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,UAAU,EAAE,MAAM,CAAC;IACnB,sBAAsB,EAAE,MAAM,EAAE,CAAC;IACjC,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/orders/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EACL,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,YAAY,CAAC,IAAI,CAAC,CAAC;IACvB,UAAU,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,YAAY,CAAC,CAAC;IACpD,sBAAsB,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC,wBAAwB,CAAC,CAAC;IAC5E,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,eAAe,EAAE,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3C,SAAS,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,MAAM,EAAE,YAAY,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,eAAe,EAAE,MAAM,GAAG,IAAI,CAAC;CAChC,CAAC"}

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

@@ -1,26 +1,27 @@
 import { JsonRpcSigner, Signer } from 'ethers';
+import { LpPoolEntity, TokenEntity } from '@reyaxyz/common';
 export declare enum ApprovalType {
     LP = 0,
     DEPOSIT = 1
 }
 export type ApproveTokenParams = {
     signer: Signer | JsonRpcSigner;
-    token: string;
+    tokenAddress: TokenEntity['address'];
     type: ApprovalType;
 };
 export type GetAllowanceParams = {
     signer: Signer | JsonRpcSigner;
-    token: string;
+    tokenAddress: TokenEntity['address'];
     type: ApprovalType;
 };
 export type GetERC20AllowanceParams = {
     walletAddress: string;
-    tokenAddress: string;
+    tokenAddress: LpPoolEntity['tokenAddress'];
     spenderAddress: string;
     subject: Signer;
 };
 export type GetBalanceParams = {
     signer: Signer | JsonRpcSigner;
-    tokenAddress: string;
+    tokenAddress: TokenEntity['address'];
 };
 //# sourceMappingURL=types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAE/C,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;CACR;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/token/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC/C,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE5D,oBAAY,YAAY;IACtB,EAAE,IAAA;IACF,OAAO,IAAA;CACR;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;IACrC,IAAI,EAAE,YAAY,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAAG;IACpC,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC,cAAc,CAAC,CAAC;IAC3C,cAAc,EAAE,MAAM,CAAC;IACvB,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC;IAC/B,YAAY,EAAE,WAAW,CAAC,SAAS,CAAC,CAAC;CACtC,CAAC"}

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

@@ -1,5 +1,4 @@
 export type Address = Lowercase<string>;
-export type SupportedChainId = 80001 | 1729;
 export type ContractType = 'core_proxy' | 'passive_pool_proxy';
 export declare const getAddress: (chainId: number, contractName: ContractType) => string;
 //# sourceMappingURL=contractAddresses.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"contractAddresses.d.ts","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAGxC,MAAM,MAAM,gBAAgB,GAAG,KAAK,GAAG,IAAI,CAAC;AAE5C,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,oBAAoB,CAAC;AAY/D,eAAO,MAAM,UAAU,YACZ,MAAM,gBACD,YAAY,KACzB,MAaF,CAAC"}
+{"version":3,"file":"contractAddresses.d.ts","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,OAAO,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;AAIxC,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,oBAAoB,CAAC;AAY/D,eAAO,MAAM,UAAU,YACZ,MAAM,gBACD,YAAY,KACzB,MAaF,CAAC"}

package/dist/utils/contractAddresses.js.map

@@ -1 +1 @@
-{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":";;;AAOA,IAAM,SAAS,GAA4D;IACzE,KAAK,EAAE;QACL,UAAU,EAAE,4CAA4C;QACxD,kBAAkB,EAAE,4CAA4C;KACjE;IACD,IAAI,EAAE;QACJ,UAAU,EAAE,4CAA4C;QACxD,kBAAkB,EAAE,4CAA4C;KACjE;CACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,OAAO,6CAAsC,UAAU,CAAE,CAAC;IAC5D,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAA2B,CAAC,CAAC;IAChE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,OAAO,kCAA2B,YAAY,cAAW,CAAC;IAC5D,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["export type Address = Lowercase<string>;\n\n// @todo update with proper chainId for mainnet\nexport type SupportedChainId = 80001 | 1729;\n\nexport type ContractType = 'core_proxy' | 'passive_pool_proxy';\n\nconst addresses: Record<SupportedChainId, Record<ContractType, Address>> = {\n  80001: {\n    core_proxy: '0xc2f1b4a1275b7338e0eb03967fea3858af4bc900',\n    passive_pool_proxy: '0x1b9d499f3ac864b8d4da415846d1d1916e00a6ff',\n  },\n  1729: {\n    core_proxy: '0x2cb06a22ee9b823a307d22f131380dbe151ece5f',\n    passive_pool_proxy: '0x63df38878c5b8e84d7dcb347b934072add64bdc5',\n  },\n};\nexport const getAddress = (\n  chainId: number,\n  contractName: ContractType,\n): string => {\n  const keyChainId = chainId.toString();\n\n  if (!Object.keys(addresses).includes(keyChainId)) {\n    return `Unspecified addresses for chain id ${keyChainId}`;\n  }\n\n  const networkAddresses = addresses[chainId as SupportedChainId];\n  if (!Object.keys(networkAddresses).includes(contractName)) {\n    return `Unspecified address for ${contractName} contract`;\n  }\n\n  return networkAddresses[contractName];\n};\n"]}
+{"version":3,"file":"contractAddresses.js","sourceRoot":"/","sources":["utils/contractAddresses.ts"],"names":[],"mappings":";;;AAMA,IAAM,SAAS,GAAuD;IACpE,KAAK,EAAE;QACL,UAAU,EAAE,4CAA4C;QACxD,kBAAkB,EAAE,4CAA4C;KACjE;IACD,IAAI,EAAE;QACJ,UAAU,EAAE,4CAA4C;QACxD,kBAAkB,EAAE,4CAA4C;KACjE;CACF,CAAC;AACK,IAAM,UAAU,GAAG,UACxB,OAAe,EACf,YAA0B;IAE1B,IAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAEtC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACjD,OAAO,6CAAsC,UAAU,CAAE,CAAC;IAC5D,CAAC;IAED,IAAM,gBAAgB,GAAG,SAAS,CAAC,OAAsB,CAAC,CAAC;IAC3D,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;QAC1D,OAAO,kCAA2B,YAAY,cAAW,CAAC;IAC5D,CAAC;IAED,OAAO,gBAAgB,CAAC,YAAY,CAAC,CAAC;AACxC,CAAC,CAAC;AAhBW,QAAA,UAAU,cAgBrB","sourcesContent":["export type Address = Lowercase<string>;\n// @todo update with proper chainId for mainnet\nimport { ReyaChainId } from '@reyaxyz/common';\n\nexport type ContractType = 'core_proxy' | 'passive_pool_proxy';\n\nconst addresses: Record<ReyaChainId, Record<ContractType, Address>> = {\n  80001: {\n    core_proxy: '0xc2f1b4a1275b7338e0eb03967fea3858af4bc900',\n    passive_pool_proxy: '0x1b9d499f3ac864b8d4da415846d1d1916e00a6ff',\n  },\n  1729: {\n    core_proxy: '0x2cb06a22ee9b823a307d22f131380dbe151ece5f',\n    passive_pool_proxy: '0x63df38878c5b8e84d7dcb347b934072add64bdc5',\n  },\n};\nexport const getAddress = (\n  chainId: number,\n  contractName: ContractType,\n): string => {\n  const keyChainId = chainId.toString();\n\n  if (!Object.keys(addresses).includes(keyChainId)) {\n    return `Unspecified addresses for chain id ${keyChainId}`;\n  }\n\n  const networkAddresses = addresses[chainId as ReyaChainId];\n  if (!Object.keys(networkAddresses).includes(contractName)) {\n    return `Unspecified address for ${contractName} contract`;\n  }\n\n  return networkAddresses[contractName];\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.11.0",
+  "version": "0.13.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -20,18 +20,19 @@
     "ts:circular-check": "dpdm --no-output --no-tree --no-warning --exit-code circular:1 -T src/index.ts",
     "ts:check": "pnpm ts:check-types && pnpm ts:circular-check",
     "lint:check": "eslint '{src,demo,tests}/**/*.{ts,tsx}'",
-    "prettier:check": "npx prettier --loglevel silent --check './{src,demo,tests}/**/*.{ts,tsx}'",
+    "prettier:check": "npx prettier --log-level silent --check './{src,demo,tests}/**/*.{ts,tsx}'",
     "code-quality:check": "npx concurrently 'pnpm ts:check' 'pnpm prettier:check' 'pnpm lint:check --quiet'",
     "lint:fix": "npx eslint --fix '{src,demo,tests}/**/*.{ts,tsx}'",
-    "prettier:fix": "npx prettier --loglevel silent --write './{src,demo,tests}/**/*.{ts,tsx}'",
+    "prettier:fix": "npx prettier --log-level silent --write './{src,demo,tests}/**/*.{ts,tsx}'",
     "test": "npx jest --silent",
     "test:coverage": "jest test --coverage",
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
+    "@reyaxyz/common": "0.2.0",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "4f23d7ea33e5b0cfeead1661fbbd1dc20c702551"
+  "gitHead": "36a41222301c1bd971953f34cf7a972c9f6940b2"
 }

package/src/services/lp/lp.ts

@@ -32,7 +32,7 @@ export const provideLiquidity = async (
   const amount = expandLpAmount(params.amount, 6);
 
   const { calldata: data, value } = encodeProvideLiquidityCall(
-    params.poolId,
+    params.lpPoolId,
     ownerAddrees,
     amount,
     minShares,
@@ -57,15 +57,15 @@ export const removeLiquidity = async (
   const network = await params.signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);
 
-  if (params.sharesAmount === 0) {
+  if (params.amount === 0) {
     throw new Error('Shares amount can not be 0');
   }
 
-  const minOut = calculateMinOutForLp(params.sharesAmount);
+  const minOut = calculateMinOutForLp(params.amount);
 
-  const amount = expandLpAmount(params.sharesAmount, 30); // shares have 30 decimals
+  const amount = expandLpAmount(params.amount, 30); // shares have 30 decimals
   const { calldata: data, value } = encodeRemoveLiquidityCall(
-    params.poolId,
+    params.lpPoolId,
     amount,
     minOut,
   );

package/src/services/lp/types.ts

@@ -1,15 +1,16 @@
 import { JsonRpcSigner, Signer } from 'ethers';
+import { LpPoolEntity } from '@reyaxyz/common';
 
 export type ProvideLiquidityParams = {
   signer: Signer | JsonRpcSigner;
   amount: number;
-  poolId: number;
+  lpPoolId: LpPoolEntity['id'];
 };
 
 export type RemoveLiquidityParams = {
   signer: Signer | JsonRpcSigner;
-  poolId: number;
-  sharesAmount: number;
+  lpPoolId: LpPoolEntity['id'];
+  amount: number;
 };
 
 export type ProvideLiquidityResult = {

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

@@ -12,7 +12,7 @@ export const deposit = async (
   const marketId = 0;
   const exchangeId = 0;
   const { calldata: data, value } = encodeDeposit(
-    params.accountId,
+    params.marginAccountId,
     params.tokenAddress,
     amount,
     marketId,

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

@@ -1,4 +1,5 @@
 import { JsonRpcSigner, Signer } from 'ethers';
+import { MarginAccountEntity, TokenEntity } from '@reyaxyz/common';
 
 export type CreateAccountParams = {
   signer: Signer | JsonRpcSigner;
@@ -11,8 +12,8 @@ export type CreateAccountResult = {
 
 export type DepositParams = {
   signer: Signer | JsonRpcSigner;
-  accountId: number;
-  tokenAddress: string;
+  marginAccountId: MarginAccountEntity['id'];
+  tokenAddress: TokenEntity['address'];
   amount: number;
 };
 
@@ -22,8 +23,8 @@ export type DepositResult = {
 
 export type WithdrawParams = {
   signer: Signer | JsonRpcSigner;
-  accountId: number;
-  tokenAddress: string;
+  marginAccountId: MarginAccountEntity['id'];
+  tokenAddress: TokenEntity['address'];
   amount: number;
 };
 
@@ -33,28 +34,29 @@ export type WithdrawResult = {
 
 export type SimulateDepositResult = {
   bridgeGasFees: number;
-  marginRatioHealth: 'danger' | 'healthy' | 'warning'; // MarginAccountEntity['marginRatioPercentage'];
-  marginRatio: number; // MarginAccountEntity['marginRatioHealth'];
+  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+  marginRatio: MarginAccountEntity['marginRatioPercentage'];
 };
 
 // TODO: Milan reevaluate these params
 export type SimulateDepositParams = {
   signer: Signer | JsonRpcSigner;
-  accountId: number;
-  tokenAddress: string;
+  marginAccountId: MarginAccountEntity['id'];
+  tokenAddress: TokenEntity['address'];
   amount: number;
 };
 
 export type SimulateWithdrawResult = {
   bridgeGasFees: number;
-  marginRatioHealth: 'danger' | 'healthy' | 'warning'; // MarginAccountEntity['marginRatioPercentage'];
-  marginRatio: number; // MarginAccountEntity['marginRatioHealth'];
+
+  marginRatioHealth: MarginAccountEntity['marginRatioHealth'];
+  marginRatio: MarginAccountEntity['marginRatioPercentage'];
 };
 
 // TODO: Milan reevaluate these params
 export type SimulateWithdrawParams = {
   signer: Signer | JsonRpcSigner;
-  accountId: number;
-  tokenAddress: string;
+  marginAccountId: MarginAccountEntity['id'];
+  tokenAddress: TokenEntity['address'];
   amount: number;
 };

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

@@ -13,7 +13,7 @@ export const withdraw = async (
   const marketId = 0;
   const exchangeId = 0;
   const { calldata: data, value } = encodeWithdraw(
-    params.accountId,
+    params.marginAccountId,
     params.tokenAddress,
     BigInt(amount),
     marketId,

package/src/services/money-flows/getAllowedChainsForMoneyInOut.ts

@@ -2,22 +2,10 @@ import {
   GetAllowedChainsForMoneyInOutParams,
   GetAllowedChainsForMoneyInOutResult,
 } from './types';
+import { getAllowedChainsForMoneyInOut as getAllowedChainsForMoneyInOutCommon } from '@reyaxyz/common';
 
-export const getAllowedChainsForMoneyInOut = ({
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  destinationChainId,
-}: GetAllowedChainsForMoneyInOutParams): GetAllowedChainsForMoneyInOutResult => {
-  // todo: implement
-  return {
-    sourceChains: [
-      {
-        chainId: 11155111,
-        tokens: {
-          '0x1c7D4B196Cb0C7B01d743Fbc6116a902379C7238': {
-            vaultAddress: '0x036CbD53842c5426634e7929541eC2318f3dCF7e',
-          },
-        },
-      },
-    ],
-  };
+export const getAllowedChainsForMoneyInOut = (
+  params: GetAllowedChainsForMoneyInOutParams,
+): GetAllowedChainsForMoneyInOutResult => {
+  return getAllowedChainsForMoneyInOutCommon(params);
 };

package/src/services/money-flows/types.ts

@@ -1,14 +1,7 @@
+import { MoneyInOutChainId, ReyaChainId } from '@reyaxyz/common';
+
 export type GetAllowedChainsForMoneyInOutParams = {
-  destinationChainId: number;
+  destinationChainId: ReyaChainId;
 };
 
-export type GetAllowedChainsForMoneyInOutResult = {
-  sourceChains: {
-    chainId: number;
-    tokens: {
-      [tokenAddress: string]: {
-        vaultAddress: string;
-      };
-    };
-  }[];
-};
+export type GetAllowedChainsForMoneyInOutResult = MoneyInOutChainId[];

package/src/services/orders/types.ts

@@ -1,23 +1,28 @@
 import { Signer, JsonRpcSigner } from 'ethers';
+import {
+  MarginAccountEntity,
+  MarketEntity,
+  PositionEntity,
+} from '@reyaxyz/common';
 
 export type MarketParams = {
-  id: number;
-  exchangeId: number;
-  counterpartyAccountIds: number[];
+  id: MarketEntity['id'];
+  exchangeId: MarketEntity['orderInfo']['exchangeId'];
+  counterpartyAccountIds: MarketEntity['orderInfo']['counterpartyAccountIds'];
   currentPrice: number;
 };
 
 export type MatchOrderParams = {
   signer: Signer | JsonRpcSigner;
-  marginAccountId: number;
+  marginAccountId: MarginAccountEntity['id'];
   orderSize: number;
   market: MarketParams;
 };
 
 export type CloseOrderParams = {
   signer: Signer | JsonRpcSigner;
-  marginAccountId: number;
-  orderBase: number; // PositionEntity[base]
+  marginAccountId: MarginAccountEntity['id'];
+  orderBase: PositionEntity['base'];
   market: MarketParams;
 };
 

package/src/services/token/approve.ts

@@ -5,7 +5,7 @@ import { getAddress } from '../../utils/contractAddresses';
 export const approveTokenSpending = async (
   params: ApproveTokenParams,
 ): Promise<number> => {
-  const underLyingTokenAddress = params.token;
+  const underLyingTokenAddress = params.tokenAddress;
 
   const network = await params.signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);

package/src/services/token/getAllowance.ts

@@ -5,7 +5,7 @@ import { getAddress } from '../../utils/contractAddresses';
 export const getAllowance = async (
   params: GetAllowanceParams,
 ): Promise<number> => {
-  const underLyingTokenAddress = params.token;
+  const underLyingTokenAddress = params.tokenAddress;
 
   const network = await params.signer.provider?.getNetwork();
   const chainId = Number(network?.chainId);

package/src/services/token/types.ts

@@ -1,4 +1,5 @@
 import { JsonRpcSigner, Signer } from 'ethers';
+import { LpPoolEntity, TokenEntity } from '@reyaxyz/common';
 
 export enum ApprovalType {
   LP,
@@ -7,24 +8,24 @@ export enum ApprovalType {
 
 export type ApproveTokenParams = {
   signer: Signer | JsonRpcSigner;
-  token: string; // token address
+  tokenAddress: TokenEntity['address'];
   type: ApprovalType;
 };
 
 export type GetAllowanceParams = {
   signer: Signer | JsonRpcSigner;
-  token: string; //  token address
+  tokenAddress: TokenEntity['address'];
   type: ApprovalType;
 };
 
 export type GetERC20AllowanceParams = {
   walletAddress: string;
-  tokenAddress: string; // LP POOL entity tokean address
+  tokenAddress: LpPoolEntity['tokenAddress'];
   spenderAddress: string;
   subject: Signer;
 };
 
 export type GetBalanceParams = {
   signer: Signer | JsonRpcSigner;
-  tokenAddress: string;
+  tokenAddress: TokenEntity['address'];
 };

package/src/utils/contractAddresses.ts

@@ -1,11 +1,10 @@
 export type Address = Lowercase<string>;
-
 // @todo update with proper chainId for mainnet
-export type SupportedChainId = 80001 | 1729;
+import { ReyaChainId } from '@reyaxyz/common';
 
 export type ContractType = 'core_proxy' | 'passive_pool_proxy';
 
-const addresses: Record<SupportedChainId, Record<ContractType, Address>> = {
+const addresses: Record<ReyaChainId, Record<ContractType, Address>> = {
   80001: {
     core_proxy: '0xc2f1b4a1275b7338e0eb03967fea3858af4bc900',
     passive_pool_proxy: '0x1b9d499f3ac864b8d4da415846d1d1916e00a6ff',
@@ -25,7 +24,7 @@ export const getAddress = (
     return `Unspecified addresses for chain id ${keyChainId}`;
   }
 
-  const networkAddresses = addresses[chainId as SupportedChainId];
+  const networkAddresses = addresses[chainId as ReyaChainId];
   if (!Object.keys(networkAddresses).includes(contractName)) {
     return `Unspecified address for ${contractName} contract`;
   }