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

package/dist/index.js

@@ -1,7 +1,22 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const RPCLibrary_1 = __importDefault(require("./RPCLibrary"));
+__exportStar(require("./utils/amount"), exports);
 exports.default = RPCLibrary_1.default;

package/dist/methods/approveToken.js

@@ -2,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../contracts/getContractAddress");
+/**
+ * Approves `spender` to pull a token from the signer.
+ * @param chainId The chain id.
+ * @param tokenSymbol The token key in the chain config.
+ * @param spender The address to approve.
+ * @param amount The allowance in the token's base units. Pass `ethers.MaxUint256` for an unlimited approval.
+ * @param signer The token owner.
+ * @returns The transaction receipt.
+ */
 const approveToken = async (chainId, tokenSymbol, spender, amount, signer) => {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -12,8 +21,7 @@ const approveToken = async (chainId, tokenSymbol, spender, amount, signer) => {
     ];
     const tokenContract = new ethers_1.ethers.Contract(tokenAddress, tokenABI, signer);
     try {
-        const amountInWei = ethers_1.ethers.parseEther(amount);
-        const tx = await tokenContract.approve(spender, amountInWei);
+        const tx = await tokenContract.approve(spender, amount);
         console.log(`Approval transaction sent:`, tx.hash);
         const receipt = await tx.wait();
         console.log(`Approved ${amount} ${tokenSymbol} for ${spender} successfully:`, receipt.transactionHash);

package/dist/methods/commons/checkAllowance.js

@@ -2,13 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAllowance = void 0;
 const contracts_1 = require("../../utils/contracts");
+const amount_1 = require("../../utils/amount");
+/**
+ * Reads how much of a token `spenderAddress` may pull from `address`.
+ * @param chainId The chain id.
+ * @param tokenId The token key in the chain config.
+ * @param address The token owner.
+ * @param spenderAddress The approved spender.
+ * @param provider The provider to read with.
+ * @returns The allowance in base units with the token's decimals.
+ */
 const checkAllowance = async (chainId, tokenId, address, spenderAddress, provider) => {
     let tokenAddress = (0, contracts_1.getContractAddress)(chainId, tokenId);
     console.log(`[commons/checkAllowance] Checking allowance for ${address} to ${spenderAddress} on ${chainId} ${tokenId}:${tokenAddress}`);
     try {
         const tokenContract = (0, contracts_1.getContract)(chainId, tokenId, provider);
         const allowance = await tokenContract.allowance(address, spenderAddress);
-        return allowance;
+        return (0, amount_1.toTokenAmount)(chainId, tokenId, allowance);
     }
     catch (error) {
         console.error(`Error calling allowance: ${error}`);

package/dist/methods/getAssetBalance.js

@@ -3,23 +3,33 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAssetBalance = void 0;
 const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../contracts/getContractAddress");
+const amount_1 = require("../utils/amount");
+/**
+ * Reads a wallet's balance of a configured asset or native ETH.
+ * @param chainId The chain id.
+ * @param address The wallet address.
+ * @param assetId The asset key in the chain config, or `"eth"` for native ETH.
+ * @param signer A connected signer whose provider is used for the read.
+ * @returns The balance in base units with the asset's decimals (18 and `"ETH"` for native ETH).
+ */
 const getAssetBalance = async (chainId, address, assetId, signer) => {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
+        const provider = signer.provider;
+        if (!provider) {
+            throw new Error("Signer has no provider");
+        }
         if (assetId === "eth") {
-            const provider = signer.provider;
-            // handle getBalance do not exist in ethers.js, check if not under the other method TODO FIXME
-            const balance = (await provider.getBalance(address)).toString();
-            return balance;
+            return (0, amount_1.toAmount)(await provider.getBalance(address), amount_1.WAD_DECIMALS, "ETH");
         }
         // @ts-ignore
         const tokenAddress = (0, getContractAddress_1.getContractAddress)(chainId, assetId);
         const abi = ["function balanceOf(address) view returns (uint256)"];
-        const contract = new ethers_1.ethers.Contract(tokenAddress, abi, signer);
+        const contract = new ethers_1.ethers.Contract(tokenAddress, abi, provider);
         const balance = await contract.balanceOf(address);
-        return ethers_1.ethers.formatEther(balance);
+        return (0, amount_1.toTokenAmount)(chainId, assetId, balance);
     }
     catch (error) {
         console.error(`Error in getAssetBalance for ${assetId}:`, error);

package/dist/minter/_helpers.js

@@ -4,10 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getMinterContract = getMinterContract;
+exports.toRaacAmount = toRaacAmount;
 const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../configs/chains"));
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
+const amount_1 = require("../utils/amount");
 async function getMinterContract(chainId, runner) {
     if (!runner) {
         const rpc = chains_1.default[chainId].rpcs[0];
@@ -17,3 +19,12 @@ async function getMinterContract(chainId, runner) {
     const abi = (0, artifacts_1.getABI)("raacminter");
     return new ethers_1.ethers.Contract(address, abi, runner);
 }
+/**
+ * Builds a RAAC `TokenAmount` from the registry (`raactoken` decimals and symbol).
+ * @param chainId The chain id.
+ * @param value The raw RAAC amount.
+ * @returns The amount.
+ */
+function toRaacAmount(chainId, value) {
+    return (0, amount_1.toTokenAmount)(chainId, "raactoken", value);
+}

package/dist/minter/calculateScheduledMintableAmount.js

@@ -6,9 +6,11 @@ const _helpers_1 = require("./_helpers");
  * Returns the total RAAC scheduled to be mintable between two timestamps,
  * applying the geometric weekly emission reduction (see EmissionSchedule.sol).
  * Both `startPeriod` and `endPeriod` are absolute UNIX timestamps in seconds.
+ * @returns The RAAC amount, with the registry `raactoken` decimals and symbol.
  */
 const calculateScheduledMintableAmount = async (chainId, startPeriod, endPeriod, provider) => {
     const contract = await (0, _helpers_1.getMinterContract)(chainId, provider);
-    return contract.calculateScheduledMintableAmount(startPeriod, endPeriod);
+    const amount = await contract.calculateScheduledMintableAmount(startPeriod, endPeriod);
+    return (0, _helpers_1.toRaacAmount)(chainId, amount);
 };
 exports.calculateScheduledMintableAmount = calculateScheduledMintableAmount;

package/dist/minter/get.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 /**
  * Read the RAAC minter's global state. Mirrors the new RAACMinter contract — the
@@ -8,6 +7,9 @@ const _helpers_1 = require("./_helpers");
  * fields no longer exist; emissions are now driven by a time-based geometric
  * schedule (see `EmissionSchedule.sol`) and routed through weighted distribution
  * pools (see `getDistributionPools`).
+ * @param chainId The chain id.
+ * @param provider Optional provider; defaults to the chain's first configured RPC.
+ * @returns The minter state; RAAC amounts are `TokenAmount`s with the registry `raactoken` decimals and symbol.
  */
 async function get(chainId, provider) {
     const contract = await (0, _helpers_1.getMinterContract)(chainId, provider);
@@ -33,19 +35,12 @@ async function get(chainId, provider) {
         raacToken,
         mintingStartAtTimestamp: Number(mintingStartAtTimestamp),
         lastUpdateBlockTimestamp: Number(lastUpdateBlockTimestamp),
-        excessTokens: ethers_1.ethers.formatEther(excessTokens),
-        maxSupply: ethers_1.ethers.formatEther(maxSupply),
+        excessTokens: (0, _helpers_1.toRaacAmount)(chainId, excessTokens),
+        maxSupply: (0, _helpers_1.toRaacAmount)(chainId, maxSupply),
         totalWeight,
         distributionPoolCount: distributionPools.length,
         distributionPools,
         paused,
-        raw: {
-            mintingStartAtTimestamp,
-            lastUpdateBlockTimestamp,
-            excessTokens,
-            maxSupply,
-            totalWeight,
-        },
     };
 }
 exports.default = get;

package/dist/minter/getApy.js

@@ -12,6 +12,9 @@ const SECONDS_PER_YEAR = 365n * 24n * 60n * 60n;
  * by current total RAAC supply.
  *
  * Returns zeros if minting hasn't been activated or supply is 0.
+ * @param chainId The chain id.
+ * @param provider Optional provider; defaults to the chain's first configured RPC.
+ * @returns The emission figures and the APY.
  */
 async function getApy(chainId, provider) {
     const contract = await (0, _helpers_1.getMinterContract)(chainId, provider);
@@ -21,9 +24,9 @@ async function getApy(chainId, provider) {
     ]);
     if (mintingStart === 0n) {
         return {
-            emissionPerSecond: 0n,
-            yearlyEmission: 0n,
-            totalSupply: 0n,
+            emissionPerSecond: (0, _helpers_1.toRaacAmount)(chainId, 0n),
+            yearlyEmission: (0, _helpers_1.toRaacAmount)(chainId, 0n),
+            totalSupply: (0, _helpers_1.toRaacAmount)(chainId, 0n),
             apy: 0,
             apyBps: 0n,
         };
@@ -45,18 +48,18 @@ async function getApy(chainId, provider) {
     const totalSupply = totalSupplyResult;
     if (totalSupply === 0n) {
         return {
-            emissionPerSecond: perSecond,
-            yearlyEmission,
-            totalSupply,
+            emissionPerSecond: (0, _helpers_1.toRaacAmount)(chainId, perSecond),
+            yearlyEmission: (0, _helpers_1.toRaacAmount)(chainId, yearlyEmission),
+            totalSupply: (0, _helpers_1.toRaacAmount)(chainId, totalSupply),
             apy: 0,
             apyBps: 0n,
         };
     }
     const apyBps = (yearlyEmission * 10000n) / totalSupply;
     return {
-        emissionPerSecond: perSecond,
-        yearlyEmission,
-        totalSupply,
+        emissionPerSecond: (0, _helpers_1.toRaacAmount)(chainId, perSecond),
+        yearlyEmission: (0, _helpers_1.toRaacAmount)(chainId, yearlyEmission),
+        totalSupply: (0, _helpers_1.toRaacAmount)(chainId, totalSupply),
         apy: Number(apyBps) / 100,
         apyBps,
     };

package/dist/minter/getDistributionPools.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDistributionPools = void 0;
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 /**
  * Returns full distribution-pool table along with each pool's share of
  * `totalWeight`. Iterates `distributionPools(i)` until it reverts (mirrors how
  * the contract stores the dynamic array) and reads `poolInfo(pool)` for each.
+ * @param chainId The chain id.
+ * @param provider Optional provider; defaults to the chain's first configured RPC.
+ * @returns One record per registered pool.
  */
 const getDistributionPools = async (chainId, provider) => {
     const contract = await (0, _helpers_1.getMinterContract)(chainId, provider);
@@ -29,8 +31,7 @@ const getDistributionPools = async (chainId, provider) => {
         return {
             pool,
             weight,
-            pendingRewards: ethers_1.ethers.formatEther(pendingRewards),
-            pendingRewardsRaw: pendingRewards,
+            pendingRewards: (0, _helpers_1.toRaacAmount)(chainId, pendingRewards),
             exists,
             weightShare,
         };

package/dist/minter/getEmissionPerSecond.js

@@ -6,12 +6,13 @@ const _helpers_1 = require("./_helpers");
  * Returns the current per-second RAAC emission. Derived by sampling
  * `calculateScheduledMintableAmount(now, now + 1)` at the latest block timestamp.
  * Returns 0 if minting hasn't been activated yet.
+ * @returns The RAAC emitted per second, with the registry `raactoken` decimals and symbol.
  */
 const getEmissionPerSecond = async (chainId, provider) => {
     const contract = await (0, _helpers_1.getMinterContract)(chainId, provider);
     const mintingStart = await contract.mintingStartAtTimestamp();
     if (mintingStart === 0n)
-        return 0n;
+        return (0, _helpers_1.toRaacAmount)(chainId, 0n);
     const runner = contract.runner;
     if (!runner || !runner.provider) {
         throw new Error("getEmissionPerSecond: minter contract has no provider");
@@ -20,6 +21,7 @@ const getEmissionPerSecond = async (chainId, provider) => {
     if (!block)
         throw new Error("getEmissionPerSecond: could not fetch latest block");
     const now = BigInt(block.timestamp);
-    return contract.calculateScheduledMintableAmount(now, now + 1n);
+    const perSecond = await contract.calculateScheduledMintableAmount(now, now + 1n);
+    return (0, _helpers_1.toRaacAmount)(chainId, perSecond);
 };
 exports.getEmissionPerSecond = getEmissionPerSecond;

package/dist/minter/getPoolInfo.js

@@ -1,10 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPoolInfo = void 0;
-const ethers_1 = require("ethers");
 const _helpers_1 = require("./_helpers");
 /**
  * Read the per-pool record from the minter's `poolInfo` mapping.
+ * @param chainId The chain id.
+ * @param pool The pool address.
+ * @param provider Optional provider; defaults to the chain's first configured RPC.
+ * @returns The pool record.
  */
 const getPoolInfo = async (chainId, pool, provider) => {
     const contract = await (0, _helpers_1.getMinterContract)(chainId, provider);
@@ -15,8 +18,7 @@ const getPoolInfo = async (chainId, pool, provider) => {
     return {
         pool,
         weight,
-        pendingRewards: ethers_1.ethers.formatEther(pendingRewards),
-        pendingRewardsRaw: pendingRewards,
+        pendingRewards: (0, _helpers_1.toRaacAmount)(chainId, pendingRewards),
         exists,
     };
 };

package/dist/nfts/_helpers.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_NFT_ASSET_ID = void 0;
+exports.getNftAssetId = getNftAssetId;
+const chains_1 = require("../configs/chains");
+/** Config asset id used when a chain's `nfts.raacnft` entry does not name its payment token. */
+exports.DEFAULT_NFT_ASSET_ID = "crvusd";
+/**
+ * The config asset id of the token RAACNFT is paid in, from `nfts.raacnft.asset`.
+ * House prices and mint prices are denominated in it.
+ * @param chainId The chain id.
+ * @returns The asset id.
+ */
+function getNftAssetId(chainId) {
+    const nft = chains_1.configs[chainId]?.nfts?.raacnft;
+    return nft?.asset ?? exports.DEFAULT_NFT_ASSET_ID;
+}

package/dist/nfts/getHousePrice.js

@@ -1,15 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
+const amount_1 = require("../utils/amount");
+/**
+ * Reads the house price of a RAAC NFT, without the mint fee.
+ * @param chainId The chain id.
+ * @param tokenId The RAAC NFT token id.
+ * @param provider The provider to read with.
+ * @returns The price in the NFT's payment token, from the chain config (`nfts.raacnft.asset`).
+ */
 async function getHousePrice(chainId, tokenId, provider) {
     try {
         const raacNFTAddress = (0, contracts_1.getContractAddress)(chainId, "raacnft");
         const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
         const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, provider);
         const price = await raacNFTContract.getHousePrice(tokenId);
-        return ethers_1.ethers.formatEther(price);
+        return (0, amount_1.toTokenAmount)(chainId, (0, _helpers_1.getNftAssetId)(chainId), price);
     }
     catch (error) {
         console.error("Error getting house price:", error);

package/dist/nfts/getMintFeePercentage.js

@@ -3,6 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
+/**
+ * Reads the RAAC NFT mint fee.
+ * @param chainId The chain id.
+ * @param provider The provider to read with.
+ * @returns The mint fee in basis points (10000 = 100%), as `MINT_FEE_PERCENTAGE` stores it.
+ */
 async function getMintFeePercentage(chainId, provider) {
     if (!provider) {
         throw new Error("Wallet not connected");
@@ -11,9 +17,7 @@ async function getMintFeePercentage(chainId, provider) {
         const raacNFTAddress = (0, contracts_1.getContractAddress)(chainId, "raacnft");
         const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
         const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, provider);
-        const percentage = (await raacNFTContract.MINT_FEE_PERCENTAGE()) / BigInt(10e5);
-        console.log(`Retrieved mint fee percentage: ${percentage}`);
-        return percentage;
+        return await raacNFTContract.MINT_FEE_PERCENTAGE();
     }
     catch (error) {
         console.log("Error retrieving mint fee percentage", error);

package/dist/nfts/getMintPrice.js

@@ -1,9 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
+const _helpers_1 = require("./_helpers");
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
-// This is the total price: includes the mint price and the mint fee
+const amount_1 = require("../utils/amount");
+/**
+ * Reads the total price to mint a RAAC NFT: the house price plus the mint fee.
+ * @param chainId The chain id.
+ * @param tokenId The RAAC NFT token id.
+ * @param provider The provider to read with.
+ * @returns The price in the NFT's payment token, from the chain config (`nfts.raacnft.asset`).
+ */
 async function getMintPrice(chainId, tokenId, provider) {
     if (!provider) {
         throw new Error("Wallet not connected");
@@ -13,12 +21,7 @@ async function getMintPrice(chainId, tokenId, provider) {
         const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
         const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, provider);
         const price = await raacNFTContract.getMintPrice(tokenId);
-        const token = await raacNFTContract.token();
-        const tokenContract = new ethers_1.Contract(token, ["function decimals() view returns (uint8)"], provider);
-        const decimals = await tokenContract.decimals();
-        const formattedValue = ethers_1.ethers.formatUnits(price, await decimals.decimals());
-        console.log(`Retrieved house price for ${tokenId}: ${formattedValue}`);
-        return { price, decimals };
+        return (0, amount_1.toTokenAmount)(chainId, (0, _helpers_1.getNftAssetId)(chainId), price);
     }
     catch (error) {
         console.error("Error retrieving mint price for " + tokenId, error);

package/dist/nfts/mint.js

@@ -3,6 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../utils/contracts");
 const artifacts_1 = require("../utils/artifacts");
+/**
+ * Mints a RAAC NFT, paying the mint price in the NFT's payment token (crvUSD). The signer must have approved the
+ * RAAC NFT contract for at least `amount`.
+ * @param chainId The chain id.
+ * @param tokenId The RAAC NFT token id.
+ * @param amount The maximum payment in payment token base units (see `getMintPrice`).
+ * @param signer The signer sending the transaction.
+ * @returns The transaction.
+ */
 async function mint(chainId, tokenId, amount, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
@@ -11,11 +20,10 @@ async function mint(chainId, tokenId, amount, signer) {
         const raacNFTAddress = (0, contracts_1.getContractAddress)(chainId, "raacnft");
         const raacNFTABI = (0, artifacts_1.getABI)("raacnft");
         const raacNFTContract = new ethers_1.ethers.Contract(raacNFTAddress, raacNFTABI, signer);
-        const amountInWei = ethers_1.ethers.parseEther(amount);
-        console.log(`Minting RAAC NFT with token ID ${tokenId} for ${amount} tokens`);
-        const tx = await raacNFTContract.mint(tokenId, amountInWei);
+        console.log(`Minting RAAC NFT with token ID ${tokenId} for ${amount} base units`);
+        const tx = await raacNFTContract.mint(tokenId, amount);
         await tx.wait();
-        console.log(`Minted RAAC NFT with token ID ${tokenId} for ${amount} tokens`);
+        console.log(`Minted RAAC NFT with token ID ${tokenId} for ${amount} base units`);
         return tx;
     }
     catch (error) {

package/dist/pools/lendingPool/_helpers.js

@@ -3,6 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.DEFAULT_RESERVE_ASSET_ID = void 0;
+exports.getReserveAssetId = getReserveAssetId;
+exports.toReserveAmount = toReserveAmount;
 exports.encodeERC721 = encodeERC721;
 exports.decodeERC721 = decodeERC721;
 exports.encodeERC20 = encodeERC20;
@@ -13,17 +16,49 @@ 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 used when a chain's `pools.lendingpool` entry does not name its reserve asset. */
+exports.DEFAULT_RESERVE_ASSET_ID = "crvusd";
+/**
+ * The config asset id of a chain's lending pool reserve asset, from `pools.lendingpool.asset`.
+ * rToken, deToken and debt amounts share the reserve asset's decimals.
+ * @param chainId The chain id.
+ * @returns The asset id.
+ */
+function getReserveAssetId(chainId) {
+    const pool = chains_1.configs[chainId]?.pools?.lendingpool;
+    return pool?.asset ?? exports.DEFAULT_RESERVE_ASSET_ID;
+}
+/**
+ * Wraps a reserve asset denominated value (reserve asset, rToken, deToken or debt amount; these tokens mirror the reserve asset's decimals).
+ * @param chainId The chain id.
+ * @param value The value in reserve asset base units.
+ * @returns The amount with the reserve asset's registry decimals and symbol.
+ */
+function toReserveAmount(chainId, value) {
+    return (0, amount_1.toTokenAmount)(chainId, getReserveAssetId(chainId), 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 getLendingPoolAdapterByAddress(chainId, address) {
     const adaptersConfig = chains_1.configs[chainId].adapters;

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

@@ -2,15 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const artifacts_1 = require("../../../../utils/artifacts");
-async function getERC20AdapterBalance(adapterAddress, userAddress, signer) {
+const amount_1 = require("../../../../utils/amount");
+/**
+ * Reads how much of the adapter's ERC20 collateral a user has deposited.
+ * @param chainId The chain id, used to look up the adapter token's decimals in the token registry.
+ * @param adapterAddress The ERC20 asset adapter address.
+ * @param userAddress The user.
+ * @param signer The signer to read with.
+ * @returns The deposited balance in base units of the adapter's token, with its registry decimals and symbol (18 decimals if the token is not in the registry).
+ */
+async function getERC20AdapterBalance(chainId, adapterAddress, userAddress, signer) {
     if (!signer) {
         throw new Error("Wallet not connected");
     }
     try {
         const abi = (0, artifacts_1.getABI)("erc20assetadapter");
         const adapterContract = new ethers_1.ethers.Contract(adapterAddress, abi, signer);
-        const balance = await adapterContract.balanceOf(userAddress);
-        return balance.toString();
+        const [balance, token] = await Promise.all([
+            adapterContract.balanceOf(userAddress),
+            adapterContract.token(),
+        ]);
+        return (0, amount_1.toTokenAmount)(chainId, token, balance);
     }
     catch (error) {
         console.error(`Error getting ERC20 Adapter balance:`, error);

package/dist/pools/lendingPool/borrowFromLendingPool.js

@@ -2,16 +2,26 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
-const ethers_1 = require("ethers");
+/**
+ * Borrows the reserve asset against a collateral position.
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param amount The amount to borrow, in reserve asset (crvUSD) base units.
+ * @param data The adapter-encoded position data.
+ * @param signer The borrower.
+ * @returns Whether the transaction succeeded.
+ */
 async function borrowFromLendingPool(chainId, adapterName, amount, data, signer) {
+    if (!signer) {
+        throw new Error("Signer is required");
+    }
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
         if (!adapterAddress) {
             throw new Error(`Adapter ${adapterName} not found for chain ${chainId}`);
         }
-        const amountInWei = ethers_1.ethers.parseEther(amount);
-        const tx = await lendingPoolContract.borrow(adapterAddress, data, amountInWei);
+        const tx = await lendingPoolContract.borrow(adapterAddress, data, amount);
         const receipt = await tx.wait();
         return receipt.status === 1;
     }

package/dist/pools/lendingPool/borrowFromLendingPoolWithInsurance.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 getAdapterAddress_1 = require("./getAdapterAddress");
 const _helpers_1 = require("./_helpers");
 const checkAllowance_1 = __importDefault(require("../../methods/commons/checkAllowance"));
@@ -11,7 +10,19 @@ const approveAsset_1 = __importDefault(require("../../wallet/assets/approveAsset
 const calculateInsuranceFee_1 = __importDefault(require("./calculateInsuranceFee"));
 const contracts_1 = require("../../utils/contracts");
 // TODO: interface changed
+/**
+ * Borrows the reserve asset with insurance, approving the insurance fee in crvUSD first when needed.
+ * @param chainId The chain id.
+ * @param adapterName The lending pool adapter holding the collateral.
+ * @param amount The amount to borrow, in reserve asset (crvUSD) base units.
+ * @param data The adapter-encoded position data.
+ * @param signer The borrower.
+ * @returns Whether the transaction succeeded.
+ */
 async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount, data, signer) {
+    if (!signer) {
+        throw new Error("Signer is required");
+    }
     try {
         const lendingPoolContract = await (0, _helpers_1.getLendingPoolContract)(chainId, signer);
         const adapterAddress = (0, getAdapterAddress_1.getAdapterAddressOnly)(chainId, adapterName);
@@ -22,25 +33,24 @@ async function borrowFromLendingPoolWithInsurance(chainId, adapterName, amount,
         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`);
+        const { value: insuranceFee } = await (0, calculateInsuranceFee_1.default)(chainId, adapterName, userAddress, data, amount, signer.provider);
+        console.log(`Insurance fee required: ${insuranceFee} crvUSD base units`);
         // 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);
+        const { value: 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`);
+            feeCollectorAddress, amountToApprove, signer);
+            console.log(`Approved ${insuranceFee} crvUSD base units for insurance fee`);
         }
         else {
-            console.log(`Already approved sufficient crvUSD for insurance fee: ${ethers_1.ethers.formatEther(currentAllowance)}`);
+            console.log(`Already approved sufficient crvUSD for insurance fee: ${currentAllowance} base units`);
         }
         // Now proceed with the borrow transaction
-        const amountInWei = ethers_1.ethers.parseEther(amount);
-        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amountInWei);
+        const tx = await lendingPoolContract.borrowWithInsurance(adapterAddress, data, amount);
         const receipt = await tx.wait();
         console.log(`Borrowed with insurance successfully. Transaction hash: ${receipt?.hash}`);
         return receipt.status === 1;