@raac/rpc 2.0.0-beta.1 → 2.0.0-beta.11

package/dist/user/getUserPortfolio.js

@@ -0,0 +1,109 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUserPortfolio = void 0;
+const ethers_1 = require("ethers");
+const chains_1 = __importDefault(require("../configs/chains"));
+const amount_1 = require("../utils/amount");
+const getLendingPoolInfo_1 = __importDefault(require("../pools/lendingPool/getLendingPoolInfo"));
+const computeEffectiveReturn_1 = require("./computeEffectiveReturn");
+const getUserCollateral_1 = require("./getUserCollateral");
+const getUserDebt_1 = require("./getUserDebt");
+const getUserWalletBalances_1 = require("./getUserWalletBalances");
+const getUserFarming_1 = require("./getUserFarming");
+const getUserGovernance_1 = require("./getUserGovernance");
+const _helpers_1 = require("./_helpers");
+const unavailable = (what, sections) => {
+    const failed = sections.filter((section) => section.error);
+    return failed.length ? new Error(`${what} needs data that could not be read: ${failed.map((section) => section.error.message).join("; ")}`) : null;
+};
+/** Builds the effective return legs from the reads. Each unit of capital earns each yield once. */
+function buildLegs(debt, rates, wallet, farming) {
+    const legs = [];
+    if (debt.valueUsd > 0) {
+        legs.push({ id: "borrow", source: "Borrow pmUSD", kind: "cost", yieldType: "borrow", countsAsCapital: false, valueUsd: debt.valueUsd, rate: (0, amount_1.toNumber)(rates.borrowApy), rateKind: "apy" });
+    }
+    // Every RpmUSD and DEpmUSD the user owns earns the supply rate wherever it sits: the wallet, inside an LP, or LP staked in a gauge.
+    const coins = farming.pools.flatMap((pool) => pool.coins);
+    const suppliedUsd = wallet.suppliedUsd + coins.filter((coin) => coin.yield === "supply").reduce((sum, coin) => sum + coin.valueUsd, 0);
+    if (suppliedUsd > 0) {
+        legs.push({ id: "supply", source: "Supplied (RpmUSD + DEpmUSD)", kind: "earning", yieldType: "supply", countsAsCapital: true, valueUsd: suppliedUsd, rate: (0, amount_1.toNumber)(rates.supplyApy), rateKind: "apr" });
+    }
+    // A gauge is an overlay: its staked value is already counted through its coins, so it earns rewards but adds no capital.
+    for (const gauge of farming.gauges) {
+        if (gauge.staked.value === 0n)
+            continue;
+        legs.push({ id: `gauge:${gauge.id}`, source: gauge.name, kind: "earning", yieldType: "gauge", countsAsCapital: false, valueUsd: gauge.valueUsd, rate: gauge.apr ?? 0, rateKind: "apr" });
+    }
+    const idleUsd = wallet.idleUsd + coins.filter((coin) => coin.yield === "none").reduce((sum, coin) => sum + coin.valueUsd, 0);
+    return { legs, idleUsd };
+}
+/**
+ * The user's position across the app: iREET collateral, debt and health factor, wallet RpmUSD/DEpmUSD/pmUSD, LP and
+ * gauge positions, veRAAC governance power, and the projected effective return built from them. Each part is read
+ * independently, so one failing read shows as an `error` on that part and the rest still return.
+ *
+ * Only the user's position data is returned; pool parameters such as the liquidation threshold stay with the callers
+ * that need them. iREET is the only collateral read (NFT positions are out of scope).
+ *
+ * @param chainId - The chain/network to use.
+ * @param user - The user's address.
+ * @param prices - USD per whole token, keyed by lowercase symbol. iREET, pmUSD, RpmUSD, DEpmUSD and RAAC are needed,
+ *   plus every coin of a Curve pool the user holds.
+ * @param provider - Optional ethers.js Provider instance. Read-only is enough.
+ * @returns Each part as `{ data, error }`, the effective return legs, and the computed effective return.
+ */
+const getUserPortfolio = async (chainId, user, prices, provider) => {
+    if (!ethers_1.ethers.isAddress(user)) {
+        throw new Error(`Invalid user address: ${user}`);
+    }
+    if (!provider) {
+        const rpc = chains_1.default[chainId].rpcs[0];
+        provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+    }
+    const [collateral, debt, rates, wallet, farming, governance] = await Promise.all([
+        (0, _helpers_1.settled)((0, getUserCollateral_1.getUserCollateral)(chainId, user, provider).then((amount) => ({ amount, valueUsd: (0, _helpers_1.requireUsd)(prices, amount, "rwaindextoken") }))),
+        (0, _helpers_1.settled)((0, getUserDebt_1.getUserDebt)(chainId, user, provider).then((debt) => ({ ...debt, valueUsd: (0, _helpers_1.requireUsd)(prices, debt.amount, chains_1.default[chainId].pools.lendingpool.asset ?? "debt") }))),
+        (0, _helpers_1.settled)((0, getLendingPoolInfo_1.default)(chainId, undefined, provider).then(({ borrowRate, borrowApy, supplyApy }) => ({ borrowRate, borrowApy, supplyApy }))),
+        (0, _helpers_1.settled)((0, getUserWalletBalances_1.getUserWalletBalances)(chainId, user, provider).then((balances) => ({
+            ...balances,
+            suppliedUsd: (0, _helpers_1.requireUsd)(prices, balances.rtoken, "rtoken") + (0, _helpers_1.requireUsd)(prices, balances.detoken, "detoken"),
+            idleUsd: (0, _helpers_1.requireUsd)(prices, balances.pmusd, "pmusd"),
+        }))),
+        (0, _helpers_1.settled)((0, getUserFarming_1.getUserFarming)(chainId, user, prices, provider)),
+        (0, _helpers_1.settled)((0, getUserGovernance_1.getUserGovernance)(chainId, user, provider)),
+    ]);
+    const netPositionError = unavailable("Net RAACLend position", [collateral, debt, wallet]);
+    const netPositionUsd = netPositionError
+        ? { data: null, error: netPositionError }
+        : { data: collateral.data.valueUsd + wallet.data.suppliedUsd - debt.data.valueUsd, error: null };
+    // A pool that failed may hold part of the user's capital, so the return cannot be computed without it.
+    const farmingErrors = (farming.data?.errors ?? []).map(({ pool, error }) => ({ data: null, error: new Error(`Curve pool ${pool}: ${error.message}`) }));
+    let legs = [];
+    let effectiveReturn;
+    const returnError = unavailable("Effective return", [collateral, debt, rates, wallet, farming, ...farmingErrors]);
+    if (returnError) {
+        effectiveReturn = { data: null, error: returnError };
+    }
+    else {
+        const built = buildLegs(debt.data, rates.data, wallet.data, farming.data);
+        legs = built.legs;
+        effectiveReturn = { data: (0, computeEffectiveReturn_1.computeEffectiveReturn)({ legs, collateralUsd: collateral.data.valueUsd, idleUsd: built.idleUsd }), error: null };
+    }
+    return {
+        chainId,
+        user: ethers_1.ethers.getAddress(user),
+        collateral,
+        debt,
+        rates,
+        wallet,
+        farming,
+        governance,
+        netPositionUsd,
+        legs,
+        effectiveReturn,
+    };
+};
+exports.getUserPortfolio = getUserPortfolio;

