@reyaxyz/sdk 0.24.7 → 0.25.0

package/dist/services/lp/bridgeAndDepositPassivePool.js

@@ -52,11 +52,11 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 tokenDecimals = (0, common_2.getTokenDetails)(params.pool.tokenAddress).tokenDecimals;
-                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
+                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeBridgeAndDepositPassivePool)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
                     chainId: chainId,
                     tokenAddress: params.pool.tokenAddress.toLowerCase(),
-                }), (0, common_1.getSocketFees)({
+                }), (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: chainId,
                 }), params.pool.id, params.ownerAddress, amount, BigInt(0)), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA6D;AAMtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,0CAAiC,EACjE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,CACV,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;qBAChE,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAvCW,QAAA,2BAA2B,+BAuCtC","sourcesContent":["import {\n  Address,\n  getSocketConnector,\n  getSocketFees,\n  getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n    getSocketFees({\n      moneyInOutChainId: chainId,\n    }),\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAMyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAkD;AAClD,mCAA6D;AAMtD,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,0CAAiC,EACjE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,CACV,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;qBAChE,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAvCW,QAAA,2BAA2B,+BAuCtC","sourcesContent":["import {\n  Address,\n  getSocketConnector,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails } from '../token/common';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: chainId,\n    }),\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/lp/index.js

@@ -19,8 +19,6 @@ __exportStar(require("./lp"), exports);
 __exportStar(require("./bridgeAndDepositPassivePool"), exports);
 __exportStar(require("./transferFromMAToPool"), exports);
 __exportStar(require("./withdrawPassivePoolAndBridge"), exports);
-__exportStar(require("./simulateTransferFromMAToPool"), exports);
 __exportStar(require("./simulateBridgeAndDepositPassivePool"), exports);
 __exportStar(require("./simulateWithdrawPassivePoolAndBridge"), exports);
-__exportStar(require("./simulateBridgeAndDepositPassivePool"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB;AACrB,gEAA8C;AAC9C,yDAAuC;AACvC,iEAA+C;AAC/C,iEAA+C;AAC/C,wEAAsD;AACtD,yEAAuD;AACvD,wEAAsD","sourcesContent":["export * from './types';\nexport * from './lp';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './transferFromMAToPool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './simulateTransferFromMAToPool';\nexport * from './simulateBridgeAndDepositPassivePool';\nexport * from './simulateWithdrawPassivePoolAndBridge';\nexport * from './simulateBridgeAndDepositPassivePool';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/lp/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,uCAAqB;AACrB,gEAA8C;AAC9C,yDAAuC;AACvC,iEAA+C;AAC/C,wEAAsD;AACtD,yEAAuD","sourcesContent":["export * from './types';\nexport * from './lp';\nexport * from './bridgeAndDepositPassivePool';\nexport * from './transferFromMAToPool';\nexport * from './withdrawPassivePoolAndBridge';\nexport * from './simulateBridgeAndDepositPassivePool';\nexport * from './simulateWithdrawPassivePoolAndBridge';\n"]}

package/dist/services/lp/simulateBridgeAndDepositPassivePool.js

@@ -1,67 +1,20 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulateBridgeAndDepositPassivePool = void 0;
-// The maximum is inclusive and the minimum is inclusive
-function getRandomIntInclusive(min, max) {
-    min = Math.ceil(min);
-    max = Math.floor(max);
-    return Math.floor(Math.random() * (max - min + 1) + min);
-}
-var randomSimulation = function () {
-    return {
-        bridgeGasFees: getRandomIntInclusive(1000, 100000),
-        estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),
+var common_1 = require("@reyaxyz/common");
+var simulateBridgeAndDepositPassivePool = function (params) {
+    var bridgeTimeInMS = (0, common_1.getSocketBridgeTime)({
+        moneyInOutChainId: params.moneyInOutChainId,
+    }).bridgeTimeInMS;
+    var fees = (0, common_1.getSocketDepositFees)({
+        moneyInOutChainId: params.moneyInOutChainId,
+    });
+    var result = {
+        fees: fees.fees,
+        feesUnit: fees.feesUnit,
+        bridgeTimeInMS: bridgeTimeInMS,
     };
+    return result;
 };
-var simulateBridgeAndDepositPassivePool = function (
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-params) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, new Promise(function (resolve) {
-                    setTimeout(function () {
-                        resolve(randomSimulation());
-                    }, Math.random() * 100 + 1000);
-                })];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
-    });
-}); };
 exports.simulateBridgeAndDepositPassivePool = simulateBridgeAndDepositPassivePool;
 //# sourceMappingURL=simulateBridgeAndDepositPassivePool.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"simulateBridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/simulateBridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;QAClD,wBAAwB,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;KAC9D,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,mCAAmC,GAAG;AACjD,6DAA6D;AAC7D,MAAiD;;;oBAE1C,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,mCAAmC,uCAY9C","sourcesContent":["import {\n  SimulateBridgeAndDepositPassivePoolParams,\n  SimulateBridgeAndDepositPassivePoolResult,\n} from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n  min = Math.ceil(min);\n  max = Math.floor(max);\n  return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateBridgeAndDepositPassivePoolResult => {\n  return {\n    bridgeGasFees: getRandomIntInclusive(1000, 100000),\n    estimatedDepositedAmount: getRandomIntInclusive(1000, 100000),\n  };\n};\n\nexport const simulateBridgeAndDepositPassivePool = async (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateBridgeAndDepositPassivePoolParams,\n): Promise<SimulateBridgeAndDepositPassivePoolResult> => {\n  return await new Promise((resolve) => {\n    setTimeout(\n      () => {\n        resolve(randomSimulation());\n      },\n      Math.random() * 100 + 1000,\n    );\n  });\n};\n"]}
