@pimlico/alto 0.0.0-main.20250430T222110 → 0.0.0-main.20250502T111711

package/esm/rpc/methods/pimlico_sendUserOperationNow.js

@@ -16,7 +16,10 @@ export const pimlicoSendUserOperationNowHandler = createMethodHandler({
             chainId: rpcHandler.config.chainId,
             publicClient: rpcHandler.config.publicClient
         });
-        await rpcHandler.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
+        const [preMempoolValid, preMempoolError] = await rpcHandler.preMempoolChecks(userOperation, apiVersion);
+        if (!preMempoolValid) {
+            throw new RpcError(preMempoolError);
+        }
         // Prepare bundle
         const userOpInfo = {
             userOp: userOperation,

package/esm/rpc/methods/pimlico_sendUserOperationNow.js.map

@@ -1 +1 @@
-{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,yBAAyB,EAC5B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EACH,QAAQ,EAGR,gBAAgB,EAChB,iCAAiC,EACpC,MAAM,aAAa,CAAA;AAEpB,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QAE1C,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;YACtC,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;YAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;SAC/C,CAAC,CAAA;QAEF,MAAM,UAAU,CAAC,gBAAgB,CAC7B,MAAM,EACN,aAAa,EACb,UAAU,EACV,UAAU,CACb,CAAA;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAe;YAC3B,MAAM,EAAE,aAAa;YACrB,UAAU,EAAE,MAAM,oBAAoB,CAAC;gBACnC,aAAa,EAAE,aAAa;gBAC5B,iBAAiB,EAAE,UAAU;gBAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;gBAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;aAC/C,CAAC;YACF,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1B,kBAAkB,EAAE,CAAC;SACxB,CAAA;QACD,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC;gBAC/B,CAAC,CAAE,KAAe;gBAClB,CAAC,CAAE,KAAe;SACzB,CAAA;QACD,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;QAClE,MAAM,MAAM,GACR,MAAM,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,QAAQ,CACd,0CAA0C,EAC1C,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,oBAAoB;QACpB,MAAM,OAAO,GACT,MAAM,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC;YAC3D,IAAI,EAAE,MAAM;YACZ,eAAe,EAAE,GAAG;SACvB,CAAC,CAAA;QAEN,OAAO,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;CACJ,CAAC,CAAA"}
+{"version":3,"file":"pimlico_sendUserOperationNow.js","sourceRoot":"","sources":["../../../rpc/methods/pimlico_sendUserOperationNow.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,oBAAoB,EACpB,WAAW,EACX,yBAAyB,EAC5B,MAAM,aAAa,CAAA;AACpB,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAA;AAC5D,OAAO,EACH,QAAQ,EAGR,gBAAgB,EAChB,iCAAiC,EACpC,MAAM,aAAa,CAAA;AAEpB,MAAM,CAAC,MAAM,kCAAkC,GAAG,mBAAmB,CAAC;IAClE,MAAM,EAAE,8BAA8B;IACtC,MAAM,EAAE,iCAAiC;IACzC,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAClD,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,6BAA6B,EAAE,CAAC;YACnD,MAAM,IAAI,QAAQ,CACd,sDAAsD,EACtD,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,MAAM,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,MAAM,CAAA;QAC1C,UAAU,CAAC,2BAA2B,CAAC,UAAU,CAAC,CAAA;QAElD,MAAM,MAAM,GAAG,MAAM,oBAAoB,CAAC;YACtC,aAAa,EAAE,aAAa;YAC5B,iBAAiB,EAAE,UAAU;YAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;YAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;SAC/C,CAAC,CAAA;QAEF,MAAM,CAAC,eAAe,EAAE,eAAe,CAAC,GACpC,MAAM,UAAU,CAAC,gBAAgB,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;QAEhE,IAAI,CAAC,eAAe,EAAE,CAAC;YACnB,MAAM,IAAI,QAAQ,CAAC,eAAe,CAAC,CAAA;QACvC,CAAC;QAED,iBAAiB;QACjB,MAAM,UAAU,GAAe;YAC3B,MAAM,EAAE,aAAa;YACrB,UAAU,EAAE,MAAM,oBAAoB,CAAC;gBACnC,aAAa,EAAE,aAAa;gBAC5B,iBAAiB,EAAE,UAAU;gBAC7B,OAAO,EAAE,UAAU,CAAC,MAAM,CAAC,OAAO;gBAClC,YAAY,EAAE,UAAU,CAAC,MAAM,CAAC,YAAY;aAC/C,CAAC;YACF,cAAc,EAAE,IAAI,CAAC,GAAG,EAAE;YAC1B,kBAAkB,EAAE,CAAC;SACxB,CAAA;QACD,MAAM,MAAM,GAAwB;YAChC,UAAU;YACV,OAAO,EAAE,CAAC,UAAU,CAAC;YACrB,OAAO,EAAE,WAAW,CAAC,aAAa,CAAC;gBAC/B,CAAC,CAAE,KAAe;gBAClB,CAAC,CAAE,KAAe;SACzB,CAAA;QACD,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,CAAC,CAAA;QAClE,MAAM,MAAM,GACR,MAAM,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;QAEjE,IAAI,CAAC,MAAM,EAAE,CAAC;YACV,MAAM,IAAI,QAAQ,CACd,0CAA0C,EAC1C,gBAAgB,CAAC,aAAa,CACjC,CAAA;QACL,CAAC;QAED,oBAAoB;QACpB,MAAM,OAAO,GACT,MAAM,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,yBAAyB,CAAC;YAC3D,IAAI,EAAE,MAAM;YACZ,eAAe,EAAE,GAAG;SACvB,CAAC,CAAA;QAEN,OAAO,yBAAyB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IACrD,CAAC;CACJ,CAAC,CAAA"}

package/esm/rpc/rpcHandler.d.ts

@@ -1,10 +1,9 @@
 import { type Executor, type ExecutorManager } from "../executor/index.js";
 import type { EventManager, GasPriceManager } from "../handlers/index.js";
 import type { InterfaceReputationManager, Mempool, Monitor } from "../mempool/index.js";
-import type { ApiVersion, BundlerRequest, StateOverrides } from "../types/index.js";
+import type { ApiVersion, BundlerRequest } from "../types/index.js";
 import { type Address, type InterfaceValidator, type UserOperation } from "../types/index.js";
 import type { Logger, Metrics } from "../utils/index.js";
-import { type Hex } from "viem";
 import type { AltoConfig } from "../createConfig.js";
 import type { MethodHandler } from "./createMethodHandler.js";
 export declare class RpcHandler {
@@ -37,39 +36,14 @@ export declare class RpcHandler {
     handleMethod(request: BundlerRequest, apiVersion: ApiVersion): Promise<any>;
     ensureEntryPointIsSupported(entryPoint: Address): void;
     ensureDebugEndpointsAreEnabled(methodName: string): void;
-    preMempoolChecks(opHash: Hex, userOperation: UserOperation, apiVersion: ApiVersion, entryPoint: Address): Promise<void>;
-    addToMempoolIfValid(userOperation: UserOperation, entryPoint: Address, apiVersion: ApiVersion): Promise<"added" | "queued">;
+    preMempoolChecks(userOperation: UserOperation, apiVersion: ApiVersion): Promise<[boolean, string]>;
     validateEip7702Auth({ userOperation, validateSender }: {
         userOperation: UserOperation;
         validateSender?: boolean;
-    }): Promise<void>;
-    getNonceValue(userOperation: UserOperation, entryPoint: Address): Promise<bigint>;
-    estimateGas({ apiVersion, userOperation, entryPoint, stateOverrides }: {
-        apiVersion: ApiVersion;
-        userOperation: UserOperation;
-        entryPoint: Address;
-        stateOverrides?: StateOverrides;
-    }): Promise<{
-        preVerificationGas: bigint;
-        verificationGasLimit: bigint;
-        callGasLimit: bigint;
-        paymasterVerificationGasLimit: bigint;
-        paymasterPostOpGasLimit: bigint;
-        verificationGas?: undefined;
-    } | {
-        preVerificationGas: bigint;
-        verificationGasLimit: bigint;
-        callGasLimit: bigint;
-        paymasterVerificationGasLimit?: undefined;
-        paymasterPostOpGasLimit?: undefined;
-        verificationGas?: undefined;
-    } | {
-        preVerificationGas: bigint;
-        verificationGas: bigint;
-        verificationGasLimit: bigint;
-        callGasLimit: bigint;
-        paymasterVerificationGasLimit?: undefined;
-        paymasterPostOpGasLimit?: undefined;
-    }>;
+    }): Promise<[
+        boolean,
+        string
+    ]>;
+    getNonceSeq(userOperation: UserOperation, entryPoint: Address): Promise<bigint>;
 }
 //# sourceMappingURL=rpcHandler.d.ts.map

package/esm/rpc/rpcHandler.js

@@ -1,6 +1,6 @@
 import { calculateAA95GasFloor } from "../executor/index.js";
 import { EntryPointV06Abi, EntryPointV07Abi, RpcError, ValidationErrors } from "../types/index.js";
-import { calcPreVerificationGas, calcVerificationGasAndCallGasLimit, deepHexlify, getAAError, getNonceKeyAndSequence, getUserOperationHash, isVersion06, isVersion07, maxBigInt, scaleBigIntByPercent } from "../utils/index.js";
+import { getNonceKeyAndSequence, isVersion06, isVersion07 } from "../utils/index.js";
 import { getContract, zeroAddress } from "viem";
 import { registerHandlers } from "./methods/index.js";
 import { recoverAuthorizationAddress } from "viem/utils";
@@ -53,7 +53,7 @@ export class RpcHandler {
     }
     ensureEntryPointIsSupported(entryPoint) {
         if (!this.config.entrypoints.includes(entryPoint)) {
-            throw new Error(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.config.entrypoints.join(", ")}`);
+            throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.config.entrypoints.join(", ")}`, ValidationErrors.InvalidFields);
         }
     }
     ensureDebugEndpointsAreEnabled(methodName) {
@@ -61,168 +61,145 @@ export class RpcHandler {
             throw new RpcError(`${methodName} is only available in development environment`);
         }
     }
-    async preMempoolChecks(opHash, userOperation, apiVersion, entryPoint) {
+    async preMempoolChecks(userOperation, apiVersion) {
         if (this.config.legacyTransactions &&
             userOperation.maxFeePerGas !== userOperation.maxPriorityFeePerGas) {
-            const reason = "maxPriorityFeePerGas must equal maxFeePerGas on chains that don't support EIP-1559";
-            this.eventManager.emitFailedValidation(opHash, reason);
-            throw new RpcError(reason);
+            return [
+                false,
+                "maxPriorityFeePerGas must equal maxFeePerGas on chains that don't support EIP-1559"
+            ];
         }
         if (apiVersion !== "v1" && !this.config.safeMode) {
-            await this.gasPriceManager.validateGasPrice({
-                maxFeePerGas: userOperation.maxFeePerGas,
-                maxPriorityFeePerGas: userOperation.maxPriorityFeePerGas
-            });
+            const { lowestMaxFeePerGas, lowestMaxPriorityFeePerGas } = await this.gasPriceManager.getLowestValidGasPrices();
+            const maxFeePerGas = userOperation.maxFeePerGas;
+            const maxPriorityFeePerGas = userOperation.maxPriorityFeePerGas;
+            if (maxFeePerGas < lowestMaxFeePerGas) {
+                return [
+                    false,
+                    `maxFeePerGas must be at least ${lowestMaxFeePerGas} (current maxFeePerGas: ${maxFeePerGas}) - use pimlico_getUserOperationGasPrice to get the current gas price`
+                ];
+            }
+            if (maxPriorityFeePerGas < lowestMaxPriorityFeePerGas) {
+                return [
+                    false,
+                    `maxPriorityFeePerGas must be at least ${lowestMaxPriorityFeePerGas} (current maxPriorityFeePerGas: ${maxPriorityFeePerGas}) - use pimlico_getUserOperationGasPrice to get the current gas price`
+                ];
+            }
         }
         if (userOperation.verificationGasLimit < 10000n) {
-            const reason = "verificationGasLimit must be at least 10000";
-            this.eventManager.emitFailedValidation(opHash, reason);
-            throw new RpcError(reason);
+            return [false, "verificationGasLimit must be at least 10000"];
         }
-        this.logger.trace({ userOperation, entryPoint }, "beginning validation");
         if (userOperation.preVerificationGas === 0n ||
             userOperation.verificationGasLimit === 0n) {
-            const reason = "user operation gas limits must be larger than 0";
-            this.eventManager.emitFailedValidation(opHash, reason);
-            throw new RpcError(reason);
+            return [false, "user operation gas limits must be larger than 0"];
         }
-        const beneficiary = this.config.utilityPrivateKey?.address ||
-            privateKeyToAddress(generatePrivateKey());
         const gasLimits = calculateAA95GasFloor({
             userOps: [userOperation],
-            beneficiary
+            beneficiary: privateKeyToAddress(generatePrivateKey())
         });
         if (gasLimits > this.config.maxGasPerBundle) {
-            throw new RpcError(`User operation gas limits exceed the max gas per bundle: ${gasLimits} > ${this.config.maxGasPerBundle}`);
+            return [
+                false,
+                `User operation gas limits exceed the max gas per bundle: ${gasLimits} > ${this.config.maxGasPerBundle}`
+            ];
         }
-    }
-    // check if we want to bundle userOperation. If yes, add to mempool
-    async addToMempoolIfValid(userOperation, entryPoint, apiVersion) {
-        this.ensureEntryPointIsSupported(entryPoint);
-        const opHash = await getUserOperationHash({
-            userOperation: userOperation,
-            entryPointAddress: entryPoint,
-            chainId: this.config.chainId,
-            publicClient: this.config.publicClient
-        });
-        await this.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
-        const currentNonceValue = await this.getNonceValue(userOperation, entryPoint);
-        const [, userOperationNonceValue] = getNonceKeyAndSequence(userOperation.nonce);
-        if (userOperationNonceValue < currentNonceValue) {
-            const reason = "UserOperation failed validation with reason: AA25 invalid account nonce";
-            this.eventManager.emitFailedValidation(opHash, reason, "AA25");
-            throw new RpcError(reason, ValidationErrors.InvalidFields);
-        }
-        if (userOperationNonceValue > currentNonceValue + 10n) {
-            const reason = "UserOperation failed validaiton with reason: AA25 invalid account nonce";
-            this.eventManager.emitFailedValidation(opHash, reason, "AA25");
-            throw new RpcError(reason, ValidationErrors.InvalidFields);
-        }
-        const queuedUserOperations = await this.mempool.getQueuedOustandingUserOps({
-            userOp: userOperation,
-            entryPoint
-        });
-        if (userOperationNonceValue >
-            currentNonceValue + BigInt(queuedUserOperations.length)) {
-            this.mempool.add(userOperation, entryPoint);
-            this.eventManager.emitQueued(opHash);
-            return "queued";
-        }
-        if (this.config.dangerousSkipUserOperationValidation) {
-            const [success, errorReason] = await this.mempool.add(userOperation, entryPoint);
-            if (!success) {
-                this.eventManager.emitFailedValidation(opHash, errorReason, getAAError(errorReason));
-                throw new RpcError(errorReason, ValidationErrors.InvalidFields);
-            }
-            return "added";
-        }
-        if (apiVersion !== "v1") {
-            await this.validator.validatePreVerificationGas({
-                userOperation,
-                entryPoint
-            });
-        }
-        await this.mempool.checkEntityMultipleRoleViolation(entryPoint, userOperation);
-        const validationResult = await this.validator.validateUserOperation({
-            userOperation,
-            queuedUserOperations,
-            entryPoint
-        });
-        await this.reputationManager.checkReputation(userOperation, entryPoint, validationResult);
-        await this.mempool.checkEntityMultipleRoleViolation(entryPoint, userOperation);
-        const [success, errorReason] = await this.mempool.add(userOperation, entryPoint, validationResult.referencedContracts);
-        if (!success) {
-            this.eventManager.emitFailedValidation(opHash, errorReason, getAAError(errorReason));
-            throw new RpcError(errorReason, ValidationErrors.InvalidFields);
-        }
-        return "added";
+        return [true, ""];
     }
     async validateEip7702Auth({ userOperation, validateSender = false }) {
         if (!userOperation.eip7702Auth) {
-            throw new RpcError("UserOperation is missing eip7702Auth", ValidationErrors.InvalidFields);
+            return [true, ""];
         }
         if (!this.config.codeOverrideSupport) {
-            throw new RpcError("eip7702Auth is not supported on this chain", ValidationErrors.InvalidFields);
+            return [false, "eip7702Auth is not supported on this chain"];
         }
         // Check that auth is valid.
-        const sender = validateSender
-            ? await recoverAuthorizationAddress({
-                authorization: {
-                    address: "address" in userOperation.eip7702Auth
-                        ? userOperation.eip7702Auth.address
-                        : userOperation.eip7702Auth.contractAddress,
-                    chainId: userOperation.eip7702Auth.chainId,
-                    nonce: userOperation.eip7702Auth.nonce,
-                    r: userOperation.eip7702Auth.r,
-                    s: userOperation.eip7702Auth.s,
-                    v: userOperation.eip7702Auth.v,
-                    yParity: userOperation.eip7702Auth.yParity
-                }
-            })
-            : userOperation.sender;
-        const nonceOnChain = await this.config.publicClient.getTransactionCount({
-            address: sender
-        });
+        const delegationDesignator = "address" in userOperation.eip7702Auth
+            ? userOperation.eip7702Auth.address
+            : userOperation.eip7702Auth.contractAddress;
+        // Fetch onchain data in parallel
+        const [sender, nonceOnChain, delegateCode] = await Promise.all([
+            validateSender
+                ? recoverAuthorizationAddress({
+                    authorization: {
+                        address: delegationDesignator,
+                        chainId: userOperation.eip7702Auth.chainId,
+                        nonce: userOperation.eip7702Auth.nonce,
+                        r: userOperation.eip7702Auth.r,
+                        s: userOperation.eip7702Auth.s,
+                        v: userOperation.eip7702Auth.v,
+                        yParity: userOperation.eip7702Auth.yParity
+                    }
+                })
+                : Promise.resolve(userOperation.sender),
+            this.config.publicClient.getTransactionCount({
+                address: userOperation.sender
+            }),
+            this.eip7702CodeCache.has(delegationDesignator)
+                ? Promise.resolve("has-code")
+                : this.config.publicClient.getCode({
+                    address: delegationDesignator
+                })
+        ]);
         if (userOperation.eip7702Auth.chainId !== this.config.chainId &&
             userOperation.eip7702Auth.chainId !== 0) {
-            throw new RpcError("Invalid EIP-7702 authorization: The chainId does not match the userOperation sender address", ValidationErrors.InvalidFields);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: The chainId does not match the userOperation sender address"
+            ];
         }
         if (![0, 1].includes(userOperation.eip7702Auth.yParity)) {
-            throw new RpcError("Invalid EIP-7702 authorization: The yParity value must be either 0 or 1", ValidationErrors.InvalidFields);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: The yParity value must be either 0 or 1"
+            ];
         }
         if (nonceOnChain !== userOperation.eip7702Auth.nonce) {
-            throw new RpcError("Invalid EIP-7702 authorization: The nonce does not match the userOperation sender address", ValidationErrors.SimulateValidation);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: The nonce does not match the userOperation sender address"
+            ];
         }
         if (sender !== userOperation.sender) {
-            throw new RpcError("Invalid EIP-7702 authorization: The recovered signer address does not match the userOperation sender address", ValidationErrors.InvalidFields);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: The recovered signer address does not match the userOperation sender address"
+            ];
         }
         if (isVersion06(userOperation) && userOperation.initCode !== "0x") {
-            throw new RpcError("Invalid EIP-7702 authorization: UserOperation cannot contain initCode.", ValidationErrors.InvalidFields);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: UserOperation cannot contain initCode."
+            ];
         }
         if (isVersion07(userOperation) &&
             userOperation.factory !== "0x7702" &&
             userOperation.factory !== null) {
-            throw new RpcError("Invalid EIP-7702 authorization: UserOperation cannot contain factory that is neither null or 0x7702.", ValidationErrors.InvalidFields);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: UserOperation cannot contain factory that is neither null or 0x7702."
+            ];
         }
         // Check delegation designator
