fix: revert #3153

wevm · Feb 23, 2025 · 6f6140a · 6f6140a
1 parent 8c13d23
commit 6f6140a
Showing 1 changed file with 20 additions and 20 deletions.
diff --git a/src/actions/wallet/prepareTransactionRequest.ts b/src/actions/wallet/prepareTransactionRequest.ts
@@ -290,6 +290,26 @@ export async function prepareTransactionRequest<
     return chainId
   }
 
+  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('blobVersionedHashes') ||
       parameters.includes('sidecars')) &&
@@ -403,26 +423,6 @@ 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