add header to all v5 endpoints + fix SDK upgrade type incompatibilities

d4mr · d4mr · commit c0d83fc690d0 · 2025-01-09T08:04:56.000+05:30
diff --git a/src/server/routes/backend-wallet/send-transaction-batch.ts b/src/server/routes/backend-wallet/send-transaction-batch.ts
@@ -56,8 +56,10 @@ export async function sendTransactionBatch(fastify: FastifyInstance) {
     },
     handler: async (request, reply) => {
       const { chain } = request.params;
-      const { "x-backend-wallet-address": fromAddress } =
-        request.headers as Static<typeof walletHeaderSchema>;
+      const {
+        "x-backend-wallet-address": fromAddress,
+        "x-transaction-mode": transactionMode,
+      } = request.headers as Static<typeof walletHeaderSchema>;
       const chainId = await getChainIdFromChain(chain);
 
       const transactionRequests = request.body;
@@ -70,6 +72,7 @@ export async function sendTransactionBatch(fastify: FastifyInstance) {
           insertedTransaction: {
             isUserOp: false,
             chainId,
+            transactionMode,
             from: fromAddress as Address,
             to: toAddress as Address | undefined,
             data: data as Hex,
diff --git a/src/server/routes/backend-wallet/send-transaction.ts b/src/server/routes/backend-wallet/send-transaction.ts
@@ -72,6 +72,7 @@ export async function sendTransaction(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-address": accountAddress,
         "x-account-factory-address": accountFactoryAddress,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -89,6 +90,7 @@ export async function sendTransaction(fastify: FastifyInstance) {
             accountAddress: accountAddress as Address,
             signerAddress: fromAddress as Address,
             target: toAddress as Address | undefined,
+            transactionMode: undefined,
             accountFactoryAddress: maybeAddress(
               accountFactoryAddress,
               "x-account-factory-address",
@@ -106,6 +108,7 @@ export async function sendTransaction(fastify: FastifyInstance) {
             from: fromAddress as Address,
             to: toAddress as Address | undefined,
             data: data as Hex,
+            transactionMode: transactionMode,
             value: BigInt(value),
             ...parseTransactionOverrides(txOverrides),
           },
diff --git a/src/server/routes/backend-wallet/sign-transaction.ts b/src/server/routes/backend-wallet/sign-transaction.ts
@@ -1,8 +1,6 @@
 import { Type, type Static } from "@sinclair/typebox";
 import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
-import type { Hex } from "thirdweb";
-import type { TransactionSerializable } from "viem";
 import { getAccount } from "../../../shared/utils/account";
 import {
   getChecksumAddress,
@@ -13,6 +11,7 @@ import { toTransactionType } from "../../../shared/utils/sdk";
 import { createCustomError } from "../../middleware/error";
 import { standardResponseSchema } from "../../schemas/shared-api-schemas";
 import { walletHeaderSchema } from "../../schemas/wallet";
+import type { Hex } from "thirdweb";
 
 const requestBodySchema = Type.Object({
   transaction: Type.Object({
@@ -86,7 +85,8 @@ export async function signTransaction(fastify: FastifyInstance) {
         maxFeePerGas: maybeBigInt(transaction.maxFeePerGas),
         maxPriorityFeePerGas: maybeBigInt(transaction.maxPriorityFeePerGas),
         ccipReadEnabled: transaction.ccipReadEnabled,
-      } as TransactionSerializable;
+      };
+
       const signature = await account.signTransaction(serializableTransaction);
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/backend-wallet/simulate-transaction.ts b/src/server/routes/backend-wallet/simulate-transaction.ts
@@ -82,6 +82,7 @@ export async function simulateTransaction(fastify: FastifyInstance) {
       const {
         "x-backend-wallet-address": walletAddress,
         "x-account-address": accountAddress,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -99,6 +100,7 @@ export async function simulateTransaction(fastify: FastifyInstance) {
         functionArgs: args,
         data: data as Hex | undefined,
         value: value ? BigInt(value) : 0n,
+        transactionMode: transactionMode,
 
         ...(accountAddress
           ? {
diff --git a/src/server/routes/backend-wallet/transfer.ts b/src/server/routes/backend-wallet/transfer.ts
@@ -88,6 +88,7 @@ export async function transfer(fastify: FastifyInstance) {
       const {
         "x-backend-wallet-address": walletAddress,
         "x-idempotency-key": idempotencyKey,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletHeaderSchema>;
       const { simulateTx: shouldSimulate } = request.query;
 
@@ -109,6 +110,7 @@ export async function transfer(fastify: FastifyInstance) {
           value: toWei(amount),
           extension: "none",
           functionName: "transfer",
+          transactionMode,
           ...parseTransactionOverrides(txOverrides),
         };
       } else {
@@ -143,6 +145,7 @@ export async function transfer(fastify: FastifyInstance) {
           extension: "erc20",
           functionName: "transfer",
           functionArgs: [to, amount, currencyAddress],
+          transactionMode,
           ...parseTransactionOverrides(txOverrides),
         };
       }
diff --git a/src/server/routes/contract/extensions/account-factory/write/create-account.ts b/src/server/routes/contract/extensions/account-factory/write/create-account.ts
@@ -74,6 +74,7 @@ export const createAccount = async (fastify: FastifyInstance) => {
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
         "x-idempotency-key": idempotencyKey,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
       const chainId = await getChainIdFromChain(chain);
 
@@ -116,6 +117,7 @@ export const createAccount = async (fastify: FastifyInstance) => {
         txOverrides,
         idempotencyKey,
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       // Note: This is a temporary solution to cache the deployed address's factory for 7 days.
diff --git a/src/server/routes/contract/extensions/erc1155/write/claim-to.ts b/src/server/routes/contract/extensions/erc1155/write/claim-to.ts
@@ -83,6 +83,7 @@ export async function erc1155claimTo(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -113,6 +114,7 @@ export async function erc1155claimTo(fastify: FastifyInstance) {
         txOverrides,
         idempotencyKey,
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc1155/write/mint-to.ts b/src/server/routes/contract/extensions/erc1155/write/mint-to.ts
@@ -82,6 +82,7 @@ export async function erc1155mintTo(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(_chain);
@@ -129,6 +130,7 @@ export async function erc1155mintTo(fastify: FastifyInstance) {
         extension: "erc1155",
         functionName: "mintTo",
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc1155/write/transfer-from.ts b/src/server/routes/contract/extensions/erc1155/write/transfer-from.ts
@@ -87,6 +87,7 @@ export async function erc1155transferFrom(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -117,6 +118,7 @@ export async function erc1155transferFrom(fastify: FastifyInstance) {
         shouldSimulate: simulateTx,
         functionName: "safeTransferFrom",
         extension: "erc1155",
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc1155/write/transfer.ts b/src/server/routes/contract/extensions/erc1155/write/transfer.ts
@@ -79,6 +79,7 @@ export async function erc1155transfer(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -109,6 +110,7 @@ export async function erc1155transfer(fastify: FastifyInstance) {
         shouldSimulate: simulateTx,
         functionName: "safeTransferFrom",
         extension: "erc1155",
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc20/write/claim-to.ts b/src/server/routes/contract/extensions/erc20/write/claim-to.ts
@@ -77,6 +77,7 @@ export async function erc20claimTo(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -105,6 +106,7 @@ export async function erc20claimTo(fastify: FastifyInstance) {
         txOverrides,
         idempotencyKey,
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc20/write/mint-to.ts b/src/server/routes/contract/extensions/erc20/write/mint-to.ts
@@ -75,6 +75,7 @@ export async function erc20mintTo(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(_chain);
@@ -106,6 +107,7 @@ export async function erc20mintTo(fastify: FastifyInstance) {
         extension: "erc20",
         functionName: "mintTo",
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc20/write/transfer-from.ts b/src/server/routes/contract/extensions/erc20/write/transfer-from.ts
@@ -81,6 +81,7 @@ export async function erc20TransferFrom(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -109,6 +110,7 @@ export async function erc20TransferFrom(fastify: FastifyInstance) {
         shouldSimulate: simulateTx,
         functionName: "transferFrom",
         extension: "erc20",
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc20/write/transfer.ts b/src/server/routes/contract/extensions/erc20/write/transfer.ts
@@ -74,6 +74,7 @@ export async function erc20Transfer(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -101,6 +102,7 @@ export async function erc20Transfer(fastify: FastifyInstance) {
         shouldSimulate: simulateTx,
         functionName: "transfer",
         extension: "erc20",
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc721/write/claim-to.ts b/src/server/routes/contract/extensions/erc721/write/claim-to.ts
@@ -78,6 +78,7 @@ export async function erc721claimTo(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -106,6 +107,7 @@ export async function erc721claimTo(fastify: FastifyInstance) {
         txOverrides,
         idempotencyKey,
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc721/write/mint-to.ts b/src/server/routes/contract/extensions/erc721/write/mint-to.ts
@@ -78,6 +78,7 @@ export async function erc721mintTo(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(_chain);
@@ -123,6 +124,7 @@ export async function erc721mintTo(fastify: FastifyInstance) {
         extension: "erc721",
         functionName: "mintTo",
         shouldSimulate: simulateTx,
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc721/write/signature-mint.ts b/src/server/routes/contract/extensions/erc721/write/signature-mint.ts
@@ -87,6 +87,7 @@ export async function erc721SignatureMint(fastify: FastifyInstance) {
         "x-backend-wallet-address": fromAddress,
         "x-account-address": accountAddress,
         "x-idempotency-key": idempotencyKey,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
       const { "x-thirdweb-sdk-version": sdkVersion } =
         request.headers as Static<typeof thirdwebSdkVersionSchema>;
@@ -133,6 +134,7 @@ export async function erc721SignatureMint(fastify: FastifyInstance) {
               accountAddress: accountAddress as Address,
               signerAddress: fromAddress as Address,
               target: contractAddress as Address | undefined,
+              transactionMode: undefined,
             },
             shouldSimulate: simulateTx,
             idempotencyKey,
@@ -142,6 +144,7 @@ export async function erc721SignatureMint(fastify: FastifyInstance) {
             insertedTransaction: {
               ...insertedTransaction,
               isUserOp: false,
+              transactionMode,
             },
             shouldSimulate: simulateTx,
             idempotencyKey,
diff --git a/src/server/routes/contract/extensions/erc721/write/transfer-from.ts b/src/server/routes/contract/extensions/erc721/write/transfer-from.ts
@@ -79,6 +79,7 @@ export async function erc721transferFrom(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -107,6 +108,7 @@ export async function erc721transferFrom(fastify: FastifyInstance) {
         shouldSimulate: simulateTx,
         functionName: "transferFrom",
         extension: "erc721",
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/extensions/erc721/write/transfer.ts b/src/server/routes/contract/extensions/erc721/write/transfer.ts
@@ -72,6 +72,7 @@ export async function erc721transfer(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -100,6 +101,7 @@ export async function erc721transfer(fastify: FastifyInstance) {
         shouldSimulate: simulateTx,
         functionName: "transferFrom",
         extension: "erc721",
+        transactionMode,
       });
 
       reply.status(StatusCodes.OK).send({
diff --git a/src/server/routes/contract/write/write.ts b/src/server/routes/contract/write/write.ts
@@ -77,6 +77,7 @@ export async function writeToContract(fastify: FastifyInstance) {
         "x-idempotency-key": idempotencyKey,
         "x-account-factory-address": accountFactoryAddress,
         "x-account-salt": accountSalt,
+        "x-transaction-mode": transactionMode,
       } = request.headers as Static<typeof walletWithAAHeaderSchema>;
 
       const chainId = await getChainIdFromChain(chain);
@@ -128,6 +129,7 @@ export async function writeToContract(fastify: FastifyInstance) {
         accountSalt,
         txOverrides,
         idempotencyKey,
+        transactionMode,
         shouldSimulate: simulateTx,
       });
 
diff --git a/src/server/schemas/wallet/index.ts b/src/server/schemas/wallet/index.ts
@@ -16,6 +16,19 @@ export const walletHeaderSchema = Type.Object({
       description: `Transactions submitted with the same idempotency key will be de-duplicated. Only the last ${env.TRANSACTION_HISTORY_COUNT} transactions are compared.`,
     }),
   ),
+  "x-transaction-mode": Type.Optional(
+    Type.Union(
+      [
+        Type.Literal("sponsored", {
+          description: "Attmpt to use native AA on ZKSync chains",
+        }),
+      ],
+      {
+        description:
+          "Transaction mode to use for EOA transactions. Will be ignored if using a smart wallet. If omitted, defaults to regular EOA transactions.",
+      },
+    ),
+  ),
 });
 
 export const walletWithAAHeaderSchema = Type.Object({
diff --git a/src/server/utils/wallets/get-aws-kms-account.ts b/src/server/utils/wallets/get-aws-kms-account.ts
diff --git a/src/server/utils/wallets/get-gcp-kms-account.ts b/src/server/utils/wallets/get-gcp-kms-account.ts
diff --git a/src/shared/db/transactions/queue-tx.ts b/src/shared/db/transactions/queue-tx.ts
diff --git a/src/shared/utils/transaction/queue-transation.ts b/src/shared/utils/transaction/queue-transation.ts
diff --git a/src/shared/utils/transaction/simulate-queued-transaction.ts b/src/shared/utils/transaction/simulate-queued-transaction.ts
diff --git a/src/shared/utils/transaction/types.ts b/src/shared/utils/transaction/types.ts
diff --git a/src/worker/tasks/send-transaction-worker.ts b/src/worker/tasks/send-transaction-worker.ts
