fix: ERC-7821 return type

wevm · Feb 3, 2025 · c822da1 · c822da1
1 parent f5736ce
commit c822da1
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/.changeset/metal-apes-bake.md b/.changeset/metal-apes-bake.md
@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Fixed ERC-7821 `getExecuteError` return type.
diff --git a/src/experimental/erc7821/utils/getExecuteError.ts b/src/experimental/erc7821/utils/getExecuteError.ts
@@ -33,7 +33,7 @@ export function getExecuteError<const calls extends readonly unknown[]>(
     | (BaseError & { data?: Hex | undefined })
     | undefined
 
-  if (!error?.data) throw e
+  if (!error?.data) return e as never
   if (
     error.data ===
     AbiError.getSelector(AbiError.from('error FnSelectorNotRecognized()'))
@@ -55,12 +55,13 @@ export function getExecuteError<const calls extends readonly unknown[]>(
       matched = call
     } catch {}
   }
-  if (!matched) throw e
+  if (matched)
+    return getContractError(error as BaseError, {
+      abi: matched.abi as Abi,
+      address: matched.to,
+      args: matched.args,
+      functionName: matched.functionName,
+    })
 
-  return getContractError(error as BaseError, {
-    abi: matched.abi as Abi,
-    address: matched.to,
-    args: matched.args,
-    functionName: matched.functionName,
-  })
+  return e as never
 }