@raac/rpc 1.2.0-beta.9 → 2.0.0-beta.0

package/dist/pools/lendingPool/calculateInsuranceFee.js

@@ -1,9 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 // TODO: interface changed
+/**
+ * Computes the insurance fee for borrowing `amount` with insurance, including any previously uninsured balance.
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param userAddress The borrower.
+ * @param data The adapter-encoded position data.
+ * @param amount The amount to borrow, in reserve asset (crvUSD) base units.
+ * @param provider The provider to read with.
+ * @returns The fee in reserve asset (crvUSD) base units.
+ */
 async function calculateInsuranceFee(chainId, adapterName, userAddress, data, amount, provider) {
     try {
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -11,10 +20,8 @@ async function calculateInsuranceFee(chainId, adapterName, userAddress, data, am
             throw new Error(`Adapter ${adapterName} not found`);
         }
         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);
-        console.log(`Insurance fee: ${ethers_1.ethers.formatEther(fee)}`);
-        return fee;
+        const fee = await lendingPoolContract.calculateInsuranceFee(adapterAddress, userAddress, data, amount);
+        return (0, _helpers_1.toReserveAmount)(chainId, fee);
     }
     catch (error) {
         console.error("Error in calculateInsuranceFee:", error);

package/dist/pools/lendingPool/depositToLendingPool.js

@@ -1,24 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 const errorDecoder_1 = require("../../utils/errorDecoder");
-// checked
+/**
+ * Deposits the reserve asset into the lending pool and receives rToken.
+ * @param chainId The chain id.
+ * @param amount The amount to deposit, in reserve asset (crvUSD) base units.
+ * @param signer The depositor.
+ * @returns The transaction receipt.
+ */
 async function depositToLendingPool(chainId, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
         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(), {
+        const depositTx = await lendingPoolContract.deposit(amount, {
             // maxFeePerGas,
             nonce: await signer.getNonce(),
         });
         console.log(`Deposit transaction sent for rToken:`, depositTx.hash);
         const receipt = await depositTx.wait();
-        console.log(`Deposited ${amount} rToken to lending pool successfully:`, receipt?.hash);
+        console.log(`Deposited ${amount} base units to lending pool successfully:`, receipt?.hash);
         return receipt;
     }
     catch (error) {

package/dist/pools/lendingPool/getEligibleUserDeposits.js

@@ -1,20 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 /**
  * @description Total amount of RToken + DEToken = total crvUSD they put in the system so far. How much they have contributed to the system.
- * @param chainId
- * @param address
- * @param provider
- * @returns
+ * @param chainId The chain id.
+ * @param address The user.
+ * @param provider The provider to read with.
+ * @returns The user's raw rToken deposits plus stability pool deposits, in reserve asset (crvUSD) base units.
  */
 async function getEligibleUserDeposits(chainId, address, provider) {
     try {
         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;
+        return (0, _helpers_1.toReserveAmount)(chainId, value);
     }
     catch (error) {
         console.error("Error in getEligibleUserDeposits:", error);

package/dist/pools/lendingPool/getHealthFactor.js

@@ -3,14 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = getHealthFactor;
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+const amount_1 = require("../../utils/amount");
 /**
  * @description Get the health factor of a NFT position -> factor < 1 : undercollateralized.
- * @param chainId
- * @param adapterName
- * @param userAddress
- * @param data
- * @param provider
- * @returns The health factor of a position (0, inf)
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param userAddress The borrower.
+ * @param data The adapter-encoded position data.
+ * @param provider The provider to read with.
+ * @returns The health factor, 1e18-scaled (liquidatable below 1e18). A position with no debt returns 1e27 (`WadRayMath.RAY`), which reads as 1e9.
  */
 async function getHealthFactor(chainId, adapterName, userAddress, data, provider) {
     try {
@@ -20,7 +21,7 @@ async function getHealthFactor(chainId, adapterName, userAddress, data, provider
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
         const healthFactor = await lendingPoolContract.calculateHealthFactor(adapterAddress, userAddress, data);
-        return healthFactor;
+        return (0, amount_1.toScaled)(healthFactor, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error("Error getting health factor:", error);

package/dist/pools/lendingPool/getHousePrice.js

@@ -3,9 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../../contracts/getContractAddress");
 const artifacts_1 = require("../../utils/artifacts");
-// checked
+const amount_1 = require("../../utils/amount");
+/**
+ * Reads the latest crvUSD price of a RAAC NFT.
+ * @param chainId The chain id.
+ * @param tokenId The RAAC NFT token id.
+ * @param signer The signer to read with.
+ * @returns The house price in crvUSD base units. RAACHousePrices always returns it with 18 decimals.
+ */
 async function getHousePrice(chainId, tokenId, signer) {
-    console.log(chainId, tokenId, signer);
     if (!signer) {
         throw new Error("Wallet not connected");
     }
@@ -13,10 +19,8 @@ async function getHousePrice(chainId, tokenId, signer) {
         const raacHousePricesAddress = (0, getContractAddress_1.getContractAddress)(chainId, "raachouseprices");
         const raacHousePricesABI = (0, artifacts_1.getABI)("raachouseprices");
         const raacHousePricesContract = new ethers_1.ethers.Contract(raacHousePricesAddress, raacHousePricesABI, signer);
-        const housePrice = await raacHousePricesContract.getLatestPrice(tokenId);
-        console.log({ housePrice });
-        console.log(`House price for token ID ${tokenId}: ${ethers_1.ethers.formatEther(housePrice)} ETH`);
-        return housePrice;
+        const [price] = await raacHousePricesContract.getLatestPrice(tokenId);
+        return (0, amount_1.toAmount)(price, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error(`Error getting house price for token ID ${tokenId}:`, error);

package/dist/pools/lendingPool/getLendingPoolInfo.js

@@ -1,103 +1,113 @@
 "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 chains_1 = __importDefault(require("../../configs/chains"));
 const _helpers_1 = require("./_helpers");
 const artifacts_1 = require("../../utils/artifacts");
+const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
+const amount_1 = require("../../utils/amount");
+const RAY = 10n ** 27n;
+const HALF_RAY = RAY / 2n;
+/** Mirrors WadRayMath.rayMul (half-up rounding). */
+const rayMul = (a, b) => (a * b + HALF_RAY) / RAY;
+/** A ray (27-decimal) value. */
+const ray = (value) => (0, amount_1.toScaled)(value, amount_1.RAY_DECIMALS);
+/**
+ * Effective yearly cost of a nominal RAY borrow rate: e^r - 1, as a ray.
+ * The usage index compounds (ReserveLibrary.calculateCompoundedInterest), so the
+ * borrow side's effective rate exceeds its nominal rate. The liquidity index
+ * accrues linearly, so the supply side has no equivalent gap.
+ * Computed in floating point, so digits past double precision are not meaningful.
+ */
+const toCompoundedApy = (rate) => BigInt(Math.round(Math.expm1(Number(rate) / 1e27) * 1e27));
+/**
+ * Reads the lending pool's reserve state, rates and, optionally, a user's redeemable balance.
+ * @param chainId The chain id.
+ * @param userAddress The user whose rToken balance to include in `userRedeemable`.
+ * @param provider The provider to read with. Defaults to the chain's first configured RPC.
+ * @returns The pool info; see `LendingPoolInfo` for units.
+ */
 async function getLendingPoolInfo(chainId, userAddress, provider) {
     try {
+        if (!provider) {
+            const rpc = chains_1.default[chainId].rpcs[0];
+            provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+        }
         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);
-                return returnType || null;
-            }
-            throw error;
-        };
         const [reserve, rateData, normalizedIncome, normalizedDebt] = await Promise.all([
-            lendingPoolContract.reserve().catch(handleError("reserve")),
-            lendingPoolContract.rateData().catch(handleError("rateData")),
-            lendingPoolContract.getNormalizedIncome().catch(handleError("getNormalizedIncome", 0n)),
-            lendingPoolContract.getNormalizedDebt().catch(handleError("getNormalizedDebt", 0n)),
+            lendingPoolContract.reserve(),
+            lendingPoolContract.rateData(),
+            lendingPoolContract.getNormalizedIncome(),
+            lendingPoolContract.getNormalizedDebt(),
         ]);
-        // Extract data from reserve
-        const totalLiquidity = reserve?.totalLiquidity ?? 0n;
-        const totalUsage = reserve?.totalUsage ?? 0n;
-        const liquidityIndex = reserve?.liquidityIndex ?? 0n;
-        const usageIndex = reserve?.usageIndex ?? 0n;
-        // Compute utilization
-        let utilization = 0n;
-        if (totalLiquidity + totalUsage > 0n) {
-            utilization = (totalUsage * BigInt(1e27)) / (totalLiquidity + totalUsage);
-        }
-        // Extract rate data
-        const currentLiquidityRate = rateData?.currentLiquidityRate ?? 0n;
-        const currentUsageRate = rateData?.currentUsageRate ?? 0n;
-        // why is prime rate 0?
-        const primeRate = rateData?.primeRate ?? 0n;
-        const baseRate = rateData?.baseRate ?? 0n;
-        const optimalRate = rateData?.optimalRate ?? 0n;
-        const maxRate = rateData?.maxRate ?? 0n;
-        const optimalUtilizationRate = rateData?.optimalUtilizationRate ?? 0n;
-        const protocolFeeRate = rateData?.protocolFeeRate ?? 0n;
-        const pendingProtocolFeeAmount = reserve?.[8];
-        // Compute APY
-        let apr;
-        if (utilization <= optimalUtilizationRate && optimalUtilizationRate > 0) {
-            apr = optimalRate;
-        }
-        else {
-            const excessUtilization = utilization - optimalUtilizationRate;
-            const maxExcessUtilization = BigInt(1e27) - optimalUtilizationRate;
-            const rateSlope = maxRate - optimalRate;
-            const rateIncrease = (excessUtilization * rateSlope) / maxExcessUtilization;
-            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);
+        // Rates as maintained by the pool. These are written by
+        // ReserveLibrary.updateInterestRatesAndLiquidity on every operation that moves
+        // liquidity or debt, and interest accrues at them until the next one, so they
+        // are the rates actually in effect - not a stale snapshot to be recomputed.
+        const supplyRate = rateData.currentLiquidityRate;
+        const borrowRate = rateData.currentUsageRate;
+        const pendingProtocolFeeAmount = await getPendingProtocolFee(chainId, provider, reserve, normalizedIncome);
         let userRedeemable = 0n;
         if (userAddress) {
-            // Fetch user's scaled RToken balance
-            const rTokenAddress = reserve?.reserveRTokenAddress;
-            const rTokenABI = (0, artifacts_1.getABI)("rtoken");
-            const rTokenContract = new ethers_1.ethers.Contract(rTokenAddress, rTokenABI, provider);
-            const userScaledBalance = await rTokenContract
-                .balanceOf(userAddress)
-                .catch(handleError("rToken balanceOf"));
-            // Compute user's redeemable balance: userRedeemable = userScaledBalance * liquidityIndex / RAY
-            userRedeemable = (userScaledBalance * liquidityIndex) / BigInt(1e27);
+            // RToken.balanceOf already applies the liquidity index, so it is the
+            // redeemable underlying amount - do not scale it again.
+            const rTokenContract = new ethers_1.ethers.Contract(reserve.reserveRTokenAddress, (0, artifacts_1.getABI)("rtoken"), provider);
+            userRedeemable = await rTokenContract.balanceOf(userAddress);
         }
-        const result = {
-            totalLiquidity: ethers_1.ethers.formatEther(totalLiquidity),
-            totalBorrow: ethers_1.ethers.formatEther(totalUsage),
-            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),
-            optimalUtilizationRate: (Number(optimalUtilizationRate.toString()) / 1e27).toFixed(6),
-            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),
-            userRedeemable: ethers_1.ethers.formatEther(userRedeemable ?? 0n),
-            apr: (Number(apr.toString()) / 1e25).toFixed(2),
-            pendingProtocolFeeAmount: ethers_1.ethers.formatEther(pendingProtocolFeeAmount),
+        return {
+            totalLiquidity: (0, _helpers_1.toReserveAmount)(chainId, reserve.totalLiquidity),
+            totalBorrow: (0, _helpers_1.toReserveAmount)(chainId, reserve.totalUsage),
+            utilization: ray(rateData.currentUtilizationRate ?? 0n),
+            liquidityIndex: ray(reserve.liquidityIndex),
+            usageIndex: ray(reserve.usageIndex),
+            supplyRate: ray(supplyRate),
+            borrowRate: ray(borrowRate),
+            supplyApy: ray(supplyRate),
+            borrowApy: ray(toCompoundedApy(borrowRate)),
+            primeRate: ray(rateData.primeRate),
+            baseRate: ray(rateData.baseRate),
+            optimalRate: ray(rateData.optimalRate),
+            maxRate: ray(rateData.maxRate),
+            optimalUtilizationRate: ray(rateData.optimalUtilizationRate),
+            protocolFeeRate: ray(rateData.protocolFeeRate),
+            currentProtocolFeeRate: ray(rateData.currentProtocolFeeRate ?? 0n),
+            normalizedIncome: ray(normalizedIncome),
+            normalizedDebt: ray(normalizedDebt),
+            userRedeemable: (0, _helpers_1.toReserveAmount)(chainId, userRedeemable),
+            pendingProtocolFeeAmount: (0, _helpers_1.toReserveAmount)(chainId, pendingProtocolFeeAmount),
+            currentLiquidityRate: ray(supplyRate),
+            currentUsageRate: ray(borrowRate),
+            apr: ray(borrowRate),
+            apy: ray(supplyRate),
         };
-        return result;
     }
     catch (error) {
         console.error("Error fetching lending pool info:", error);
         throw error;
     }
 }
+/**
+ * Resolves the protocol fee owed in underlying asset units.
+ *
+ * Newer pools bank the fee scaled by the liquidity index and expose
+ * `getPendingProtocolFee()`, which re-values it at the current index. Older pools
+ * store the unscaled amount in the reserve's ninth slot and have no getter, so
+ * fall back to reading it directly.
+ * @returns The pending protocol fee in reserve asset base units.
+ */
+async function getPendingProtocolFee(chainId, provider, reserve, normalizedIncome) {
+    const stored = reserve?.[8] ?? 0n;
+    if (stored === 0n)
+        return 0n;
+    try {
+        const pool = new ethers_1.ethers.Contract((0, getContractAddress_1.default)(chainId, "lendingpool"), ["function getPendingProtocolFee() view returns (uint256)"], provider);
+        return await pool.getPendingProtocolFee();
+    }
+    catch {
+        return normalizedIncome > 0n ? rayMul(stored, normalizedIncome) : stored;
+    }
+}
 exports.default = getLendingPoolInfo;

package/dist/pools/lendingPool/getLendingPoolTotalLiquidity.js

@@ -1,14 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
-// The lending pool reserve contains the total liquidity of the lending pool. see getLendingPooInfo.ts
-// @deprecated
+/**
+ * Reads the lending pool's total liquidity.
+ * @deprecated Use `getLendingPoolInfo(...).totalLiquidity`.
+ * @param chainId The chain id.
+ * @param provider The provider to read with.
+ * @returns The total liquidity in reserve asset (crvUSD) base units.
+ */
 async function getLendingPoolTotalLiquidity(chainId, provider) {
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const reserve = (await lendingPoolContract.reserve());
-        const totalLiquidity = reserve.totalLiquidity;
-        return totalLiquidity;
+        return (0, _helpers_1.toReserveAmount)(chainId, reserve.totalLiquidity);
     }
     catch (error) {
         console.error("Error fetching total liquidity:", error);

package/dist/pools/lendingPool/getParameters.js

@@ -1,24 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+/**
+ * Reads the lending pool's protocol parameters.
+ * @param chainId The chain id.
+ * @param provider The provider to read with.
+ * @returns The parameters: caps, fees and minimums as `TokenAmount`s in reserve asset base units, ratios as basis points.
+ */
 async function getParameters(chainId, provider) {
     try {
         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,
-            liquidationGracePeriod,
-            insuranceFee,
-            depositFee,
-            liquidityBufferRatio,
-            supplyCap,
-            borrowCap,
-            vaultOpeningFee,
-            borrowThreshold,
+        const p = await lendingPoolContract.parameters();
+        return {
+            canPaybackDebt: p.canPaybackDebt,
+            withdrawalsPaused: p.withdrawalsPaused,
+            liquidationThreshold: p.liquidationThreshold,
+            liquidationGracePeriod: p.liquidationGracePeriod,
+            insuranceFee: p.insuranceFee,
+            depositFee: p.depositFee,
+            liquidityBufferRatio: p.liquidityBufferRatio,
+            supplyCap: (0, _helpers_1.toReserveAmount)(chainId, p.supplyCap),
+            borrowCap: (0, _helpers_1.toReserveAmount)(chainId, p.borrowCap),
+            vaultOpeningFee: (0, _helpers_1.toReserveAmount)(chainId, p.vaultOpeningFee),
+            borrowThreshold: p.borrowThreshold,
+            minDepositAmount: (0, _helpers_1.toReserveAmount)(chainId, p.minDepositAmount),
+            primeRateChangeBps: p.primeRateChangeBps,
+            minVaultRebalanceAmount: (0, _helpers_1.toReserveAmount)(chainId, p.minVaultRebalanceAmount),
         };
-        return parameters;
     }
     catch (error) {
         console.error("Error in getParameters:", error);

package/dist/pools/lendingPool/getPositionDebt.js

@@ -5,10 +5,12 @@ const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 /**
  * @description Get the raw debt of the user on a NFT. Equivant to the original amount borrowed on NFT.
- * @param chainId
- * @param address
- * @param provider
- * @returns The raw debt of the user on a NFT
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param userAddress The borrower.
+ * @param data The adapter-encoded position data.
+ * @param provider The provider to read with.
+ * @returns The raw debt of the position (principal, without accrued interest), in reserve asset (crvUSD) base units.
  */
 async function getPositionDebt(chainId, adapterName, userAddress, data, provider) {
     try {
@@ -18,7 +20,7 @@ async function getPositionDebt(chainId, adapterName, userAddress, data, provider
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
         const debt = await lendingPoolContract.getPositionDebt(adapterAddress, userAddress, data);
-        return debt;
+        return (0, _helpers_1.toReserveAmount)(chainId, debt);
     }
     catch (error) {
         console.error("Error getting position debt:", error);

package/dist/pools/lendingPool/getPositionScaledDebt.js

@@ -5,12 +5,12 @@ const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 /**
  * @description Get the scaled debt of the user on a NFT (contains the accured interest)
- * @param chainId
- * @param lendingPoolAddress
- * @param adapterName
- * @param userAddress
- * @param data
- * @returns The  debt of the user on a NFT with the accured interest
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param userAddress The borrower.
+ * @param data The adapter-encoded position data.
+ * @param provider The provider to read with.
+ * @returns The debt of the position including accrued interest, in reserve asset (crvUSD) base units.
  */
 async function getPositionScaledDebt(chainId, adapterName, userAddress, data, provider) {
     try {
@@ -20,7 +20,7 @@ async function getPositionScaledDebt(chainId, adapterName, userAddress, data, pr
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
         const scaledDebt = await lendingPoolContract.getPositionScaledDebt(adapterAddress, userAddress, data);
-        return scaledDebt;
+        return (0, _helpers_1.toReserveAmount)(chainId, scaledDebt);
     }
     catch (error) {
         console.error("Error getting position scaled debt:", error);

package/dist/pools/lendingPool/getPositionView.js

@@ -1,31 +1,36 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPositionView = transformPositionView;
-const ethers_1 = require("ethers");
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
-// TODO: interface changed
-function transformPositionView(positionView) {
+const amount_1 = require("../../utils/amount");
+/**
+ * Maps the on-chain `CollateralPositionView` struct to a `PositionView`.
+ * @param positionView The struct returned by `LendingPool.getPositionView`.
+ * @param chainId The chain id, used to resolve the reserve asset's decimals.
+ * @returns The position view.
+ */
+function transformPositionView(positionView, chainId) {
     return {
-        rawDebtBalance: ethers_1.ethers.formatEther(positionView?.[0] || 0n),
-        scaledDebtBalance: ethers_1.ethers.formatEther(positionView?.[1] || 0n),
-        healthFactor: (positionView?.[2] || 0n).toString(),
-        isUnderLiquidation: positionView?.[3] || false,
-        liquidationStartTime: (positionView?.[4] || 0n).toString(),
-        positionIndex: (positionView?.[5] || 0n).toString(),
-        isInsured: positionView?.[6] || false,
-        adapter: positionView?.[7],
-        asset: positionView?.[8],
+        rawDebtBalance: (0, _helpers_1.toReserveAmount)(chainId, positionView.rawDebtBalance),
+        scaledDebtBalance: (0, _helpers_1.toReserveAmount)(chainId, positionView.scaledDebtBalance),
+        healthFactor: (0, amount_1.toScaled)(positionView.healthFactor, amount_1.WAD_DECIMALS),
+        isUnderLiquidation: positionView.isUnderLiquidation,
+        liquidationStartTime: positionView.liquidationStartTime.toString(),
+        positionIndex: (0, amount_1.toScaled)(positionView.positionIndex, amount_1.RAY_DECIMALS),
+        isInsured: positionView.isInsured,
+        adapter: positionView.adapter,
+        asset: positionView.asset,
     };
 }
 /**
  * @description Return all the information about a NFT position
- * @param chainId
- * @param adapterName
- * @param userAddress
- * @param data
- * @param provider
- * @returns All information about a NFT position
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param userAddress The borrower.
+ * @param data The adapter-encoded position data.
+ * @param provider The provider to read with.
+ * @returns The position's debts, health factor, liquidation state, index, insurance flag, adapter and asset.
  */
 async function getPositionView(chainId, adapterName, userAddress, data, provider) {
     try {
@@ -35,7 +40,7 @@ async function getPositionView(chainId, adapterName, userAddress, data, provider
         }
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
         const position = await lendingPoolContract.getPositionView(adapterAddress, userAddress, data);
-        return transformPositionView(position);
+        return transformPositionView(position, chainId);
     }
     catch (error) {
         console.error("Error in getPositionView:", error);

package/dist/pools/lendingPool/getPositionsScaledDebt.js

@@ -1,21 +1,19 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 // TODO: interface changed
 /**
  * @description Get the sum of all the scaled debts of a user over all NFTs
- * @param chainId
- * @param address
- * @param provider
- * @returns The  debt of the user
+ * @param chainId The chain id.
+ * @param address The user.
+ * @param provider The provider to read with.
+ * @returns The user's total debt including accrued interest, in reserve asset (crvUSD) base units.
  */
 async function getPositionsScaledDebt(chainId, address, provider) {
     try {
         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;
+        const debt = await lendingPoolContract.getPositionsScaledDebt(address);
+        return (0, _helpers_1.toReserveAmount)(chainId, debt);
     }
     catch (error) {
         console.error("Error in getPositionsScaledDebt:", error);

package/dist/pools/lendingPool/getRawUserDepositsInLendingPool.js

@@ -1,14 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
-// Get the amount of RToken RAW deposit in the lending pool, without the accured interest
+/**
+ * Reads the user's raw rToken balance in the lending pool, without accrued interest.
+ * @param chainId The chain id.
+ * @param address The user.
+ * @param provider The provider to read with.
+ * @returns The raw deposit in rToken (reserve asset, crvUSD) base units.
+ */
 async function getRawUserDepositsInLendingPool(chainId, address, provider) {
     try {
         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;
+        return (0, _helpers_1.toReserveAmount)(chainId, value);
     }
     catch (error) {
         console.error("Error in getRawUserDepositsInLendingPool:", error);

package/dist/pools/lendingPool/getUserCollateralValue.js

@@ -1,21 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
+const amount_1 = require("../../utils/amount");
 // TODO: interface changed: not efficient
 /**
  * @description Sum of the prices of all the NFTS
- * @param chainId
- * @param address
- * @param provider
- * @returns The total value of the collateral
+ * @param chainId The chain id.
+ * @param address The user.
+ * @param provider The provider to read with.
+ * @returns The total collateral value in crvUSD base units. Asset adapters always price with 18 decimals.
  */
 async function getUserCollateralValue(chainId, address, provider) {
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, provider);
-        const reward = await lendingPoolContract.getUserCollateralValue(address);
-        console.log(`getUserCollateralValue result: ${ethers_1.ethers.formatEther(reward)}`);
-        return reward;
+        const value = await lendingPoolContract.getUserCollateralValue(address);
+        return (0, amount_1.toAmount)(value, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error("Error in getUserCollateralValue:", error);