@raac/rpc 1.1.0-beta.8 → 1.1.0-beta.80

package/dist/pools/lendingPool/getUserCollateralValue.js

@@ -12,7 +12,7 @@ const _helpers_1 = require("./_helpers");
  */
 async function getUserCollateralValue(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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/initializeLiquidation.js

@@ -9,9 +9,9 @@ const _helpers_1 = require("./_helpers");
  * @param provider
  * @returns The  debt of the user
  */
-async function initializeLiquidation(chainId, adapterName, userAddress, data) {
+async function initializeLiquidation(chainId, adapterName, userAddress, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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}`);

package/dist/pools/lendingPool/openVaultPosition.js

@@ -12,13 +12,11 @@ async function openVaultPosition(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         // Get parameters to check vault opening fee
         const parameters = await lendingPoolContract.parameters();
+        console.log(parameters);
         const vaultOpeningFee = parameters.vaultOpeningFee;
-        if (vaultOpeningFee === 0n) {
-            throw new Error("Vault opening fee is not set");
-        }
         // 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);

package/dist/pools/lendingPool/repayToLendingPool.js

@@ -2,9 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
-async function repayToLendingPool(chainId, adapterName, amount, data) {
+async function repayToLendingPool(chainId, adapterName, amount, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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}`);

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;

package/dist/pools/lendingPool/withdrawAssetFromLendingPool.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withdrawAssetFromLendingPool = withdrawAssetFromLendingPool;
+exports.default = withdrawAssetFromLendingPool;
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
-exports.default = withdrawAssetFromLendingPool;
-async function withdrawAssetFromLendingPool(chainId, adapterName, data) {
+async function withdrawAssetFromLendingPool(chainId, adapterName, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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}`);

package/dist/pools/lendingPool/withdrawFromLendingPool.js

@@ -6,7 +6,7 @@ const artifacts_1 = require("../../utils/artifacts");
 const _helpers_1 = require("./_helpers");
 async function withdrawFromLendingPool(chainId, amount, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const rtokenAddress = (0, getContractAddress_1.getContractAddress)(chainId, "rtoken");
         const assetABI = (0, artifacts_1.getABI)("rtoken");
         const rTokenContract = new ethers_1.ethers.Contract(rtokenAddress, assetABI, signer);
@@ -16,9 +16,12 @@ async function withdrawFromLendingPool(chainId, amount, signer) {
         if (userBalance < parseFloat(amount)) {
             throw new Error(`Insufficient rToken balance. Available: ${ethers_1.ethers.formatEther(userBalance)}, Requested: ${ethers_1.ethers.formatEther(amount)}`);
         }
-        const approveTx = await rTokenContract.approve(await lendingPoolContract.getAddress(), amountInWei);
-        await approveTx.wait();
-        console.log(`Approved LendingPool to spend ${amount} rToken`);
+        // const approveTx = await rTokenContract.approve(
+        // 	await lendingPoolContract.getAddress(),
+        // 	amountInWei
+        // );
+        // await approveTx.wait();
+        // console.log(`Approved LendingPool to spend ${amount} rToken`);
         // const withdraw = await lendingPoolContract.withdraw(amountInWei.toString(), {
         // maxFeePerGas,
         // nonce: await signer.getNonce()

package/dist/pools/rwaVault/_helpers.js

@@ -33,9 +33,8 @@ function getRWAVaultAdapterByAddress(chainId, address) {
         throw new Error("Adapter not found in config.");
     return adaptersConfig.rwavault[matchKey];
 }
-async function getRWAVaultContract(chainId) {
+async function getRWAVaultContract(chainId, provider_signer) {
     const rwaVaultAddress = (0, getContractAddress_1.default)(chainId, "rwavault");
     const rwaVaultABI = (0, artifacts_1.getABI)("rwavault");
-    const provider = new ethers_1.ethers.JsonRpcProvider();
-    return new ethers_1.ethers.Contract(rwaVaultAddress, rwaVaultABI, provider);
+    return new ethers_1.ethers.Contract(rwaVaultAddress, rwaVaultABI, provider_signer);
 }

package/dist/pools/rwaVault/depositToRWAVault.js

@@ -1,15 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
-async function depositToRWAVault(chainId, adapter, data, receiver, signer) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+async function depositToRWAVault(chainId, adapter, data, receiver, minSharesOut, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
-        const tx = await rwaVaultContract.depositAsset(adapter, data, receiver, {
-            nonce: await signer.getNonce(),
-        });
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
+        const adapterAddress = await (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter);
+        const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver, ethers_1.ethers.parseEther(minSharesOut));
         console.log(`Deposit transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Deposited to RWA Vault successfully:`, receipt?.hash);

package/dist/pools/rwaVault/getNextRandomNFT.js

@@ -6,7 +6,7 @@ async function getNextRandomNFT(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const [adapter, tokenId] = await rwaVaultContract.getNextRandomNFT();
         return {
             adapter,

package/dist/pools/rwaVault/getRWAVaultInfo.js

@@ -1,13 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
-async function getRWAVaultInfo(chainId, signer) {
-    if (!signer) {
-        throw new Error("Wallet not connected");
-    }
+async function getRWAVaultInfo(chainId, provider) {
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
-        const [totalAssets, pricePerShare, vaultToken, underlyingAssetToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest, llamaTemple, llamaPerkDiscount, llamaPerkMultiplier, llamaPerkClassName] = await Promise.all([
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
+        const [totalAssets, pricePerShare, vaultToken, underlyingAssetToken, stabilityPool, vrfConsumer, indexTokenMintingFee, feeCollector, vrfRequestDelay, allowVRFRequest,] = await Promise.all([
             rwaVaultContract.totalAssets(),
             rwaVaultContract.pricePerShare(),
             rwaVaultContract.vaultToken(),
@@ -18,10 +15,6 @@ async function getRWAVaultInfo(chainId, signer) {
             rwaVaultContract.feeCollector(),
             rwaVaultContract.vrfRequestDelay(),
             rwaVaultContract.allowVRFRequest(),
-            rwaVaultContract.llamaTemple(),
-            rwaVaultContract.llamaPerkDiscount(),
-            rwaVaultContract.llamaPerkMultiplier(),
-            rwaVaultContract.llamaPerkClassName()
         ]);
         return {
             totalAssets: totalAssets.toString(),
@@ -34,10 +27,6 @@ async function getRWAVaultInfo(chainId, signer) {
             feeCollector,
             vrfRequestDelay: vrfRequestDelay.toString(),
             allowVRFRequest,
-            llamaTemple,
-            llamaPerkDiscount: llamaPerkDiscount.toString(),
-            llamaPerkMultiplier: llamaPerkMultiplier.toString(),
-            llamaPerkClassName
         };
     }
     catch (error) {

package/dist/pools/rwaVault/previewDeposit.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
+async function previewDeposit(chainId, assetValue, provider) {
+    try {
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
+        const shares = await rwaVaultContract.previewDeposit(ethers_1.ethers.parseEther(assetValue));
+        return shares;
+    }
+    catch (error) {
+        console.error(`Error depositing to RWA Vault:`, error);
+        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+    }
+}
+exports.default = previewDeposit;

package/dist/pools/rwaVault/previewWithdraw.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
+async function previewWithdraw(chainId, assetValue, provider) {
+    try {
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
+        const shares = await rwaVaultContract.previewDeposit(ethers_1.ethers.parseEther(assetValue));
+        return shares;
+    }
+    catch (error) {
+        console.error(`Error depositing to RWA Vault:`, error);
+        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+    }
+}
+exports.default = previewWithdraw;

package/dist/pools/rwaVault/redeemNFTFromRWAVault.js

@@ -1,15 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
-async function redeemNFTFromRWAVault(chainId, signer) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+async function redeemNFTFromRWAVault(chainId, adapter, tokenId, maxSharesBurn, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
-        const tx = await rwaVaultContract.redeemNFT({
-            nonce: await signer.getNonce(),
-        });
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
+        const address = (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter).address;
+        if (!address) {
+            throw new Error(`Adapter ${adapter} not found`);
+        }
+        const tx = await rwaVaultContract.redeemNFT(address, tokenId, ethers_1.ethers.parseEther(maxSharesBurn));
         console.log(`Redeem NFT transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Redeemed NFT from RWA Vault successfully:`, receipt?.hash);

package/dist/pools/rwaVault/requestRandomSeed.js

@@ -6,7 +6,7 @@ async function requestRandomSeed(chainId, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId);
+        const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
         const tx = await rwaVaultContract.requestRandomSeed({
             nonce: await signer.getNonce(),
         });

package/dist/pools/stabilityPool/_helpers.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getStabilityPoolContract = getStabilityPoolContract;
+const ethers_1 = require("ethers");
+const artifacts_1 = require("../../utils/artifacts");
+const getContractAddress_1 = require("../../contracts/getContractAddress");
+async function getStabilityPoolContract(chainId, providerOrSigner) {
+    const stabilityPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "stabilitypool");
+    const stabilityPoolABI = (0, artifacts_1.getABI)("stabilitypool");
+    return new ethers_1.ethers.Contract(stabilityPoolAddress, stabilityPoolABI, providerOrSigner);
+}

package/dist/pools/stabilityPool/getStabilityPoolInfo.js

@@ -15,60 +15,23 @@ async function getStabilityPoolInfo(chainId, address, provider) {
             }
             throw error;
         };
-        console.log(await stabilityPoolContract.deToken());
         // Fetch data from StabilityPool
-        const [totalDeposits, totalAllocation] = await Promise.all([
+        const [totalDeposits] = await Promise.all([
             stabilityPoolContract
                 .getTotalDeposits()
                 .catch(handleError("getTotalDeposits")),
-            stabilityPoolContract
-                .raacToken()
-                .then(async (raacTokenAddress) => {
-                const raacTokenAbi = (0, artifacts_1.getABI)("raactoken"); // Ensure you have the correct ABI
-                const raacTokenContract = new ethers_1.ethers.Contract(raacTokenAddress, raacTokenAbi, provider);
-                return raacTokenContract
-                    .balanceOf(stabilityPoolAddress)
-                    .catch(handleError("raacToken balanceOf"));
-            })
-                .catch(handleError("raacToken")),
         ]);
         let userDeposit = 0n;
-        let pendingRewards = 0n;
         if (address) {
-            [userDeposit, pendingRewards] = await Promise.all([
+            [userDeposit] = await Promise.all([
                 stabilityPoolContract
                     .getUserDeposit(address)
                     .catch(handleError("getUserDeposit")),
-                stabilityPoolContract
-                    .getPendingRewards(address)
-                    .catch(handleError("getPendingRewards")),
-            ]);
-        }
-        // Fetch RAAC Minter information if needed for APY calculation
-        const raacMinterAddress = (0, contracts_1.getContractAddress)(chainId, "raacminter");
-        let apy = 0n;
-        if (raacMinterAddress && raacMinterAddress !== ethers_1.ethers.ZeroAddress) {
-            const raacMinterABI = (0, artifacts_1.getABI)("raacminter");
-            const raacMinterContract = new ethers_1.ethers.Contract(raacMinterAddress, raacMinterABI, provider);
-            const [emissionRate, totalSupply] = await Promise.all([
-                raacMinterContract.emissionRate().catch(handleError("emissionRate")),
-                raacMinterContract
-                    .getTotalSupply()
-                    .catch(handleError("getTotalSupply")),
             ]);
-            // APY Calculation
-            // Assuming emissionRate is per block and BLOCKS_PER_YEAR is known
-            const BLOCKS_PER_YEAR = 2102400n; // Approximate number of blocks per year (Ethereum ~15 sec/block)
-            const emissionRatePerYear = emissionRate * BLOCKS_PER_YEAR;
-            apy =
-                totalSupply > 0n ? (emissionRatePerYear * 10000n) / totalSupply : 0n;
         }
         const result = {
             totalDeposits: ethers_1.ethers.formatEther(totalDeposits ?? 0n),
-            totalAllocation: (totalAllocation ?? 0n).toString(),
             userDeposit: ethers_1.ethers.formatEther(userDeposit ?? 0n),
-            pendingRewards: ethers_1.ethers.formatEther(pendingRewards ?? 0n),
-            apy: parseFloat((apy ?? 0n).toString()) / 100, // APY in percentage
         };
         return result;
     }

package/dist/pools/stabilityPool/getWithdrawRequestInfo.js

@@ -0,0 +1,28 @@
+"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 stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(chainId, provider);
+        const duration = await stabilityPoolContract.withdrawTimelockDuration();
+        const request = await stabilityPoolContract.withdrawTimelock(userAddress);
+        if (request[0] === 0n) {
+            return null;
+        }
+        return {
+            amount: ethers_1.ethers.formatEther(request[0]),
+            indexAtRequest: Number(request[1]),
+            balanceAtRequest: ethers_1.ethers.formatEther(request[2]),
+            userIndexAtRequest: Number(request[3]),
+            readyAt: Number(request[4]),
+            expiresAt: Number(request[5]),
+            duration: Number(duration)
+        };
+    }
+    catch (error) {
+        console.error("Error in getWithdrawRequestInfo:", error);
+        throw error;
+    }
+}

package/dist/pools/{lendingPool → stabilityPool}/requestWithdraw.js

@@ -8,14 +8,9 @@ async function requestWithdraw(chainId, amount, signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(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 tx = await stabilityPoolContract.requestWithdraw(amountInWei);
         const receipt = await tx.wait();
         console.log(`Withdrawal request for ${amount} submitted successfully`);
         console.log(`Transaction hash: ${receipt?.hash}`);