@raac/rpc 1.1.0-beta.2 → 1.1.0-beta.21

package/dist/configs/chains/8453.json

@@ -17,7 +17,7 @@
         "raachouseprices": {
             "id": "raachouseprices",
             "name": "RAAC House Prices",
-            "contract": "0xa513E6E4b8f2a923D98304ec87F64353C4D5C853"
+            "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
         },
         "auctionfactory": {
             "id": "auctionfactory",
@@ -37,12 +37,12 @@
         "feecollector": {
             "id": "feecollector",
             "name": "Fee Collector",
-            "contract": "0x4ed7c70F96B99c776995fB64377f0d4aB3B0e1C1"
+            "contract": "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
         },
         "treasury": {
             "id": "treasury",
             "name": "Treasury",
-            "contract": "0xc6e7DF5E7b4f2A278906862b61205850344D4e7d"
+            "contract": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
         },
         "repairfund": {
             "id": "repairfund",
@@ -53,6 +53,11 @@
             "id": "releaseorchestrator",
             "name": "Release Orchestrator",
             "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
+        },
+        "rwavault": {
+            "id": "rwavault",
+            "name": "RWA Vault",
+            "contract": "0xE6E340D132b5f46d1e472DebcD681B2aBc16e57E"
         }
     },
     "pools": {
@@ -64,14 +69,14 @@
         "lendingpool": {
             "id": "lendingpool",
             "name": "Lending Pool",
-            "contract": "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e"
+            "contract": "0x59b670e9fA9D0A427751Af201D676719a970857b"
         }
     },
     "nfts": {
         "raacnft": {
             "id": "raacnft",
             "name": "RAAC NFT",
-            "contract": "0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6"
+            "contract": "0xf5059a5D33d5853360D16C683c16e67980206f36"
         }
     },
     "assets": {
@@ -85,43 +90,73 @@
             "id": "crvusd",
             "name": "CRVUSD",
             "decimals": 18,
-            "contract": "0x5FbDB2315678afecb367f032d93F642f64180aa3"
+            "contract": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0"
         },
         "rtoken": {
             "id": "rtoken",
             "name": "RToken",
             "decimals": 18,
-            "contract": "0x8A791620dd6260079BF849Dc5567aDC3F2FdC318"
+            "contract": "0x9A9f2CCfdE556A7E9Ff0848998Aa4a0CFD8863AE"
         },
         "detoken": {
             "id": "detoken",
             "name": "DEToken",
             "decimals": 18,
-            "contract": "0x68B1D87F95878fE05B998F19b66F4baba5De1aed"
+            "contract": "0x4A679253410272dd5232B3Ff7cF5dbB88f295319"
         },
         "raactoken": {
             "id": "raactoken",
             "name": "RAAC",
             "decimals": 18,
-            "contract": "0x9fE46736679d2D9a65F0992F2272dE9f3c7fa6e0"
+            "contract": "0xDc64a140Aa3E981100a9becA4E685f962f0cF6C9"
         },
         "veraac": {
             "id": "veraac",
             "name": "VERAAC",
             "decimals": 18,
-            "contract": "0x5FC8d32690cc91D4c39d9d3abcBD16989F875707"
+            "contract": "0xB7f8BC63BbcaD18155201308C8f3540b07f84F5e"
         },
         "debttoken": {
             "id": "debttoken",
             "name": "Debt Token",
             "decimals": 18,
-            "contract": "0x610178dA211FEF7D417bC0e6FeD39F05609AD788"
+            "contract": "0x68B1D87F95878fE05B998F19b66F4baba5De1aed"
         },
-        "indextoken": {
-            "id": "indextoken",
+        "rwaindextoken": {
+            "id": "rwaindextoken",
             "name": "Index Token",
             "decimals": 18,
-            "contract": "0xa85233C63b9Ee964Add6F2cffe00Fd84eb32338f"
+            "contract": "0x67d269191c92Caf3cD7723F116c85e6E9bf55933"
+        }
+    },
+    "adapters": {
+        "lendingpool": {
+            "raacnftadapter": {
+                "id": "raacnftadapter",
+                "name": "RAAC NFT Adapter",
+                "contract": "0x998abeb3E57409262aE5b751f60747921B33613E",
+                "type": "ERC721"
+            },
+            "rwaindextokenadapter": {
+                "id": "rwaindextokenadapter",
+                "name": "RWA Index Token",
+                "contract": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
+                "type": "ERC20"
+            }
+        },
+        "rwavault": {
+            "raacnftadapter": {
+                "id": "raacnftadapter",
+                "name": "RAAC NFT Adapter",
+                "contract": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf",
+                "type": "ERC721"
+            },
+            "crvusdadapter": {
+                "id": "crvusdadapter",
+                "name": "CRVUSD Adapter",
+                "contract": "0xc3e53F4d16Ae77Db1c982e75a937B9f60FE63690",
+                "type": "ERC20"
+            }
         }
     }
 }

