@reyaxyz/sdk 0.34.3 → 0.35.0

package/dist/abis/socket/VaultWithPayload.json

@@ -1,5 +1,35 @@
 {
     "abi": [
-        "function depositToAppChain(address receiver_, uint256 amount_, uint256 msgGasLimit_ address connector_, bytes calldata execPayload_)"
+        {
+            "type": "function",
+            "name": "depositToAppChain",
+            "inputs": [
+                {
+                    "name": "receiver_",
+                    "type": "address",
+                    "internalType": "address"
+                },
+                {
+                    "name": "amount_",
+                    "type": "uint256",
+                    "internalType": "uint256"
+                },
+                {
+                    "name": "msgGasLimit_",
+                    "type": "uint256",
+                    "internalType": "uint256"
+                },
+                {
+                    "name": "connector_",
+                    "type": "address",
+                    "internalType": "address"
+                },
+                {
+                    "name": "execPayload_",
+                    "type": "bytes",
+                    "internalType": "bytes"
+                }
+            ]
+        }
     ]
 }

package/dist/index.js

@@ -19,5 +19,4 @@ __exportStar(require("./services/margin-accounts"), exports);
 __exportStar(require("./services/money-flows"), exports);
 __exportStar(require("./services/orders"), exports);
 __exportStar(require("./services/token"), exports);
-__exportStar(require("./utils/network"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,mDAAiC;AACjC,kDAAgC","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/token';\nexport * from './utils/network';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"/","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,gDAA8B;AAC9B,6DAA2C;AAC3C,yDAAuC;AACvC,oDAAkC;AAClC,mDAAiC","sourcesContent":["export * from './services/lp';\nexport * from './services/margin-accounts';\nexport * from './services/money-flows';\nexport * from './services/orders';\nexport * from './services/token';\n"]}

package/dist/services/lp/bridgeAndDepositPassivePool.js

@@ -41,32 +41,31 @@ var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var executeTransaction_1 = require("../executeTransaction");
 var encode_1 = require("./encode");
-var network_1 = require("../../utils/network");
 var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var network, moneyInOutChainId, _a, tokenName, tokenDecimals, amount, socketConnectors, peripheryAddress, _b, data, value, result;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0: return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
+    var network, moneyInOutChainId, tokenInfo, amount, socketConnectors, peripheryAddress, _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 = _d.sent();
+                network = _c.sent();
                 moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                _a = (0, common_1.getTokenDetails)(params.pool.tokenAddress), tokenName = _a.tokenName, tokenDecimals = _a.tokenDecimals;
-                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.pool.tokenAddress);
+                amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
                 socketConnectors = (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: moneyInOutChainId,
-                    tokenName: tokenName,
+                    tokenName: tokenInfo.name,
                 });
-                peripheryAddress = (0, contractAddresses_1.getAddress)((0, network_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId), contractAddresses_1.ContractType.PERIPHERY_PROXY);
-                _b = (0, encode_1.encodeBridgeAndDepositPassivePool)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
+                peripheryAddress = (0, contractAddresses_1.getAddress)((0, common_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId), contractAddresses_1.ContractType.PERIPHERY_PROXY);
+                _a = (0, encode_1.encodeBridgeAndDepositPassivePool)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: moneyInOutChainId,
-                }), params.pool.id, params.ownerAddress, amount, BigInt(0), BigInt('10000000'), socketConnectors.withdraw), data = _b.calldata, value = _b.value;
+                }), params.pool.id, params.ownerAddress, amount, BigInt(0), BigInt('10000000'), socketConnectors.withdraw), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, moneyInOutChainId, (0, common_1.getSocketVault)({
                         moneyInOutChainId: moneyInOutChainId,
-                        tokenName: tokenName,
+                        tokenName: tokenInfo.name,
                     }))];
             case 2:
