@pimlico/alto 0.0.19 → 0.0.20

package/esm/rpc/validation/UnsafeValidator.d.ts

@@ -1,7 +1,6 @@
 import type { GasPriceManager } from "../../handlers/index.js";
-import type { InterfaceValidator, StateOverrides, UserOperationV06, UserOperationV07, ValidationResult, ValidationResultV06, ValidationResultV07, ValidationResultWithAggregationV06, ValidationResultWithAggregationV07 } from "../../types/index.js";
-import { type Address, type ExecutionResult, type ReferencedCodeHashes, type StorageMap, type UserOperation, type ValidationResultWithAggregation } from "../../types/index.js";
-import type { Logger, Metrics } from "../../utils/index.js";
+import { type Address, type ExecutionResult, type InterfaceValidator, type ReferencedCodeHashes, type StateOverrides, type StorageMap, type UserOperation, type UserOperation06, type UserOperation07, type ValidationResult, type ValidationResult06, type ValidationResult07 } from "../../types/index.js";
+import { type Logger, type Metrics } from "../../utils/index.js";
 import type { AltoConfig } from "../../createConfig.js";
 import { GasEstimationHandler } from "../estimation/gasEstimationHandler.js";
 import type { SimulateHandleOpResult } from "../estimation/types.js";
@@ -16,24 +15,29 @@ export declare class UnsafeValidator implements InterfaceValidator {
         metrics: Metrics;
         gasPriceManager: GasPriceManager;
     });
-    getSimulationResult(isVersion06: boolean, errorResult: unknown, logger: Logger, simulationType: "validation" | "execution"): Promise<ValidationResult | ValidationResultWithAggregation | ExecutionResult>;
+    getSimulationResult06(errorResult: unknown, logger: Logger, simulationType: "validation" | "execution"): Promise<ValidationResult | ExecutionResult>;
     validateHandleOp(args: {
         userOp: UserOperation;
         entryPoint: Address;
         queuedUserOps: UserOperation[];
         stateOverrides?: StateOverrides;
-    }): Promise<SimulateHandleOpResult>;
+    }): Promise<{
+        callGasLimit: bigint;
+        verificationGasLimit: bigint;
+        paymasterVerificationGasLimit: bigint | null;
+        paymasterPostOpGasLimit: bigint | null;
+    }>;
     getExecutionResult(args: {
         userOp: UserOperation;
         entryPoint: Address;
         queuedUserOps: UserOperation[];
         stateOverrides?: StateOverrides;
     }): Promise<SimulateHandleOpResult>;
-    getValidationResultV06(args: {
-        userOp: UserOperationV06;
+    getValidationResult06(args: {
+        userOp: UserOperation06;
         entryPoint: Address;
         codeHashes?: ReferencedCodeHashes;
-    }): Promise<(ValidationResultV06 | ValidationResultWithAggregationV06) & {
+    }): Promise<ValidationResult06 & {
         storageMap: StorageMap;
         referencedContracts?: ReferencedCodeHashes;
     }>;
@@ -62,12 +66,12 @@ export declare class UnsafeValidator implements InterfaceValidator {
         validAfter: number;
         validUntil: number;
     };
-    getValidationResultV07(args: {
-        userOp: UserOperationV07;
-        queuedUserOps: UserOperationV07[];
+    getValidationResult07(args: {
+        userOp: UserOperation07;
+        queuedUserOps: UserOperation07[];
         entryPoint: Address;
         codeHashes?: ReferencedCodeHashes;
-    }): Promise<(ValidationResultV07 | ValidationResultWithAggregationV07) & {
+    }): Promise<ValidationResult07 & {
         storageMap: StorageMap;
         referencedContracts?: ReferencedCodeHashes;
     }>;
@@ -76,7 +80,7 @@ export declare class UnsafeValidator implements InterfaceValidator {
         queuedUserOps: UserOperation[];
         entryPoint: Address;
         codeHashes?: ReferencedCodeHashes;
-    }): Promise<(ValidationResult | ValidationResultWithAggregation) & {
+    }): Promise<ValidationResult & {
         storageMap: StorageMap;
         referencedContracts?: ReferencedCodeHashes;
     }>;
@@ -85,7 +89,7 @@ export declare class UnsafeValidator implements InterfaceValidator {
         queuedUserOps: UserOperation[];
         entryPoint: Address;
         _referencedContracts?: ReferencedCodeHashes;
-    }): Promise<(ValidationResult | ValidationResultWithAggregation) & {
+    }): Promise<ValidationResult & {
         storageMap: StorageMap;
         referencedContracts?: ReferencedCodeHashes;
     }>;

package/esm/rpc/validation/UnsafeValidator.js

@@ -1,10 +1,11 @@
-import { EntryPointV06Abi, ExecutionErrors, RpcError, ValidationErrors, entryPointExecutionErrorSchemaV06, entryPointExecutionErrorSchemaV07 } from "../../types/index.js";
+import { ERC7769Errors, EntryPointV06Abi, RpcError, entryPointExecutionErrorSchema06 } from "../../types/index.js";
 import { isVersion06 } from "../../utils/index.js";
 import * as sentry from "@sentry/node";
 import { BaseError, ContractFunctionExecutionError, getContract, pad, slice, toHex, zeroAddress } from "viem";
 import { fromZodError } from "zod-validation-error";
 import { getEip7702DelegationOverrides } from "../../utils/eip7702.js";
 import { GasEstimationHandler } from "../estimation/gasEstimationHandler.js";
+import { toErc7769Code } from "../estimation/utils.js";
 export class UnsafeValidator {
     config;
     metrics;
@@ -20,14 +21,11 @@ export class UnsafeValidator {
         });
         this.gasEstimationHandler = new GasEstimationHandler(config, gasPriceManager);
     }
