add "x-account-factory-address" header

Author: d4mr

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

@@ -2,6 +2,7 @@ import { Static, Type } from "@sinclair/typebox";
 import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { queueTxRaw } from "../../../db/transactions/queueTxRaw";
+import { redis } from "../../../utils/redis/redis";
 import {
   requestQuerystringSchema,
   standardResponseSchema,
@@ -72,9 +73,21 @@ export async function sendTransaction(fastify: FastifyInstance) {
         "x-backend-wallet-address": fromAddress,
         "x-idempotency-key": idempotencyKey,
         "x-account-address": accountAddress,
+        "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,
+        );
+      }
+
       let queueId: string;
       if (accountAddress) {
         const { id } = await queueTxRaw({

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

@@ -3,6 +3,7 @@ import { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { queueTx } from "../../../../db/transactions/queueTx";
 import { getContract } from "../../../../utils/cache/getContract";
+import { redis } from "../../../../utils/redis/redis";
 import { abiSchema } from "../../../schemas/contract";
 import {
   contractParamSchema,
@@ -66,8 +67,20 @@ export async function writeToContract(fastify: FastifyInstance) {
         "x-backend-wallet-address": walletAddress,
         "x-account-address": accountAddress,
         "x-idempotency-key": idempotencyKey,
+        "x-account-factory-address": factoryAddress,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
+      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,
+        );
+      }
+
       const chainId = await getChainIdFromChain(chain);
       const contract = await getContract({
         chainId,

src/server/schemas/wallet/index.ts

@@ -19,6 +19,11 @@ export const walletWithAAHeaderSchema = Type.Object({
       description: "Smart account address",
     }),
   ),
+  "x-account-factory-address": Type.Optional(
+    Type.String({
+      description: "Smart account factory address",
+    }),
+  ),
 });
 
 export const walletParamSchema = Type.Object({