Refactor delegation contract fetching with withCache utility

Co-authored-by: firekeeper <[email protected]>

Author: cursoragent

packages/thirdweb/src/wallets/in-app/core/eip7702/minimal-account.ts

@@ -27,6 +27,7 @@ import type { BundlerOptions } from "../../../smart/types.js";
 import { getDefaultBundlerUrl } from "../../../smart/lib/constants.js";
 import { getClientFetch } from "../../../../utils/fetch.js";
 import { stringify } from "../../../../utils/json.js";
+import { withCache } from "../../../../utils/promise/withCache.js";
 
 interface DelegationContractResponse {
   id: string;
@@ -36,10 +37,6 @@ interface DelegationContractResponse {
   };
 }
 
-// Cache for delegation contract address to avoid repeated requests
-let cachedDelegationContract: string | null = null;
-let cachePromise: Promise<string> | null = null;
-
 /**
  * Fetches the delegation contract address from the bundler using the tw_getDelegationContract RPC method
  * @internal
@@ -49,68 +46,54 @@ async function getDelegationContractAddress(args: {
   chain: Chain;
   bundlerUrl?: string;
 }): Promise<string> {
-  // Return cached result if available
-  if (cachedDelegationContract) {
-    return cachedDelegationContract;
-  }
-
-  // If there's already a request in progress, wait for it
-  if (cachePromise) {
-    return cachePromise;
-  }
-
-  // Create the promise and cache it
-  cachePromise = (async () => {
-    const { client, chain, bundlerUrl } = args;
-    const url = bundlerUrl ?? getDefaultBundlerUrl(chain);
-    const fetchWithHeaders = getClientFetch(client);
+  const { client, chain, bundlerUrl } = args;
+  const url = bundlerUrl ?? getDefaultBundlerUrl(chain);
+  
+  // Create a cache key based on the bundler URL to ensure we cache per chain/bundler
+  const cacheKey = `delegation-contract:${url}`;
+  
+  return withCache(
+    async () => {
+      const fetchWithHeaders = getClientFetch(client);
 
-    const response = await fetchWithHeaders(url, {
-      useAuthToken: true,
-      body: stringify({
-        id: 1,
-        jsonrpc: "2.0",
-        method: "tw_getDelegationContract",
-        params: [],
-      }),
-      headers: {
-        "Content-Type": "application/json",
-      },
-      method: "POST",
-    });
-
-    if (!response.ok) {
-      throw new Error(
-        `Failed to fetch delegation contract: ${response.status} ${response.statusText}`,
-      );
-    }
+      const response = await fetchWithHeaders(url, {
+        useAuthToken: true,
+        body: stringify({
+          id: 1,
+          jsonrpc: "2.0",
+          method: "tw_getDelegationContract",
+          params: [],
+        }),
+        headers: {
+          "Content-Type": "application/json",
+        },
+        method: "POST",
+      });
 
-    const result: DelegationContractResponse = await response.json();
-    
-    if ((result as any).error) {
-      throw new Error(
-        `Delegation contract RPC error: ${JSON.stringify((result as any).error)}`,
-      );
-    }
+      if (!response.ok) {
+        throw new Error(
+          `Failed to fetch delegation contract: ${response.status} ${response.statusText}`,
+        );
+      }
 
-    if (!result.result?.delegationContract) {
-      throw new Error(
-        "Invalid response: missing delegationContract in result",
-      );
-    }
+      const result: DelegationContractResponse = await response.json();
+      
+      if ((result as any).error) {
+        throw new Error(
+          `Delegation contract RPC error: ${JSON.stringify((result as any).error)}`,
+        );
+      }
 
-    // Cache the result
-    cachedDelegationContract = result.result.delegationContract;
-    return cachedDelegationContract;
-  })();
+      if (!result.result?.delegationContract) {
+        throw new Error(
+          "Invalid response: missing delegationContract in result",
+        );
+      }
 
-  try {
-    const result = await cachePromise;
-    return result;
-  } finally {
-    // Clear the promise cache after completion (success or failure)
-    cachePromise = null;
-  }
+      return result.result.delegationContract;
+    },
+    { cacheKey }
+  );
 }