@raac/rpc 1.1.0-beta.22 → 1.1.0-beta.24

package/dist/pools/lendingPool/borrowFromLendingPool.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const ethers_1 = require("ethers");
 async function borrowFromLendingPool(chainId, adapterName, amount, data, signer) {
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
@@ -9,7 +10,8 @@ async function borrowFromLendingPool(chainId, adapterName, amount, data, signer)
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
-        const tx = await lendingPoolContract.borrow(adapterAddress, data, amount);
+        const amountInWei = ethers_1.ethers.parseEther(amount);
+        const tx = await lendingPoolContract.borrow(adapterAddress, data, amountInWei);
         const receipt = await tx.wait();
         return receipt.status === 1;
     }

package/dist/pools/lendingPool/borrowFromLendingPoolWithInsurance.js

@@ -9,6 +9,7 @@ const _helpers_1 = require("./_helpers");
 const checkAllowance_1 = __importDefault(require("../../methods/commons/checkAllowance"));
 const approveAsset_1 = __importDefault(require("../../wallet/assets/approveAsset"));
 const calculateInsuranceFee_1 = __importDefault(require("./calculateInsuranceFee"));
+const contracts_1 = require("../../utils/contracts");
 // TODO: interface changed
 async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount, data, signer) {
     try {
@@ -19,22 +20,27 @@ async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount,
         }
         const userAddress = await signer.getAddress();
         const lendingPoolAddress = await lendingPoolContract.getAddress();
+        const feeCollectorAddress = (0, contracts_1.getContractAddress)(chainId, "feecollector");
         // Calculate the insurance fee they need to pay
-        const insuranceFee = await (0, calculateInsuranceFee_1.default)(chainId, adapterName, userAddress, data, ethers_1.ethers.formatEther(amount.toString()), signer.provider);
+        const insuranceFee = await (0, calculateInsuranceFee_1.default)(chainId, adapterName, userAddress, data, amount, signer.provider);
         console.log(`Insurance fee required: ${ethers_1.ethers.formatEther(insuranceFee)} crvUSD`);
         // Check if the user has approved enough crvUSD for the insurance fee
-        const currentAllowance = await (0, checkAllowance_1.default)(chainId, "crvusd", userAddress, lendingPoolAddress, signer.provider);
+        // TODO: With the new changes, need to check approval towards the lending pool address
+        const currentAllowance = await (0, checkAllowance_1.default)(chainId, "crvusd", userAddress, feeCollectorAddress, signer.provider);
         // If allowance is less than the insurance fee, approve it
         if (currentAllowance < insuranceFee) {
-            const amountToApprove = insuranceFee.toString();
-            await (0, approveAsset_1.default)(chainId, "crvusd", lendingPoolAddress, ethers_1.ethers.formatEther(amountToApprove), signer);
+            const amountToApprove = insuranceFee;
+            await (0, approveAsset_1.default)(chainId, "crvusd", 
+            // TODO: With the new changes, need to approve towards the lending pool address
+            feeCollectorAddress, ethers_1.ethers.formatEther(amountToApprove), signer);
             console.log(`Approved ${ethers_1.ethers.formatEther(insuranceFee)} crvUSD for insurance fee`);
         }
         else {
             console.log(`Already approved sufficient crvUSD for insurance fee: ${ethers_1.ethers.formatEther(currentAllowance)}`);
         }
         // Now proceed with the borrow transaction
-        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amount);
+        const amountInWei = ethers_1.ethers.parseEther(amount);
+        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amountInWei);
         const receipt = await tx.wait();
         console.log(`Borrowed with insurance successfully. Transaction hash: ${receipt?.hash}`);
         return receipt.status === 1;

package/dist/pools/lendingPool/calculateInsuranceFee.js

@@ -12,7 +12,7 @@ async function calculateInsuranceFee(chainId, adapterName, userAddress, data, am
         }
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amountInWei.toString());
+        const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amountInWei);
         console.log(`Insurance fee: ${ethers_1.ethers.formatEther(fee)}`);
         return fee;
     }

package/dist/types/pools/lendingPool/borrowFromLendingPool.d.ts

@@ -1,5 +1,5 @@
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-import { BigNumberish, BytesLike, Signer } from "ethers";
-declare function borrowFromLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: BigNumberish, data: BytesLike, signer: Signer): Promise<boolean>;
+import { BytesLike, Signer } from "ethers";
+declare function borrowFromLendingPool(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: string, data: BytesLike, signer: Signer): Promise<boolean>;
 export default borrowFromLendingPool;

package/dist/types/pools/lendingPool/borrowFromLendingPoolWithInsurance.d.ts

@@ -1,5 +1,5 @@
-import { BigNumberish, BytesLike, Signer } from "ethers";
+import { BytesLike, Signer } from "ethers";
 import { ChainId } from "../../configs/chains";
 import { LendingPoolAdapterId } from "./types";
-declare function borrowFromLendingPoolWithInsurance(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: BigNumberish, data: BytesLike, signer: Signer): Promise<boolean>;
+declare function borrowFromLendingPoolWithInsurance(chainId: ChainId, adapterName: LendingPoolAdapterId, amount: string, data: BytesLike, signer: Signer): Promise<boolean>;
 export default borrowFromLendingPoolWithInsurance;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "1.1.0-beta.22",
+	"version": "1.1.0-beta.24",
 	"description": "RPC Library for RAAC ",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",