@reyaxyz/sdk 0.115.0 → 0.116.0

package/README.md

@@ -6,5 +6,5 @@
 
 | Statements                  | Branches                | Functions                 | Lines             |
 | --------------------------- | ----------------------- | ------------------------- | ----------------- |
-| ![Statements](https://img.shields.io/badge/statements-9.65%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-4.6%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-5.55%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-9.07%25-red.svg?style=flat) |
+| ![Statements](https://img.shields.io/badge/statements-8.96%25-red.svg?style=flat) | ![Branches](https://img.shields.io/badge/branches-4.24%25-red.svg?style=flat) | ![Functions](https://img.shields.io/badge/functions-5.26%25-red.svg?style=flat) | ![Lines](https://img.shields.io/badge/lines-8.4%25-red.svg?style=flat) |
 

package/dist/services/lp/bridgeAndDepositPassivePool.js

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bridgeAndDepositPassivePoolUnderAlphaTerms = exports.bridgeAndDepositPassivePool = void 0;
+exports.bridgeAndDepositPassivePoolUnderAlphaTerms = exports.bridgeAndDepositPassivePoolV2 = exports.bridgeAndDepositPassivePool = void 0;
 var common_1 = require("@reyaxyz/common");
 var config_1 = require("../../config");
 var common_2 = require("@reyaxyz/common");
@@ -82,6 +82,42 @@ var bridgeAndDepositPassivePool = function (params) { return __awaiter(void 0, v
     });
 }); };
 exports.bridgeAndDepositPassivePool = bridgeAndDepositPassivePool;
