Skip to content

Submitter: retry when the EVM nonce is too low #989

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
norswap merged 1 commit into from
Jul 24, 2025
Merged

Submitter: retry when the EVM nonce is too low #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions apps/submitter/lib/handlers/createAccount/createAccount.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,10 @@ import { CreateAccount, type CreateAccountInput, type CreateAccountOutput } from

const WaitForReceiptError = Symbol("WaitForReceiptError")

async function createAccount({ salt, owner }: CreateAccountInput): Promise<CreateAccountOutput> {
async function createAccount(
{ salt, owner }: CreateAccountInput,
noNonceRetry?: "noNonceRetry",
): Promise<CreateAccountOutput> {
assertDef(salt) // from validator
let evmTxInfo: Optional<EvmTxInfo, "evmTxHash"> | undefined
const predictedAddress = computeHappyAccountAddress(salt, owner)
Expand Down Expand Up @@ -75,7 +78,14 @@ async function createAccount({ salt, owner }: CreateAccountInput): Promise<Creat
logger.trace("Successfully created account", address, owner, salt)
return { status: CreateAccount.Success, owner, salt, address }
} catch (error) {
if (isNonceTooLowError(error)) evmNonceManager.resyncIfTooLow(accountDeployer.address)
if (isNonceTooLowError(error)) {
evmNonceManager.resyncIfTooLow(accountDeployer.address)
if (!noNonceRetry) {
logger.warn("EVM nonce too low, retrying account creation", { salt, owner })
return await createAccount({ salt, owner }, "noNonceRetry")
}
return { ...outputForGenericError(error), owner, salt }
}

if (evmTxInfo) {
// The nonce has been consumed. A transaction must occur with that nonce because other other transactions
Expand Down
13 changes: 9 additions & 4 deletions apps/submitter/lib/handlers/submit/submit.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,14 +34,15 @@ type SubmitInternalInput = SubmitInput & {
timeout?: number
earlyExit?: boolean
replacedTx?: EvmTxInfo
noNonceRetry?: boolean
}

type SubmitInternalOutput =
| (SubmitSuccess & { evmTxHash?: Hash; receiptPromise?: Promise<WaitForReceiptOutput> })
| (SubmitError & { evmTxHash?: undefined; receiptPromise?: undefined })

async function submitInternal(input: SubmitInternalInput): Promise<SubmitInternalOutput> {
const { entryPoint = deployment.EntryPoint, timeout, earlyExit, replacedTx } = input
const { entryPoint = deployment.EntryPoint, timeout, earlyExit, replacedTx, noNonceRetry } = input
let boop = input.boop

const boopHash = computeHash(boop)
Expand Down Expand Up @@ -164,9 +165,13 @@ async function submitInternal(input: SubmitInternalInput): Promise<SubmitInterna
const receiptPromise = boopReceiptService.waitForInclusion(args)
return { status: Onchain.Success, boopHash, entryPoint, evmTxHash, receiptPromise }
} catch (error) {
if (isNonceTooLowError(error)) evmNonceManager.resyncIfTooLow(accountDeployer.address)

if ((error as BaseError)?.walk((e) => e instanceof InsufficientFundsError)) {
if (isNonceTooLowError(error)) {
evmNonceManager.resyncIfTooLow(accountDeployer.address)
if (!noNonceRetry) {
logger.warn("EVM nonce too low, retrying submit", boopHash)
return await submitInternal({ ...input, noNonceRetry: true })
}
} else if ((error as BaseError)?.walk((e) => e instanceof InsufficientFundsError)) {
return {
status: SubmitterError.UnexpectedError,
error: "Submitter failed to pay for the boop.",
Expand Down