@reyaxyz/sdk 0.8.0 → 0.8.2

package/dist/services/encode.js

@@ -18,8 +18,7 @@ var encodeSingleWithdraw = function (token, amount, marketId, exchangeId, multiA
 exports.encodeSingleWithdraw = encodeSingleWithdraw;
 var encodeSingleTrade = function (counterpartyAccountIds, orderBase, orderPriceLimit, marketId, exchangeId, multiAction) {
     // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));
-    var encodedBasePrice = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], // @todo check if uint256 casts to UD60x18
-    [orderBase, orderPriceLimit]);
+    var encodedBasePrice = ethers_1.AbiCoder.defaultAbiCoder().encode(['int256', 'uint256'], [orderBase, orderPriceLimit]);
     multiAction.newAction((0, routerCommands_1.getCommand)(routerCommands_1.CommandType.MATCH_ORDER, [counterpartyAccountIds, encodedBasePrice], marketId, exchangeId));
 };
 exports.encodeSingleTrade = encodeSingleTrade;

package/dist/services/encode.js.map

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,0DAAkE;AAClE,iCAA6C;AAC7C,qEAAmD;AACnD,gBAAgB;AAChB,wGAAwG;AACxG,KAAK;AACE,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EAAC,4BAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CACvE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,mBAAmB,uBAU9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EAAC,4BAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CACxE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,oBAAoB,wBAU/B;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EAAE,0CAA0C;IACjE,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EACR,4BAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,WAAwB,EACxB,SAAiB,EACjB,mBAA2B;IAE3B,IAAM,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAM,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,0BAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction } from '../utils/action';\nimport { CommandType, getCommand } from '../utils/routerCommands';\nimport { AbiCoder, Interface } from 'ethers';\nimport { abi } from '../abis/ExecutionModule.json';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.DEPOSIT, [token, amount], marketId, exchangeId),\n  );\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], marketId, exchangeId),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'], // @todo check if uint256 casts to UD60x18\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/encode.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;AAGzD,0DAAkE;AAClE,iCAA6C;AAC7C,qEAAmD;AACnD,gBAAgB;AAChB,wGAAwG;AACxG,KAAK;AACE,IAAM,mBAAmB,GAAG,UACjC,KAAa,EACb,MAAc,EACd,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EAAC,4BAAW,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CACvE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,mBAAmB,uBAU9B;AAEK,IAAM,oBAAoB,GAAG,UAClC,KAAa,EACb,MAAc,EACd,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EAAC,4BAAW,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,UAAU,CAAC,CACxE,CAAC;AACJ,CAAC,CAAC;AAVW,QAAA,oBAAoB,wBAU/B;AAEK,IAAM,iBAAiB,GAAG,UAC/B,sBAAgC,EAChC,SAAiB,EACjB,eAAuB,EACvB,QAAgB,EAChB,UAAkB,EAClB,WAAwB;IAExB,wGAAwG;IACxG,IAAM,gBAAgB,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACxD,CAAC,QAAQ,EAAE,SAAS,CAAC,EACrB,CAAC,SAAS,EAAE,eAAe,CAAC,CAC7B,CAAC;IAEF,WAAW,CAAC,SAAS,CACnB,IAAA,2BAAU,EACR,4BAAW,CAAC,WAAW,EACvB,CAAC,sBAAsB,EAAE,gBAAgB,CAAC,EAC1C,QAAQ,EACR,UAAU,CACX,CACF,CAAC;AACJ,CAAC,CAAC;AAtBW,QAAA,iBAAiB,qBAsB5B;AAEK,IAAM,gBAAgB,GAAG,UAC9B,WAAwB,EACxB,SAAiB,EACjB,mBAA2B;IAE3B,IAAM,iBAAiB,GAAG,SAAS,CAAC;IACpC,IAAM,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,CAAC,CAAC;IAErD,IAAM,SAAS,GAAG,IAAI,kBAAS,CAAC,0BAAG,CAAC,CAAC;IACrC,IAAM,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;IAC7E,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,MAAM,CAAC,mBAAmB,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;KAChD,CAAC;AACJ,CAAC,CAAC;AAdW,QAAA,gBAAgB,oBAc3B","sourcesContent":["////////////////////  ENCODE SINGLE  ////////////////////\n\nimport { MethodParameters, MultiAction } from '../utils/action';\nimport { CommandType, getCommand } from '../utils/routerCommands';\nimport { AbiCoder, Interface } from 'ethers';\nimport { abi } from '../abis/ExecutionModule.json';\n// const abi = [\n//   'function coreExecute(uint128 poolId, uint128 accountId, Command[] commands, EIP712Signature sig)',\n// ];\nexport const encodeSingleDeposit = (\n  token: string,\n  amount: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.DEPOSIT, [token, amount], marketId, exchangeId),\n  );\n};\n\nexport const encodeSingleWithdraw = (\n  token: string,\n  amount: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  multiAction.newAction(\n    getCommand(CommandType.WITHDRAW, [token, amount], marketId, exchangeId),\n  );\n};\n\nexport const encodeSingleTrade = (\n  counterpartyAccountIds: number[],\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  marketId: number,\n  exchangeId: number,\n  multiAction: MultiAction,\n): void => {\n  // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));\n  const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(\n    ['int256', 'uint256'],\n    [orderBase, orderPriceLimit],\n  );\n\n  multiAction.newAction(\n    getCommand(\n      CommandType.MATCH_ORDER,\n      [counterpartyAccountIds, encodedBasePrice],\n      marketId,\n      exchangeId,\n    ),\n  );\n};\n\nexport const encodeRouterCall = (\n  multiAction: MultiAction,\n  accountId: number,\n  nativeCurrencyValue: bigint,\n): MethodParameters => {\n  const functionSignature = 'execute';\n  const parameters = [accountId, multiAction.commands];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(nativeCurrencyValue).toString(10),\n  };\n};\n"]}

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

@@ -42,22 +42,26 @@ var encode_1 = require("./encode");
 var consts_1 = require("../../utils/consts");
 var lp_1 = require("../../utils/lp");
 var provideLiquidity = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var ownerAddrees, chainId, minShares, amount, _a, data, value, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var ownerAddrees, network, chainId, minShares, amount, _a, data, value, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0: return [4 /*yield*/, params.signer.getAddress()];
             case 1:
-                ownerAddrees = _b.sent();
-                chainId = 80001;
+                ownerAddrees = _c.sent();
+                return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
+            case 2:
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 minShares = (0, lp_1.calculateMinSharesForLp)(params.amount);
                 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 2:
-                result = _b.sent();
+            case 3:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];
@@ -66,20 +70,23 @@ var provideLiquidity = function (params) { return __awaiter(void 0, void 0, void
 }); };
 exports.provideLiquidity = provideLiquidity;
 var removeLiquidity = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var chainId, minOut, amount, _a, data, value, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                chainId = 80001;
