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

package/dist/pools/lendingPool/openVaultPosition.js

@@ -3,7 +3,6 @@ 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 checkAllowance_1 = __importDefault(require("../../methods/commons/checkAllowance"));
 const approveAsset_1 = __importDefault(require("../../wallet/assets/approveAsset"));
 const _helpers_1 = require("./_helpers");
@@ -19,11 +18,11 @@ async function openVaultPosition(chainId, signer) {
         const vaultOpeningFee = parameters.vaultOpeningFee;
         // Check if user has approved the fee
         const userAddress = await signer.getAddress();
-        const allowance = await (0, checkAllowance_1.default)(chainId, "crvusd", userAddress, await lendingPoolContract.getAddress(), signer.provider);
+        const { value: allowance } = await (0, checkAllowance_1.default)(chainId, "crvusd", userAddress, await lendingPoolContract.getAddress(), signer.provider);
         // If allowance is less than the fee, approve it
         if (allowance < vaultOpeningFee) {
-            await (0, approveAsset_1.default)(chainId, "crvusd", await lendingPoolContract.getAddress(), vaultOpeningFee.toString(), signer);
-            console.log(`Approved ${ethers_1.ethers.formatEther(vaultOpeningFee)} crvUSD for vault opening fee`);
+            await (0, approveAsset_1.default)(chainId, "crvusd", await lendingPoolContract.getAddress(), vaultOpeningFee, signer);
+            console.log(`Approved ${vaultOpeningFee} crvUSD base units for vault opening fee`);
         }
         // Open the vault position
         const tx = await lendingPoolContract.openVaultPosition();

package/dist/pools/lendingPool/repayToLendingPool.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
+/**
+ * Repays debt on a collateral position.
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param amount The amount to repay, in reserve asset (crvUSD) base units.
+ * @param data The adapter-encoded position data.
+ * @param signer The borrower.
+ * @returns Whether the transaction succeeded.
+ */
 async function repayToLendingPool(chainId, adapterName, amount, data, signer) {
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);

package/dist/pools/lendingPool/withdrawFromLendingPool.js

@@ -4,31 +4,30 @@ const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../../contracts/getContractAddress");
 const artifacts_1 = require("../../utils/artifacts");
 const _helpers_1 = require("./_helpers");
+/**
+ * Redeems rToken for the reserve asset.
+ * @param chainId The chain id.
+ * @param amount The amount to withdraw, in rToken (reserve asset, crvUSD) base units.
+ * @param signer The rToken holder.
+ * @returns The transaction receipt.
+ * @throws If the signer's rToken balance is below `amount`.
+ */
 async function withdrawFromLendingPool(chainId, amount, signer) {
+    if (!signer) {
+        throw new Error("Signer is required");
+    }
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const rtokenAddress = (0, getContractAddress_1.getContractAddress)(chainId, "rtoken");
         const assetABI = (0, artifacts_1.getABI)("rtoken");
         const rTokenContract = new ethers_1.ethers.Contract(rtokenAddress, assetABI, signer);
-        const amountInWei = ethers_1.ethers.parseEther(amount.toString());
-        // const { maxFeePerGas } = await estimateGasPrice(signer);
         const userBalance = await rTokenContract.balanceOf(await signer.getAddress());
-        if (userBalance < parseFloat(amount)) {
-            throw new Error(`Insufficient rToken balance. Available: ${ethers_1.ethers.formatEther(userBalance)}, Requested: ${ethers_1.ethers.formatEther(amount)}`);
+        if (userBalance < amount) {
+            throw new Error(`Insufficient rToken balance. Available: ${userBalance}, Requested: ${amount} (base units)`);
         }
-        // const approveTx = await rTokenContract.approve(
-        // 	await lendingPoolContract.getAddress(),
-        // 	amountInWei
-        // );
-        // await approveTx.wait();
-        // console.log(`Approved LendingPool to spend ${amount} rToken`);
-        // const withdraw = await lendingPoolContract.withdraw(amountInWei.toString(), {
-        // maxFeePerGas,
-        // nonce: await signer.getNonce()
-        // });
-        const tx = await lendingPoolContract.withdraw(amountInWei);
+        const tx = await lendingPoolContract.withdraw(amount);
         const receipt = await tx.wait();
-        console.log(`Withdrawn ${amount} from Lending Pool`);
+        console.log(`Withdrawn ${amount} base units from Lending Pool`);
         console.log(`Transaction hash: ${receipt?.hash}`);
         return receipt;
     }

package/dist/pools/liquidityPool/getLiquidityPoolInfo.js

@@ -3,66 +3,59 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const artifacts_1 = require("../../utils/artifacts");
+const amount_1 = require("../../utils/amount");
+/**
+ * Reads liquidity pool markets. The liquidity pool is disabled and this method is not wired into `RPCLibrary`.
+ * @param chainId The chain id.
+ * @param address The user, or an empty string to skip user reads.
+ * @param provider The provider to read with.
+ * @returns Market info keyed by paired token, and the TVL (18 decimals, fixed by the contract).
+ */
 async function getLiquidityPoolInfo(chainId, address, provider) {
     try {
         const liquidityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "liquiditypool");
         // @ts-ignore
         const abi = (0, artifacts_1.getABI)("liquiditypool");
         const liquidityPoolContract = new ethers_1.ethers.Contract(liquidityPoolAddress, abi, provider);
-        const handleError = (operation) => (error) => {
-            if (error.code === "BAD_DATA") {
-                console.log(`BAD_DATA from getLiquidityPoolInfo - ${operation}:`, error.message);
-                return 0n;
-            }
-            throw error;
-        };
-        // Get all markets
-        const markets = await liquidityPoolContract
-            .getMarkets()
-            .catch(handleError("getMarkets"));
+        const markets = await liquidityPoolContract.getMarkets();
         const result = {
             markets: {},
-            tvl: "0",
+            tvl: (0, amount_1.toAmount)(0n, amount_1.WAD_DECIMALS),
         };
         for (const market of markets) {
             const [totalLiquidity, userLiquidity, exchangeRate] = await Promise.all([
-                liquidityPoolContract
-                    .getTotalLiquidity(market)
-                    .catch(handleError("getTotalLiquidity")),
+                liquidityPoolContract.getTotalLiquidity(market),
                 address
                     ? liquidityPoolContract
                         // FIXME: pariedToken not defined.
                         // @ts-ignore
                         .getUserLiquidity(pairedToken, address)
-                        .catch(handleError("getUserLiquidity"))
                     : [0n, 0n, 0n],
                 liquidityPoolContract
                     // @ts-ignore
-                    .getExchangeRate(pairedToken)
-                    .catch(handleError("getExchangeRate")),
+                    .getExchangeRate(pairedToken),
             ]);
             // @ts-ignore
             result.markets[pairedToken] = {
                 totalLiquidity: {
-                    raac: ethers_1.ethers.formatEther(totalLiquidity[0] ?? 0n),
-                    paired: ethers_1.ethers.formatEther(totalLiquidity[1] ?? 0n),
+                    raac: (0, amount_1.toTokenAmount)(chainId, "raactoken", totalLiquidity[0]),
+                    // @ts-ignore
+                    paired: (0, amount_1.toTokenAmount)(chainId, pairedToken, totalLiquidity[1]),
                 },
                 userLiquidity: {
-                    raac: ethers_1.ethers.formatEther(userLiquidity[0] ?? 0n),
-                    paired: ethers_1.ethers.formatEther(userLiquidity[1] ?? 0n),
-                    lpAmount: ethers_1.ethers.formatEther(userLiquidity[2] ?? 0n),
+                    raac: (0, amount_1.toTokenAmount)(chainId, "raactoken", userLiquidity[0]),
+                    // @ts-ignore
+                    paired: (0, amount_1.toTokenAmount)(chainId, pairedToken, userLiquidity[1]),
+                    lpAmount: (0, amount_1.toAmount)(userLiquidity[2], amount_1.WAD_DECIMALS),
                 },
                 exchangeRate: {
-                    raacPerPaired: ethers_1.ethers.formatEther(exchangeRate[0] ?? 0n),
-                    pairedPerRaac: ethers_1.ethers.formatEther(exchangeRate[1] ?? 0n),
+                    raacPerPaired: (0, amount_1.toScaled)(exchangeRate[0], amount_1.WAD_DECIMALS),
+                    pairedPerRaac: (0, amount_1.toScaled)(exchangeRate[1], amount_1.WAD_DECIMALS),
                 },
             };
         }
-        const tvl = await liquidityPoolContract
-            .getTotalValueLocked()
-            .catch(handleError("getTotalValueLocked"));
-        result.tvl = ethers_1.ethers.formatEther(tvl ?? 0n);
-        console.log("getLiquidityPoolInfo result:", result);
+        const tvl = await liquidityPoolContract.getTotalValueLocked();
+        result.tvl = (0, amount_1.toAmount)(tvl, amount_1.WAD_DECIMALS);
         return result;
     }
     catch (error) {

package/dist/pools/rwaVault/_helpers.js

@@ -3,6 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.VAULT_SHARE_ASSET_ID = void 0;
+exports.toShareAmount = toShareAmount;
 exports.encodeERC721 = encodeERC721;
 exports.decodeERC721 = decodeERC721;
 exports.encodeERC20 = encodeERC20;
@@ -13,17 +15,39 @@ const ethers_1 = require("ethers");
 const chains_1 = require("../../configs/chains");
 const artifacts_1 = require("../../utils/artifacts");
 const getContractAddress_1 = __importDefault(require("../../contracts/getContractAddress"));
+const amount_1 = require("../../utils/amount");
+/** Config asset id of the RWA vault's share token. */
+exports.VAULT_SHARE_ASSET_ID = "rwaindextoken";
+/**
+ * Wraps an RWA vault share amount (the RWA index token).
+ * @param chainId The chain id.
+ * @param value The shares in base units.
+ * @returns The amount with the share token's registry decimals and symbol.
+ */
+function toShareAmount(chainId, value) {
+    return (0, amount_1.toTokenAmount)(chainId, exports.VAULT_SHARE_ASSET_ID, value);
+}
 function encodeERC721(tokenId) {
     return new ethers_1.ethers.AbiCoder().encode(["uint256"], [tokenId.toString()]);
 }
 function decodeERC721(data) {
     return new ethers_1.ethers.AbiCoder().decode(["uint256"], data);
 }
+/**
+ * ABI-encodes an ERC20 adapter amount.
+ * @param amount The amount in the token's base units.
+ * @returns The encoded `uint256`.
+ */
 function encodeERC20(amount) {
-    return new ethers_1.ethers.AbiCoder().encode(["uint256"], [amount.toString()]);
+    return new ethers_1.ethers.AbiCoder().encode(["uint256"], [amount]);
 }
+/**
+ * Decodes an ERC20 adapter amount.
+ * @param data The encoded `uint256`.
+ * @returns The amount in the token's base units.
+ */
 function decodeERC20(data) {
-    return new ethers_1.ethers.AbiCoder().decode(["uint256"], data);
+    return new ethers_1.ethers.AbiCoder().decode(["uint256"], data)[0];
 }
 function getRWAVaultAdapterByAddress(chainId, address) {
     const adaptersConfig = chains_1.configs[chainId].adapters;

package/dist/pools/rwaVault/adapters/erc20/getERC20VaultAdapterAssetValue.js

@@ -1,7 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
+const amount_1 = require("../../../../utils/amount");
 const ethers_1 = require("ethers");
+/**
+ * Values an amount of the adapter's ERC20 token.
+ * @param adapterAddress The ERC20 vault adapter address.
+ * @param amount The token amount, in the adapter token's base units.
+ * @param signer The signer to read with.
+ * @returns The value in crvUSD base units. The adapter always normalizes to 18 decimals.
+ */
 async function getERC20VaultAdapterAssetValue(adapterAddress, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -11,7 +19,7 @@ async function getERC20VaultAdapterAssetValue(adapterAddress, amount, signer) {
         const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
         const data = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(["uint256"], [amount]);
         const assetValue = await adapterContract.getAssetValue(data);
-        return assetValue;
+        return (0, amount_1.toAmount)(assetValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error(`Error getting ERC20 Vault Adapter asset value:`, error);

package/dist/pools/rwaVault/adapters/erc20/getERC20VaultAdapterTotalValue.js

@@ -1,7 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
+const amount_1 = require("../../../../utils/amount");
 const ethers_1 = require("ethers");
+/**
+ * Reads the value of all tokens held by an ERC20 vault adapter.
+ * @param adapterAddress The ERC20 vault adapter address.
+ * @param signer The signer to read with.
+ * @returns The value in crvUSD base units. The adapter always normalizes to 18 decimals.
+ */
 async function getERC20VaultAdapterTotalValue(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -10,7 +17,7 @@ async function getERC20VaultAdapterTotalValue(adapterAddress, signer) {
         const abi = (0, artifacts_1.getABI)("erc20vaultadapter");
         const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
         const totalValue = await adapterContract.totalValue();
-        return totalValue;
+        return (0, amount_1.toAmount)(totalValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error(`Error getting ERC20 Vault Adapter total value:`, error);

package/dist/pools/rwaVault/adapters/erc721/getERC721VaultAdapterAssetValue.js

@@ -2,6 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
+const amount_1 = require("../../../../utils/amount");
+/**
+ * Values an NFT held by an ERC721 vault adapter.
+ * @param adapterAddress The ERC721 vault adapter address.
+ * @param tokenId The NFT token id.
+ * @param signer The signer to read with.
+ * @returns The oracle value in crvUSD base units, 18 decimals.
+ */
 async function getERC721VaultAdapterAssetValue(adapterAddress, tokenId, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -11,7 +19,7 @@ async function getERC721VaultAdapterAssetValue(adapterAddress, tokenId, signer)
         const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
         const data = ethers_1.ethers.AbiCoder.defaultAbiCoder().encode(["uint256"], [tokenId]);
         const assetValue = await adapterContract.getAssetValue(data);
-        return assetValue;
+        return (0, amount_1.toAmount)(assetValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error(`Error getting ERC721 Vault Adapter asset value:`, error);

package/dist/pools/rwaVault/adapters/erc721/getERC721VaultAdapterTotalValue.js

@@ -1,7 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const artifacts_1 = require("../../../../utils/artifacts");
+const amount_1 = require("../../../../utils/amount");
 const ethers_1 = require("ethers");
+/**
+ * Reads the value of all NFTs held by an ERC721 vault adapter.
+ * @param adapterAddress The ERC721 vault adapter address.
+ * @param signer The signer to read with.
+ * @returns The summed oracle value in crvUSD base units, 18 decimals.
+ */
 async function getERC721VaultAdapterTotalValue(adapterAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -10,7 +17,7 @@ async function getERC721VaultAdapterTotalValue(adapterAddress, signer) {
         const abi = (0, artifacts_1.getABI)("erc721vaultadapter");
         const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
         const totalValue = await adapterContract.totalValue();
-        return totalValue;
+        return (0, amount_1.toAmount)(totalValue, amount_1.WAD_DECIMALS);
     }
     catch (error) {
         console.error(`Error getting ERC721 Vault Adapter total value:`, error);

package/dist/pools/rwaVault/depositToRWAVault.js

@@ -1,16 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 const getAdapterAddress_1 = require("./getAdapterAddress");
+/**
+ * Deposits an asset into the RWA vault through an adapter and mints vault shares to `receiver`.
+ * @param chainId The chain id.
+ * @param adapter The RWA vault adapter id.
+ * @param data The adapter-encoded asset data.
+ * @param receiver The share recipient.
+ * @param minSharesOut The minimum shares to mint, in share token (RWA index token) base units.
+ * @param signer The depositor.
+ * @returns The transaction receipt.
+ */
 async function depositToRWAVault(chainId, adapter, data, receiver, minSharesOut, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
-        const adapterAddress = await (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter);
-        const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver, ethers_1.ethers.parseEther(minSharesOut));
+        const adapterAddress = (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter);
+        if (!adapterAddress) {
+            throw new Error(`Adapter ${adapter} not found`);
+        }
+        const tx = await rwaVaultContract.depositAsset(adapterAddress.address, data, receiver, minSharesOut);
         console.log(`Deposit transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Deposited to RWA Vault successfully:`, receipt?.hash);

package/dist/pools/rwaVault/getRWAVaultInfo.js

@@ -1,6 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _helpers_1 = require("./_helpers");
+const amount_1 = require("../../utils/amount");
+/**
+ * Reads the RWA vault's state.
+ * @param chainId The chain id.
+ * @param provider The provider to read with.
+ * @returns The vault info; see `RWAVaultInfo` for units.
+ */
 async function getRWAVaultInfo(chainId, provider) {
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
@@ -19,13 +26,13 @@ async function getRWAVaultInfo(chainId, provider) {
             rwaVaultContract.allowVRFRequest(),
         ]);
         return {
-            totalAssets: totalAssets.toString(),
-            pricePerShare: pricePerShare.toString(),
+            totalAssets: (0, amount_1.toAmount)(totalAssets, amount_1.WAD_DECIMALS),
+            pricePerShare: (0, amount_1.toAmount)(pricePerShare, amount_1.WAD_DECIMALS),
             vaultToken,
             // underlyingAssetToken,
             stabilityPool,
             vrfConsumer,
-            indexTokenMintingFee: indexTokenMintingFee.toString(),
+            indexTokenMintingFee,
             feeCollector,
             vrfRequestDelay: vrfRequestDelay.toString(),
             allowVRFRequest,

package/dist/pools/rwaVault/previewDeposit.js

@@ -1,16 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
+/**
+ * Previews how many vault shares are minted for depositing `assetValue`.
+ * @param chainId The chain id.
+ * @param assetValue The asset value in vault value base units (crvUSD, 18 decimals, as returned by the vault adapters).
+ * @param provider The provider to read with.
+ * @returns The shares (rounded down), in share token (RWA index token) base units.
+ */
 async function previewDeposit(chainId, assetValue, provider) {
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
-        const shares = await rwaVaultContract.previewDeposit(ethers_1.ethers.parseEther(assetValue));
-        return shares;
+        const shares = await rwaVaultContract.previewDeposit(assetValue);
+        return (0, _helpers_1.toShareAmount)(chainId, shares);
     }
     catch (error) {
-        console.error(`Error depositing to RWA Vault:`, error);
-        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+        console.error(`Error previewing RWA Vault deposit:`, error);
+        throw new Error(`RWA Vault deposit preview failed: ${error.message}`);
     }
 }
 exports.default = previewDeposit;

package/dist/pools/rwaVault/previewWithdraw.js

@@ -1,16 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
+/**
+ * Previews how many vault shares are burned to withdraw `assetValue`.
+ * @param chainId The chain id.
+ * @param assetValue The asset value in vault value base units (crvUSD, 18 decimals, as returned by the vault adapters).
+ * @param provider The provider to read with.
+ * @returns The shares (rounded up), in share token (RWA index token) base units.
+ */
 async function previewWithdraw(chainId, assetValue, provider) {
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, provider);
-        const shares = await rwaVaultContract.previewDeposit(ethers_1.ethers.parseEther(assetValue));
-        return shares;
+        const shares = await rwaVaultContract.previewWithdraw(assetValue);
+        return (0, _helpers_1.toShareAmount)(chainId, shares);
     }
     catch (error) {
-        console.error(`Error depositing to RWA Vault:`, error);
-        throw new Error(`Deposit to RWA Vault failed: ${error.message}`);
+        console.error(`Error previewing RWA Vault withdraw:`, error);
+        throw new Error(`RWA Vault withdraw preview failed: ${error.message}`);
     }
 }
 exports.default = previewWithdraw;

package/dist/pools/rwaVault/redeemNFTFromRWAVault.js

@@ -1,19 +1,27 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 const getAdapterAddress_1 = require("./getAdapterAddress");
+/**
+ * Burns vault shares to redeem a specific NFT from the RWA vault.
+ * @param chainId The chain id.
+ * @param adapter The RWA vault adapter id holding the NFT.
+ * @param tokenId The NFT token id.
+ * @param maxSharesBurn The maximum shares to burn, in share token (RWA index token) base units.
+ * @param signer The redeemer.
+ * @returns The transaction receipt.
+ */
 async function redeemNFTFromRWAVault(chainId, adapter, tokenId, maxSharesBurn, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
         const rwaVaultContract = await (0, _helpers_1.getRWAVaultContract)(chainId, signer);
-        const address = (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter).address;
+        const address = (0, getAdapterAddress_1.getAdapterAddress)(chainId, adapter)?.address;
         if (!address) {
             throw new Error(`Adapter ${adapter} not found`);
         }
-        const tx = await rwaVaultContract.redeemNFT(address, tokenId, ethers_1.ethers.parseEther(maxSharesBurn));
+        const tx = await rwaVaultContract.redeemNFT(address, tokenId, maxSharesBurn);
         console.log(`Redeem NFT transaction sent to RWA Vault:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Redeemed NFT from RWA Vault successfully:`, receipt?.hash);

package/dist/pools/stabilityPool/depositToStabilityPool.js

@@ -1,23 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const contracts_1 = require("../../utils/contracts");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
+/**
+ * Deposits rToken into the stability pool and receives deToken.
+ * @param chainId The chain id.
+ * @param amount The rToken amount to deposit, in base units (as returned by `RToken.balanceOf`; reserve asset decimals).
+ * @param signer The depositor.
+ * @returns The transaction receipt.
+ */
 async function depositToStabilityPool(chainId, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
-        const stabilityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "stabilitypool");
-        const abi = (0, artifacts_1.getABI)("stabilitypool");
-        const stabilityPoolContract = new ethers_1.ethers.Contract(stabilityPoolAddress, abi, signer);
-        const amountInWei = ethers_1.ethers.parseEther(amount);
-        const tx = await stabilityPoolContract.deposit(amountInWei.toString(), {
+        const stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(chainId, signer);
+        const tx = await stabilityPoolContract.deposit(amount, {
             nonce: await signer.getNonce(),
         });
         console.log(`Deposit transaction sent to Stability Pool:`, tx.hash);
         const receipt = await tx.wait();
-        console.log(`Deposited ${amount} to Stability Pool successfully:`, receipt?.hash);
+        console.log(`Deposited ${amount} base units to Stability Pool successfully:`, receipt?.hash);
         return receipt;
     }
     catch (error) {

package/dist/pools/stabilityPool/getRawUserDepositsInStabilityPool.js

@@ -1,17 +1,19 @@
 "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");
-// Get the amount of RToken RAW deposit in the lending pool, without the accured interest
+const _helpers_1 = require("./_helpers");
+const _helpers_2 = require("../lendingPool/_helpers");
+/**
+ * Reads the user's raw stability pool deposit, without accrued interest.
+ * @param chainId The chain id.
+ * @param address The user.
+ * @param provider The provider to read with.
+ * @returns The deposit in deToken base units (reserve asset, crvUSD, decimals).
+ */
 async function getRawUserDepositInStabilityPool(chainId, address, provider) {
     try {
-        const stabilityPoolAddress = (0, getContractAddress_1.getContractAddress)(chainId, "stabilitypool");
-        const stabilityPoolABI = (0, artifacts_1.getABI)("stabilitypool");
-        const stabilityPoolContract = new ethers_1.ethers.Contract(stabilityPoolAddress, stabilityPoolABI, provider);
+        const stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(chainId, provider);
         const value = await stabilityPoolContract.getUserDeposit(address);
-        console.log(`User deposits in stability pool: ${ethers_1.ethers.formatEther(value)}`);
-        return value;
+        return (0, _helpers_2.toReserveAmount)(chainId, value);
     }
     catch (error) {
         console.error("Error in getRawUserDepositInStabilityPool:", error);

package/dist/pools/stabilityPool/getStabilityPoolInfo.js

@@ -1,39 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
-const contracts_1 = require("../../utils/contracts");
-const artifacts_1 = require("../../utils/artifacts");
+const _helpers_1 = require("./_helpers");
+const _helpers_2 = require("../lendingPool/_helpers");
+/**
+ * Reads the stability pool's total deposits and, optionally, a user's deposit.
+ * @param chainId The chain id.
+ * @param address The user, or an empty string to skip the user read.
+ * @param provider The provider to read with.
+ * @returns The totals; see `StabilityPoolInfo`.
+ */
 async function getStabilityPoolInfo(chainId, address, provider) {
     try {
-        const stabilityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "stabilitypool");
-        const abi = (0, artifacts_1.getABI)("stabilitypool");
-        const stabilityPoolContract = new ethers_1.ethers.Contract(stabilityPoolAddress, abi, provider);
-        const handleError = (operation) => (error) => {
-            if (error.code === "BAD_DATA") {
-                console.log(`BAD_DATA from getStabilityPoolInfo - ${operation}:`, error.message);
-                return 0n;
-            }
-            throw error;
-        };
-        // Fetch data from StabilityPool
-        const [totalDeposits] = await Promise.all([
-            stabilityPoolContract
-                .getTotalDeposits()
-                .catch(handleError("getTotalDeposits")),
+        const stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(chainId, provider);
+        const [totalDeposits, userDeposit] = await Promise.all([
+            stabilityPoolContract.getTotalDeposits(),
+            address ? stabilityPoolContract.getUserDeposit(address) : Promise.resolve(0n),
         ]);
-        let userDeposit = 0n;
-        if (address) {
-            [userDeposit] = await Promise.all([
-                stabilityPoolContract
-                    .getUserDeposit(address)
-                    .catch(handleError("getUserDeposit")),
-            ]);
-        }
-        const result = {
-            totalDeposits: ethers_1.ethers.formatEther(totalDeposits ?? 0n),
-            userDeposit: ethers_1.ethers.formatEther(userDeposit ?? 0n),
+        return {
+            totalDeposits: (0, _helpers_2.toReserveAmount)(chainId, totalDeposits),
+            userDeposit: (0, _helpers_2.toReserveAmount)(chainId, userDeposit),
         };
-        return result;
     }
     catch (error) {
         console.error("Error fetching stability pool info:", error);

package/dist/pools/stabilityPool/getStabilityPoolTotalDeposits.js

@@ -1,15 +1,18 @@
 "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 _helpers_2 = require("../lendingPool/_helpers");
+/**
+ * Reads the stability pool's total deposits (deToken total supply).
+ * @param chainId The chain id.
+ * @param provider The provider to read with.
+ * @returns The total deposits in deToken base units (reserve asset, crvUSD, decimals).
+ */
 async function getStabilityPoolTotalDeposits(chainId, provider) {
     try {
-        const stabilityPoolAddress = (0, contracts_1.getContractAddress)(chainId, "stabilitypool");
-        const abi = (0, artifacts_1.getABI)("stabilitypool");
-        const stabilityPoolContract = new ethers_1.ethers.Contract(stabilityPoolAddress, abi, provider);
+        const stabilityPoolContract = await (0, _helpers_1.getStabilityPoolContract)(chainId, provider);
         const totalDeposits = await stabilityPoolContract.getTotalDeposits();
-        return totalDeposits;
+        return (0, _helpers_2.toReserveAmount)(chainId, totalDeposits);
     }
     catch (error) {
         console.error("Error fetching total deposits:", error);