-                result = _d.sent();
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA6D;AAK7D,+CAA0E;AAEnE,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEhE,KAA+B,IAAA,wBAAe,EAClD,MAAM,CAAC,IAAI,CAAC,YAAY,CACzB,EAFO,SAAS,eAAA,EAAE,aAAa,mBAAA,CAE9B;gBACI,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS;iBACrB,CAAC,CAAC;gBAEG,gBAAgB,GAAG,IAAA,8BAAU,EACjC,IAAA,6CAAmC,EAAC,iBAAiB,CAAC,EACtD,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,KAA4B,IAAA,0CAAiC,EACjE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS;qBACrB,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;AAlDW,QAAA,2BAA2B,+BAkDtC","sourcesContent":["import {\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  getTokenDetails,\n  MoneyInOutChainId,\n  getSocketConnectors,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolResult,\n} from './types';\nimport { getReyaNetworkFromMoneyInOutChainId } from '../../utils/network';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  const { tokenName, tokenDecimals } = getTokenDetails(\n    params.pool.tokenAddress,\n  );\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: tokenName,\n  });\n\n  const peripheryAddress = getAddress(\n    getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId),\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n    peripheryAddress,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenName,\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,0CAQyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,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,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEhE,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5D,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAElD,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;iBAC1B,CAAC,CAAC;gBAEG,gBAAgB,GAAG,IAAA,8BAAU,EACjC,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,EACtD,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,KAA4B,IAAA,0CAAiC,EACjE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS,CAAC,IAAI;qBAC1B,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;AAhDW,QAAA,2BAA2B,+BAgDtC","sourcesContent":["import {\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getTokenInfoByAddress,\n  getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\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 moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: tokenInfo.name,\n  });\n\n  const peripheryAddress = getAddress(\n    getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId),\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePool(\n    peripheryAddress,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

package/dist/services/lp/encode.js

@@ -28,26 +28,24 @@ var encodeRemoveLiquidityCall = function (poolId, sharesAmount, minOut) {
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeRemoveLiquidityCall = encodeRemoveLiquidityCall;
-var encodeTransferFromMAToPool = function (accountId, amount, sig, poolId, owner, minShares) {
+var encodeTransferFromMAToPool = function (accountId, amount, sig, poolId, minShares) {
     var functionSignature = 'transferFromMAToPool';
-    var parameters = [{ accountId: accountId, amount: amount, sig: sig, poolId: poolId, owner: owner, minShares: minShares }];
+    var parameters = [{ accountId: accountId, amount: amount, sig: sig, poolId: poolId, minShares: minShares }];
     var INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeTransferFromMAToPool = encodeTransferFromMAToPool;
-var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit, socketConnector, socketController, receiver) {
+var encodeWithdrawPassivePoolAndBridge = function (poolId, sharesAmount, minOut, sig, socketMsgGasLimit, socketConnector, receiver) {
     var functionSignature = 'withdrawPassivePool';
     var parameters = [
         {
-            owner: owner,
             poolId: poolId,
             sharesAmount: sharesAmount,
             minOut: minOut,
             sig: sig,
             socketMsgGasLimit: socketMsgGasLimit,
             socketConnector: socketConnector,
-            socketController: socketController,
             receiver: receiver,
         },
     ];
@@ -63,7 +61,7 @@ var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, s
         socketMsgGasLimit: fallbackSocketMsgGasLimit,
         socketConnector: fallbackSocketConnector,
     };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePool', [inputs, fallbackData]);
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePool((uint128,address,uint256,uint256),(uint256,address))', [inputs, fallbackData]);
     var functionSignature = 'depositToAppChain';
     var parameters = [
         receiver,

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport { EIP712Signature } from '../sign';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\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\nexport const encodeTransferFromMAToPool = (\n  accountId: number,\n  amount: bigint,\n  sig: EIP712Signature,\n  poolId: number,\n  owner: string,\n  minShares: bigint,\n): MethodParameters => {\n  const functionSignature = 'transferFromMAToPool';\n  const parameters = [{ accountId, amount, sig, poolId, owner, minShares }];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeWithdrawPassivePoolAndBridge = (\n  owner: string,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketController: string,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawPassivePool';\n  const parameters = [\n    {\n      owner,\n      poolId,\n      sharesAmount,\n      minOut,\n      sig,\n      socketMsgGasLimit,\n      socketConnector,\n      socketController,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositPassivePool = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketFees: bigint,\n  poolId: number,\n  owner: string,\n  amount: bigint,\n  minShares: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = { poolId, owner, amount, minShares };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'depositToAppChain';\n  const parameters = [\n    receiver,\n    amount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport { EIP712Signature } from '../sign';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\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\nexport const encodeTransferFromMAToPool = (\n  accountId: number,\n  amount: bigint,\n  sig: EIP712Signature,\n  poolId: number,\n  minShares: bigint,\n): MethodParameters => {\n  const functionSignature = 'transferFromMAToPool';\n  const parameters = [{ accountId, amount, sig, poolId, minShares }];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeWithdrawPassivePoolAndBridge = (\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawPassivePool';\n  const parameters = [\n    {\n      poolId,\n      sharesAmount,\n      minOut,\n      sig,\n      socketMsgGasLimit,\n      socketConnector,\n      receiver,\n    },\n  ];\n  const INTERFACE = new Interface(peripheryAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeBridgeAndDepositPassivePool = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketFees: bigint,\n  poolId: number,\n  owner: string,\n  amount: bigint,\n  minShares: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = { poolId, owner, amount, minShares };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool((uint128,address,uint256,uint256),(uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'depositToAppChain';\n  const parameters = [\n    receiver,\n    amount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n  ];\n  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: socketFees.toString(10) };\n};\n"]}

package/dist/services/lp/simulateWithdrawPassivePoolAndBridge.js

@@ -12,7 +12,7 @@ params) {
         reyaChainId: params.reyaChainId,
         tokenAddress: params.tokenAddress,
     });
-    var feesUnderlyingToken = (0, common_1.getTokenDetails)(params.tokenAddress).tokenName;
+    var feesUnderlyingToken = (0, common_1.getTokenInfoByAddress)(params.tokenAddress).name;
     var result = {
         fees: fees.fees,
         feesUnderlyingToken: feesUnderlyingToken,

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

@@ -1 +1 @@
-{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;AAAA,0CAIyB;AAMlB,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,mBAAmB,GAAG,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,SAAS,CAAC;IAE3E,IAAM,MAAM,GAA+C;QACzD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,mBAAmB,EAAE,mBAAmB;QACxC,cAAc,EAAE,cAAc;KAC/B,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtBW,QAAA,oCAAoC,wCAsB/C","sourcesContent":["import {\n  getSocketBridgeTime,\n  getSocketWithdrawFees,\n  getTokenDetails,\n} 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 feesUnderlyingToken = getTokenDetails(params.tokenAddress).tokenName;\n\n  const result: SimulateWithdrawPassivePoolAndBridgeResult = {\n    fees: fees.fees,\n    feesUnderlyingToken: feesUnderlyingToken,\n    bridgeTimeInMS: bridgeTimeInMS,\n  };\n\n  return result;\n};\n"]}
+{"version":3,"file":"simulateWithdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/simulateWithdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;AAAA,0CAIyB;AAMlB,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,mBAAmB,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;IAE5E,IAAM,MAAM,GAA+C;QACzD,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,mBAAmB,EAAE,mBAAmB;QACxC,cAAc,EAAE,cAAc;KAC/B,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAtBW,QAAA,oCAAoC,wCAsB/C","sourcesContent":["import {\n  getSocketBridgeTime,\n  getSocketWithdrawFees,\n  getTokenInfoByAddress,\n} 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 feesUnderlyingToken = getTokenInfoByAddress(params.tokenAddress).name;\n\n  const result: SimulateWithdrawPassivePoolAndBridgeResult = {\n    fees: fees.fees,\n    feesUnderlyingToken: feesUnderlyingToken,\n    bridgeTimeInMS: bridgeTimeInMS,\n  };\n\n  return result;\n};\n"]}

package/dist/services/lp/transferFromMAToPool.js

@@ -43,22 +43,26 @@ var executeTransaction_1 = require("../executeTransaction");
 var sign_1 = require("../sign");
 var encode_1 = require("./encode");
 var consts_1 = require("../../utils/consts");
+var action_1 = require("../../utils/action");
+var encode_2 = require("../encode");
 var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var network, chainId, eip712Signature, tokenDecimals, amount, _a, data, value, result;
+    var network, reyaChainId, tokenInfo, amount, multiAction, eip712Signature, _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);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, chainId, params.marginAccountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
+                reyaChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.pool.tokenAddress);
+                amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
+                multiAction = new action_1.MultiAction();
+                (0, encode_2.encodeSingleWithdraw)(params.pool.tokenAddress, amount, multiAction);
+                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, reyaChainId, (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), params.marginAccountId, multiAction.commands, params.owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
             case 2:
                 eip712Signature = _c.sent();
-                tokenDecimals = (0, common_1.getTokenDetails)(params.pool.tokenAddress).tokenDecimals;
-                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)];
+                _a = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, BigInt(0)), data = _a.calldata, value = _a.value;
+                return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
             case 3:
                 result = _c.sent();
                 return [2 /*return*/, {

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

@@ -1 +1 @@
-{"version":3,"file":"transferFromMAToPool.js","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAIyB;AACzB,mEAA6D;AAC7D,4DAA2D;AAC3D,gCAA2C;AAC3C,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 {\n  getCurrentTimestampInSeconds,\n  scale,\n  getTokenDetails,\n} from '@reyaxyz/common';\nimport { ContractType } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\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,0CAKyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAsD;AAKtD,6CAAgE;AAChE,6CAAiD;AACjD,oCAAiD;AAE1C,IAAM,oBAAoB,GAAG,UAClC,MAAkC;;;;;oBAElB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEpD,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC5D,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAGlD,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,6BAAoB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;gBAC5C,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,eAAe,EACtB,WAAW,CAAC,QAAQ,EACpB,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBARK,eAAe,GAAG,SAQvB;gBAEK,KAA4B,IAAA,mCAA0B,EAC1D,MAAM,CAAC,eAAe,EACtB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,CAAC,CAAC,CACV,EANiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAM3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,WAAW,EACX,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;AAzCW,QAAA,oBAAoB,wBAyC/B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeTransferFromMAToPool } from './encode';\nimport {\n  TransferFromMAToPoolParams,\n  TransferFromMAToPoolResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { MultiAction } from '../../utils/action';\nimport { encodeSingleWithdraw } from '../encode';\n\nexport const transferFromMAToPool = async (\n  params: TransferFromMAToPoolParams,\n): Promise<TransferFromMAToPoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(params.amount);\n\n  // transfer from MA to pool involves a core withdrawal\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(params.pool.tokenAddress, amount, multiAction);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    params.marginAccountId,\n    multiAction.commands,\n    params.owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { calldata: data, value } = encodeTransferFromMAToPool(\n    params.marginAccountId,\n    amount,\n    eip712Signature,\n    params.pool.id,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    reyaChainId,\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  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  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n  sharesAmount: number;\n  withdrawMax: boolean;\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  feesUnderlyingToken: TokenEntity['id'];\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n  moneyInOutChainId: MoneyInOutChainId;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n  fees: number;\n  feesUnderlyingToken: TokenEntity['id'];\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeParams = {\n  reyaChainId: ReyaChainId;\n  moneyInOutChainId: MoneyInOutChainId;\n  tokenAddress: TokenEntity['address'];\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, '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  moneyInOutChainId: MoneyInOutChainId;\n  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];\n  sharesAmount: number;\n  withdrawMax: boolean;\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  feesUnderlyingToken: TokenEntity['id'];\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n  moneyInOutChainId: MoneyInOutChainId;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n  fees: number;\n  feesUnderlyingToken: TokenEntity['id'];\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

@@ -44,7 +44,7 @@ var encode_1 = require("./encode");
 var common_1 = require("@reyaxyz/common");
 var consts_1 = require("../../utils/consts");
 var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var network, reyaChainId, sharesAmount, eip712Signature, tokenName, _a, data, value, result;
+    var network, reyaChainId, sharesAmount, eip712Signature, tokenInfo, _a, data, value, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -58,18 +58,15 @@ var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0,
                 else {
                     sharesAmount = (0, common_1.scale)(30)(params.amount * params.sharePrice);
                 }
-                return [4 /*yield*/, (0, sign_1.signPoolRemoveLiquidity)(params.signer, reyaChainId, params.owner.address, params.pool.id, sharesAmount, BigInt(0), params.owner.poolSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
+                return [4 /*yield*/, (0, sign_1.signPoolRemoveLiquidity)(params.signer, reyaChainId, (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), params.owner.address, params.pool.id, sharesAmount, BigInt(0), params.owner.poolSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
             case 2:
                 eip712Signature = _c.sent();
-                tokenName = (0, common_1.getTokenDetails)(params.pool.tokenAddress).tokenName;
-                _a = (0, encode_1.encodeWithdrawPassivePoolAndBridge)(params.owner.address, params.pool.id, sharesAmount, BigInt(0), eip712Signature, BigInt('10000000'), //todo
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.pool.tokenAddress);
+                _a = (0, encode_1.encodeWithdrawPassivePoolAndBridge)(params.pool.id, sharesAmount, BigInt(0), eip712Signature, BigInt('10000000'), //todo
                 (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: params.moneyInOutChainId,
-                    tokenName: tokenName,
-                }).withdraw, (0, common_1.getSocketController)({
-                    reyaChainId: reyaChainId,
-                    tokenName: tokenName,
-                }), params.owner.address), data = _a.calldata, value = _a.value;
+                    tokenName: tokenInfo.name,
+                }).withdraw, params.owner.address), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
             case 3:
                 result = _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,0CAOyB;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,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAI1D,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC9D,CAAC;gBAEuB,qBAAM,IAAA,8BAAuB,EACnD,MAAM,CAAC,MAAM,EACb,WAAW,EACX,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;gBAEO,SAAS,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,UAA9C,CAA+C;gBAE1D,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,4BAAmB,EAAC;oBAClB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,SAAS,EAAE,SAAS;iBACrB,CAAC,CAAC,QAAQ,EACX,IAAA,4BAAmB,EAAC;oBAClB,WAAW,EAAE,WAAW;oBACxB,SAAS,EAAE,SAAS;iBACrB,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,WAAW,EACX,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;AAxDW,QAAA,4BAA4B,gCAwDvC","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  ReyaChainId,\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  getSocketController,\n  getTokenDetails,\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 reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  let sharesAmount;\n\n  if (params.withdrawMax) {\n    sharesAmount = scale(30)(params.sharesAmount);\n  } else {\n    sharesAmount = scale(30)(params.amount * params.sharePrice);\n  }\n\n  const eip712Signature = await signPoolRemoveLiquidity(\n    params.signer,\n    reyaChainId,\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 { tokenName } = getTokenDetails(params.pool.tokenAddress);\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    getSocketConnectors({\n      moneyInOutChainId: params.moneyInOutChainId,\n      tokenName: tokenName,\n    }).withdraw,\n    getSocketController({\n      reyaChainId: reyaChainId,\n      tokenName: tokenName,\n    }),\n    params.owner.address,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    reyaChainId,\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,mEAAyE;AACzE,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,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAI1D,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBAChD,CAAC;qBAAM,CAAC;oBACN,YAAY,GAAG,IAAA,cAAK,EAAC,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC9D,CAAC;gBAEuB,qBAAM,IAAA,8BAAuB,EACnD,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,MAAM,CAAC,KAAK,CAAC,YAAY,GAAG,CAAC,EAC7B,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBAVK,eAAe,GAAG,SAUvB;gBAEK,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAE5D,KAA4B,IAAA,2CAAkC,EAClE,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM;gBAC1B,IAAA,4BAAmB,EAAC;oBAClB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,SAAS,EAAE,SAAS,CAAC,IAAI;iBAC1B,CAAC,CAAC,QAAQ,EACX,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAXiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAW3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,WAAW,EACX,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;AApDW,QAAA,4BAA4B,gCAoDvC","sourcesContent":["import { ContractType, getAddress } 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  ReyaChainId,\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  getTokenInfoByAddress,\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 reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  let sharesAmount;\n\n  if (params.withdrawMax) {\n    sharesAmount = scale(30)(params.sharesAmount);\n  } else {\n    sharesAmount = scale(30)(params.amount * params.sharePrice);\n  }\n\n  const eip712Signature = await signPoolRemoveLiquidity(\n    params.signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    params.owner.poolSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const tokenInfo = getTokenInfoByAddress(params.pool.tokenAddress);\n\n  const { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    BigInt('10000000'), //todo\n    getSocketConnectors({\n      moneyInOutChainId: params.moneyInOutChainId,\n      tokenName: tokenInfo.name,\n    }).withdraw,\n    params.owner.address,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -36,47 +36,54 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bridgeAndDepositExisingMA = void 0;
+exports.bridgeAndDepositExistingMA = void 0;
 var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var executeTransaction_1 = require("../executeTransaction");
 var encode_1 = require("./encode");
 var sign_1 = require("../sign");
 var consts_1 = require("../../utils/consts");
-var network_1 = require("../../utils/network");
-var bridgeAndDepositExisingMA = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var network, moneyInOutChainId, reyaChainId, eip712Signature, _a, tokenName, tokenDecimals, amount, socketConnectors, _b, data, value, result;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0: return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
+var encode_2 = require("../encode");
+var action_1 = require("../../utils/action");
+var bridgeAndDepositExistingMA = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var network, moneyInOutChainId, reyaChainId, moneyInOutTokenInfo, reyaPeripheryTokenInfo, reyaCoreTokenInfo, multiAction, peripheryAddress, eip712Signature, socketConnectors, _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 = _d.sent();
+                network = _c.sent();
                 moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                reyaChainId = (0, network_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId);
-                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, reyaChainId, params.marginAccountId, params.owner.coreSigNonce, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
+                reyaChainId = (0, common_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId);
+                moneyInOutTokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress, moneyInOutChainId);
+                reyaPeripheryTokenInfo = (0, common_1.getTokenInfoByName)(moneyInOutTokenInfo.name, reyaChainId);
+                reyaCoreTokenInfo = reyaPeripheryTokenInfo.name === 'USDC'
+                    ? (0, common_1.getTokenInfoByName)('RUSD', reyaChainId)
+                    : reyaPeripheryTokenInfo;
+                multiAction = new action_1.MultiAction();
+                (0, encode_2.encodeSingleDeposit)(reyaCoreTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), multiAction);
+                peripheryAddress = (0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY);
+                return [4 /*yield*/, (0, sign_1.signCoreCommands)(params.signer, reyaChainId, peripheryAddress, params.marginAccountId, multiAction.commands, params.owner.coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.BRIDGE_DEADLINE_IN_SECONDS)];
             case 2:
-                eip712Signature = _d.sent();
-                _a = (0, common_1.getTokenDetails)(params.tokenAddress), tokenName = _a.tokenName, tokenDecimals = _a.tokenDecimals;
-                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                eip712Signature = _c.sent();
                 socketConnectors = (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: moneyInOutChainId,
-                    tokenName: tokenName,
+                    tokenName: moneyInOutTokenInfo.name,
                 });
-                _b = (0, encode_1.encodeBridgeAndDepositExistingMA)((0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
+                _a = (0, encode_1.encodeBridgeAndDepositExistingMA)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: moneyInOutChainId,
-                }), params.marginAccountId, params.tokenAddress, amount, eip712Signature, BigInt('10000000'), socketConnectors.withdraw), data = _b.calldata, value = _b.value;
+                }), params.marginAccountId, reyaPeripheryTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), eip712Signature, (0, common_1.scale)(moneyInOutTokenInfo.decimals)(params.amount), BigInt('10000000'), socketConnectors.withdraw), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, moneyInOutChainId, (0, common_1.getSocketVault)({
                         moneyInOutChainId: moneyInOutChainId,
-                        tokenName: tokenName,
+                        tokenName: moneyInOutTokenInfo.name,
                     }))];
             case 3:
-                result = _d.sent();
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];
         }
     });
 }); };
-exports.bridgeAndDepositExisingMA = bridgeAndDepositExisingMA;
+exports.bridgeAndDepositExistingMA = bridgeAndDepositExistingMA;
 //# sourceMappingURL=bridgeAndDepositExistingMA.js.map

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,0CAQyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAChE,+CAA0E;AAEnE,IAAM,yBAAyB,GAAG,UACvC,MAAuC;;;;;oBAEvB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAChE,WAAW,GAAG,IAAA,6CAAmC,EAAC,iBAAiB,CAAC,CAAC;gBACnD,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,WAAW,EACX,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,KAAK,CAAC,YAAY,EACzB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;gBANK,eAAe,GAAG,SAMvB;gBAEK,KAA+B,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,EAAjE,SAAS,eAAA,EAAE,aAAa,mBAAA,CAA0C;gBACpE,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS;iBACrB,CAAC,CAAC;gBAEG,KAA4B,IAAA,yCAAgC,EAChE,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS;qBACrB,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;AAnDW,QAAA,yBAAyB,6BAmDpC","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  getTokenDetails,\n  MoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExisingMAParams,\n  BridgeAndDepositExisingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { getReyaNetworkFromMoneyInOutChainId } from '../../utils/network';\n\nexport const bridgeAndDepositExisingMA = async (\n  params: BridgeAndDepositExisingMAParams,\n): Promise<BridgeAndDepositExisingMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    reyaChainId,\n    params.marginAccountId,\n    params.owner.coreSigNonce,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const { tokenName, tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: tokenName,\n  });\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.marginAccountId,\n    params.tokenAddress,\n    amount,\n    eip712Signature,\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenName,\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":"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","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n  getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositExistingMA } from './encode';\nimport {\n  BridgeAndDepositExistingMAParams,\n  BridgeAndDepositExistingMAResult,\n} from './types';\nimport { signCoreCommands } from '../sign';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { encodeSingleDeposit } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const bridgeAndDepositExistingMA = async (\n  params: BridgeAndDepositExistingMAParams,\n): Promise<BridgeAndDepositExistingMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n\n  const moneyInOutTokenInfo = getTokenInfoByAddress(\n    params.tokenAddress,\n    moneyInOutChainId,\n  );\n  const reyaPeripheryTokenInfo = getTokenInfoByName(\n    moneyInOutTokenInfo.name,\n    reyaChainId,\n  );\n  const reyaCoreTokenInfo =\n    reyaPeripheryTokenInfo.name === 'USDC'\n      ? getTokenInfoByName('RUSD', reyaChainId)\n      : reyaPeripheryTokenInfo;\n\n  const multiAction = new MultiAction();\n  encodeSingleDeposit(\n    reyaCoreTokenInfo.address,\n    scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n    multiAction,\n  );\n\n  const peripheryAddress = getAddress(\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n  );\n\n  const eip712Signature = await signCoreCommands(\n    params.signer,\n    reyaChainId,\n    peripheryAddress,\n    params.marginAccountId,\n    multiAction.commands,\n    params.owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: moneyInOutTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeBridgeAndDepositExistingMA(\n    peripheryAddress,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.marginAccountId,\n    reyaPeripheryTokenInfo.address,\n    scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n    eip712Signature,\n    scale(moneyInOutTokenInfo.decimals)(params.amount),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: moneyInOutTokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -41,32 +41,31 @@ var common_1 = require("@reyaxyz/common");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var executeTransaction_1 = require("../executeTransaction");
 var encode_1 = require("./encode");
-var network_1 = require("../../utils/network");
 var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0, void 0, function () {
-    var network, moneyInOutChainId, reyaChainId, _a, tokenName, tokenDecimals, amount, socketConnectors, _b, data, value, result;
-    var _c;
-    return __generator(this, function (_d) {
-        switch (_d.label) {
-            case 0: return [4 /*yield*/, ((_c = params.signer.provider) === null || _c === void 0 ? void 0 : _c.getNetwork())];
+    var network, moneyInOutChainId, reyaChainId, moneyInOutTokenInfo, reyaPeripheryTokenInfo, socketConnectors, _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 = _d.sent();
+                network = _c.sent();
                 moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
-                reyaChainId = (0, network_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId);
-                _a = (0, common_1.getTokenDetails)(params.tokenAddress), tokenName = _a.tokenName, tokenDecimals = _a.tokenDecimals;
-                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                reyaChainId = (0, common_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId);
+                moneyInOutTokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress, moneyInOutChainId);
+                reyaPeripheryTokenInfo = (0, common_1.getTokenInfoByName)(moneyInOutTokenInfo.name, reyaChainId);
                 socketConnectors = (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: moneyInOutChainId,
-                    tokenName: tokenName,
+                    tokenName: moneyInOutTokenInfo.name,
                 });
-                _b = (0, encode_1.encodeBridgeAndDepositNewMA)((0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
+                _a = (0, encode_1.encodeBridgeAndDepositNewMA)((0, contractAddresses_1.getAddress)(reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY), BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: moneyInOutChainId,
-                }), params.ownerAddress, params.tokenAddress, amount, BigInt('10000000'), socketConnectors.withdraw), data = _b.calldata, value = _b.value;
+                }), params.ownerAddress, reyaPeripheryTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), (0, common_1.scale)(moneyInOutTokenInfo.decimals)(params.amount), BigInt('10000000'), socketConnectors.withdraw), data = _a.calldata, value = _a.value;
                 return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(params.signer, data, value, moneyInOutChainId, (0, common_1.getSocketVault)({
                         moneyInOutChainId: moneyInOutChainId,
-                        tokenName: tokenName,
+                        tokenName: moneyInOutTokenInfo.name,
                     }))];
             case 2:
