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

package/dist/oracles/houses/simulate.js

@@ -0,0 +1,21 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simulate = simulate;
+const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const config_1 = __importDefault(require("./config"));
+async function simulate(houseId) {
+    const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+        ...config_1.default,
+        args: [houseId],
+    });
+    if (responseBytesHexstring) {
+        console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+    }
+    if (errorString) {
+        console.log(`\nError returned by simulated script:\n${errorString}\n`);
+    }
+    console.log("Local simulation of source code completed...");
+}

package/dist/oracles/prime-rate/config.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const requestConfig = {
+    name: "prime-rate",
+    sourceURL: "https://emerald-many-grasshopper-318.mypinata.cloud/ipfs/bafkreid3kubchc3f2sspzq25pnmnw3mppkhv46xvzg72xx7zqs2plvjbqu",
+    codeLocation: functions_toolkit_1.Location["Inline"],
+    // Optional
+    secrets: { apiKey: process.env.FRED_API_KEY ?? "" },
+    // Optional
+    secretsLocation: functions_toolkit_1.Location["DONHosted"],
+    args: [],
+    codeLanguage: functions_toolkit_1.CodeLanguage.JavaScript,
+    expectedReturnType: functions_toolkit_1.ReturnType.uint256,
+};
+exports.default = requestConfig;

package/dist/oracles/prime-rate/request.js

