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

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([], [], 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

@@ -33,9 +33,8 @@ function getLendingPoolAdapterByAddress(chainId, address) {
         throw new Error("Adapter not found in config.");
     return adaptersConfig[matchKey];
 }
-async function getLendingPoolContract(chainId) {
+async function getLendingPoolContract(chainId, providerOrProvider) {
     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);
+    return new ethers_1.ethers.Contract(lendingPoolAddress, lendingPoolABI, providerOrProvider);
 }

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(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(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

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

package/dist/pools/lendingPool/borrowFromLendingPoolWithInsurance.js

@@ -1,17 +1,48 @@
 "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 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, adapterName, amount, data) {
+async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
-        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amount);
+        const userAddress = await signer.getAddress();
+        const lendingPoolAddress = await lendingPoolContract.getAddress();
+        const feeCollectorAddress = (0, contracts_1.getContractAddress)(chainId, "feecollector");
+        // Calculate the insurance fee they need to pay
+        const insuranceFee = await (0, calculateInsuranceFee_1.default)(chainId, adapterName, userAddress, data, 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`);
+        }
+        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 with insurance successfully. Transaction hash: ${receipt?.hash}`);
         return receipt.status === 1;
     }
     catch (error) {

package/dist/pools/lendingPool/calculateInsuranceFee.js

@@ -10,9 +10,9 @@ async function calculateInsuranceFee(chainId, adapterName, userAddress, data, am
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found`);
         }
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const amountInWei = ethers_1.ethers.parseEther(amount);
-        const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amountInWei.toString());
+        const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amountInWei);
         console.log(`Insurance fee: ${ethers_1.ethers.formatEther(fee)}`);
         return fee;
     }

package/dist/pools/lendingPool/closeLiquidation.js

@@ -11,9 +11,9 @@ const _helpers_1 = require("./_helpers");
  * @param data
  * @returns
  */
-async function closeLiquidation(chainId, adapterName, data) {
+async function closeLiquidation(chainId, adapterName, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/depositAssetToLendingPool.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 // TODO: interface changed
-async function depositAssetToLendingPool(chainId, adapterName, data) {
+async function depositAssetToLendingPool(chainId, adapterName, data, signer) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/depositToLendingPool.js

@@ -2,13 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 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 lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        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(), {
@@ -22,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

@@ -18,16 +18,14 @@ function getAdapterAddress(chainId, adapterName) {
         throw new Error(`Chain configuration not found for chain ID ${chainId}`);
     }
     // Search through all adapters in the chain config
-    for (const poolType in chainConfig.adapters) {
-        const poolAdapters = chainConfig.adapters[poolType];
-        for (const assetType in poolAdapters) {
-            const adapter = poolAdapters[assetType];
-            if (adapter.id === adapterName) {
-                return {
-                    address: adapter.contract,
-                    type: adapter.type
-                };
-            }
+    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;

package/dist/pools/lendingPool/getAdapters.js

@@ -4,7 +4,7 @@ const index_1 = require("../../configs/chains/index");
 const _helpers_1 = require("./_helpers");
 async function getAdapters(chainId, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapters = await lendingPoolContract.getAdapters();
         const adapterConfig = index_1.configs[chainId].adapters;
         return {

package/dist/pools/lendingPool/getEligibleUserDeposits.js

@@ -11,7 +11,7 @@ const _helpers_1 = require("./_helpers");
  */
 async function getEligibleUserDeposits(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getEligibleUserDeposits(address);
         console.log(`Eligible user deposits: ${ethers_1.ethers.formatEther(value)}`);
         return value;

package/dist/pools/lendingPool/getHealthFactor.js

@@ -12,9 +12,9 @@ const _helpers_1 = require("./_helpers");
  * @param provider
  * @returns The health factor of a position (0, inf)
  */
-async function getHealthFactor(chainId, adapterName, userAddress, data) {
+async function getHealthFactor(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/getLendingPoolInfo.js

@@ -5,7 +5,7 @@ const _helpers_1 = require("./_helpers");
 const artifacts_1 = require("../../utils/artifacts");
 async function getLendingPoolInfo(chainId, userAddress, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const handleError = (operation, returnType) => (error) => {
             if (error.code === "BAD_DATA") {
                 console.log(`BAD_DATA from ${operation} - Pool empty?`, error.messag);
@@ -39,20 +39,27 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
         const maxRate = rateData?.maxRate ?? 0n;
         const optimalUtilizationRate = rateData?.optimalUtilizationRate ?? 0n;
         const protocolFeeRate = rateData?.protocolFeeRate ?? 0n;
+        const pendingProtocolFeeAmount = reserve?.[8];
         // Compute APY
-        let apy;
+        let apr;
         if (utilization <= optimalUtilizationRate && optimalUtilizationRate > 0) {
-            const rateSlope = primeRate - baseRate;
-            const rateIncrease = (utilization * rateSlope) / optimalUtilizationRate;
-            apy = baseRate + rateIncrease;
+            apr = optimalRate;
         }
         else {
             const excessUtilization = utilization - optimalUtilizationRate;
             const maxExcessUtilization = BigInt(1e27) - optimalUtilizationRate;
-            const rateSlope = maxRate - primeRate;
+            const rateSlope = maxRate - optimalRate;
             const rateIncrease = (excessUtilization * rateSlope) / maxExcessUtilization;
-            apy = primeRate + rateIncrease;
+            apr = primeRate + rateIncrease;
+            apr = apr > maxRate ? maxRate : apr;
         }
+        // compute the APY
+        // FIXME: This is not correct
+        let apy;
+        const grossLiquidityRate = utilization * currentUsageRate / BigInt(1e27);
+        const protocolFeeAmount = grossLiquidityRate * protocolFeeRate / BigInt(1e27);
+        apy = grossLiquidityRate - protocolFeeAmount;
+        console.log("apr", apy);
         let userRedeemable = 0n;
         if (userAddress) {
             // Fetch user's scaled RToken balance
@@ -71,18 +78,20 @@ async function getLendingPoolInfo(chainId, userAddress, provider) {
             utilization: (Number(utilization.toString()) / 1e27).toFixed(6), // Utilization as a decimal value between 0 and 1
             liquidityIndex: (Number(liquidityIndex.toString()) / 1e27).toFixed(6),
             usageIndex: (Number(usageIndex.toString()) / 1e27).toFixed(6),
-            currentLiquidityRate: (Number(currentLiquidityRate.toString()) / 1e25).toFixed(2) + "%",
-            currentUsageRate: (Number(currentUsageRate.toString()) / 1e25).toFixed(2) + "%",
-            primeRate: (Number(primeRate.toString()) / 1e25).toFixed(2) + "%",
-            baseRate: (Number(baseRate.toString()) / 1e25).toFixed(2) + "%",
-            optimalRate: (Number(optimalRate.toString()) / 1e25).toFixed(2) + "%",
-            maxRate: (Number(maxRate.toString()) / 1e25).toFixed(2) + "%",
+            currentLiquidityRate: (Number(currentLiquidityRate.toString()) / 1e25).toFixed(2),
+            currentUsageRate: (Number(currentUsageRate.toString()) / 1e25).toFixed(2),
+            primeRate: (Number(primeRate.toString()) / 1e25).toFixed(2),
+            baseRate: (Number(baseRate.toString()) / 1e25).toFixed(2),
+            optimalRate: (Number(optimalRate.toString()) / 1e25).toFixed(2),
+            maxRate: (Number(maxRate.toString()) / 1e25).toFixed(2),
             optimalUtilizationRate: (Number(optimalUtilizationRate.toString()) / 1e27).toFixed(6),
-            protocolFeeRate: (Number(protocolFeeRate.toString()) / 1e25).toFixed(2) + "%",
+            protocolFeeRate: (Number(protocolFeeRate.toString()) / 1e25).toFixed(2),
             normalizedIncome: (Number(normalizedIncome.toString()) / 1e27).toFixed(6),
             normalizedDebt: (Number(normalizedDebt.toString()) / 1e27).toFixed(6),
-            apy: (Number(apy.toString()) / 1e25).toFixed(2) + "%",
+            apy: (Number(apy.toString()) / 1e25).toFixed(2),
             userRedeemable: ethers_1.ethers.formatEther(userRedeemable ?? 0n),
+            apr: (Number(apr.toString()) / 1e25).toFixed(2),
+            pendingProtocolFeeAmount: ethers_1.ethers.formatEther(pendingProtocolFeeAmount),
         };
         return result;
     }

package/dist/pools/lendingPool/getLendingPoolTotalLiquidity.js

@@ -5,7 +5,7 @@ const _helpers_1 = require("./_helpers");
 // @deprecated
 async function getLendingPoolTotalLiquidity(chainId, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reserve = (await lendingPoolContract.reserve());
         const totalLiquidity = reserve.totalLiquidity;
         return totalLiquidity;

package/dist/pools/lendingPool/getParameters.js

@@ -3,21 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
 async function getParameters(chainId, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
-        const [canPaybackDebt, withdrawalsPaused, liquidationThreshold, healthFactorLiquidationThreshold, liquidationGracePeriod, insuranceFee, depositFee, liquidityBufferRatio, supplyCap, borrowCap, withdrawTimelockDuration, vaultOpeningFee,] = await lendingPoolContract.parameters();
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
+        const [canPaybackDebt, withdrawalsPaused, liquidationThreshold, liquidationGracePeriod, insuranceFee, depositFee, liquidityBufferRatio, supplyCap, borrowCap, vaultOpeningFee, borrowThreshold,] = await lendingPoolContract.parameters();
         const parameters = {
             canPaybackDebt,
             withdrawalsPaused,
             liquidationThreshold,
-            healthFactorLiquidationThreshold,
             liquidationGracePeriod,
             insuranceFee,
             depositFee,
             liquidityBufferRatio,
             supplyCap,
             borrowCap,
-            withdrawTimelockDuration,
             vaultOpeningFee,
+            borrowThreshold,
         };
         return parameters;
     }

package/dist/pools/lendingPool/getPositionDebt.js

@@ -10,9 +10,9 @@ const _helpers_1 = require("./_helpers");
  * @param provider
  * @returns The raw debt of the user on a NFT
  */
-async function getPositionDebt(chainId, adapterName, userAddress, data) {
+async function getPositionDebt(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/getPositionScaledDebt.js

@@ -12,9 +12,9 @@ const _helpers_1 = require("./_helpers");
  * @param data
  * @returns The  debt of the user on a NFT with the accured interest
  */
-async function getPositionScaledDebt(chainId, adapterName, userAddress, data) {
+async function getPositionScaledDebt(chainId, adapterName, userAddress, data, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);

package/dist/pools/lendingPool/getPositionView.js

@@ -33,7 +33,7 @@ async function getPositionView(chainId, adapterName, userAddress, data, provider
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found`);
         }
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const position = await lendingPoolContract.getPositionView(adapterAddress, userAddress, data);
         return transformPositionView(position);
     }

package/dist/pools/lendingPool/getPositionsScaledDebt.js

@@ -12,7 +12,7 @@ const _helpers_1 = require("./_helpers");
  */
 async function getPositionsScaledDebt(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reward = await lendingPoolContract.getPositionsScaledDebt(address);
         console.log(`getPositionsScaledDebt result: ${ethers_1.ethers.formatEther(reward)}`);
         return reward;

package/dist/pools/lendingPool/getRawUserDepositsInLendingPool.js

@@ -5,7 +5,7 @@ const _helpers_1 = require("./_helpers");
 // Get the amount of RToken RAW deposit in the lending pool, without the accured interest
 async function getRawUserDepositsInLendingPool(chainId, address, provider) {
     try {
-        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId);
+        const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const value = await lendingPoolContract.getUserDeposits(address);
         console.log(`User deposits in lending pool: ${ethers_1.ethers.formatEther(value)}`);
         return value;