@raac/rpc 2.0.0-beta.2 → 2.0.0-beta.4

package/dist/types/utils/artifacts.d.ts

@@ -794,13 +794,14 @@ declare const ABIS: {
         stateMutability?: undefined;
         outputs?: undefined;
     } | {
-        inputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
+        inputs: any[];
         name: string;
         outputs: {
+            components: {
+                internalType: string;
+                name: string;
+                type: string;
+            }[];
             internalType: string;
             name: string;
             type: string;
@@ -809,14 +810,13 @@ declare const ABIS: {
         type: string;
         anonymous?: undefined;
     } | {
-        inputs: any[];
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
         name: string;
         outputs: {
-            components: {
-                internalType: string;
-                name: string;
-                type: string;
-            }[];
             internalType: string;
             name: string;
             type: string;
@@ -874,26 +874,6 @@ declare const ABIS: {
         stateMutability: string;
         type: string;
         anonymous?: undefined;
-    } | {
-        inputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        name: string;
-        outputs: {
-            components: {
-                internalType: string;
-                name: string;
-                type: string;
-            }[];
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        stateMutability: string;
-        type: string;
-        anonymous?: undefined;
     })[];
     zeno: ({
         inputs: {
@@ -1010,26 +990,6 @@ declare const ABIS: {
         stateMutability: string;
         type: string;
         anonymous?: undefined;
-    } | {
-        inputs: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        name: string;
-        outputs: {
-            components: {
-                internalType: string;
-                name: string;
-                type: string;
-            }[];
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        stateMutability: string;
-        type: string;
-        anonymous?: undefined;
     })[];
     mockvrfcoordinator: ({
         inputs: {
@@ -2539,6 +2499,118 @@ declare const ABIS: {
         name?: undefined;
         outputs?: undefined;
     })[];
+    "rpsm-susds": ({
+        inputs: any[];
+        stateMutability: string;
+        type: string;
+        name?: undefined;
+        anonymous?: undefined;
+        outputs?: undefined;
+    } | {
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        type: string;
+        stateMutability?: undefined;
+        anonymous?: undefined;
+        outputs?: undefined;
+    } | {
+        anonymous: boolean;
+        inputs: {
+            indexed: boolean;
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        type: string;
+        stateMutability?: undefined;
+        outputs?: undefined;
+    } | {
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        outputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        stateMutability: string;
+        type: string;
+        anonymous?: undefined;
+    } | {
+        inputs: {
+            components: {
+                internalType: string;
+                name: string;
+                type: string;
+            }[];
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        outputs: any[];
+        stateMutability: string;
+        type: string;
+        anonymous?: undefined;
+    })[];
+    rateprovider: ({
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        stateMutability: string;
+        type: string;
+        name?: undefined;
+        anonymous?: undefined;
+        outputs?: undefined;
+    } | {
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        type: string;
+        stateMutability?: undefined;
+        anonymous?: undefined;
+        outputs?: undefined;
+    } | {
+        anonymous: boolean;
+        inputs: {
+            indexed: boolean;
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        type: string;
+        stateMutability?: undefined;
+        outputs?: undefined;
+    } | {
+        inputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        name: string;
+        outputs: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        stateMutability: string;
+        type: string;
+        anonymous?: undefined;
+    })[];
 };
 export type AssetType = keyof typeof ABIS | string;
 export type ContractType = keyof typeof ABIS;
@@ -3137,26 +3209,6 @@ declare const getABI: (name: keyof typeof ABIS) => any[] | ({
     stateMutability: string;
     type: string;
     anonymous?: undefined;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        components: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    anonymous?: undefined;
 })[] | ({
     inputs: {
         internalType: string;
@@ -3192,13 +3244,14 @@ declare const getABI: (name: keyof typeof ABIS) => any[] | ({
     stateMutability?: undefined;
     outputs?: undefined;
 } | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
+    inputs: any[];
     name: string;
     outputs: {
+        components: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
         internalType: string;
         name: string;
         type: string;
@@ -3207,14 +3260,13 @@ declare const getABI: (name: keyof typeof ABIS) => any[] | ({
     type: string;
     anonymous?: undefined;
 } | {
-    inputs: any[];
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
     name: string;
     outputs: {
-        components: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
         internalType: string;
         name: string;
         type: string;
@@ -3271,26 +3323,6 @@ declare const getABI: (name: keyof typeof ABIS) => any[] | ({
     stateMutability: string;
     type: string;
     anonymous?: undefined;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        components: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    anonymous?: undefined;
 })[] | ({
     inputs: {
         internalType: string;
@@ -4984,5 +5016,115 @@ declare const getABI: (name: keyof typeof ABIS) => any[] | ({
     inputs?: undefined;
     name?: undefined;
     outputs?: undefined;
+})[] | ({
+    inputs: any[];
+    stateMutability: string;
+    type: string;
+    name?: undefined;
+    anonymous?: undefined;
+    outputs?: undefined;
+} | {
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    type: string;
+    stateMutability?: undefined;
+    anonymous?: undefined;
+    outputs?: undefined;
+} | {
+    anonymous: boolean;
+    inputs: {
+        indexed: boolean;
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    type: string;
+    stateMutability?: undefined;
+    outputs?: undefined;
+} | {
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    outputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
+} | {
+    inputs: {
+        components: {
+            internalType: string;
+            name: string;
+            type: string;
+        }[];
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    outputs: any[];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
+})[] | ({
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+    name?: undefined;
+    anonymous?: undefined;
+    outputs?: undefined;
+} | {
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    type: string;
+    stateMutability?: undefined;
+    anonymous?: undefined;
+    outputs?: undefined;
+} | {
+    anonymous: boolean;
+    inputs: {
+        indexed: boolean;
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    type: string;
+    stateMutability?: undefined;
+    outputs?: undefined;
+} | {
+    inputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    name: string;
+    outputs: {
+        internalType: string;
+        name: string;
+        type: string;
+    }[];
+    stateMutability: string;
+    type: string;
+    anonymous?: undefined;
 })[];
 export { getABI, ABIS };

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

@@ -130,6 +130,14 @@ export declare const getConfigs: () => {
             };
         };
         proposals: any[];
+        psm: {
+            "rpsm-susds": {
+                id: string;
+                name: string;
+                contract: string;
+                rateProvider: string;
+            };
+        };
         pools: {
             stabilitypool: {
                 id: string;
@@ -166,6 +174,13 @@ export declare const getConfigs: () => {
                 decimals: number;
                 contract: string;
             };
+            susds: {
+                id: string;
+                name: string;
+                symbol: string;
+                decimals: number;
+                contract: string;
+            };
             xpm: {
                 id: string;
                 name: string;
@@ -390,6 +405,14 @@ declare const _default: {
                 };
             };
             proposals: any[];
+            psm: {
+                "rpsm-susds": {
+                    id: string;
+                    name: string;
+                    contract: string;
+                    rateProvider: string;
+                };
+            };
             pools: {
                 stabilitypool: {
                     id: string;
@@ -426,6 +449,13 @@ declare const _default: {
                     decimals: number;
                     contract: string;
                 };
+                susds: {
+                    id: string;
+                    name: string;
+                    symbol: string;
+                    decimals: number;
+                    contract: string;
+                };
                 xpm: {
                     id: string;
                     name: string;

package/dist/types/utils/errorDecoder.d.ts

@@ -1,37 +1,38 @@
-interface GeneratedErrorInfo {
+import { Interface, InterfaceAbi } from "ethers";
+export interface DecodedRevert {
     name: string;
-    signature: string;
-    message: string;
-    contract?: string;
-    inputs?: Array<{
-        name: string;
-        type: string;
-        internalType: string;
-    }>;
+    /** Argument values by name; unnamed/tuple arguments fall back to their positional index as a string key. */
+    args: Record<string, unknown>;
 }
 /**
- * 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`.
  */
-export declare function getErrorInfo(data?: string): GeneratedErrorInfo | null;
+export declare function decodeRevertWithAbi(abi: Interface | InterfaceAbi, data?: string): DecodedRevert | null;
 /**
- * Returns only the error name, or null if it cannot be decoded.
- */
-export declare function decodeErrorName(data?: string): string | null;
-/**
- * Returns the custom error message, or null if it cannot be decoded.
- */
-export declare function decodeErrorMessage(data?: string): string | null;
-/**
- * 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.
  */
-export declare function attachDecodedError(prefix: string, error: any): string;
+export declare function decodeRevertWithAllAbis(data?: string): DecodedRevert | null;
 /**
- * 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.
  */
-export declare function attachDecodedErrorMessage(prefix: string, error: any): string;
-export {};
+export declare function errorNameForSelector(selector: string, abi?: Interface | InterfaceAbi): string | null;

package/dist/types/utils/rpcError.d.ts

@@ -0,0 +1,52 @@
+import { ChainId } from "../configs/chains";
+export type RpcErrorCode = "USER_REJECTED" | "CONTRACT_REVERT" | "INSUFFICIENT_FUNDS" | "NETWORK" | "UNKNOWN";
+export interface RpcErrorContract {
+    id: string;
+    name: string;
+    address: string;
+}
+export interface RpcErrorParams {
+    code: RpcErrorCode;
+    action: string;
+    message: string;
+    contract?: RpcErrorContract;
+    errorName?: string;
+    selector?: string;
+    args?: Record<string, unknown>;
+    cause: unknown;
+}
+/**
+ * The one error type every `rpc` function throws. Replaces the ~5 inconsistent
+ * catch-block shapes in the codebase today (plain `new Error(\`Failed to…\`)`
+ * rewraps, ad hoc decoder string concatenation, raw rethrows, no handling at
+ * all) with one structure a consumer can actually branch on: skip
+ * `USER_REJECTED` without a toast, tag Sentry with `code`/`contract`/`errorName`
+ * instead of a free-text string.
+ */
+export declare class RpcError extends Error {
+    code: RpcErrorCode;
+    action: string;
+    contract?: RpcErrorContract;
+    errorName?: string;
+    selector?: string;
+    args?: Record<string, unknown>;
+    cause: unknown;
+    constructor(params: RpcErrorParams);
+}
+export interface ResolveContext {
+    chainId: ChainId;
+    /** The address the failed call was sent to, when the caller has it on hand. */
+    address?: string;
+}
+/**
+ * Builds an {@link RpcError} from whatever ethers, a wallet, or the network
+ * threw. Every `rpc` function's catch block calls this instead of hand-rolling
+ * its own rewrap.
+ *
+ * @param action - What was being attempted, e.g. "lendingPool.deposit".
+ * @param error - The error caught.
+ * @param resolve - The chain and, when known, the address that was called —
+ *   lets the error be decoded against that contract's own ABI instead of a
+ *   selector-only guess, and names the contract on the result.
+ */
+export declare function toRpcError(action: string, error: unknown, resolve?: ResolveContext): RpcError;

package/dist/utils/artifacts.js

@@ -56,6 +56,9 @@ const RAACBotLocker_json_1 = __importDefault(require("../artifacts/core/lockers/
 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;
@@ -150,6 +153,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

@@ -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"];
     const keys = Object.keys(config).filter((key) => chainKeys.includes(key));
     let address = null;
     for (const key of keys) {