@raac/rpc 1.1.0-beta.6 → 1.1.0-beta.60

package/dist/pools/lendingPool/getAdapters.js

@@ -1,14 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
 const index_1 = require("../../configs/chains/index");
+const _helpers_1 = require("./_helpers");
 async function getAdapters(chainId, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapters = await lendingPoolContract.getAdapters();
         const adapterConfig = index_1.configs[chainId].adapters;
         return {

package/dist/pools/lendingPool/getEligibleUserDeposits.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
 /**
  * @description Total amount of RToken + DEToken = total crvUSD they put in the system so far. How much they have contributed to the system.
  * @param chainId
@@ -12,9 +11,7 @@ const artifacts_1 = require("../../utils/artifacts");
  */
 async function getEligibleUserDeposits(chainId, address, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getEligibleUserDeposits(address);
         console.log(`Eligible user deposits: ${ethers_1.ethers.formatEther(value)}`);
         return value;

package/dist/pools/lendingPool/getHealthFactor.js

@@ -1,27 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+exports.default = getHealthFactor;
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 /**
  * @description Get the health factor of a NFT position -> factor < 1 : undercollateralized.
  * @param chainId
- * @param address
+ * @param adapterName
+ * @param userAddress
+ * @param data
  * @param provider
  * @returns The health factor of a position (0, inf)
  */
-async function getHealthFactor(chainId, adapter, userAddress, data, provider) {
+async function getHealthFactor(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
-        const value = await lendingPoolContract.calculateHealthFactor(adapter, userAddress, data);
-        console.log(`getHealthFactor result: ${value}`);
-        return value;
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
+        }
+        const healthFactor = await lendingPoolContract.calculateHealthFactor(adapterAddress, userAddress, data);
+        return healthFactor;
     }
     catch (error) {
-        console.error("Error in getHealthFactor:", error);
+        console.error("Error getting health factor:", error);
         throw error;
     }
 }
-exports.default = getHealthFactor;

package/dist/pools/lendingPool/getLendingPoolInfo.js

@@ -1,16 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const contracts_1 = require("../../utils/contracts");
+const _helpers_1 = require("./_helpers");
 const artifacts_1 = require("../../utils/artifacts");
 async function getLendingPoolInfo(chainId, userAddress, provider) {
     try {
-        const lendingPoolAddress = (0, contracts_1.getContractAddress)(chainId, "lendingpool");
-        const abi = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, abi, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const handleError = (operation, returnType) => (error) => {
             if (error.code === "BAD_DATA") {
-                console.log(`BAD_DATA from ${operation} - Pool empty?`, error.message);
+                console.log(`BAD_DATA from ${operation} - Pool empty?`, error.messag);
                 return returnType || null;
             }
             throw error;
@@ -18,14 +16,9 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
         const [reserve, rateData, normalizedIncome, normalizedDebt] = await Promise.all([
             lendingPoolContract.reserve().catch(handleError("reserve")),
             lendingPoolContract.rateData().catch(handleError("rateData")),
-            lendingPoolContract
-                .getNormalizedIncome()
-                .catch(handleError("getNormalizedIncome", 0n)),
-            lendingPoolContract
-                .getNormalizedDebt()
-                .catch(handleError("getNormalizedDebt", 0n)),
+            lendingPoolContract.getNormalizedIncome().catch(handleError("getNormalizedIncome", 0n)),
+            lendingPoolContract.getNormalizedDebt().catch(handleError("getNormalizedDebt", 0n)),
         ]);
-        console.log(reserve);
         // Extract data from reserve
         const totalLiquidity = reserve?.totalLiquidity ?? 0n;
         const totalUsage = reserve?.totalUsage ?? 0n;
@@ -39,6 +32,7 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
         // Extract rate data
         const currentLiquidityRate = rateData?.currentLiquidityRate ?? 0n;
         const currentUsageRate = rateData?.currentUsageRate ?? 0n;
+        // why is prime rate 0?
         const primeRate = rateData?.primeRate ?? 0n;
         const baseRate = rateData?.baseRate ?? 0n;
         const optimalRate = rateData?.optimalRate ?? 0n;
@@ -46,19 +40,24 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
         const optimalUtilizationRate = rateData?.optimalUtilizationRate ?? 0n;
         const protocolFeeRate = rateData?.protocolFeeRate ?? 0n;
         // Compute APY
-        let apy;
+        let apr;
         if (utilization <= optimalUtilizationRate && optimalUtilizationRate > 0) {
-            const rateSlope = primeRate - baseRate;
-            const rateIncrease = (utilization * rateSlope) / optimalUtilizationRate;
-            apy = baseRate + rateIncrease;
+            apr = optimalRate;
         }
         else {
             const excessUtilization = utilization - optimalUtilizationRate;
             const maxExcessUtilization = BigInt(1e27) - optimalUtilizationRate;
-            const rateSlope = maxRate - primeRate;
+            const rateSlope = maxRate - optimalRate;
             const rateIncrease = (excessUtilization * rateSlope) / maxExcessUtilization;
-            apy = primeRate + rateIncrease;
+            apr = primeRate + rateIncrease;
+            apr = apr > maxRate ? maxRate : apr;
         }
+        // compute the APY
+        let apy;
+        const grossLiquidityRate = utilization * currentUsageRate / BigInt(1e27);
+        const protocolFeeAmount = grossLiquidityRate * protocolFeeRate / BigInt(1e27);
+        apy = grossLiquidityRate - protocolFeeAmount;
+        console.log("apr", apy);
         let userRedeemable = 0n;
         if (userAddress) {
             // Fetch user's scaled RToken balance
@@ -77,18 +76,19 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
             utilization: (Number(utilization.toString()) / 1e27).toFixed(6), // Utilization as a decimal value between 0 and 1
             liquidityIndex: (Number(liquidityIndex.toString()) / 1e27).toFixed(6),
             usageIndex: (Number(usageIndex.toString()) / 1e27).toFixed(6),
-            currentLiquidityRate: (Number(currentLiquidityRate.toString()) / 1e25).toFixed(2) + "%",
-            currentUsageRate: (Number(currentUsageRate.toString()) / 1e25).toFixed(2) + "%",
-            primeRate: (Number(primeRate.toString()) / 1e25).toFixed(2) + "%",
-            baseRate: (Number(baseRate.toString()) / 1e25).toFixed(2) + "%",
-            optimalRate: (Number(optimalRate.toString()) / 1e25).toFixed(2) + "%",
-            maxRate: (Number(maxRate.toString()) / 1e25).toFixed(2) + "%",
+            currentLiquidityRate: (Number(currentLiquidityRate.toString()) / 1e25).toFixed(2),
+            currentUsageRate: (Number(currentUsageRate.toString()) / 1e25).toFixed(2),
+            primeRate: (Number(primeRate.toString()) / 1e25).toFixed(2),
+            baseRate: (Number(baseRate.toString()) / 1e25).toFixed(2),
+            optimalRate: (Number(optimalRate.toString()) / 1e25).toFixed(2),
+            maxRate: (Number(maxRate.toString()) / 1e25).toFixed(2),
             optimalUtilizationRate: (Number(optimalUtilizationRate.toString()) / 1e27).toFixed(6),
-            protocolFeeRate: (Number(protocolFeeRate.toString()) / 1e25).toFixed(2) + "%",
+            protocolFeeRate: (Number(protocolFeeRate.toString()) / 1e25).toFixed(2),
             normalizedIncome: (Number(normalizedIncome.toString()) / 1e27).toFixed(6),
             normalizedDebt: (Number(normalizedDebt.toString()) / 1e27).toFixed(6),
-            apy: (Number(apy.toString()) / 1e25).toFixed(2) + "%",
+            apy: (Number(apy.toString()) / 1e25).toFixed(2),
             userRedeemable: ethers_1.ethers.formatEther(userRedeemable ?? 0n),
+            apr: (Number(apr.toString()) / 1e25).toFixed(2),
         };
         return result;
     }

package/dist/pools/lendingPool/getLendingPoolTotalLiquidity.js

@@ -1,15 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const contracts_1 = require("../../utils/contracts");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
 // The lending pool reserve contains the total liquidity of the lending pool. see getLendingPooInfo.ts
 // @deprecated
 async function getLendingPoolTotalLiquidity(chainId, provider) {
     try {
-        const lendingPoolAddress = (0, contracts_1.getContractAddress)(chainId, "lendingpool");
-        const abi = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, abi, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reserve = (await lendingPoolContract.reserve());
         const totalLiquidity = reserve.totalLiquidity;
         return totalLiquidity;

package/dist/pools/lendingPool/getParameters.js

@@ -1,19 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
 async function getParameters(chainId, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
-        const [canPaybackDebt, withdrawalsPaused, liquidationThreshold, healthFactorLiquidationThreshold, liquidationGracePeriod, insuranceFee, depositFee, liquidityBufferRatio, supplyCap, borrowCap, withdrawTimelockDuration, vaultOpeningFee,] = await lendingPoolContract.parameters();
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const [canPaybackDebt, withdrawalsPaused, liquidationThreshold, liquidationGracePeriod, insuranceFee, depositFee, liquidityBufferRatio, supplyCap, borrowCap, withdrawTimelockDuration, vaultOpeningFee, borrowThreshold, withdrawTimelockDelay] = await lendingPoolContract.parameters();
         const parameters = {
             canPaybackDebt,
             withdrawalsPaused,
             liquidationThreshold,
-            healthFactorLiquidationThreshold,
             liquidationGracePeriod,
             insuranceFee,
             depositFee,
@@ -22,6 +17,8 @@ async function getParameters(chainId, provider) {
             borrowCap,
             withdrawTimelockDuration,
             vaultOpeningFee,
+            borrowThreshold,
+            withdrawTimelockDelay
         };
         return parameters;
     }

package/dist/pools/lendingPool/getPositionDebt.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 /**
  * @description Get the raw debt of the user on a NFT. Equivant to the original amount borrowed on NFT.
@@ -11,17 +10,18 @@ const artifacts_1 = require("../../utils/artifacts");
  * @param provider
  * @returns The raw debt of the user on a NFT
  */
-async function getPositionDebt(chainId, adapter, userAddress, data, provider) {
+async function getPositionDebt(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
-        const reward = await lendingPoolContract.getPositionDebt(adapter, userAddress, data);
-        console.log(`getPositionDebt result: ${ethers_1.ethers.formatEther(reward)}`);
-        return reward;
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
+        }
+        const debt = await lendingPoolContract.getPositionDebt(adapterAddress, userAddress, data);
+        return debt;
     }
     catch (error) {
-        console.error("Error in getPositionDebt:", error);
+        console.error("Error getting position debt:", error);
         throw error;
     }
 }

package/dist/pools/lendingPool/getPositionScaledDebt.js

@@ -1,27 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 /**
  * @description Get the scaled debt of the user on a NFT (contains the accured interest)
  * @param chainId
- * @param address
- * @param provider
+ * @param lendingPoolAddress
+ * @param adapterName
+ * @param userAddress
+ * @param data
  * @returns The  debt of the user on a NFT with the accured interest
  */
-async function getPositionScaledDebt(chainId, adapter, userAddress, data, provider) {
+async function getPositionScaledDebt(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
-        const reward = await lendingPoolContract.getPositionScaledDebt(adapter, userAddress, data);
-        console.log(`getPositionScaledDebt result: ${ethers_1.ethers.formatEther(reward)}`);
-        return reward;
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
+        }
+        const scaledDebt = await lendingPoolContract.getPositionScaledDebt(adapterAddress, userAddress, data);
+        return scaledDebt;
     }
     catch (error) {
-        console.error("Error in getPositionScaledDebt:", error);
+        console.error("Error getting position scaled debt:", error);
         throw error;
     }
 }

package/dist/pools/lendingPool/getPositionView.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPositionView = transformPositionView;
 const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 function transformPositionView(positionView) {
     return {
@@ -21,18 +21,21 @@ function transformPositionView(positionView) {
 /**
  * @description Return all the information about a NFT position
  * @param chainId
- * @param address
+ * @param adapterName
+ * @param userAddress
+ * @param data
  * @param provider
  * @returns All information about a NFT position
  */
-async function getPositionView(chainId, adapter, userAddress, data, provider) {
+async function getPositionView(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
-        const res = await lendingPoolContract.getPositionView(adapter, userAddress, data);
-        console.log(`getPositionView result: ${res}`);
-        return transformPositionView(res);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found`);
+        }
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const position = await lendingPoolContract.getPositionView(adapterAddress, userAddress, data);
+        return transformPositionView(position);
     }
     catch (error) {
         console.error("Error in getPositionView:", error);

package/dist/pools/lendingPool/getPositionsScaledDebt.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
@@ -13,9 +12,7 @@ const artifacts_1 = require("../../utils/artifacts");
  */
 async function getPositionsScaledDebt(chainId, address, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reward = await lendingPoolContract.getPositionsScaledDebt(address);
         console.log(`getPositionsScaledDebt result: ${ethers_1.ethers.formatEther(reward)}`);
         return reward;

package/dist/pools/lendingPool/getRawUserDepositsInLendingPool.js

@@ -1,14 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
 // Get the amount of RToken RAW deposit in the lending pool, without the accured interest
 async function getRawUserDepositsInLendingPool(chainId, address, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getUserDeposits(address);
         console.log(`User deposits in lending pool: ${ethers_1.ethers.formatEther(value)}`);
         return value;

package/dist/pools/lendingPool/getUserCollateralValue.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed: not efficient
 /**
  * @description Sum of the prices of all the NFTS
@@ -13,9 +12,7 @@ const artifacts_1 = require("../../utils/artifacts");
  */
 async function getUserCollateralValue(chainId, address, provider) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reward = await lendingPoolContract.getUserCollateralValue(address);
         console.log(`getUserCollateralValue result: ${ethers_1.ethers.formatEther(reward)}`);
         return reward;

package/dist/pools/lendingPool/getWithdrawRequestInfo.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getWithdrawRequestInfo = getWithdrawRequestInfo;
+const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
+async function getWithdrawRequestInfo(chainId, userAddress, provider) {
+    try {
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const request = await lendingPoolContract.withdrawTimelock(userAddress);
+        if (request[0] === 0n) {
+            return null;
+        }
+        return {
+            amount: ethers_1.ethers.formatEther(request[0]),
+            readyAt: Number(request[1]),
+            expiresAt: Number(request[2])
+        };
+    }
+    catch (error) {
+        console.error("Error in getWithdrawRequestInfo:", error);
+        throw error;
+    }
+}

package/dist/pools/lendingPool/initializeLiquidation.js

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
  * @param chainId
@@ -10,18 +9,19 @@ const artifacts_1 = require("../../utils/artifacts");
  * @param provider
  * @returns The  debt of the user
  */
-async function initializeLiquidation(chainId, adapter, userAddress, data, signer) {
+async function initializeLiquidation(chainId, adapterName, userAddress, data, signer) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
-        const tx = await lendingPoolContract.initiateLiquidation(adapter, userAddress, data);
-        await tx.wait();
-        console.log(`initializeLiquidation result: ${tx.hash}`);
-        return tx;
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
+        }
+        const tx = await lendingPoolContract.initiateLiquidation(adapterAddress, userAddress, data);
+        const receipt = await tx.wait();
+        return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error in initializeLiquidation:", error);
+        console.error("Error initializing liquidation:", error);
         throw error;
     }
 }

package/dist/pools/lendingPool/openVaultPosition.js

@@ -0,0 +1,39 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const checkAllowance_1 = __importDefault(require("../../methods/commons/checkAllowance"));
+const approveAsset_1 = __importDefault(require("../../wallet/assets/approveAsset"));
+const _helpers_1 = require("./_helpers");
+async function openVaultPosition(chainId, signer) {
+    if (!signer) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
+        // Get parameters to check vault opening fee
+        const parameters = await lendingPoolContract.parameters();
+        const vaultOpeningFee = parameters.vaultOpeningFee;
+        // Check if user has approved the fee
+        const userAddress = await signer.getAddress();
+        const allowance = await (0, checkAllowance_1.default)(chainId, "crvusd", userAddress, await lendingPoolContract.getAddress(), signer.provider);
+        // If allowance is less than the fee, approve it
+        if (allowance < vaultOpeningFee) {
+            await (0, approveAsset_1.default)(chainId, "crvusd", await lendingPoolContract.getAddress(), vaultOpeningFee.toString(), signer);
+            console.log(`Approved ${ethers_1.ethers.formatEther(vaultOpeningFee)} crvUSD for vault opening fee`);
+        }
+        // Open the vault position
+        const tx = await lendingPoolContract.openVaultPosition();
+        const receipt = await tx.wait();
+        console.log("Vault position opened successfully");
+        console.log(`Transaction hash: ${receipt?.hash}`);
+        return receipt;
+    }
+    catch (error) {
+        console.error("Error in openVaultPosition:", error);
+        throw error;
+    }
+}
+exports.default = openVaultPosition;

package/dist/pools/lendingPool/repayToLendingPool.js

@@ -1,23 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
-async function repayToLendingPool(chainId, adapter, data, amount, signer) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
+async function repayToLendingPool(chainId, adapterName, amount, data, signer) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
-        const amountInWei = ethers_1.ethers.parseEther(amount.toString());
-        console.log("Repaying amount in wei:", amountInWei.toString());
-        const tx = await lendingPoolContract.repay(adapter, data, amountInWei.toString());
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
+        }
+        const tx = await lendingPoolContract.repay(adapterAddress, data, amount);
         const receipt = await tx.wait();
-        console.log(`Repaid ${amount} crvUSD to lending pool.`);
-        console.log(`Transaction hash: ${receipt?.hash}`);
-        return receipt;
+        return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error in repayToLendingPool:", error);
+        console.error("Error repaying to lending pool:", error);
         throw error;
     }
 }

package/dist/pools/lendingPool/requestWithdraw.js

@@ -0,0 +1,28 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.requestWithdraw = requestWithdraw;
+const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
+async function requestWithdraw(chainId, amount, signer) {
+    if (!signer) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
+        const amountInWei = ethers_1.ethers.parseEther(amount);
+        // Check if withdrawals are paused
+        const parameters = await lendingPoolContract.parameters();
+        if (parameters.withdrawalsPaused) {
+            throw new Error("Withdrawals are currently paused");
+        }
+        const tx = await lendingPoolContract.requestWithdraw(amountInWei);
+        const receipt = await tx.wait();
+        console.log(`Withdrawal request for ${amount} submitted successfully`);
+        console.log(`Transaction hash: ${receipt?.hash}`);
+        return receipt;
+    }
+    catch (error) {
+        console.error("Error in requestWithdraw:", error);
+        throw error;
+    }
+}

package/dist/pools/lendingPool/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/pools/lendingPool/vaultOpened.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const _helpers_1 = require("./_helpers");
+/**
+ * @description Check if the vault position is opened for a given address in the lending pool
+ * @param chainId - The chain ID
+ * @param address - The user address to check
+ * @param provider - The provider to use for the blockchain call
+ * @returns Promise<boolean> - True if vault position is opened, false otherwise
+ */
+async function vaultOpened(chainId, address, provider) {
+    try {
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const isVaultOpened = await lendingPoolContract.vaultOpened(address);
+        return isVaultOpened;
+    }
+    catch (error) {
+        console.error("Error in vaultOpened:", error);
+        throw error;
+    }
+}
+exports.default = vaultOpened;