+{"version":3,"file":"simulateBridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/simulateBridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;AAAA,0CAA4E;AAMrE,IAAM,mCAAmC,GAAG,UACjD,MAAiD;IAEjD,IAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC;QACzC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC5C,CAAC,CAAC,cAAc,CAAC;IAElB,IAAM,IAAI,GAAG,IAAA,6BAAoB,EAAC;QAChC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC5C,CAAC,CAAC;IAEH,IAAM,MAAM,GAA8C;QACxD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,cAAc,EAAE,cAAc;KAC/B,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAlBW,QAAA,mCAAmC,uCAkB9C","sourcesContent":["import { getSocketBridgeTime, getSocketDepositFees } from '@reyaxyz/common';\nimport {\n  SimulateBridgeAndDepositPassivePoolParams,\n  SimulateBridgeAndDepositPassivePoolResult,\n} from './types';\n\nexport const simulateBridgeAndDepositPassivePool = (\n  params: SimulateBridgeAndDepositPassivePoolParams,\n): SimulateBridgeAndDepositPassivePoolResult => {\n  const bridgeTimeInMS = getSocketBridgeTime({\n    moneyInOutChainId: params.moneyInOutChainId,\n  }).bridgeTimeInMS;\n\n  const fees = getSocketDepositFees({\n    moneyInOutChainId: params.moneyInOutChainId,\n  });\n\n  const result: SimulateBridgeAndDepositPassivePoolResult = {\n    fees: fees.fees,\n    feesUnit: fees.feesUnit,\n    bridgeTimeInMS: bridgeTimeInMS,\n  };\n\n  return result;\n};\n"]}

package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js

