Implement dynamic delegation contract fetching for minimal account

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

Author: cursoragent

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

@@ -24,9 +24,96 @@ import {
   getQueuedTransactionHash,
 } from "../../../smart/lib/bundler.js";
 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";
+
+interface DelegationContractResponse {
+  id: string;
+  jsonrpc: string;
+  result: {
+    delegationContract: string;
+  };
+}
+
+// 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
+ */
+async function getDelegationContractAddress(args: {
+  client: ThirdwebClient;
+  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 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 result: DelegationContractResponse = await response.json();
+    
+    if ((result as any).error) {
+      throw new Error(
+        `Delegation contract RPC error: ${JSON.stringify((result as any).error)}`,
+      );
+    }
+
+    if (!result.result?.delegationContract) {
+      throw new Error(
+        "Invalid response: missing delegationContract in result",
+      );
+    }
+
+    // Cache the result
+    cachedDelegationContract = result.result.delegationContract;
+    return cachedDelegationContract;
+  })();
+
+  try {
+    const result = await cachePromise;
+    return result;
+  } finally {
+    // Clear the promise cache after completion (success or failure)
+    cachePromise = null;
+  }
+}
+
 
-const MINIMAL_ACCOUNT_IMPLEMENTATION_ADDRESS =
-  "0xD6999651Fc0964B9c6B444307a0ab20534a66560";
 
 export const create7702MinimalAccount = (args: {
   client: ThirdwebClient;
@@ -49,7 +136,11 @@ export const create7702MinimalAccount = (args: {
     });
     // check if account has been delegated already
     let authorization: SignedAuthorization | undefined;
-    const isMinimalAccount = await is7702MinimalAccount(eoaContract);
+    const delegationContractAddress = await getDelegationContractAddress({
+      client,
+      chain,
+    });
+    const isMinimalAccount = await is7702MinimalAccount(eoaContract, delegationContractAddress);
     if (!isMinimalAccount) {
       // if not, sign authorization
       let nonce = firstTx.nonce
@@ -58,12 +149,12 @@ export const create7702MinimalAccount = (args: {
             await getNonce({
               client,
               address: adminAccount.address,
-              chain: getCachedChain(firstTx.chainId),
+              chain,
             }),
           );
       nonce += sponsorGas ? 0n : 1n;
       const auth = await adminAccount.signAuthorization?.({
-        address: MINIMAL_ACCOUNT_IMPLEMENTATION_ADDRESS,
+        address: getAddress(delegationContractAddress),
         chainId: firstTx.chainId,
         nonce,
       });
@@ -131,7 +222,7 @@ export const create7702MinimalAccount = (args: {
     const executeTx = execute({
       calls: txs.map((tx) => ({
         data: tx.data ?? "0x",
-        target: tx.to ?? "",
+        target: getAddress(tx.to ?? ""),
         value: tx.value ?? 0n,
       })),
       contract: eoaContract,
@@ -228,7 +319,7 @@ async function getNonce(args: {
     "../../../../rpc/actions/eth_getTransactionCount.js"
   ).then(({ eth_getTransactionCount }) =>
     eth_getTransactionCount(rpcRequest, {
-      address,
+      address: getAddress(address),
       blockTag: "pending",
     }),
   );
@@ -238,14 +329,14 @@ async function getNonce(args: {
 async function is7702MinimalAccount(
   // biome-ignore lint/suspicious/noExplicitAny: TODO properly type tw contract
   eoaContract: ThirdwebContract<any>,
+  delegationContractAddress: string,
 ): Promise<boolean> {
   const code = await getBytecode(eoaContract);
   const isDelegated = code.length > 0 && code.startsWith("0xef0100");
   const target = `0x${code.slice(8, 48)}`;
   return (
     isDelegated &&
-    target.toLowerCase() ===
-      MINIMAL_ACCOUNT_IMPLEMENTATION_ADDRESS.toLowerCase()
+    target.toLowerCase() === delegationContractAddress.toLowerCase()
   );
 }