Cache smart wallet account factory address (#585)

* Cache smart wallet account factory address

* Fix import path

* Absolute import path

* Clean up re: comments

* fix types

* updatde logic on processTx for UserOps to check for account created onchain and then only process

---------

Co-authored-by: farhanW3 <farhan@thirdweb.com>

Author: jakeloo

src/server/routes/contract/extensions/accountFactory/write/createAccount.ts

@@ -12,6 +12,7 @@ import {
 import { txOverridesWithValueSchema } from "../../../../../schemas/txOverrides";
 import { walletWithAAHeaderSchema } from "../../../../../schemas/wallet";
 import { getChainIdFromChain } from "../../../../../utils/chain";
+import { redis } from "utils/redis/redis";
 
 const requestBodySchema = Type.Object({
   adminAddress: Type.String({
@@ -92,6 +93,10 @@ export const createAccount = async (fastify: FastifyInstance) => {
         txOverrides,
       });
 
+      // Note: This is a temporary solution to cache the deployed address's factory for 7 days.
+      // This is needed due to a potential race condition of submitting a transaction immediately after creating an account that is not yet mined onchain
+      await redis.set(`account-factory:${deployedAddress.toLowerCase()}`, contractAddress, 'EX', 7 * 24 * 60 * 60);
+
       reply.status(StatusCodes.OK).send({
         result: {
           queueId,

src/server/utils/wallets/getSmartWallet.ts

@@ -1,6 +1,7 @@
 import { EVMWallet, SmartWallet } from "@thirdweb-dev/wallets";
 import { getContract } from "../../../utils/cache/getContract";
 import { env } from "../../../utils/env";
+import { redis } from "utils/redis/redis";
 
 interface GetSmartWalletParams {
   chainId: number;
@@ -13,17 +14,27 @@ export const getSmartWallet = async ({
   backendWallet,
   accountAddress,
 }: GetSmartWalletParams) => {
-  let factoryAddress: string;
+  let factoryAddress: string = "";
+
   try {
-    const contract = await getContract({
-      chainId,
-      contractAddress: accountAddress,
-    });
-    factoryAddress = await contract.call("factory");
+    // Note: This is a temporary solution to use cached deployed address's factory address from create-account
+    // This is needed due to a potential race condition of submitting a transaction immediately after creating an account that is not yet mined onchain
+    factoryAddress = (await redis.get(`account-factory:${accountAddress.toLowerCase()}`)) || "";
   } catch {
-    throw new Error(
-      `Failed to find factory address for account '${accountAddress}' on chain '${chainId}'`,
-    );
+  }
+
+  if (!factoryAddress) {
+    try {
+      const contract = await getContract({
+        chainId,
+        contractAddress: accountAddress,
+      });
+      factoryAddress = await contract.call("factory");
+    } catch {
+      throw new Error(
+        `Failed to find factory address for account '${accountAddress}' on chain '${chainId}'`,
+      );
+    }
   }
 
   const smartWallet = new SmartWallet({

src/worker/tasks/processTx.ts

@@ -9,6 +9,8 @@ import {
 import { ERC4337EthersSigner } from "@thirdweb-dev/wallets/dist/declarations/src/evm/connectors/smart-wallet/lib/erc4337-signer";
 import { ethers } from "ethers";
 import { BigNumber } from "ethers/lib/ethers";
+import { getContractAddress } from "ethers/lib/utils";
+import { redis } from "utils/redis/redis";
 import { RpcResponse } from "viem/_types/utils/rpc";
 import { prisma } from "../../db/client";
 import { getQueuedTxs } from "../../db/transactions/getQueuedTxs";
@@ -35,7 +37,6 @@ import {
 } from "../../utils/webhook";
 import { randomNonce } from "../utils/nonce";
 import { getWithdrawValue } from "../utils/withdraw";
-import { getContractAddress } from "ethers/lib/utils";
 
 type RpcResponseData = {
   tx: Transactions;
@@ -381,6 +382,38 @@ export const processTx = async () => {
               walletAddress: tx.signerAddress!,
               accountAddress: tx.accountAddress!,
             });
+
+            // Check if the Smart Account is deployed onchain before sending the user op
+            // check Redis cache for account deployed code
+            const cachedAccountDeployedCode = await redis.get(
+              `account-deployed:${tx.accountAddress!.toLowerCase()}`,
+            );
+
+            // if not found in cache, fetch from chain and set in cache once
+            if (!cachedAccountDeployedCode) {
+              const accountDeployedCode = await sdk
+                .getProvider()
+                .getCode(tx.accountAddress!);
+
+              if (accountDeployedCode === "0x") {
+                logger({
+                  service: "worker",
+                  level: "warn",
+                  queueId: tx.id,
+                  message: `Account not deployed. Skipping`,
+                });
+
+                return;
+              }
+
+              await redis.set(
+                `account-deployed:${tx.accountAddress!.toLowerCase()}`,
+                accountDeployedCode,
+                "EX",
+                60 * 60 * 24,
+              );
+            }
+
             const signer = sdk.getSigner() as ERC4337EthersSigner;
 
             const nonce = randomNonce();

tsconfig.json

@@ -10,7 +10,8 @@
     "emitDecoratorMetadata": true,
     "skipLibCheck": true,
     "allowJs": true,
-    "resolveJsonModule": true
+    "resolveJsonModule": true,
+    "baseUrl": "src"
   },
   "ts-node": {
     "esm": true,