From 92cbb2974b96d87487afebec4628165823ebfbca Mon Sep 17 00:00:00 2001 From: Prithvish Baidya Date: Fri, 28 Feb 2025 20:30:07 +0530 Subject: [PATCH] fix non sbw flow for AA atomic transactions --- .../backend-wallet/send-transaction-batch-atomic.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/server/routes/backend-wallet/send-transaction-batch-atomic.ts b/src/server/routes/backend-wallet/send-transaction-batch-atomic.ts index 80506b6e..5aa29c22 100644 --- a/src/server/routes/backend-wallet/send-transaction-batch-atomic.ts +++ b/src/server/routes/backend-wallet/send-transaction-batch-atomic.ts @@ -1,7 +1,7 @@ import { Type, type Static } from "@sinclair/typebox"; import type { FastifyInstance } from "fastify"; import { StatusCodes } from "http-status-codes"; -import type { Address, Hex } from "thirdweb"; +import { getAddress, type Address, type Hex } from "thirdweb"; import { insertTransaction } from "../../../shared/utils/transaction/insert-transaction"; import { requestQuerystringSchema, @@ -29,7 +29,9 @@ const requestBodySchema = Type.Object({ }), }); -export async function sendTransactionBatchAtomicRoute(fastify: FastifyInstance) { +export async function sendTransactionBatchAtomicRoute( + fastify: FastifyInstance, +) { fastify.route<{ Params: Static; Body: Static; @@ -113,8 +115,10 @@ export async function sendTransactionBatchAtomicRoute(fastify: FastifyInstance) const queueId = await insertTransaction({ insertedTransaction: { + ...(hasSmartHeaders + ? { isUserOp: true, signerAddress: getAddress(fromAddress) } + : { isUserOp: false }), transactionMode: undefined, - isUserOp: false, chainId, from: fromAddress as Address, accountAddress: maybeAddress(accountAddress, "x-account-address"),