-    async getSimulationResult(isVersion06, errorResult, logger, simulationType) {
-        const entryPointExecutionErrorSchema = isVersion06
-            ? entryPointExecutionErrorSchemaV06
-            : entryPointExecutionErrorSchemaV07;
-        const entryPointErrorSchemaParsing = entryPointExecutionErrorSchema.safeParse(errorResult);
-        if (!entryPointErrorSchemaParsing.success) {
+    async getSimulationResult06(errorResult, logger, simulationType) {
+        const parsingResult = entryPointExecutionErrorSchema06.safeParse(errorResult);
+        if (!parsingResult.success) {
             try {
-                const err = fromZodError(entryPointErrorSchemaParsing.error);
+                const err = fromZodError(parsingResult.error);
                 logger.error({ error: err.message }, "unexpected error during valiation");
                 logger.error(JSON.stringify(errorResult));
                 err.message = `User Operation simulation returned unexpected invalid response: ${err.message}`;
@@ -38,16 +36,16 @@ export class UnsafeValidator {
                     const revertError = errorResult.walk((err) => err instanceof ContractFunctionExecutionError);
                     throw new RpcError(`UserOperation reverted during simulation with reason: ${
                     // biome-ignore lint/suspicious/noExplicitAny: it's a generic type
-                    revertError?.cause?.reason}`, ValidationErrors.SimulateValidation);
+                    revertError?.cause?.reason}`, ERC7769Errors.SimulateValidation);
                 }
                 sentry.captureException(errorResult);
                 throw new Error(`User Operation simulation returned unexpected invalid response: ${JSON.stringify(errorResult)}`);
             }
         }
-        const errorData = entryPointErrorSchemaParsing.data;
+        const errorData = parsingResult.data;
         if (errorData.errorName === "FailedOp") {
             const reason = errorData.args.reason;
-            throw new RpcError(`UserOperation reverted during simulation with reason: ${reason}`, ValidationErrors.SimulateValidation);
+            throw new RpcError(`UserOperation reverted during simulation with reason: ${reason}`, toErc7769Code(reason));
         }
         if (simulationType === "validation") {
             if (errorData.errorName !== "ValidationResult" &&
@@ -71,14 +69,55 @@ export class UnsafeValidator {
             targetCallData: "0x",
             stateOverrides
         });
+        let { callGasLimit, verificationGasLimit } = userOp;
+        let paymasterVerificationGasLimit = "paymasterVerificationGasLimit" in userOp
+            ? userOp.paymasterVerificationGasLimit
+            : null;
+        // Check if userOperation passes without estimation balance overrides (will throw error if it fails validation)
+        // the errors we are looking for are:
+        // 1. AA31 paymaster deposit too low
+        // 2. AA21 didn't pay prefund
         if (error.result === "failed") {
-            let errorCode = ExecutionErrors.UserOperationReverted;
-            if (error.data.toString().includes("AA23")) {
-                errorCode = ValidationErrors.SimulateValidation;
+            const data = error.data.toString();
+            if (data.includes("AA31") ||
+                data.includes("AA21") ||
+                data.includes("AA50")) {
+                const errorMessage = data;
+                throw new RpcError(`UserOperation reverted during simulation with reason: ${errorMessage}`, toErc7769Code(errorMessage));
+            }
+            this.metrics.altoSecondValidationFailed.inc();
+            this.logger.warn({ data }, "Second validation during eth_estimateUserOperationGas led to a failure");
+            // we always have to double the call gas limits as other gas limits happen
+            // before we even get to callGasLimit
+            callGasLimit *= 2n;
+            const isPaymasterError = data.includes("AA33") || data.includes("AA36");
+            const isVerificationError = data.includes("AA23") ||
+                data.includes("AA13") ||
+                data.includes("AA26") ||
+                data.includes("AA40") ||
+                data.includes("AA41");
+            if (isPaymasterError && paymasterVerificationGasLimit) {
+                // paymasterVerificationGasLimit out of gas errors
+                paymasterVerificationGasLimit *= 2n;
+            }
+            else if (isVerificationError) {
+                // verificationGasLimit out of gas errors
+                verificationGasLimit *= 2n;
+                // we need to increase paymaster fields because they will be
+                // caught after verification gas limit errors
+                if (paymasterVerificationGasLimit) {
+                    paymasterVerificationGasLimit *= 2n;
+                }
             }
-            throw new RpcError(`UserOperation reverted during simulation with reason: ${error.data}`, errorCode);
         }
-        return error;
+        return {
+            callGasLimit: callGasLimit,
+            verificationGasLimit: verificationGasLimit,
+            paymasterVerificationGasLimit: paymasterVerificationGasLimit,
+            paymasterPostOpGasLimit: "paymasterPostOpGasLimit" in userOp
+                ? userOp.paymasterPostOpGasLimit
+                : null
+        };
     }
     async getExecutionResult(args) {
         const { userOp, entryPoint, queuedUserOps, stateOverrides } = args;
@@ -91,24 +130,15 @@ export class UnsafeValidator {
             stateOverrides
         });
         if (error.result === "failed") {
-            let errorCode = ExecutionErrors.UserOperationReverted;
-            if (error.data.toString().includes("AA23")) {
-                errorCode = ValidationErrors.SimulateValidation;
-                return {
-                    result: "failed",
-                    data: error.data,
-                    code: errorCode
-                };
-            }
             return {
                 result: "failed",
                 data: `UserOperation reverted during simulation with reason: ${error.data}`,
-                code: errorCode
+                code: error.code
             };
         }
         return error;
     }
-    async getValidationResultV06(args) {
+    async getValidationResult06(args) {
         const { userOp, entryPoint } = args;
         const entryPointContract = getContract({
             address: entryPoint,
@@ -138,11 +168,11 @@ export class UnsafeValidator {
         });
         const [simulateValidationResult, runtimeValidation] = await Promise.all([simulateValidationPromise, runtimeValidationPromise]);
         const validationResult = {
-            ...(await this.getSimulationResult(isVersion06(userOp), simulateValidationResult, this.logger, "validation")),
+            ...(await this.getSimulationResult06(simulateValidationResult, this.logger, "validation")),
             storageMap: {}
         };
         if (validationResult.returnInfo.sigFailed) {
-            throw new RpcError("Invalid UserOperation signature or paymaster signature", ValidationErrors.InvalidSignature);
+            throw new RpcError("Invalid UserOperation signature or paymaster signature", ERC7769Errors.InvalidSignature);
         }
         const now = Date.now() / 1000;
         this.logger.debug({
@@ -152,15 +182,15 @@ export class UnsafeValidator {
         });
         if (validationResult.returnInfo.validAfter > now &&
             this.config.expirationCheck) {
-            throw new RpcError("User operation is not valid yet", ValidationErrors.ExpiresShortly);
+            throw new RpcError("User operation is not valid yet", ERC7769Errors.ExpiresShortly);
         }
         if (this.config.expirationCheck &&
             validationResult.returnInfo.validUntil < now + 5) {
-            throw new RpcError("expires too soon", ValidationErrors.ExpiresShortly);
+            throw new RpcError("expires too soon", ERC7769Errors.ExpiresShortly);
         }
         // validate runtime
         if (runtimeValidation.result === "failed") {
-            throw new RpcError(`UserOperation reverted during simulation with reason: ${runtimeValidation.data}`, ValidationErrors.SimulateValidation);
+            throw new RpcError(`UserOperation reverted during simulation with reason: ${runtimeValidation.data}`, ERC7769Errors.SimulateValidation);
         }
         return validationResult;
     }
@@ -191,7 +221,7 @@ export class UnsafeValidator {
     mergeValidationDataValues(accountValidationData, paymasterValidationData) {
         return this.mergeValidationData(this.parseValidationData(accountValidationData), this.parseValidationData(paymasterValidationData));
     }
-    async getValidationResultV07(args) {
+    async getValidationResult07(args) {
         const { userOp, queuedUserOps, entryPoint } = args;
         const simulateValidationResult = await this.gasEstimationHandler.gasEstimator07.simulateValidation({
             entryPoint,
@@ -199,7 +229,8 @@ export class UnsafeValidator {
             queuedUserOps
         });
         if (simulateValidationResult.result === "failed") {
-            throw new RpcError(`UserOperation reverted with reason: ${simulateValidationResult.data}`, ValidationErrors.SimulateValidation);
+            const failedResult = simulateValidationResult;
+            throw new RpcError(`UserOperation reverted with reason: ${failedResult.data}`, failedResult.code);
         }
         const validationResult = simulateValidationResult.data;
         const mergedValidation = this.mergeValidationDataValues(validationResult.returnInfo.accountValidationData, validationResult.returnInfo.paymasterValidationData);
@@ -232,32 +263,32 @@ export class UnsafeValidator {
         };
         // this.validateStorageAccessList(userOp, res, accessList)
         if (res.returnInfo.accountSigFailed) {
-            throw new RpcError("Invalid UserOp signature", ValidationErrors.InvalidSignature);
+            throw new RpcError("Invalid UserOp signature", ERC7769Errors.InvalidSignature);
         }
         if (res.returnInfo.paymasterSigFailed) {
-            throw new RpcError("Invalid UserOp paymasterData", ValidationErrors.InvalidSignature);
+            throw new RpcError("Invalid UserOp paymasterData", ERC7769Errors.InvalidSignature);
         }
         const now = Math.floor(Date.now() / 1000);
         if (res.returnInfo.validAfter > now) {
-            throw new RpcError(`User operation is not valid yet, validAfter=${res.returnInfo.validAfter}, now=${now}`, ValidationErrors.ExpiresShortly);
+            throw new RpcError(`User operation is not valid yet, validAfter=${res.returnInfo.validAfter}, now=${now}`, ERC7769Errors.ExpiresShortly);
         }
         if (this.config.expirationCheck &&
             (res.returnInfo.validUntil == null ||
                 res.returnInfo.validUntil < now + 5)) {
-            throw new RpcError(`UserOperation expires too soon, validUntil=${res.returnInfo.validUntil}, now=${now}`, ValidationErrors.ExpiresShortly);
+            throw new RpcError(`UserOperation expires too soon, validUntil=${res.returnInfo.validUntil}, now=${now}`, ERC7769Errors.ExpiresShortly);
         }
         return res;
     }
     getValidationResult(args) {
         const { userOp, queuedUserOps, entryPoint, codeHashes } = args;
         if (isVersion06(userOp)) {
-            return this.getValidationResultV06({
+            return this.getValidationResult06({
                 userOp,
                 entryPoint,
                 codeHashes
             });
         }
-        return this.getValidationResultV07({
+        return this.getValidationResult07({
             userOp,
             queuedUserOps: queuedUserOps,
             entryPoint

package/esm/rpc/validation/UnsafeValidator.js.map

@@ -1 +1 @@
-{"version":3,"file":"UnsafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/UnsafeValidator.ts"],"names":[],"mappings":"AAYA,OAAO,EAEH,gBAAgB,EAChB,eAAe,EAGf,QAAQ,EAGR,gBAAgB,EAEhB,iCAAiC,EACjC,iCAAiC,EACpC,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,cAAc,CAAA;AACtC,OAAO,EACH,SAAS,EACT,8BAA8B,EAE9B,WAAW,EACX,GAAG,EACH,KAAK,EACL,KAAK,EACL,WAAW,EACd,MAAM,MAAM,CAAA;AACb,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAA;AAEnD,OAAO,EAAE,6BAA6B,EAAE,MAAM,qBAAqB,CAAA;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,oCAAoC,CAAA;AAGzE,MAAM,OAAO,eAAe;IACxB,MAAM,CAAY;IAClB,OAAO,CAAS;IAChB,eAAe,CAAiB;IAChC,MAAM,CAAQ;IACd,oBAAoB,CAAsB;IAE1C,YAAY,EACR,MAAM,EACN,OAAO,EACP,eAAe,EAKlB;QACG,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAA;QACtB,IAAI,CAAC,eAAe,GAAG,eAAe,CAAA;QACtC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,SAAS,CAC1B,EAAE,MAAM,EAAE,WAAW,EAAE,EACvB;YACI,KAAK,EAAE,MAAM,CAAC,QAAQ;SACzB,CACJ,CAAA;QACD,IAAI,CAAC,oBAAoB,GAAG,IAAI,oBAAoB,CAChD,MAAM,EACN,eAAe,CAClB,CAAA;IACL,CAAC;IAED,KAAK,CAAC,mBAAmB,CACrB,WAAoB,EACpB,WAAoB,EACpB,MAAc,EACd,cAA0C;QAI1C,MAAM,8BAA8B,GAAG,WAAW;YAC9C,CAAC,CAAC,iCAAiC;YACnC,CAAC,CAAC,iCAAiC,CAAA;QAEvC,MAAM,4BAA4B,GAC9B,8BAA8B,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;QAEzD,IAAI,CAAC,4BAA4B,CAAC,OAAO,EAAE,CAAC;YACxC,IAAI,CAAC;gBACD,MAAM,GAAG,GAAG,YAAY,CAAC,4BAA4B,CAAC,KAAK,CAAC,CAAA;gBAC5D,MAAM,CAAC,KAAK,CACR,EAAE,KAAK,EAAE,GAAG,CAAC,OAAO,EAAE,EACtB,mCAAmC,CACtC,CAAA;gBACD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAA;gBACzC,GAAG,CAAC,OAAO,GAAG,mEAAmE,GAAG,CAAC,OAAO,EAAE,CAAA;gBAC9F,MAAM,GAAG,CAAA;YACb,CAAC;YAAC,MAAM,CAAC;gBACL,IAAI,WAAW,YAAY,SAAS,EAAE,CAAC;oBACnC,MAAM,WAAW,GAAG,WAAW,CAAC,IAAI,CAChC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,YAAY,8BAA8B,CACzD,CAAA;oBACD,MAAM,IAAI,QAAQ,CACd,yDAAyD;oBACrD,kEAAkE;oBACjE,WAAW,EAAE,KAAa,EAAE,MACjC,EAAE,EACF,gBAAgB,CAAC,kBAAkB,CACtC,CAAA;gBACL,CAAC;gBACD,MAAM,CAAC,gBAAgB,CAAC,WAAW,CAAC,CAAA;gBACpC,MAAM,IAAI,KAAK,CACX,mEAAmE,IAAI,CAAC,SAAS,CAC7E,WAAW,CACd,EAAE,CACN,CAAA;YACL,CAAC;QACL,CAAC;QAED,MAAM,SAAS,GAAG,4BAA4B,CAAC,IAAI,CAAA;QAEnD,IAAI,SAAS,CAAC,SAAS,KAAK,UAAU,EAAE,CAAC;YACrC,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAC,MAAM,CAAA;YACpC,MAAM,IAAI,QAAQ,CACd,yDAAyD,MAAM,EAAE,EACjE,gBAAgB,CAAC,kBAAkB,CACtC,CAAA;QACL,CAAC;QAED,IAAI,cAAc,KAAK,YAAY,EAAE,CAAC;YAClC,IACI,SAAS,CAAC,SAAS,KAAK,kBAAkB;gBAC1C,SAAS,CAAC,SAAS,KAAK,iCAAiC,EAC3D,CAAC;gBACC,MAAM,IAAI,KAAK,CACX,yFAAyF,CAC5F,CAAA;YACL,CAAC;QACL,CAAC;aAAM,IAAI,SAAS,CAAC,SAAS,KAAK,iBAAiB,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CACX,qDAAqD,CACxD,CAAA;QACL,CAAC;QAED,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAA;QAEvC,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAKtB;QACG,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;QAClE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAC3D,MAAM;YACN,aAAa;YACb,UAAU;YACV,aAAa,EAAE,WAAW;YAC1B,cAAc,EAAE,IAAI;YACpB,cAAc;SACjB,CAAC,CAAA;QAEF,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,SAAS,GAAW,eAAe,CAAC,qBAAqB,CAAA;YAE7D,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzC,SAAS,GAAG,gBAAgB,CAAC,kBAAkB,CAAA;YACnD,CAAC;YAED,MAAM,IAAI,QAAQ,CACd,yDAAyD,KAAK,CAAC,IAAI,EAAE,EACrE,SAAS,CACZ,CAAA;QACL,CAAC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,kBAAkB,CAAC,IAKxB;QACG,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,cAAc,EAAE,GAAG,IAAI,CAAA;QAClE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,oBAAoB,CAAC,gBAAgB,CAAC;YAC3D,MAAM;YACN,aAAa;YACb,UAAU;YACV,aAAa,EAAE,WAAW;YAC1B,cAAc,EAAE,IAAI;YACpB,cAAc;SACjB,CAAC,CAAA;QAEF,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC5B,IAAI,SAAS,GAAW,eAAe,CAAC,qBAAqB,CAAA;YAE7D,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;gBACzC,SAAS,GAAG,gBAAgB,CAAC,kBAAkB,CAAA;gBAE/C,OAAO;oBACH,MAAM,EAAE,QAAQ;oBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;oBAChB,IAAI,EAAE,SAAS;iBAClB,CAAA;YACL,CAAC;YAED,OAAO;gBACH,MAAM,EAAE,QAAQ;gBAChB,IAAI,EAAE,yDAAyD,KAAK,CAAC,IAAI,EAAE;gBAC3E,IAAI,EAAE,SAAS;aAClB,CAAA;QACL,CAAC;QAED,OAAO,KAAK,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAI5B;QAMG,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QACnC,MAAM,kBAAkB,GAAG,WAAW,CAAC;YACnC,OAAO,EAAE,UAAU;YACnB,GAAG,EAAE,gBAAgB;YACrB,MAAM,EAAE;gBACJ,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,YAAY;aACnC;SACJ,CAAC,CAAA;QAEF,IAAI,eAA0C,CAAA;QAC9C,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;YACrB,eAAe,GAAG,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAAC,CAAA;QAC7D,CAAC;QAED,MAAM,yBAAyB,GAAG,kBAAkB,CAAC,QAAQ;aACxD,kBAAkB,CACf,CAAC,MAAM,CAAC,EACR,eAAe,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,EAAE,CAC5D;aACA,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACT,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gBACrB,OAAO,CAAC,CAAA;YACZ,CAAC;YACD,MAAM,CAAC,CAAA;QACX,CAAC,CAAC,CAAA;QAEN,MAAM,wBAAwB,GAC1B,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,kBAAkB,CAAC;YACxD,UAAU;YACV,MAAM;YACN,eAAe,EAAE,KAAK,EAAE,iEAAiE;YACzF,aAAa,EAAE,WAAW;YAC1B,cAAc,EAAE,IAAI;SACvB,CAAC,CAAA;QAEN,MAAM,CAAC,wBAAwB,EAAE,iBAAiB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CACnE,CAAC,yBAAyB,EAAE,wBAAwB,CAAC,CACxD,CAAA;QAED,MAAM,gBAAgB,GAAG;YACrB,GAAI,CAAC,MAAM,IAAI,CAAC,mBAAmB,CAC/B,WAAW,CAAC,MAAM,CAAC,EACnB,wBAAwB,EACxB,IAAI,CAAC,MAAM,EACX,YAAY,CACf,CAA8D;YAC/D,UAAU,EAAE,EAAE;SACjB,CAAA;QAED,IAAI,gBAAgB,CAAC,UAAU,CAAC,SAAS,EAAE,CAAC;YACxC,MAAM,IAAI,QAAQ,CACd,wDAAwD,EACxD,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAA;QAE7B,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;YACd,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,UAAU;YAClD,UAAU,EAAE,gBAAgB,CAAC,UAAU,CAAC,UAAU;YAClD,GAAG;SACN,CAAC,CAAA;QAEF,IACI,gBAAgB,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG;YAC5C,IAAI,CAAC,MAAM,CAAC,eAAe,EAC7B,CAAC;YACC,MAAM,IAAI,QAAQ,CACd,iCAAiC,EACjC,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,IACI,IAAI,CAAC,MAAM,CAAC,eAAe;YAC3B,gBAAgB,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,GAAG,CAAC,EAClD,CAAC;YACC,MAAM,IAAI,QAAQ,CACd,kBAAkB,EAClB,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,mBAAmB;QACnB,IAAI,iBAAiB,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxC,MAAM,IAAI,QAAQ,CACd,yDAAyD,iBAAiB,CAAC,IAAI,EAAE,EACjF,gBAAgB,CAAC,kBAAkB,CACtC,CAAA;QACL,CAAC;QAED,OAAO,gBAAgB,CAAA;IAC3B,CAAC;IAED,mBAAmB,CAAC,cAAsB;QAKtC,MAAM,SAAS,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAA;QAC7B,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;QAErD,uCAAuC;QACvC,MAAM,UAAU,GAAG,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,CAAC,CAAA;QACvC,IAAI,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC,CAAA;QACnE,IAAI,UAAU,KAAK,CAAC,EAAE,CAAC;YACnB,UAAU,GAAG,SAAS,CAAA;QAC1B,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAA;QAEzD,OAAO;YACH,UAAU;YACV,UAAU;YACV,UAAU;SACb,CAAA;IACL,CAAC;IAED,mBAAmB,CACf,qBAIC,EACD,uBAIC;QAOD,OAAO;YACH,kBAAkB,EACd,uBAAuB,CAAC,UAAU,KAAK,WAAW;YACtD,gBAAgB,EAAE,qBAAqB,CAAC,UAAU,KAAK,WAAW;YAClE,UAAU,EAAE,IAAI,CAAC,GAAG,CAChB,qBAAqB,CAAC,UAAU,EAChC,uBAAuB,CAAC,UAAU,CACrC;YACD,UAAU,EAAE,IAAI,CAAC,GAAG,CAChB,qBAAqB,CAAC,UAAU,EAChC,uBAAuB,CAAC,UAAU,CACrC;SACJ,CAAA;IACL,CAAC;IAED,yBAAyB,CACrB,qBAA6B,EAC7B,uBAA+B;QAO/B,OAAO,IAAI,CAAC,mBAAmB,CAC3B,IAAI,CAAC,mBAAmB,CAAC,qBAAqB,CAAC,EAC/C,IAAI,CAAC,mBAAmB,CAAC,uBAAuB,CAAC,CACpD,CAAA;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,IAK5B;QAMG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAElD,MAAM,wBAAwB,GAC1B,MAAM,IAAI,CAAC,oBAAoB,CAAC,cAAc,CAAC,kBAAkB,CAAC;YAC9D,UAAU;YACV,MAAM;YACN,aAAa;SAChB,CAAC,CAAA;QAEN,IAAI,wBAAwB,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC/C,MAAM,IAAI,QAAQ,CACd,uCACI,wBAAwB,CAAC,IAC7B,EAAE,EACF,gBAAgB,CAAC,kBAAkB,CACtC,CAAA;QACL,CAAC;QAED,MAAM,gBAAgB,GAClB,wBAAwB,CAAC,IAA0C,CAAA;QAEvE,MAAM,gBAAgB,GAAG,IAAI,CAAC,yBAAyB,CACnD,gBAAgB,CAAC,UAAU,CAAC,qBAAqB,EACjD,gBAAgB,CAAC,UAAU,CAAC,uBAAuB,CACtD,CAAA;QAED,MAAM,GAAG,GAAG;YACR,UAAU,EAAE;gBACR,GAAG,gBAAgB,CAAC,UAAU;gBAC9B,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB;gBACnD,kBAAkB,EAAE,gBAAgB,CAAC,kBAAkB;gBACvD,UAAU,EAAE,gBAAgB,CAAC,UAAU;gBACvC,UAAU,EAAE,gBAAgB,CAAC,UAAU;aAC1C;YACD,UAAU,EAAE;gBACR,GAAG,gBAAgB,CAAC,UAAU;gBAC9B,IAAI,EAAE,MAAM,CAAC,MAAM;aACtB;YACD,WAAW,EACP,MAAM,CAAC,OAAO,IAAI,gBAAgB,CAAC,WAAW;gBAC1C,CAAC,CAAC;oBACI,GAAG,gBAAgB,CAAC,WAAW;oBAC/B,IAAI,EAAE,MAAM,CAAC,OAAO;iBACvB;gBACH,CAAC,CAAC,SAAS;YACnB,aAAa,EACT,MAAM,CAAC,SAAS,IAAI,gBAAgB,CAAC,aAAa;gBAC9C,CAAC,CAAC;oBACI,GAAG,gBAAgB,CAAC,aAAa;oBACjC,IAAI,EAAE,MAAM,CAAC,SAAS;iBACzB;gBACH,CAAC,CAAC,SAAS;YACnB,cAAc,EAAE,gBAAgB,CAAC,cAAc;YAC/C,UAAU,EAAE,EAAE;SACjB,CAAA;QAED,0DAA0D;QAE1D,IAAI,GAAG,CAAC,UAAU,CAAC,gBAAgB,EAAE,CAAC;YAClC,MAAM,IAAI,QAAQ,CACd,0BAA0B,EAC1B,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,IAAI,GAAG,CAAC,UAAU,CAAC,kBAAkB,EAAE,CAAC;YACpC,MAAM,IAAI,QAAQ,CACd,8BAA8B,EAC9B,gBAAgB,CAAC,gBAAgB,CACpC,CAAA;QACL,CAAC;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,CAAA;QAEzC,IAAI,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,EAAE,CAAC;YAClC,MAAM,IAAI,QAAQ,CACd,+CAA+C,GAAG,CAAC,UAAU,CAAC,UAAU,SAAS,GAAG,EAAE,EACtF,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,IACI,IAAI,CAAC,MAAM,CAAC,eAAe;YAC3B,CAAC,GAAG,CAAC,UAAU,CAAC,UAAU,IAAI,IAAI;gBAC9B,GAAG,CAAC,UAAU,CAAC,UAAU,GAAG,GAAG,GAAG,CAAC,CAAC,EAC1C,CAAC;YACC,MAAM,IAAI,QAAQ,CACd,8CAA8C,GAAG,CAAC,UAAU,CAAC,UAAU,SAAS,GAAG,EAAE,EACrF,gBAAgB,CAAC,cAAc,CAClC,CAAA;QACL,CAAC;QAED,OAAO,GAAG,CAAA;IACd,CAAC;IAED,mBAAmB,CAAC,IAKnB;QAMG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAC9D,IAAI,WAAW,CAAC,MAAM,CAAC,EAAE,CAAC;YACtB,OAAO,IAAI,CAAC,sBAAsB,CAAC;gBAC/B,MAAM;gBACN,UAAU;gBACV,UAAU;aACb,CAAC,CAAA;QACN,CAAC;QACD,OAAO,IAAI,CAAC,sBAAsB,CAAC;YAC/B,MAAM;YACN,aAAa,EAAE,aAAmC;YAClD,UAAU;SACb,CAAC,CAAA;IACN,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,IAKpB;QAMG,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,UAAU,EAAE,GAAG,IAAI,CAAA;QAClD,IAAI,CAAC;YACD,MAAM,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC;gBACpD,MAAM;gBACN,aAAa;gBACb,UAAU;aACb,CAAC,CAAA;YAEF,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAA;YAE3C,OAAO,gBAAgB,CAAA;QAC3B,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACT,iBAAiB;YACjB,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,GAAG,EAAE,CAAA;YAC3C,MAAM,CAAC,CAAA;QACX,CAAC;IACL,CAAC;CACJ"}
+{"version":3,"file":"UnsafeValidator.js","sourceRoot":"","sources":["../../../rpc/validation/UnsafeValidator.ts"],"names":[],"mappings":"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"}

package/esm/store/createMempoolStore.d.ts

@@ -1,5 +1,5 @@
+import { type MempoolStore } from "./index.js";
 import type { Metrics } from "../utils/index.js";
-import type { MempoolStore } from "./index.js";
 import type { AltoConfig } from "../createConfig.js";
 export declare const createMempoolStore: ({ config, metrics }: {
     config: AltoConfig;

package/esm/store/createMempoolStore.js

@@ -1,8 +1,5 @@
+import { createOutstandingQueue, createProcessingStore } from "./index.js";
 import * as sentry from "@sentry/node";
-import { createMemoryOutstandingQueue } from "./createMemoryOutstandingStore.js";
-import { createRedisOutstandingQueue } from "./createRedisOutstandingStore.js";
-import { createRedisStore } from "./createRedisStore.js";
-import { createMemoryStore } from "./createStore.js";
 export const createMempoolStore = ({ config, metrics }) => {
     const logger = config.getLogger({ module: "mempool-store" }, {
         level: config.logLevel
@@ -17,48 +14,20 @@ export const createMempoolStore = ({ config, metrics }) => {
         return handlers;
     };
     for (const entryPoint of config.entrypoints) {
-        let outstanding;
-        let processing;
-        let submitted;
-        if (config.redisMempoolUrl) {
-            outstanding = createRedisOutstandingQueue({
-                config,
-                entryPoint
-            });
-            processing = createRedisStore({
-                config,
-                entryPoint,
-                storeType: "processing"
-            });
-            submitted = createRedisStore({
-                config,
-                entryPoint,
-                storeType: "submitted"
-            });
-            logger.info("Using redis for outstanding, processing, submitted mempools");
-        }
-        else {
-            outstanding = createMemoryOutstandingQueue({
-                config
-            });
-            processing = createMemoryStore({
-                config
-            });
-            submitted = createMemoryStore({
-                config
-            });
-            logger.info("Using memory for outstanding, processing, submitted mempools");
-        }
+        const outstanding = createOutstandingQueue({
+            config,
+            entryPoint,
+            logger
+        });
+        const processing = createProcessingStore({
+            config,
+            entryPoint
+        });
         storeHandlers.set(entryPoint, {
-            processing,
-            submitted,
-            outstanding
+            outstanding,
+            processing
         });
     }
-    const logAddOperation = (userOpHash, storeType) => {
-        logger.debug({ userOpHash, store: storeType }, `added user op to ${storeType} mempool`);
-        metrics.userOpsInMempool.labels({ status: storeType }).inc();
-    };
     const logRemoveOperation = (userOpHash, storeType, removed) => {
         if (!removed) {
             logger.warn({ userOpHash, store: storeType }, "tried to remove non-existent user op from mempool");
@@ -74,146 +43,101 @@ export const createMempoolStore = ({ config, metrics }) => {
     };
     return {
         // Methods used for bundling
-        popOutstanding: async (entryPoint) => {
-            try {
-                const { outstanding } = getStoreHandlers(entryPoint);
-                return await outstanding.pop();
-            }
-            catch (err) {
-                logger.error({ err }, "Failed to pop from outstanding mempool, defaulting to undefined");
-                sentry.captureException(err);
-                return undefined;
-            }
-        },
-        peekOutstanding: async (entryPoint) => {
+        popOutstanding: async (entryPoint, count) => {
             try {
                 const { outstanding } = getStoreHandlers(entryPoint);
-                return await outstanding.peek();
+                return await outstanding.pop(count);
             }
             catch (err) {
-                logger.error({ err }, "Failed to peek from outstanding mempool, defaulting to undefined");
+                logger.error({ err }, "Failed to pop from outstanding mempool, defaulting to empty array");
                 sentry.captureException(err);
-                return undefined;
+                return [];
             }
         },
         // State handling
-        addOutstanding: async ({ entryPoint, userOpInfo }) => {
+        addOutstanding: async ({ entryPoint, userOpInfos }) => {
             const { outstanding } = getStoreHandlers(entryPoint);
-            logAddOperation(userOpInfo.userOpHash, "outstanding");
+            metrics.userOpsInMempool
+                .labels({ status: "outstanding" })
+                .inc(userOpInfos.length);
             try {
-                await outstanding.add(userOpInfo);
+                await outstanding.add(userOpInfos);
             }
             catch (err) {
                 logger.error({ err }, "Failed to add to outstanding mempool");
                 sentry.captureException(err);
             }
         },
-        addProcessing: ({ entryPoint, userOpInfo }) => {
-            try {
-                const { processing } = getStoreHandlers(entryPoint);
-                logAddOperation(userOpInfo.userOpHash, "processing");
-                processing.add(userOpInfo);
-                return Promise.resolve();
-            }
-            catch (err) {
-                logger.error({ err }, "Failed to add to processing mempool");
-                sentry.captureException(err);
-                return Promise.resolve();
-            }
-        },
-        addSubmitted: ({ entryPoint, userOpInfo }) => {
-            try {
-                const { submitted } = getStoreHandlers(entryPoint);
-                logAddOperation(userOpInfo.userOpHash, "submitted");
-                submitted.add(userOpInfo);
-                return Promise.resolve();
-            }
-            catch (err) {
-                logger.error({ err }, "Failed to add to submitted mempool");
-                sentry.captureException(err);
-                return Promise.resolve();
-            }
-        },
         removeOutstanding: async ({ entryPoint, userOpHash }) => {
             try {
                 const { outstanding } = getStoreHandlers(entryPoint);
-                const removed = await outstanding.remove(userOpHash);
-                logRemoveOperation(userOpHash, "outstanding", removed);
+                const removed = await outstanding.remove([userOpHash]);
+                logRemoveOperation(userOpHash, "outstanding", removed.length > 0);
             }
             catch (err) {
                 logger.error({ err }, "Failed to remove from outstanding mempool");
                 sentry.captureException(err);
-                return Promise.resolve();
             }
         },
-        removeProcessing: async ({ entryPoint, userOpHash }) => {
+        dumpOutstanding: async (entryPoint) => {
+            const { outstanding } = getStoreHandlers(entryPoint);
+            logDumpOperation("outstanding");
+            return await outstanding.dumpLocal();
+        },
+        // Methods to mark/unmark userOps that are being processed.
+        addProcessing: async ({ entryPoint, userOpInfo }) => {
             try {
                 const { processing } = getStoreHandlers(entryPoint);
-                const removed = await processing.remove(userOpHash);
-                logRemoveOperation(userOpHash, "processing", removed);
+                await processing.addProcessing(userOpInfo);
             }
             catch (err) {
-                logger.error({ err }, "Failed to remove from processing mempool");
+                logger.error({ err }, "Failed to track active userOp");
                 sentry.captureException(err);
-                return Promise.resolve();
             }
         },
-        removeSubmitted: async ({ entryPoint, userOpHash }) => {
+        removeProcessing: async ({ entryPoint, userOpInfo }) => {
             try {
-                const { submitted } = getStoreHandlers(entryPoint);
-                const removed = await submitted.remove(userOpHash);
-                logRemoveOperation(userOpHash, "submitted", removed);
+                const { processing } = getStoreHandlers(entryPoint);
+                await processing.removeProcessing(userOpInfo);
             }
             catch (err) {
-                logger.error({ err }, "Failed to remove from submitted mempool");
+                logger.error({ err }, "Failed to untrack active userOp");
                 sentry.captureException(err);
-                return Promise.resolve();
             }
         },
-        dumpOutstanding: async (entryPoint) => {
-            const { outstanding } = getStoreHandlers(entryPoint);
-            logDumpOperation("outstanding");
-            return await outstanding.dumpLocal();
-        },
-        dumpProcessing: async (entryPoint) => {
-            const { processing } = getStoreHandlers(entryPoint);
-            logDumpOperation("processing");
-            return await processing.dumpLocal();
-        },
-        dumpSubmitted: async (entryPoint) => {
-            const { submitted } = getStoreHandlers(entryPoint);
-            logDumpOperation("submitted");
-            return await submitted.dumpLocal();
-        },
-        // Check if the userOp is already in the mempool
-        isInMempool: async ({ userOpHash, entryPoint }) => {
-            const { outstanding, processing, submitted } = getStoreHandlers(entryPoint);
-            const [inOutstanding, inProcessing, inSubmitted] = await Promise.all([
+        // Check if the userOp is already in the mempool or conflicts with existing userOps.
+        checkDuplicatesAndConflicts: async ({ entryPoint, userOp, userOpHash }) => {
+            const { outstanding, processing } = getStoreHandlers(entryPoint);
+            const [isInOutstanding, isInProcessing, wouldConflict] = await Promise.all([
                 outstanding.contains(userOpHash),
-                processing.contains(userOpHash),
-                submitted.contains(userOpHash)
-            ]);
-            return inOutstanding || inProcessing || inSubmitted;
-        },
-        validateSubmittedOrProcessing: async ({ entryPoint, userOp }) => {
-            const { submitted, processing } = getStoreHandlers(entryPoint);
-            const [submittedConflict, processingConflict] = await Promise.all([
-                submitted.findConflicting(userOp),
-                processing.findConflicting(userOp)
+                processing.isProcessing(userOpHash),
+                processing.wouldConflict(userOp)
             ]);
-            const conflicting = submittedConflict || processingConflict;
-            if (conflicting?.reason === "conflicting_nonce") {
+            // Check if already known (in outstanding or processing).
+            if (isInOutstanding || isInProcessing) {
+                return {
+                    valid: false,
+                    reason: "Already known"
+                };
+            }
+            if (wouldConflict === "conflicting_nonce") {
                 return {
                     valid: false,
                     reason: "AA25 invalid account nonce: Another UserOperation with same sender and nonce is already being processed"
                 };
             }
-            if (conflicting?.reason === "conflicting_deployment") {
+            if (wouldConflict === "conflicting_deployment") {
                 return {
                     valid: false,
                     reason: "AA25 invalid account deployment: Another deployment operation for this sender is already being processed"
                 };
             }
+            if (wouldConflict === "conflicting_7702_auth") {
+                return {
+                    valid: false,
+                    reason: "AA10 sender already constructed: Sender already has an inflight EIP-7702 authorization"
+                };
+            }
             return { valid: true };
         },
         popConflictingOustanding: async ({ entryPoint, userOp }) => {
@@ -227,21 +151,21 @@ export const createMempoolStore = ({ config, metrics }) => {
                 return undefined;
             }
         },
-        validateSenderLimits: ({ entryPoint, userOp }) => {
+        validateSenderLimits: async ({ entryPoint, userOp }) => {
             const { outstanding } = getStoreHandlers(entryPoint);
             if (!outstanding.validateParallelLimit(userOp)) {
-                return Promise.resolve({
+                return {
                     valid: false,
                     reason: "AA25 invalid account nonce: Maximum number of parallel user operations for that is allowed for this sender reached"
-                });
+                };
             }
             if (!outstanding.validateQueuedLimit(userOp)) {
-                return Promise.resolve({
+                return {
                     valid: false,
                     reason: "AA25 invalid account nonce: Maximum number of queued user operations reached for this sender and nonce key"
-                });
+                };
             }
-            return Promise.resolve({ valid: true });
+            return { valid: true };
         },
         // misc
         getQueuedOutstandingUserOps: async ({ userOp, entryPoint }) => {