-                result = _d.sent();
+                result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
                     }];

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,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAAuD;AAKvD,+CAA0E;AAEnE,IAAM,qBAAqB,GAAG,UACnC,MAAmC;;;;;oBAEnB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAChE,WAAW,GAAG,IAAA,6CAAmC,EAAC,iBAAiB,CAAC,CAAC;gBAErE,KAA+B,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,EAAjE,SAAS,eAAA,EAAE,aAAa,mBAAA,CAA0C;gBACpE,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAE7C,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,SAAS;iBACrB,CAAC,CAAC;gBAEG,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAZiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAY3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,SAAS;qBACrB,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;AA3CW,QAAA,qBAAqB,yBA2ChC","sourcesContent":["import {\n  getSocketConnectors,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  getTokenDetails,\n  MoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { encodeBridgeAndDepositNewMA } from './encode';\nimport {\n  BridgeAndDepositNewMAParams,\n  BridgeAndDepositNewMAResult,\n} from './types';\nimport { getReyaNetworkFromMoneyInOutChainId } from '../../utils/network';\n\nexport const bridgeAndDepositNewMA = async (\n  params: BridgeAndDepositNewMAParams,\n): Promise<BridgeAndDepositNewMAResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n\n  const { tokenName, tokenDecimals } = getTokenDetails(params.tokenAddress);\n  const amount = scale(tokenDecimals)(params.amount);\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: tokenName,\n  });\n\n  const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.ownerAddress,\n    params.tokenAddress,\n    amount,\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenName,\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,0CASyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,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,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAChE,WAAW,GAAG,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,CAAC;gBAErE,mBAAmB,GAAG,IAAA,8BAAqB,EAC/C,MAAM,CAAC,YAAY,EACnB,iBAAiB,CAClB,CAAC;gBACI,sBAAsB,GAAG,IAAA,2BAAkB,EAC/C,mBAAmB,CAAC,IAAI,EACxB,WAAW,CACZ,CAAC;gBAEI,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;iBACpC,CAAC,CAAC;gBAEG,KAA4B,IAAA,oCAA2B,EAC3D,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,YAAY,EACnB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrD,IAAA,cAAK,EAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAClD,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;gBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,CAAC,MAAM,EACb,IAAI,EACJ,KAAK,EACL,iBAAiB,EACjB,IAAA,uBAAc,EAAC;wBACb,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;qBACpC,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;AAlDW,QAAA,qBAAqB,yBAkDhC","sourcesContent":["import {\n  getSocketConnectors,\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getTokenInfoByName,\n  getTokenInfoByAddress,\n  getReyaNetworkFromMoneyInOutChainId,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\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 moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId);\n\n  const moneyInOutTokenInfo = getTokenInfoByAddress(\n    params.tokenAddress,\n    moneyInOutChainId,\n  );\n  const reyaPeripheryTokenInfo = getTokenInfoByName(\n    moneyInOutTokenInfo.name,\n    reyaChainId,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: moneyInOutTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeBridgeAndDepositNewMA(\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.ownerAddress,\n    reyaPeripheryTokenInfo.address,\n    scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n    scale(moneyInOutTokenInfo.decimals)(params.amount),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: moneyInOutTokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n"]}

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

@@ -42,13 +42,13 @@ var executeTransaction_1 = require("../executeTransaction");
 var contractAddresses_1 = require("../../utils/contractAddresses");
 var common_1 = 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 tokenInfo, amount, _a, data, value, network, chainId, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
             case 0:
-                tokenDecimals = (0, common_1.getTokenDetails)(params.tokenAddress).tokenDecimals;
-                amount = (0, common_1.scale)(tokenDecimals)(params.amount);
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress);
+                amount = (0, common_1.scale)(tokenInfo.decimals)(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,mEAA6D;AAC7D,0CAAyD;AAElD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEb,aAAa,GAAK,IAAA,wBAAe,EAAC,MAAM,CAAC,YAAY,CAAC,cAAzC,CAA0C;gBACzD,MAAM,GAAG,IAAA,cAAK,EAAC,aAAa,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAC7C,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 { ContractType } from '../../utils/contractAddresses';\nimport { scale, getTokenDetails } 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"]}
+{"version":3,"file":"deposit.js","sourceRoot":"/","sources":["services/margin-accounts/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,mCAAyC;AACzC,4DAA2D;AAC3D,mEAA6D;AAC7D,0CAA+D;AAExD,IAAM,OAAO,GAAG,UACrB,MAAqB;;;;;;gBAEf,SAAS,GAAG,IAAA,8BAAqB,EAAC,MAAM,CAAC,YAAY,CAAC,CAAC;gBACvD,MAAM,GAAG,IAAA,cAAK,EAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;gBAClD,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 { ContractType } from '../../utils/contractAddresses';\nimport { getTokenInfoByAddress, scale } from '@reyaxyz/common';\n\nexport const deposit = async (\n  params: DepositParams,\n): Promise<DepositResult> => {\n  const tokenInfo = getTokenInfoByAddress(params.tokenAddress);\n  const amount = scale(tokenInfo.decimals)(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"]}