@raac/rpc 2.0.0-beta.3 → 2.0.0-beta.5

package/dist/utils/errorDecoder.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.decodeRevertWithAbi = decodeRevertWithAbi;
 exports.decodeRevertWithAllAbis = decodeRevertWithAllAbis;
+exports.errorNameForSelector = errorNameForSelector;
 const ethers_1 = require("ethers");
 const artifacts_1 = require("./artifacts");
 /**
@@ -32,6 +33,22 @@ function decodeRevertWithAbi(abi, data) {
     return { name: parsed.name, args };
 }
 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;
+}
 /**
  * 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.
@@ -44,18 +61,29 @@ let ALL_ERRORS;
  * @returns The error name and its decoded arguments, or null if no known contract declares that selector.
  */
 function decodeRevertWithAllAbis(data) {
-    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);
-            }
+    return decodeRevertWithAbi(allErrors(), data);
+}
+/**
+ * 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 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.
         }
-        ALL_ERRORS = new ethers_1.Interface([...bySelector.values()]);
     }
-    return decodeRevertWithAbi(ALL_ERRORS, data);
+    return null;
 }

package/dist/utils/rpcError.js

@@ -51,6 +51,27 @@ function isUserRejection(error) {
     return codes.some((code) => REJECTION_CODES.has(code));
 }
 const NETWORK_CODES = new Set(["NETWORK_ERROR", "TIMEOUT", "SERVER_ERROR"]);
+const SELECTOR = /^0x[0-9a-fA-F]{8}$/;
+const SIGNATURE_IN_MESSAGE = /Encoded error signature "(0x[0-9a-fA-F]{8})"/;
+/**
+ * The revert selector when a client decoded the revert itself and threw only
+ * the selector. thirdweb does this: its send path decodes the revert data with
+ * viem against the contract's ABI, which it lacks behind the ethers adapter, so
+ * it throws viem's `AbiErrorSignatureNotFoundError` (selector on `.signature`
+ * and in the message) and drops the data.
+ */
+function selectorWithoutData(error) {
+    let current = error;
+    for (let depth = 0; current && typeof current === "object" && depth < 5; depth++) {
+        if (typeof current.signature === "string" && SELECTOR.test(current.signature))
+            return current.signature.toLowerCase();
+        const match = typeof current.message === "string" ? current.message.match(SIGNATURE_IN_MESSAGE) : null;
+        if (match)
+            return match[1].toLowerCase();
+        current = current.cause;
+    }
+    return undefined;
+}
 /**
  * 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
@@ -86,7 +107,7 @@ function toRpcError(action, error, resolve) {
         }
     }
     const data = err?.data ?? err?.error?.data ?? err?.info?.error?.data;
-    const selector = typeof data === "string" && /^0x[0-9a-fA-F]{8}/.test(data) ? data.slice(0, 10).toLowerCase() : undefined;
+    const selector = typeof data === "string" && /^0x[0-9a-fA-F]{8}/.test(data) ? data.slice(0, 10).toLowerCase() : selectorWithoutData(err);
     let errorName;
     let args;
     // ethers already decoded this against the ABI it used to make the call —
@@ -111,6 +132,9 @@ function toRpcError(action, error, resolve) {
             args = decoded.args;
         }
     }
+    if (!errorName && selector) {
+        errorName = (0, errorDecoder_1.errorNameForSelector)(selector, abi) ?? undefined;
+    }
     let code;
     if (errorName || selector || err?.code === "CALL_EXCEPTION") {
         code = "CONTRACT_REVERT";

package/package.json

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