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

package/dist/RPCLibrary.js

@@ -105,6 +105,12 @@ const calculateInsuranceFee_1 = __importDefault(require("./pools/lendingPool/cal
 const getTotalPropertiesCount_1 = __importDefault(require("./nfts/getTotalPropertiesCount"));
 const getParameters_1 = __importDefault(require("./pools/lendingPool/getParameters"));
 const getAdapters_1 = __importDefault(require("./pools/lendingPool/getAdapters"));
+const getWithdrawRequestInfo_1 = require("./pools/lendingPool/getWithdrawRequestInfo");
+const requestWithdraw_1 = require("./pools/lendingPool/requestWithdraw");
+const openVaultPosition_1 = __importDefault(require("./pools/lendingPool/openVaultPosition"));
+const getAdapterAddress_1 = require("./pools/lendingPool/getAdapterAddress");
+const getAdapterAddress_2 = require("./pools/rwaVault/getAdapterAddress");
+const getAdapters_2 = __importDefault(require("./pools/rwaVault/getAdapters"));
 class RPCLibrary {
     signer;
     isConnected;
@@ -212,6 +218,11 @@ class RPCLibrary {
                 // ERC721 Adapter
                 getERC721AdapterInfo: getERC721AdapterInfo_1.default,
                 getERC721AdapterDeposits: getERC721AdapterDeposits_1.default,
+                requestWithdraw: requestWithdraw_1.requestWithdraw,
+                getWithdrawRequestInfo: getWithdrawRequestInfo_1.getWithdrawRequestInfo,
+                openVaultPosition: openVaultPosition_1.default,
+                getAdapterAddress: getAdapterAddress_1.getAdapterAddress,
+                getAdapterAddressOnly: getAdapterAddress_1.getAdapterAddressOnly,
             },
             // RWA Vault
             rwaVault: {
@@ -229,6 +240,9 @@ class RPCLibrary {
                 getERC721VaultAdapterDeposits: getERC721VaultAdapterDeposits_1.default,
                 getERC721VaultAdapterTotalValue: getERC721VaultAdapterTotalValue_1.default,
                 getERC721VaultAdapterAssetValue: getERC721VaultAdapterAssetValue_1.default,
+                getAdapters: getAdapters_2.default,
+                getAdapterAddress: getAdapterAddress_2.getAdapterAddress,
+                getAdapterAddressOnly: getAdapterAddress_2.getAdapterAddressOnly,
             },
             depositToLendingPool: depositToLendingPool_1.default,
             withdrawFromLendingPool: withdrawFromLendingPool_1.default,

package/dist/configs/chains/11155111.json

@@ -58,6 +58,11 @@
             "id": "releaseorchestrator",
             "name": "Release Orchestrator",
             "contract": "0x3758d904c69d2C56b89f4b5BbD2c1B1D74773830"
+        },
+        "rwavault": {
+            "id": "rwavault",
+            "name": "RWA Vault",
+            "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
         }
     },
     "pools": {
@@ -122,9 +127,9 @@
             "decimals": 18,
             "contract": "0xf6e002A1E60955d006C5EC1c4Eb74677B73Fba13"
         },
-        "indextoken": {
-            "id": "indextoken",
-            "name": "Index Token",
+        "rwaindextoken": {
+            "id": "rwaindextoken",
+            "name": "RWA Index Token",
             "decimals": 18,
             "contract": "0x3A663C401AdF767d710C7f0133DF40eA18F24863"
         }

package/dist/configs/chains/17000.json

@@ -53,6 +53,11 @@
             "id": "releaseorchestrator",
             "name": "Release Orchestrator",
             "contract": "0xdC5F980E0e0Ad46c94086450f2744CDe11cDcDce"
+        },
+        "rwavault": {
+            "id": "rwavault",
+            "name": "RWA Vault",
+            "contract": "0x0165878A594ca255338adfa4d48449f69242Eb8F"
         }
     },
     "pools": {
@@ -117,43 +122,37 @@
             "decimals": 18,
             "contract": "0x3C9406aFa1d63A8e12b6E71f0D1d28A41b2e5D16"
         },
-        "indextoken": {
-            "id": "indextoken",
-            "name": "Index Token",
+        "rwaindextoken": {
+            "id": "rwaindextoken",
+            "name": "RWA Index Token",
             "decimals": 18,
             "contract": "0x3C9406aFa1d63A8e12b6E71f0D1d28A41b2e5D16"
         }
     },
     "adapters": {
         "lendingpool": {
-            "raacnft": {
-                "id": "raacnft",
+            "raacnftadapter": {
+                "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
                 "contract": "",
                 "type": "ERC721"
             },
-            "rwaindextoken": {
-                "id": "rwaindextoken",
+            "rwaindextokenadapter": {
+                "id": "rwaindextokenadapter",
                 "name": "RWA Index Token",
                 "contract": "",
                 "type": "ERC20"
             }
         },
         "rwavault": {
-            "raacnft": {
-                "id": "raacnft",
+            "raacnftadapter": {
+                "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
                 "contract": "",
                 "type": "ERC721"
             },
-            "rwaindextoken": {
-                "id": "rwaindextoken",
-                "name": "RWA Index Token",
-                "contract": "",
-                "type": "ERC20"
-            },
-            "crvusd": {
-                "id": "crvusd",
+            "crvusdadapter": {
+                "id": "crvusdadapter",
                 "name": "CRVUSD",
                 "contract": "",
                 "type": "ERC20"

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,77 +90,71 @@
             "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": {
-            "raacnft": {
-                "id": "raacnft",
+            "raacnftadapter": {
+                "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "",
+                "contract": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf",
                 "type": "ERC721"
             },
-            "rwaindextoken": {
-                "id": "rwaindextoken",
+            "rwaindextokenadapter": {
+                "id": "rwaindextokenadapter",
                 "name": "RWA Index Token",
-                "contract": "",
+                "contract": "0x95401dc811bb5740090279Ba06cfA8fcF6113778",
                 "type": "ERC20"
             }
         },
         "rwavault": {
-            "raacnft": {
-                "id": "raacnft",
+            "raacnftadapter": {
+                "id": "raacnftadapter",
                 "name": "RAAC NFT Adapter",
-                "contract": "",
+                "contract": "0x99bbA657f2BbC93c02D617f8bA121cB8Fc104Acf",
                 "type": "ERC721"
             },
-            "rwaindextoken": {
-                "id": "rwaindextoken",
-                "name": "RWA Index Token",
-                "contract": "",
-                "type": "ERC20"
-            },
-            "crvusd": {
-                "id": "crvusd",
-                "name": "CRVUSD",
-                "contract": "",
+            "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/pools/lendingPool/_helpers.js

@@ -1,12 +1,18 @@
 "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()]);
 }
@@ -27,3 +33,9 @@ function getLendingPoolAdapterByAddress(chainId, address) {
         throw new Error("Adapter not found in config.");
     return adaptersConfig[matchKey];
 }
+async function getLendingPoolContract(chainId) {
+    const lendingPoolAddress = (0, getContractAddress_1.default)(chainId, "lendingpool");
+    const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
+    const provider = new ethers_1.ethers.JsonRpcProvider();
+    return new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, provider);
+}

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC20AdapterBalance(chainId, adapterAddress, userAddress, signer) {
+async function getERC20AdapterBalance(adapterAddress, userAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC20AdapterInfo(chainId, adapterAddress, signer) {
+async function getERC20AdapterInfo(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC721AdapterDeposits(chainId, adapterAddress, userAddress, signer) {
+async function getERC721AdapterDeposits(adapterAddress, userAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC721AdapterInfo(chainId, adapterAddress, signer) {
+async function getERC721AdapterInfo(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }

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, adapter, data, amount, signer) {
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
+async function borrowFromLendingPool(chainId, adapterName, amount, data) {
     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(adapter, data, amountInWei.toString());
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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 ${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,40 +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"));
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed
-async function borrowFromLendingPoolWithInsurance(chainId, adapter, data, amount, signer) {
+async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount, data) {
     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(adapter, userAddress, data, 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);
+        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(adapter, data, 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,17 +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");
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 // TODO: interface changed
-async function calculateInsuranceFee(chainId, adapter, userAddress, data, amount, provider) {
+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);
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const insuranceFee = await lendingPoolContract.calculateInsuranceFee(adapter, userAddress, data, 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,28 +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, adapter, data, signer) {
+async function closeLiquidation(chainId, adapterName, data) {
     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(adapter, data);
-        await tx.wait();
-        console.log(`closeLiquidation result: ${tx.hash}`);
-        return tx;
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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;
     }
 }

package/dist/pools/lendingPool/depositAssetToLendingPool.js

@@ -1,60 +1,22 @@
 "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
-async function depositAssetToLendingPool(chainId, adapter, data, signer) {
-    if (!signer) {
-        throw new Error("Wallet not connected");
-    }
+async function depositAssetToLendingPool(chainId, adapterName, data) {
     try {
-        const lendingPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "lendingpool");
-        const nftAddress = (0, getContractAddress_1.getContractAddress)(chainId, "raacnft");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const nftABI = (0, artifacts_1.getABI)("raacnft");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
-        const adapterConfig = (0, _helpers_1.getLendingPoolAdapterByAddress)(chainId, adapter);
-        if (adapterConfig.type === "ERC721") {
-            const nftContract = new ethers_1.ethers.Contract(nftAddress, nftABI, signer);
-            // Check if the signer owns the NFT
-            const tokenId = await (0, _helpers_1.decodeERC721)(data);
-            const owner = await nftContract.ownerOf(tokenId);
-            if (owner.toLowerCase() !== (await signer.getAddress()).toLowerCase()) {
-                throw new Error(`Signer does not own NFT #${tokenId}`);
-            }
-            // Approve the lending pool to transfer the NFT
-            const approveTx = await nftContract.approve(lendingPoolAddress, tokenId, {
-                // maxFeePerGas,
-                nonce: await signer.getNonce(),
-            });
-            await approveTx.wait();
-            console.log(`Approved lending pool to transfer NFT #${tokenId}`);
-        }
-        else if (adapterConfig.type === "ERC20") {
-            const amount = (0, _helpers_1.decodeERC20)(data);
-            const erc20Contract = new ethers_1.ethers.Contract((0, getContractAddress_1.getContractAddress)(chainId, "crvusd"), (0, artifacts_1.getABI)("crvusd"), signer);
-            const sufficientBalance = await erc20Contract.balanceOf(await signer.getAddress()) > amount;
-            if (!sufficientBalance)
-                throw new Error("User does not have sufficient balance.");
-        }
-        else {
-            throw new Error("Adapter type is not configured.");
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
-        // Deposit the Asset
-        const depositTx = await lendingPoolContract.depositAsset(adapter, data, {
-            // maxFeePerGas,
-            nonce: await signer.getNonce(),
-        });
-        console.log(`Deposit transaction sent for Asset #${data}:`, depositTx.hash);
-        const receipt = await depositTx.wait();
-        console.log(`Deposited Asset #${data} to lending pool successfully:`, receipt?.hash);
-        return receipt;
+        const tx = await lendingPoolContract.depositAsset(adapterAddress, data);
+        const receipt = await tx.wait();
+        return receipt.status === 1;
     }
     catch (error) {
-        console.error(`Asset Deposit to Lending Pool error:`, error);
-        throw new Error(`Asset Deposit to Lending Pool failed: ${error.message}`);
+        console.error("Error depositing asset to lending pool:", error);
+        throw error;
     }
 }
 exports.default = depositAssetToLendingPool;

package/dist/pools/lendingPool/depositToLendingPool.js

@@ -1,17 +1,14 @@
 "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");
 // checked
 async function depositToLendingPool(chainId, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const lendingPoolAddress = (0, contracts_1.getContractAddress)(chainId, "lendingpool");
-        const lendingPoolABI = (0, artifacts_1.getABI)("lendingpool");
-        const lendingPoolContract = new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, signer);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
         const amountInWei = ethers_1.ethers.parseEther(amount);
         // const { maxFeePerGas } = await estimateGasPrice(signer);
         const depositTx = await lendingPoolContract.deposit(amountInWei.toString(), {