refactor(vault-v2): introduce isUnknownOfFactoryError utility for improved error handling

Author: Foulks-Plb

packages/blue-sdk-viem/src/error.ts

@@ -0,0 +1,18 @@
+import { BaseError, ContractFunctionRevertedError } from "viem";
+
+/**
+ * Checks if an error is a contract revert with the "UnknownOfFactory" error name.
+ * Used to propagate factory validation errors instead of falling back to multicall.
+ */
+export function isUnknownOfFactoryError(error: unknown): boolean {
+  if (!(error instanceof BaseError)) return false;
+
+  const revertError = error.walk(
+    (err) => err instanceof ContractFunctionRevertedError,
+  );
+
+  return (
+    revertError instanceof ContractFunctionRevertedError &&
+    revertError.data?.errorName === "UnknownOfFactory"
+  );
+}

packages/blue-sdk-viem/src/fetch/vault-v2/VaultV2.ts

@@ -10,9 +10,7 @@ import {
 } from "@morpho-org/blue-sdk";
 import {
   type Address,
-  BaseError,
   type Client,
-  ContractFunctionRevertedError,
   type Hash,
   erc20Abi,
   zeroAddress,
@@ -24,6 +22,7 @@ import {
   vaultV2Abi,
   vaultV2FactoryAbi,
 } from "../../abis";
+import { isUnknownOfFactoryError } from "../../error";
 import { abi, code } from "../../queries/vault-v2/GetVaultV2";
 import type { DeploylessFetchParameters } from "../../types";
 import { fetchToken } from "../Token";
@@ -73,17 +72,7 @@ export async function fetchVaultV2(
       });
     } catch (error) {
       if (deployless === "force") throw error;
-
-      if (error instanceof BaseError) {
-        const revertError = error.walk(
-          (err) => err instanceof ContractFunctionRevertedError,
-        );
-        if (
-          revertError instanceof ContractFunctionRevertedError &&
-          revertError.data?.errorName === "UnknownOfFactory"
-        )
-          throw error;
-      }
+      if (isUnknownOfFactoryError(error)) throw error;
       // Fallback to multicall if deployless call fails.
     }
   }

packages/blue-sdk-viem/src/fetch/vault-v2/VaultV2MorphoMarketV1Adapter.ts

@@ -5,17 +5,13 @@ import {
   VaultV2MorphoMarketV1Adapter,
   getChainAddresses,
 } from "@morpho-org/blue-sdk";
-import {
-  type Address,
-  BaseError,
-  type Client,
-  ContractFunctionRevertedError,
-} from "viem";
+import type { Address, Client } from "viem";
 import { getChainId, readContract } from "viem/actions";
 import {
   morphoMarketV1AdapterAbi,
   morphoMarketV1AdapterFactoryAbi,
 } from "../../abis";
+import { isUnknownOfFactoryError } from "../../error";
 import {
   abi,
   code,
@@ -56,18 +52,8 @@ export async function fetchVaultV2MorphoMarketV1Adapter(
       });
     } catch (error) {
       if (deployless === "force") throw error;
+      if (isUnknownOfFactoryError(error)) throw error;
       // Fallback to multicall if deployless call fails.
-
-      if (error instanceof BaseError) {
-        const revertError = error.walk(
-          (err) => err instanceof ContractFunctionRevertedError,
-        );
-        if (
-          revertError instanceof ContractFunctionRevertedError &&
-          revertError.data?.errorName === "UnknownOfFactory"
-        )
-          throw error;
-      }
     }
   }
 

packages/blue-sdk-viem/src/fetch/vault-v2/VaultV2MorphoMarketV1AdapterV2.ts

@@ -7,17 +7,13 @@ import {
   getChainAddresses,
 } from "@morpho-org/blue-sdk";
 import { fromEntries } from "@morpho-org/morpho-ts";
-import {
-  type Address,
-  BaseError,
-  type Client,
-  ContractFunctionRevertedError,
-} from "viem";
+import type { Address, Client } from "viem";
 import { getChainId, readContract } from "viem/actions";
 import {
   morphoMarketV1AdapterV2Abi,
   morphoMarketV1AdapterV2FactoryAbi,
 } from "../../abis";
+import { isUnknownOfFactoryError } from "../../error";
 import {
   abi,
   code,
@@ -67,18 +63,8 @@ export async function fetchVaultV2MorphoMarketV1AdapterV2(
       });
     } catch (error) {
       if (deployless === "force") throw error;
+      if (isUnknownOfFactoryError(error)) throw error;
       // Fallback to multicall if deployless call fails.
-
-      if (error instanceof BaseError) {
-        const revertError = error.walk(
-          (err) => err instanceof ContractFunctionRevertedError,
-        );
-        if (
-          revertError instanceof ContractFunctionRevertedError &&
-          revertError.data?.errorName === "UnknownOfFactory"
-        )
-          throw error;
-      }
     }
   }
 

packages/blue-sdk-viem/src/fetch/vault-v2/VaultV2MorphoVaultV1Adapter.ts

@@ -5,18 +5,13 @@ import {
   VaultV2MorphoVaultV1Adapter,
   getChainAddresses,
 } from "@morpho-org/blue-sdk";
-import {
-  type Address,
-  BaseError,
-  type Client,
-  ContractFunctionRevertedError,
-  erc20Abi,
-} from "viem";
+import { type Address, type Client, erc20Abi } from "viem";
 import { getChainId, readContract } from "viem/actions";
 import {
   morphoVaultV1AdapterAbi,
   morphoVaultV1AdapterFactoryAbi,
 } from "../../abis";
+import { isUnknownOfFactoryError } from "../../error";
 import {
   abi,
   code,
@@ -50,18 +45,8 @@ export async function fetchVaultV2MorphoVaultV1Adapter(
       return new VaultV2MorphoVaultV1Adapter({ ...adapter, address });
     } catch (error) {
       if (deployless === "force") throw error;
+      if (isUnknownOfFactoryError(error)) throw error;
       // Fallback to multicall if deployless call fails.
-
-      if (error instanceof BaseError) {
-        const revertError = error.walk(
-          (err) => err instanceof ContractFunctionRevertedError,
-        );
-        if (
-          revertError instanceof ContractFunctionRevertedError &&
-          revertError.data?.errorName === "UnknownOfFactory"
-        )
-          throw error;
-      }
     }
   }