+var bridgeAndDepositPassivePoolV2 = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var network, moneyInOutChainId, env, chainId, tokenInfo, amount, socketConnectors, peripheryAddress, reyaTokenInfo, _a, data, value, result;
+    var _b;
+    return __generator(this, function (_c) {
+        switch (_c.label) {
+            case 0: return [4 /*yield*/, ((_b = params.signer.provider) === null || _b === void 0 ? void 0 : _b.getNetwork())];
+            case 1:
+                network = _c.sent();
+                moneyInOutChainId = Number(network === null || network === void 0 ? void 0 : network.chainId);
+                env = (0, config_1.getSdkEnvironment)();
+                chainId = (0, common_1.getReyaNetwork)(env === 'production' ? 'production' : 'test');
+                if (moneyInOutChainId === chainId) {
+                    throw new Error('Bridging from Reya Chain to Reya Chain is not supported');
+                }
+                tokenInfo = (0, common_1.getTokenInfoByAddress)(params.tokenAddress, moneyInOutChainId);
+                amount = (0, common_1.scale)(tokenInfo.decimals)(params.amount);
+                socketConnectors = (0, common_1.getSocketConnectors)({
+                    moneyInOutChainId: moneyInOutChainId,
+                    tokenName: tokenInfo.name,
+                });
+                peripheryAddress = (0, common_2.getAddress)((0, common_1.getReyaNetworkFromMoneyInOutChainId)(moneyInOutChainId), common_2.ContractType.PERIPHERY_PROXY);
+                reyaTokenInfo = (0, common_1.getTokenInfoByName)(tokenInfo.isRUSDUnderlying ? 'RUSD' : tokenInfo.name, chainId);
+                _a = (0, encode_1.encodeBridgeAndDepositPassivePoolV2)(peripheryAddress, BigInt('10000000'), socketConnectors.deposit, '0x', params.socketDepositFees, params.pool.id, params.ownerAddress, amount, BigInt(0), reyaTokenInfo.address), data = _a.calldata, value = _a.value;
+                return [4 /*yield*/, (0, common_1.executeTransaction)(params.signer, data, value, moneyInOutChainId, (0, common_1.getSocketVault)({
+                        moneyInOutChainId: moneyInOutChainId,
+                        tokenName: tokenInfo.name,
+                    }))];
+            case 2:
+                result = _c.sent();
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.hash) || null,
+                    }];
+        }
+    });
+}); };
+exports.bridgeAndDepositPassivePoolV2 = bridgeAndDepositPassivePoolV2;
 var bridgeAndDepositPassivePoolUnderAlphaTerms = function (params) { return __awaiter(void 0, void 0, void 0, function () {
     var alphaTermsModule;
     return __generator(this, function (_a) {

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

@@ -1 +1 @@
-{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0CASyB;AACzB,uCAA4E;AAC5E,0CAA2D;AAC3D,mCAA6D;AAO7D,2BAAwC;AAEjC,IAAM,2BAA2B,GAAG,UACzC,MAAyC;;;;;oBAEzB,qBAAM,CAAA,MAAA,MAAM,CAAC,MAAM,CAAC,QAAQ,0CAAE,UAAU,EAAE,CAAA,EAAA;;gBAApD,OAAO,GAAG,SAA0C;gBACpD,iBAAiB,GAAsB,MAAM,CAAC,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,OAAO,CAAC,CAAC;gBAEhE,GAAG,GAAG,IAAA,0BAAiB,GAAE,CAAC;gBAC1B,OAAO,GAAG,IAAA,uBAAc,EAAC,GAAG,KAAK,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;gBAE7E,iBAAiB;gBACjB,IAAI,iBAAiB,KAAM,OAAmB,EAAE,CAAC;oBAC/C,sBAAO,IAAA,qBAAgB,EAAC;4BACtB,MAAM,EAAE,MAAM,CAAC,MAAM;4BACrB,MAAM,EAAE,MAAM,CAAC,MAAM;4BACrB,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE;yBACzB,CAAC,EAAC;gBACL,CAAC;gBAEK,SAAS,GAAG,IAAA,mCAA0B,EAAC,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,mBAAU,EACjC,IAAA,4CAAmC,EAAC,iBAAiB,CAAC,EACtD,qBAAY,CAAC,eAAe,CAC7B,CAAC;gBAEI,KAA4B,IAAA,0CAAiC,EACjE,gBAAgB,EAChB,MAAM,CAAC,UAAU,CAAC,EAClB,gBAAgB,CAAC,OAAO,EACxB,IAAI,EACJ,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,MAAM,CAAC,YAAY,EACnB,MAAM,EACN,MAAM,CAAC,CAAC,CAAC,CACV,EAViB,IAAI,cAAA,EAAE,KAAK,WAAA,CAU3B;gBAEa,qBAAM,IAAA,2BAAkB,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;AA1DW,QAAA,2BAA2B,+BA0DtC;AAEK,IAAM,0CAA0C,GAAG,UACxD,MAAwD;;;;;gBAElD,gBAAgB,GAAG,IAAA,kCAAyB,GAAE,CAAC;gBACrD,qBAAM,gBAAgB,CAAC,sBAAsB,CAAC;wBAC5C,aAAa,EAAE,MAAM,CAAC,YAAY;wBAClC,IAAI,EAAE,MAAM,CAAC,UAAU;qBACxB,CAAC,EAAA;;gBAHF,SAGE,CAAC;gBAEI,qBAAM,IAAA,mCAA2B,EAAC,MAAM,CAAC,EAAA;oBAAhD,sBAAO,SAAyC,EAAC;;;KAClD,CAAC;AAVW,QAAA,0CAA0C,8CAUrD","sourcesContent":["import {\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getReyaNetworkFromMoneyInOutChainId,\n  getRUSDUnderlyingTokenInfo,\n  executeTransaction,\n  getReyaNetwork,\n} from '@reyaxyz/common';\nimport { getAlphaTermsModuleClient, getSdkEnvironment } from '../../config';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport { encodeBridgeAndDepositPassivePool } from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolResult,\n  BridgeAndDepositPassivePoolUnderAlphaTermsParams,\n  BridgeAndDepositPassivePoolUnderAlphaTermsResult,\n} from './types';\nimport { provideLiquidity } from './lp';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n  // @todo fix this\n  if (moneyInOutChainId === (chainId as unknown)) {\n    return provideLiquidity({\n      signer: params.signer,\n      amount: params.amount,\n      lpPoolId: params.pool.id,\n    });\n  }\n\n  const tokenInfo = getRUSDUnderlyingTokenInfo(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    params.socketDepositFees,\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const bridgeAndDepositPassivePoolUnderAlphaTerms = async (\n  params: BridgeAndDepositPassivePoolUnderAlphaTermsParams,\n): Promise<BridgeAndDepositPassivePoolUnderAlphaTermsResult> => {\n  const alphaTermsModule = getAlphaTermsModuleClient();\n  await alphaTermsModule.registerAlphaSignature({\n    walletAddress: params.ownerAddress,\n    link: params.signedLink,\n  });\n\n  return await bridgeAndDepositPassivePool(params);\n};\n"]}
+{"version":3,"file":"bridgeAndDepositPassivePool.js","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  getSocketVault,\n  scale,\n  MoneyInOutChainId,\n  getSocketConnectors,\n  getReyaNetworkFromMoneyInOutChainId,\n  getRUSDUnderlyingTokenInfo,\n  executeTransaction,\n  getReyaNetwork,\n  getTokenInfoByAddress,\n  getTokenInfoByName,\n} from '@reyaxyz/common';\nimport { getAlphaTermsModuleClient, getSdkEnvironment } from '../../config';\nimport { ContractType, getAddress } from '@reyaxyz/common';\nimport {\n  encodeBridgeAndDepositPassivePool,\n  encodeBridgeAndDepositPassivePoolV2,\n} from './encode';\nimport {\n  BridgeAndDepositPassivePoolParams,\n  BridgeAndDepositPassivePoolParamsV2,\n  BridgeAndDepositPassivePoolResult,\n  BridgeAndDepositPassivePoolUnderAlphaTermsParams,\n  BridgeAndDepositPassivePoolUnderAlphaTermsResult,\n} from './types';\nimport { provideLiquidity } from './lp';\n\nexport const bridgeAndDepositPassivePool = async (\n  params: BridgeAndDepositPassivePoolParams,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n  // @todo fix this\n  if (moneyInOutChainId === (chainId as unknown)) {\n    return provideLiquidity({\n      signer: params.signer,\n      amount: params.amount,\n      lpPoolId: params.pool.id,\n    });\n  }\n\n  const tokenInfo = getRUSDUnderlyingTokenInfo(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    params.socketDepositFees,\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n  );\n\n  const result = await executeTransaction(\n    params.signer,\n    data,\n    value,\n    moneyInOutChainId,\n    getSocketVault({\n      moneyInOutChainId: moneyInOutChainId,\n      tokenName: tokenInfo.name,\n    }),\n  );\n\n  return {\n    transactionHash: result?.hash || null,\n  };\n};\n\nexport const bridgeAndDepositPassivePoolV2 = async (\n  params: BridgeAndDepositPassivePoolParamsV2,\n): Promise<BridgeAndDepositPassivePoolResult> => {\n  const network = await params.signer.provider?.getNetwork();\n  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);\n\n  const env = getSdkEnvironment();\n  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');\n\n  if (moneyInOutChainId === (chainId as unknown)) {\n    throw new Error('Bridging from Reya Chain to Reya Chain is not supported');\n  }\n\n  const tokenInfo = getTokenInfoByAddress(\n    params.tokenAddress,\n    moneyInOutChainId,\n  );\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 reyaTokenInfo = getTokenInfoByName(\n    tokenInfo.isRUSDUnderlying ? 'RUSD' : tokenInfo.name,\n    chainId,\n  );\n  const { calldata: data, value } = encodeBridgeAndDepositPassivePoolV2(\n    peripheryAddress,\n    BigInt('10000000'),\n    socketConnectors.deposit,\n    '0x',\n    params.socketDepositFees,\n    params.pool.id,\n    params.ownerAddress,\n    amount,\n    BigInt(0),\n    reyaTokenInfo.address,\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\nexport const bridgeAndDepositPassivePoolUnderAlphaTerms = async (\n  params: BridgeAndDepositPassivePoolUnderAlphaTermsParams,\n): Promise<BridgeAndDepositPassivePoolUnderAlphaTermsResult> => {\n  const alphaTermsModule = getAlphaTermsModuleClient();\n  await alphaTermsModule.registerAlphaSignature({\n    walletAddress: params.ownerAddress,\n    link: params.signedLink,\n  });\n\n  return await bridgeAndDepositPassivePool(params);\n};\n"]}

package/dist/services/lp/encode.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.encodeBridgeAndDepositPassivePool = exports.encodeWithdrawPassivePoolAndBridge = exports.encodeTransferFromPoolToMA = exports.encodeTransferFromMAToPool = exports.encodeRemoveLiquidityCall = exports.encodeProvideLiquidityCall = void 0;
+exports.encodeBridgeAndDepositPassivePoolV2 = exports.encodeBridgeAndDepositPassivePool = exports.encodeWithdrawPassivePoolAndBridgeV2 = exports.encodeWithdrawPassivePoolAndBridge = exports.encodeTransferFromPoolToMA = exports.encodeTransferFromMAToPool = exports.encodeRemoveLiquidityCall = exports.encodeProvideLiquidityCall = void 0;
 var common_1 = require("@reyaxyz/common");
 var ethers_1 = require("ethers");
 var common_2 = require("@reyaxyz/common");
@@ -63,6 +63,26 @@ var encodeWithdrawPassivePoolAndBridge = function (owner, poolId, sharesAmount,
     return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 exports.encodeWithdrawPassivePoolAndBridge = encodeWithdrawPassivePoolAndBridge;
+var encodeWithdrawPassivePoolAndBridgeV2 = function (owner, poolId, sharesAmount, minOut, sig, socketMsgGasLimit, chainId, receiver, token) {
+    var functionSignature = 'WithdrawPassivePoolV2';
+    var parameters = [
+        {
+            owner: owner,
+            token: token,
+            poolId: poolId,
+            sharesAmount: sharesAmount,
+            minOut: minOut,
+            sig: sig,
+            socketMsgGasLimit: socketMsgGasLimit,
+            chainId: chainId,
+            receiver: receiver,
+        },
+    ];
+    var INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
+    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+    return { calldata: calldata, value: BigInt(0).toString(10) };
+};
+exports.encodeWithdrawPassivePoolAndBridgeV2 = encodeWithdrawPassivePoolAndBridgeV2;
 var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, poolId, owner, amount, minShares) {
     var PERIPHERY_INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
     var inputs = { poolId: poolId, owner: owner, minShares: minShares };
@@ -81,4 +101,22 @@ var encodeBridgeAndDepositPassivePool = function (receiver, socketMsgGasLimit, s
     return { calldata: calldata, value: socketFees.toString(10) };
 };
 exports.encodeBridgeAndDepositPassivePool = encodeBridgeAndDepositPassivePool;
+var encodeBridgeAndDepositPassivePoolV2 = function (receiver, socketMsgGasLimit, socketConnector, socketBridgeOptions, socketFees, poolId, owner, amount, minShares, token) {
+    var PERIPHERY_INTERFACE = new ethers_1.Interface(common_1.PeripheryAbi);
+    var inputs = { poolId: poolId, owner: owner, token: token, minShares: minShares };
+    var peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData('depositPassivePoolV2((uint128,address,address,uint256))', [inputs]);
+    var functionSignature = 'bridge';
+    var parameters = [
+        receiver,
+        amount,
+        socketMsgGasLimit,
+        socketConnector,
+        peripheryCalldata,
+        socketBridgeOptions,
+    ];
+    var INTERFACE = new ethers_1.Interface(common_2.Socket_VaultWithPayloadAbi);
+    var calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+    return { calldata: calldata, value: socketFees.toString(10) };
+};
+exports.encodeBridgeAndDepositPassivePoolV2 = encodeBridgeAndDepositPassivePoolV2;
 //# sourceMappingURL=encode.js.map

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, PeripheryAbi } from '@reyaxyz/common';\nimport { Interface } from 'ethers';\nimport { EIP712Signature, Socket_VaultWithPayloadAbi } from '@reyaxyz/common';\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 encodeTransferFromPoolToMA = (\n  owner: string,\n  sig: EIP712Signature,\n  sharesAmount: bigint,\n  poolId: number,\n  minOut: bigint,\n  accountId: number,\n): MethodParameters => {\n  const functionSignature = 'transferFromPoolToMA';\n  const parameters = [{ owner, sig, sharesAmount, poolId, minOut, accountId }];\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  chainId: number,\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      chainId,\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): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = { poolId, owner, minShares };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool((uint128,address,uint256))',\n    [inputs],\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"]}
+{"version":3,"file":"encode.js","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"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","sourcesContent":["import { MethodParameters, PeripheryAbi } from '@reyaxyz/common';\nimport { Interface } from 'ethers';\nimport { EIP712Signature, Socket_VaultWithPayloadAbi } from '@reyaxyz/common';\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 encodeTransferFromPoolToMA = (\n  owner: string,\n  sig: EIP712Signature,\n  sharesAmount: bigint,\n  poolId: number,\n  minOut: bigint,\n  accountId: number,\n): MethodParameters => {\n  const functionSignature = 'transferFromPoolToMA';\n  const parameters = [{ owner, sig, sharesAmount, poolId, minOut, accountId }];\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  chainId: number,\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      chainId,\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 encodeWithdrawPassivePoolAndBridgeV2 = (\n  owner: string,\n  poolId: number,\n  sharesAmount: bigint,\n  minOut: bigint,\n  sig: EIP712Signature,\n  socketMsgGasLimit: bigint,\n  chainId: number,\n  receiver: string,\n  token: string,\n): MethodParameters => {\n  const functionSignature = 'WithdrawPassivePoolV2';\n  const parameters = [\n    {\n      owner,\n      token,\n      poolId,\n      sharesAmount,\n      minOut,\n      sig,\n      socketMsgGasLimit,\n      chainId,\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): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = { poolId, owner, minShares };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePool((uint128,address,uint256))',\n    [inputs],\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\nexport const encodeBridgeAndDepositPassivePoolV2 = (\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  token: string,\n): MethodParameters => {\n  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);\n  const inputs = { poolId, owner, token, minShares };\n  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(\n    'depositPassivePoolV2((uint128,address,address,uint256))',\n    [inputs],\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/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  SocketDepositFees,\n  TokenEntity,\n  TokenName,\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 TransferFromPoolToMAParams = {\n  signer: Signer | JsonRpcSigner;\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  marginAccountId: MarginAccountEntity['id'];\n};\n\nexport type TransferFromMAToPoolResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type TransferFromPoolToMAResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | 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  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolUnderAlphaTermsParams =\n  BridgeAndDepositPassivePoolParams & {\n    signedLink: string;\n  };\n\nexport type BridgeAndDepositPassivePoolUnderAlphaTermsResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n  fees: number;\n  feesUnderlyingToken: TokenName;\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n  moneyInOutChainId: MoneyInOutChainId;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n  fees: number;\n  feesUnderlyingToken: TokenName;\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  SocketDepositFees,\n  TokenEntity,\n  TokenName,\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 TransferFromPoolToMAParams = {\n  signer: Signer | JsonRpcSigner;\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  marginAccountId: MarginAccountEntity['id'];\n};\n\nexport type TransferFromMAToPoolResult = {\n  transactionHash: string | null;\n  coreSigNonce: OwnerMetadataEntity['coreSigNonce'] | null;\n};\n\nexport type TransferFromPoolToMAResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | 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 WithdrawPassivePoolAndBridgeParamsV2 = {\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  priceTokenToRusd: LpWithdrawBalanceEntity['balanceBreakdown'][string]['priceTokenToRusd'];\n  sharesAmount: number;\n  withdrawMax: boolean;\n  tokenAddress: TokenEntity['address']; // address from reya chain\n};\n\nexport type WithdrawPassivePoolAndBridgeResult = {\n  transactionHash: string | null;\n  poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;\n};\n\nexport type BridgeAndDepositPassivePoolParams = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n};\n\nexport type BridgeAndDepositPassivePoolParamsV2 = {\n  signer: Signer | JsonRpcSigner;\n  ownerAddress: OwnerMetadataEntity['address'];\n  pool: Pick<LpPoolEntity, 'id'>;\n  amount: number;\n  socketDepositFees: SocketDepositFees['fees'];\n  tokenAddress: TokenEntity['address'];\n};\n\nexport type BridgeAndDepositPassivePoolResult = {\n  transactionHash: string | null;\n};\n\nexport type BridgeAndDepositPassivePoolUnderAlphaTermsParams =\n  BridgeAndDepositPassivePoolParams & {\n    signedLink: string;\n  };\n\nexport type BridgeAndDepositPassivePoolUnderAlphaTermsResult = {\n  transactionHash: string | null;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolResult = {\n  fees: number;\n  feesUnderlyingToken: TokenName;\n  bridgeTimeInMS: number;\n};\n\nexport type SimulateBridgeAndDepositPassivePoolParams = {\n  moneyInOutChainId: MoneyInOutChainId;\n};\n\nexport type SimulateWithdrawPassivePoolAndBridgeResult = {\n  fees: number;\n  feesUnderlyingToken: TokenName;\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

@@ -36,7 +36,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawPassivePoolAndBridge = void 0;
+exports.withdrawPassivePoolAndBridgeV2 = exports.withdrawPassivePoolAndBridge = void 0;
 var encode_1 = require("./encode");
 var common_1 = require("@reyaxyz/common");
 var signAndBroadcastTransaction_1 = require("../signAndBroadcastTransaction");
@@ -73,4 +73,36 @@ var withdrawPassivePoolAndBridge = function (params) { return __awaiter(void 0,
     });
 }); };
 exports.withdrawPassivePoolAndBridge = withdrawPassivePoolAndBridge;
+var withdrawPassivePoolAndBridgeV2 = function (params) { return __awaiter(void 0, void 0, void 0, function () {
+    var reyaChainId, sharesAmount, socketMsgGasLimit, eip712Signature, data, result;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0:
+                reyaChainId = (0, common_1.getReyaNetworkFromMoneyInOutChainId)(params.moneyInOutChainId);
+                if (params.withdrawMax) {
+                    sharesAmount = (0, common_1.scale)(30)(params.sharesAmount);
+                }
+                else {
+                    sharesAmount = (0, common_1.scale)(30)((params.amount * params.priceTokenToRusd) / params.sharePrice);
+                }
+                socketMsgGasLimit = (0, common_1.getSocketWithdrawMsgGasLimit)({
+                    moneyInOutChainId: params.moneyInOutChainId,
+                }).msgGasLimit;
+                return [4 /*yield*/, (0, common_1.signPoolRemoveLiquidityV2)(params.signer, reyaChainId, (0, common_1.getAddress)(reyaChainId, common_1.ContractType.PERIPHERY_PROXY), params.owner.address, params.pool.id, sharesAmount, BigInt(0), params.owner.poolSigNonce + 1, (0, common_1.getCurrentTimestampInSeconds)() + common_1.BRIDGE_DEADLINE_IN_SECONDS, ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(['address', 'uint256', 'uint256'], [params.owner.address, params.moneyInOutChainId, socketMsgGasLimit]), params.tokenAddress)];
+            case 1:
+                eip712Signature = _a.sent();
+                data = (0, encode_1.encodeWithdrawPassivePoolAndBridgeV2)(params.owner.address, params.pool.id, sharesAmount, BigInt(0), eip712Signature, socketMsgGasLimit, params.moneyInOutChainId, params.owner.address, params.tokenAddress).calldata;
+                return [4 /*yield*/, (0, signAndBroadcastTransaction_1.signAndBroadcastTransaction)(data, reyaChainId, common_1.ContractType.PERIPHERY_PROXY, {
+                        destinationType: 'pool',
+                    })];
+            case 2:
+                result = _a.sent();
+                return [2 /*return*/, {
+                        transactionHash: (result === null || result === void 0 ? void 0 : result.txHash) || null,
+                        poolSigNonce: Number(result === null || result === void 0 ? void 0 : result.poolSigNonce) || null,
+                    }];
+        }
+    });
+}); };
+exports.withdrawPassivePoolAndBridgeV2 = withdrawPassivePoolAndBridgeV2;
 //# sourceMappingURL=withdrawPassivePoolAndBridge.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIA,mCAA8D;AAC9D,0CASyB;AACzB,8EAA6E;AAC7E,iCAAgC;AAEzB,IAAM,4BAA4B,GAAG,UAC1C,MAA0C;;;;;gBAEpC,WAAW,GAAG,IAAA,4CAAmC,EACrD,MAAM,CAAC,iBAAiB,CACzB,CAAC;gBAGF,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;gBAEK,iBAAiB,GAAG,IAAA,qCAA4B,EAAC;oBACrD,iBAAiB,EAAE,MAAM,CAAC,iBAAiB;iBAC5C,CAAC,CAAC,WAAW,CAAC;gBAES,qBAAM,IAAA,gCAAuB,EACnD,MAAM,CAAC,MAAM,EACb,WAAW,EACX,IAAA,mBAAU,EAAC,WAAW,EAAE,qBAAY,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,EAC3D,eAAM,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC,MAAM,CACtC,CAAC,SAAS,EAAE,SAAS,EAAE,SAAS,CAAC,EACjC,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,CAAC,iBAAiB,EAAE,iBAAiB,CAAC,CACpE,CACF,EAAA;;gBAdK,eAAe,GAAG,SAcvB;gBAEiB,IAAI,GAAK,IAAA,2CAAkC,EAC3D,MAAM,CAAC,KAAK,CAAC,OAAO,EACpB,MAAM,CAAC,IAAI,CAAC,EAAE,EACd,YAAY,EACZ,MAAM,CAAC,CAAC,CAAC,EACT,eAAe,EACf,iBAAiB,EACjB,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,KAAK,CAAC,OAAO,CACrB,SATqB,CASpB;gBAEa,qBAAM,IAAA,yDAA2B,EAC9C,IAAI,EACJ,WAAW,EACX,qBAAY,CAAC,eAAe,EAC5B;wBACE,eAAe,EAAE,MAAM;qBACxB,CACF,EAAA;;gBAPK,MAAM,GAAG,SAOd;gBAED,sBAAO;wBACL,eAAe,EAAE,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,KAAI,IAAI;wBACvC,YAAY,EAAE,MAAM,CAAC,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,CAAC,IAAI,IAAI;qBACnD,EAAC;;;KACH,CAAC;AA1DW,QAAA,4BAA4B,gCA0DvC","sourcesContent":["import {\n  WithdrawPassivePoolAndBridgeParams,\n  WithdrawPassivePoolAndBridgeResult,\n} from './types';\nimport { encodeWithdrawPassivePoolAndBridge } from './encode';\nimport {\n  getCurrentTimestampInSeconds,\n  scale,\n  signPoolRemoveLiquidity,\n  ContractType,\n  getAddress,\n  BRIDGE_DEADLINE_IN_SECONDS,\n  getReyaNetworkFromMoneyInOutChainId,\n  getSocketWithdrawMsgGasLimit,\n} from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { ethers } from 'ethers';\n\nexport const withdrawPassivePoolAndBridge = async (\n  params: WithdrawPassivePoolAndBridgeParams,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(\n    params.moneyInOutChainId,\n  );\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 socketMsgGasLimit = getSocketWithdrawMsgGasLimit({\n    moneyInOutChainId: params.moneyInOutChainId,\n  }).msgGasLimit;\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    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [params.owner.address, params.moneyInOutChainId, socketMsgGasLimit],\n    ),\n  );\n\n  const { calldata: data } = encodeWithdrawPassivePoolAndBridge(\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    socketMsgGasLimit,\n    params.moneyInOutChainId,\n    params.owner.address,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      destinationType: 'pool',\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    poolSigNonce: Number(result?.poolSigNonce) || null,\n  };\n};\n"]}
+{"version":3,"file":"withdrawPassivePoolAndBridge.js","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  WithdrawPassivePoolAndBridgeParams,\n  WithdrawPassivePoolAndBridgeParamsV2,\n  WithdrawPassivePoolAndBridgeResult,\n} from './types';\nimport {\n  encodeWithdrawPassivePoolAndBridge,\n  encodeWithdrawPassivePoolAndBridgeV2,\n} from './encode';\nimport {\n  getCurrentTimestampInSeconds,\n  scale,\n  signPoolRemoveLiquidity,\n  ContractType,\n  getAddress,\n  BRIDGE_DEADLINE_IN_SECONDS,\n  getReyaNetworkFromMoneyInOutChainId,\n  getSocketWithdrawMsgGasLimit,\n  signPoolRemoveLiquidityV2,\n} from '@reyaxyz/common';\nimport { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';\nimport { ethers } from 'ethers';\n\nexport const withdrawPassivePoolAndBridge = async (\n  params: WithdrawPassivePoolAndBridgeParams,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(\n    params.moneyInOutChainId,\n  );\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 socketMsgGasLimit = getSocketWithdrawMsgGasLimit({\n    moneyInOutChainId: params.moneyInOutChainId,\n  }).msgGasLimit;\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    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [params.owner.address, params.moneyInOutChainId, socketMsgGasLimit],\n    ),\n  );\n\n  const { calldata: data } = encodeWithdrawPassivePoolAndBridge(\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    socketMsgGasLimit,\n    params.moneyInOutChainId,\n    params.owner.address,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      destinationType: 'pool',\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    poolSigNonce: Number(result?.poolSigNonce) || null,\n  };\n};\n\nexport const withdrawPassivePoolAndBridgeV2 = async (\n  params: WithdrawPassivePoolAndBridgeParamsV2,\n): Promise<WithdrawPassivePoolAndBridgeResult> => {\n  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(\n    params.moneyInOutChainId,\n  );\n\n  let sharesAmount;\n  if (params.withdrawMax) {\n    sharesAmount = scale(30)(params.sharesAmount);\n  } else {\n    sharesAmount = scale(30)(\n      (params.amount * params.priceTokenToRusd) / params.sharePrice,\n    );\n  }\n\n  const socketMsgGasLimit = getSocketWithdrawMsgGasLimit({\n    moneyInOutChainId: params.moneyInOutChainId,\n  }).msgGasLimit;\n\n  const eip712Signature = await signPoolRemoveLiquidityV2(\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    ethers.AbiCoder.defaultAbiCoder().encode(\n      ['address', 'uint256', 'uint256'],\n      [params.owner.address, params.moneyInOutChainId, socketMsgGasLimit],\n    ),\n    params.tokenAddress,\n  );\n\n  const { calldata: data } = encodeWithdrawPassivePoolAndBridgeV2(\n    params.owner.address,\n    params.pool.id,\n    sharesAmount,\n    BigInt(0),\n    eip712Signature,\n    socketMsgGasLimit,\n    params.moneyInOutChainId,\n    params.owner.address,\n    params.tokenAddress,\n  );\n\n  const result = await signAndBroadcastTransaction(\n    data,\n    reyaChainId,\n    ContractType.PERIPHERY_PROXY,\n    {\n      destinationType: 'pool',\n    },\n  );\n\n  return {\n    transactionHash: result?.txHash || null,\n    poolSigNonce: Number(result?.poolSigNonce) || null,\n  };\n};\n"]}

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

@@ -1,4 +1,5 @@
-import { BridgeAndDepositPassivePoolParams, BridgeAndDepositPassivePoolResult, BridgeAndDepositPassivePoolUnderAlphaTermsParams, BridgeAndDepositPassivePoolUnderAlphaTermsResult } from './types';
+import { BridgeAndDepositPassivePoolParams, BridgeAndDepositPassivePoolParamsV2, BridgeAndDepositPassivePoolResult, BridgeAndDepositPassivePoolUnderAlphaTermsParams, BridgeAndDepositPassivePoolUnderAlphaTermsResult } from './types';
 export declare const bridgeAndDepositPassivePool: (params: BridgeAndDepositPassivePoolParams) => Promise<BridgeAndDepositPassivePoolResult>;
+export declare const bridgeAndDepositPassivePoolV2: (params: BridgeAndDepositPassivePoolParamsV2) => Promise<BridgeAndDepositPassivePoolResult>;
 export declare const bridgeAndDepositPassivePoolUnderAlphaTerms: (params: BridgeAndDepositPassivePoolUnderAlphaTermsParams) => Promise<BridgeAndDepositPassivePoolUnderAlphaTermsResult>;
 //# sourceMappingURL=bridgeAndDepositPassivePool.d.ts.map

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":"AAaA,OAAO,EACL,iCAAiC,EACjC,iCAAiC,EACjC,gDAAgD,EAChD,gDAAgD,EACjD,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAwD3C,CAAC;AAEF,eAAO,MAAM,0CAA0C,WAC7C,gDAAgD,KACvD,QAAQ,gDAAgD,CAQ1D,CAAC"}
+{"version":3,"file":"bridgeAndDepositPassivePool.d.ts","sourceRoot":"/","sources":["services/lp/bridgeAndDepositPassivePool.ts"],"names":[],"mappings":"AAkBA,OAAO,EACL,iCAAiC,EACjC,mCAAmC,EACnC,iCAAiC,EACjC,gDAAgD,EAChD,gDAAgD,EACjD,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,2BAA2B,WAC9B,iCAAiC,KACxC,QAAQ,iCAAiC,CAwD3C,CAAC;AAEF,eAAO,MAAM,6BAA6B,WAChC,mCAAmC,KAC1C,QAAQ,iCAAiC,CA2D3C,CAAC;AAEF,eAAO,MAAM,0CAA0C,WAC7C,gDAAgD,KACvD,QAAQ,gDAAgD,CAQ1D,CAAC"}

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

@@ -5,5 +5,7 @@ export declare const encodeRemoveLiquidityCall: (poolId: number, sharesAmount: b
 export declare const encodeTransferFromMAToPool: (accountId: number, amount: bigint, sig: EIP712Signature, poolId: number, minShares: bigint, receiver: string) => MethodParameters;
 export declare const encodeTransferFromPoolToMA: (owner: string, sig: EIP712Signature, sharesAmount: bigint, poolId: number, minOut: bigint, accountId: number) => MethodParameters;
 export declare const encodeWithdrawPassivePoolAndBridge: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, chainId: number, receiver: string) => MethodParameters;
+export declare const encodeWithdrawPassivePoolAndBridgeV2: (owner: string, poolId: number, sharesAmount: bigint, minOut: bigint, sig: EIP712Signature, socketMsgGasLimit: bigint, chainId: number, receiver: string, token: string) => MethodParameters;
 export declare const encodeBridgeAndDepositPassivePool: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint) => MethodParameters;