+    var network, chainId, minOut, amount, _a, data, value, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
+            case 1:
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 if (params.sharesAmount === 0) {
                     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 1:
-                result = _b.sent();
+            case 2:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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;gBAE/C,OAAO,GAAG,KAAK,CAAC;gBAChB,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;AAhCW,QAAA,gBAAgB,oBAgC3B;AAEK,IAAM,eAAe,GAAG,UAC7B,MAA6B;;;;;gBAGvB,OAAO,GAAG,KAAK,CAAC;gBAEtB,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  // @todo we might not have chainId for reya network, update once we have information\n  const chainId = 80001;\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  // @todo we might not have chainId for reya nework, update once we have information\n  const chainId = 80001;\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/account.js

@@ -41,15 +41,19 @@ var executeTransaction_1 = require("../executeTransaction");
 var encode_1 = require("./encode");
 var consts_1 = require("../../utils/consts");
 var createAccount = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, data, value, chainId, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var _a, data, value, network, chainId, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 _a = (0, encode_1.encodeCreateAccountCall)(params.ownerAddress), data = _a.calldata, value = _a.value;
-                chainId = 80001;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.CREATE_ACCOUNT)];
+                return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
-                result = _b.sent();
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.CREATE_ACCOUNT)];
+            case 2:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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

@@ -1 +1 @@
-{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAC3D,mCAAmD;AAEnD,6CAAqD;AAE9C,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;gBAErB,KAA4B,IAAA,gCAAuB,EACvD,MAAM,CAAC,YAAY,CACpB,EAFiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAE3B;gBAGI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,cAAc,CAC/B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAnBW,QAAA,aAAa,iBAmBxB","sourcesContent":["import { executeTransaction } from '../executeTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams, CreateAccountResult } from './types';\nimport { TransactionType } from '../../utils/consts';\n\nexport const createAccount = async (\n  params: CreateAccountParams,\n): Promise<CreateAccountResult> => {\n  const { calldata: data, value } = encodeCreateAccountCall(\n    params.ownerAddress,\n  );\n\n  // @todo update it\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.CREATE_ACCOUNT,\n  );\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"account.js","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,4DAA2D;AAC3D,mCAAmD;AAEnD,6CAAqD;AAE9C,IAAM,aAAa,GAAG,UAC3B,MAA2B;;;;;;gBAErB,KAA4B,IAAA,gCAAuB,EACvD,MAAM,CAAC,YAAY,CACpB,EAFiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAE3B;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,cAAc,CAC/B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBACD,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AApBW,QAAA,aAAa,iBAoBxB","sourcesContent":["import { executeTransaction } from '../executeTransaction';\nimport { encodeCreateAccountCall } from './encode';\nimport { CreateAccountParams, CreateAccountResult } from './types';\nimport { TransactionType } from '../../utils/consts';\n\nexport const createAccount = async (\n  params: CreateAccountParams,\n): Promise<CreateAccountResult> => {\n  const { calldata: data, value } = encodeCreateAccountCall(\n    params.ownerAddress,\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.CREATE_ACCOUNT,\n  );\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -42,19 +42,23 @@ var executeTransaction_1 = require("../executeTransaction");
 var consts_1 = require("../../utils/consts");
 var common_1 = require("../token/common");
 var deposit = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var tokenDecimals, amount, marketId, exchangeId, _a, data, value, chainId, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var tokenDecimals, amount, marketId, exchangeId, _a, data, value, network, chainId, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 tokenDecimals = (0, common_1.getTokenDetails)(params.token).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;
-                chainId = 80001;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.DEPOSIT)];
+                return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
-                result = _b.sent();
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.DEPOSIT)];
+            case 2:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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;gBAEI,OAAO,GAAG,KAAK,CAAC;gBACP,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;AA3BW,QAAA,OAAO,WA2BlB","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 chainId = 80001;\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,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"]}

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

@@ -42,19 +42,23 @@ var executeTransaction_1 = require("../executeTransaction");
 var consts_1 = require("../../utils/consts");
 var common_1 = require("../token/common");
 var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var tokenDecimals, amount, marketId, exchangeId, _a, data, value, chainId, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var tokenDecimals, amount, marketId, exchangeId, _a, data, value, network, chainId, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 tokenDecimals = (0, common_1.getTokenDetails)(params.token).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;
-                chainId = 80001;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.WITHDRAW)];
+                return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
-                result = _b.sent();
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.WITHDRAW)];
+            case 2:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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;gBAEI,OAAO,GAAG,KAAK,CAAC;gBACP,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;AA5BW,QAAA,QAAQ,YA4BnB","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 chainId = 80001;\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,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"]}

package/dist/services/orders/order.js

@@ -46,9 +46,10 @@ var consts_1 = require("../../utils/consts");
 var trade_1 = require("../../utils/trade");
 var bignumber_js_1 = __importDefault(require("bignumber.js"));
 var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var orderPriceLimit, orderBase, _a, data, value, chainId, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var orderPriceLimit, orderBase, _a, data, value, network, chainId, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (params.orderSize === 0) {
                     throw new Error('Position size can not be 0');
@@ -56,10 +57,13 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, params.orderSize);
                 orderBase = (0, trade_1.calculateOrderBaseFromOrderSize)(params.orderSize, params.market.currentPrice);
                 _a = (0, encode_1.encodeMatchOrder)(params.marginAccountId, orderBase, orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId), data = _a.calldata, value = _a.value;
-                chainId = 80001;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.TRADE)];
+                return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
-                result = _b.sent();
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.TRADE)];
+            case 2:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];
@@ -68,9 +72,10 @@ var matchOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
 }); };
 exports.matchOrder = matchOrder;
 var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var base, orderPriceLimit, _a, data, value, chainId, result;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
+    var base, orderPriceLimit, _a, data, value, network, chainId, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
             case 0:
                 if (params.orderBase === 0) {
                     throw new Error('Position base can not be 0');
@@ -78,10 +83,13 @@ var closeOrder = function (params) { return __awaiter(void 0, void 0, void 0, fu
                 base = (0, bignumber_js_1.default)(params.orderBase).negated().toNumber();
                 orderPriceLimit = (0, trade_1.calculatePriceLimitForTrade)(params.market.currentPrice, base);
                 _a = (0, encode_1.encodeMatchOrder)(params.marginAccountId, BigInt(base), orderPriceLimit, params.market.counterpartyAccountIds, params.market.id, params.market.exchangeId), data = _a.calldata, value = _a.value;
-                chainId = 80001;
-                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.TRADE)];
+                return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:
-                result = _b.sent();
+                network = _c.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, consts_1.TransactionType.TRADE)];
+            case 2:
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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

