@pimlico/alto 0.0.3 → 0.0.5

package/lib/cli/setupServer.js.map

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

package/lib/executor/executor.d.ts

@@ -1,8 +1,8 @@
 import type { SenderManager } from "./index.js";
 import type { InterfaceReputationManager } from "../mempool/index.js";
-import { type Address, type BundleResult, type CompressedUserOperation, type HexData32, type TransactionInfo, type UserOperation } from "../types/index.js";
-import type { GasPriceManager, Logger, Metrics } from "../utils/index.js";
-import { type CompressionHandler } from "../utils/index.js";
+import { type TransactionInfo, type Address, type UserOperation, type BundleResult, type CompressedUserOperation } from "../types/index.js";
+import type { Logger, Metrics } from "../utils/index.js";
+import type { GasPriceManager, CompressionHandler, EventManager } from "../handlers/index.js";
 import { Mutex } from "async-mutex";
 import { type Account, type Chain, type PublicClient, type Transport, type WalletClient } from "viem";
 export interface GasEstimateResult {
@@ -18,15 +18,6 @@ export type ReplaceTransactionResult = {
 } | {
     status: "failed";
 };
-export declare class NullExecutor {
-    bundle(_entryPoint: Address, _ops: UserOperation[]): Promise<BundleResult[]>;
-    bundleCompressed(_entryPoint: Address, _compressedOps: CompressedUserOperation[]): Promise<BundleResult[]>;
-    replaceTransaction(_entryPoint: Address, _transactionInfo: TransactionInfo): Promise<ReplaceTransactionResult>;
-    replaceOps(_opHashes: HexData32[]): Promise<void>;
-    cancelOps(_entryPoint: Address, _ops: UserOperation[]): Promise<void>;
-    markWalletProcessed(_executor: Account): Promise<void>;
-    flushStuckTransactions(): Promise<void>;
-}
 export declare class Executor {
     publicClient: PublicClient;
     walletClient: WalletClient<Transport, Chain, Account | undefined>;
@@ -41,9 +32,11 @@ export declare class Executor {
     reputationManager: InterfaceReputationManager;
     compressionHandler: CompressionHandler | null;
     gasPriceManager: GasPriceManager;
-    disableBlockTagSupport: boolean;
+    blockTagSupport: boolean;
     mutex: Mutex;
-    constructor(publicClient: PublicClient, walletClient: WalletClient<Transport, Chain, Account | undefined>, senderManager: SenderManager, reputationManager: InterfaceReputationManager, entryPoints: Address[], logger: Logger, metrics: Metrics, compressionHandler: CompressionHandler | null, gasPriceManager: GasPriceManager, simulateTransaction?: boolean, legacyTransactions?: boolean, fixedGasLimitForEstimation?: bigint, disableBlockTagSupport?: boolean, localGasLimitCalculation?: boolean);
+    eventManager: EventManager;
+    noProfitBundling: boolean;
+    constructor(publicClient: PublicClient, walletClient: WalletClient<Transport, Chain, Account | undefined>, senderManager: SenderManager, reputationManager: InterfaceReputationManager, entryPoints: Address[], logger: Logger, metrics: Metrics, compressionHandler: CompressionHandler | null, gasPriceManager: GasPriceManager, eventManager: EventManager, simulateTransaction?: boolean, legacyTransactions?: boolean, fixedGasLimitForEstimation?: bigint, blockTagSupport?: boolean, localGasLimitCalculation?: boolean, noProfitBundling?: boolean);
     getCompressionHandler(): CompressionHandler;
     cancelOps(_entryPoint: Address, _ops: UserOperation[]): Promise<void>;
     markWalletProcessed(executor: Account): Promise<void>;

package/lib/executor/executor.js

@@ -23,37 +23,14 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Executor = exports.NullExecutor = void 0;
+exports.Executor = void 0;
 const types_1 = require("../types/index.js");
 const utils_1 = require("../utils/index.js");
+// biome-ignore lint/style/noNamespaceImport: explicitly make it clear when sentry is used
 const sentry = __importStar(require("@sentry/node"));
 const async_mutex_1 = require("async-mutex");
 const viem_1 = require("viem");
 const utils_2 = require("./utils.js");
-class NullExecutor {
-    bundle(_entryPoint, _ops) {
-        return Promise.resolve([]);
-    }
-    bundleCompressed(_entryPoint, _compressedOps) {
-        return Promise.resolve([]);
-    }
-    replaceTransaction(_entryPoint, _transactionInfo) {
-        return Promise.resolve({ status: "failed" });
-    }
-    replaceOps(_opHashes) {
-        return Promise.resolve();
-    }
-    cancelOps(_entryPoint, _ops) {
-        return Promise.resolve();
-    }
-    markWalletProcessed(_executor) {
-        return Promise.resolve();
-    }
-    flushStuckTransactions() {
-        return Promise.resolve();
-    }
-}
-exports.NullExecutor = NullExecutor;
 class Executor {
     // private unWatch: WatchBlocksReturnType | undefined
     publicClient;
@@ -69,9 +46,11 @@ class Executor {
     reputationManager;
     compressionHandler;
     gasPriceManager;
-    disableBlockTagSupport;
+    blockTagSupport;
     mutex;
-    constructor(publicClient, walletClient, senderManager, reputationManager, entryPoints, logger, metrics, compressionHandler, gasPriceManager, simulateTransaction = false, legacyTransactions = false, fixedGasLimitForEstimation, disableBlockTagSupport = false, localGasLimitCalculation = false) {
+    eventManager;
+    noProfitBundling; // if true, bundle such that all beneficiary fees go towards tx gasFees
+    constructor(publicClient, walletClient, senderManager, reputationManager, entryPoints, logger, metrics, compressionHandler, gasPriceManager, eventManager, simulateTransaction = false, legacyTransactions = false, fixedGasLimitForEstimation, blockTagSupport = true, localGasLimitCalculation = false, noProfitBundling = false) {
         this.publicClient = publicClient;
         this.walletClient = walletClient;
         this.senderManager = senderManager;
@@ -84,8 +63,10 @@ class Executor {
         this.localGasLimitCalculation = localGasLimitCalculation;
         this.compressionHandler = compressionHandler;
         this.gasPriceManager = gasPriceManager;
-        this.disableBlockTagSupport = disableBlockTagSupport;
+        this.eventManager = eventManager;
+        this.blockTagSupport = blockTagSupport;
         this.entryPoints = entryPoints;
+        this.noProfitBundling = noProfitBundling;
         this.mutex = new async_mutex_1.Mutex();
     }
     getCompressionHandler() {
@@ -152,27 +133,27 @@ class Executor {
                 type: "compressed"
             };
         }
-        const result = await (0, utils_2.filterOpsAndEstimateGas)(transactionInfo.entryPoint, callContext, transactionInfo.executor, opsWithHashes, newRequest.nonce, newRequest.maxFeePerGas, newRequest.maxPriorityFeePerGas, this.disableBlockTagSupport ? undefined : "latest", this.legacyTransactions, this.fixedGasLimitForEstimation, this.reputationManager, this.logger);
+        let { simulatedOps, gasLimit } = await (0, utils_2.filterOpsAndEstimateGas)(transactionInfo.entryPoint, callContext, transactionInfo.executor, opsWithHashes, newRequest.nonce, newRequest.maxFeePerGas, newRequest.maxPriorityFeePerGas, this.blockTagSupport ? "latest" : undefined, this.legacyTransactions, this.fixedGasLimitForEstimation, this.reputationManager, this.logger);
         const childLogger = this.logger.child({
             transactionHash: transactionInfo.transactionHash,
             executor: transactionInfo.executor.address
         });
-        if (result.simulatedOps.length === 0) {
+        if (simulatedOps.length === 0) {
             childLogger.warn("no ops to bundle");
             this.markWalletProcessed(transactionInfo.executor);
             return { status: "failed" };
         }
-        if (result.simulatedOps.every((op) => op.reason === "AA25 invalid account nonce" ||
+        if (simulatedOps.every((op) => op.reason === "AA25 invalid account nonce" ||
             op.reason === "AA10 sender already constructed")) {
-            childLogger.trace({ reasons: result.simulatedOps.map((sop) => sop.reason) }, "all ops failed simulation with nonce error");
+            childLogger.trace({ reasons: simulatedOps.map((sop) => sop.reason) }, "all ops failed simulation with nonce error");
             return { status: "potentially_already_included" };
         }
-        if (result.simulatedOps.every((op) => op.reason !== undefined)) {
+        if (simulatedOps.every((op) => op.reason !== undefined)) {
             childLogger.warn("all ops failed simulation");
             this.markWalletProcessed(transactionInfo.executor);
             return { status: "failed" };
         }
-        const opsToBundle = result.simulatedOps
+        const opsToBundle = simulatedOps
             .filter((op) => op.reason === undefined)
             .map((op) => {
             const opInfo = transactionInfo.userOperationInfos.find((info) => info.userOperationHash === op.owh.userOperationHash);
@@ -181,15 +162,29 @@ class Executor {
             }
             return opInfo;
         });
-        newRequest.gas = this.localGasLimitCalculation
-            ? opsToBundle.reduce((acc, opInfo) => {
+        if (this.localGasLimitCalculation) {
+            gasLimit = opsToBundle.reduce((acc, opInfo) => {
                 const userOperation = (0, types_1.deriveUserOperation)(opInfo.mempoolUserOperation);
                 return (acc +
                     userOperation.preVerificationGas +
                     3n * userOperation.verificationGasLimit +
                     userOperation.callGasLimit);
-            }, 0n)
-            : result.gasLimit;
+            }, 0n);
+        }
+        // https://github.com/eth-infinitism/account-abstraction/blob/fa61290d37d079e928d92d53a122efcc63822214/contracts/core/EntryPoint.sol#L236
+        let innerHandleOpFloor = 0n;
+        for (const owh of opsToBundle) {
+            const op = (0, types_1.deriveUserOperation)(owh.mempoolUserOperation);
+            innerHandleOpFloor +=
+                op.callGasLimit + op.verificationGasLimit + 5000n;
+        }
+        if (gasLimit < innerHandleOpFloor) {
+            gasLimit += innerHandleOpFloor;
+        }
+        // sometimes the estimation rounds down, adding a fixed constant accounts for this
+        gasLimit += 10000n;
+        // ensures that we don't submit again with too low of a gas value
+        newRequest.gas = (0, utils_1.maxBigInt)(newRequest.gas, gasLimit);
         // update calldata to include only ops that pass simulation
         if (transactionInfo.transactionType === "default") {
             const isUserOpVersion06 = opsWithHashes.reduce((acc, op) => {
@@ -241,6 +236,12 @@ class Executor {
                     accessList: undefined
                 }
                 : newRequest);
+            opsToBundle.map((opToBundle) => {
+                const op = (0, types_1.deriveUserOperation)(opToBundle.mempoolUserOperation);
+                const chainId = this.publicClient.chain?.id;
+                const opHash = (0, utils_1.getUserOperationHash)(op, opToBundle.entryPoint, chainId);
+                this.eventManager.emitSubmitted(opHash, txHash);
+            });
             const newTxInfo = {
                 ...transactionInfo,
                 transactionRequest: newRequest,
@@ -290,17 +291,15 @@ class Executor {
         }
     }
     async flushStuckTransactions() {
+        const allWallets = new Set(this.senderManager.wallets);
+        const utilityWallet = this.senderManager.utilityAccount;
+        if (utilityWallet) {
+            allWallets.add(utilityWallet);
+        }
+        const wallets = Array.from(allWallets);
         const gasPrice = await this.gasPriceManager.getGasPrice();
-        const wallets = this.senderManager.utilityAccount
-            ? Array.from(new Set([
-                ...this.senderManager.wallets,
-                this.senderManager.utilityAccount
-            ]))
-            : Array.from(new Set(this.senderManager.wallets));
-        const promises = wallets.map(async (wallet) => {
-            for (const entryPoint of this.entryPoints) {
-                await (0, utils_2.flushStuckTransaction)(this.publicClient, this.walletClient, wallet, gasPrice.maxFeePerGas * 5n, this.logger, entryPoint);
-            }
+        const promises = wallets.map((wallet) => {
+            (0, utils_2.flushStuckTransaction)(this.publicClient, this.walletClient, wallet, gasPrice.maxFeePerGas * 5n, this.logger);
         });
         await Promise.all(promises);
     }
@@ -343,33 +342,17 @@ class Executor {
             ep,
             type: "default"
         };
-        let { gasLimit, simulatedOps, resubmitAllOps } = await (0, utils_2.filterOpsAndEstimateGas)(entryPoint, callContext, wallet, opsWithHashes, nonce, gasPriceParameters.maxFeePerGas, gasPriceParameters.maxPriorityFeePerGas, this.disableBlockTagSupport ? undefined : "pending", this.legacyTransactions, this.fixedGasLimitForEstimation, this.reputationManager, childLogger);
-        gasLimit += 10000n;
-        if (resubmitAllOps) {
-            this.markWalletProcessed(wallet);
-            return opsWithHashes.map((owh) => {
-                const bundleResult = {
-                    status: "resubmit",
-                    info: {
-                        entryPoint,
-                        userOpHash: owh.userOperationHash,
-                        userOperation: owh.mempoolUserOperation,
-                        reason: viem_1.FeeCapTooLowError.name
-                    }
-                };
-                return bundleResult;
-            });
-        }
+        let { gasLimit, simulatedOps } = await (0, utils_2.filterOpsAndEstimateGas)(entryPoint, callContext, wallet, opsWithHashes, nonce, gasPriceParameters.maxFeePerGas, gasPriceParameters.maxPriorityFeePerGas, this.blockTagSupport ? "pending" : undefined, this.legacyTransactions, this.fixedGasLimitForEstimation, this.reputationManager, childLogger);
         if (simulatedOps.length === 0) {
             childLogger.error("gas limit simulation encountered unexpected failure");
             this.markWalletProcessed(wallet);
-            return opsWithHashes.map((owh) => {
+            return opsWithHashes.map(({ userOperationHash, mempoolUserOperation }) => {
                 return {
                     status: "failure",
                     error: {
                         entryPoint,
-                        userOpHash: owh.userOperationHash,
-                        userOperation: owh.mempoolUserOperation,
+                        userOpHash: userOperationHash,
+                        userOperation: mempoolUserOperation,
                         reason: "INTERNAL FAILURE"
                     }
                 };
@@ -378,14 +361,14 @@ class Executor {
         if (simulatedOps.every((op) => op.reason !== undefined)) {
             childLogger.warn("all ops failed simulation");
             this.markWalletProcessed(wallet);
-            return simulatedOps.map((op) => {
+            return simulatedOps.map(({ reason, owh }) => {
                 return {
                     status: "failure",
                     error: {
                         entryPoint,
-                        userOpHash: op.owh.userOperationHash,
-                        userOperation: op.owh.mempoolUserOperation,
-                        reason: op.reason
+                        userOpHash: owh.userOperationHash,
+                        userOperation: owh.mempoolUserOperation,
+                        reason: reason
                     }
                 };
             });
@@ -397,36 +380,52 @@ class Executor {
             userOperations: opsWithHashToBundle.map((owh) => owh.userOperationHash),
             entryPoint
         });
-        childLogger.trace({ gasLimit }, "got gas limit");
-        let txHash;
+        // https://github.com/eth-infinitism/account-abstraction/blob/fa61290d37d079e928d92d53a122efcc63822214/contracts/core/EntryPoint.sol#L236
+        let innerHandleOpFloor = 0n;
+        let totalBeneficiaryFees = 0n;
+        for (const owh of opsWithHashToBundle) {
+            const op = (0, types_1.deriveUserOperation)(owh.mempoolUserOperation);
+            innerHandleOpFloor +=
+                op.callGasLimit + op.verificationGasLimit + 5000n;
+            totalBeneficiaryFees += (0, utils_1.getRequiredPrefund)(op);
+        }
+        if (gasLimit < innerHandleOpFloor) {
+            gasLimit += innerHandleOpFloor;
+        }
+        // sometimes the estimation rounds down, adding a fixed constant accounts for this
+        gasLimit += 10000n;
+        childLogger.debug({ gasLimit }, "got gas limit");
+        let transactionHash;
         try {
-            const gasOptions = this.legacyTransactions
-                ? {
-                    gasPrice: gasPriceParameters.maxFeePerGas
-                }
+            const isLegacyTransaction = this.legacyTransactions;
+            const gasOptions = isLegacyTransaction
+                ? { gasPrice: gasPriceParameters.maxFeePerGas }
                 : {
                     maxFeePerGas: gasPriceParameters.maxFeePerGas,
                     maxPriorityFeePerGas: gasPriceParameters.maxPriorityFeePerGas
                 };
-            txHash = isUserOpVersion06
-                ? await ep.write.handleOps([
-                    opsWithHashToBundle.map((owh) => owh.mempoolUserOperation),
-                    wallet.address
-                ], {
-                    account: wallet,
-                    gas: gasLimit,
-                    nonce: nonce,
-                    ...gasOptions
-                })
-                : await ep.write.handleOps([
-                    opsWithHashToBundle.map((owh) => (0, utils_1.toPackedUserOperation)(owh.mempoolUserOperation)),
-                    wallet.address
-                ], {
-                    account: wallet,
-                    gas: gasLimit,
-                    nonce: nonce,
-                    ...gasOptions
-                });
+            if (this.noProfitBundling) {
+                const gasPrice = totalBeneficiaryFees / gasLimit;
+                if (isLegacyTransaction) {
+                    gasOptions.gasPrice = gasPrice;
+                }
+                else {
+                    gasOptions.maxFeePerGas = (0, utils_1.maxBigInt)(gasPrice, gasOptions.maxFeePerGas || 0n);
+                }
+            }
+            const opts = {
+                account: wallet,
+                gas: gasLimit,
+                nonce: nonce,
+                ...gasOptions
+            };
+            const userOps = opsWithHashToBundle.map((owh) => isUserOpVersion06
+                ? owh.mempoolUserOperation
+                : (0, utils_1.toPackedUserOperation)(owh.mempoolUserOperation));
+            transactionHash = await ep.write.handleOps([userOps, wallet.address], opts);
+            opsWithHashToBundle.map(({ userOperationHash }) => {
+                this.eventManager.emitSubmitted(userOperationHash, transactionHash);
+            });
         }
         catch (err) {
             const e = (0, utils_1.parseViemError)(err);
@@ -445,6 +444,23 @@ class Executor {
                     };
                 });
             }
+            if (e?.details
+                .toLowerCase()
+                .includes("replacement transaction underpriced")) {
+                childLogger.error({ error: e }, "replacement transaction underpriced");
+                this.markWalletProcessed(wallet);
+                return opsWithHashToBundle.map((owh) => {
+                    return {
+                        status: "resubmit",
+                        info: {
+                            entryPoint,
+                            userOpHash: owh.userOperationHash,
+                            userOperation: owh.mempoolUserOperation,
+                            reason: "replacement transaction underpriced"
+                        }
+                    };
+                });
+            }
             sentry.captureException(err);
             childLogger.error({ error: JSON.stringify(err) }, "error submitting bundle transaction");
             this.markWalletProcessed(wallet);
@@ -473,7 +489,7 @@ class Executor {
             entryPoint,
             isVersion06: isUserOpVersion06,
             transactionType: "default",
-            transactionHash: txHash,
+            transactionHash: transactionHash,
             previousTransactionHashes: [],
             transactionRequest: {
                 account: wallet,
@@ -513,7 +529,7 @@ class Executor {
                 ...transactionInfo.transactionRequest,
                 abi: undefined
             },
-            txHash,
+            txHash: transactionHash,
             opHashes: opsWithHashToBundle.map((owh) => owh.userOperationHash)
         }, "submitted bundle transaction");
         return userOperationResults;
@@ -539,36 +555,23 @@ class Executor {
             perOpInflatorId: compressionHandler.perOpInflatorId,
             type: "compressed"
         };
-        let { gasLimit, simulatedOps, resubmitAllOps } = await (0, utils_2.filterOpsAndEstimateGas)(entryPoint, callContext, wallet, compressedOps.map((compressedOp) => {
+        let { gasLimit, simulatedOps } = await (0, utils_2.filterOpsAndEstimateGas)(entryPoint, callContext, wallet, compressedOps.map((compressedOp) => {
             return {
                 mempoolUserOperation: compressedOp,
                 userOperationHash: (0, utils_1.getUserOperationHash)(compressedOp.inflatedOp, entryPoint, this.walletClient.chain.id)
             };
-        }), nonce, gasPriceParameters.maxFeePerGas, gasPriceParameters.maxPriorityFeePerGas, this.disableBlockTagSupport ? undefined : "pending", this.legacyTransactions, this.fixedGasLimitForEstimation, this.reputationManager, childLogger);
+        }), nonce, gasPriceParameters.maxFeePerGas, gasPriceParameters.maxPriorityFeePerGas, this.blockTagSupport ? "pending" : undefined, this.legacyTransactions, this.fixedGasLimitForEstimation, this.reputationManager, childLogger);
         gasLimit += 10000n;
-        if (resubmitAllOps) {
-            this.markWalletProcessed(wallet);
-            return compressedOps.map((compressedOp) => {
-                return {
-                    status: "resubmit",
-                    info: {
-                        entryPoint,
-                        userOpHash: (0, utils_1.getUserOperationHash)(compressedOp.inflatedOp, entryPoint, this.walletClient.chain.id),
-                        userOperation: compressedOp,
-                        reason: viem_1.FeeCapTooLowError.name
-                    }
-                };
-            });
-        }
         if (simulatedOps.length === 0) {
             childLogger.warn("no ops to bundle");
             this.markWalletProcessed(wallet);
             return compressedOps.map((compressedOp) => {
+                const userOpHash = (0, utils_1.getUserOperationHash)(compressedOp.inflatedOp, entryPoint, this.walletClient.chain.id);
                 return {
                     status: "failure",
                     error: {
                         entryPoint,
-                        userOpHash: (0, utils_1.getUserOperationHash)(compressedOp.inflatedOp, entryPoint, this.walletClient.chain.id),
+                        userOpHash,
                         userOperation: compressedOp,
                         reason: "INTERNAL FAILURE"
                     }
@@ -579,14 +582,14 @@ class Executor {
         if (simulatedOps.some((simulatedOp) => simulatedOp.reason !== undefined)) {
             childLogger.warn("some ops failed simulation");
             this.markWalletProcessed(wallet);
-            return simulatedOps.map((simulatedOp) => {
+            return simulatedOps.map(({ reason, owh }) => {
                 return {
                     status: "failure",
                     error: {
                         entryPoint,
-                        userOpHash: simulatedOp.owh.userOperationHash,
-                        userOperation: simulatedOp.owh.mempoolUserOperation,
-                        reason: simulatedOp.reason
+                        userOpHash: owh.userOperationHash,
+                        userOperation: owh.mempoolUserOperation,
+                        reason: reason
                     }
                 };
             });
@@ -594,7 +597,7 @@ class Executor {
         const opsToBundle = simulatedOps
             .filter((simulatedOp) => simulatedOp.reason === undefined)
             .map((simulatedOp) => simulatedOp.owh);
-        let txHash;
+        let transactionHash;
         try {
             const gasOptions = this.legacyTransactions
                 ? {
@@ -604,27 +607,34 @@ class Executor {
                     maxFeePerGas: gasPriceParameters.maxFeePerGas,
                     maxPriorityFeePerGas: gasPriceParameters.maxPriorityFeePerGas
                 };
+            const compressedOpsToBundle = opsToBundle.map(({ mempoolUserOperation }) => {
+                const compressedOp = mempoolUserOperation;
+                return compressedOp;
+            });
             // need to use sendTransaction to target BundleBulker's fallback
-            txHash = await this.walletClient.sendTransaction({
+            transactionHash = await this.walletClient.sendTransaction({
                 account: wallet,
                 to: compressionHandler.bundleBulkerAddress,
-                data: (0, utils_2.createCompressedCalldata)(compressedOps, compressionHandler.perOpInflatorId),
+                data: (0, utils_2.createCompressedCalldata)(compressedOpsToBundle, compressionHandler.perOpInflatorId),
                 gas: gasLimit,
                 nonce: nonce,
                 ...gasOptions
             });
+            opsToBundle.map(({ userOperationHash }) => {
+                this.eventManager.emitSubmitted(userOperationHash, transactionHash);
+            });
         }
         catch (err) {
             sentry.captureException(err);
             childLogger.error({ error: JSON.stringify(err) }, "error submitting bundle transaction");
             this.markWalletProcessed(wallet);
-            return opsToBundle.map((op) => {
+            return opsToBundle.map(({ userOperationHash, mempoolUserOperation }) => {
                 return {
                     status: "failure",
                     error: {
                         entryPoint,
-                        userOpHash: op.userOperationHash,
-                        userOperation: op.mempoolUserOperation,
+                        userOpHash: userOperationHash,
+                        userOperation: mempoolUserOperation,
                         reason: "INTERNAL FAILURE"
                     }
                 };
@@ -643,7 +653,7 @@ class Executor {
             entryPoint,
             isVersion06: true, //TODO: compressed bundles are always v06
             transactionType: "compressed",
-            transactionHash: txHash,
+            transactionHash,
             previousTransactionHashes: [],
             transactionRequest: {
                 to: compressionHandler.bundleBulkerAddress,
@@ -663,7 +673,7 @@ class Executor {
         };
         const userOperationResults = (0, utils_2.simulatedOpsToResults)(simulatedOps, transactionInfo);
         childLogger.info({
-            txHash,
+            txHash: transactionHash,
             opHashes: opsToBundle.map((owh) => owh.userOperationHash)
         }, "submitted bundle transaction");
         return userOperationResults;