chore: clean up nonce resync worker (#763)

* chore: clean up nonce resync worker * update logging
thirdweb-dev · Nov 8, 2024 · 32961ab · 32961ab
1 parent 1ba738a
commit 32961ab
Showing 1 changed file with 35 additions and 63 deletions.
diff --git a/src/worker/tasks/nonceResyncWorker.ts b/src/worker/tasks/nonceResyncWorker.ts
@@ -8,6 +8,7 @@ import {
 } from "../../db/wallets/walletNonce";
 import { getConfig } from "../../utils/cache/getConfig";
 import { getChain } from "../../utils/chain";
+import { prettifyError } from "../../utils/error";
 import { logger } from "../../utils/logger";
 import { redis } from "../../utils/redis/redis";
 import { thirdwebClient } from "../../utils/sdk";
@@ -40,78 +41,49 @@ export const initNonceResyncWorker = async () => {
  */
 const handler: Processor<any, void, string> = async (job: Job<string>) => {
   const sentNoncesKeys = await redis.keys("nonce-sent*");
-  job.log(`Found ${sentNoncesKeys.length} nonce-sent* keys`);
+  if (sentNoncesKeys.length === 0) {
+    job.log("No active wallets.");
+    return;
+  }
 
   for (const sentNonceKey of sentNoncesKeys) {
-    const { chainId, walletAddress } = splitSentNoncesKey(sentNonceKey);
-
-    const rpcRequest = getRpcClient({
-      client: thirdwebClient,
-      chain: await getChain(chainId),
-    });
+    try {
+      const { chainId, walletAddress } = splitSentNoncesKey(sentNonceKey);
 
-    const [transactionCount, lastUsedNonceDb] = await Promise.all([
-      eth_getTransactionCount(rpcRequest, {
-        address: walletAddress,
-        blockTag: "latest",
-      }),
-      inspectNonce(chainId, walletAddress),
-    ]);
-
-    if (Number.isNaN(transactionCount)) {
-      job.log(
-        `Received invalid onchain transaction count for ${walletAddress}: ${transactionCount}`,
-      );
-      logger({
-        level: "error",
-        message: `[nonceResyncWorker] Received invalid onchain transaction count for ${walletAddress}: ${transactionCount}`,
-        service: "worker",
+      const rpcRequest = getRpcClient({
+        client: thirdwebClient,
+        chain: await getChain(chainId),
       });
-      continue;
-    }
+      const lastUsedNonceOnchain =
+        (await eth_getTransactionCount(rpcRequest, {
+          address: walletAddress,
+          blockTag: "latest",
+        })) - 1;
+      const lastUsedNonceDb = await inspectNonce(chainId, walletAddress);
 
-    const lastUsedNonceOnchain = transactionCount - 1;
-
-    job.log(
-      `${walletAddress} last used onchain nonce: ${lastUsedNonceOnchain} and last used db nonce: ${lastUsedNonceDb}`,
-    );
-    logger({
-      level: "debug",
-      message: `[nonceResyncWorker] last used onchain nonce: ${transactionCount} and last used db nonce: ${lastUsedNonceDb}`,
-      service: "worker",
-    });
-
-    // If the last used nonce onchain is the same as or ahead of the last used nonce in the db,
-    // There is no need to resync the nonce.
-    if (lastUsedNonceOnchain >= lastUsedNonceDb) {
-      job.log(`No need to resync nonce for ${walletAddress}`);
-      logger({
-        level: "debug",
-        message: `[nonceResyncWorker] No need to resync nonce for ${walletAddress}`,
-        service: "worker",
-      });
-      continue;
-    }
+      // Recycle all nonces between (onchain nonce, db nonce] if they aren't in-flight ("sent nonce").
+      const recycled: number[] = [];
+      for (
+        let nonce = lastUsedNonceOnchain + 1;
+        nonce <= lastUsedNonceDb;
+        nonce++
+      ) {
+        const exists = await isSentNonce(chainId, walletAddress, nonce);
+        if (!exists) {
+          await recycleNonce(chainId, walletAddress, nonce);
+          recycled.push(nonce);
+        }
+      }
 
-    //  for each nonce between last used db nonce and last used onchain nonce
-    //    check if nonce exists in nonce-sent set
-    //    if it does not exist, recycle it
-    for (
-      let _nonce = lastUsedNonceOnchain + 1;
-      _nonce < lastUsedNonceDb;
-      _nonce++
-    ) {
-      const exists = await isSentNonce(chainId, walletAddress, _nonce);
+      const message = `wallet=${chainId}:${walletAddress} lastUsedNonceOnchain=${lastUsedNonceOnchain} lastUsedNonceDb=${lastUsedNonceDb}, recycled=${recycled.join(",")}`;
+      job.log(message);
+      logger({ level: "debug", service: "worker", message });
+    } catch (error) {
       logger({
-        level: "debug",
-        message: `[nonceResyncWorker] nonce ${_nonce} exists in nonce-sent set: ${exists}`,
+        level: "error",
+        message: `[nonceResyncWorker] ${prettifyError(error)}`,
         service: "worker",
       });
-
-      // If nonce does not exist in nonce-sent set, recycle it
-      if (!exists) {
-        await recycleNonce(chainId, walletAddress, _nonce);
-      }
     }
   }
 };