@@ -0,0 +1,149 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.request = request;
+const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const configs_1 = require("../../configs");
+const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
+const ethers5_1 = require("ethers5");
+const config_1 = __importDefault(require("./config"));
+const chainlink_networks_config_1 = __importDefault(require("../chainlink-networks-config"));
+const artifacts_1 = require("../../utils/artifacts");
+const subscriptionIds = {
+    8453: 4392,
+    17000: 4392,
+    11155111: 4392,
+    18453: 4392,
+};
+async function request(chainId, signerV5) {
+    const chain = (0, configs_1.getChainConfig)(chainId);
+    const network = chainlink_networks_config_1.default[chainId];
+    if (!chain) {
+        throw new Error(`Chain configuration not found for chainId: ${chainId}`);
+    }
+    const sourceFetch = await fetch(config_1.default.sourceURL);
+    const source = await sourceFetch.text();
+    console.log("Reading source from URL: ", config_1.default.sourceURL);
+    // Simulate the request first
+    {
+        const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+            ...config_1.default,
+            source,
+        });
+        if (responseBytesHexstring) {
+            console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+        }
+        if (errorString) {
+            console.log(`\nError returned by simulated script:\n${errorString}\n`);
+        }
+        console.log("Local simulation of source code completed...");
+    }
+    // Get the RPC endpoint from the chain config and derive a v5 provider
+    const rpcUrl = chain.rpcs?.[0] ?? chain.rpc ?? undefined;
+    if (!rpcUrl)
+        throw new Error("No RPC URL found in chain configuration");
+    const contractAddress = (0, getContractAddress_1.default)(chainId, "raacprimerateoracle");
+    const contractAbi = (0, artifacts_1.getABI)("raacprimerateoracle");
+    const subscriptionId = subscriptionIds[chainId];
+    const slotId = 0;
+    const callbackGasLimit = 300_000;
+    const consumerContract = new ethers5_1.ethers.Contract(contractAddress, contractAbi, signerV5);
+    const linkTokenAddress = network.linkToken;
+    const functionsRouterAddress = network.functionsRouter;
+    const subscriptionManager = new functions_toolkit_1.SubscriptionManager({
+        // Use the v5 signer here (toolkit expects ethers v5 types)
+        signer: signerV5,
+        linkTokenAddress,
+        functionsRouterAddress,
+    });
+    await subscriptionManager.initialize();
+    const donId = network.donId;
+    const secretsManager = new functions_toolkit_1.SecretsManager({
+        // ethers v5 signer again
+        signer: signerV5,
+        functionsRouterAddress,
+        donId,
+    });
+    await secretsManager.initialize();
+    const subInfo = await subscriptionManager.getSubscriptionInfo(subscriptionId);
+    if (!subInfo.consumers
+        .map((c) => c.toLowerCase())
+        .includes(contractAddress.toLowerCase())) {
+        throw Error(`Consumer contract ${contractAddress} has not been added to subscription ${subscriptionId}`);
+    }
+    // Use the v5 provider for gas data (to avoid type mismatches)
+    const { gasPrice } = await signerV5.provider.getFeeData();
+    // @ts-ignore
+    const gasPriceWei = BigInt(Math.ceil(ethers5_1.ethers.utils.formatUnits(gasPrice, "wei").toString()));
+    const estimatedCostJuels = await subscriptionManager.estimateFunctionsRequestCost({
+        donId,
+        subscriptionId,
+        callbackGasLimit,
+        gasPriceWei,
+    });
+    const estimatedCostLink = ethers5_1.ethers.utils.formatUnits(estimatedCostJuels.toString(), 18);
+    const subBalanceLink = ethers5_1.ethers.utils.formatUnits(subInfo.balance.toString(), 18);
+    if (subInfo.balance <= estimatedCostJuels) {
+        throw Error(`Subscription ${subscriptionId} does not have sufficient funds. The estimated cost is ${estimatedCostLink} LINK, but the subscription only has ${subBalanceLink} LINK.`);
+    }
+    const encryptedSecrets = await secretsManager.encryptSecrets(config_1.default.secrets);
+    // DONHoster secrets
+    const { version } = await secretsManager.uploadEncryptedSecretsToDON({
+        encryptedSecretsHexstring: encryptedSecrets.encryptedSecrets,
+        gatewayUrls: network.gatewayUrls,
+        slotId,
+        minutesUntilExpiration: 5,
+    });
+    const encryptedSecretsReference = await secretsManager.buildDONHostedEncryptedSecretsReference({
+        slotId,
+        version,
+    });
+    const responseListener = new functions_toolkit_1.ResponseListener({
+        provider: signerV5.provider,
+        functionsRouterAddress,
+    });
+    console.log(`Waiting for transaction for RAACPrimeRateOracle contract ${contractAddress} on network ${network.name} to be confirmed...`);
+    const overrides = {
+        gasLimit: 1_500_000,
+    };
+    const requestTx = await consumerContract.sendRequest(source, config_1.default.secretsLocation, encryptedSecretsReference, config_1.default.args, [], subscriptionId, callbackGasLimit, overrides);
+    const requestTxReceipt = await requestTx.wait(1);
+    console.log(`Transaction confirmed, see https://sepolia.etherscan.io/tx/${requestTx.hash} for more details.`);
+    console.log(`Functions request has been initiated in transaction ${requestTx.hash} with request ID ${requestTxReceipt?.events[2]?.args?.id}. Note the request ID may change if a re-org occurs, but the transaction hash will remain constant.\nWaiting for fulfillment from the Decentralized Oracle Network...\n`);
+    try {
+        // localFunctionsTestnet needs 0 or 1 confirmations to work correctly as it's local.
+        // If on live testnet or mainnet, setting to undefined then uses the functions-toolkit default of 2 confirmations.
+        const NUM_CONFIRMATIONS = network.confirmations;
+        // Get response data
+        const { requestId, totalCostInJuels, responseBytesHexstring, errorString, fulfillmentCode, } = await responseListener.listenForResponseFromTransaction(requestTx.hash, undefined, NUM_CONFIRMATIONS, undefined);
+        switch (fulfillmentCode) {
+            case functions_toolkit_1.FulfillmentCode.FULFILLED:
+                if (responseBytesHexstring !== "0x") {
+                    console.log(`Request ${requestId} fulfilled!\nResponse has been sent to consumer contract: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+                }
+                else if (errorString.length > 0) {
+                    console.error(`Request ${requestId} fulfilled with error: ${errorString}\n`);
+                }
+                else {
+                    console.warn(`Request ${requestId} fulfilled with empty response data.\n`);
+                }
+                const linkCost = ethers5_1.ethers.utils.formatUnits(totalCostInJuels.toString(), 18);
+                console.log(`Total request cost: ${linkCost + " LINK"}`);
+                break;
+            case functions_toolkit_1.FulfillmentCode.USER_CALLBACK_ERROR:
+                console.error("Error encountered when calling consumer contract callback.\nEnsure the fulfillRequest function in RAACPrimeRateOracle is correct and the --callbackgaslimit is sufficient.");
+                break;
+            case functions_toolkit_1.FulfillmentCode.COST_EXCEEDS_COMMITMENT:
+                console.error(`Request ${requestId} failed due to a gas price spike when attempting to respond.`);
+                break;
+            default:
+                console.error(`Request ${requestId} failed with fulfillment code: ${fulfillmentCode}. Please contact Chainlink support.`);
+        }
+    }
+    catch (error) {
+        console.error("Request fulfillment was not received within 5 minute response period.");
+        throw error;
+    }
+}

package/dist/oracles/prime-rate/simulate.js

@@ -0,0 +1,25 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simulate = simulate;
+const functions_toolkit_1 = require("@chainlink/functions-toolkit");
+const config_1 = __importDefault(require("./config"));
+async function simulate() {
+    // Simulate the request first
+    const sourceFetch = await fetch(config_1.default.sourceURL);
+    const source = await sourceFetch.text();
+    console.log("Reading source from URL: ", config_1.default.sourceURL);
+    const { responseBytesHexstring, errorString } = await (0, functions_toolkit_1.simulateScript)({
+        ...config_1.default,
+        source,
+    });
+    if (responseBytesHexstring) {
+        console.log(`\nResponse returned by script during local simulation: ${(0, functions_toolkit_1.decodeResult)(responseBytesHexstring, config_1.default.expectedReturnType).toString()}\n`);
+    }
+    if (errorString) {
+        console.log(`\nError returned by simulated script:\n${errorString}\n`);
+    }
+    console.log("Local simulation of source code completed...");
+}

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,8 @@ function getLendingPoolAdapterByAddress(chainId, address) {
         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

@@ -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,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC721AdapterDeposits(chainId, adapterAddress, userAddress, signer) {
-    if (!signer) {
+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(adapterAddress, abi, signer);
+        const adapterContract = new ethers_1.ethers.Contract((0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName), abi, provider);
         const depositedTokens = await adapterContract.getDepositedTokens(userAddress);
         return depositedTokens;
     }

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

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC721AdapterInfo(chainId, adapterAddress, signer) {
-    if (!signer) {
+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(adapterAddress, abi, signer);
+        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(),

package/dist/pools/lendingPool/borrowFromLendingPool.js

@@ -1,23 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const getAdapterAddress_1 = require("./getAdapterAddress");
+const _helpers_1 = require("./_helpers");
 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) {
+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 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 amountInWei = ethers_1.ethers.parseEther(amount);
-        console.log("Borrowing amount in wei:", amountInWei.toString());
-        const tx = await lendingPoolContract.borrow(adapter, data, amountInWei.toString());
+        const tx = await lendingPoolContract.borrow(adapterAddress, data, amountInWei);
         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

@@ -4,37 +4,49 @@ var __importDefault = (this && this.__importDefault) || function (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 getAdapterAddress_1 = require("./getAdapterAddress");
+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, adapter, data, amount, signer) {
+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 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 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 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, 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
+        // 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;
+            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`);
         }
-        const tx = await lendingPoolContract.borrowWithInsurance(adapter, data, amountInWei.toString());
+        else {
+            console.log(`Already approved sufficient crvUSD for insurance fee: ${ethers_1.ethers.formatEther(currentAllowance)}`);
+        }
+        // Now proceed with the borrow transaction
+        const amountInWei = ethers_1.ethers.parseEther(amount);
+        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amountInWei);
         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;
+        console.log(`Borrowed with insurance successfully. Transaction hash: ${receipt?.hash}`);
+        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, provider);
         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);
