fix: avoid nonce gap in nonceManager (#3142) (#3153)

* fix: avoid nonce gap in nonceManager (#3142) * Update prepareTransactionRequest.ts * Update brave-cooks-carry.md --------- Co-authored-by: jxom <[email protected]>
wevm · Jan 6, 2025 · 40222c8 · 40222c8
1 parent c1bc74f
commit 40222c8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 20 deletions.
diff --git a/.changeset/brave-cooks-carry.md b/.changeset/brave-cooks-carry.md
@@ -0,0 +1,5 @@
+---
+"viem": patch
+---
+
+Fixed premature nonce increment by rearranging gas estimation logic.
diff --git a/src/actions/wallet/prepareTransactionRequest.ts b/src/actions/wallet/prepareTransactionRequest.ts
@@ -316,26 +316,6 @@ export async function prepareTransactionRequest<
 
   if (parameters.includes('chainId')) request.chainId = await getChainId()
 
-  if (parameters.includes('nonce') && typeof nonce === 'undefined' && account) {
-    if (nonceManager) {
-      const chainId = await getChainId()
-      request.nonce = await nonceManager.consume({
-        address: account.address,
-        chainId,
-        client,
-      })
-    } else {
-      request.nonce = await getAction(
-        client,
-        getTransactionCount,
-        'getTransactionCount',
-      )({
-        address: account.address,
-        blockTag: 'pending',
-      })
-    }
-  }
-
   if (
     (parameters.includes('fees') || parameters.includes('type')) &&
     typeof type === 'undefined'
@@ -415,6 +395,26 @@ export async function prepareTransactionRequest<
         : account,
     } as EstimateGasParameters)
 
+  if (parameters.includes('nonce') && typeof nonce === 'undefined' && account) {
+    if (nonceManager) {
+      const chainId = await getChainId()
+      request.nonce = await nonceManager.consume({
+        address: account.address,
+        chainId,
+        client,
+      })
+    } else {
+      request.nonce = await getAction(
+        client,
+        getTransactionCount,
+        'getTransactionCount',
+      )({
+        address: account.address,
+        blockTag: 'pending',
+      })
+    }
+  }
+
   assertRequest(request as AssertRequestParameters)
 
   delete request.parameters