package/dist/configs/createConfig.js

@@ -83,9 +83,9 @@ function createConfig(chainId) {
                 decimals: 18,
                 contract: "",
             },
-            indextoken: {
-                id: "indextoken",
-                name: "Index Token",
+            rwaindextoken: {
+                id: "rwaindextoken",
+                name: "RWA Index Token",
                 decimals: 18,
                 contract: "",
             },

package/dist/methods/approveToken.js

@@ -1,11 +1,7 @@
 "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 getContractAddress_1 = require("../contracts/getContractAddress");
-const estimateGasPrice_1 = __importDefault(require("./commons/estimateGasPrice"));
 const approveToken = async (chainId, tokenSymbol, spender, amount, signer) => {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -17,11 +13,7 @@ const approveToken = async (chainId, tokenSymbol, spender, amount, signer) => {
     const tokenContract = new ethers_1.ethers.Contract(tokenAddress, tokenABI, signer);
     try {
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
-        const tx = await tokenContract.approve(spender, amountInWei, {
-            maxFeePerGas,
-            // maxPriorityFeePerGas
-        });
+        const tx = await tokenContract.approve(spender, amountInWei);
         console.log(`Approval transaction sent:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Approved ${amount} ${tokenSymbol} for ${spender} successfully:`, receipt.transactionHash);

package/dist/minter/tick.js

@@ -1,12 +1,8 @@
 "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 contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
-const estimateGasPrice_1 = __importDefault(require("../methods/commons/estimateGasPrice"));
 async function tick(chainId, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -15,10 +11,10 @@ async function tick(chainId, signer) {
         const raacMinterAddress = (0, contracts_1.getContractAddress)(chainId, "raacminter");
         const raacMinterABI = (0, artifacts_1.getABI)("raacminter");
         const raacMinterContract = new ethers_1.ethers.Contract(raacMinterAddress, raacMinterABI, signer);
-        const { maxFeePerGas } = await (0, estimateGasPrice_1.default)(signer);
-        console.log({ maxFeePerGas });
+        // const { maxFeePerGas } = await estimateGasPrice(signer);
+        // console.log({ maxFeePerGas });
         const tick = await raacMinterContract.tick({
-            maxFeePerGas,
+            // maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         if (tick.wait) {

package/dist/nfts/approveNFT.js

@@ -0,0 +1,25 @@
+"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");
+async function approveNFT(chainId, nftContractName, approvedAddress, tokenId, signer) {
+    if (!signer) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const nftAddress = (0, contracts_1.getContractAddress)(chainId, nftContractName);
+        const nftABI = (0, artifacts_1.getABI)(nftContractName);
+        const nftContract = new ethers_1.ethers.Contract(nftAddress, nftABI, signer);
+        console.log(`Approving NFT ${nftContractName} token ID ${tokenId} for ${approvedAddress}`);
+        const tx = await nftContract.approve(approvedAddress, tokenId);
+        const receipt = await tx.wait();
+        console.log(`Approved NFT ${nftContractName} token ID ${tokenId} for ${approvedAddress} successfully:`, receipt?.hash);
+        return receipt;
+    }
+    catch (error) {
+        console.error(`Error approving NFT ${nftContractName}:`, error);
+        throw new Error(`Failed to approve NFT ${nftContractName}: ${error.message}`);
+    }
+}
+exports.default = approveNFT;

package/dist/nfts/getApprovalForAll.js

@@ -0,0 +1,32 @@
+"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");
+/**
+ * Check if an address is approved for all tokens of an NFT contract (operator approval)
+ * @param chainId - The chain ID
+ * @param nftContractName - The NFT contract name from configs
+ * @param owner - The owner address
+ * @param operator - The operator address to check
+ * @param provider - The provider to use for the contract call
+ * @returns Boolean indicating if the operator is approved for all
+ */
+async function getApprovedForAll(chainId, nftContractName, owner, operator, provider) {
+    if (!provider) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const nftAddress = (0, contracts_1.getContractAddress)(chainId, nftContractName);
+        const nftABI = (0, artifacts_1.getABI)(nftContractName);
+        const nftContract = new ethers_1.ethers.Contract(nftAddress, nftABI, provider);
+        const isApproved = await nftContract.isApprovedForAll(owner, operator);
+        console.log(`NFT ${nftContractName}: ${operator} is ${isApproved ? 'approved' : 'not approved'} for all tokens of ${owner}`);
+        return isApproved;
+    }
+    catch (error) {
+        console.error(`Error checking NFT approval for all for ${nftContractName}:`, error);
+        throw new Error(`Failed to check NFT approval for all for ${nftContractName}: ${error.message}`);
+    }
+}
+exports.default = getApprovedForAll;

package/dist/nfts/getNFTApproval.js

@@ -0,0 +1,33 @@
+"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");
+/**
+ * Check if an NFT token is approved for a specific address
+ * @param chainId - The chain ID
+ * @param nftContractName - The NFT contract name from configs
+ * @param tokenId - The token ID to check
+ * @param checkAddress - The address to check if it's approved
+ * @param provider - The provider to use for the contract call
+ * @returns Boolean indicating if the address is approved for the token
+ */
+async function getNFTApproval(chainId, nftContractName, tokenId, checkAddress, provider) {
+    if (!provider) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const nftAddress = (0, contracts_1.getContractAddress)(chainId, nftContractName);
+        const nftABI = (0, artifacts_1.getABI)(nftContractName);
+        const nftContract = new ethers_1.ethers.Contract(nftAddress, nftABI, provider);
+        const approvedAddress = await nftContract.getApproved(tokenId);
+        const isApproved = approvedAddress.toLowerCase() === checkAddress.toLowerCase();
+        console.log(`NFT ${nftContractName} token ID ${tokenId} is ${isApproved ? 'approved' : 'not approved'} for ${checkAddress}`);
+        return isApproved;
+    }
+    catch (error) {
+        console.error(`Error checking NFT approval for ${nftContractName}:`, error);
+        throw new Error(`Failed to check NFT approval for ${nftContractName}: ${error.message}`);
+    }
+}
+exports.default = getNFTApproval;

package/dist/nfts/setApprovalForAll.js

@@ -0,0 +1,34 @@
+"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");
+/**
+ * Set approval for all tokens of an NFT contract (operator approval)
+ * @param chainId - The chain ID
+ * @param nftContractName - The NFT contract name from configs
+ * @param operator - The operator address to approve/disapprove
+ * @param approved - Boolean indicating whether to approve or disapprove
+ * @param signer - The signer to use for the transaction
+ * @returns Transaction receipt
+ */
+async function setApprovalForAll(chainId, nftContractName, operator, approved, signer) {
+    if (!signer) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const nftAddress = (0, contracts_1.getContractAddress)(chainId, nftContractName);
+        const nftABI = (0, artifacts_1.getABI)(nftContractName);
+        const nftContract = new ethers_1.ethers.Contract(nftAddress, nftABI, signer);
+        console.log(`${approved ? 'Approving' : 'Revoking approval for'} all NFTs ${nftContractName} for operator ${operator}`);
+        const tx = await nftContract.setApprovalForAll(operator, approved);
+        const receipt = await tx.wait();
+        console.log(`${approved ? 'Approved' : 'Revoked approval for'} all NFTs ${nftContractName} for operator ${operator} successfully:`, receipt?.hash);
+        return receipt;
+    }
+    catch (error) {
+        console.error(`Error setting approval for all NFTs ${nftContractName}:`, error);
+        throw new Error(`Failed to set approval for all NFTs ${nftContractName}: ${error.message}`);
+    }
+}
+exports.default = setApprovalForAll;