@@ -1,66 +1,22 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.simulateWithdrawPassivePoolAndBridge = void 0;
-// The maximum is inclusive and the minimum is inclusive
-function getRandomIntInclusive(min, max) {
-    min = Math.ceil(min);
-    max = Math.floor(max);
-    return Math.floor(Math.random() * (max - min + 1) + min);
-}
-var randomSimulation = function () {
-    return {
-        bridgeGasFees: getRandomIntInclusive(1000, 100000),
-    };
-};
+var common_1 = require("@reyaxyz/common");
 var simulateWithdrawPassivePoolAndBridge = function (
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
-params) { return __awaiter(void 0, void 0, void 0, function () {
-    return __generator(this, function (_a) {
-        switch (_a.label) {
-            case 0: return [4 /*yield*/, new Promise(function (resolve) {
-                    setTimeout(function () {
-                        resolve(randomSimulation());
-                    }, Math.random() * 100 + 1000);
-                })];
-            case 1: return [2 /*return*/, _a.sent()];
-        }
+params) {
+    var bridgeTimeInMS = (0, common_1.getSocketBridgeTime)({
+        moneyInOutChainId: params.moneyInOutChainId,
+    }).bridgeTimeInMS;
+    var fees = (0, common_1.getSocketWithdrawFees)({
+        reyaChainId: params.reyaChainId,
+        tokenAddress: params.tokenAddress,
     });
-}); };
+    var result = {
+        fees: fees.fees,
+        bridgeTimeInMS: bridgeTimeInMS,
+    };
+    return result;
+};
 exports.simulateWithdrawPassivePoolAndBridge = simulateWithdrawPassivePoolAndBridge;
 //# sourceMappingURL=simulateWithdrawPassivePoolAndBridge.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAKA,wDAAwD;AACxD,SAAS,qBAAqB,CAAC,GAAW,EAAE,GAAW;IACrD,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrB,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IACtB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC;AAC3D,CAAC;AAED,IAAM,gBAAgB,GAAG;IACvB,OAAO;QACL,aAAa,EAAE,qBAAqB,CAAC,IAAI,EAAE,MAAM,CAAC;KACnD,CAAC;AACJ,CAAC,CAAC;AAEK,IAAM,oCAAoC,GAAG;AAClD,6DAA6D;AAC7D,MAAkD;;;oBAE3C,qBAAM,IAAI,OAAO,CAAC,UAAC,OAAO;oBAC/B,UAAU,CACR;wBACE,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAAC;oBAC9B,CAAC,EACD,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,GAAG,IAAI,CAC3B,CAAC;gBACJ,CAAC,CAAC,EAAA;oBAPF,sBAAO,SAOL,EAAC;;;KACJ,CAAC;AAZW,QAAA,oCAAoC,wCAY/C","sourcesContent":["import {\n  SimulateWithdrawPassivePoolAndBridgeParams,\n  SimulateWithdrawPassivePoolAndBridgeResult,\n} from './types';\n\n// The maximum is inclusive and the minimum is inclusive\nfunction getRandomIntInclusive(min: number, max: number) {\n  min = Math.ceil(min);\n  max = Math.floor(max);\n  return Math.floor(Math.random() * (max - min + 1) + min);\n}\n\nconst randomSimulation = (): SimulateWithdrawPassivePoolAndBridgeResult => {\n  return {\n    bridgeGasFees: getRandomIntInclusive(1000, 100000),\n  };\n};\n\nexport const simulateWithdrawPassivePoolAndBridge = async (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateWithdrawPassivePoolAndBridgeParams,\n): Promise<SimulateWithdrawPassivePoolAndBridgeResult> => {\n  return await new Promise((resolve) => {\n    setTimeout(\n      () => {\n        resolve(randomSimulation());\n      },\n      Math.random() * 100 + 1000,\n    );\n  });\n};\n"]}
+{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;AAAA,0CAA6E;AAMtE,IAAM,oCAAoC,GAAG;AAClD,6DAA6D;AAC7D,MAAkD;IAElD,IAAM,cAAc,GAAG,IAAA,4BAAmB,EAAC;QACzC,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;KAC5C,CAAC,CAAC,cAAc,CAAC;IAElB,IAAM,IAAI,GAAG,IAAA,8BAAqB,EAAC;QACjC,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,YAAY,EAAE,MAAM,CAAC,YAAY;KAClC,CAAC,CAAC;IAEH,IAAM,MAAM,GAA+C;QACzD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,cAAc,EAAE,cAAc;KAC/B,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAnBW,QAAA,oCAAoC,wCAmB/C","sourcesContent":["import { getSocketBridgeTime, getSocketWithdrawFees } from '@reyaxyz/common';\nimport {\n  SimulateWithdrawPassivePoolAndBridgeParams,\n  SimulateWithdrawPassivePoolAndBridgeResult,\n} from './types';\n\nexport const simulateWithdrawPassivePoolAndBridge = (\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  params: SimulateWithdrawPassivePoolAndBridgeParams,\n): SimulateWithdrawPassivePoolAndBridgeResult => {\n  const bridgeTimeInMS = getSocketBridgeTime({\n    moneyInOutChainId: params.moneyInOutChainId,\n  }).bridgeTimeInMS;\n\n  const fees = getSocketWithdrawFees({\n    reyaChainId: params.reyaChainId,\n    tokenAddress: params.tokenAddress,\n  });\n\n  const result: SimulateWithdrawPassivePoolAndBridgeResult = {\n    fees: fees.fees,\n    bridgeTimeInMS: bridgeTimeInMS,\n  };\n\n  return result;\n};\n"]}

package/dist/services/lp/transferFromMAToPool.js

@@ -57,7 +57,7 @@ var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0,
             case 2:
                 eip712Signature = _c.sent();
                 tokenDecimals = (0, common_2.getTokenDetails)(params.pool.tokenAddress).tokenDecimals;
-                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
+                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, params.owner.address, BigInt(0)), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
             case 3:

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

@@ -1 +1 @@
-{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAA+D;AAC/D,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAyD;AACzD,mCAAsD;AAKtD,6CAAgE;AAEzD,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;oBAElB,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;gBAEjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,eAAe,EACtB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,CACV,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,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,oBAAoB,wBAqC/B","sourcesContent":["import { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n  TransferFromMAToPoolParams,\n  TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const transferFromMAToPool = async (\n  params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeTransferFromMAToPool(\n    params.marginAccountId,\n    amount,\n    eip712Signature,\n    params.pool.id,\n    params.owner.address,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAsE;AACtE,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAkD;AAClD,mCAAsD;AAKtD,6CAAgE;AAEzD,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;oBAElB,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;gBAEjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,cAA9C,CAA+C;gBAC9D,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,eAAe,EACtB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,CAAC,CAAC,CACV,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,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,oBAAoB,wBAqC/B","sourcesContent":["import { getCurrentTimestampInSeconds, scale } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails } from '../token/common';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n  TransferFromMAToPoolParams,\n  TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const transferFromMAToPool = async (\n  params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.pool.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeTransferFromMAToPool(\n    params.marginAccountId,\n    amount,\n    eip712Signature,\n    params.pool.id,\n    params.owner.address,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  LpPoolEntity,\n  LpWithdrawBalanceEntity,\n  MarginAccountEntity,\n  OwnerMetadataEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n  lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateTransferFromMAToPoolResult = {\n  bridgeGasFees: number;\n  estimatedDepositedAmount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateTransferFromMAToPoolParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  amount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n  bridgeGasFees: number;\n  estimatedDepositedAmount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  amount: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n  bridgeGasFees: number;\n};\n\n// TODO: Milan, Alex reevaluate these params\nexport type SimulateWithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  tokenAddress: LpPoolEntity['tokenAddress'];\n  amount: number;\n};\n"]}
+{"version":3,"file":"types.js","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"","sourcesContent":["import { JsonRpcSigner, Signer } from 'ethers';\nimport {\n  LpPoolEntity,\n  LpWithdrawBalanceEntity,\n  MarginAccountEntity,\n  MoneyInOutChainId,\n  OwnerMetadataEntity,\n  ReyaChainId,\n  TokenEntity,\n} from '@reyaxyz/common';\n\nexport type ProvideLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  amount: number;\n  lpPoolId: LpPoolEntity['id'];\n};\n\nexport type RemoveLiquidityParams = {\n  signer: Signer | JsonRpcSigner;\n  lpPoolId: LpPoolEntity['id'];\n  amount: number;\n};\n\nexport type ProvideLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type RemoveLiquidityResult = {\n  transactionHash: string | null;\n};\n\nexport type TransferFromMAToPoolParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'coreSigNonce'>;\n  marginAccountId: MarginAccountEntity['id'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type TransferFromMAToPoolResult = {\n  transactionHash: string | null;\n};\n\nexport type WithdrawPassivePoolAndBridgeParams = {\n  signer: Signer | JsonRpcSigner;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n  fees: number;\n  feesUnit: string;\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n  moneyInOutChainId: MoneyInOutChainId;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n  fees: number;\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeParams = {\n  reyaChainId: ReyaChainId;\n  moneyInOutChainId: MoneyInOutChainId;\n  tokenAddress: TokenEntity['address'];\n};\n"]}

package/dist/services/lp/withdrawPassivePoolAndBridge.js

@@ -43,7 +43,6 @@ var sign_1 = require("../sign");
 var encode_1 = require("./encode");
 var common_1 = require("@reyaxyz/common");
 var consts_1 = require("../../utils/consts");
-var common_2 = require("../token/common");
 var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var network, chainId, sharesAmount, eip712Signature, _a, data, value, result;
     var _b;
@@ -53,7 +52,7 @@ var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0,
             case 1:
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                sharesAmount = (0, common_2.scale)(30)(params.amount * params.sharePrice);
+                sharesAmount = (0, common_1.scale)(30)(params.amount * params.sharePrice);
                 return [4 /*yield*/, (0, sign_1.signPoolRemoveLiquidity)(params.signer, chainId, params.owner.address, params.pool.id, sharesAmount, BigInt(0), params.owner.poolSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
             case 2:
                 eip712Signature = _c.sent();

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAAkD;AAKlD,mCAA8D;AAC9D,0CAKyB;AACzB,6CAAgE;AAChE,0CAAwC;AAEjC,IAAM,4BAA4B,GAAG,UAC1C,MAA0C;;;;;oBAE1B,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,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAE1C,qBAAM,IAAA,8BAAuB,EACnD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBATK,eAAe,GAAG,SASvB;gBAEK,KAA4B,IAAA,2CAAkC,EAClE,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM;gBAC1B,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,IAAA,4BAAmB,EAAC;oBAClB,WAAW,EAAE,OAAO;oBACpB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAhBiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAgB3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAhDW,QAAA,4BAA4B,gCAgDvC","sourcesContent":["import { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signPoolRemoveLiquidity } from '../sign';\nimport {\n  WithdrawPassivePoolAndBridgeParams,\n  WithdrawPassivePoolAndBridgeResult,\n} from './types';\nimport { encodeWithdrawPassivePoolAndBridge } from './encode';\nimport {\n  Address,\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketController,\n} from '@reyaxyz/common';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { scale } from '../token/common';\n\nexport const withdrawPassivePoolAndBridge = async (\n  params: WithdrawPassivePoolAndBridgeParams,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const sharesAmount = scale(30)(params.amount * params.sharePrice);\n\n  const eip712Signature = await signPoolRemoveLiquidity(\n    params.signer,\n    chainId,\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    params.owner.poolSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    BigInt('10000000'), //todo\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n    getSocketController({\n      reyaChainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n    params.owner.address,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAAkD;AAKlD,mCAA8D;AAC9D,0CAMyB;AACzB,6CAAgE;AAEzD,IAAM,4BAA4B,GAAG,UAC1C,MAA0C;;;;;oBAE1B,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,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAE1C,qBAAM,IAAA,8BAAuB,EACnD,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBATK,eAAe,GAAG,SASvB;gBAEK,KAA4B,IAAA,2CAAkC,EAClE,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM;gBAC1B,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,IAAA,4BAAmB,EAAC;oBAClB,WAAW,EAAE,OAAO;oBACpB,YAAY,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,WAAW,EAAa;iBAChE,CAAC,EACF,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAhBiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAgB3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,eAAe,CAC7B,EAAA;;gBANK,MAAM,GAAG,SAMd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAhDW,QAAA,4BAA4B,gCAgDvC","sourcesContent":["import { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signPoolRemoveLiquidity } from '../sign';\nimport {\n  WithdrawPassivePoolAndBridgeParams,\n  WithdrawPassivePoolAndBridgeResult,\n} from './types';\nimport { encodeWithdrawPassivePoolAndBridge } from './encode';\nimport {\n  Address,\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketController,\n  scale,\n} from '@reyaxyz/common';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawPassivePoolAndBridge = async (\n  params: WithdrawPassivePoolAndBridgeParams,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const sharesAmount = scale(30)(params.amount * params.sharePrice);\n\n  const eip712Signature = await signPoolRemoveLiquidity(\n    params.signer,\n    chainId,\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    params.owner.poolSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    BigInt('10000000'), //todo\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n    getSocketController({\n      reyaChainId: chainId,\n      tokenAddress: params.pool.tokenAddress.toLowerCase() as Address,\n    }),\n    params.owner.address,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -57,11 +57,11 @@ var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, voi
             case 2:
                 eip712Signature = _c.sent();
                 tokenDecimals = (0, common_2.getTokenDetails)(params.tokenAddress).tokenDecimals;
-                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
+                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeBridgeAndDepositExistingMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
                     chainId: chainId,
                     tokenAddress: params.tokenAddress,
-                }), (0, common_1.getSocketFees)({
+                }), (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: chainId,
                 }), params.marginAccountId, params.tokenAddress, amount, eip712Signature), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9CW,QAAA,yBAAyB,6BA8CpC","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketFees,\n  getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExisingMAParams,\n  BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n  params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    getSocketFees({\n      moneyInOutChainId: chainId,\n    }),\n    params.marginAccountId,\n    params.tokenAddress,\n    amount,\n    eip712Signature,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAMyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAkD;AAClD,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAEzD,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,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;gBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,OAAO,EACP,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,CAChB,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AA9CW,QAAA,yBAAyB,6BA8CpC","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails } from '../token/common';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExisingMAParams,\n  BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const bridgeAndDepositExisingMA = async (\n  params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    chainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: chainId,\n    }),\n    params.marginAccountId,\n    params.tokenAddress,\n    amount,\n    eip712Signature,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -52,11 +52,11 @@ var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0,
                 network = _c.sent();
                 chainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
                 tokenDecimals = (0, common_2.getTokenDetails)(params.tokenAddress).tokenDecimals;
-                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
+                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeBridgeAndDepositNewMA)((0, contractAddresses_1.getAddress)(chainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), (0, common_1.getSocketConnector)({
                     chainId: chainId,
                     tokenAddress: params.tokenAddress,
-                }), (0, common_1.getSocketFees)({
+                }), (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: chainId,
                 }), params.ownerAddress, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, chainId, (0, common_1.getSocketVault)({

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositNewMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAyD;AACzD,mCAAuD;AAMhD,IAAM,qBAAqB,GAAG,UACnC,MAAmC;;;;;oBAEnB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,sBAAa,EAAC;oBACZ,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC","sourcesContent":["import {\n  getSocketConnector,\n  getSocketFees,\n  getSocketVault,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeBridgeAndDepositNewMA } from './encode';\nimport {\n  BridgeAndDepositNewMAParams,\n  BridgeAndDepositNewMAResult,\n} from './types';\n\nexport const bridgeAndDepositNewMA = async (\n  params: BridgeAndDepositNewMAParams,\n): Promise<BridgeAndDepositNewMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    getSocketFees({\n      moneyInOutChainId: chainId,\n    }),\n    params.ownerAddress,\n    params.tokenAddress,\n    amount,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"bridgeAndDepositNewMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositNewMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,0CAAkD;AAClD,mCAAuD;AAMhD,IAAM,qBAAqB,GAAG,UACnC,MAAmC;;;;;oBAEnB,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;gBAEjC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,OAAO,EAAE,gCAAY,CAAC,eAAe,CAAC,EACjD,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;oBACjB,OAAO,EAAE,OAAO;oBAChB,YAAY,EAAE,MAAM,CAAC,YAAY;iBAClC,CAAC,EACF,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,OAAO;iBAC3B,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,OAAO,EACP,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,OAAO;wBAC1B,YAAY,EAAE,MAAM,CAAC,YAAY;qBAClC,CAAC,CACH,EAAA;;gBATK,MAAM,GAAG,SASd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;qBACtC,EAAC;;;KACH,CAAC;AAtCW,QAAA,qBAAqB,yBAsChC","sourcesContent":["import {\n  getSocketConnector,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails } from '../token/common';\nimport { encodeBridgeAndDepositNewMA } from './encode';\nimport {\n  BridgeAndDepositNewMAParams,\n  BridgeAndDepositNewMAResult,\n} from './types';\n\nexport const bridgeAndDepositNewMA = async (\n  params: BridgeAndDepositNewMAParams,\n): Promise<BridgeAndDepositNewMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n    getAddress(chainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: chainId,\n    }),\n    params.ownerAddress,\n    params.tokenAddress,\n    amount,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    chainId,\n    getSocketVault({\n      moneyInOutChainId: chainId,\n      tokenAddress: params.tokenAddress,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -41,6 +41,7 @@ var encode_1 = require("./encode");
 var executeTransaction_1 = require("../executeTransaction");
 var common_1 = require("../token/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
+var common_2 = require("@reyaxyz/common");
 var deposit = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var tokenDecimals, amount, _a, data, value, network, chainId, result;
     var _b;
@@ -48,7 +49,7 @@ var deposit = function (params) { return __awaiter(void 0, void 0, void 0, funct
         switch (_c.label) {
             case 0:
                 tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
-                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeDeposit)(params.marginAccountId, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:

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,0CAAyD;AACzD,mEAA6D;AAEtD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEb,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;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,gCAAY,CAAC,UAAU,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;AAzBW,QAAA,OAAO,WAyBlB","sourcesContent":["import { DepositParams, DepositResult } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { ContractType } from '../../utils/contractAddresses';\n\nexport const deposit = async (\n  params: DepositParams,\n): Promise<DepositResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n  const { calldata: data, value } = encodeDeposit(\n    params.marginAccountId,\n    params.tokenAddress,\n    amount,\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    ContractType.CORE_PROXY,\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,0CAAkD;AAClD,mEAA6D;AAC7D,0CAAwC;AAEjC,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEb,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,KAA4B,IAAA,sBAAa,EAC7C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;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,gCAAY,CAAC,UAAU,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;AAzBW,QAAA,OAAO,WAyBlB","sourcesContent":["import { DepositParams, DepositResult } from './types';\nimport { encodeDeposit } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails } from '../token/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale } from '@reyaxyz/common';\n\nexport const deposit = async (\n  params: DepositParams,\n): Promise<DepositResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n  const { calldata: data, value } = encodeDeposit(\n    params.marginAccountId,\n    params.tokenAddress,\n    amount,\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    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -17,12 +17,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./types"), exports);
 __exportStar(require("./account"), exports);
 __exportStar(require("./deposit"), exports);
-__exportStar(require("./simulateDeposit"), exports);
-__exportStar(require("./simulateWithdraw"), exports);
 __exportStar(require("./withdraw"), exports);
 __exportStar(require("./bridgeAndDepositExistingMA"), exports);
 __exportStar(require("./bridgeAndDepositNewMA"), exports);
 __exportStar(require("./transferMarginBetweenAccounts"), exports);
 __exportStar(require("./withdrawMAAndBridge"), exports);
-__exportStar(require("./simulateTransferMarginBetweenAccounts"), exports);
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,oDAAkC;AAClC,qDAAmC;AACnC,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC;AACtC,0EAAwD","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './simulateDeposit';\nexport * from './simulateWithdraw';\nexport * from './withdraw';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './bridgeAndDepositNewMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\nexport * from './simulateTransferMarginBetweenAccounts';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["services/margin-accounts/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,4CAA0B;AAC1B,4CAA0B;AAC1B,6CAA2B;AAC3B,+DAA6C;AAC7C,0DAAwC;AACxC,kEAAgD;AAChD,wDAAsC","sourcesContent":["export * from './types';\nexport * from './account';\nexport * from './deposit';\nexport * from './withdraw';\nexport * from './bridgeAndDepositExistingMA';\nexport * from './bridgeAndDepositNewMA';\nexport * from './transferMarginBetweenAccounts';\nexport * from './withdrawMAAndBridge';\n"]}

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

@@ -37,9 +37,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transferMarginBetweenAccounts = void 0;
+var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var executeTransaction_1 = require("../executeTransaction");
-var common_1 = require("../token/common");
+var common_2 = require("../token/common");
 var encode_1 = require("./encode");
 var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var tokenDecimals, amount, _a, data, value, network, chainId, result;
@@ -47,7 +48,7 @@ var transferMarginBetweenAccounts = function (params) { return __awaiter(void 0,
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
+                tokenDecimals = (0, common_2.getTokenDetails)(params.tokenAddress).tokenDecimals;
                 amount = (0, common_1.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeTransferMargin)(params.fromMarginAccountId, params.toMarginAccountId, params.tokenAddress, amount), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];

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

@@ -1 +1 @@
-{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAA6D;AAC7D,4DAA2D;AAC3D,0CAAyD;AACzD,mCAAgD;AAMzC,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;;gBAEnC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,KAA4B,IAAA,6BAAoB,EACpD,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EALiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAK3B;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,gCAAY,CAAC,UAAU,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;AA1BW,QAAA,6BAA6B,iCA0BxC","sourcesContent":["import { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeTransferMargin } from './encode';\nimport {\n  TransferMarginBetweenAccountsParams,\n  TransferMarginBetweenAccountsResult,\n} from './types';\n\nexport const transferMarginBetweenAccounts = async (\n  params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n  const { calldata: data, value } = encodeTransferMargin(\n    params.fromMarginAccountId,\n    params.toMarginAccountId,\n    params.tokenAddress,\n    amount,\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    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"transferMarginBetweenAccounts.js","sourceRoot":"/","sources":["services/margin-accounts/transferMarginBetweenAccounts.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAAwC;AACxC,mEAA6D;AAC7D,4DAA2D;AAC3D,0CAAkD;AAClD,mCAAgD;AAMzC,IAAM,6BAA6B,GAAG,UAC3C,MAA2C;;;;;;gBAEnC,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,KAA4B,IAAA,6BAAoB,EACpD,MAAM,CAAC,mBAAmB,EAC1B,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,YAAY,EACnB,MAAM,CACP,EALiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAK3B;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,gCAAY,CAAC,UAAU,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;AA1BW,QAAA,6BAA6B,iCA0BxC","sourcesContent":["import { scale } from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails } from '../token/common';\nimport { encodeTransferMargin } from './encode';\nimport {\n  TransferMarginBetweenAccountsParams,\n  TransferMarginBetweenAccountsResult,\n} from './types';\n\nexport const transferMarginBetweenAccounts = async (\n  params: TransferMarginBetweenAccountsParams,\n): Promise<TransferMarginBetweenAccountsResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n  const { calldata: data, value } = encodeTransferMargin(\n    params.fromMarginAccountId,\n    params.toMarginAccountId,\n    params.tokenAddress,\n    amount,\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    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -41,6 +41,7 @@ var encode_1 = require("./encode");
 var executeTransaction_1 = require("../executeTransaction");
 var common_1 = require("../token/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
+var common_2 = require("@reyaxyz/common");
 var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var tokenDecimals, amount, _a, data, value, network, chainId, result;
     var _b;
@@ -48,7 +49,7 @@ var withdraw = function (params) { return __awaiter(void 0, void 0, void 0, func
         switch (_c.label) {
             case 0:
                 tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
-                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                amount = (0, common_2.scale)(tokenDecimals)(params.amount);
                 _a = (0, encode_1.encodeWithdraw)(params.marginAccountId, params.tokenAddress, BigInt(amount)), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
             case 1:

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,0CAAyD;AACzD,mEAA6D;AAEtD,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEd,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,CAAC,CACf,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;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,gCAAY,CAAC,UAAU,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;AA1BW,QAAA,QAAQ,YA0BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails, scale } from '../token/common';\nimport { ContractType } from '../../utils/contractAddresses';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeWithdraw(\n    params.marginAccountId,\n    params.tokenAddress,\n    BigInt(amount),\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    ContractType.CORE_PROXY,\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,0CAAkD;AAClD,mEAA6D;AAC7D,0CAAwC;AAEjC,IAAM,QAAQ,GAAG,UACtB,MAAsB;;;;;;gBAEd,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,KAA4B,IAAA,uBAAc,EAC9C,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,MAAM,CAAC,CACf,EAJiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAI3B;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,gCAAY,CAAC,UAAU,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;AA1BW,QAAA,QAAQ,YA0BnB","sourcesContent":["import { WithdrawParams, WithdrawResult } from './types';\nimport { encodeWithdraw } from './encode';\nimport { executeTransaction } from '../executeTransaction';\nimport { getTokenDetails } from '../token/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { scale } from '@reyaxyz/common';\n\nexport const withdraw = async (\n  params: WithdrawParams,\n): Promise<WithdrawResult> => {\n  const { tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const { calldata: data, value } = encodeWithdraw(\n    params.marginAccountId,\n    params.tokenAddress,\n    BigInt(amount),\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    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -59,7 +59,7 @@ var withdrawMAAndBridge = function (_a) {
                 case 2:
                     eip712Signature = _e.sent();
                     tokenDecimals = (0, common_2.getTokenDetails)(tokenAddress).tokenDecimals;
-                    scaledAmount = (0, common_2.scale)(tokenDecimals)(amount);
+                    scaledAmount = (0, common_1.scale)(tokenDecimals)(amount);
                     _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, tokenAddress, scaledAmount, eip712Signature, BigInt('10000000'), (0, common_1.getSocketConnector)({
                         chainId: chainId,
                         tokenAddress: tokenAddress,

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAyD;AACzD,mCAAqD;AAKrD,6CAAgE;AAEzD,IAAM,mBAAmB,GAAG,UAAO,EAOd;QAN1B,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,KAAK,WAAA,EACL,MAAM,YAAA,EACN,YAAY,kBAAA,EACZ,uBAA+B,EAA/B,eAAe,mBAAG,KAAK,CAAC,OAAO,KAAA;;;;;;wBAEf,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,eAAe,EACf,KAAK,CAAC,YAAY,EAClB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBANK,eAAe,GAAG,SAMvB;oBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,YAAY,CAAC,cAAlC,CAAmC;oBAClD,YAAY,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;oBAE5C,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;wBACjB,OAAO,SAAA;wBACP,YAAY,cAAA;qBACb,CAAC,EACF,IAAA,4BAAmB,EAAC;wBAClB,WAAW,EAAE,OAAO;wBACpB,YAAY,cAAA;qBACb,CAAC,EACF,eAAe,CAChB,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AAjDW,QAAA,mBAAmB,uBAiD9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketController,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails, scale } from '../token/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  marginAccountId,\n  owner,\n  amount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    marginAccountId,\n    owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(tokenAddress);\n  const scaledAmount = scale(tokenDecimals)(amount);\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    tokenAddress,\n    scaledAmount,\n    eip712Signature,\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId,\n      tokenAddress,\n    }),\n    getSocketController({\n      reyaChainId: chainId,\n      tokenAddress,\n    }),\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}
+{"version":3,"file":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAKyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,0CAAkD;AAClD,mCAAqD;AAKrD,6CAAgE;AAEzD,IAAM,mBAAmB,GAAG,UAAO,EAOd;QAN1B,MAAM,YAAA,EACN,eAAe,qBAAA,EACf,KAAK,WAAA,EACL,MAAM,YAAA,EACN,YAAY,kBAAA,EACZ,uBAA+B,EAA/B,eAAe,mBAAG,KAAK,CAAC,OAAO,KAAA;;;;;;wBAEf,qBAAM,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;oBAA7C,OAAO,GAAG,SAAmC;oBAC7C,OAAO,GAAG,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBACjB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,eAAe,EACf,KAAK,CAAC,YAAY,EAClB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBANK,eAAe,GAAG,SAMvB;oBAEO,aAAa,GAAK,IAAA,wBAAe,EAAC,YAAY,CAAC,cAAlC,CAAmC;oBAClD,YAAY,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC;oBAE5C,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,YAAY,EACZ,YAAY,EACZ,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,IAAA,2BAAkB,EAAC;wBACjB,OAAO,SAAA;wBACP,YAAY,cAAA;qBACb,CAAC,EACF,IAAA,4BAAmB,EAAC;wBAClB,WAAW,EAAE,OAAO;wBACpB,YAAY,cAAA;qBACb,CAAC,EACF,eAAe,CAChB,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,OAAO,EACP,gCAAY,CAAC,UAAU,CACxB,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AAjDW,QAAA,mBAAmB,uBAiD9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnector,\n  getSocketController,\n  scale,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { getTokenDetails } from '../token/common';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  marginAccountId,\n  owner,\n  amount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const chainId = Number(network?.chainId);\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    marginAccountId,\n    owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenDecimals } = getTokenDetails(tokenAddress);\n  const scaledAmount = scale(tokenDecimals)(amount);\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    tokenAddress,\n    scaledAmount,\n    eip712Signature,\n    BigInt('10000000'),\n    getSocketConnector({\n      chainId,\n      tokenAddress,\n    }),\n    getSocketController({\n      reyaChainId: chainId,\n      tokenAddress,\n    }),\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    signer,\n    data,\n    value,\n    chainId,\n    ContractType.CORE_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/token/common.js

@@ -36,24 +36,11 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getERC20Balance = exports.getERC20Allowance = exports.getTokenDetails = exports.convertToAddress = exports.getERC20TokenContract = exports.scale = exports.descale = void 0;
+exports.getERC20Balance = exports.getERC20Allowance = exports.getTokenDetails = exports.convertToAddress = exports.getERC20TokenContract = void 0;
 var ethers_1 = require("ethers");
 var consts_1 = require("./consts");
 var retry_1 = require("../../utils/retry");
-var descale = function (tokenDecimals) {
-    var f = function (value) {
-        return Number(ethers_1.ethers.formatUnits(value.toString(), tokenDecimals));
-    };
-    return f;
-};
-exports.descale = descale;
-var scale = function (tokenDecimals) {
-    var f = function (value) {
-        return BigInt(ethers_1.ethers.parseUnits(value.toFixed(tokenDecimals), tokenDecimals));
-    };
-    return f;
-};
-exports.scale = scale;
+var common_1 = require("@reyaxyz/common");
 var getERC20TokenContract = function (tokenAddress, subject) {
     var abi = [
         "function approve(address, uint256) external returns (bool)",
@@ -78,7 +65,7 @@ var getTokenDetails = function (caseSensitiveAddress) {
     return {
         tokenName: tokenName,
         tokenDecimals: tokenDecimals,
-        tokenDescaler: (0, exports.descale)(tokenDecimals),
+        tokenDescaler: (0, common_1.descale)(tokenDecimals),
     };
 };
 exports.getTokenDetails = getTokenDetails;
@@ -96,9 +83,9 @@ var getERC20Allowance = function (_a) {
                         })];
                 case 1:
                     allowance = _b.sent();
-                    return [2 /*return*/, BigInt(allowance) > (0, exports.scale)(tokenDecimals)(Number.MAX_SAFE_INTEGER)
+                    return [2 /*return*/, BigInt(allowance) > (0, common_1.scale)(tokenDecimals)(Number.MAX_SAFE_INTEGER)
                             ? Number.MAX_SAFE_INTEGER
-                            : (0, exports.descale)(tokenDecimals)(allowance)];
+                            : (0, common_1.descale)(tokenDecimals)(allowance)];
             }
         });
     });