@pimlico/alto 0.0.0-main.20250203T212650 → 0.0.0-main.20250205T150420

package/esm/executor/utils.js

@@ -1,199 +1,60 @@
-import { EntryPointV06Abi, EntryPointV07Abi, failedOpErrorSchema, failedOpWithRevertErrorSchema } from "../types/index.js";
-import { getRevertErrorData, isVersion06, parseViemError, scaleBigIntByPercent, toPackedUserOperation } from "../utils/index.js";
+import { EntryPointV06Abi, EntryPointV07Abi } from "../types/index.js";
+import { isVersion06, toPackedUserOperation, isVersion07 } from "../utils/index.js";
 // biome-ignore lint/style/noNamespaceImport: explicitly make it clear when sentry is used
 import * as sentry from "@sentry/node";
-import { ContractFunctionRevertedError, EstimateGasExecutionError, FeeCapTooLowError, decodeErrorResult } from "viem";
+import { encodeFunctionData } from "viem";
 export const isTransactionUnderpricedError = (e) => {
     return e?.details
         ?.toLowerCase()
         .includes("replacement transaction underpriced");
 };
-export const getAuthorizationList = (userOperations) => {
-    const authorizationList = userOperations
-        .map((op) => {
-        if (op.eip7702Auth) {
-            return op.eip7702Auth;
+// V7 source: https://github.com/eth-infinitism/account-abstraction/blob/releases/v0.7/contracts/core/EntryPoint.sol
+// V6 source: https://github.com/eth-infinitism/account-abstraction/blob/fa61290d37d079e928d92d53a122efcc63822214/contracts/core/EntryPoint.sol#L236
+export function calculateAA95GasFloor(userOps) {
+    let gasFloor = 0n;
+    for (const userOpInfo of userOps) {
+        const { userOp } = userOpInfo;
+        if (isVersion07(userOp)) {
+            const totalGas = userOp.callGasLimit +
+                (userOp.paymasterPostOpGasLimit || 0n) +
+                10000n;
+            gasFloor += (totalGas * 64n) / 63n;
         }
-        return undefined;
-    })
-        .filter((auth) => auth !== undefined);
-    return authorizationList.length > 0 ? authorizationList : undefined;
-};
-export function simulatedOpsToResults(simulatedOps, transactionInfo) {
-    return simulatedOps.map(({ reason, owh }) => {
-        if (reason === undefined) {
-            return {
-                status: "success",
-                value: {
-                    userOperation: {
-                        entryPoint: transactionInfo.entryPoint,
-                        userOperation: owh.userOperation,
-                        userOperationHash: owh.userOperationHash,
-                        lastReplaced: Date.now(),
-                        firstSubmitted: Date.now()
-                    },
-                    transactionInfo
-                }
-            };
-        }
-        return {
-            status: "failure",
-            error: {
-                entryPoint: transactionInfo.entryPoint,
-                userOperation: owh.userOperation,
-                userOpHash: owh.userOperationHash,
-                reason: reason
-            }
-        };
-    });
-}
-export async function filterOpsAndEstimateGas(entryPoint, ep, wallet, ops, nonce, maxFeePerGas, maxPriorityFeePerGas, blockTag, onlyPre1559, fixedGasLimitForEstimation, reputationManager, logger, authorizationList) {
-    const simulatedOps = ops.map((owh) => {
-        return { owh, reason: undefined };
-    });
-    let gasLimit;
-    const isUserOpV06 = isVersion06(simulatedOps[0].owh.userOperation);
-    const gasOptions = onlyPre1559
-        ? { gasPrice: maxFeePerGas }
-        : { maxFeePerGas, maxPriorityFeePerGas };
-    let fixedEstimationGasLimit = fixedGasLimitForEstimation;
-    let retriesLeft = 5;
-    while (simulatedOps.filter((op) => op.reason === undefined).length > 0) {
-        try {
-            const opsToSend = simulatedOps
-                .filter((op) => op.reason === undefined)
-                .map(({ owh }) => {
-                const op = owh.userOperation;
-                return isUserOpV06
-                    ? op
-                    : toPackedUserOperation(op);
-            });
-            gasLimit = await ep.estimateGas.handleOps(
-            // @ts-ignore - ep is set correctly for opsToSend, but typescript doesn't know that
-            [opsToSend, wallet.address], {
-                account: wallet,
-                nonce: nonce,
-                blockTag: blockTag,
-                ...(fixedEstimationGasLimit !== undefined && {
-                    gas: fixedEstimationGasLimit
-                }),
-                ...(authorizationList !== undefined && {
-                    authorizationList
-                }),
-                ...gasOptions
-            });
-            return { simulatedOps, gasLimit };
-        }
-        catch (err) {
-            logger.error({ err, blockTag }, "error estimating gas");
-            const e = parseViemError(err);
-            if (e instanceof ContractFunctionRevertedError) {
-                const failedOpError = failedOpErrorSchema.safeParse(e.data);
-                const failedOpWithRevertError = failedOpWithRevertErrorSchema.safeParse(e.data);
-                let errorData = undefined;
-                if (failedOpError.success) {
-                    errorData = failedOpError.data.args;
-                }
-                if (failedOpWithRevertError.success) {
-                    errorData = failedOpWithRevertError.data.args;
-                }
-                if (errorData) {
-                    if (errorData.reason.indexOf("AA95 out of gas") !== -1 &&
-                        retriesLeft > 0) {
-                        retriesLeft--;
-                        fixedEstimationGasLimit = scaleBigIntByPercent(fixedEstimationGasLimit || BigInt(30_000_000), 110n);
-                        continue;
-                    }
-                    logger.debug({
-                        errorData,
-                        userOpHashes: simulatedOps
-                            .filter((op) => op.reason === undefined)
-                            .map((op) => op.owh.userOperationHash)
-                    }, "user op in batch invalid");
-                    const failingOp = simulatedOps.filter((op) => op.reason === undefined)[Number(errorData.opIndex)];
-                    failingOp.reason = `${errorData.reason}${errorData?.inner
-                        ? ` - ${errorData.inner}`
-                        : ""}`;
-                    reputationManager.crashedHandleOps(failingOp.owh.userOperation, entryPoint, failingOp.reason);
-                }
-                if (!(failedOpError.success || failedOpWithRevertError.success)) {
-                    sentry.captureException(err);
-                    logger.error({
-                        error: `${failedOpError.error} ${failedOpWithRevertError.error}`
-                    }, "failed to parse failedOpError");
-                    return {
-                        simulatedOps: [],
-                        gasLimit: 0n
-                    };
-                }
-            }
-            else if (e instanceof EstimateGasExecutionError ||
-                err instanceof EstimateGasExecutionError) {
-                if (e?.cause instanceof FeeCapTooLowError && retriesLeft > 0) {
-                    retriesLeft--;
-                    logger.info({ error: e.shortMessage }, "error estimating gas due to max fee < basefee");
-                    if ("gasPrice" in gasOptions) {
-                        gasOptions.gasPrice = scaleBigIntByPercent(gasOptions.gasPrice || maxFeePerGas, 125n);
-                    }
-                    if ("maxFeePerGas" in gasOptions) {
-                        gasOptions.maxFeePerGas = scaleBigIntByPercent(gasOptions.maxFeePerGas || maxFeePerGas, 125n);
-                    }
-                    if ("maxPriorityFeePerGas" in gasOptions) {
-                        gasOptions.maxPriorityFeePerGas = scaleBigIntByPercent(gasOptions.maxPriorityFeePerGas ||
-                            maxPriorityFeePerGas, 125n);
-                    }
-                    continue;
-                }
-                try {
-                    let errorHexData = "0x";
-                    if (err instanceof EstimateGasExecutionError) {
-                        errorHexData = getRevertErrorData(err);
-                    }
-                    else {
-                        errorHexData = e?.details.split("Reverted ")[1];
-                    }
-                    const errorResult = decodeErrorResult({
-                        abi: isUserOpV06 ? EntryPointV06Abi : EntryPointV07Abi,
-                        data: errorHexData
-                    });
-                    logger.debug({
-                        errorName: errorResult.errorName,
-                        args: errorResult.args,
-                        userOpHashes: simulatedOps
-                            .filter((op) => op.reason === undefined)
-                            .map((op) => op.owh.userOperationHash)
-                    }, "user op in batch invalid");
-                    if (errorResult.errorName !== "FailedOpWithRevert" &&
-                        errorResult.errorName !== "FailedOp") {
-                        logger.error({
-                            errorName: errorResult.errorName,
-                            args: errorResult.args
-                        }, "unexpected error result");
-                        return {
-                            simulatedOps: [],
-                            gasLimit: 0n
-                        };
-                    }
-                    const failingOp = simulatedOps.filter((op) => op.reason === undefined)[Number(errorResult.args[0])];
-                    failingOp.reason = errorResult.args[1];
-                }
-                catch (e) {
-                    logger.error({ error: JSON.stringify(err) }, "failed to parse error result");
-                    return {
-                        simulatedOps: [],
-                        gasLimit: 0n
-                    };
-                }
-            }
-            else {
-                sentry.captureException(err);
-                logger.error({ error: JSON.stringify(err), blockTag }, "error estimating gas");
-                return { simulatedOps: [], gasLimit: 0n };
-            }
+        else {
+            gasFloor +=
+                userOp.callGasLimit + userOp.verificationGasLimit + 5000n;
         }
     }
-    return { simulatedOps, gasLimit: 0n };
+    return gasFloor;
 }
+export const getUserOpHashes = (userOpInfos) => {
+    return userOpInfos.map(({ userOpHash }) => userOpHash);
+};
+export const packUserOps = (userOpInfos) => {
+    const userOps = userOpInfos.map(({ userOp }) => userOp);
+    const isV06 = isVersion06(userOps[0]);
+    const packedUserOps = isV06
+        ? userOps
+        : userOps.map((op) => toPackedUserOperation(op));
+    return packedUserOps;
+};
+export const encodeHandleOpsCalldata = ({ userOps, beneficiary }) => {
+    const ops = userOps.map(({ userOp }) => userOp);
+    const isV06 = isVersion06(ops[0]);
+    const packedUserOps = packUserOps(userOps);
+    return encodeFunctionData({
+        abi: isV06 ? EntryPointV06Abi : EntryPointV07Abi,
+        functionName: "handleOps",
+        args: [packedUserOps, beneficiary]
+    });
+};
+export const getAuthorizationList = (userOpInfos) => {
+    const authList = userOpInfos
+        .map(({ userOp }) => userOp)
+        .map(({ eip7702Auth }) => eip7702Auth)
+        .filter(Boolean);
+    return authList.length ? authList : undefined;
+};
 export async function flushStuckTransaction(publicClient, walletClient, wallet, gasPrice, logger) {
     const latestNonce = await publicClient.getTransactionCount({
         address: wallet.address,

package/esm/executor/utils.js.map

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

package/esm/handlers/eventManager.d.ts

@@ -17,7 +17,10 @@ export declare class EventManager {
     emitQueued(userOperationHash: Hex): Promise<void>;
     emitReceived(userOperationHash: Hex, timestamp?: number): Promise<void>;
     emitFailedValidation(userOperationHash: Hex, reason?: string, aaError?: string): Promise<void>;
-    emitSubmitted(userOperationHash: Hex, transactionHash: Hex): Promise<void>;
+    emitSubmitted({ userOpHashes, transactionHash }: {
+        userOpHashes: Hex[];
+        transactionHash: Hex;
+    }): Promise<void>;
     emitDropped(userOperationHash: Hex, reason?: string, aaError?: string): Promise<void>;
     emitAddedToMempool(userOperationHash: Hex): Promise<void>;
     private emitEvent;

package/esm/handlers/eventManager.js

@@ -108,14 +108,16 @@ export class EventManager {
         });
     }
     // emits when the userOperation has been submitted to the network
-    async emitSubmitted(userOperationHash, transactionHash) {
-        await this.emitEvent({
-            userOperationHash,
-            event: {
-                eventType: "submitted",
-                transactionHash
-            }
-        });
+    async emitSubmitted({ userOpHashes, transactionHash }) {
+        for (const hash of userOpHashes) {
+            await this.emitEvent({
+                userOperationHash: hash,
+                event: {
+                    eventType: "submitted",
+                    transactionHash
+                }
+            });
+        }
     }
     // emits when the userOperation was dropped from the internal mempool
     async emitDropped(userOperationHash, reason, aaError) {

package/esm/handlers/eventManager.js.map

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

package/esm/mempool/mempool.d.ts

@@ -1,6 +1,5 @@
 import type { EventManager } from "../handlers/index.js";
-import { type InterfaceValidator, type ReferencedCodeHashes, type StorageMap, type SubmittedUserOperation, type TransactionInfo, type UserOperation, type UserOperationInfo } from "../types/index.js";
-import type { HexData32 } from "../types/index.js";
+import { type InterfaceValidator, type ReferencedCodeHashes, type StorageMap, type SubmittedUserOp, type TransactionInfo, type UserOperation, UserOperationBundle, UserOpInfo } from "../types/index.js";
 import type { Metrics } from "../utils/index.js";
 import { type Address } from "viem";
 import type { Monitor } from "./monitoring.js";
@@ -23,11 +22,11 @@ export declare class MemoryMempool {
         metrics: Metrics;
         eventManager: EventManager;
     });
-    replaceSubmitted(userOperation: UserOperationInfo, transactionInfo: TransactionInfo): void;
+    replaceSubmitted(userOpInfo: UserOpInfo, transactionInfo: TransactionInfo): void;
     markSubmitted(userOpHash: `0x${string}`, transactionInfo: TransactionInfo): void;
-    dumpOutstanding(): UserOperationInfo[];
-    dumpProcessing(): UserOperationInfo[];
-    dumpSubmittedOps(): SubmittedUserOperation[];
+    dumpOutstanding(): UserOperation[];
+    dumpProcessing(): UserOpInfo[];
+    dumpSubmittedOps(): SubmittedUserOp[];
     removeSubmitted(userOpHash: `0x${string}`): void;
     removeProcessing(userOpHash: `0x${string}`): void;
     checkEntityMultipleRoleViolation(op: UserOperation): Promise<void>;
@@ -36,8 +35,8 @@ export declare class MemoryMempool {
         paymasters: Set<Address>;
         factories: Set<Address>;
     };
-    add(userOperation: UserOperation, entryPoint: Address, referencedContracts?: ReferencedCodeHashes): [boolean, string];
-    shouldSkip(opInfo: UserOperationInfo, paymasterDeposit: {
+    add(userOp: UserOperation, entryPoint: Address, referencedContracts?: ReferencedCodeHashes): [boolean, string];
+    shouldSkip(userOpInfo: UserOpInfo, paymasterDeposit: {
         [paymaster: string]: bigint;
     }, stakedEntityCount: {
         [addr: string]: number;
@@ -61,9 +60,14 @@ export declare class MemoryMempool {
         senders: Set<string>;
         storageMap: StorageMap;
     }>;
-    process(maxGasLimit: bigint, minOps?: number): Promise<UserOperationInfo[]>;
-    get(opHash: HexData32): UserOperation | null;
-    getQueuedUserOperations(userOperation: UserOperation, entryPoint: Address, _currentNonceValue?: bigint): Promise<UserOperation[]>;
+    getBundles(maxBundleCount?: number): Promise<UserOperationBundle[]>;
+    process({ maxGasLimit, entryPoint, minOpsPerBundle, maxBundleCount }: {
+        maxGasLimit: bigint;
+        entryPoint: Address;
+        minOpsPerBundle: number;
+        maxBundleCount?: number;
+    }): Promise<UserOperationBundle[]>;
+    getQueuedUserOperations(userOp: UserOperation, entryPoint: Address, _currentNonceValue?: bigint): Promise<UserOperation[]>;
     clear(): void;
 }
 //# sourceMappingURL=mempool.d.ts.map