package/dist/user/getUserWalletBalances.js

@@ -0,0 +1,30 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUserWalletBalances = void 0;
+const ethers_1 = require("ethers");
+const chains_1 = __importDefault(require("../configs/chains"));
+const getBalance_1 = __importDefault(require("../wallet/assets/getBalance"));
+/**
+ * The lending tokens a user holds in their wallet: RpmUSD, DEpmUSD and idle pmUSD.
+ *
+ * @param chainId - The chain/network to use.
+ * @param user - The user's address.
+ * @param provider - Optional ethers.js Provider instance.
+ * @returns Each balance, with its registry decimals and symbol.
+ */
+const getUserWalletBalances = async (chainId, user, provider) => {
+    if (!provider) {
+        const rpc = chains_1.default[chainId].rpcs[0];
+        provider = new ethers_1.ethers.JsonRpcProvider(rpc);
+    }
+    const [rtoken, detoken, pmusd] = await Promise.all([
+        (0, getBalance_1.default)(chainId, "rtoken", user, provider),
+        (0, getBalance_1.default)(chainId, "detoken", user, provider),
+        (0, getBalance_1.default)(chainId, "pmusd", user, provider),
+    ]);
+    return { rtoken, detoken, pmusd };
+};
+exports.getUserWalletBalances = getUserWalletBalances;

