🐛 common: handle viem reverts

Author: dieguezguille

common/revertReason.ts

@@ -1,25 +1,38 @@
-import { BaseError, ContractFunctionRevertedError } from "viem";
+type ContractFunctionReverted = {
+  data?: { args?: readonly unknown[]; errorName?: string };
+  name: "ContractFunctionRevertedError";
+  reason?: string;
+  signature?: string;
+};
 
 type Fallback = "message" | "name" | "string" | "unknown";
 
 export default function revertReason(
   error?: unknown,
   { fallback = "name", withArguments = false }: { fallback?: Fallback; withArguments?: boolean } = {},
 ): string {
-  const cause = error instanceof BaseError ? error.walk((r) => r instanceof ContractFunctionRevertedError) : undefined;
-  return cause instanceof ContractFunctionRevertedError
-    ? withArguments && cause.data?.errorName
-      ? `${cause.data.errorName}(${cause.data.args?.map(String).join(",") ?? ""})`
-      : (cause.data?.errorName ?? cause.reason ?? cause.signature ?? "unknown")
-    : fallback === "message"
-      ? error instanceof Error
-        ? error.message
-        : String(error)
-      : fallback === "string"
-        ? String(error)
-        : fallback === "unknown"
-          ? "unknown"
-          : error instanceof Error
-            ? error.name
-            : "unknown";
+  const cause = findRevertedCause(error);
+  if (cause) {
+    if (withArguments && cause.data?.errorName) {
+      return `${cause.data.errorName}(${cause.data.args?.map(String).join(",") ?? ""})`;
+    }
+    return cause.data?.errorName ?? cause.reason ?? cause.signature ?? "unknown";
+  }
+  if (fallback === "message") return error instanceof Error ? error.message : String(error);
+  if (fallback === "string") return String(error);
+  if (fallback === "unknown") return "unknown";
+  return error instanceof Error ? error.name : "unknown";
+}
+
+export function findRevertedCause(error: unknown): ContractFunctionReverted | undefined {
+  for (
+    let cause: unknown = error;
+    cause != null && typeof cause === "object";
+    cause = (cause as { cause?: unknown }).cause
+  ) {
+    if ("name" in cause && (cause as { name?: unknown }).name === "ContractFunctionRevertedError") {
+      return cause as ContractFunctionReverted;
+    }
+  }
+  return undefined;
 }

src/utils/reportError.ts

@@ -1,7 +1,6 @@
 import { captureException, withScope } from "@sentry/react-native";
-import { BaseError, ContractFunctionRevertedError } from "viem";
 
-import revertReason from "@exactly/common/revertReason";
+import revertReason, { findRevertedCause } from "@exactly/common/revertReason";
 
 export default function reportError(error: unknown, hint?: Parameters<typeof captureException>[1]) {
   const parsed = parseError(error);
@@ -104,7 +103,7 @@ function parseError(error: unknown) {
             root.message.length > 0
           ? normalizeMessage(root.message)
           : undefined;
-  const revert = error instanceof BaseError && error.walk((r) => r instanceof ContractFunctionRevertedError) !== null;
+  const revert = findRevertedCause(error) !== undefined;
   const reason = revertReason(error, { fallback: "unknown" });
   return { code, message, name, reason, revert, status };
 }