+        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, 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(adapter, data);
-        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;
     }
 }

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, signer) {
     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, signer);
+        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,15 @@
 "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");
+const errorDecoder_1 = require("../../utils/errorDecoder");
 // 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, signer);
         const amountInWei = ethers_1.ethers.parseEther(amount);
         // const { maxFeePerGas } = await estimateGasPrice(signer);
         const depositTx = await lendingPoolContract.deposit(amountInWei.toString(), {
@@ -25,7 +23,8 @@ async function depositToLendingPool(chainId, amount, signer) {
     }
     catch (error) {
         console.error(`Lending Pool Deposit error:`, error);
-        throw new Error(`Lending Pool Deposit failed: ${error.message}`);
+        const message = (0, errorDecoder_1.attachDecodedError)("Lending Pool Deposit failed", error);
+        throw new Error(`${message}: ${error.message}`);
     }
 }
 exports.default = depositToLendingPool;

package/dist/pools/lendingPool/getAdapterAddress.js

@@ -0,0 +1,42 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAdapterAddress = getAdapterAddress;
+exports.getAdapterAddressOnly = getAdapterAddressOnly;
+const chains_1 = __importDefault(require("../../configs/chains"));
+/**
+ * Get the adapter address and type for a given adapter name
+ * @param chainId The chain ID
+ * @param adapterName The name of the adapter (e.g., "rwaindextokenadapter")
+ * @returns The adapter address and type, or null if not found
+ */
+function getAdapterAddress(chainId, adapterName) {
+    const chainConfig = chains_1.default[chainId];
+    if (!chainConfig) {
+        throw new Error(`Chain configuration not found for chain ID ${chainId}`);
+    }
+    // Search through all adapters in the chain config
+    const poolAdapters = chainConfig.adapters["lendingpool"];
+    for (const assetType in poolAdapters) {
+        const adapter = poolAdapters[assetType];
+        if (adapter.id === adapterName) {
+            return {
+                address: adapter.contract,
+                type: adapter.type
+            };
+        }
+    }
+    return null;
+}
+/**
+ * Get the adapter address for a given adapter name
+ * @param chainId The chain ID
+ * @param adapterName The name of the adapter (e.g., "rwaindextokenadapter")
+ * @returns The adapter address, or null if not found
+ */
+function getAdapterAddressOnly(chainId, adapterName) {
+    const adapterInfo = getAdapterAddress(chainId, adapterName);
+    return adapterInfo?.address ?? null;
+}