fix(common): move prepare just before send tx (#2364)

latticexyz · Mar 5, 2024 · 2b54f50 · 2b54f50
1 parent 884642a
commit 2b54f50
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/packages/common/src/sendTransaction.ts b/packages/common/src/sendTransaction.ts
@@ -52,17 +52,15 @@ export async function sendTransaction<
       account,
     } as CallParameters<TChain>);
 
-    // TODO: estimate gas
-
     return request;
   }
 
-  const preparedRequest = await prepare();
-
   return await nonceManager.mempoolQueue.add(
     () =>
       pRetry(
         async () => {
+          const preparedRequest = await prepare();
+
           if (!nonceManager.hasNonce()) {
             await nonceManager.resetNonce();
           }

diff --git a/packages/common/src/writeContract.ts b/packages/common/src/writeContract.ts
@@ -63,12 +63,12 @@ export async function writeContract<
     return result.request as unknown as WriteContractParameters<abi, functionName, args, chain, account, chainOverride>;
   }
 
-  const preparedWrite = await prepareWrite();
-
   return nonceManager.mempoolQueue.add(
     () =>
       pRetry(
         async () => {
+          const preparedWrite = await prepareWrite();
+
           if (!nonceManager.hasNonce()) {
             await nonceManager.resetNonce();
           }