package/dist/pools/lendingPool/_helpers.js

@@ -0,0 +1,40 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.encodeERC721 = encodeERC721;
+exports.decodeERC721 = decodeERC721;
+exports.encodeERC20 = encodeERC20;
+exports.decodeERC20 = decodeERC20;
+exports.getLendingPoolAdapterByAddress = getLendingPoolAdapterByAddress;
+exports.getLendingPoolContract = getLendingPoolContract;
+const ethers_1 = require("ethers");
+const chains_1 = require("../../configs/chains");
+const artifacts_1 = require("../../utils/artifacts");
+const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
+function encodeERC721(tokenId) {
+    return new ethers_1.ethers.AbiCoder().encode(["uint256"], [tokenId.toString()]);
+}
+function decodeERC721(data) {
+    return new ethers_1.ethers.AbiCoder().decode(["uint256"], data);
+}
+function encodeERC20(amount) {
+    return new ethers_1.ethers.AbiCoder().encode(["uint256"], [amount.toString()]);
+}
+function decodeERC20(data) {
+    return new ethers_1.ethers.AbiCoder().decode(["uint256"], data);
+}
+function getLendingPoolAdapterByAddress(chainId, address) {
+    const adaptersConfig = chains_1.configs[chainId].adapters;
+    const keys = Object.keys(adaptersConfig.lendingpool);
+    const matchKey = keys.find((k) => adaptersConfig[k].contract === address);
+    if (matchKey === null)
+        throw new Error("Adapter not found in config.");
+    return adaptersConfig[matchKey];
+}
+async function getLendingPoolContract(chainId, providerOrProvider) {
+    const lendingPoolAddress = (0, getContractAddress_1.default)(chainId, "lendingpool");
+    const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
+    return new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, providerOrProvider);
+}

