Fk/extend ph worker (#595)

* Update: Added nonce rebase with blockchain logic

* removed logs

* updates

Author: farhanW3

src/db/wallets/walletNonce.ts

@@ -8,7 +8,7 @@ import { thirdwebClient } from "../../utils/sdk";
  * The "last used nonce" stores the last nonce submitted onchain.
  * Example: "25"
  */
-const lastUsedNonceKey = (chainId: number, walletAddress: Address) =>
+export const lastUsedNonceKey = (chainId: number, walletAddress: Address) =>
   `nonce:${chainId}:${normalizeAddress(walletAddress)}`;
 
 /**
@@ -122,3 +122,36 @@ export const deleteAllNonces = async () => {
     await redis.del(keys);
   }
 };
+
+/**
+ * Resync the nonce i.e., max of transactionCount +1 and lastUsedNonce.
+ * @param chainId
+ * @param walletAddress
+ */
+export const rebaseNonce = async (chainId: number, walletAddress: Address) => {
+  const rpcRequest = getRpcClient({
+    client: thirdwebClient,
+    chain: await getChain(chainId),
+  });
+
+  // The next unused nonce = transactionCount.
+  const transactionCount = await eth_getTransactionCount(rpcRequest, {
+    address: walletAddress,
+  });
+
+  // Lua script to set nonce as max(transactionCount, redis.get(lastUsedNonceKey))
+  const script = `
+    local transactionCount = tonumber(ARGV[1])
+    local lastUsedNonce = tonumber(redis.call('get', KEYS[1]))
+    local nextNonce = math.max(transactionCount, lastUsedNonce)
+    redis.call('set', KEYS[1], nextNonce)
+    return nextNonce
+  `;
+  const nextNonce = await redis.eval(
+    script,
+    1,
+    lastUsedNonceKey(chainId, normalizeAddress(walletAddress)),
+    transactionCount.toString(),
+  );
+  return nextNonce;
+};

src/worker/tasks/sendTransactionWorker.ts

@@ -7,7 +7,11 @@ import { bundleUserOp } from "thirdweb/wallets/smart";
 import type { TransactionSerializable } from "viem";
 import { getContractAddress } from "viem";
 import { TransactionDB } from "../../db/transactions/db";
-import { acquireNonce, recycleNonce } from "../../db/wallets/walletNonce";
+import {
+  acquireNonce,
+  rebaseNonce,
+  recycleNonce,
+} from "../../db/wallets/walletNonce";
 import { getAccount } from "../../utils/account";
 import { getBlockNumberish } from "../../utils/block";
 import { getChain } from "../../utils/chain";
@@ -167,7 +171,11 @@ const _sendTransaction = async (
     transactionHash = sendTransactionResult.transactionHash;
     job.log(`Sent transaction: ${transactionHash}`);
   } catch (error: unknown) {
-    if (!isNonceAlreadyUsedError(error)) {
+    // If NonceAlreadyUsedError, rebase the nonce and retry.
+    if (isNonceAlreadyUsedError(error)) {
+      const resyncNonce = await rebaseNonce(chainId, from);
+      job.log(`Resynced nonce to ${resyncNonce}.`);
+    } else {
       job.log(`Recycling nonce: ${nonce}`);
       await recycleNonce(chainId, from, nonce);
     }