free on handleTransactionUnderpriced

pimlicolabs · Jan 10, 2025 · e27e0f0 · e27e0f0
1 parent 416d4c5
commit e27e0f0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -665,7 +665,7 @@ export class Executor {
         if (isTransactionUnderPriced) {
             await this.handleTransactionUnderPriced({
                 nonce: request.nonce,
-                executor: request.from
+                executor: request.account
             })
         }
 
@@ -681,15 +681,15 @@ export class Executor {
     async handleTransactionUnderPriced({
         nonce,
         executor
-    }: { nonce: number; executor: Address }) {
+    }: { nonce: number; executor: Account }) {
         const submitted = this.mempool.dumpSubmittedOps()
 
         const conflictingOps = submitted
             .filter((submitted) => {
                 const tx = submitted.transactionInfo
 
                 return (
-                    tx.executor.address === executor &&
+                    tx.executor.address === executor.address &&
                     tx.transactionRequest.nonce === nonce
                 )
             })
@@ -702,6 +702,10 @@ export class Executor {
             this.mempool.removeSubmitted(op.userOperationHash)
             this.mempool.add(op.mempoolUserOperation, op.entryPoint)
         })
+
+        if (conflictingOps.length > 0) {
+            this.markWalletProcessed(executor)
+        }
     }
 
     async bundle(