package/dist/pools/lendingPool/adapters/erc20/getERC20AdapterBalance.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const artifacts_1 = require("../../../../utils/artifacts");
+async function getERC20AdapterBalance(adapterAddress, userAddress, signer) {
+    if (!signer) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const abi = (0, artifacts_1.getABI)("erc20assetadapter");
+        const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
+        const balance = await adapterContract.balanceOf(userAddress);
+        return balance.toString();
+    }
+    catch (error) {
+        console.error(`Error getting ERC20 Adapter balance:`, error);
+        throw new Error(`Failed to get ERC20 Adapter balance: ${error.message}`);
+    }
+}
+exports.default = getERC20AdapterBalance;

package/dist/pools/lendingPool/adapters/erc20/getERC20AdapterInfo.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const artifacts_1 = require("../../../../utils/artifacts");
+async function getERC20AdapterInfo(adapterAddress, signer) {
+    if (!signer) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const abi = (0, artifacts_1.getABI)("erc20assetadapter");
+        const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
+        const [token, priceOracle, lendingPool, assetType, supportsPartialWithdraw] = await Promise.all([
+            adapterContract.token(),
+            adapterContract.priceOracle(),
+            adapterContract.lendingPool(),
+            adapterContract.getAssetType(),
+            adapterContract.supportsPartialWithdraw()
+        ]);
+        return {
+            token,
+            priceOracle,
+            lendingPool,
+            assetType,
+            supportsPartialWithdraw
+        };
+    }
+    catch (error) {
+        console.error(`Error getting ERC20 Adapter info:`, error);
+        throw new Error(`Failed to get ERC20 Adapter info: ${error.message}`);
+    }
+}
+exports.default = getERC20AdapterInfo;

package/dist/pools/lendingPool/adapters/erc721/getERC721AdapterDeposits.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const artifacts_1 = require("../../../../utils/artifacts");
+const getAdapterAddress_1 = require("../../getAdapterAddress");
+async function getERC721AdapterDeposits(chainId, adapterName, userAddress, provider) {
+    if (!provider) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const abi = (0, artifacts_1.getABI)("erc721assetadapter");
+        const adapterContract = new ethers_1.ethers.Contract((0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName), abi, provider);
+        const depositedTokens = await adapterContract.getDepositedTokens(userAddress);
+        return depositedTokens;
+    }
+    catch (error) {
+        console.error(`Error getting ERC721 Adapter deposits:`, error);
+        throw new Error(`Failed to get ERC721 Adapter deposits: ${error.message}`);
+    }
+}
+exports.default = getERC721AdapterDeposits;

package/dist/pools/lendingPool/adapters/erc721/getERC721AdapterInfo.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const ethers_1 = require("ethers");
+const artifacts_1 = require("../../../../utils/artifacts");
+const getAdapterAddress_1 = require("../../getAdapterAddress");
+async function getERC721AdapterInfo(chainId, adapterName, provider) {
+    if (!provider) {
+        throw new Error("Wallet not connected");
+    }
+    try {
+        const abi = (0, artifacts_1.getABI)("erc721assetadapter");
+        const adapterContract = new ethers_1.ethers.Contract((0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName), abi, provider);
+        const [token, priceOracle, lendingPool, assetType, supportsPartialWithdraw] = await Promise.all([
+            adapterContract.token(),
+            adapterContract.priceOracle(),
+            adapterContract.lendingPool(),
+            adapterContract.getAssetType(),
+            adapterContract.supportsPartialWithdraw()
+        ]);
+        return {
+            token,
+            priceOracle,
+            lendingPool,
+            assetType,
+            supportsPartialWithdraw
+        };
+    }
+    catch (error) {
+        console.error(`Error getting ERC721 Adapter info:`, error);
+        throw new Error(`Failed to get ERC721 Adapter info: ${error.message}`);
+    }
+}
+exports.default = getERC721AdapterInfo;

