Merge remote-tracking branch 'origin/main' into ph/cancelNonce

Author: arcoraven

package.json

@@ -101,7 +101,7 @@
     "schema": "./src/prisma/schema.prisma"
   },
   "resolutions": {
-    "@thirdweb-dev/auth/**/axios": ">=1.7.4",
+    "@thirdweb-dev/auth/**/axios": ">=1.7.8",
     "@thirdweb-dev/auth/**/web3-utils": ">=4.2.1",
     "ethers-gcp-kms-signer/**/protobufjs": ">=7.2.5",
     "fastify/**/find-my-way": ">=8.2.2",

src/db/wallets/walletNonce.ts

@@ -250,18 +250,19 @@ export const inspectNonce = async (chainId: number, walletAddress: Address) => {
 };
 
 /**
- * Delete all wallet nonces. Useful when they get out of sync.
+ * Delete nonce state for the provided wallets.
+ * @param backendWallets
  */
-export const deleteAllNonces = async () => {
-  const keys = [
-    ...(await redis.keys("nonce:*")),
-    ...(await redis.keys("nonce-recycled:*")),
-    ...(await redis.keys("sent-nonce:*")),
-  ];
-  if (keys.length > 0) {
-    await redis.del(keys);
-  }
-};
+export async function deleteNoncesForBackendWallets(
+  backendWallets: { chainId: number; walletAddress: Address }[],
+) {
+  const keys = backendWallets.flatMap(({ chainId, walletAddress }) => [
+    lastUsedNonceKey(chainId, walletAddress),
+    recycledNoncesKey(chainId, walletAddress),
+    sentNoncesKey(chainId, walletAddress),
+  ]);
+  await redis.del(keys);
+}
 
 /**
  * Resync the nonce to the higher of (db nonce, onchain nonce).

src/server/index.ts

@@ -65,6 +65,7 @@ export const initServer = async () => {
 
   // Start the server with middleware.
   const server: FastifyInstance = fastify({
+    maxParamLength: 200,
     connectionTimeout: SERVER_CONNECTION_TIMEOUT,
     disableRequestLogging: true,
     trustProxy,

src/server/routes/backend-wallet/reset-nonces.ts

@@ -0,0 +1,96 @@
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
+import { StatusCodes } from "http-status-codes";
+import { getAddress } from "thirdweb";
+import {
+  deleteNoncesForBackendWallets,
+  getUsedBackendWallets,
+  syncLatestNonceFromOnchain,
+} from "../../../db/wallets/walletNonce";
+import { AddressSchema } from "../../schemas/address";
+import { standardResponseSchema } from "../../schemas/sharedApiSchemas";
+
+const requestBodySchema = Type.Object({
+  chainId: Type.Optional(
+    Type.Number({
+      description: "The chain ID to reset nonces for.",
+    }),
+  ),
+  walletAddress: Type.Optional({
+    ...AddressSchema,
+    description:
+      "The backend wallet address to reset nonces for. Omit to reset all backend wallets.",
+  }),
+});
+
+const responseSchema = Type.Object({
+  result: Type.Object({
+    status: Type.String(),
+    count: Type.Number({
+      description: "The number of backend wallets processed.",
+    }),
+  }),
+});
+
+responseSchema.example = {
+  result: {
+    status: "success",
+    count: 1,
+  },
+};
+
+export const resetBackendWalletNoncesRoute = async (
+  fastify: FastifyInstance,
+) => {
+  fastify.route<{
+    Reply: Static<typeof responseSchema>;
+    Body: Static<typeof requestBodySchema>;
+  }>({
+    method: "POST",
+    url: "/backend-wallet/reset-nonces",
+    schema: {
+      summary: "Reset nonces",
+      description:
+        "Reset nonces for all backend wallets. This is for debugging purposes and does not impact held tokens.",
+      tags: ["Backend Wallet"],
+      operationId: "resetNonces",
+      body: requestBodySchema,
+      response: {
+        ...standardResponseSchema,
+        [StatusCodes.OK]: responseSchema,
+      },
+    },
+    handler: async (req, reply) => {
+      const { chainId, walletAddress: _walletAddress } = req.body;
+
+      // If chain+wallet are provided, only process that wallet.
+      // Otherwise process all used wallets that has nonce state.
+      const backendWallets =
+        chainId && _walletAddress
+          ? [{ chainId, walletAddress: getAddress(_walletAddress) }]
+          : await getUsedBackendWallets();
+
+      const RESYNC_BATCH_SIZE = 50;
+      for (let i = 0; i < backendWallets.length; i += RESYNC_BATCH_SIZE) {
+        const batch = backendWallets.slice(i, i + RESYNC_BATCH_SIZE);
+
+        // Delete nonce state for these backend wallets.
+        await deleteNoncesForBackendWallets(backendWallets);
+
+        // Resync nonces for these backend wallets.
+        await Promise.allSettled(
+          batch.map(({ chainId, walletAddress }) =>
+            syncLatestNonceFromOnchain(chainId, walletAddress),
+          ),
+        );
+      }
+
+      reply.status(StatusCodes.OK).send({
+        result: {
+          status: "success",
+          count: backendWallets.length,
+        },
+      });
+    },
+  });
+};

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

@@ -20,7 +20,7 @@ import { getTransactionsForBackendWallet } from "./backend-wallet/getTransaction
 import { getTransactionsForBackendWalletByNonce } from "./backend-wallet/getTransactionsByNonce";
 import { importBackendWallet } from "./backend-wallet/import";
 import { removeBackendWallet } from "./backend-wallet/remove";
-import { resetBackendWalletNonces } from "./backend-wallet/resetNonces";
+import { resetBackendWalletNoncesRoute } from "./backend-wallet/reset-nonces";
 import { sendTransaction } from "./backend-wallet/sendTransaction";
 import { sendTransactionBatch } from "./backend-wallet/sendTransactionBatch";
 import { signMessageRoute } from "./backend-wallet/signMessage";
@@ -129,8 +129,9 @@ export async function withRoutes(fastify: FastifyInstance) {
   await fastify.register(signTypedData);
   await fastify.register(getTransactionsForBackendWallet);
   await fastify.register(getTransactionsForBackendWalletByNonce);
-  await fastify.register(resetBackendWalletNonces);
+  await fastify.register(resetBackendWalletNoncesRoute);
   await fastify.register(cancelBackendWalletNoncesRoute);
+  await fastify.register(resetBackendWalletNoncesRoute);
   await fastify.register(getBackendWalletNonce);
   await fastify.register(simulateTransaction);
 

src/server/routes/index.ts

@@ -4,6 +4,7 @@ import { StatusCodes } from "http-status-codes";
 import { isDatabaseReachable } from "../../../db/client";
 import { env } from "../../../utils/env";
 import { isRedisReachable } from "../../../utils/redis/redis";
+import { thirdwebClientId } from "../../../utils/sdk";
 import { createCustomError } from "../../middleware/error";
 
 type EngineFeature =
@@ -26,6 +27,7 @@ const ReplySchemaOk = Type.Object({
       Type.Literal("SMART_BACKEND_WALLETS"),
     ]),
   ),
+  clientId: Type.String(),
 });
 
 const ReplySchemaError = Type.Object({
@@ -73,6 +75,7 @@ export async function healthCheck(fastify: FastifyInstance) {
         engineVersion: env.ENGINE_VERSION,
         engineTier: env.ENGINE_TIER ?? "SELF_HOSTED",
         features: getFeatures(),
+        clientId: thirdwebClientId,
       });
     },
   });

src/server/routes/system/health.ts

@@ -266,7 +266,7 @@ export const toTransactionSchema = (
     if (transaction.status === "sent") {
       return transaction.gasPrice?.toString() ?? null;
     }
-    return null;
+    return transaction.overrides?.gasPrice?.toString() ?? null;
   };
 
   const resolveMaxFeePerGas = (): string | null => {

src/server/schemas/transaction/index.ts

@@ -10,8 +10,11 @@ export const txOverridesSchema = Type.Object({
         description: "Gas limit for the transaction",
       }),
 
-      // Overriding `gasPrice` is currently not supported.
-
+      gasPrice: Type.Optional({
+        ...WeiAmountStringSchema,
+        description:
+          "Gas price for the transaction. Do not use this if maxFeePerGas is set or if you want to use EIP-1559 type transactions. Only use this if you want to use legacy transactions.",
+      }),
       maxFeePerGas: Type.Optional({
         ...WeiAmountStringSchema,
         description: "Maximum fee per gas",

src/server/schemas/txOverrides.ts

@@ -12,6 +12,7 @@ export const walletHeaderSchema = Type.Object({
   },
   "x-idempotency-key": Type.Optional(
     Type.String({
+      maxLength: 200,
       description: `Transactions submitted with the same idempotency key will be de-duplicated. Only the last ${env.TRANSACTION_HISTORY_COUNT} transactions are compared.`,
     }),
   ),