@@ -1 +1 @@
-{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,mCAA4C;AAC5C,4DAA2D;AAC3D,6CAAqD;AACrD,2CAG2B;AAC3B,8DAAqC;AAE9B,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;gBAExB,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBACK,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,MAAM,CAAC,SAAS,CACjB,CAAC;gBAEI,SAAS,GAAG,IAAA,uCAA+B,EAC/C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAC3B,CAAC;gBAEI,KAA4B,IAAA,yBAAgB,EAChD,MAAM,CAAC,eAAe,EACtB,SAAS,EACT,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAGI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,KAAK,CACtB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtCW,QAAA,UAAU,cAsCrB;AAEK,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;gBAExB,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEK,IAAI,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAExD,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,IAAI,CACL,CAAC;gBAEI,KAA4B,IAAA,yBAAgB,EAChD,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,IAAI,CAAC,EACZ,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAGI,OAAO,GAAG,KAAK,CAAC;gBACP,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,wBAAe,CAAC,KAAK,CACtB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AApCW,QAAA,UAAU,cAoCrB","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport {\n  calculateOrderBaseFromOrderSize,\n  calculatePriceLimitForTrade,\n} from '../../utils/trade';\nimport BigNumber from 'bignumber.js';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.orderSize === 0) {\n    throw new Error('Position size can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderSize,\n  );\n\n  const orderBase = calculateOrderBaseFromOrderSize(\n    params.orderSize,\n    params.market.currentPrice,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  // @todo update it\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.TRADE,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = BigNumber(params.orderBase).negated().toNumber(); // when closing position we are doing trade in the opposite direction\n\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    base,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    BigInt(base),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.exchangeId,\n  );\n\n  // @todo update it\n  const chainId = 80001;\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    TransactionType.TRADE,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"order.js","sourceRoot":"/","sources":["services/orders/order.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAMA,mCAA4C;AAC5C,4DAA2D;AAC3D,6CAAqD;AACrD,2CAG2B;AAC3B,8DAAqC;AAE9B,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;;gBAExB,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBACK,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,MAAM,CAAC,SAAS,CACjB,CAAC;gBAEI,SAAS,GAAG,IAAA,uCAA+B,EAC/C,MAAM,CAAC,SAAS,EAChB,MAAM,CAAC,MAAM,CAAC,YAAY,CAC3B,CAAC;gBAEI,KAA4B,IAAA,yBAAgB,EAChD,MAAM,CAAC,eAAe,EACtB,SAAS,EACT,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;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,KAAK,CACtB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAvCW,QAAA,UAAU,cAuCrB;AAEK,IAAM,UAAU,GAAG,UACxB,MAAwB;;;;;;gBAExB,IAAI,MAAM,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;oBAC3B,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;gBAChD,CAAC;gBAEK,IAAI,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAExD,eAAe,GAAG,IAAA,mCAA2B,EACjD,MAAM,CAAC,MAAM,CAAC,YAAY,EAC1B,IAAI,CACL,CAAC;gBAEI,KAA4B,IAAA,yBAAgB,EAChD,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,IAAI,CAAC,EACZ,eAAe,EACf,MAAM,CAAC,MAAM,CAAC,sBAAsB,EACpC,MAAM,CAAC,MAAM,CAAC,EAAE,EAChB,MAAM,CAAC,MAAM,CAAC,UAAU,CACzB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;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,KAAK,CACtB,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AArCW,QAAA,UAAU,cAqCrB","sourcesContent":["import {\n  CloseOrderParams,\n  CloseOrderResult,\n  MatchOrderParams,\n  MatchOrderResult,\n} from './types';\nimport { encodeMatchOrder } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { TransactionType } from '../../utils/consts';\nimport {\n  calculateOrderBaseFromOrderSize,\n  calculatePriceLimitForTrade,\n} from '../../utils/trade';\nimport BigNumber from 'bignumber.js';\n\nexport const matchOrder = async (\n  params: MatchOrderParams,\n): Promise<MatchOrderResult> => {\n  if (params.orderSize === 0) {\n    throw new Error('Position size can not be 0');\n  }\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    params.orderSize,\n  );\n\n  const orderBase = calculateOrderBaseFromOrderSize(\n    params.orderSize,\n    params.market.currentPrice,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    orderBase,\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.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.TRADE,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const closeOrder = async (\n  params: CloseOrderParams,\n): Promise<CloseOrderResult> => {\n  if (params.orderBase === 0) {\n    throw new Error('Position base can not be 0');\n  }\n\n  const base = BigNumber(params.orderBase).negated().toNumber(); // when closing position we are doing trade in the opposite direction\n\n  const orderPriceLimit = calculatePriceLimitForTrade(\n    params.market.currentPrice,\n    base,\n  );\n\n  const { calldata: data, value } = encodeMatchOrder(\n    params.marginAccountId,\n    BigInt(base),\n    orderPriceLimit,\n    params.market.counterpartyAccountIds,\n    params.market.id,\n    params.market.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.TRADE,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/token/approve.js

@@ -41,13 +41,17 @@ var types_1 = require("./types");
 var common_1 = require("./common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var approveTokenSpending = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var underLyingTokenAddress, chainId, tokenContract, contractProxyAddress, maxUint256Bn, approvalTransaction, error_1, _a, error_2;
+    var underLyingTokenAddress, network, chainId, tokenContract, contractProxyAddress, maxUint256Bn, approvalTransaction, error_1, _a, error_2;
     var _b;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    var _c;
+    return __generator(this, function (_d) {
+        switch (_d.label) {
             case 0:
                 underLyingTokenAddress = params.token;
-                chainId = 80001;
+                return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
+            case 1:
+                network = _d.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 tokenContract = (0, common_1.getERC20TokenContract)(underLyingTokenAddress, params.signer);
                 contractProxyAddress = params.type === types_1.ApprovalType.DEPOSIT
                     ? (0, contractAddresses_1.getAddress)(chainId, 'core_proxy')
@@ -60,35 +64,35 @@ var approveTokenSpending = function (params) { return __awaiter(void 0, void 0,
                         console.error(error);
                         throw new Error('Transaction Confirmation Error');
                     })];
-            case 1:
-                approvalTransaction = _c.sent();
-                _c.label = 2;
             case 2:
-                _c.trys.push([2, 4, , 5]);
-                return [4 /*yield*/, approvalTransaction.wait()];
+                approvalTransaction = _d.sent();
+                _d.label = 3;
             case 3:
-                _c.sent();
-                return [3 /*break*/, 5];
+                _d.trys.push([3, 5, , 6]);
+                return [4 /*yield*/, approvalTransaction.wait()];
             case 4:
-                error_1 = _c.sent();
+                _d.sent();
+                return [3 /*break*/, 6];
+            case 5:
+                error_1 = _d.sent();
                 console.warn('Token approval failed');
                 throw new Error('Token approval failed');
-            case 5:
-                _c.trys.push([5, 8, , 9]);
+            case 6:
+                _d.trys.push([6, 9, , 10]);
                 _a = common_1.getERC20Allowance;
                 _b = {};
                 return [4 /*yield*/, params.signer.getAddress()];
-            case 6: return [4 /*yield*/, _a.apply(void 0, [(_b.walletAddress = _c.sent(),
+            case 7: return [4 /*yield*/, _a.apply(void 0, [(_b.walletAddress = _d.sent(),
                         _b.tokenAddress = underLyingTokenAddress,
                         _b.spenderAddress = contractProxyAddress,
                         _b.subject = params.signer,
                         _b)])];
-            case 7: return [2 /*return*/, _c.sent()];
-            case 8:
-                error_2 = _c.sent();
+            case 8: return [2 /*return*/, _d.sent()];
+            case 9:
+                error_2 = _d.sent();
                 console.warn('Fetching allowance failed');
-                return [3 /*break*/, 9];
-            case 9: return [2 /*return*/, 0];
+                return [3 /*break*/, 10];
+            case 10: return [2 /*return*/, 0];
         }
     });
 }); };

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;gBAGtC,OAAO,GAAG,KAAK,CAAC;gBAEhB,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;;oBAG5C,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  // @todo update once we know this\n  const chainId = 80001;\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,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"]}

package/dist/services/token/consts.js

@@ -9,8 +9,8 @@ exports.tokenDetails = {
         tokenName: 'USDC',
         tokenDecimals: 6,
     },
-    // mainnet
-    '--': {
+    // reya cronos
+    '0x51b0b7f083e563d5cf9d0b5f3916b59fc49c7e5f': {
         tokenName: 'USDC',
         tokenDecimals: 6,
     },
@@ -20,10 +20,33 @@ exports.tokenDetails = {
         tokenName: 'WETH',
         tokenDecimals: 18,
     },
-    // mainnet
-    '---': {
+    // reya cronos
+    '0xcbdba2ac8f840711948ccd7a1b9ec0226d641693': {
         tokenName: 'WETH',
         tokenDecimals: 18,
     },
+    // ====== wBTC ======
+    // mumbai
+    '0x2fa2e7a6deb7bb51b625336dbe1da23511914a8a': {
+        tokenName: 'WBTC',
+        tokenDecimals: 8,
+    },
+    // mainnet
+    '0xaf21abab55a7c0ab143e0379a3c01054e4ebb514': {
+        tokenName: 'WBTC',
+        tokenDecimals: 8,
+    },
+    // ====== USDT ======
+    // reya cronos
+    '0xeba6f8d7d4d4787f29441db1164548299ef4641f': {
+        tokenName: 'USDT',
+        tokenDecimals: 6,
+    },
+    // ====== dai ======
+    // reya cronos
+    '0x0d4fad8b258a467286fc2419ffc19015fdcae7f9': {
+        tokenName: 'USDT',
+        tokenDecimals: 18,
+    },
 };
 //# sourceMappingURL=consts.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"consts.js","sourceRoot":"/","sources":["services/token/consts.ts"],"names":[],"mappings":";;;AAEA,kCAAkC;AACrB,QAAA,YAAY,GAKrB;IACF,qBAAqB;IACrB,SAAS;IACT,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IACD,UAAU;IACV,IAAI,EAAE;QACJ,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IACD,qBAAqB;IACrB,SAAS;IACT,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,EAAE;KAClB;IACD,UAAU;IACV,KAAK,EAAE;QACL,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,EAAE;KAClB;CACF,CAAC","sourcesContent":["import { Address } from './common';\n\n// @todo update values for mainnet\nexport const tokenDetails: {\n  [address: Address]: {\n    tokenName: Uppercase<string>;\n    tokenDecimals: number;\n  };\n} = {\n  // ====== USDC ======\n  // mumbai\n  '0x52d800ca262522580cebad275395ca6e7598c014': {\n    tokenName: 'USDC',\n    tokenDecimals: 6,\n  },\n  // mainnet\n  '--': {\n    tokenName: 'USDC',\n    tokenDecimals: 6,\n  },\n  // ====== wETH ======\n  // mumbai\n  '0xc199807af4fedb02ee567ed0feb814a077de4802': {\n    tokenName: 'WETH',\n    tokenDecimals: 18,\n  },\n  // mainnet\n  '---': {\n    tokenName: 'WETH',\n    tokenDecimals: 18,\n  },\n};\n"]}
+{"version":3,"file":"consts.js","sourceRoot":"/","sources":["services/token/consts.ts"],"names":[],"mappings":";;;AAEA,kCAAkC;AACrB,QAAA,YAAY,GAKrB;IACF,qBAAqB;IACrB,SAAS;IACT,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IACD,cAAc;IACd,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IACD,qBAAqB;IACrB,SAAS;IACT,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,EAAE;KAClB;IACD,cAAc;IACd,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,EAAE;KAClB;IAED,qBAAqB;IACrB,SAAS;IACT,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IACD,UAAU;IACV,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IACD,qBAAqB;IACrB,cAAc;IACd,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,CAAC;KACjB;IAED,oBAAoB;IACpB,cAAc;IACd,4CAA4C,EAAE;QAC5C,SAAS,EAAE,MAAM;QACjB,aAAa,EAAE,EAAE;KAClB;CACF,CAAC","sourcesContent":["import { Address } from './common';\n\n// @todo update values for mainnet\nexport const tokenDetails: {\n  [address: Address]: {\n    tokenName: Uppercase<string>;\n    tokenDecimals: number;\n  };\n} = {\n  // ====== USDC ======\n  // mumbai\n  '0x52d800ca262522580cebad275395ca6e7598c014': {\n    tokenName: 'USDC',\n    tokenDecimals: 6,\n  },\n  // reya cronos\n  '0x51b0b7f083e563d5cf9d0b5f3916b59fc49c7e5f': {\n    tokenName: 'USDC',\n    tokenDecimals: 6,\n  },\n  // ====== wETH ======\n  // mumbai\n  '0xc199807af4fedb02ee567ed0feb814a077de4802': {\n    tokenName: 'WETH',\n    tokenDecimals: 18,\n  },\n  // reya cronos\n  '0xcbdba2ac8f840711948ccd7a1b9ec0226d641693': {\n    tokenName: 'WETH',\n    tokenDecimals: 18,\n  },\n\n  // ====== wBTC ======\n  // mumbai\n  '0x2fa2e7a6deb7bb51b625336dbe1da23511914a8a': {\n    tokenName: 'WBTC',\n    tokenDecimals: 8,\n  },\n  // mainnet\n  '0xaf21abab55a7c0ab143e0379a3c01054e4ebb514': {\n    tokenName: 'WBTC',\n    tokenDecimals: 8,\n  },\n  // ====== USDT ======\n  // reya cronos\n  '0xeba6f8d7d4d4787f29441db1164548299ef4641f': {\n    tokenName: 'USDT',\n    tokenDecimals: 6,\n  },\n\n  // ====== dai ======\n  // reya cronos\n  '0x0d4fad8b258a467286fc2419ffc19015fdcae7f9': {\n    tokenName: 'USDT',\n    tokenDecimals: 18,\n  },\n};\n"]}

package/dist/services/token/getAllowance.js

@@ -41,26 +41,30 @@ var types_1 = require("./types");
 var common_1 = require("./common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var getAllowance = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var underLyingTokenAddress, chainId, contractProxyAddress, walletAddress, allowance;
-    return __generator(this, function (_a) {
-        switch (_a.label) {
+    var underLyingTokenAddress, network, chainId, contractProxyAddress, walletAddress, allowance;
+    var _a;
+    return __generator(this, function (_b) {
+        switch (_b.label) {
             case 0:
                 underLyingTokenAddress = params.token;
-                chainId = 80001;
+                return [4 /*yield*/, ((_a = params.signer.provider) === null || _a === void 0 ? void 0 : _a.getNetwork())];
+            case 1:
+                network = _b.sent();
+                chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 contractProxyAddress = params.type === types_1.ApprovalType.DEPOSIT
                     ? (0, contractAddresses_1.getAddress)(chainId, 'core_proxy')
                     : (0, contractAddresses_1.getAddress)(chainId, 'passive_pool_proxy');
                 return [4 /*yield*/, params.signer.getAddress()];
-            case 1:
-                walletAddress = _a.sent();
+            case 2:
+                walletAddress = _b.sent();
                 return [4 /*yield*/, (0, common_1.getERC20Allowance)({
                         walletAddress: walletAddress,
                         tokenAddress: underLyingTokenAddress,
                         spenderAddress: contractProxyAddress,
                         subject: params.signer,
                     })];
-            case 2:
-                allowance = _a.sent();
+            case 3:
+                allowance = _b.sent();
                 return [2 /*return*/, allowance];
         }
     });

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;gBAGtC,OAAO,GAAG,KAAK,CAAC;gBAEhB,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  // @todo update\n  const chainId = 80001;\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,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"]}

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/lp/lp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lp.d.ts","sourceRoot":"/","sources":["services/lp/lp.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAQjB,eAAO,MAAM,gBAAgB,WACnB,sBAAsB,KAC7B,QAAQ,sBAAsB,CA8BhC,CAAC;AAEF,eAAO,MAAM,eAAe,WAClB,qBAAqB,KAC5B,QAAQ,qBAAqB,CA4B/B,CAAC"}
+{"version":3,"file":"lp.d.ts","sourceRoot":"/","sources":["services/lp/lp.ts"],"names":[],"mappings":"AAKA,OAAO,EACL,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACtB,MAAM,SAAS,CAAC;AAQjB,eAAO,MAAM,gBAAgB,WACnB,sBAAsB,KAC7B,QAAQ,sBAAsB,CA+BhC,CAAC;AAEF,eAAO,MAAM,eAAe,WAClB,qBAAqB,KAC5B,QAAQ,qBAAqB,CA4B/B,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGnE,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,mBAAmB,CAiB7B,CAAC"}
+{"version":3,"file":"account.d.ts","sourceRoot":"/","sources":["services/margin-accounts/account.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAGnE,eAAO,MAAM,aAAa,WAChB,mBAAmB,KAC1B,QAAQ,mBAAmB,CAkB7B,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMvD,eAAO,MAAM,OAAO,WACV,aAAa,KACpB,QAAQ,aAAa,CAyBvB,CAAC"}
+{"version":3,"file":"deposit.d.ts","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAMvD,eAAO,MAAM,OAAO,WACV,aAAa,KACpB,QAAQ,aAAa,CA2BvB,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAMzD,eAAO,MAAM,QAAQ,WACX,cAAc,KACrB,QAAQ,cAAc,CA0BxB,CAAC"}
+{"version":3,"file":"withdraw.d.ts","sourceRoot":"/","sources":["services/margin-accounts/withdraw.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAMzD,eAAO,MAAM,QAAQ,WACX,cAAc,KACrB,QAAQ,cAAc,CA4BxB,CAAC"}

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

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

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

@@ -1 +1 @@
-{"version":3,"file":"consts.d.ts","sourceRoot":"/","sources":["services/token/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,eAAO,MAAM,YAAY,EAAE;IACzB,CAAC,OAAO,EAAE,OAAO,GAAG;QAClB,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CAwBH,CAAC"}
+{"version":3,"file":"consts.d.ts","sourceRoot":"/","sources":["services/token/consts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGnC,eAAO,MAAM,YAAY,EAAE;IACzB,CAAC,OAAO,EAAE,OAAO,GAAG;QAClB,SAAS,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;QAC7B,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;CAiDH,CAAC"}

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

@@ -1,5 +1,5 @@
 export type Address = Lowercase<string>;
-export type SupportedChainId = 80001 | 999;
+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,GAAG,CAAC;AAE3C,MAAM,MAAM,YAAY,GAAG,YAAY,GAAG,oBAAoB,CAAC;AAe/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;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"}

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/types/utils/routerCommands.d.ts

@@ -7,8 +7,9 @@ import { SingleAction } from './action';
 export declare enum CommandType {
     DEPOSIT = 0,
     WITHDRAW = 1,
-    MATCH_ORDER = 2,
-    PROPAGATE_CACHE_FLOW = 3
+    DUTCH_LIQUIDATION = 2,
+    MATCH_ORDER = 3,
+    PROPAGATE_CACHE_FLOW = 4
 }
 export type RouterCommand = {
     type: CommandType;

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

@@ -1 +1 @@
-{"version":3,"file":"routerCommands.d.ts","sourceRoot":"/","sources":["utils/routerCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;GAIG;AACH,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,WAAW,IAAA;IACX,oBAAoB,IAAA;CACrB;AASD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,aAAa,CAC3B,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,OAAO,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,aAAa,CAMf;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,OAAO,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,YAAY,CAUd"}
+{"version":3,"file":"routerCommands.d.ts","sourceRoot":"/","sources":["utils/routerCommands.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAExC;;;;GAIG;AACH,oBAAY,WAAW;IACrB,OAAO,IAAA;IACP,QAAQ,IAAA;IACR,iBAAiB,IAAA;IACjB,WAAW,IAAA;IACX,oBAAoB,IAAA;CACrB;AAUD,MAAM,MAAM,aAAa,GAAG;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,wBAAgB,aAAa,CAC3B,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,OAAO,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,aAAa,CAMf;AAED,wBAAgB,UAAU,CACxB,IAAI,EAAE,WAAW,EACjB,UAAU,EAAE,OAAO,EAAE,EACrB,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB,YAAY,CAUd"}

package/dist/utils/contractAddresses.js

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAddress = void 0;
 var addresses = {
     80001: {
-        core_proxy: '0xdb8cd625873ca9d7b6529ffafe5ecdd3746708b4',
-        passive_pool_proxy: '0xbc8fb7d6ceace18ce15d473b8ae5849e2394f5c5',
+        core_proxy: '0xc2f1b4a1275b7338e0eb03967fea3858af4bc900',
+        passive_pool_proxy: '0x1b9d499f3ac864b8d4da415846d1d1916e00a6ff',
     },
-    999: {
-        core_proxy: '0xdb8cd625873ca9d7b6529ffafe5ecdd3746708b4',
-        passive_pool_proxy: '0xbc8fb7d6ceace18ce15d473b8ae5849e2394f5c5',
+    1729: {
+        core_proxy: '0x2cb06a22ee9b823a307d22f131380dbe151ece5f',
+        passive_pool_proxy: '0x63df38878c5b8e84d7dcb347b934072add64bdc5',
     },
 };
-// @todo update values for mainnet
 var getAddress = function (chainId, contractName) {
     var keyChainId = chainId.toString();
     if (!Object.keys(addresses).includes(keyChainId)) {

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,GAAG,EAAE;QACH,UAAU,EAAE,4CAA4C;QACxD,kBAAkB,EAAE,4CAA4C;KACjE;CACF,CAAC;AAEF,kCAAkC;AAE3B,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 | 999;\n\nexport type ContractType = 'core_proxy' | 'passive_pool_proxy';\n\nconst addresses: Record<SupportedChainId, Record<ContractType, Address>> = {\n  80001: {\n    core_proxy: '0xdb8cd625873ca9d7b6529ffafe5ecdd3746708b4',\n    passive_pool_proxy: '0xbc8fb7d6ceace18ce15d473b8ae5849e2394f5c5',\n  },\n  999: {\n    core_proxy: '0xdb8cd625873ca9d7b6529ffafe5ecdd3746708b4',\n    passive_pool_proxy: '0xbc8fb7d6ceace18ce15d473b8ae5849e2394f5c5',\n  },\n};\n\n// @todo update values for mainnet\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":";;;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"]}

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/dist/utils/routerCommands.js

@@ -12,14 +12,16 @@ var CommandType;
 (function (CommandType) {
     CommandType[CommandType["DEPOSIT"] = 0] = "DEPOSIT";
     CommandType[CommandType["WITHDRAW"] = 1] = "WITHDRAW";
-    CommandType[CommandType["MATCH_ORDER"] = 2] = "MATCH_ORDER";
-    CommandType[CommandType["PROPAGATE_CACHE_FLOW"] = 3] = "PROPAGATE_CACHE_FLOW";
+    CommandType[CommandType["DUTCH_LIQUIDATION"] = 2] = "DUTCH_LIQUIDATION";
+    CommandType[CommandType["MATCH_ORDER"] = 3] = "MATCH_ORDER";
+    CommandType[CommandType["PROPAGATE_CACHE_FLOW"] = 4] = "PROPAGATE_CACHE_FLOW";
 })(CommandType || (exports.CommandType = CommandType = {}));
 var ABI_DEFINITION = (_a = {},
     _a[CommandType.DEPOSIT] = ['address', 'uint256'],
     _a[CommandType.WITHDRAW] = ['address', 'uint256'],
     _a[CommandType.MATCH_ORDER] = ['uint128[]', 'bytes'],
     _a[CommandType.PROPAGATE_CACHE_FLOW] = [],
+    _a[CommandType.DUTCH_LIQUIDATION] = [],
     _a);
 function createCommand(type, parameters, marketId, exchangeId) {
     var encodedInput = ethers_1.AbiCoder.defaultAbiCoder().encode(ABI_DEFINITION[type], parameters);

package/dist/utils/routerCommands.js.map

@@ -1 +1 @@
-{"version":3,"file":"routerCommands.js","sourceRoot":"/","sources":["utils/routerCommands.ts"],"names":[],"mappings":";;;;AAAA,iCAAkC;AAGlC;;;;GAIG;AACH,IAAY,WAKX;AALD,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,qDAAQ,CAAA;IACR,2DAAW,CAAA;IACX,6EAAoB,CAAA;AACtB,CAAC,EALW,WAAW,2BAAX,WAAW,QAKtB;AAED,IAAM,cAAc;IAClB,GAAC,WAAW,CAAC,OAAO,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC7C,GAAC,WAAW,CAAC,QAAQ,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9C,GAAC,WAAW,CAAC,WAAW,IAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IACjD,GAAC,WAAW,CAAC,oBAAoB,IAAG,EAAE;OACvC,CAAC;AASF,SAAgB,aAAa,CAC3B,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,YAAY,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACpD,cAAc,CAAC,IAAI,CAAC,EACpB,UAAU,CACX,CAAC;IACF,OAAO,EAAE,IAAI,MAAA,EAAE,YAAY,cAAA,EAAE,QAAQ,UAAA,EAAE,UAAU,YAAA,EAAE,CAAC;AACtD,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CACxB,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE;YACP,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;KACF,CAAC;AACJ,CAAC;AAfD,gCAeC","sourcesContent":["import { AbiCoder } from 'ethers';\nimport { SingleAction } from './action';\n\n/**\n * CommandTypes\n * @description Flags that modify a command's execution\n * @enum {number}\n */\nexport enum CommandType {\n  DEPOSIT,\n  WITHDRAW,\n  MATCH_ORDER,\n  PROPAGATE_CACHE_FLOW,\n}\n\nconst ABI_DEFINITION: { [key in CommandType]: string[] } = {\n  [CommandType.DEPOSIT]: ['address', 'uint256'],\n  [CommandType.WITHDRAW]: ['address', 'uint256'],\n  [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],\n  [CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct\n};\n\nexport type RouterCommand = {\n  type: CommandType;\n  encodedInput: string;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport function createCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): RouterCommand {\n  const encodedInput = AbiCoder.defaultAbiCoder().encode(\n    ABI_DEFINITION[type],\n    parameters,\n  );\n  return { type, encodedInput, marketId, exchangeId };\n}\n\nexport function getCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): SingleAction {\n  const command = createCommand(type, parameters, marketId, exchangeId);\n  return {\n    command: {\n      commandType: command.type,\n      inputs: command.encodedInput,\n      marketId: command.marketId,\n      exchangeId: command.exchangeId,\n    },\n  };\n}\n"]}
+{"version":3,"file":"routerCommands.js","sourceRoot":"/","sources":["utils/routerCommands.ts"],"names":[],"mappings":";;;;AAAA,iCAAkC;AAGlC;;;;GAIG;AACH,IAAY,WAMX;AAND,WAAY,WAAW;IACrB,mDAAO,CAAA;IACP,qDAAQ,CAAA;IACR,uEAAiB,CAAA;IACjB,2DAAW,CAAA;IACX,6EAAoB,CAAA;AACtB,CAAC,EANW,WAAW,2BAAX,WAAW,QAMtB;AAED,IAAM,cAAc;IAClB,GAAC,WAAW,CAAC,OAAO,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC7C,GAAC,WAAW,CAAC,QAAQ,IAAG,CAAC,SAAS,EAAE,SAAS,CAAC;IAC9C,GAAC,WAAW,CAAC,WAAW,IAAG,CAAC,WAAW,EAAE,OAAO,CAAC;IACjD,GAAC,WAAW,CAAC,oBAAoB,IAAG,EAAE;IACtC,GAAC,WAAW,CAAC,iBAAiB,IAAG,EAAE;OACpC,CAAC;AASF,SAAgB,aAAa,CAC3B,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,YAAY,GAAG,iBAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACpD,cAAc,CAAC,IAAI,CAAC,EACpB,UAAU,CACX,CAAC;IACF,OAAO,EAAE,IAAI,MAAA,EAAE,YAAY,cAAA,EAAE,QAAQ,UAAA,EAAE,UAAU,YAAA,EAAE,CAAC;AACtD,CAAC;AAXD,sCAWC;AAED,SAAgB,UAAU,CACxB,IAAiB,EACjB,UAAqB,EACrB,QAAgB,EAChB,UAAkB;IAElB,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IACtE,OAAO;QACL,OAAO,EAAE;YACP,WAAW,EAAE,OAAO,CAAC,IAAI;YACzB,MAAM,EAAE,OAAO,CAAC,YAAY;YAC5B,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,UAAU,EAAE,OAAO,CAAC,UAAU;SAC/B;KACF,CAAC;AACJ,CAAC;AAfD,gCAeC","sourcesContent":["import { AbiCoder } from 'ethers';\nimport { SingleAction } from './action';\n\n/**\n * CommandTypes\n * @description Flags that modify a command's execution\n * @enum {number}\n */\nexport enum CommandType {\n  DEPOSIT,\n  WITHDRAW,\n  DUTCH_LIQUIDATION,\n  MATCH_ORDER,\n  PROPAGATE_CACHE_FLOW,\n}\n\nconst ABI_DEFINITION: { [key in CommandType]: string[] } = {\n  [CommandType.DEPOSIT]: ['address', 'uint256'],\n  [CommandType.WITHDRAW]: ['address', 'uint256'],\n  [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],\n  [CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct\n  [CommandType.DUTCH_LIQUIDATION]: [], // @todo update once needed\n};\n\nexport type RouterCommand = {\n  type: CommandType;\n  encodedInput: string;\n  marketId: number;\n  exchangeId: number;\n};\n\nexport function createCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): RouterCommand {\n  const encodedInput = AbiCoder.defaultAbiCoder().encode(\n    ABI_DEFINITION[type],\n    parameters,\n  );\n  return { type, encodedInput, marketId, exchangeId };\n}\n\nexport function getCommand(\n  type: CommandType,\n  parameters: unknown[],\n  marketId: number,\n  exchangeId: number,\n): SingleAction {\n  const command = createCommand(type, parameters, marketId, exchangeId);\n  return {\n    command: {\n      commandType: command.type,\n      inputs: command.encodedInput,\n      marketId: command.marketId,\n      exchangeId: command.exchangeId,\n    },\n  };\n}\n"]}

package/dist/utils/trade.js

@@ -21,7 +21,7 @@ function calculatePriceLimitForTrade(orderPrice, amount) {
 }
 exports.calculatePriceLimitForTrade = calculatePriceLimitForTrade;
 function calculateOrderBaseFromOrderSize(orderSize, currentPrice) {
-    var decimalFactor = (0, bignumber_js_1.default)('1000000'); // 10^6
+    var decimalFactor = (0, bignumber_js_1.default)('1000000000000000000'); // 10^18
     // @todo check decimal places handling if this should stay hardcoded to 6
     var orderBase = (0, bignumber_js_1.default)(orderSize)
         .times(decimalFactor)

package/dist/utils/trade.js.map

@@ -1 +1 @@
-{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC;AAED,SAAgB,+BAA+B,CAC7C,SAAiB,EACjB,YAAoB;IAEpB,IAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC,CAAC,CAAC,OAAO;IACnD,yEAAyE;IAEzE,IAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC;SACnC,KAAK,CAAC,aAAa,CAAC;SACpB,GAAG,CAAC,YAAY,CAAC;SACjB,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAbD,0EAaC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt.div(2);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n\nexport function calculateOrderBaseFromOrderSize(\n  orderSize: number,\n  currentPrice: number,\n): bigint {\n  const decimalFactor = BigNumber('1000000'); // 10^6\n  // @todo check decimal places handling if this should stay hardcoded to 6\n\n  const orderBase = BigNumber(orderSize)\n    .times(decimalFactor)\n    .div(currentPrice)\n    .toFixed(0);\n\n  return BigInt(orderBase);\n}\n"]}
+{"version":3,"file":"trade.js","sourceRoot":"/","sources":["utils/trade.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAqC;AAErC,SAAgB,2BAA2B,CACzC,UAAkB,EAClB,MAAc;IAEd,8BAA8B;IAC9B,IAAM,gBAAgB,GAAG,IAAA,sBAAS,EAAC,UAAU,CAAC,CAAC;IAE/C,mCAAmC;IACnC,IAAM,MAAM,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAEvC,mFAAmF;IACnF,IAAI,MAAM,GAAG,CAAC,EAAE,CAAC;QACf,wBAAwB;QACxB,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAChE,CAAC;IACJ,CAAC;SAAM,CAAC;QACN,OAAO,MAAM,CACX,IAAA,sBAAS,EAAC,gBAAgB,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CACjE,CAAC;IACJ,CAAC;AACH,CAAC;AArBD,kEAqBC;AAED,SAAgB,+BAA+B,CAC7C,SAAiB,EACjB,YAAoB;IAEpB,IAAM,aAAa,GAAG,IAAA,sBAAS,EAAC,qBAAqB,CAAC,CAAC,CAAC,QAAQ;IAChE,yEAAyE;IAEzE,IAAM,SAAS,GAAG,IAAA,sBAAS,EAAC,SAAS,CAAC;SACnC,KAAK,CAAC,aAAa,CAAC;SACpB,GAAG,CAAC,YAAY,CAAC;SACjB,OAAO,CAAC,CAAC,CAAC,CAAC;IAEd,OAAO,MAAM,CAAC,SAAS,CAAC,CAAC;AAC3B,CAAC;AAbD,0EAaC","sourcesContent":["import BigNumber from 'bignumber.js';\n\nexport function calculatePriceLimitForTrade(\n  orderPrice: number,\n  amount: number,\n): bigint {\n  // Ensure orderPrice is BigInt\n  const orderPriceBigInt = BigNumber(orderPrice);\n\n  // Calculate 50% of the order price\n  const offset = orderPriceBigInt.div(2);\n\n  // Determine if the amount is positive or negative and adjust the price accordingly\n  if (amount > 0) {\n    // Trade is long, so add\n    return BigInt(\n      BigNumber(orderPriceBigInt).plus(offset).times(1e18).toFixed(0),\n    );\n  } else {\n    return BigInt(\n      BigNumber(orderPriceBigInt).minus(offset).times(1e18).toFixed(0),\n    );\n  }\n}\n\nexport function calculateOrderBaseFromOrderSize(\n  orderSize: number,\n  currentPrice: number,\n): bigint {\n  const decimalFactor = BigNumber('1000000000000000000'); // 10^18\n  // @todo check decimal places handling if this should stay hardcoded to 6\n\n  const orderBase = BigNumber(orderSize)\n    .times(decimalFactor)\n    .div(currentPrice)\n    .toFixed(0);\n\n  return BigInt(orderBase);\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -33,5 +33,5 @@
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.10.4",
-  "gitHead": "1244bb2e3497cd062367ebe40830a45680460b69"
+  "gitHead": "49d5165ed209db0febeb26c55446bc37e83c54eb"
 }

package/src/services/encode.ts

@@ -41,7 +41,7 @@ export const encodeSingleTrade = (
 ): void => {
   // (int256 orderBase, UD60x18 orderPriceLimit) = abi.decode(matchOrderInputs.inputs, (int256, UD60x18));
   const encodedBasePrice = AbiCoder.defaultAbiCoder().encode(
-    ['int256', 'uint256'], // @todo check if uint256 casts to UD60x18
+    ['int256', 'uint256'],
     [orderBase, orderPriceLimit],
   );
 

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

@@ -20,15 +20,16 @@ export const provideLiquidity = async (
   params: ProvideLiquidityParams,
 ): Promise<ProvideLiquidityResult> => {
   const ownerAddrees = await params.signer.getAddress();
-  // @todo we might not have chainId for reya network, update once we have information
-  const chainId = 80001;
+
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
   const minShares = calculateMinSharesForLp(params.amount);
 
   if (params.amount === 0) {
     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,
@@ -53,8 +54,8 @@ export const provideLiquidity = async (
 export const removeLiquidity = async (
   params: RemoveLiquidityParams,
 ): Promise<RemoveLiquidityResult> => {
-  // @todo we might not have chainId for reya nework, update once we have information
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
 
   if (params.sharesAmount === 0) {
     throw new Error('Shares amount can not be 0');
@@ -62,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/account.ts

@@ -10,8 +10,9 @@ export const createAccount = async (
     params.ownerAddress,
   );
 
-  // @todo update it
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
   const result = await executeTransaction(
     params.signer,
     data,

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

@@ -19,7 +19,9 @@ export const deposit = async (
     exchangeId,
   );
 
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
   const result = await executeTransaction(
     params.signer,
     data,

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

@@ -20,7 +20,9 @@ export const withdraw = async (
     exchangeId,
   );
 
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
   const result = await executeTransaction(
     params.signer,
     data,

package/src/services/orders/order.ts

@@ -38,8 +38,9 @@ export const matchOrder = async (
     params.market.exchangeId,
   );
 
-  // @todo update it
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
   const result = await executeTransaction(
     params.signer,
     data,
@@ -76,8 +77,9 @@ export const closeOrder = async (
     params.market.exchangeId,
   );
 
-  // @todo update it
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
+
   const result = await executeTransaction(
     params.signer,
     data,

package/src/services/token/approve.ts

@@ -7,8 +7,8 @@ export const approveTokenSpending = async (
 ): Promise<number> => {
   const underLyingTokenAddress = params.token;
 
-  // @todo update once we know this
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
 
   const tokenContract = getERC20TokenContract(
     underLyingTokenAddress,

package/src/services/token/consts.ts

@@ -13,8 +13,8 @@ export const tokenDetails: {
     tokenName: 'USDC',
     tokenDecimals: 6,
   },
-  // mainnet
-  '--': {
+  // reya cronos
+  '0x51b0b7f083e563d5cf9d0b5f3916b59fc49c7e5f': {
     tokenName: 'USDC',
     tokenDecimals: 6,
   },
@@ -24,9 +24,34 @@ export const tokenDetails: {
     tokenName: 'WETH',
     tokenDecimals: 18,
   },
-  // mainnet
-  '---': {
+  // reya cronos
+  '0xcbdba2ac8f840711948ccd7a1b9ec0226d641693': {
     tokenName: 'WETH',
     tokenDecimals: 18,
   },
+
+  // ====== wBTC ======
+  // mumbai
+  '0x2fa2e7a6deb7bb51b625336dbe1da23511914a8a': {
+    tokenName: 'WBTC',
+    tokenDecimals: 8,
+  },
+  // mainnet
+  '0xaf21abab55a7c0ab143e0379a3c01054e4ebb514': {
+    tokenName: 'WBTC',
+    tokenDecimals: 8,
+  },
+  // ====== USDT ======
+  // reya cronos
+  '0xeba6f8d7d4d4787f29441db1164548299ef4641f': {
+    tokenName: 'USDT',
+    tokenDecimals: 6,
+  },
+
+  // ====== dai ======
+  // reya cronos
+  '0x0d4fad8b258a467286fc2419ffc19015fdcae7f9': {
+    tokenName: 'USDT',
+    tokenDecimals: 18,
+  },
 };

package/src/services/token/getAllowance.ts

@@ -7,8 +7,8 @@ export const getAllowance = async (
 ): Promise<number> => {
   const underLyingTokenAddress = params.token;
 
-  // @todo update
-  const chainId = 80001;
+  const network = await params.signer.provider?.getNetwork();
+  const chainId = Number(network?.chainId);
 
   const contractProxyAddress =
     params.type === ApprovalType.DEPOSIT

package/src/utils/contractAddresses.ts

@@ -1,23 +1,20 @@
 export type Address = Lowercase<string>;
 
 // @todo update with proper chainId for mainnet
-export type SupportedChainId = 80001 | 999;
+export type SupportedChainId = 80001 | 1729;
 
 export type ContractType = 'core_proxy' | 'passive_pool_proxy';
 
 const addresses: Record<SupportedChainId, Record<ContractType, Address>> = {
   80001: {
-    core_proxy: '0xdb8cd625873ca9d7b6529ffafe5ecdd3746708b4',
-    passive_pool_proxy: '0xbc8fb7d6ceace18ce15d473b8ae5849e2394f5c5',
+    core_proxy: '0xc2f1b4a1275b7338e0eb03967fea3858af4bc900',
+    passive_pool_proxy: '0x1b9d499f3ac864b8d4da415846d1d1916e00a6ff',
   },
-  999: {
-    core_proxy: '0xdb8cd625873ca9d7b6529ffafe5ecdd3746708b4',
-    passive_pool_proxy: '0xbc8fb7d6ceace18ce15d473b8ae5849e2394f5c5',
+  1729: {
+    core_proxy: '0x2cb06a22ee9b823a307d22f131380dbe151ece5f',
+    passive_pool_proxy: '0x63df38878c5b8e84d7dcb347b934072add64bdc5',
   },
 };
-
-// @todo update values for mainnet
-
 export const getAddress = (
   chainId: number,
   contractName: ContractType,

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;
 }

package/src/utils/routerCommands.ts

@@ -9,6 +9,7 @@ import { SingleAction } from './action';
 export enum CommandType {
   DEPOSIT,
   WITHDRAW,
+  DUTCH_LIQUIDATION,
   MATCH_ORDER,
   PROPAGATE_CACHE_FLOW,
 }
@@ -18,6 +19,7 @@ const ABI_DEFINITION: { [key in CommandType]: string[] } = {
   [CommandType.WITHDRAW]: ['address', 'uint256'],
   [CommandType.MATCH_ORDER]: ['uint128[]', 'bytes'],
   [CommandType.PROPAGATE_CACHE_FLOW]: [], // @todo Check if correct
+  [CommandType.DUTCH_LIQUIDATION]: [], // @todo update once needed
 };
 
 export type RouterCommand = {

package/src/utils/trade.ts

@@ -27,7 +27,7 @@ export function calculateOrderBaseFromOrderSize(
   orderSize: number,
   currentPrice: number,
 ): bigint {
-  const decimalFactor = BigNumber('1000000'); // 10^6
+  const decimalFactor = BigNumber('1000000000000000000'); // 10^18
   // @todo check decimal places handling if this should stay hardcoded to 6
 
   const orderBase = BigNumber(orderSize)