@reyaxyz/sdk 0.51.0 → 0.52.1

package/dist/services/lp/bridgeAndDepositPassivePool.js

@@ -57,9 +57,9 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
                     tokenName: tokenInfo.name,
                 });
                 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)({
+                _a = (0, encode_1.encodeBridgeAndDepositPassivePool)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, '0x', (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: moneyInOutChainId,
-                }), params.pool.id, params.ownerAddress, amount, BigInt(0), BigInt('10000000'), socketConnectors.withdraw), data = _a.calldata, value = _a.value;
+                }), params.pool.id, params.ownerAddress, amount, BigInt(0), BigInt('10000000'), socketConnectors.withdraw, BigInt(0)), 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: tokenInfo.name,

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

@@ -1 +1 @@
-{"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;gBAKhE,SAAS,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBAE1D,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;AApDW,QAAA,2BAA2B,+BAoDtC","sourcesContent":["import {\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getReyaNetworkFromMoneyInOutChainId,\n  getTokenInfoByName,\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  // todo: maybe usdc should not be hardcoded\n  // it should be the token of the pool, or the underlying token\n  // if token is rusd.\n  const tokenInfo = getTokenInfoByName('USDC', moneyInOutChainId);\n\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"]}
+{"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;gBAKhE,SAAS,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;gBAE1D,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,IAAI,EACJ,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,EACzB,MAAM,CAAC,CAAC,CAAC,CACV,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;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;AAtDW,QAAA,2BAA2B,+BAsDtC","sourcesContent":["import {\n  getSocketDepositFeesAsBigInt,\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getReyaNetworkFromMoneyInOutChainId,\n  getTokenInfoByName,\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  // todo: maybe usdc should not be hardcoded\n  // it should be the token of the pool, or the underlying token\n  // if token is rusd.\n  const tokenInfo = getTokenInfoByName('USDC', moneyInOutChainId);\n\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    '0x',\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    BigInt(0),\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,23 +28,25 @@ var encodeRemoveLiquidityCall = function (poolId, sharesAmount, minOut) {
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeRemoveLiquidityCall = encodeRemoveLiquidityCall;
-var encodeTransferFromMAToPool = function (accountId, amount, sig, poolId, minShares) {
+var encodeTransferFromMAToPool = function (accountId, amount, sig, poolId, minShares, receiver) {
     var functionSignature = 'transferFromMAToPool';
-    var parameters = [{ accountId: accountId, amount: amount, sig: sig, poolId: poolId, minShares: minShares }];
+    var parameters = [{ accountId: accountId, amount: amount, sig: sig, poolId: poolId, minShares: minShares, receiver: receiver }];
     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 (poolId, sharesAmount, minOut, sig, socketMsgGasLimit, socketConnector, receiver) {
+var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit, socketPayloadSize, socketConnector, receiver) {
     var functionSignature = 'withdrawPassivePool';
     var parameters = [
         {
+            owner: owner,
             poolId: poolId,
             sharesAmount: sharesAmount,
             minOut: minOut,
             sig: sig,
             socketMsgGasLimit: socketMsgGasLimit,
+            socketPayloadSize: socketPayloadSize,
             socketConnector: socketConnector,
             receiver: receiver,
         },
@@ -54,21 +56,23 @@ var encodeWithdrawPassivePoolAndBridge = function (poolId, sharesAmount, minOut,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawPassivePoolAndBridge = encodeWithdrawPassivePoolAndBridge;
-var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, socketConnector, socketFees, poolId, owner, amount, minShares, fallbackSocketMsgGasLimit, fallbackSocketConnector) {
+var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, poolId, owner, amount, minShares, fallbackSocketMsgGasLimit, fallbackSocketConnector, fallbackSocketPayloadSize) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
     var inputs = { poolId: poolId, owner: owner, amount: amount, minShares: minShares };
     var fallbackData = {
         socketMsgGasLimit: fallbackSocketMsgGasLimit,
         socketConnector: fallbackSocketConnector,
+        socketPayloadSize: fallbackSocketPayloadSize,
     };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePool((uint128,address,uint256,uint256),(uint256,address))', [inputs, fallbackData]);
-    var functionSignature = 'depositToAppChain';
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePool((uint128,address,uint256,uint256),(uint256,uint256,address))', [inputs, fallbackData]);
+    var functionSignature = 'bridge';
     var parameters = [
         receiver,
         amount,
         socketMsgGasLimit,
         socketConnector,
         peripheryCalldata,
+        socketBridgeOptions,
     ];
     var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);

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  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"]}
+{"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  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'transferFromMAToPool';\n  const parameters = [{ accountId, amount, sig, poolId, minShares, receiver }];\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  socketPayloadSize: bigint,\n  socketConnector: 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      socketPayloadSize,\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  socketBridgeOptions: string,\n  socketFees: bigint,\n  poolId: number,\n  owner: string,\n  amount: bigint,\n  minShares: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\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    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool((uint128,address,uint256,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    amount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\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/transferFromMAToPool.js

@@ -61,7 +61,7 @@ var transferFromMAToPool = function (params) { return __awaiter(void 0, void 0,
                 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();
-                _a = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, BigInt(0)), data = _a.calldata, value = _a.value;
+                _a = (0, encode_1.encodeTransferFromMAToPool)(params.marginAccountId, amount, eip712Signature, params.pool.id, BigInt(0), 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/transferFromMAToPool.js.map

@@ -1 +1 @@
-{"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"]}
+{"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,EACT,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAPiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAO3B;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;AA1CW,QAAA,oBAAoB,wBA0C/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    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/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, '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' | 'address'>;\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

@@ -61,8 +61,8 @@ var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0,
                 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();
-                _a = (0, encode_1.encodeWithdrawPassivePoolAndBridge)(params.pool.id, sharesAmount, BigInt(0), eip712Signature, BigInt('10000000'), //todo
-                (0, common_1.getSocketConnectors)({
+                _a = (0, encode_1.encodeWithdrawPassivePoolAndBridge)(params.owner.address, params.pool.id, sharesAmount, BigInt(0), eip712Signature, BigInt('10000000'), //todo
+                BigInt(0), (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: params.moneyInOutChainId,
                     tokenName: 'USDC', // todo: this should not be hardcoded
                 }).withdraw, params.owner.address), data = _a.calldata, value = _a.value;

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAyE;AACzE,4DAA2D;AAC3D,gCAAkD;AAKlD,mCAA8D;AAC9D,0CAKyB;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;gBAG1D,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,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,MAAM,EAAE,qCAAqC;iBACzD,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;AAjDW,QAAA,4BAA4B,gCAiDvC","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  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  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 { 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: 'USDC', // todo: this should not be hardcoded\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"]}
+{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mEAAyE;AACzE,4DAA2D;AAC3D,gCAAkD;AAKlD,mCAA8D;AAC9D,0CAKyB;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;gBAG1D,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,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,MAAM,CAAC,CAAC,CAAC,EACT,IAAA,4BAAmB,EAAC;oBAClB,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;oBAC3C,SAAS,EAAE,MAAM,EAAE,qCAAqC;iBACzD,CAAC,CAAC,QAAQ,EACX,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,EAbiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAa3B;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;AAnDW,QAAA,4BAA4B,gCAmDvC","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  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  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 { calldata: data, value } = encodeWithdrawPassivePoolAndBridge(\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    BigInt('10000000'), //todo\n    BigInt(0),\n    getSocketConnectors({\n      moneyInOutChainId: params.moneyInOutChainId,\n      tokenName: 'USDC', // todo: this should not be hardcoded\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

@@ -41,12 +41,10 @@ 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 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 network, moneyInOutChainId, reyaChainId, moneyInOutTokenInfo, reyaPeripheryTokenInfo, reyaCoreTokenInfo, multiAction, peripheryAddress, socketConnectors, _a, data, value, result;
     var _b;
     return __generator(this, function (_c) {
         switch (_c.label) {
@@ -63,21 +61,18 @@ var bridgeAndDepositExistingMA = function (params) { return __awaiter(void 0, vo
                 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 = _c.sent();
                 socketConnectors = (0, common_1.getSocketConnectors)({
                     moneyInOutChainId: moneyInOutChainId,
                     tokenName: moneyInOutTokenInfo.name,
                 });
-                _a = (0, encode_1.encodeBridgeAndDepositExistingMA)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, (0, common_1.getSocketDepositFeesAsBigInt)({
+                _a = (0, encode_1.encodeBridgeAndDepositExistingMA)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, '0x', (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: moneyInOutChainId,
-                }), 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;
+                }), params.marginAccountId, reyaPeripheryTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), (0, common_1.scale)(moneyInOutTokenInfo.decimals)(params.amount), BigInt('10000000'), socketConnectors.withdraw, BigInt(0)), 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: moneyInOutTokenInfo.name,
                     }))];
-            case 3:
+            case 2:
                 result = _c.sent();
                 return [2 /*return*/, {
                         transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,

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,0CAUyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA4D;AAK5D,gCAA2C;AAC3C,6CAAgE;AAChE,oCAAgD;AAChD,6CAAiD;AAE1C,IAAM,0BAA0B,GAAG,UACxC,MAAwC;;;;;oBAExB,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;gBACI,iBAAiB,GACrB,sBAAsB,CAAC,IAAI,KAAK,MAAM;oBACpC,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;oBACzC,CAAC,CAAC,sBAAsB,CAAC;gBAEvB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,4BAAmB,EACjB,iBAAiB,CAAC,OAAO,EACzB,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrD,WAAW,CACZ,CAAC;gBAEI,gBAAgB,GAAG,IAAA,8BAAU,EACjC,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,CAAC,MAAM,EACb,WAAW,EACX,gBAAgB,EAChB,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,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;iBACpC,CAAC,CAAC;gBAEG,KAA4B,IAAA,yCAAgC,EAChE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrD,eAAe,EACf,IAAA,cAAK,EAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAClD,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,CAC1B,EAdiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAc3B;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;AA7EW,QAAA,0BAA0B,8BA6ErC","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"]}
+{"version":3,"file":"bridgeAndDepositExistingMA.js","sourceRoot":"/","sources":["services/margin-accounts/bridgeAndDepositExistingMA.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CASyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,mCAA4D;AAK5D,oCAAgD;AAChD,6CAAiD;AAE1C,IAAM,0BAA0B,GAAG,UACxC,MAAwC;;;;;oBAExB,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;gBACI,iBAAiB,GACrB,sBAAsB,CAAC,IAAI,KAAK,MAAM;oBACpC,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;oBACzC,CAAC,CAAC,sBAAsB,CAAC;gBAEvB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBACtC,IAAA,4BAAmB,EACjB,iBAAiB,CAAC,OAAO,EACzB,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EACrD,WAAW,CACZ,CAAC;gBAEI,gBAAgB,GAAG,IAAA,8BAAU,EACjC,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;oBAC3C,iBAAiB,EAAE,iBAAiB;oBACpC,SAAS,EAAE,mBAAmB,CAAC,IAAI;iBACpC,CAAC,CAAC;gBAEG,KAA4B,IAAA,yCAAgC,EAChE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAI,EACJ,IAAA,qCAA4B,EAAC;oBAC3B,iBAAiB,EAAE,iBAAiB;iBACrC,CAAC,EACF,MAAM,CAAC,eAAe,EACtB,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,EACzB,MAAM,CAAC,CAAC,CAAC,CACV,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;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;AApEW,QAAA,0BAA0B,8BAoErC","sourcesContent":["import {\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 { 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 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    '0x',\n    getSocketDepositFeesAsBigInt({\n      moneyInOutChainId: moneyInOutChainId,\n    }),\n    params.marginAccountId,\n    reyaPeripheryTokenInfo.address,\n    scale(reyaPeripheryTokenInfo.decimals)(params.amount),\n    scale(moneyInOutTokenInfo.decimals)(params.amount),\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n    BigInt(0),\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

@@ -57,9 +57,9 @@ var bridgeAndDepositNewMA = function (params) { return __awaiter(void 0, void 0,
                     moneyInOutChainId: moneyInOutChainId,
                     tokenName: moneyInOutTokenInfo.name,
                 });
-                _a = (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, '0x', (0, common_1.getSocketDepositFeesAsBigInt)({
                     moneyInOutChainId: moneyInOutChainId,
-                }), 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;
+                }), params.ownerAddress, reyaPeripheryTokenInfo.address, (0, common_1.scale)(reyaPeripheryTokenInfo.decimals)(params.amount), (0, common_1.scale)(moneyInOutTokenInfo.decimals)(params.amount), BigInt('10000000'), socketConnectors.withdraw, BigInt(0)), 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: moneyInOutTokenInfo.name,

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,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"]}
+{"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,IAAI,EACJ,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,EACzB,MAAM,CAAC,CAAC,CAAC,CACV,EAfiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAe3B;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;AApDW,QAAA,qBAAqB,yBAoDhC","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    '0x',\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    BigInt(0),\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/encode.js

@@ -51,8 +51,8 @@ exports.encodeBridgeAndDepositExistingMA = exports.encodeBridgeAndDepositNewMA =
 var action_1 = require("../../utils/action");
 var ethers_1 = require("ethers");
 var encode_1 = require("../encode");
-var AccountModule_json_1 = require("../../abis/AccountModule.json");
-var ExecutionModule_json_1 = require("../../abis/ExecutionModule.json");
+var CoreProxy_json_1 = require("../../abis/CoreProxy.json");
+var CoreProxy_json_2 = require("../../abis/CoreProxy.json");
 var Periphery_json_1 = require("../../abis/Periphery.json");
 var VaultWithPayload_json_1 = require("../../abis/socket/VaultWithPayload.json");
 var sign_1 = require("../sign");
@@ -61,7 +61,7 @@ var common_1 = require("@reyaxyz/common");
 var encodeCreateAccountCall = function (accountOwner) {
     var functionSignature = 'createAccount';
     var parameters = [accountOwner];
-    var INTERFACE = new ethers_1.Interface(AccountModule_json_1.abi);
+    var INTERFACE = new ethers_1.Interface(CoreProxy_json_1.abi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
@@ -88,6 +88,7 @@ var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAc
         switch (_a.label) {
             case 0:
                 multiAction = new action_1.MultiAction();
+                // todo: note can we make this more stateless?
                 (0, encode_1.encodeSingleTransferMargin)(toMarginAccountId, token, amount, multiAction);
                 return [4 /*yield*/, (0, sign_1.signCoreCommands)(signer, chainId, consts_1.RELAYER_ACCOUNT, fromMarginAccountId, multiAction.commands, coreSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + consts_1.CORE_DEADLINE_IN_SECONDS)];
             case 1:
@@ -99,7 +100,7 @@ var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAc
                     multiAction.commands,
                     eip712Signature,
                 ];
-                INTERFACE = new ethers_1.Interface(ExecutionModule_json_1.abi);
+                INTERFACE = new ethers_1.Interface(CoreProxy_json_2.abi);
                 calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
                 return [2 /*return*/, {
                         calldata: calldata,
@@ -109,7 +110,7 @@ var encodeTransferMargin = function (signer, chainId, coreSigNonce, fromMarginAc
     });
 }); };
 exports.encodeTransferMargin = encodeTransferMargin;
-var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress, corePeripheryTokenAmount, sig, socketMsgGasLimit, socketConnector, receiver) {
+var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress, corePeripheryTokenAmount, sig, socketMsgGasLimit, socketPayloadSize, socketConnector, receiver) {
     var functionSignature = 'withdrawMA';
     var parameters = [
         {
@@ -118,6 +119,7 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
             tokenAmount: corePeripheryTokenAmount,
             sig: sig,
             socketMsgGasLimit: socketMsgGasLimit,
+            socketPayloadSize: socketPayloadSize,
             socketConnector: socketConnector,
             receiver: receiver,
         },
@@ -127,7 +129,7 @@ var encodeWithdrawMAAndBridge = function (accountId, corePeripheryTokenAddress,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawMAAndBridge = encodeWithdrawMAAndBridge;
-var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketFees, accountOwner, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount, fallbackSocketMsgGasLimit, fallbackSocketConnector) {
+var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountOwner, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount, fallbackSocketMsgGasLimit, fallbackSocketConnector, fallbackSocketPayloadSize) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
     var inputs = {
         accountOwner: accountOwner,
@@ -137,41 +139,44 @@ var encodeBridgeAndDepositNewMA = function (receiver, socketMsgGasLimit, socketC
     var fallbackData = {
         socketMsgGasLimit: fallbackSocketMsgGasLimit,
         socketConnector: fallbackSocketConnector,
+        socketPayloadSize: fallbackSocketPayloadSize,
     };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA((address,address,uint256),(uint256,address))', [inputs, fallbackData]);
-    var functionSignature = 'depositToAppChain';
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositNewMA((address,address,uint256),(uint256,uint256,address))', [inputs, fallbackData]);
+    var functionSignature = 'bridge';
     var parameters = [
         receiver,
         moneyInOutTokenAmount,
         socketMsgGasLimit,
         socketConnector,
         peripheryCalldata,
+        socketBridgeOptions,
     ];
     var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
     return { calldata: calldata, value: socketFees.toString(10) };
 };
 exports.encodeBridgeAndDepositNewMA = encodeBridgeAndDepositNewMA;
-var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, sig, moneyInOutTokenAmount, fallbackSocketMsgGasLimit, fallbackSocketConnector) {
+var encodeBridgeAndDepositExistingMA = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, accountId, peripheryTokenAddress, peripheryTokenAmount, moneyInOutTokenAmount, fallbackSocketMsgGasLimit, fallbackSocketConnector, fallbackSocketPayloadSize) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(Periphery_json_1.abi);
     var inputs = {
         accountId: accountId,
         token: peripheryTokenAddress,
         tokenAmount: peripheryTokenAmount,
-        sig: sig,
     };
     var fallbackData = {
         socketMsgGasLimit: fallbackSocketMsgGasLimit,
         socketConnector: fallbackSocketConnector,
+        socketPayloadSize: fallbackSocketPayloadSize,
     };
-    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositExistingMA((uint128,address,uint256,(uint8,bytes32,bytes32,uint256)),(uint256,address))', [inputs, fallbackData]);
-    var functionSignature = 'depositToAppChain';
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositExistingMA((uint128,address,uint256),(uint256,uint256,address))', [inputs, fallbackData]);
+    var functionSignature = 'bridge';
     var parameters = [
         receiver,
         moneyInOutTokenAmount,
         socketMsgGasLimit,
         socketConnector,
         peripheryCalldata,
+        socketBridgeOptions,
     ];
     var INTERFACE = new ethers_1.Interface(VaultWithPayload_json_1.abi);
     var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/margin-accounts/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\n\nimport { abi } from '../../abis/AccountModule.json';\nimport { abi as coreAbi } from '../../abis/ExecutionModule.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature, signCoreCommands } from '../sign';\nimport { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    RELAYER_ACCOUNT,\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    fromMarginAccountId,\n    multiAction.commands,\n    eip712Signature,\n  ];\n\n  const INTERFACE = new Interface(coreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\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 encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address,uint256),(uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'depositToAppChain';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\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\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n    sig,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address,uint256,(uint8,bytes32,bytes32,uint256)),(uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'depositToAppChain';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\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/margin-accounts/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { Interface } from 'ethers';\nimport {\n  encodeRouterCall,\n  encodeSingleDeposit,\n  encodeSingleTransferMargin,\n  encodeSingleWithdraw,\n} from '../encode';\n\nimport { abi } from '../../abis/CoreProxy.json';\nimport { abi as coreAbi } from '../../abis/CoreProxy.json';\nimport { abi as peripheryAbi } from '../../abis/Periphery.json';\nimport { abi as Socket_VaultWithPayloadAbi } from '../../abis/socket/VaultWithPayload.json';\nimport { EIP712Signature, signCoreCommands } from '../sign';\nimport { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { Signer } from 'ethers';\n\nexport const encodeCreateAccountCall = (\n  accountOwner: string,\n): MethodParameters => {\n  const functionSignature = 'createAccount';\n  const parameters = [accountOwner];\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return { calldata: calldata, value: BigInt(0).toString(10) };\n};\n\nexport const encodeDeposit = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleDeposit(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeWithdraw = (\n  accountId: number,\n  token: string,\n  amount: bigint,\n): MethodParameters => {\n  const multiAction = new MultiAction();\n\n  encodeSingleWithdraw(token, amount, multiAction);\n\n  const value = BigInt(0);\n  const call = encodeRouterCall(multiAction, accountId, value);\n\n  return {\n    ...call,\n  };\n};\n\nexport const encodeTransferMargin = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  fromMarginAccountId: number,\n  toMarginAccountId: number,\n  token: string,\n  amount: bigint,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n  // todo: note can we make this more stateless?\n  encodeSingleTransferMargin(toMarginAccountId, token, amount, multiAction);\n\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    RELAYER_ACCOUNT,\n    fromMarginAccountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [\n    fromMarginAccountId,\n    multiAction.commands,\n    eip712Signature,\n  ];\n\n  const INTERFACE = new Interface(coreAbi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n\nexport const encodeWithdrawMAAndBridge = (\n  accountId: number,\n  corePeripheryTokenAddress: string,\n  corePeripheryTokenAmount: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  socketPayloadSize: bigint,\n  socketConnector: string,\n  receiver: string,\n): MethodParameters => {\n  const functionSignature = 'withdrawMA';\n  const parameters = [\n    {\n      accountId,\n      token: corePeripheryTokenAddress,\n      tokenAmount: corePeripheryTokenAmount,\n      sig,\n      socketMsgGasLimit,\n      socketPayloadSize,\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 encodeBridgeAndDepositNewMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountOwner: string,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountOwner,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositNewMA((address,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\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\nexport const encodeBridgeAndDepositExistingMA = (\n  receiver: string,\n  socketMsgGasLimit: bigint,\n  socketConnector: string,\n  socketBridgeOptions: string,\n  socketFees: bigint,\n  accountId: number,\n  peripheryTokenAddress: string,\n  peripheryTokenAmount: bigint,\n  moneyInOutTokenAmount: bigint,\n  fallbackSocketMsgGasLimit: bigint,\n  fallbackSocketConnector: string,\n  fallbackSocketPayloadSize: bigint,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(peripheryAbi);\n  const inputs = {\n    accountId,\n    token: peripheryTokenAddress,\n    tokenAmount: peripheryTokenAmount,\n  };\n  const fallbackData = {\n    socketMsgGasLimit: fallbackSocketMsgGasLimit,\n    socketConnector: fallbackSocketConnector,\n    socketPayloadSize: fallbackSocketPayloadSize,\n  };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositExistingMA((uint128,address,uint256),(uint256,uint256,address))',\n    [inputs, fallbackData],\n  );\n\n  const functionSignature = 'bridge';\n  const parameters = [\n    receiver,\n    moneyInOutTokenAmount,\n    socketMsgGasLimit,\n    socketConnector,\n    peripheryCalldata,\n    socketBridgeOptions,\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/margin-accounts/withdrawMAAndBridge.js

@@ -69,7 +69,7 @@ var withdrawMAAndBridge = function (_a) {
                         moneyInOutChainId: moneyInOutChainId,
                         tokenName: bridgeTokenInfo.name,
                     });
-                    _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), socketConnectors.withdraw, receiverAddress), data = _c.calldata, value = _c.value;
+                    _c = (0, encode_1.encodeWithdrawMAAndBridge)(marginAccountId, corePeripheryTokenInfo.address, (0, common_1.scale)(corePeripheryTokenInfo.decimals)(unscaledAmount), eip712Signature, BigInt('10000000'), BigInt(0), socketConnectors.withdraw, receiverAddress), data = _c.calldata, value = _c.value;
                     return [4 /*yield*/, (0, executeTransaction_1.executeTransaction)(signer, data, value, reyaChainId, contractAddresses_1.ContractType.PERIPHERY_PROXY)];
                 case 3:
                     result = _e.sent();

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,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AAE1C,IAAM,mBAAmB,GAAG,UAAO,EAQd;QAP1B,MAAM,YAAA,EACN,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,KAAK,WAAA,EACG,cAAc,YAAA,EACtB,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,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEpD,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAC7D,eAAe,GACnB,sBAAsB,CAAC,IAAI,KAAK,MAAM;wBACpC,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,sBAAsB,CAAC;oBAEvB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;oBACtC,IAAA,6BAAoB,EAClB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,WAAW,CACZ,CAAC;oBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBARK,eAAe,GAAG,SAQvB;oBAEK,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;wBAC3C,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,eAAe,CAAC,IAAI;qBAChC,CAAC,CAAC;oBAEG,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,QAAQ,EACzB,eAAe,CAChB,EARiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAQ3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA5DW,QAAA,mBAAmB,uBA4D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  moneyInOutChainId,\n  marginAccountId,\n  owner,\n  amount: unscaledAmount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n  const bridgeTokenInfo =\n    corePeripheryTokenInfo.name === 'RUSD'\n      ? getTokenInfoByName('USDC', reyaChainId)\n      : corePeripheryTokenInfo;\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    marginAccountId,\n    multiAction.commands,\n    owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: bridgeTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    BigInt('10000000'),\n    socketConnectors.withdraw,\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    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":"withdrawMAAndBridge.js","sourceRoot":"/","sources":["services/margin-accounts/withdrawMAAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CAOyB;AACzB,mEAAyE;AACzE,4DAA2D;AAC3D,gCAA2C;AAC3C,mCAAqD;AAKrD,6CAAgE;AAChE,oCAAiD;AACjD,6CAAiD;AAE1C,IAAM,mBAAmB,GAAG,UAAO,EAQd;QAP1B,MAAM,YAAA,EACN,iBAAiB,uBAAA,EACjB,eAAe,qBAAA,EACf,KAAK,WAAA,EACG,cAAc,YAAA,EACtB,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,WAAW,GAAgB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;oBAEpD,sBAAsB,GAAG,IAAA,8BAAqB,EAAC,YAAY,CAAC,CAAC;oBAC7D,eAAe,GACnB,sBAAsB,CAAC,IAAI,KAAK,MAAM;wBACpC,CAAC,CAAC,IAAA,2BAAkB,EAAC,MAAM,EAAE,WAAW,CAAC;wBACzC,CAAC,CAAC,sBAAsB,CAAC;oBAEvB,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;oBACtC,IAAA,6BAAoB,EAClB,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,WAAW,CACZ,CAAC;oBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,WAAW,EACX,IAAA,8BAAU,EAAC,WAAW,EAAE,gCAAY,CAAC,eAAe,CAAC,EACrD,eAAe,EACf,WAAW,CAAC,QAAQ,EACpB,KAAK,CAAC,YAAY,GAAG,CAAC,EACtB,IAAA,qCAA4B,GAAE,GAAG,mCAA0B,CAC5D,EAAA;;oBARK,eAAe,GAAG,SAQvB;oBAEK,gBAAgB,GAAG,IAAA,4BAAmB,EAAC;wBAC3C,iBAAiB,EAAE,iBAAiB;wBACpC,SAAS,EAAE,eAAe,CAAC,IAAI;qBAChC,CAAC,CAAC;oBAEG,KAA4B,IAAA,kCAAyB,EACzD,eAAe,EACf,sBAAsB,CAAC,OAAO,EAC9B,IAAA,cAAK,EAAC,sBAAsB,CAAC,QAAQ,CAAC,CAAC,cAAc,CAAC,EACtD,eAAe,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,MAAM,CAAC,CAAC,CAAC,EACT,gBAAgB,CAAC,QAAQ,EACzB,eAAe,CAChB,EATiB,IAAI,cAAA,EAAE,KAAK,WAAA,CAS3B;oBAEa,qBAAM,IAAA,uCAAkB,EACrC,MAAM,EACN,IAAI,EACJ,KAAK,EACL,WAAW,EACX,gCAAY,CAAC,eAAe,CAC7B,EAAA;;oBANK,MAAM,GAAG,SAMd;oBAED,sBAAO;4BACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,IAAI,KAAI,IAAI;yBACtC,EAAC;;;;CACH,CAAC;AA7DW,QAAA,mBAAmB,uBA6D9B","sourcesContent":["import {\n  getCurrentTimestampInSeconds,\n  getSocketConnectors,\n  scale,\n  ReyaChainId,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n} from '@reyaxyz/common';\nimport { ContractType, getAddress } from '../../utils/contractAddresses';\nimport { executeTransaction } from '../executeTransaction';\nimport { signCoreCommands } from '../sign';\nimport { encodeWithdrawMAAndBridge } from './encode';\nimport {\n  WithdrawMAAndBridgeParams,\n  WithdrawMAAndBridgeParamsResult,\n} from './types';\nimport { BRIDGE_DEADLINE_IN_SECONDS } from '../../utils/consts';\nimport { encodeSingleWithdraw } from '../encode';\nimport { MultiAction } from '../../utils/action';\n\nexport const withdrawMAAndBridge = async ({\n  signer,\n  moneyInOutChainId,\n  marginAccountId,\n  owner,\n  amount: unscaledAmount,\n  tokenAddress,\n  receiverAddress = owner.address,\n}: WithdrawMAAndBridgeParams): Promise<WithdrawMAAndBridgeParamsResult> => {\n  const network = await signer.provider?.getNetwork();\n  const reyaChainId: ReyaChainId = Number(network?.chainId);\n\n  const corePeripheryTokenInfo = getTokenInfoByAddress(tokenAddress);\n  const bridgeTokenInfo =\n    corePeripheryTokenInfo.name === 'RUSD'\n      ? getTokenInfoByName('USDC', reyaChainId)\n      : corePeripheryTokenInfo;\n\n  const multiAction = new MultiAction();\n  encodeSingleWithdraw(\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    reyaChainId,\n    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),\n    marginAccountId,\n    multiAction.commands,\n    owner.coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,\n  );\n\n  const socketConnectors = getSocketConnectors({\n    moneyInOutChainId: moneyInOutChainId,\n    tokenName: bridgeTokenInfo.name,\n  });\n\n  const { calldata: data, value } = encodeWithdrawMAAndBridge(\n    marginAccountId,\n    corePeripheryTokenInfo.address,\n    scale(corePeripheryTokenInfo.decimals)(unscaledAmount),\n    eip712Signature,\n    BigInt('10000000'),\n    BigInt(0),\n    socketConnectors.withdraw,\n    receiverAddress,\n  );\n\n  const result = await executeTransaction(\n    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/orders/encode.js

@@ -43,7 +43,7 @@ var sign_1 = require("../sign");
 var common_1 = require("@reyaxyz/common");
 var consts_1 = require("../../utils/consts");
 var ethers_1 = require("ethers");
-var ExecutionModule_json_1 = require("../../abis/ExecutionModule.json");
+var CoreProxy_json_1 = require("../../abis/CoreProxy.json");
 var encodeMatchOrder = function (signer, chainId, coreSigNonce, accountId, orderBase, orderPriceLimit, counterpartyAccountIds, marketId, exchangeId) { return __awaiter(void 0, void 0, void 0, function () {
     var multiAction, eip712Signature, value, functionSignature, parameters, INTERFACE, calldata;
     return __generator(this, function (_a) {
@@ -57,7 +57,7 @@ var encodeMatchOrder = function (signer, chainId, coreSigNonce, accountId, order
                 value = BigInt(0);
                 functionSignature = 'executeBySig';
                 parameters = [accountId, multiAction.commands, eip712Signature];
-                INTERFACE = new ethers_1.Interface(ExecutionModule_json_1.abi);
+                INTERFACE = new ethers_1.Interface(CoreProxy_json_1.abi);
                 calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
                 return [2 /*return*/, {
                         calldata: calldata,

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

@@ -1 +1 @@
-{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmE;AACnE,oCAA8C;AAC9C,gCAA2C;AAC3C,0CAA+D;AAC/D,6CAA+E;AAC/E,iCAA2C;AAC3C,wEAAsD;AAC/C,IAAM,gBAAgB,GAAG,UAC9B,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,SAAiB,EACjB,SAAiB,EACjB,eAAuB,EACvB,sBAAgC,EAChC,QAAgB,EAChB,UAAkB;;;;;gBAEZ,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBAEtC,IAAA,0BAAiB,EACf,sBAAsB,EACtB,SAAS,EACT,eAAe,EACf,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;gBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,wBAAe,EACf,SAAS,EACT,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,CAC1D,EAAA;;gBARK,eAAe,GAAG,SAQvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,cAAc,CAAC;gBACnC,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAEhE,SAAS,GAAG,IAAI,kBAAS,CAAC,0BAAG,CAAC,CAAC;gBAC/B,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;gBAC7E,sBAAO;wBACL,QAAQ,EAAE,QAAQ;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAClC,EAAC;;;KACH,CAAC;AAzCW,QAAA,gBAAgB,oBAyC3B","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { encodeSingleTrade } from '../encode';\nimport { signCoreCommands } from '../sign';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';\nimport { Interface, Signer } from 'ethers';\nimport { abi } from '../../abis/ExecutionModule.json';\nexport const encodeMatchOrder = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  counterpartyAccountIds: number[],\n  marketId: number,\n  exchangeId: number,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleTrade(\n    counterpartyAccountIds,\n    orderBase,\n    orderPriceLimit,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    RELAYER_ACCOUNT,\n    accountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [accountId, multiAction.commands, eip712Signature];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/orders/encode.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6CAAmE;AACnE,oCAA8C;AAC9C,gCAA2C;AAC3C,0CAA+D;AAC/D,6CAA+E;AAC/E,iCAA2C;AAC3C,4DAAgD;AACzC,IAAM,gBAAgB,GAAG,UAC9B,MAAc,EACd,OAAe,EACf,YAAoB,EACpB,SAAiB,EACjB,SAAiB,EACjB,eAAuB,EACvB,sBAAgC,EAChC,QAAgB,EAChB,UAAkB;;;;;gBAEZ,WAAW,GAAG,IAAI,oBAAW,EAAE,CAAC;gBAEtC,IAAA,0BAAiB,EACf,sBAAsB,EACtB,SAAS,EACT,eAAe,EACf,QAAQ,EACR,UAAU,EACV,WAAW,CACZ,CAAC;gBACsB,qBAAM,IAAA,uBAAgB,EAC5C,MAAM,EACN,OAAO,EACP,wBAAe,EACf,SAAS,EACT,WAAW,CAAC,QAAQ,EACpB,YAAY,GAAG,CAAC,EAChB,IAAA,qCAA4B,GAAE,GAAG,iCAAwB,CAC1D,EAAA;;gBARK,eAAe,GAAG,SAQvB;gBAEK,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;gBAClB,iBAAiB,GAAG,cAAc,CAAC;gBACnC,UAAU,GAAG,CAAC,SAAS,EAAE,WAAW,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;gBAEhE,SAAS,GAAG,IAAI,kBAAS,CAAC,oBAAG,CAAC,CAAC;gBAC/B,QAAQ,GAAG,SAAS,CAAC,kBAAkB,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;gBAC7E,sBAAO;wBACL,QAAQ,EAAE,QAAQ;wBAClB,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;qBAClC,EAAC;;;KACH,CAAC;AAzCW,QAAA,gBAAgB,oBAyC3B","sourcesContent":["import { MethodParameters, MultiAction } from '../../utils/action';\nimport { encodeSingleTrade } from '../encode';\nimport { signCoreCommands } from '../sign';\nimport { getCurrentTimestampInSeconds } from '@reyaxyz/common';\nimport { CORE_DEADLINE_IN_SECONDS, RELAYER_ACCOUNT } from '../../utils/consts';\nimport { Interface, Signer } from 'ethers';\nimport { abi } from '../../abis/CoreProxy.json';\nexport const encodeMatchOrder = async (\n  signer: Signer,\n  chainId: number,\n  coreSigNonce: number,\n  accountId: number,\n  orderBase: bigint,\n  orderPriceLimit: bigint,\n  counterpartyAccountIds: number[],\n  marketId: number,\n  exchangeId: number,\n): Promise<MethodParameters> => {\n  const multiAction = new MultiAction();\n\n  encodeSingleTrade(\n    counterpartyAccountIds,\n    orderBase,\n    orderPriceLimit,\n    marketId,\n    exchangeId,\n    multiAction,\n  );\n  const eip712Signature = await signCoreCommands(\n    signer,\n    chainId,\n    RELAYER_ACCOUNT,\n    accountId,\n    multiAction.commands,\n    coreSigNonce + 1,\n    getCurrentTimestampInSeconds() + CORE_DEADLINE_IN_SECONDS,\n  );\n\n  const value = BigInt(0);\n  const functionSignature = 'executeBySig';\n  const parameters = [accountId, multiAction.commands, eip712Signature];\n\n  const INTERFACE = new Interface(abi);\n  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);\n  return {\n    calldata: calldata,\n    value: BigInt(value).toString(10),\n  };\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAkD3C,CAAC"}
+{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAYA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EAClC,MAAM,SAAS,CAAC;AAEjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAoD3C,CAAC"}

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

@@ -2,7 +2,7 @@ import { MethodParameters } from '../../utils/action';
 import { EIP712Signature } from '../sign';
 export declare const encodeProvideLiquidityCall: (poolId: number, accountOwner: string, amount: bigint, minShares: number) => MethodParameters;
 export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: bigint, minOut: number) => MethodParameters;
-export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, minShares: bigint) => MethodParameters;
-export declare const encodeWithdrawPassivePoolAndBridge: (poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketConnector: string, receiver: string) => MethodParameters;
-export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string) => MethodParameters;
+export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, minShares: bigint, receiver: string) => MethodParameters;
+export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, socketPayloadSize: bigint, socketConnector: string, receiver: string) => MethodParameters;
+export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint, fallbackSocketMsgGasLimit: bigint, fallbackSocketConnector: string, fallbackSocketPayloadSize: bigint) => MethodParameters;
 //# sourceMappingURL=encode.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,WACrC,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,mBACR,MAAM,YACb,MAAM,KACf,gBAgBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,cACX,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,6BACU,MAAM,2BACR,MAAM,KAC9B,gBAuBF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAa1C,eAAO,MAAM,0BAA0B,WAC7B,MAAM,gBACA,MAAM,UACZ,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAC5B,MAAM,gBACA,MAAM,UACZ,MAAM,KACb,gBAMF,CAAC;AAEF,eAAO,MAAM,0BAA0B,cAC1B,MAAM,UACT,MAAM,OACT,eAAe,UACZ,MAAM,aACH,MAAM,YACP,MAAM,KACf,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,qBACN,MAAM,mBACR,MAAM,YACb,MAAM,KACf,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,6BACU,MAAM,2BACR,MAAM,6BACJ,MAAM,KAChC,gBAyBF,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"transferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,CAuCpC,CAAC"}
+{"version":3,"file":"transferFromMAToPool.d.ts","sourceRoot":"/","sources":["services/lp/transferFromMAToPool.ts"],"names":[],"mappings":"AAUA,OAAO,EACL,0BAA0B,EAC1B,0BAA0B,EAC3B,MAAM,SAAS,CAAC;AAKjB,eAAO,MAAM,oBAAoB,WACvB,0BAA0B,KACjC,QAAQ,0BAA0B,CAwCpC,CAAC"}