package/dist/pools/lendingPool/borrowFromLendingPool.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 borrowFromLendingPool(chainId, tokenId, amount, signer) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
+async function borrowFromLendingPool(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);
-        console.log("Borrowing amount in wei:", amountInWei.toString());
-        const tx = await lendingPoolContract.borrow(tokenId, 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.borrow(adapterAddress, data, amount);
         const receipt = await tx.wait();
-        console.log(`Borrowed ${ethers_1.ethers.formatEther(amount)} from lending pool`);
-        console.log(`Transaction hash: ${receipt?.hash}`);
-        return receipt;
+        return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error in borrowFromLendingPool:", error);
+        console.error("Error borrowing from lending pool:", error);
         throw error;
     }
 }

package/dist/pools/lendingPool/borrowFromLendingPoolWithInsurance.js

@@ -1,39 +1,21 @@
 "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 getContractAddress_1 = require("../../contracts/getContractAddress");
-const artifacts_1 = require("../../utils/artifacts");
-const checkAllowance_1 = __importDefault(require("../../methods/commons/checkAllowance"));
-const approveAsset_1 = __importDefault(require("../../wallet/assets/approveAsset"));
-async function borrowFromLendingPoolWithInsurance(chainId, tokenId, amount, signer) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
+// TODO: interface changed
+async function borrowFromLendingPoolWithInsurance(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 feeCollectorAddress = (0, getContractAddress_1.getContractAddress)(chainId, "feecollector");
-        const userAddress = await signer.getAddress();
-        const amountInWei = ethers_1.ethers.parseEther(amount);
-        console.log("Borrowing amount in wei:", amountInWei.toString());
-        // get the total insurance they need to pay
-        const insurance = await lendingPoolContract.calculateInsuranceFee(userAddress, tokenId, amountInWei.toString());
-        // Approve the crvUSD balance to the fee collector
-        const allowance = await (0, checkAllowance_1.default)(chainId, "crvusd", userAddress, feeCollectorAddress, signer.provider);
-        // If the allowance is less than the insurance, approve the difference
-        if (allowance < insurance) {
-            await (0, approveAsset_1.default)(chainId, "crvusd", feeCollectorAddress, insurance.toString(), signer);
-            console.log(`Approved ${ethers_1.ethers.formatEther(insurance)} crvUSD to fee collector`);
+        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.borrowWithInsurance(tokenId, amountInWei.toString());
+        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amount);
         const receipt = await tx.wait();
-        console.log(`Borrowed ${ethers_1.ethers.formatEther(amount)} from lending pool by paying insurance: ${ethers_1.ethers.formatEther(insurance)}`);
-        console.log(`Transaction hash: ${receipt?.hash}`);
-        return receipt;
+        return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error in borrowFromLendingPoolWithInsurance:", error);
+        console.error("Error borrowing from lending pool with insurance:", error);
         throw error;
     }
 }

package/dist/pools/lendingPool/calculateInsuranceFee.js

@@ -1,16 +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 calculateInsuranceFee(chainId, address, tokenId, amount, provider) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
+// TODO: interface changed
+async function calculateInsuranceFee(chainId, adapterName, userAddress, data, amount, 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 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 amountInWei = ethers_1.ethers.parseEther(amount);
-        const insuranceFee = await lendingPoolContract.calculateInsuranceFee(address, tokenId, amountInWei.toString());
-        return ethers_1.ethers.formatEther(insuranceFee);
+        const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amountInWei.toString());
+        console.log(`Insurance fee: ${ethers_1.ethers.formatEther(fee)}`);
+        return fee;
     }
     catch (error) {
         console.error("Error in calculateInsuranceFee:", error);

package/dist/pools/lendingPool/closeLiquidation.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 Close the liqudation after the debt has been paid
  * @param chainId
- * @param address
- * @param provider
+ * @param lendingPoolAddress
+ * @param adapterName
+ * @param data
  * @returns
  */
-async function closeLiquidation(chainId, tokenId, signer) {
+async function closeLiquidation(chainId, adapterName, 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.closeLiquidation(tokenId);
-        await tx.wait();
-        console.log(`closeLiquidation 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.closeLiquidation(adapterAddress, data);
+        const receipt = await tx.wait();
+        return receipt.status === 1;
     }
     catch (error) {
-        console.error("Error in closeLiquidation:", error);
+        console.error("Error closing liquidation:", error);
         throw error;
     }
 }