add factory address validation, chainId to cache key

Author: d4mr

src/server/routes/backend-wallet/sendTransaction.ts

@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getAddress } from "thirdweb";
 import { queueTxRaw } from "../../../db/transactions/queueTxRaw";
 import { redis } from "../../../utils/redis/redis";
 import {
@@ -78,14 +79,19 @@ export async function sendTransaction(fastify: FastifyInstance) {
       const chainId = await getChainIdFromChain(chain);
 
       if (accountAddress && factoryAddress) {
-        // 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:${accountAddress.toLowerCase()}`,
-          factoryAddress,
-          "EX",
-          7 * 24 * 60 * 60,
-        );
+        try {
+          const validatedFactoryAddress = getAddress(factoryAddress);
+          // 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:${chainId}:${validatedFactoryAddress.toLowerCase()}`,
+            factoryAddress,
+            "EX",
+            7 * 24 * 60 * 60,
+          );
+        } catch {
+          // incorrect factory address provided, ignore for backwards compatibility
+        }
       }
 
       let queueId: string;

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

@@ -95,7 +95,12 @@ export const createAccount = async (fastify: FastifyInstance) => {
 
       // 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);
+      await redis.set(
+        `account-factory:${chainId}:${deployedAddress.toLowerCase()}`,
+        contractAddress,
+        "EX",
+        7 * 24 * 60 * 60,
+      );
 
       reply.status(StatusCodes.OK).send({
         result: {

src/server/routes/contract/write/write.ts

@@ -1,6 +1,7 @@
 import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
+import { getAddress } from "thirdweb";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getContract } from "../../../../utils/cache/getContract";
 import { redis } from "../../../../utils/redis/redis";
@@ -70,18 +71,24 @@ export async function writeToContract(fastify: FastifyInstance) {
         "x-account-factory-address": factoryAddress,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
+      const chainId = await getChainIdFromChain(chain);
+
       if (accountAddress && factoryAddress) {
-        // 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:${accountAddress.toLowerCase()}`,
-          factoryAddress,
-          "EX",
-          7 * 24 * 60 * 60,
-        );
+        try {
+          const validatedFactoryAddress = getAddress(factoryAddress);
+          // 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:${chainId}:${validatedFactoryAddress.toLowerCase()}`,
+            factoryAddress,
+            "EX",
+            7 * 24 * 60 * 60,
+          );
+        } catch {
+          // incorrect factory address provided, ignore for backwards compatibility
+        }
       }
 
-      const chainId = await getChainIdFromChain(chain);
       const contract = await getContract({
         chainId,
         contractAddress,

src/server/utils/wallets/getSmartWallet.ts

@@ -20,8 +20,9 @@ export const getSmartWallet = async ({
     // 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()}`)) ||
-      "";
+      (await redis.get(
+        `account-factory:${chainId}:${accountAddress.toLowerCase()}`,
+      )) || "";
   } catch {}
 
   if (!factoryAddress) {