package/dist/user/index.js

@@ -0,0 +1,24 @@
+"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);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./computeEffectiveReturn"), exports);
+__exportStar(require("./getUserClaimables"), exports);
+__exportStar(require("./getUserCollateral"), exports);
+__exportStar(require("./getUserDebt"), exports);
+__exportStar(require("./getUserFarming"), exports);
+__exportStar(require("./getUserGovernance"), exports);
+__exportStar(require("./getUserPortfolio"), exports);
+__exportStar(require("./getUserWalletBalances"), exports);

package/dist/utils/amount.js

@@ -5,6 +5,7 @@ exports.toAmount = toAmount;
 exports.toScaled = toScaled;
 exports.parseAmount = parseAmount;
 exports.toDecimalString = toDecimalString;
+exports.toNumber = toNumber;
 exports.serializeAmount = serializeAmount;
 exports.deserializeAmount = deserializeAmount;
 exports.getAssetDecimals = getAssetDecimals;
@@ -65,6 +66,15 @@ function parseAmount(text, decimals) {
 function toDecimalString(amount) {
     return ethers_1.ethers.formatUnits(amount.value, amount.decimals);
 }
+/**
+ * An amount or scaled value as a JavaScript number, for USD and rate maths. Lossy past about 15 significant digits,
+ * so keep on-chain values as `bigint` and use this only for computed figures.
+ * @param amount The amount or scaled value, e.g. a ray rate of 3.5e25 becomes 0.035.
+ * @returns The value in whole units.
+ */
+function toNumber(amount) {
+    return Number(toDecimalString(amount));
+}
 /**
  * Converts an amount to a JSON-safe form, since `bigint` does not survive `JSON.stringify`.
  * @param amount The amount.

package/dist/utils/artifacts.js

@@ -38,6 +38,8 @@ const RWAIndexTokenCollector_json_1 = __importDefault(require("../artifacts/core
 const RAACTokenCollector_json_1 = __importDefault(require("../artifacts/core/collectors/RAACTokenCollector.sol/RAACTokenCollector.json"));
 const CrvUSDToUSDOracle_json_1 = __importDefault(require("../artifacts/core/oracles/CrvUSDToUSDOracle.sol/CrvUSDToUSDOracle.json"));
 const NFTRoyaltyFeeCollector_json_1 = __importDefault(require("../artifacts/core/collectors/NFTRoyaltyFeeCollector.sol/NFTRoyaltyFeeCollector.json"));
+const RentStreamer_json_1 = __importDefault(require("../artifacts/core/collectors/fee-streamer/RentStreamer.sol/RentStreamer.json"));
+const USDCTokenLimited_json_1 = __importDefault(require("../artifacts/mocks/core/tokens/USDCTokenLimited.sol/USDCTokenLimited.json"));
 const GaugeController_json_1 = __importDefault(require("../artifacts/core/governance/gauges/GaugeController.sol/GaugeController.json"));
 const BaseGauge_json_1 = __importDefault(require("../artifacts/core/governance/gauges/BaseGauge.sol/BaseGauge.json"));
 const RAACGauge_json_1 = __importDefault(require("../artifacts/core/governance/gauges/RAACGauge.sol/RAACGauge.json"));
@@ -52,10 +54,14 @@ const pmBlender_json_1 = __importDefault(require("../artifacts/core/pmBlender/pm
 const RAACLiquidLocker_json_1 = __importDefault(require("../artifacts/core/lockers/RAACLiquidLocker.sol/RAACLiquidLocker.json"));
 const RAACMaturityVault_json_1 = __importDefault(require("../artifacts/core/lockers/RAACMaturityVault.sol/RAACMaturityVault.json"));
 const RAACBotLocker_json_1 = __importDefault(require("../artifacts/core/lockers/RAACBotLocker.sol/RAACBotLocker.json"));
+const ERC721Mock_json_1 = __importDefault(require("../artifacts/mocks/core/tokens/ERC721Mock.sol/ERC721Mock.json"));
 // leRAAC token
 const LiquidEscrowedRAAC_json_1 = __importDefault(require("../artifacts/core/tokens/LeRAAC.sol/LiquidEscrowedRAAC.json"));
 // Zap
 const AladdinZap_json_1 = __importDefault(require("../artifacts/zap/AladdinZap.sol/AladdinZap.json"));
+// PSM
+const PSMVault_json_1 = __importDefault(require("../artifacts/core/psm/PSMVault.sol/PSMVault.json"));
+const RateProvider_json_1 = __importDefault(require("../artifacts/core/psm/RateProvider.sol/RateProvider.json"));
 const CRVUSD_ABI = crvUSDToken_json_1.default.abi;
 const PMUSD_ABI = pmUSD_json_1.default.abi;
 const XPM_ABI = xPM_json_1.default.abi;
@@ -89,9 +95,12 @@ const ABIS = {
     // Tokens
     crvusd: CRVUSD_ABI,
     pmusd: PMUSD_ABI,
+    usdc: USDCTokenLimited_json_1.default.abi,
     xpm: XPM_ABI,
     // RAAC
     raacnft: RAACNFT_ABI,
+    // Standard OpenZeppelin ERC721 ABI; the Bot NFT is a plain ERC721 with no RAAC-specific functions
+    raacbotnft: ERC721Mock_json_1.default.abi,
     raactoken: RAACToken_ABI,
     veraac: VERAAC_ABI,
     // Pools tokens
@@ -128,6 +137,7 @@ const ABIS = {
     raactokencollector: RAACTokenCollector_json_1.default.abi,
     crvusdtousdoracle: CRVUSDTOUSDORACLE_ABI,
     nftroyaltyfeecollector: NFTRoyaltyFeeCollector_json_1.default.abi,
+    rentstreamer: RentStreamer_json_1.default.abi,
     // Governance
     gaugecontroller: GAUGECONTROLLER_ABI,
     basegauge: BASEGAUGE_ABI,
@@ -150,6 +160,9 @@ const ABIS = {
     leraac: LiquidEscrowedRAAC_json_1.default.abi,
     // Zap
     aladdinzap: AladdinZap_json_1.default.abi,
+    // PSM
+    "rpsm-susds": PSMVault_json_1.default.abi,
+    rateprovider: RateProvider_json_1.default.abi,
 };
 exports.ABIS = ABIS;
 const getABI = (name) => {

package/dist/utils/chain.js

@@ -7,6 +7,7 @@ exports.switchChain = exports.getChainId = exports.getSigner = exports.getContra
 const ethers_1 = require("ethers");
 const getContractAddress_1 = require("../contracts/getContractAddress");
 const chains_1 = __importDefault(require("../configs/chains"));
+const rpcError_1 = require("./rpcError");
 const isBrowser = typeof window !== "undefined";
 const getProvider = (chainId) => {
     const config = chains_1.default[chainId];
@@ -60,7 +61,7 @@ const switchChain = async (chainId) => {
                 await addChain(chainId);
             }
             else {
-                throw error;
+                throw (0, rpcError_1.toRpcError)("wallet.switchChain", error);
             }
         }
     }

package/dist/utils/config.js

@@ -13,7 +13,6 @@
 // export const getConfig = (chainId: ChainId) => {
 // 	if (typeof window === "undefined") {
 // 		// Server-side logic
-// 		console.log("Server-side logic", fs, path, fileURLToPath);
 // 		const __filename = fileURLToPath(import.meta.url);
 // 		const __dirname = path.dirname(__filename);
 // 		const configPath = path.join(

package/dist/utils/contracts.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getContractAddress = exports.getContract = exports.getConfig = exports.setOverrideConfig = exports.getConfigs = void 0;
+exports.isDeployed = exports.getContractAddress = exports.getContract = exports.getConfig = exports.setOverrideConfig = exports.getConfigs = void 0;
 const configs_1 = require("../configs");
 const chains_1 = require("../configs/chains");
 const artifacts_1 = require("./artifacts");
@@ -56,7 +56,7 @@ const getContractAddress = (chainId, contractName) => {
     if (!config) {
         throw new Error(`Unsupported chain ID: ${chainId}`);
     }
-    const chainKeys = ["contracts", "governance", "assets", "pools", "nfts", "lockers", "zap"];
+    const chainKeys = ["contracts", "governance", "assets", "pools", "nfts", "lockers", "zap", "psm", "curve"];
     const keys = Object.keys(config).filter((key) => chainKeys.includes(key));
     let address = null;
     for (const key of keys) {
@@ -84,3 +84,6 @@ exports.default = {
     getConfig: exports.getConfig,
     getConfigs: exports.getConfigs,
 };
+/** Whether a config address is set and deployed: a valid, non-zero address. */
+const isDeployed = (address) => !!address && ethers_1.ethers.isAddress(address) && address !== ethers_1.ethers.ZeroAddress;
+exports.isDeployed = isDeployed;

package/dist/utils/errorDecoder.js

@@ -1,137 +1,89 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getErrorInfo = getErrorInfo;
-exports.decodeErrorName = decodeErrorName;
-exports.decodeErrorMessage = decodeErrorMessage;
-exports.attachDecodedError = attachDecodedError;
-exports.attachDecodedErrorMessage = attachDecodedErrorMessage;
+exports.decodeRevertWithAbi = decodeRevertWithAbi;
+exports.decodeRevertWithAllAbis = decodeRevertWithAllAbis;
+exports.errorNameForSelector = errorNameForSelector;
 const ethers_1 = require("ethers");
 const artifacts_1 = require("./artifacts");
-// Try to load the generated error map, fallback to runtime scanning
-let ERROR_SIGNATURE_MAP = {};
-try {
-    const generatedMap = require('../generated/errorMap.json');
-    ERROR_SIGNATURE_MAP = generatedMap;
-}
-catch (error) {
-    console.warn('Generated error map not found, falling back to runtime scanning...');
-    // Fallback to runtime scanning (original implementation)
-    (function buildErrorSignatureMap() {
-        for (const abiKey in artifacts_1.ABIS) {
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore – ABIS may contain unknown items
-            const abi = artifacts_1.ABIS[abiKey];
-            if (!Array.isArray(abi))
-                continue;
-            for (const item of abi) {
-                if (item.type !== "error")
-                    continue;
-                const inputs = (item.inputs || []);
-                const signature = `${item.name}(${inputs.map((input) => input.type).join(",")})`;
-                const selector = (0, ethers_1.id)(signature).slice(0, 10).toLowerCase();
-                if (!ERROR_SIGNATURE_MAP[selector]) {
-                    ERROR_SIGNATURE_MAP[selector] = {
-                        name: item.name,
-                        signature,
-                        message: `${item.name.replace(/([A-Z])/g, ' $1').trim()} error occurred`,
-                        contract: abiKey,
-                        inputs: inputs.map((input) => ({
-                            name: input.name || '',
-                            type: input.type,
-                            internalType: input.internalType || input.type,
-                        })),
-                    };
-                }
-            }
-        }
-    })();
-}
 /**
- * Returns detailed information about the error encoded in the given data blob.
+ * Decodes revert data against a specific contract's ABI, recovering the error's
+ * argument values, not just its name, as long as the caller already knows
+ * which contract it called (see contracts/findContract.ts).
+ *
+ * @param abi The ABI of the contract that was called.
  * @param data The revert data returned by the EVM (e.g., error.data).
+ * @returns The error name and its decoded arguments, or null if `data` doesn't match any error in `abi`.
  */
-function getErrorInfo(data) {
-    if (!data || typeof data !== "string")
+function decodeRevertWithAbi(abi, data) {
+    if (!data || typeof data !== "string" || !data.startsWith("0x"))
         return null;
-    let selector;
-    if (data.startsWith("0x")) {
-        selector = data.slice(0, 10).toLowerCase();
+    let parsed;
+    try {
+        parsed = ethers_1.Interface.from(abi).parseError(data);
     }
-    else {
-        // look for first 4-byte hex inside the string (e.g., error message)
-        const match = data.match(/0x[0-9a-fA-F]{8}/);
-        if (match)
-            selector = match[0].toLowerCase();
+    catch {
+        return null;
     }
-    if (!selector)
+    if (!parsed)
         return null;
-    return ERROR_SIGNATURE_MAP[selector] ?? null;
-}
-/**
- * Returns only the error name, or null if it cannot be decoded.
- */
-function decodeErrorName(data) {
-    const info = getErrorInfo(data);
-    return info?.name ?? null;
+    const args = {};
+    parsed.fragment.inputs.forEach((input, i) => {
+        args[input.name || String(i)] = parsed.args[i];
+    });
+    return { name: parsed.name, args };
 }
-/**
- * Returns the custom error message, or null if it cannot be decoded.
- */
-function decodeErrorMessage(data) {
-    const info = getErrorInfo(data);
-    return info?.message ?? null;
+let ALL_ERRORS;
+function allErrors() {
+    if (!ALL_ERRORS) {
+        const bySelector = new Map();
+        for (const abi of Object.values(artifacts_1.ABIS)) {
+            for (const item of abi) {
+                if (item?.type !== "error")
+                    continue;
+                const fragment = ethers_1.ErrorFragment.from(item);
+                if (!bySelector.has(fragment.selector))
+                    bySelector.set(fragment.selector, fragment);
+            }
+        }
+        ALL_ERRORS = new ethers_1.Interface([...bySelector.values()]);
+    }
+    return ALL_ERRORS;
 }
 /**
- * Builds a user-friendly error prefix with decoded error name (if available).
- * Usage example:
- *   const msg = attachDecodedError("Deposit failed", caughtError);
+ * Decodes revert data against every custom error in {@link ABIS}. This is the
+ * fallback for a revert thrown by a contract other than the one called: e.g.
+ * LendingPool.deposit bubbling up crvUSD's `ERC20InsufficientAllowance`, which
+ * LendingPool's own ABI does not declare. When two contracts declare the same
+ * selector, the first one in `ABIS` order wins: a shared selector means a
+ * shared signature, so only the argument names can differ.
+ *
+ * @param data The revert data returned by the EVM (e.g., error.data).
+ * @returns The error name and its decoded arguments, or null if no known contract declares that selector.
  */
-function attachDecodedError(prefix, error) {
-    // ethers@6 nests the original error under error.error
-    // viem/ethcall surface it directly on error.data
-    const data = (error && ((error.data ?? error.error?.data) ||
-        // viem error format: error.shortMessage
-        undefined));
-    // If data not found, attempt to extract selector from message like
-    // "Encoded error signature \"0xa9b65aba\" not found on ABI"
-    let selector;
-    if (data && data.startsWith("0x")) {
-        selector = data.slice(0, 10).toLowerCase();
-    }
-    else if (typeof error?.message === "string") {
-        const SIGNATURE_REGEX = /Encoded error signature \"(0x[0-9a-fA-F]{8})\"/;
-        const match = error.message.match(SIGNATURE_REGEX);
-        if (match)
-            selector = match[1].toLowerCase();
-    }
-    if (!selector)
-        return prefix; // unable to determine
-    const decodedName = ERROR_SIGNATURE_MAP[selector]?.name ?? null;
-    // console.debug("Decoded", selector, decodedName);
-    return decodedName ? `${prefix} (${decodedName})` : prefix;
+function decodeRevertWithAllAbis(data) {
+    return decodeRevertWithAbi(allErrors(), data);
 }
 /**
- * Builds a user-friendly error message with custom error description (if available).
- * Usage example:
- *   const msg = attachDecodedErrorMessage("Deposit failed", caughtError);
+ * Names the custom error behind a bare 4-byte selector, for when a wallet or
+ * client surfaced the selector but not the full revert data (so the arguments
+ * cannot be decoded). Looks in `abi` first, then in every known ABI.
+ *
+ * @param selector The 4-byte error selector, e.g. "0x79db4619".
+ * @param abi The ABI of the contract that was called, when known.
+ * @returns The error name, or null if no known contract declares that selector.
  */
-function attachDecodedErrorMessage(prefix, error) {
-    const data = (error && ((error.data ?? error.error?.data) ||
-        undefined));
-    let selector;
-    if (data && data.startsWith("0x")) {
-        selector = data.slice(0, 10).toLowerCase();
-    }
-    else if (typeof error?.message === "string") {
-        const SIGNATURE_REGEX = /Encoded error signature \"(0x[0-9a-fA-F]{8})\"/;
-        const match = error.message.match(SIGNATURE_REGEX);
-        if (match)
-            selector = match[1].toLowerCase();
+function errorNameForSelector(selector, abi) {
+    for (const iface of [abi, allErrors()]) {
+        if (!iface)
+            continue;
+        try {
+            const fragment = ethers_1.Interface.from(iface).getError(selector);
+            if (fragment)
+                return fragment.name;
+        }
+        catch {
+            // Not declared on this ABI.
+        }
     }
-    if (!selector)
-        return prefix;
-    const errorInfo = ERROR_SIGNATURE_MAP[selector];
-    if (!errorInfo)
-        return prefix;
-    return `${prefix}: ${errorInfo.message}`;
+    return null;
 }