+export declare const encodeBridgeAndDepositPassivePoolV2: (receiver: string, socketMsgGasLimit: bigint, socketConnector: string, socketBridgeOptions: string, socketFees: bigint, poolId: number, owner: string, amount: bigint, minShares: bigint, token: string) => 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,EAAgB,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAW9E,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,0BAA0B,UAC9B,MAAM,OACR,eAAe,gBACN,MAAM,UACZ,MAAM,UACN,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,KAChB,gBAoBF,CAAC"}
+{"version":3,"file":"encode.d.ts","sourceRoot":"/","sources":["services/lp/encode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAgB,MAAM,iBAAiB,CAAC;AAEjE,OAAO,EAAE,eAAe,EAA8B,MAAM,iBAAiB,CAAC;AAW9E,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,0BAA0B,UAC9B,MAAM,OACR,eAAe,gBACN,MAAM,UACZ,MAAM,UACN,MAAM,aACH,MAAM,KAChB,gBAMF,CAAC;AAEF,eAAO,MAAM,kCAAkC,UACtC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,KACf,gBAiBF,CAAC;AAEF,eAAO,MAAM,oCAAoC,UACxC,MAAM,UACL,MAAM,gBACA,MAAM,UACZ,MAAM,OACT,eAAe,qBACD,MAAM,WAChB,MAAM,YACL,MAAM,SACT,MAAM,KACZ,gBAkBF,CAAC;AAEF,eAAO,MAAM,iCAAiC,aAClC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,KAChB,gBAoBF,CAAC;AAEF,eAAO,MAAM,mCAAmC,aACpC,MAAM,qBACG,MAAM,mBACR,MAAM,uBACF,MAAM,cACf,MAAM,UACV,MAAM,SACP,MAAM,UACL,MAAM,aACH,MAAM,SACV,MAAM,KACZ,gBAoBF,CAAC"}

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

@@ -51,6 +51,18 @@ export type WithdrawPassivePoolAndBridgeParams = {
     sharesAmount: number;
     withdrawMax: boolean;
 };
+export type WithdrawPassivePoolAndBridgeParamsV2 = {
+    signer: Signer | JsonRpcSigner;
+    moneyInOutChainId: MoneyInOutChainId;
+    owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;
+    pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
+    amount: number;
+    sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];
+    priceTokenToRusd: LpWithdrawBalanceEntity['balanceBreakdown'][string]['priceTokenToRusd'];
+    sharesAmount: number;
+    withdrawMax: boolean;
+    tokenAddress: TokenEntity['address'];
+};
 export type WithdrawPassivePoolAndBridgeResult = {
     transactionHash: string | null;
     poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;
@@ -62,6 +74,14 @@ export type BridgeAndDepositPassivePoolParams = {
     amount: number;
     socketDepositFees: SocketDepositFees['fees'];
 };
+export type BridgeAndDepositPassivePoolParamsV2 = {
+    signer: Signer | JsonRpcSigner;
+    ownerAddress: OwnerMetadataEntity['address'];
+    pool: Pick<LpPoolEntity, 'id'>;
+    amount: number;
+    socketDepositFees: SocketDepositFees['fees'];
+    tokenAddress: TokenEntity['address'];
+};
 export type BridgeAndDepositPassivePoolResult = {
     transactionHash: string | null;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"/","sources":["services/lp/types.ts"],"names":[],"mappings":"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"}

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

@@ -1,3 +1,4 @@
-import { WithdrawPassivePoolAndBridgeParams, WithdrawPassivePoolAndBridgeResult } from './types';
+import { WithdrawPassivePoolAndBridgeParams, WithdrawPassivePoolAndBridgeParamsV2, WithdrawPassivePoolAndBridgeResult } from './types';
 export declare const withdrawPassivePoolAndBridge: (params: WithdrawPassivePoolAndBridgeParams) => Promise<WithdrawPassivePoolAndBridgeResult>;
+export declare const withdrawPassivePoolAndBridgeV2: (params: WithdrawPassivePoolAndBridgeParamsV2) => Promise<WithdrawPassivePoolAndBridgeResult>;
 //# sourceMappingURL=withdrawPassivePoolAndBridge.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAejB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAwD5C,CAAC"}
+{"version":3,"file":"withdrawPassivePoolAndBridge.d.ts","sourceRoot":"/","sources":["services/lp/withdrawPassivePoolAndBridge.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kCAAkC,EAClC,oCAAoC,EACpC,kCAAkC,EACnC,MAAM,SAAS,CAAC;AAmBjB,eAAO,MAAM,4BAA4B,WAC/B,kCAAkC,KACzC,QAAQ,kCAAkC,CAwD5C,CAAC;AAEF,eAAO,MAAM,8BAA8B,WACjC,oCAAoC,KAC3C,QAAQ,kCAAkC,CA4D5C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reyaxyz/sdk",
-  "version": "0.115.0",
+  "version": "0.116.0",
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
@@ -29,11 +29,11 @@
     "generate:coverage-badges": "npx istanbul-badges-readme --silent"
   },
   "dependencies": {
-    "@reyaxyz/common": "0.215.0",
+    "@reyaxyz/common": "0.216.0",
     "axios": "^1.6.2",
     "bignumber.js": "^9.1.2",
     "ethers": "6.9.0"
   },
   "packageManager": "pnpm@8.3.1",
-  "gitHead": "38dbec8bddffce38ae9658470df563fdd39a2f70"
+  "gitHead": "ce6b1165f93548c3f889f7f2ed1953898be7d501"
 }

package/src/services/lp/bridgeAndDepositPassivePool.ts

@@ -7,12 +7,18 @@ import {
   getRUSDUnderlyingTokenInfo,
   executeTransaction,
   getReyaNetwork,
+  getTokenInfoByAddress,
+  getTokenInfoByName,
 } from '@reyaxyz/common';
 import { getAlphaTermsModuleClient, getSdkEnvironment } from '../../config';
 import { ContractType, getAddress } from '@reyaxyz/common';
-import { encodeBridgeAndDepositPassivePool } from './encode';
+import {
+  encodeBridgeAndDepositPassivePool,
+  encodeBridgeAndDepositPassivePoolV2,
+} from './encode';
 import {
   BridgeAndDepositPassivePoolParams,
+  BridgeAndDepositPassivePoolParamsV2,
   BridgeAndDepositPassivePoolResult,
   BridgeAndDepositPassivePoolUnderAlphaTermsParams,
   BridgeAndDepositPassivePoolUnderAlphaTermsResult,
@@ -79,6 +85,69 @@ export const bridgeAndDepositPassivePool = async (
   };
 };
 
+export const bridgeAndDepositPassivePoolV2 = async (
+  params: BridgeAndDepositPassivePoolParamsV2,
+): Promise<BridgeAndDepositPassivePoolResult> => {
+  const network = await params.signer.provider?.getNetwork();
+  const moneyInOutChainId: MoneyInOutChainId = Number(network?.chainId);
+
+  const env = getSdkEnvironment();
+  const chainId = getReyaNetwork(env === 'production' ? 'production' : 'test');
+
+  if (moneyInOutChainId === (chainId as unknown)) {
+    throw new Error('Bridging from Reya Chain to Reya Chain is not supported');
+  }
+
+  const tokenInfo = getTokenInfoByAddress(
+    params.tokenAddress,
+    moneyInOutChainId,
+  );
+
+  const amount = scale(tokenInfo.decimals)(params.amount);
+
+  const socketConnectors = getSocketConnectors({
+    moneyInOutChainId: moneyInOutChainId,
+    tokenName: tokenInfo.name,
+  });
+
+  const peripheryAddress = getAddress(
+    getReyaNetworkFromMoneyInOutChainId(moneyInOutChainId),
+    ContractType.PERIPHERY_PROXY,
+  );
+
+  const reyaTokenInfo = getTokenInfoByName(
+    tokenInfo.isRUSDUnderlying ? 'RUSD' : tokenInfo.name,
+    chainId,
+  );
+  const { calldata: data, value } = encodeBridgeAndDepositPassivePoolV2(
+    peripheryAddress,
+    BigInt('10000000'),
+    socketConnectors.deposit,
+    '0x',
+    params.socketDepositFees,
+    params.pool.id,
+    params.ownerAddress,
+    amount,
+    BigInt(0),
+    reyaTokenInfo.address,
+  );
+
+  const result = await executeTransaction(
+    params.signer,
+    data,
+    value,
+    moneyInOutChainId,
+    getSocketVault({
+      moneyInOutChainId: moneyInOutChainId,
+      tokenName: tokenInfo.name,
+    }),
+  );
+
+  return {
+    transactionHash: result?.hash || null,
+  };
+};
+
 export const bridgeAndDepositPassivePoolUnderAlphaTerms = async (
   params: BridgeAndDepositPassivePoolUnderAlphaTermsParams,
 ): Promise<BridgeAndDepositPassivePoolUnderAlphaTermsResult> => {

package/src/services/lp/encode.ts

@@ -94,6 +94,36 @@ export const encodeWithdrawPassivePoolAndBridge = (
   return { calldata: calldata, value: BigInt(0).toString(10) };
 };
 
+export const encodeWithdrawPassivePoolAndBridgeV2 = (
+  owner: string,
+  poolId: number,
+  sharesAmount: bigint,
+  minOut: bigint,
+  sig: EIP712Signature,
+  socketMsgGasLimit: bigint,
+  chainId: number,
+  receiver: string,
+  token: string,
+): MethodParameters => {
+  const functionSignature = 'WithdrawPassivePoolV2';
+  const parameters = [
+    {
+      owner,
+      token,
+      poolId,
+      sharesAmount,
+      minOut,
+      sig,
+      socketMsgGasLimit,
+      chainId,
+      receiver,
+    },
+  ];
+  const INTERFACE = new Interface(PeripheryAbi);
+  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+  return { calldata: calldata, value: BigInt(0).toString(10) };
+};
+
 export const encodeBridgeAndDepositPassivePool = (
   receiver: string,
   socketMsgGasLimit: bigint,
@@ -125,3 +155,36 @@ export const encodeBridgeAndDepositPassivePool = (
   const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
   return { calldata: calldata, value: socketFees.toString(10) };
 };
+
+export const encodeBridgeAndDepositPassivePoolV2 = (
+  receiver: string,
+  socketMsgGasLimit: bigint,
+  socketConnector: string,
+  socketBridgeOptions: string,
+  socketFees: bigint,
+  poolId: number,
+  owner: string,
+  amount: bigint,
+  minShares: bigint,
+  token: string,
+): MethodParameters => {
+  const PERIPHERY_INTERFACE = new Interface(PeripheryAbi);
+  const inputs = { poolId, owner, token, minShares };
+  const peripheryCalldata = PERIPHERY_INTERFACE.encodeFunctionData(
+    'depositPassivePoolV2((uint128,address,address,uint256))',
+    [inputs],
+  );
+
+  const functionSignature = 'bridge';
+  const parameters = [
+    receiver,
+    amount,
+    socketMsgGasLimit,
+    socketConnector,
+    peripheryCalldata,
+    socketBridgeOptions,
+  ];
+  const INTERFACE = new Interface(Socket_VaultWithPayloadAbi);
+  const calldata = INTERFACE.encodeFunctionData(functionSignature, parameters);
+  return { calldata: calldata, value: socketFees.toString(10) };
+};

package/src/services/lp/types.ts

@@ -71,6 +71,19 @@ export type WithdrawPassivePoolAndBridgeParams = {
   withdrawMax: boolean;
 };
 
+export type WithdrawPassivePoolAndBridgeParamsV2 = {
+  signer: Signer | JsonRpcSigner;
+  moneyInOutChainId: MoneyInOutChainId;
+  owner: Pick<OwnerMetadataEntity, 'address' | 'poolSigNonce'>;
+  pool: Pick<LpPoolEntity, 'id' | 'tokenAddress'>;
+  amount: number;
+  sharePrice: LpWithdrawBalanceEntity['poolSharePrice'];
+  priceTokenToRusd: LpWithdrawBalanceEntity['balanceBreakdown'][string]['priceTokenToRusd'];
+  sharesAmount: number;
+  withdrawMax: boolean;
+  tokenAddress: TokenEntity['address']; // address from reya chain
+};
+
 export type WithdrawPassivePoolAndBridgeResult = {
   transactionHash: string | null;
   poolSigNonce: OwnerMetadataEntity['poolSigNonce'] | null;
@@ -84,6 +97,15 @@ export type BridgeAndDepositPassivePoolParams = {
   socketDepositFees: SocketDepositFees['fees'];
 };
 
+export type BridgeAndDepositPassivePoolParamsV2 = {
+  signer: Signer | JsonRpcSigner;
+  ownerAddress: OwnerMetadataEntity['address'];
+  pool: Pick<LpPoolEntity, 'id'>;
+  amount: number;
+  socketDepositFees: SocketDepositFees['fees'];
+  tokenAddress: TokenEntity['address'];
+};
+
 export type BridgeAndDepositPassivePoolResult = {
   transactionHash: string | null;
 };

package/src/services/lp/withdrawPassivePoolAndBridge.ts

@@ -1,8 +1,12 @@
 import {
   WithdrawPassivePoolAndBridgeParams,
+  WithdrawPassivePoolAndBridgeParamsV2,
   WithdrawPassivePoolAndBridgeResult,
 } from './types';
-import { encodeWithdrawPassivePoolAndBridge } from './encode';
+import {
+  encodeWithdrawPassivePoolAndBridge,
+  encodeWithdrawPassivePoolAndBridgeV2,
+} from './encode';
 import {
   getCurrentTimestampInSeconds,
   scale,
@@ -12,6 +16,7 @@ import {
   BRIDGE_DEADLINE_IN_SECONDS,
   getReyaNetworkFromMoneyInOutChainId,
   getSocketWithdrawMsgGasLimit,
+  signPoolRemoveLiquidityV2,
 } from '@reyaxyz/common';
 import { signAndBroadcastTransaction } from '../signAndBroadcastTransaction';
 import { ethers } from 'ethers';
@@ -75,3 +80,67 @@ export const withdrawPassivePoolAndBridge = async (
     poolSigNonce: Number(result?.poolSigNonce) || null,
   };
 };
+
+export const withdrawPassivePoolAndBridgeV2 = async (
+  params: WithdrawPassivePoolAndBridgeParamsV2,
+): Promise<WithdrawPassivePoolAndBridgeResult> => {
+  const reyaChainId = getReyaNetworkFromMoneyInOutChainId(
+    params.moneyInOutChainId,
+  );
+
+  let sharesAmount;
+  if (params.withdrawMax) {
+    sharesAmount = scale(30)(params.sharesAmount);
+  } else {
+    sharesAmount = scale(30)(
+      (params.amount * params.priceTokenToRusd) / params.sharePrice,
+    );
+  }
+
+  const socketMsgGasLimit = getSocketWithdrawMsgGasLimit({
+    moneyInOutChainId: params.moneyInOutChainId,
+  }).msgGasLimit;
+
+  const eip712Signature = await signPoolRemoveLiquidityV2(
+    params.signer,
+    reyaChainId,
+    getAddress(reyaChainId, ContractType.PERIPHERY_PROXY),
+    params.owner.address,
+    params.pool.id,
+    sharesAmount,
+    BigInt(0),
+    params.owner.poolSigNonce + 1,
+    getCurrentTimestampInSeconds() + BRIDGE_DEADLINE_IN_SECONDS,
+    ethers.AbiCoder.defaultAbiCoder().encode(
+      ['address', 'uint256', 'uint256'],
+      [params.owner.address, params.moneyInOutChainId, socketMsgGasLimit],
+    ),
+    params.tokenAddress,
+  );
+
+  const { calldata: data } = encodeWithdrawPassivePoolAndBridgeV2(
+    params.owner.address,
+    params.pool.id,
+    sharesAmount,
+    BigInt(0),
+    eip712Signature,
+    socketMsgGasLimit,
+    params.moneyInOutChainId,
+    params.owner.address,
+    params.tokenAddress,
+  );
+
+  const result = await signAndBroadcastTransaction(
+    data,
+    reyaChainId,
+    ContractType.PERIPHERY_PROXY,
+    {
+      destinationType: 'pool',
+    },
+  );
+
+  return {
+    transactionHash: result?.txHash || null,
+    poolSigNonce: Number(result?.poolSigNonce) || null,
+  };
+};