@raac/rpc 2.0.0-beta.20 → 2.0.0-beta.21

package/dist/RPCLibrary.js

@@ -101,6 +101,7 @@ const findContract_1 = require("./contracts/findContract");
 const decodeCall_1 = require("./contracts/decodeCall");
 const resolveName_1 = require("./contracts/resolveName");
 const getTokenMetadata_1 = require("./contracts/getTokenMetadata");
+const resolveTokenInfo_1 = require("./contracts/resolveTokenInfo");
 // House Prices
 const getLatestPrice_1 = __importDefault(require("./contracts/housePrices/getLatestPrice"));
 const setOracle_1 = __importDefault(require("./contracts/housePrices/setOracle"));
@@ -558,6 +559,7 @@ class RPCLibrary {
             resolveName: resolveName_1.resolveName,
             resolveNames: resolveName_1.resolveNames,
             getTokenMetadata: getTokenMetadata_1.getTokenMetadata,
+            resolveTokenInfo: resolveTokenInfo_1.resolveTokenInfo,
             feeCollector: {
                 claimRewardFromPool: claimRewardFromPool_1.default,
                 getState: getState_2.default,

package/dist/contracts/governance/gauge/getUserGaugeState.js

@@ -8,21 +8,22 @@ const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../../../configs/chains"));
 const _helpers_1 = require("../gaugeSystems/_helpers");
 const amount_1 = require("../../../utils/amount");
+const resolveTokenInfo_1 = require("../../resolveTokenInfo");
 const _tokens_1 = require("./_tokens");
 const RAW_BALANCE_OF_ABI = ["function rawBalanceOf(address account) view returns (uint256)"];
 const tokenState = async (chainId, token, user, spender, provider) => {
     const contract = new ethers_1.ethers.Contract(token, _tokens_1.ERC20_ABI, provider);
-    const [balance, allowance] = await Promise.all([
+    const [balance, allowance, { decimals, symbol }] = await Promise.all([
         contract.balanceOf(user),
         contract.allowance(user, spender),
+        (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, token, provider),
     ]);
-    const balanceAmount = (0, amount_1.toTokenAmount)(chainId, token, balance);
     return {
         address: ethers_1.ethers.getAddress(token),
-        symbol: balanceAmount.symbol,
-        decimals: balanceAmount.decimals,
-        balance: balanceAmount,
-        allowance: (0, amount_1.toTokenAmount)(chainId, token, allowance),
+        symbol,
+        decimals,
+        balance: (0, amount_1.toAmount)(balance, decimals, symbol),
+        allowance: (0, amount_1.toAmount)(allowance, decimals, symbol),
         spender: ethers_1.ethers.getAddress(spender),
     };
 };
@@ -34,7 +35,7 @@ const tokenState = async (chainId, token, user, spender, provider) => {
  * @param gaugeAddressOrId - Address of the gauge contract or its config ID.
  * @param user - The wallet.
  * @param provider - Optional ethers.js Provider instance.
- * @returns The wallet's gauge state. Every amount carries its own token's registry decimals and symbol.
+ * @returns The wallet's gauge state. Every amount carries its own token's decimals and symbol.
  */
 const getUserGaugeState = async (chainId, gaugeAddressOrId, user, provider) => {
     if (!provider) {
@@ -47,6 +48,6 @@ const getUserGaugeState = async (chainId, gaugeAddressOrId, user, provider) => {
         tokenState(chainId, stakingToken, user, gauge, provider),
         underlying ? tokenState(chainId, underlying, user, stakingToken, provider) : Promise.resolve(null),
     ]);
-    return { gauge, staked: (0, amount_1.toTokenAmount)(chainId, stakingToken, staked), stakingToken: staking, underlying: wrappable };
+    return { gauge, staked: (0, amount_1.toAmount)(staked, staking.decimals, staking.symbol), stakingToken: staking, underlying: wrappable };
 };
 exports.getUserGaugeState = getUserGaugeState;

package/dist/contracts/psm/getVaultInfo.js

@@ -65,18 +65,14 @@ async function getVaultInfo(chainId, vaultKeyOrAddress, userAddress, provider) {
         let user = null;
         if (userAddress) {
             const baseAssetContract = (0, _helpers_1.getTokenReaderContract)(baseAsset, provider);
-            const [shareBalance, savingsTokenBalance, baseAssetBalance, redeemRequest, savingsTokenAllowance, baseAssetAllowance] = await Promise.all([
+            const [shareBalance, redeemRequest, savingsTokenAllowance, baseAssetAllowance] = await Promise.all([
                 vault.balanceOf(userAddress),
-                savingsTokenContract.balanceOf(userAddress),
-                baseAssetContract.balanceOf(userAddress),
                 vault.redeemRequests(userAddress),
                 savingsTokenContract.allowance(userAddress, contractAddress),
                 baseAssetContract.allowance(userAddress, contractAddress),
             ]);
             user = {
                 shareBalance: (0, amount_1.toAmount)(shareBalance, Number(vaultDecimals), entry.id),
-                savingsTokenBalance: (0, amount_1.toTokenAmount)(chainId, "susds", savingsTokenBalance),
-                baseAssetBalance: (0, amount_1.toTokenAmount)(chainId, "pmusd", baseAssetBalance),
                 redeemRequest: {
                     shares: (0, amount_1.toAmount)(redeemRequest[0], Number(vaultDecimals), entry.id),
                     exitTime: Number(redeemRequest[1]),

package/dist/contracts/resolveTokenInfo.js

@@ -0,0 +1,65 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveTokenInfo = void 0;
+const ethers_1 = require("ethers");
+const chains_1 = __importDefault(require("../configs/chains"));
+const amount_1 = require("../utils/amount");
+const rpcError_1 = require("../utils/rpcError");
+const ERC20_METADATA_ABI = ["function symbol() view returns (string)", "function decimals() view returns (uint8)"];
+/** The address Curve pools (and others) list native ETH under. */
+const NATIVE_ETH_PLACEHOLDER = "0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee";
+/** Tokens read from the chain, keyed `chainId:address`. Holds the request, so concurrent callers share it. */
+const resolved = new Map();
+/**
+ * A token's decimals and symbol for any address: the chain config registry first, then the token itself for an address
+ * the registry does not list. An on-chain read happens once per chain and token; a failed read is not remembered, so
+ * the next call tries again.
+ *
+ * Use this wherever a method takes a token address it cannot know in advance. Methods that take an asset key keep
+ * using `toTokenAmount`, which reads only the registry.
+ *
+ * @param chainId The chain id.
+ * @param idOrAddress An asset key from the registry, or a token contract address, any casing.
+ * @param provider Optional ethers.js Provider instance.
+ * @returns The token's decimals, and its symbol when it has one: a token without a readable `symbol()` gets none.
+ * @throws If an asset key is not in the registry, or an unlisted token has no readable `decimals()`.
+ */
+const resolveTokenInfo = (chainId, idOrAddress, provider) => {
+    const known = (0, amount_1.getTokenInfo)(chainId, idOrAddress);
+    if (known)
+        return Promise.resolve(known);
+    if (!ethers_1.ethers.isAddress(idOrAddress)) {
+        return Promise.reject(new Error(`Token ${idOrAddress} is not in the asset registry of chain ${chainId}`));
+    }
+    const address = idOrAddress.toLowerCase();
+    if (address === NATIVE_ETH_PLACEHOLDER)
+        return Promise.resolve({ decimals: amount_1.WAD_DECIMALS, symbol: "ETH" });
+    const key = `${chainId}:${address}`;
+    let info = resolved.get(key);
+    if (!info) {
+        info = readTokenInfo(chainId, address, provider);
+        resolved.set(key, info);
+        info.catch(() => resolved.delete(key));
+    }
+    return info;
+};
+exports.resolveTokenInfo = resolveTokenInfo;
+const readTokenInfo = async (chainId, address, provider) => {
+    if (!provider) {
+        provider = new ethers_1.ethers.JsonRpcProvider(chains_1.default[chainId].rpcs[0]);
+    }
+    try {
+        const token = new ethers_1.ethers.Contract(address, ERC20_METADATA_ABI, provider);
+        const [decimals, symbol] = await Promise.all([
+            token.decimals(),
+            token.symbol().catch(() => undefined),
+        ]);
+        return symbol === undefined ? { decimals: Number(decimals) } : { decimals: Number(decimals), symbol };
+    }
+    catch (error) {
+        throw (0, rpcError_1.toRpcError)("contracts.resolveTokenInfo", error, { chainId, address });
+    }
+};

package/dist/contracts/yearn/vault/getUserInfo.js

@@ -6,17 +6,17 @@ const amount_1 = require("../../../utils/amount");
 const rpcError_1 = require("../../../utils/rpcError");
 const _helpers_1 = require("./_helpers");
 const ERC20_READ_ABI = [
-    "function balanceOf(address) view returns (uint256)",
     "function allowance(address owner, address spender) view returns (uint256)",
 ];
 /**
- * Gets a user's position in a Yearn V3 vault, plus their vault asset balance and allowance.
+ * Gets a user's position in a Yearn V3 vault, plus their vault asset allowance. Read the wallet's asset balance with
+ * `wallet.assets.getBalance`.
  *
  * @param chainId - The chain/network to use.
  * @param vaultAddressOrId - The vault's key in the chain config's `yearn` section (e.g. "spmusd"), or its address.
  * @param account - Address of the user.
  * @param provider - Optional ethers.js Provider instance.
- * @returns The user's shares, their asset value, balances, allowance and limits, in base units.
+ * @returns The user's shares, their asset value, allowance and limits, in base units.
  */
 async function getUserInfo(chainId, vaultAddressOrId, account, provider) {
     const { entry, contract } = (0, _helpers_1.getYearnVaultContract)(chainId, vaultAddressOrId, provider);
@@ -24,9 +24,8 @@ async function getUserInfo(chainId, vaultAddressOrId, account, provider) {
     const shares = (value) => (0, amount_1.toTokenAmount)(chainId, entry.contract, value);
     try {
         const token = new ethers_1.ethers.Contract(await contract.asset(), ERC20_READ_ABI, contract.runner);
-        const [userShares, assetBalance, assetAllowance, maxDeposit, maxWithdraw, maxRedeem] = await Promise.all([
+        const [userShares, assetAllowance, maxDeposit, maxWithdraw, maxRedeem] = await Promise.all([
             contract.balanceOf(account),
-            token.balanceOf(account),
             token.allowance(account, entry.contract),
             contract.maxDeposit(account),
             contract.maxWithdraw(account),
@@ -35,7 +34,6 @@ async function getUserInfo(chainId, vaultAddressOrId, account, provider) {
         return {
             shares: shares(userShares),
             assets: asset(await contract.convertToAssets(userShares)),
-            assetBalance: asset(assetBalance),
             assetAllowance: asset(assetAllowance),
             maxDeposit: asset(maxDeposit),
             maxWithdraw: asset(maxWithdraw),

package/dist/contracts/zap/aladdin/inspectCurvePool.js

@@ -7,6 +7,7 @@ exports.inspectCurvePool = void 0;
 const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../../../configs/chains"));
 const rpcError_1 = require("../../../utils/rpcError");
+const resolveTokenInfo_1 = require("../../resolveTokenInfo");
 const _types_1 = require("./_types");
 /**
  * The zap's Curve swap calls by pool type (TokenZapLogic.swap), for pools indexed by plain `coins(i)`. The base, A, Y,
@@ -19,7 +20,6 @@ const SWAP_SIGNATURES = [
     [_types_1.AladdinPoolType.CurveBasePool, "exchange(int128,int128,uint256,uint256)"],
 ];
 const MAX_COINS = 8;
-const ERC20 = ["function symbol() view returns (string)", "function decimals() view returns (uint8)"];
 /**
  * Reads a Curve pool that may not be in the chain config, so a zap route can be built through it: its coins in index
  * order with their symbols, and which zap pool types it can swap as. The types come from the swap function selectors in
@@ -53,9 +53,8 @@ const inspectCurvePool = async (chainId, pool, provider) => {
         if (!addresses.length)
             throw new Error(`${address} has no coins(0); it is not a Curve pool this can read`);
         const coins = await Promise.all(addresses.map(async (coin) => {
-            const erc20 = new ethers_1.ethers.Contract(coin, ERC20, provider);
-            const [symbol, decimals] = await Promise.all([erc20.symbol().catch(() => "?"), erc20.decimals().then(Number).catch(() => 18)]);
-            return { address: coin, symbol, decimals };
+            const { symbol, decimals } = await (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, coin, provider);
+            return { address: coin, symbol: symbol ?? "?", decimals };
         }));
         const poolTypes = SWAP_SIGNATURES.filter(([, sig]) => code.toLowerCase().includes(ethers_1.ethers.id(sig).slice(2, 10))).map(([type]) => type);
         return { pool: address, coins, poolTypes };

package/dist/pools/rwaVault/getRegisteredAdapters.js

@@ -8,6 +8,7 @@ const getContractAddress_1 = __importDefault(require("../../contracts/getContrac
 const artifacts_1 = require("../../utils/artifacts");
 const amount_1 = require("../../utils/amount");
 const rpcError_1 = require("../../utils/rpcError");
+const resolveTokenInfo_1 = require("../../contracts/resolveTokenInfo");
 /**
  * Walks a public address array (`adapters(i)`) until the index reverts. Any other error (network, RPC) is thrown,
  * so a flaky node never returns a shortened list as if it were complete.
@@ -30,15 +31,19 @@ async function readList(vault, method) {
     }
     return out;
 }
-async function readAdapter(address, provider) {
+async function readAdapter(chainId, address, provider) {
     const erc20 = new ethers_1.ethers.Contract(address, (0, artifacts_1.getABI)("erc20vaultadapter"), provider);
     const [type, token] = await Promise.all([erc20.getAssetType(), erc20.getAssetToken()]);
     const erc721 = type === "ERC721";
     const adapter = erc721 ? new ethers_1.ethers.Contract(address, (0, artifacts_1.getABI)("erc721vaultadapter"), provider) : erc20;
-    const asset = new ethers_1.ethers.Contract(token, ["function symbol() view returns (string)", "function decimals() view returns (uint8)"], provider);
-    const [tokenSymbol, tokenDecimals, value, tokenIds] = await Promise.all([
-        asset.symbol().catch(() => (erc721 ? "NFTs" : "tokens")),
-        erc721 ? 0 : asset.decimals().then(Number),
+    // An NFT collection has no decimals, so only an ERC20 goes through resolveTokenInfo.
+    const assetInfo = erc721
+        ? new ethers_1.ethers.Contract(token, ["function symbol() view returns (string)"], provider)
+            .symbol()
+            .then((symbol) => ({ decimals: 0, symbol }), () => ({ decimals: 0, symbol: "NFTs" }))
+        : (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, token, provider).then(({ decimals, symbol }) => ({ decimals, symbol: symbol ?? "tokens" }));
+    const [{ symbol: tokenSymbol, decimals: tokenDecimals }, value, tokenIds] = await Promise.all([
+        assetInfo,
         adapter.totalValue().catch(() => null),
         erc721 ? adapter.getDepositedTokens() : Promise.resolve([]),
     ]);
@@ -63,7 +68,7 @@ async function getRegisteredAdapters(chainId, provider) {
         return Promise.all(all.map(async (address) => {
             const flags = { address, depositable: depositable.includes(address), redeemable: redeemable.includes(address) };
             try {
-                return { ...flags, ...(await readAdapter(address, provider)) };
+                return { ...flags, ...(await readAdapter(chainId, address, provider)) };
             }
             catch (error) {
                 const message = error instanceof Error ? error.message : String(error);

package/dist/prices/getCurveLPPriceUSD.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getCurveLPPriceUSD = getCurveLPPriceUSD;
 const ethers_1 = require("ethers");
 const chains_1 = __importDefault(require("../configs/chains"));
-const getTokenMetadata_1 = require("../contracts/getTokenMetadata");
+const resolveTokenInfo_1 = require("../contracts/resolveTokenInfo");
 const tokenPricesUSD_1 = require("./tokenPricesUSD");
 const CURVE_POOL_ABI = [
     "function coins(uint256) view returns (address)",
@@ -31,13 +31,13 @@ async function getCurveLPPriceUSD(chainId, token, provider) {
         ]);
         if (supply === 0n)
             return 0;
-        const [meta0, meta1] = await Promise.all([
-            (0, getTokenMetadata_1.getTokenMetadata)(chainId, c0, provider).catch(() => null),
-            (0, getTokenMetadata_1.getTokenMetadata)(chainId, c1, provider).catch(() => null),
+        const [info0, info1] = await Promise.all([
+            (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, c0, provider),
+            (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, c1, provider),
         ]);
-        const p0 = (0, tokenPricesUSD_1.getTokenPriceUSD)(meta0?.symbol);
-        const p1 = (0, tokenPricesUSD_1.getTokenPriceUSD)(meta1?.symbol);
-        const tvl = Number(ethers_1.ethers.formatEther(b0)) * p0 + Number(ethers_1.ethers.formatEther(b1)) * p1;
+        const p0 = (0, tokenPricesUSD_1.getTokenPriceUSD)(info0.symbol);
+        const p1 = (0, tokenPricesUSD_1.getTokenPriceUSD)(info1.symbol);
+        const tvl = Number(ethers_1.ethers.formatUnits(b0, info0.decimals)) * p0 + Number(ethers_1.ethers.formatUnits(b1, info1.decimals)) * p1;
         return tvl / Number(ethers_1.ethers.formatEther(supply));
     }
     catch {

package/dist/types/RPCLibrary.d.ts

@@ -47,6 +47,7 @@ import { findContract } from "./contracts/findContract";
 import { decodeCall } from "./contracts/decodeCall";
 import { resolveName, resolveNames } from "./contracts/resolveName";
 import { getTokenMetadata } from "./contracts/getTokenMetadata";
+import { resolveTokenInfo } from "./contracts/resolveTokenInfo";
 import getLatestPrice from "./contracts/housePrices/getLatestPrice";
 import setOracle from "./contracts/housePrices/setOracle";
 import tick from "./minter/tick";
@@ -441,6 +442,7 @@ declare class RPCLibrary {
         resolveName: typeof resolveName;
         resolveNames: typeof resolveNames;
         getTokenMetadata: typeof getTokenMetadata;
+        resolveTokenInfo: typeof resolveTokenInfo;
         feeCollector: {
             claimRewardFromPool: typeof claimRewardFromPool;
             getState: typeof getFeeCollectorState;

package/dist/types/contracts/governance/gauge/getUserGaugeState.d.ts

@@ -3,9 +3,9 @@ import { ChainId } from "../../../configs/chains";
 import { TokenAmount } from "../../../utils/amount";
 export interface UserGaugeTokenState {
     address: string;
-    /** From the token registry; undefined when the registry does not list the token. */
+    /** From the token registry, or read from the token when the registry does not list it; undefined if it has none. */
     symbol?: string;
-    /** From the token registry; 18 when the registry does not list the token. */
+    /** From the token registry, or read from the token when the registry does not list it. */
     decimals: number;
     /** Wallet balance, in this token's base units. */
     balance: TokenAmount;
@@ -30,6 +30,6 @@ export interface UserGaugeState {
  * @param gaugeAddressOrId - Address of the gauge contract or its config ID.
  * @param user - The wallet.
  * @param provider - Optional ethers.js Provider instance.
- * @returns The wallet's gauge state. Every amount carries its own token's registry decimals and symbol.
+ * @returns The wallet's gauge state. Every amount carries its own token's decimals and symbol.
  */
 export declare const getUserGaugeState: (chainId: ChainId, gaugeAddressOrId: string, user: string, provider?: Provider) => Promise<UserGaugeState>;

package/dist/types/contracts/psm/getVaultInfo.d.ts

@@ -3,8 +3,6 @@ import { ChainId } from "../../configs/chains";
 import { TokenAmount, ScaledValue } from "../../utils/amount";
 export interface PsmVaultUserInfo {
     shareBalance: TokenAmount;
-    savingsTokenBalance: TokenAmount;
-    baseAssetBalance: TokenAmount;
     redeemRequest: {
         shares: TokenAmount;
         exitTime: number;

package/dist/types/contracts/resolveTokenInfo.d.ts

@@ -0,0 +1,18 @@
+import { Provider } from "ethers";
+import { ChainId } from "../configs/chains";
+import { TokenInfo } from "../utils/amount";
+/**
+ * A token's decimals and symbol for any address: the chain config registry first, then the token itself for an address
+ * the registry does not list. An on-chain read happens once per chain and token; a failed read is not remembered, so
+ * the next call tries again.
+ *
+ * Use this wherever a method takes a token address it cannot know in advance. Methods that take an asset key keep
+ * using `toTokenAmount`, which reads only the registry.
+ *
+ * @param chainId The chain id.
+ * @param idOrAddress An asset key from the registry, or a token contract address, any casing.
+ * @param provider Optional ethers.js Provider instance.
+ * @returns The token's decimals, and its symbol when it has one: a token without a readable `symbol()` gets none.
+ * @throws If an asset key is not in the registry, or an unlisted token has no readable `decimals()`.
+ */
+export declare const resolveTokenInfo: (chainId: ChainId, idOrAddress: string, provider?: Provider) => Promise<TokenInfo>;

package/dist/types/contracts/yearn/vault/getUserInfo.d.ts

@@ -6,8 +6,6 @@ export interface YearnVaultUserInfo {
     shares: TokenAmount;
     /** What `shares` redeem for now, in the vault asset. */
     assets: TokenAmount;
-    /** Wallet balance of the vault asset. */
-    assetBalance: TokenAmount;
     /** Vault asset allowance to the vault, which `deposit` and `mint` pull from. */
     assetAllowance: TokenAmount;
     /** Most the user can deposit now, in the vault asset. */
@@ -18,12 +16,13 @@ export interface YearnVaultUserInfo {
     maxRedeem: TokenAmount;
 }
 /**
- * Gets a user's position in a Yearn V3 vault, plus their vault asset balance and allowance.
+ * Gets a user's position in a Yearn V3 vault, plus their vault asset allowance. Read the wallet's asset balance with
+ * `wallet.assets.getBalance`.
  *
  * @param chainId - The chain/network to use.
  * @param vaultAddressOrId - The vault's key in the chain config's `yearn` section (e.g. "spmusd"), or its address.
  * @param account - Address of the user.
  * @param provider - Optional ethers.js Provider instance.
- * @returns The user's shares, their asset value, balances, allowance and limits, in base units.
+ * @returns The user's shares, their asset value, allowance and limits, in base units.
  */
 export declare function getUserInfo(chainId: ChainId, vaultAddressOrId: string, account: string, provider?: Provider): Promise<YearnVaultUserInfo>;

package/dist/types/wallet/assets/getBalance.d.ts

@@ -3,13 +3,14 @@ import { AssetType } from "../../utils/artifacts";
 import { ChainId } from "../../configs/chains/index";
 import { TokenAmount } from "../../utils/amount";
 /**
- * Reads a wallet's balance of a configured asset or native ETH.
+ * Reads a wallet's balance of a configured asset, any ERC20 by address, or native ETH.
  * @param chainId The chain id.
- * @param assetId The asset key in the chain config, or `"eth"` for native ETH.
+ * @param assetIdOrAddress The asset key in the chain config, an ERC20 contract address, or `"eth"` for native ETH.
  * @param address The wallet address.
  * @param provider The provider to read with.
  * @returns The balance in base units with decimals and symbol from the token registry (`"ETH"` and 18 for native ETH).
- * @throws If the asset is not deployed on the chain, or the read fails.
+ * A token address the registry does not list takes its decimals and symbol from the token, read once per chain.
+ * @throws If the asset key is not deployed on the chain, or the read fails.
  */
-declare function getBalance(chainId: ChainId, assetId: AssetType, address: string, provider: Provider): Promise<TokenAmount>;
+declare function getBalance(chainId: ChainId, assetIdOrAddress: AssetType, address: string, provider: Provider): Promise<TokenAmount>;
 export default getBalance;

package/dist/wallet/assets/getBalance.js

@@ -3,30 +3,41 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ethers_1 = require("ethers");
 const contracts_1 = require("../../utils/contracts");
 const amount_1 = require("../../utils/amount");
+const resolveTokenInfo_1 = require("../../contracts/resolveTokenInfo");
 const _helpers_1 = require("../../assets/_helpers");
 const rpcError_1 = require("../../utils/rpcError");
 /**
- * Reads a wallet's balance of a configured asset or native ETH.
+ * Reads a wallet's balance of a configured asset, any ERC20 by address, or native ETH.
  * @param chainId The chain id.
- * @param assetId The asset key in the chain config, or `"eth"` for native ETH.
+ * @param assetIdOrAddress The asset key in the chain config, an ERC20 contract address, or `"eth"` for native ETH.
  * @param address The wallet address.
  * @param provider The provider to read with.
  * @returns The balance in base units with decimals and symbol from the token registry (`"ETH"` and 18 for native ETH).
- * @throws If the asset is not deployed on the chain, or the read fails.
+ * A token address the registry does not list takes its decimals and symbol from the token, read once per chain.
+ * @throws If the asset key is not deployed on the chain, or the read fails.
  */
-async function getBalance(chainId, assetId, address, provider) {
+async function getBalance(chainId, assetIdOrAddress, address, provider) {
     const BALANCE_OF_ABI = ["function balanceOf(address) view returns (uint256)"];
     let contractAddress;
     try {
-        if (assetId === "eth") {
+        if (assetIdOrAddress === "eth") {
             const balance = await provider.getBalance(address);
             return (0, amount_1.toAmount)(balance, amount_1.WAD_DECIMALS, "ETH");
         }
-        (0, _helpers_1.assertAssetDeployed)(chainId, assetId);
-        contractAddress = (0, contracts_1.getContractAddress)(chainId, assetId);
+        if (ethers_1.ethers.isAddress(assetIdOrAddress)) {
+            contractAddress = assetIdOrAddress;
+            const contract = new ethers_1.ethers.Contract(contractAddress, BALANCE_OF_ABI, provider);
+            const [balance, info] = await Promise.all([
+                contract.balanceOf(address),
+                (0, resolveTokenInfo_1.resolveTokenInfo)(chainId, contractAddress, provider),
+            ]);
+            return (0, amount_1.toAmount)(balance, info.decimals, info.symbol);
+        }
+        (0, _helpers_1.assertAssetDeployed)(chainId, assetIdOrAddress);
+        contractAddress = (0, contracts_1.getContractAddress)(chainId, assetIdOrAddress);
         const contract = new ethers_1.ethers.Contract(contractAddress, BALANCE_OF_ABI, provider);
         const balance = await contract.balanceOf(address);
-        return (0, amount_1.toTokenAmount)(chainId, assetId, balance);
+        return (0, amount_1.toTokenAmount)(chainId, assetIdOrAddress, balance);
     }
     catch (error) {
         throw (0, rpcError_1.toRpcError)("wallet.getBalance", error, { chainId, address: contractAddress });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@raac/rpc",
-	"version": "2.0.0-beta.20",
+	"version": "2.0.0-beta.21",
 	"description": "RPC Library for RAAC",
 	"main": "dist/index.js",
 	"types": "dist/types/index.d.ts",