@pimlico/alto 0.0.19 → 0.0.20

package/esm/executor/executor.js

@@ -15,7 +15,7 @@ export class Executor {
         this.eventManager = eventManager;
     }
     getBundleGasPrice({ bundle, networkGasPrice, networkBaseFee, totalBeneficiaryFees, bundleGasUsed }) {
-        const { bundlerInitialCommission, resubmitMultiplierCeiling, legacyTransactions, chainType, arbitrumGasBidMultiplier } = this.config;
+        const { bundlerInitialCommission, resubmitMultiplierCeiling, legacyTransactions, chainType, arbitrumBaseFeeMultiplier } = this.config;
         // Arbtirum's sequencer orders based on first come first serve.
         // Because of this, maxFee/maxPriorityFee is ignored and the bundler *always* pays the network's baseFee.
         // The bundler need to set a large enough gasBid to account for network baseFee fluctuations.
@@ -23,8 +23,8 @@ export class Executor {
         if (chainType === "arbitrum") {
             const scaledBaseFee = scaleBigIntByPercent(networkBaseFee, 100n + 20n * BigInt(bundle.submissionAttempts));
             return {
-                maxFeePerGas: scaledBaseFee * arbitrumGasBidMultiplier,
-                maxPriorityFeePerGas: scaledBaseFee * arbitrumGasBidMultiplier
+                maxFeePerGas: scaleBigIntByPercent(scaledBaseFee, arbitrumBaseFeeMultiplier),
+                maxPriorityFeePerGas: scaleBigIntByPercent(scaledBaseFee, arbitrumBaseFeeMultiplier)
             };
         }
         // Increase network gas price for resubmissions to improve tx inclusion
@@ -63,8 +63,14 @@ export class Executor {
             maxPriorityFeePerGas: networkMaxPriorityFeePerGas
         };
     }
-    async sendHandleOpsTransaction({ txParam, gasOpts }) {
-        const { executorGasMultiplier, sendHandleOpsRetryCount, transactionUnderpricedMultiplier, walletClient, publicClient } = this.config;
+    async sendHandleOpsTransaction({ txParam, gasOpts, childLogger, submissionAttempts }) {
+        const { executorGasMultiplier, sendHandleOpsRetryCount, transactionUnderpricedMultiplier, walletClients, publicClient, privateEndpointSubmissionAttempts } = this.config;
+        // Use private wallet for configured number of attempts if available, then switch to public
+        const usePrivateEndpoint = walletClients.private &&
+            submissionAttempts < privateEndpointSubmissionAttempts;
+        const walletClient = usePrivateEndpoint
+            ? walletClients.private
+            : walletClients.public;
         const { entryPoint, userOps, account, gas, nonce } = txParam;
         const handleOpsCalldata = encodeHandleOpsCalldata({
             userOps: userOps.map(({ userOp }) => userOp),
@@ -93,12 +99,22 @@ export class Executor {
                     multiple: this.config.gasLimitRoundingMultiple
                 });
                 transactionHash = await walletClient.sendTransaction(request);
+                childLogger.info({
+                    transactionRequest: {
+                        executor: request.account.address,
+                        maxFeePerGas: request.maxFeePerGas,
+                        maxPriorityFeePerGas: request.maxPriorityFeePerGas,
+                        nonce: request.nonce
+                    },
+                    txHash: transactionHash,
+                    isPrivate: usePrivateEndpoint
+                }, "submitted bundle transaction");
                 break;
             }
             catch (e) {
                 if (e instanceof BaseError) {
                     if (isTransactionUnderpricedError(e)) {
-                        this.logger.warn("Transaction underpriced, retrying");
+                        childLogger.warn("Transaction underpriced, retrying");
                         request.nonce = await publicClient.getTransactionCount({
                             address: account.address,
                             blockTag: "latest"
@@ -115,7 +131,7 @@ export class Executor {
                     }
                 }
                 if (e instanceof FeeCapTooLowError) {
-                    this.logger.warn("max fee < basefee, retrying");
+                    childLogger.warn("max fee < basefee, retrying");
                     if (request.gasPrice) {
                         request.gasPrice = scaleBigIntByPercent(request.gasPrice, 125n);
                     }
@@ -130,21 +146,21 @@ export class Executor {
                 if (error instanceof TransactionExecutionError) {
                     const cause = error.cause;
                     if (cause instanceof NonceTooLowError) {
-                        this.logger.warn("Nonce too low, retrying");
+                        childLogger.warn("Nonce too low, retrying");
                         request.nonce = await publicClient.getTransactionCount({
                             address: request.from,
                             blockTag: "latest"
                         });
                     }
                     if (cause instanceof NonceTooHighError) {
-                        this.logger.warn("Nonce too high, retrying");
+                        childLogger.warn("Nonce too high, retrying");
                         request.nonce = await publicClient.getTransactionCount({
                             address: request.from,
                             blockTag: "latest"
                         });
                     }
                     if (cause instanceof IntrinsicGasTooLowError) {
-                        this.logger.warn("Intrinsic gas too low, retrying");
+                        childLogger.warn("Intrinsic gas too low, retrying");
                         request.gas = scaleBigIntByPercent(request.gas, 150n);
                     }
                 }
@@ -162,13 +178,13 @@ export class Executor {
     }
     async bundle({ executor, userOpBundle, networkGasPrice, networkBaseFee, nonce }) {
         const { entryPoint, userOps } = userOpBundle;
-        const isReplacementTx = userOpBundle.submissionAttempts > 0;
         let childLogger = this.logger.child({
-            isReplacementTx,
+            submissionAttempts: userOpBundle.submissionAttempts,
             userOperations: getUserOpHashes(userOps),
             entryPoint
         });
         const filterOpsResult = await filterOpsAndEstimateGas({
+            checkEip7702AuthNonces: false, // Ignore EIP-7702 auth nonce check to save latency.
             networkBaseFee,
             userOpBundle,
             config: this.config,
@@ -195,8 +211,8 @@ export class Executor {
         const { userOpsToBundle, rejectedUserOps, bundleGasUsed, bundleGasLimit, totalBeneficiaryFees } = filterOpsResult;
         // Update child logger with userOperations being sent for bundling.
         childLogger = this.logger.child({
-            isReplacementTx,
-            userOperations: getUserOpHashes(userOpsToBundle),
+            userOps: getUserOpHashes(userOpsToBundle),
+            submissionAttempts: userOpBundle.submissionAttempts,
             entryPoint
         });
         const { maxFeePerGas, maxPriorityFeePerGas } = this.getBundleGasPrice({
@@ -240,7 +256,9 @@ export class Executor {
                     userOps: userOpsToBundle,
                     entryPoint
                 },
-                gasOpts
+                childLogger,
+                gasOpts,
+                submissionAttempts: userOpBundle.submissionAttempts
             });
             this.eventManager.emitSubmitted({
                 userOpHashes: getUserOpHashes(userOpsToBundle),
@@ -298,11 +316,6 @@ export class Executor {
                 nonce
             }
         };
-        childLogger.info({
-            transactionRequest: bundleResult.transactionRequest,
-            txHash: transactionHash,
-            opHashes: getUserOpHashes(userOpsBundled)
-        }, "submitted bundle transaction");
         return bundleResult;
     }
 }

package/esm/executor/executor.js.map

@@ -1 +1 @@
-{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executor.js","sourceRoot":"","sources":["../../executor/executor.ts"],"names":[],"mappings":"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"}

package/esm/executor/executorManager.d.ts

@@ -1,35 +1,35 @@
 import type { GasPriceManager } from "../handlers/index.js";
 import type { Mempool } from "../mempool/index.js";
-import type { BundlingMode, SubmittedBundleInfo, UserOperationBundle } from "../types/index.js";
-import type { GasPriceParameters } from "../types/index.js";
+import type { BundlingMode, GasPriceParameters, SubmittedBundleInfo, UserOperationBundle } from "../types/index.js";
 import { type Metrics } from "../utils/index.js";
 import type { Hex } from "viem";
 import type { AltoConfig } from "../createConfig.js";
+import type { BundleManager } from "./bundleManager.js";
 import type { Executor } from "./executor.js";
 import type { SenderManager } from "./senderManager/index.js";
-import type { UserOpMonitor } from "./userOpMonitor.js";
 export declare class ExecutorManager {
-    private senderManager;
-    private config;
-    private executor;
-    private mempool;
-    private logger;
-    private metrics;
-    private gasPriceManager;
+    private readonly senderManager;
+    private readonly config;
+    private readonly executor;
+    private readonly mempool;
+    private readonly logger;
+    private readonly metrics;
+    private readonly gasPriceManager;
+    private readonly bundleManager;
     private opsCount;
     private bundlingMode;
-    private userOpMonitor;
     private unWatch;
     private currentlyHandlingBlock;
-    constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, userOpMonitor }: {
+    constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, bundleManager }: {
         config: AltoConfig;
         executor: Executor;
         mempool: Mempool;
         metrics: Metrics;
         gasPriceManager: GasPriceManager;
         senderManager: SenderManager;
-        userOpMonitor: UserOpMonitor;
+        bundleManager: BundleManager;
     });
+    start(): void;
     setBundlingMode(bundleMode: BundlingMode): Promise<void>;
     autoScalingBundling(): Promise<void>;
     startWatchingBlocks(): void;
@@ -37,7 +37,8 @@ export declare class ExecutorManager {
     sendBundleToExecutor(userOpBundle: UserOperationBundle): Promise<Hex | undefined>;
     stopWatchingBlocks(): void;
     private handleBlock;
-    potentiallyResubmitBundle({ submittedBundle, networkGasPrice, networkBaseFee }: {
+    potentiallyResubmitBundle({ blockReceivedTimestamp, submittedBundle, networkGasPrice, networkBaseFee }: {
+        blockReceivedTimestamp: number;
         submittedBundle: SubmittedBundleInfo;
         networkGasPrice: {
             maxFeePerGas: bigint;
@@ -46,7 +47,8 @@ export declare class ExecutorManager {
         networkBaseFee: bigint;
     }): void;
     cancelBundle(submittedBundle: SubmittedBundleInfo): Promise<void>;
-    replaceTransaction({ submittedBundle, networkGasPrice, networkBaseFee, reason }: {
+    replaceTransaction({ blockReceivedTimestamp, submittedBundle, networkGasPrice, networkBaseFee, reason }: {
+        blockReceivedTimestamp: number;
         submittedBundle: SubmittedBundleInfo;
         networkGasPrice: GasPriceParameters;
         networkBaseFee: bigint;

package/esm/executor/executorManager.js

@@ -10,12 +10,12 @@ export class ExecutorManager {
     logger;
     metrics;
     gasPriceManager;
+    bundleManager;
     opsCount = [];
     bundlingMode;
-    userOpMonitor;
     unWatch;
     currentlyHandlingBlock = false;
-    constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, userOpMonitor }) {
+    constructor({ config, executor, mempool, metrics, gasPriceManager, senderManager, bundleManager }) {
         this.config = config;
         this.executor = executor;
         this.mempool = mempool;
@@ -26,7 +26,9 @@ export class ExecutorManager {
         this.gasPriceManager = gasPriceManager;
         this.senderManager = senderManager;
         this.bundlingMode = this.config.bundleMode;
-        this.userOpMonitor = userOpMonitor;
+        this.bundleManager = bundleManager;
+    }
+    start() {
         if (this.bundlingMode === "auto") {
             this.autoScalingBundling();
         }
@@ -43,7 +45,7 @@ export class ExecutorManager {
     async autoScalingBundling() {
         const now = Date.now();
         this.opsCount = this.opsCount.filter((timestamp) => now - timestamp < RPM_WINDOW);
-        const bundles = await this.mempool.getBundles();
+        const bundles = await this.mempool.getBundles(this.config.maxBundleCount);
         if (bundles.length > 0) {
             // Count total ops and add timestamps
             const totalOps = bundles.reduce((sum, bundle) => sum + bundle.userOps.length, 0);
@@ -66,16 +68,35 @@ export class ExecutorManager {
         if (this.unWatch) {
             return;
         }
-        this.unWatch = this.config.publicClient.watchBlocks({
-            onBlock: async (block) => {
-                await this.handleBlock(block);
-            },
-            onError: (error) => {
-                this.logger.error({ error }, "error while watching blocks");
-            },
-            includeTransactions: false,
-            emitMissed: false
-        });
+        // If preconfirmationTime is set, poll at intervals instead of watching blocks
+        if (this.config.flashblocksPreconfirmationTime) {
+            // Set up interval to call handleBlock
+            const intervalId = setInterval(async () => {
+                try {
+                    await this.handleBlock();
+                }
+                catch (err) {
+                    this.logger.error({ err }, "error while polling blocks");
+                }
+            }, this.config.flashblocksPreconfirmationTime);
+            // Store cleanup function
+            this.unWatch = () => {
+                clearInterval(intervalId);
+            };
+        }
+        else {
+            // Default behavior - watch blocks
+            this.unWatch = this.config.publicClient.watchBlocks({
+                onBlock: async (block) => {
+                    await this.handleBlock(block);
+                },
+                onError: (err) => {
+                    this.logger.error({ err }, "error while watching blocks");
+                },
+                includeTransactions: false,
+                emitMissed: false
+            });
+        }
         this.logger.debug("started watching blocks");
     }
     async getBaseFee() {
@@ -119,21 +140,49 @@ export class ExecutorManager {
         });
         if (!bundleResult.success) {
             const { rejectedUserOps, recoverableOps, reason } = bundleResult;
+            // Recover any userOps that can be resubmitted.
+            await this.mempool.resubmitUserOps({
+                userOps: recoverableOps,
+                entryPoint,
+                reason
+            });
+            // For rejected userOps, we need to check for frontruns
+            const shouldCheckFrontrun = rejectedUserOps.some(({ reason }) => reason.includes("AA25 invalid account nonce") ||
+                reason.includes("AA10 sender already constructed"));
+            if (shouldCheckFrontrun) {
+                // Check each rejected userOp for frontrun or included
+                const results = await Promise.all(rejectedUserOps.map(async (userOpInfo) => ({
+                    userOpInfo,
+                    status: await this.bundleManager.getUserOpStatus({
+                        userOpInfo,
+                        entryPoint,
+                        bundlerTxs: [],
+                        blockReceivedTimestamp: Date.now()
+                    })
+                })));
+                // Drop userOps that were rejected but not frontrun or included
+                const notFoundUserOps = results
+                    .filter(({ status }) => status === "not_found")
+                    .map(({ userOpInfo }) => userOpInfo);
+                await this.mempool.dropUserOps(entryPoint, notFoundUserOps);
+                // Stop tracking userOps that were included onchain either due to frontrun or included
+                const confirmedUserOps = results
+                    .filter(({ status }) => ["frontran", "included"].includes(status))
+                    .map(({ userOpInfo }) => userOpInfo);
+                await this.mempool.removeProcessing({
+                    entryPoint,
+                    userOps: confirmedUserOps
+                });
+            }
+            else {
+                this.logger.warn({ reason }, "failed to send bundle transaction");
+                await this.mempool.dropUserOps(entryPoint, rejectedUserOps);
+            }
             // Free wallet as no bundle was sent.
             await this.senderManager.markWalletProcessed(wallet);
-            // Drop rejected ops
-            await this.mempool.dropUserOps(entryPoint, rejectedUserOps);
             this.metrics.userOpsSubmitted
                 .labels({ status: "failed" })
                 .inc(rejectedUserOps.length);
-            // Handle recoverable ops
-            if (recoverableOps.length > 0) {
-                await this.mempool.resubmitUserOps({
-                    userOps: recoverableOps,
-                    entryPoint,
-                    reason
-                });
-            }
             if (reason === "filterops_failed" || reason === "generic_error") {
                 this.metrics.bundlesSubmitted.labels({ status: "failed" }).inc();
             }
@@ -160,14 +209,13 @@ export class ExecutorManager {
             previousTransactionHashes: [],
             lastReplaced: Date.now()
         };
-        this.userOpMonitor.trackBundle(submittedBundle);
+        // Track bundle and start loop to watch blocks
+        this.bundleManager.trackBundle(submittedBundle);
+        this.startWatchingBlocks();
         await this.mempool.markUserOpsAsSubmitted({
             userOps: submittedBundle.bundle.userOps,
-            entryPoint: submittedBundle.bundle.entryPoint,
             transactionHash: submittedBundle.transactionHash
         });
-        // Start watching blocks after marking operations as submitted
-        this.startWatchingBlocks();
         await this.mempool.dropUserOps(entryPoint, rejectedUserOps);
         this.metrics.bundlesSubmitted.labels({ status: "success" }).inc();
         return transactionHash;
@@ -183,37 +231,41 @@ export class ExecutorManager {
             return;
         }
         this.currentlyHandlingBlock = true;
-        const pendingBundles = this.userOpMonitor.getPendingBundles();
+        const blockReceivedTimestamp = Date.now();
+        const pendingBundles = this.bundleManager.getPendingBundles();
         if (pendingBundles.length === 0) {
             this.stopWatchingBlocks();
             this.currentlyHandlingBlock = false;
             return;
         }
-        const [receipts, networkGasPrice, networkBaseFee] = await Promise.all([
-            this.userOpMonitor.getReceipts(pendingBundles),
+        const [bundleStatuses, networkGasPrice, networkBaseFee] = await Promise.all([
+            this.bundleManager.getBundleStatuses(pendingBundles),
             this.gasPriceManager.tryGetNetworkGasPrice().catch(() => ({
                 maxFeePerGas: 0n,
                 maxPriorityFeePerGas: 0n
             })),
             this.getBaseFee().catch(() => 0n)
         ]);
-        await Promise.all(receipts.map(async (receipt, index) => {
-            if (receipt.status === "included") {
-                await this.userOpMonitor.processIncludedBundle({
+        await Promise.all(bundleStatuses.map(async (bundleStatus, index) => {
+            if (bundleStatus.status === "included") {
+                await this.bundleManager.processIncludedBundle({
                     submittedBundle: pendingBundles[index],
-                    bundleReceipt: receipt
+                    bundleReceipt: bundleStatus,
+                    blockReceivedTimestamp
                 });
             }
-            if (receipt.status === "reverted") {
-                await this.userOpMonitor.processRevertedBundle({
+            if (bundleStatus.status === "reverted") {
+                await this.bundleManager.processRevertedBundle({
+                    blockReceivedTimestamp,
                     submittedBundle: pendingBundles[index],
-                    bundleReceipt: receipt,
+                    bundleReceipt: bundleStatus,
                     block
                 });
             }
             // can be potentially resubmitted - so we first submit it again to optimize for the speed
-            if (receipt.status === "not_found") {
+            if (bundleStatus.status === "not_found") {
                 this.potentiallyResubmitBundle({
+                    blockReceivedTimestamp,
                     submittedBundle: pendingBundles[index],
                     networkGasPrice,
                     networkBaseFee
@@ -222,15 +274,16 @@ export class ExecutorManager {
         }));
         this.currentlyHandlingBlock = false;
     }
-    potentiallyResubmitBundle({ submittedBundle, networkGasPrice, networkBaseFee }) {
+    potentiallyResubmitBundle({ blockReceivedTimestamp, submittedBundle, networkGasPrice, networkBaseFee }) {
         const { transactionRequest, lastReplaced } = submittedBundle;
         const { maxFeePerGas, maxPriorityFeePerGas } = transactionRequest;
         const isGasPriceTooLow = maxFeePerGas < networkGasPrice.maxFeePerGas ||
             maxPriorityFeePerGas < networkGasPrice.maxPriorityFeePerGas;
         const isStuck = Date.now() - lastReplaced > this.config.resubmitStuckTimeout;
         if (isGasPriceTooLow) {
-            this.userOpMonitor.stopTrackingBundle(submittedBundle);
+            this.bundleManager.stopTrackingBundle(submittedBundle);
             this.replaceTransaction({
+                blockReceivedTimestamp,
                 submittedBundle,
                 networkGasPrice,
                 networkBaseFee,
@@ -238,8 +291,9 @@ export class ExecutorManager {
             });
         }
         else if (isStuck) {
-            this.userOpMonitor.stopTrackingBundle(submittedBundle);
+            this.bundleManager.stopTrackingBundle(submittedBundle);
             this.replaceTransaction({
+                blockReceivedTimestamp,
                 submittedBundle,
                 networkGasPrice,
                 networkBaseFee,
@@ -249,7 +303,8 @@ export class ExecutorManager {
     }
     async cancelBundle(submittedBundle) {
         const { bundle: { userOps }, executor, transactionRequest, transactionHash } = submittedBundle;
-        const { walletClient, publicClient, blockTime } = this.config;
+        const { walletClients, publicClient, blockTime } = this.config;
+        const walletClient = walletClients.public;
         const logger = this.logger.child({
             userOps: getUserOpHashes(userOps)
         });
@@ -284,14 +339,14 @@ export class ExecutorManager {
                 await new Promise((resolve) => setTimeout(resolve, blockTime / 2));
             }
             catch (err) {
-                logger.warn({ error: err }, "failed to cancel bundle");
+                logger.warn({ err }, "failed to cancel bundle");
                 gasMultiplier += 20n; // Increase gas by additional 20% each retry
             }
         }
         // All retries exhausted
         logger.error({ transactionHash }, "failed to cancel bundle after max retries");
     }
-    async replaceTransaction({ submittedBundle, networkGasPrice, networkBaseFee, reason }) {
+    async replaceTransaction({ blockReceivedTimestamp, submittedBundle, networkGasPrice, networkBaseFee, reason }) {
         const { bundle, executor, transactionRequest, transactionHash: oldTxHash } = submittedBundle;
         const { entryPoint } = bundle;
         const bundleResult = await this.executor.bundle({
@@ -314,22 +369,38 @@ export class ExecutorManager {
             const shouldCheckFrontrun = rejectedUserOps.some(({ reason }) => reason.includes("AA25 invalid account nonce") ||
                 reason.includes("AA10 sender already constructed"));
             if (shouldCheckFrontrun) {
-                // Check each rejected userOp for frontrun
-                const frontrunResults = await Promise.all(rejectedUserOps.map(async (userOpInfo) => ({
+                // Check each rejected userOp for frontrun or included
+                const results = await Promise.all(rejectedUserOps.map(async (userOpInfo) => ({
                     userOpInfo,
-                    wasFrontrun: await this.userOpMonitor.checkFrontrun(userOpInfo)
+                    status: await this.bundleManager.getUserOpStatus({
+                        userOpInfo,
+                        entryPoint,
+                        bundlerTxs: [
+                            submittedBundle.transactionHash,
+                            ...submittedBundle.previousTransactionHashes
+                        ],
+                        blockReceivedTimestamp
+                    })
                 })));
-                const hasFrontrun = frontrunResults.some(({ wasFrontrun }) => wasFrontrun);
+                const hasFrontrun = results.some(({ status }) => status === "frontran");
                 // If one userOp in the bundle was frontrun, we need to cancel the entire bundle
                 // as it will fail onchain
                 if (hasFrontrun) {
                     await this.cancelBundle(submittedBundle);
                 }
-                // Drop userOps that were rejected but not frontrun
-                const nonFrontrunUserOps = frontrunResults
-                    .filter(({ wasFrontrun }) => !wasFrontrun)
+                // Drop userOps that were rejected but not frontrun or included
+                const notFoundUserOps = results
+                    .filter(({ status }) => status === "not_found")
                     .map(({ userOpInfo }) => userOpInfo);
-                await this.mempool.dropUserOps(entryPoint, nonFrontrunUserOps);
+                await this.mempool.dropUserOps(entryPoint, notFoundUserOps);
+                // Stop tracking userOps that were included onchain either due to frontrun or included
+                const confirmedUserOps = results
+                    .filter(({ status }) => ["frontran", "included"].includes(status))
+                    .map(({ userOpInfo }) => userOpInfo);
+                await this.mempool.removeProcessing({
+                    entryPoint,
+                    userOps: confirmedUserOps
+                });
             }
             else {
                 this.logger.warn({ oldTxHash, reason }, "failed to replace transaction");
@@ -364,7 +435,9 @@ export class ExecutorManager {
                 submissionAttempts: bundle.submissionAttempts + 1
             }
         };
-        this.userOpMonitor.trackBundle(newTxInfo);
+        // Track bundle and start loop to watch blocks
+        this.bundleManager.trackBundle(newTxInfo);
+        this.startWatchingBlocks();
         // Drop all userOperations that were rejected during simulation.
         await this.mempool.dropUserOps(entryPoint, rejectedUserOps);
         this.logger.info({
@@ -372,7 +445,9 @@ export class ExecutorManager {
             newTxHash,
             reason
         }, "replaced transaction");
-        return;
+        this.metrics.replacedTransactions
+            .labels({ reason, status: "success" })
+            .inc();
     }
 }
 //# sourceMappingURL=executorManager.js.map