fix

pimlicolabs · Nov 10, 2024 · 6702820 · 6702820
1 parent 7e7593f
commit 6702820
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/src/cli/setupServer.ts b/src/cli/setupServer.ts
@@ -116,6 +116,7 @@ const getCompressionHandler = async (
 }
 
 const getExecutor = ({
+    mempool,
     config,
     senderManager,
     reputationManager,
@@ -124,6 +125,7 @@ const getExecutor = ({
     gasPriceManager,
     eventManager
 }: {
+    mempool: MemoryMempool
     config: AltoConfig
     senderManager: SenderManager
     reputationManager: InterfaceReputationManager
@@ -133,6 +135,7 @@ const getExecutor = ({
     eventManager: EventManager
 }): Executor => {
     return new Executor({
+        mempool,
         config,
         senderManager,
         reputationManager,
@@ -299,6 +302,7 @@ export const setupServer = async ({
     })
 
     const executor = getExecutor({
+        mempool,
         config,
         senderManager,
         reputationManager,

diff --git a/src/executor/executor.ts b/src/executor/executor.ts
@@ -544,6 +544,7 @@ export class Executor {
                 ...opts
             })
 
+        let isTransactionUnderPriced = false
         let attempts = 0
         let transactionHash: Hex | undefined
         const maxAttempts = 3
@@ -562,11 +563,6 @@ export class Executor {
                     if (isTransactionUnderpricedError(e)) {
                         this.logger.warn("Transaction underpriced, retrying")
 
-                        await this.handleTransactionUnderPriced({
-                            nonce: request.nonce,
-                            executor: request.from
-                        })
-
                         request.maxFeePerGas = scaleBigIntByPercent(
                             request.maxFeePerGas,
                             150
@@ -576,6 +572,7 @@ export class Executor {
                             150
                         )
                         isErrorHandled = true
+                        isTransactionUnderPriced = true
                     }
                 }
 
@@ -622,6 +619,13 @@ export class Executor {
             }
         }
 
+        if (isTransactionUnderPriced) {
+            await this.handleTransactionUnderPriced({
+                nonce: request.nonce,
+                executor: request.from
+            })
+        }
+
         // needed for TS
         if (!transactionHash) {
             throw new Error("Transaction hash not assigned")