Cleanup executors

src/cli/config/bundler.ts

@@ -146,7 +146,6 @@ export const compatibilityArgsSchema = z.object({
         .optional()
         .transform((val) => val as ApiVersion),
     "balance-override": z.boolean(),
-    "local-gas-limit-calculation": z.boolean(),
     "flush-stuck-transactions-during-startup": z.boolean(),
     "fixed-gas-limit-for-estimation": z
         .string()

src/cli/config/options.ts

@@ -337,13 +337,6 @@ export const compatibilityOptions: CliCommandOptions<ICompatibilityArgsInput> =
             require: true,
             default: true
         },
-        "local-gas-limit-calculation": {
-            description:
-                "Calculate the bundle transaction gas limits locally instead of using the RPC gas limit estimation",
-            type: "boolean",
-            require: true,
-            default: false
-        },
         "flush-stuck-transactions-during-startup": {
             description:
                 "Flush stuck transactions with old nonces during bundler startup",

src/cli/setupServer.ts

@@ -97,15 +97,13 @@ const getEventManager = ({
 const getExecutor = ({
     mempool,
     config,
-    senderManager,
     reputationManager,
     metrics,
     gasPriceManager,
     eventManager
 }: {
     mempool: MemoryMempool
     config: AltoConfig
-    senderManager: SenderManager
     reputationManager: InterfaceReputationManager
     metrics: Metrics
     gasPriceManager: GasPriceManager
@@ -114,7 +112,6 @@ const getExecutor = ({
     return new Executor({
         mempool,
         config,
-        senderManager,
         reputationManager,
         metrics,
         gasPriceManager,
@@ -127,6 +124,7 @@ const getExecutorManager = ({
     executor,
     mempool,
     monitor,
+    senderManager,
     reputationManager,
     metrics,
     gasPriceManager,
@@ -137,6 +135,7 @@ const getExecutorManager = ({
     mempool: MemoryMempool
     monitor: Monitor
     reputationManager: InterfaceReputationManager
+    senderManager: SenderManager
     metrics: Metrics
     gasPriceManager: GasPriceManager
     eventManager: EventManager
@@ -146,6 +145,7 @@ const getExecutorManager = ({
         executor,
         mempool,
         monitor,
+        senderManager,
         reputationManager,
         metrics,
         gasPriceManager,
@@ -275,7 +275,6 @@ export const setupServer = async ({
     const executor = getExecutor({
         mempool,
         config,
-        senderManager,
         reputationManager,
         metrics,
         gasPriceManager,
@@ -287,6 +286,7 @@ export const setupServer = async ({
         executor,
         mempool,
         monitor,
+        senderManager,
         reputationManager,
         metrics,
         gasPriceManager,
@@ -314,7 +314,7 @@ export const setupServer = async ({
     })
 
     if (config.flushStuckTransactionsDuringStartup) {
-        executor.flushStuckTransactions()
+        senderManager.flushOnStartUp()
     }
 
     const rootLogger = config.getLogger(