diff --git a/packages/common/src/sendTransaction.ts b/packages/common/src/sendTransaction.ts index b450f5c8d2..e9748ddc0a 100644 --- a/packages/common/src/sendTransaction.ts +++ b/packages/common/src/sendTransaction.ts @@ -52,17 +52,15 @@ export async function sendTransaction< account, } as CallParameters); - // 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 index 5ce34e5c24..99bce2b5e0 100644 --- 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; } - const preparedWrite = await prepareWrite(); - return nonceManager.mempoolQueue.add( () => pRetry( async () => { + const preparedWrite = await prepareWrite(); + if (!nonceManager.hasNonce()) { await nonceManager.resetNonce(); }