-        const delegationDesignator = "address" in userOperation.eip7702Auth
-            ? userOperation.eip7702Auth.address
-            : userOperation.eip7702Auth.contractAddress;
         if (delegationDesignator === zeroAddress) {
-            throw new RpcError("Invalid EIP-7702 authorization: Cannot delegate to the zero address.", ValidationErrors.InvalidFields);
+            return [
+                false,
+                "Invalid EIP-7702 authorization: Cannot delegate to the zero address."
+            ];
         }
+        // Use the delegateCode we already got from Promise.all
         const hasCode = this.eip7702CodeCache.has(delegationDesignator);
         if (!hasCode) {
-            const delegateCode = await this.config.publicClient.getCode({
-                address: delegationDesignator
-            });
             if (delegateCode === undefined || delegateCode === "0x") {
-                throw new RpcError(`Invalid EIP-7702 authorization: Delegate ${delegationDesignator} has no code.`, ValidationErrors.InvalidFields);
+                return [
+                    false,
+                    `Invalid EIP-7702 authorization: Delegate ${delegationDesignator} has no code.`
+                ];
             }
             this.eip7702CodeCache.set(delegationDesignator, true);
         }
+        return [true, ""];
     }
-    async getNonceValue(userOperation, entryPoint) {
+    async getNonceSeq(userOperation, entryPoint) {
         const entryPointContract = getContract({
             address: entryPoint,
             abi: isVersion06(userOperation)
@@ -236,152 +213,8 @@ export class RpcHandler {
         const getNonceResult = await entryPointContract.read.getNonce([userOperation.sender, nonceKey], {
             blockTag: "latest"
         });
-        const [_, currentNonceValue] = getNonceKeyAndSequence(getNonceResult);
-        return currentNonceValue;
-    }
-    async estimateGas({ apiVersion, userOperation, entryPoint, stateOverrides }) {
-        this.ensureEntryPointIsSupported(entryPoint);
-        if (userOperation.maxFeePerGas === 0n && !this.config.isGasFreeChain) {
-            throw new RpcError("user operation max fee per gas must be larger than 0 during gas estimation");
-        }
-        // Check if the nonce is valid
-        // If the nonce is less than the current nonce, the user operation has already been executed
-        // If the nonce is greater than the current nonce, we may have missing user operations in the mempool
-        const currentNonceValue = await this.getNonceValue(userOperation, entryPoint);
-        const [, userOperationNonceValue] = getNonceKeyAndSequence(userOperation.nonce);
-        let queuedUserOperations = [];
-        if (userOperationNonceValue < currentNonceValue) {
-            throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
-        }
-        if (userOperationNonceValue > currentNonceValue) {
-            // Nonce queues are supported only for v7 user operations
-            if (isVersion06(userOperation)) {
-                throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
-            }
-            queuedUserOperations =
-                await this.mempool.getQueuedOustandingUserOps({
-                    userOp: userOperation,
-                    entryPoint
-                });
-            if (userOperationNonceValue >
-                currentNonceValue + BigInt(queuedUserOperations.length)) {
-                throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
-            }
-        }
-        // Prepare userOperation for simulation
-        const { simulationVerificationGasLimit, simulationCallGasLimit, simulationPaymasterVerificationGasLimit, simulationPaymasterPostOpGasLimit } = this.config;
-        const simulationUserOperation = {
-            ...userOperation,
-            maxFeePerGas: 1n,
-            maxPriorityFeePerGas: 1n,
-            preVerificationGas: 0n,
-            verificationGasLimit: simulationVerificationGasLimit,
-            callGasLimit: simulationCallGasLimit
-        };
-        if (isVersion07(simulationUserOperation)) {
-            simulationUserOperation.paymasterVerificationGasLimit =
-                simulationPaymasterVerificationGasLimit;
-            simulationUserOperation.paymasterPostOpGasLimit =
-                simulationPaymasterPostOpGasLimit;
-        }
-        // This is necessary because entryPoint pays
-        // min(maxFeePerGas, baseFee + maxPriorityFeePerGas) for the verification
-        // Since we don't want our estimations to depend upon baseFee, we set
-        // maxFeePerGas to maxPriorityFeePerGas
-        simulationUserOperation.maxPriorityFeePerGas =
-            simulationUserOperation.maxFeePerGas;
-        const executionResult = await this.validator.getExecutionResult({
-            userOperation: simulationUserOperation,
-            entryPoint,
-            queuedUserOperations,
-            stateOverrides: deepHexlify(stateOverrides)
-        });
-        let { verificationGasLimit, callGasLimit, paymasterVerificationGasLimit } = calcVerificationGasAndCallGasLimit(simulationUserOperation, executionResult.data.executionResult, executionResult.data);
-        let paymasterPostOpGasLimit = 0n;
-        if (!paymasterVerificationGasLimit &&
-            isVersion07(simulationUserOperation) &&
-            simulationUserOperation.paymaster !== null &&
-            "paymasterVerificationGasLimit" in
-                executionResult.data.executionResult) {
-            paymasterVerificationGasLimit =
-                executionResult.data.executionResult
-                    .paymasterVerificationGasLimit || 1n;
-            paymasterVerificationGasLimit = scaleBigIntByPercent(paymasterVerificationGasLimit, this.config.paymasterGasLimitMultiplier);
-        }
-        if (isVersion07(simulationUserOperation) &&
-            simulationUserOperation.paymaster !== null &&
-            "paymasterPostOpGasLimit" in executionResult.data.executionResult) {
-            paymasterPostOpGasLimit =
-                executionResult.data.executionResult.paymasterPostOpGasLimit ||
-                    1n;
-            const userOperationPaymasterPostOpGasLimit = "paymasterPostOpGasLimit" in userOperation
-                ? userOperation.paymasterPostOpGasLimit ?? 1n
-                : 1n;
-            paymasterPostOpGasLimit = maxBigInt(userOperationPaymasterPostOpGasLimit, scaleBigIntByPercent(paymasterPostOpGasLimit, this.config.paymasterGasLimitMultiplier));
-        }
-        if (simulationUserOperation.callData === "0x") {
-            callGasLimit = 0n;
-        }
-        if (isVersion06(simulationUserOperation)) {
-            callGasLimit = scaleBigIntByPercent(callGasLimit, this.config.v6CallGasLimitMultiplier);
-            verificationGasLimit = scaleBigIntByPercent(verificationGasLimit, this.config.v6VerificationGasLimitMultiplier);
-        }
-        if (isVersion07(simulationUserOperation)) {
-            verificationGasLimit = scaleBigIntByPercent(verificationGasLimit, this.config.v7VerificationGasLimitMultiplier);
-            paymasterVerificationGasLimit = scaleBigIntByPercent(paymasterVerificationGasLimit, this.config.v7PaymasterVerificationGasLimitMultiplier);
-            callGasLimit = scaleBigIntByPercent(callGasLimit, this.config.v7CallGasLimitMultiplier);
-            paymasterPostOpGasLimit = scaleBigIntByPercent(paymasterPostOpGasLimit, this.config.v7PaymasterPostOpGasLimitMultiplier);
-        }
-        let preVerificationGas = await calcPreVerificationGas({
-            config: this.config,
-            userOperation: {
-                ...userOperation,
-                callGasLimit, // use actual callGasLimit
-                verificationGasLimit, // use actual verificationGasLimit
-                paymasterPostOpGasLimit, // use actual paymasterPostOpGasLimit
-                paymasterVerificationGasLimit // use actual paymasterVerificationGasLimit
-            },
-            entryPoint,
-            gasPriceManager: this.gasPriceManager,
-            validate: false
-        });
-        preVerificationGas = scaleBigIntByPercent(preVerificationGas, 110n);
-        // Check if userOperation passes without estimation balance overrides
-        await this.validator.validateHandleOp({
-            userOperation: {
-                ...userOperation,
-                preVerificationGas,
-                verificationGasLimit,
-                callGasLimit,
-                paymasterVerificationGasLimit,
-                paymasterPostOpGasLimit
-            },
-            entryPoint,
-            queuedUserOperations,
-            stateOverrides: deepHexlify(stateOverrides)
-        });
-        if (isVersion07(simulationUserOperation)) {
-            return {
-                preVerificationGas,
-                verificationGasLimit,
-                callGasLimit,
-                paymasterVerificationGasLimit,
-                paymasterPostOpGasLimit
-            };
-        }
-        if (apiVersion === "v2") {
-            return {
-                preVerificationGas,
-                verificationGasLimit,
-                callGasLimit
-            };
-        }
-        return {
-            preVerificationGas,
-            verificationGas: verificationGasLimit,
-            verificationGasLimit,
-            callGasLimit
-        };
+        const [_, currentNonceSeq] = getNonceKeyAndSequence(getNonceResult);
+        return currentNonceSeq;
     }
 }
 //# sourceMappingURL=rpcHandler.js.map

package/esm/rpc/rpcHandler.js.map

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

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

@@ -28,7 +28,7 @@ export declare class UnsafeValidator implements InterfaceValidator {
         entryPoint: Address;
         queuedUserOperations: UserOperation[];
         stateOverrides?: StateOverrides;
-    }): Promise<SimulateHandleOpResult<"execution">>;
+    }): Promise<SimulateHandleOpResult<"execution" | "failed">>;
     getValidationResultV06({ userOperation, entryPoint }: {
         userOperation: UserOperationV06;
         entryPoint: Address;
@@ -80,10 +80,6 @@ export declare class UnsafeValidator implements InterfaceValidator {
         storageMap: StorageMap;
         referencedContracts?: ReferencedCodeHashes;
     }>;
-    validatePreVerificationGas({ userOperation, entryPoint }: {
-        userOperation: UserOperation;
-        entryPoint: Address;
-    }): Promise<void>;
     validateUserOperation({ userOperation, queuedUserOperations, entryPoint }: {
         userOperation: UserOperation;
         queuedUserOperations: UserOperation[];

package/esm/rpc/validation/UnsafeValidator.js

@@ -1,5 +1,5 @@
 import { EntryPointV06Abi, ExecutionErrors, RpcError, ValidationErrors, entryPointExecutionErrorSchemaV06, entryPointExecutionErrorSchemaV07 } from "../../types/index.js";
-import { calcPreVerificationGas, isVersion06 } from "../../utils/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";
@@ -91,8 +91,17 @@ export class UnsafeValidator {
             let errorCode = ExecutionErrors.UserOperationReverted;
             if (error.data.toString().includes("AA23")) {
                 errorCode = ValidationErrors.SimulateValidation;
+                return {
+                    result: "failed",
+                    data: error.data,
+                    code: errorCode
+                };
             }
-            throw new RpcError(`UserOperation reverted during simulation with reason: ${error.data}`, errorCode);
+            return {
+                result: "failed",
+                data: `UserOperation reverted during simulation with reason: ${error.data}`,
+                code: errorCode
+            };
         }
         return error;
     }
@@ -244,18 +253,6 @@ export class UnsafeValidator {
             entryPoint
         });
     }
-    async validatePreVerificationGas({ userOperation, entryPoint }) {
-        const preVerificationGas = await calcPreVerificationGas({
-            config: this.config,
-            userOperation,
-            entryPoint,
-            gasPriceManager: this.gasPriceManager,
-            validate: true
-        });
-        if (preVerificationGas > userOperation.preVerificationGas) {
-            throw new RpcError(`preVerificationGas is not enough, required: ${preVerificationGas}, got: ${userOperation.preVerificationGas}`, ValidationErrors.SimulateValidation);
-        }
-    }
     async validateUserOperation({ userOperation, queuedUserOperations, entryPoint }) {
         try {
             const validationResult = await this.getValidationResult({