cleanup markWalletProcessed flow

pimlicolabs · Jan 26, 2025 · 255ec63 · 255ec63
1 parent 25daacd
commit 255ec63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -588,7 +588,6 @@ export class Executor {
             childLogger.error(
                 "gas limit simulation encountered unexpected failure"
             )
-            this.markWalletProcessed(wallet)
             return {
                 status: "bundle_failure",
                 reason: "INTERNAL FAILURE",
@@ -600,7 +599,6 @@ export class Executor {
 
         if (opsToBundle.length === 0) {
             childLogger.warn("all ops failed simulation")
-            this.markWalletProcessed(wallet)
             return {
                 status: "bundle_failure",
                 reason: "INTERNAL FAILURE",
@@ -683,7 +681,6 @@ export class Executor {
                     { error: e },
                     "insufficient funds, not submitting transaction"
                 )
-                this.markWalletProcessed(wallet)
                 return {
                     status: "bundle_resubmit",
                     reason: InsufficientFundsError.name,
@@ -696,7 +693,6 @@ export class Executor {
                 { error: JSON.stringify(err) },
                 "error submitting bundle transaction"
             )
-            this.markWalletProcessed(wallet)
             return {
                 status: "bundle_failure",
                 reason: "INTERNAL FAILURE",

diff --git a/src/executor/executorManager.ts b/src/executor/executorManager.ts
@@ -262,6 +262,14 @@ export class ExecutorManager {
                     break
             }
 
+            // Free wallet if the wallet did not make a succesful bundle tx.
+            if (
+                bundle.status === "bundle_failure" ||
+                bundle.status === "bundle_resubmit"
+            ) {
+                this.senderManager.markWalletProcessed(wallet)
+            }
+
             if (bundle.status === "bundle_resubmit") {
                 const { userOpsBundled: userOperations, reason } = bundle