@pimlico/alto 0.0.0-main.20250123T120827 → 0.0.0-main.20250123T175913

package/lib/rpc/estimation/gasEstimationsV06.js

@@ -4,7 +4,6 @@ exports.GasEstimatorV06 = void 0;
 const types_1 = require("../../types/index.js");
 const viem_1 = require("viem");
 const zod_1 = require("zod");
-const userop_1 = require("../../utils/userop.js");
 const gasEstimationsV07_1 = require("./gasEstimationsV07.js");
 const utils_1 = require("../../utils/index.js");
 class GasEstimatorV06 {
@@ -65,7 +64,7 @@ class GasEstimatorV06 {
         }
         throw new Error("Unexpected error whilst decoding simulateHandleOp result");
     }
-    async simulateHandleOpV06({ userOperation, targetAddress, targetCallData, entryPoint, useCodeOverride = true, authorizationList, stateOverrides = undefined }) {
+    async simulateHandleOpV06({ userOperation, targetAddress, targetCallData, entryPoint, useCodeOverride = true, stateOverrides = undefined }) {
         const publicClient = this.config.publicClient;
         const blockTagSupport = this.config.blockTagSupport;
         const utilityWalletAddress = this.config.utilityPrivateKey?.address ??
@@ -76,21 +75,21 @@ class GasEstimatorV06 {
                 stateOverrides = {};
             }
             stateOverrides[entryPoint] = {
-                ...(0, userop_1.deepHexlify)(stateOverrides?.[entryPoint] || {}),
+                ...(0, utils_1.deepHexlify)(stateOverrides?.[entryPoint] || {}),
                 code: types_1.ENTRYPOINT_V06_SIMULATION_OVERRIDE
             };
         }
-        if (authorizationList) {
+        // Remove state override if not supported by network.
+        if (!this.config.balanceOverride) {
+            stateOverrides = undefined;
+        }
+        if (userOperation.eip7702Auth) {
             stateOverrides = await (0, utils_1.addAuthorizationStateOverrides)({
                 stateOverrides,
-                authorizationList,
+                authorizationList: [userOperation.eip7702Auth],
                 publicClient
             });
         }
-        // Remove state override if not supported by network.
-        if (!this.config.balanceOverride) {
-            stateOverrides = undefined;
-        }
         try {
             await publicClient.request({
                 method: "eth_call",

package/lib/rpc/estimation/gasEstimationsV06.js.map

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

package/lib/rpc/estimation/gasEstimationsV07.d.ts

@@ -7,11 +7,10 @@ import type { SignedAuthorizationList } from "viem/experimental";
 export declare class GasEstimatorV07 {
     private config;
     constructor(config: AltoConfig);
-    simulateValidation({ entryPoint, userOperation, queuedUserOperations, authorizationList }: {
+    simulateValidation({ entryPoint, userOperation, queuedUserOperations }: {
         entryPoint: Address;
         userOperation: UserOperationV07;
         queuedUserOperations: UserOperationV07[];
-        authorizationList?: SignedAuthorizationList;
     }): Promise<{
         simulateValidationResult: {
             status: "validation" | "failed";
@@ -64,7 +63,7 @@ export declare class GasEstimatorV07 {
         initialMinGas?: bigint;
         functionName: "binarySearchPaymasterVerificationGasLimit" | "binarySearchVerificationGasLimit" | "binarySearchCallGasLimit";
     }): Hex;
-    retryBinarySearch({ entryPoint, optimalGas, minGas, targetOp, target, targetCallData, functionName, queuedOps, stateOverrides, authorizationList }: {
+    retryBinarySearch({ entryPoint, optimalGas, minGas, targetOp, target, targetCallData, functionName, queuedOps, stateOverrides }: {
         entryPoint: Address;
         optimalGas: bigint;
         minGas: bigint;
@@ -74,14 +73,12 @@ export declare class GasEstimatorV07 {
         targetCallData: Hex;
         functionName: "binarySearchPaymasterVerificationGasLimit" | "binarySearchVerificationGasLimit" | "binarySearchCallGasLimit";
         stateOverrides?: StateOverrides | undefined;
-        authorizationList?: SignedAuthorizationList;
     }): Promise<SimulateBinarySearchRetryResult>;
-    simulateHandleOpV07({ entryPoint, userOperation, queuedUserOperations, stateOverrides, authorizationList }: {
+    simulateHandleOpV07({ entryPoint, userOperation, queuedUserOperations, stateOverrides }: {
         entryPoint: Address;
         userOperation: UserOperationV07;
         queuedUserOperations: UserOperationV07[];
         stateOverrides?: StateOverrides | undefined;
-        authorizationList?: SignedAuthorizationList;
     }): Promise<SimulateHandleOpResult>;
     callPimlicoEntryPointSimulations({ entryPoint, entryPointSimulationsCallData, stateOverrides, authorizationList }: {
         entryPoint: Address;

package/lib/rpc/estimation/gasEstimationsV07.js

@@ -11,7 +11,7 @@ class GasEstimatorV07 {
     constructor(config) {
         this.config = config;
     }
-    async simulateValidation({ entryPoint, userOperation, queuedUserOperations, authorizationList }) {
+    async simulateValidation({ entryPoint, userOperation, queuedUserOperations }) {
         const userOperations = [...queuedUserOperations, userOperation];
         const packedUserOperations = userOperations.map((uo) => (0, utils_1.toPackedUserOperation)(uo));
         const simulateValidationLast = (0, viem_1.encodeFunctionData)({
@@ -19,6 +19,10 @@ class GasEstimatorV07 {
             functionName: "simulateValidationLast",
             args: [packedUserOperations]
         });
+        let authorizationList = [];
+        if (userOperation.eip7702Auth) {
+            authorizationList = [userOperation.eip7702Auth];
+        }
         const errorResult = await this.callPimlicoEntryPointSimulations({
             entryPoint,
             entryPointSimulationsCallData: [simulateValidationLast],
@@ -87,7 +91,7 @@ class GasEstimatorV07 {
         return binarySearchVerificationGasLimit;
     }
     // Try to get the calldata gas again if the initial simulation reverted due to hitting the eth_call gasLimit.
-    async retryBinarySearch({ entryPoint, optimalGas, minGas, targetOp, target, targetCallData, functionName, queuedOps, stateOverrides, authorizationList }) {
+    async retryBinarySearch({ entryPoint, optimalGas, minGas, targetOp, target, targetCallData, functionName, queuedOps, stateOverrides }) {
         const maxRetries = 3;
         let retryCount = 0;
         let currentOptimalGas = optimalGas;
@@ -105,6 +109,10 @@ class GasEstimatorV07 {
                 gasAllowance,
                 functionName
             });
+            let authorizationList = [];
+            if (targetOp.eip7702Auth) {
+                authorizationList = [targetOp.eip7702Auth];
+            }
             let cause = await this.callPimlicoEntryPointSimulations({
                 entryPoint,
                 entryPointSimulationsCallData: [binarySearchCallGasLimit],
@@ -144,7 +152,7 @@ class GasEstimatorV07 {
             code: types_1.ValidationErrors.SimulateValidation
         };
     }
-    async simulateHandleOpV07({ entryPoint, userOperation, queuedUserOperations, stateOverrides = undefined, authorizationList }) {
+    async simulateHandleOpV07({ entryPoint, userOperation, queuedUserOperations, stateOverrides = undefined }) {
         const simulateHandleOpLast = this.encodeSimulateHandleOpLast({
             entryPoint,
             userOperation,
@@ -182,6 +190,10 @@ class GasEstimatorV07 {
             }),
             functionName: "binarySearchCallGasLimit"
         });
+        let authorizationList = [];
+        if (userOperation.eip7702Auth) {
+            authorizationList = [userOperation.eip7702Auth];
+        }
         let cause;
         if (this.config.chainType === "hedera") {
             // due to Hedera specific restrictions, we can't combine these two calls.

package/lib/rpc/estimation/gasEstimationsV07.js.map

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

package/lib/rpc/nonceQueuer.d.ts

@@ -1,13 +1,13 @@
 import type { EventManager } from "../handlers/index.js";
 import type { MemoryMempool } from "../mempool/index.js";
-import { type MempoolUserOperation } from "../types/index.js";
+import { UserOperation } from "../types/index.js";
 import type { Logger } from "../utils/index.js";
 import { type Address, type Hash, type PublicClient } from "viem";
 import type { AltoConfig } from "../createConfig.js";
 type QueuedUserOperation = {
     entryPoint: Address;
     userOperationHash: Hash;
-    mempoolUserOperation: MempoolUserOperation;
+    userOperation: UserOperation;
     nonceKey: bigint;
     nonceSequence: bigint;
     addedAt: number;
@@ -24,8 +24,8 @@ export declare class NonceQueuer {
         eventManager: EventManager;
     });
     process(): Promise<void>;
-    add(mempoolUserOperation: MempoolUserOperation, entryPoint: Address): void;
-    resubmitUserOperation(mempoolUserOperation: MempoolUserOperation, entryPoint: Address): void;
+    add(userOperation: UserOperation, entryPoint: Address): void;
+    resubmitUserOperation(userOperation: UserOperation, entryPoint: Address): void;
     getAvailableUserOperations(publicClient: PublicClient): Promise<QueuedUserOperation[]>;
 }
 export {};

package/lib/rpc/nonceQueuer.js

@@ -39,28 +39,26 @@ class NonceQueuer {
             });
         });
         availableOps.map((op) => {
-            this.resubmitUserOperation(op.mempoolUserOperation, op.entryPoint);
+            this.resubmitUserOperation(op.userOperation, op.entryPoint);
         });
         this.logger.info({ availableOps: availableOps.map((qop) => qop.userOperationHash) }, "submitted user operations from nonce queue");
     }
-    add(mempoolUserOperation, entryPoint) {
-        const userOperation = (0, types_1.deriveUserOperation)(mempoolUserOperation);
+    add(userOperation, entryPoint) {
         const [nonceKey, nonceSequence] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
-        const userOperationHash = (0, utils_1.getUserOperationHash)((0, types_1.deriveUserOperation)(mempoolUserOperation), entryPoint, this.config.publicClient.chain.id);
+        const userOperationHash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.config.publicClient.chain.id);
         this.queuedUserOperations.push({
             entryPoint,
             userOperationHash,
-            mempoolUserOperation,
+            userOperation,
             nonceKey,
             nonceSequence,
             addedAt: Date.now()
         });
         this.eventManager.emitQueued(userOperationHash);
     }
-    resubmitUserOperation(mempoolUserOperation, entryPoint) {
-        const userOperation = mempoolUserOperation;
+    resubmitUserOperation(userOperation, entryPoint) {
         this.logger.info({ userOperation: userOperation }, "submitting user operation from nonce queue");
-        const result = this.mempool.add(mempoolUserOperation, entryPoint);
+        const result = this.mempool.add(userOperation, entryPoint);
         if (result) {
             this.logger.info({ userOperation: userOperation, result: result }, "added user operation");
         }
@@ -74,7 +72,7 @@ class NonceQueuer {
         try {
             results = await publicClient.multicall({
                 contracts: queuedUserOperations.map((qop) => {
-                    const userOperation = (0, types_1.deriveUserOperation)(qop.mempoolUserOperation);
+                    const userOperation = qop.userOperation;
                     const isUserOpV06 = (0, utils_1.isVersion06)(userOperation);
                     return {
                         address: qop.entryPoint,
@@ -89,7 +87,7 @@ class NonceQueuer {
         catch (error) {
             this.logger.error({ error: JSON.stringify(error) }, "error fetching with multiCall");
             results = await Promise.all(queuedUserOperations.map(async (qop) => {
-                const userOperation = (0, types_1.deriveUserOperation)(qop.mempoolUserOperation);
+                const userOperation = qop.userOperation;
                 try {
                     const isUserOpV06 = (0, utils_1.isVersion06)(userOperation);
                     const entryPointContract = isUserOpV06

package/lib/rpc/nonceQueuer.js.map

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

package/lib/rpc/rpcHandler.d.ts

@@ -2,12 +2,11 @@ import type { Executor, ExecutorManager } from "../executor/index.js";
 import type { EventManager, GasPriceManager } from "../handlers/index.js";
 import type { InterfaceReputationManager, MemoryMempool, Monitor } from "../mempool/index.js";
 import type { ApiVersion, StateOverrides } from "../types/index.js";
-import { type Address, type BundlerClearMempoolResponseResult, type BundlerClearStateResponseResult, type BundlerDumpMempoolResponseResult, type BundlerDumpReputationsResponseResult, type BundlerGetStakeStatusResponseResult, type BundlerRequest, type BundlerResponse, type BundlerSendBundleNowResponseResult, type BundlerSetBundlingModeResponseResult, type BundlerSetReputationsRequestParams, type BundlingMode, type ChainIdResponseResult, type EstimateUserOperationGasResponseResult, type GetUserOperationByHashResponseResult, type GetUserOperationReceiptResponseResult, type HexData32, type InterfaceValidator, type MempoolUserOperation, type PimlicoGetUserOperationGasPriceResponseResult, type PimlicoGetUserOperationStatusResponseResult, type SendUserOperationResponseResult, type SupportedEntryPointsResponseResult, type UserOperation } from "../types/index.js";
+import { type Address, type BundlerClearMempoolResponseResult, type BundlerClearStateResponseResult, type BundlerDumpMempoolResponseResult, type BundlerDumpReputationsResponseResult, type BundlerGetStakeStatusResponseResult, type BundlerRequest, type BundlerResponse, type BundlerSendBundleNowResponseResult, type BundlerSetBundlingModeResponseResult, type BundlerSetReputationsRequestParams, type BundlingMode, type ChainIdResponseResult, type EstimateUserOperationGasResponseResult, type GetUserOperationByHashResponseResult, type GetUserOperationReceiptResponseResult, type HexData32, type InterfaceValidator, type PimlicoGetUserOperationGasPriceResponseResult, type PimlicoGetUserOperationStatusResponseResult, type SendUserOperationResponseResult, type SupportedEntryPointsResponseResult, type UserOperation } from "../types/index.js";
 import type { Logger, Metrics } from "../utils/index.js";
 import { type Hex } from "viem";
 import type { NonceQueuer } from "./nonceQueuer.js";
 import type { AltoConfig } from "../createConfig.js";
-import type { SignedAuthorization } from "viem/experimental";
 export interface IRpcEndpoint {
     handleMethod(request: BundlerRequest, apiVersion: ApiVersion): Promise<BundlerResponse>;
     eth_chainId(): ChainIdResponseResult;
@@ -63,8 +62,8 @@ export declare class RpcHandler implements IRpcEndpoint {
     debug_bundler_setReputation(args: BundlerSetReputationsRequestParams): BundlerSetBundlingModeResponseResult;
     pimlico_getUserOperationStatus(userOperationHash: HexData32): PimlicoGetUserOperationStatusResponseResult;
     pimlico_getUserOperationGasPrice(): Promise<PimlicoGetUserOperationGasPriceResponseResult>;
-    addToMempoolIfValid(op: MempoolUserOperation, entryPoint: Address, apiVersion: ApiVersion): Promise<"added" | "queued">;
-    pimlico_experimental_estimateUserOperationGas7702(apiVersion: ApiVersion, userOperation: UserOperation, entryPoint: Address, authorization: SignedAuthorization, stateOverrides?: StateOverrides): Promise<{
+    addToMempoolIfValid(userOperation: UserOperation, entryPoint: Address, apiVersion: ApiVersion): Promise<"added" | "queued">;
+    pimlico_experimental_estimateUserOperationGas7702(apiVersion: ApiVersion, userOperation: UserOperation, entryPoint: Address, stateOverrides?: StateOverrides): Promise<{
         preVerificationGas: bigint;
         verificationGasLimit: bigint;
         callGasLimit: bigint;
@@ -86,7 +85,7 @@ export declare class RpcHandler implements IRpcEndpoint {
         paymasterVerificationGasLimit?: undefined;
         paymasterPostOpGasLimit?: undefined;
     }>;
-    pimlico_experimental_sendUserOperation7702(apiVersion: ApiVersion, userOperation: UserOperation, entryPoint: Address, authorizationSignature: SignedAuthorization): Promise<`0x${string}`>;
+    pimlico_experimental_sendUserOperation7702(apiVersion: ApiVersion, userOperation: UserOperation, entryPoint: Address): Promise<`0x${string}`>;
     pimlico_sendUserOperationNow(apiVersion: ApiVersion, userOperation: UserOperation, entryPoint: Address): Promise<{
         sender: `0x${string}`;
         userOpHash: `0x${string}`;
@@ -133,12 +132,11 @@ export declare class RpcHandler implements IRpcEndpoint {
         reason?: `0x${string}` | undefined;
     }>;
     getNonceValue(userOperation: UserOperation, entryPoint: Address): Promise<bigint>;
-    estimateGas({ apiVersion, userOperation, entryPoint, stateOverrides, authorization }: {
+    estimateGas({ apiVersion, userOperation, entryPoint, stateOverrides }: {
         apiVersion: ApiVersion;
         userOperation: UserOperation;
         entryPoint: Address;
         stateOverrides?: StateOverrides;
-        authorization?: SignedAuthorization;
     }): Promise<{
         preVerificationGas: bigint;
         verificationGasLimit: bigint;

package/lib/rpc/rpcHandler.js

@@ -131,7 +131,7 @@ class RpcHandler {
             case "pimlico_experimental_estimateUserOperationGas7702":
                 return {
                     method,
-                    result: await this.pimlico_experimental_estimateUserOperationGas7702(apiVersion, request.params[0], request.params[1], request.params[2], request.params[3])
+                    result: await this.pimlico_experimental_estimateUserOperationGas7702(apiVersion, request.params[0], request.params[1], request.params[2])
                 };
         }
     }
@@ -331,7 +331,7 @@ class RpcHandler {
         this.ensureEntryPointIsSupported(entryPoint);
         return this.mempool
             .dumpOutstanding()
-            .map((userOpInfo) => (0, types_1.deriveUserOperation)(userOpInfo.mempoolUserOperation));
+            .map(({ userOperation }) => userOperation);
     }
     async debug_bundler_sendBundleNow() {
         this.ensureDebugEndpointsAreEnabled("debug_bundler_sendBundleNow");
@@ -387,9 +387,8 @@ class RpcHandler {
         };
     }
     // check if we want to bundle userOperation. If yes, add to mempool
-    async addToMempoolIfValid(op, entryPoint, apiVersion) {
+    async addToMempoolIfValid(userOperation, entryPoint, apiVersion) {
         this.ensureEntryPointIsSupported(entryPoint);
-        const userOperation = (0, types_1.deriveUserOperation)(op);
         const opHash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.config.publicClient.chain.id);
         await this.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
         const currentNonceValue = await this.getNonceValue(userOperation, entryPoint);
@@ -411,11 +410,11 @@ class RpcHandler {
         }
         if (userOperationNonceValue >
             currentNonceValue + BigInt(queuedUserOperations.length)) {
-            this.nonceQueuer.add(op, entryPoint);
+            this.nonceQueuer.add(userOperation, entryPoint);
             return "queued";
         }
         if (this.config.dangerousSkipUserOperationValidation) {
-            const [success, errorReason] = this.mempool.add(op, entryPoint);
+            const [success, errorReason] = this.mempool.add(userOperation, entryPoint);
             if (!success) {
                 this.eventManager.emitFailedValidation(opHash, errorReason, (0, utils_1.getAAError)(errorReason));
                 throw new types_1.RpcError(errorReason, types_1.ValidationErrors.InvalidFields);
@@ -428,48 +427,39 @@ class RpcHandler {
                 entryPoint
             });
         }
-        let authorizationList;
-        if ((0, types_1.is7702Type)(op)) {
-            authorizationList = [op.authorization];
-        }
         const validationResult = await this.validator.validateUserOperation({
             shouldCheckPrefund: apiVersion !== "v1",
             userOperation,
             queuedUserOperations,
-            entryPoint,
-            authorizationList
+            entryPoint
         });
         await this.reputationManager.checkReputation(userOperation, entryPoint, validationResult);
         await this.mempool.checkEntityMultipleRoleViolation(userOperation);
-        const [success, errorReason] = this.mempool.add(op, entryPoint, validationResult.referencedContracts);
+        const [success, errorReason] = this.mempool.add(userOperation, entryPoint, validationResult.referencedContracts);
         if (!success) {
             this.eventManager.emitFailedValidation(opHash, errorReason, (0, utils_1.getAAError)(errorReason));
             throw new types_1.RpcError(errorReason, types_1.ValidationErrors.InvalidFields);
         }
         return "added";
     }
-    async pimlico_experimental_estimateUserOperationGas7702(apiVersion, userOperation, entryPoint, authorization, stateOverrides) {
+    async pimlico_experimental_estimateUserOperationGas7702(apiVersion, userOperation, entryPoint, stateOverrides) {
         if (!this.config.enableExperimental7702Endpoints) {
             throw new types_1.RpcError("pimlico_experimental_estimateUserOperationGas7702 endpoint is not enabled", types_1.ValidationErrors.InvalidFields);
         }
         return await this.estimateGas({
             apiVersion,
             userOperation,
-            authorization,
             entryPoint,
             stateOverrides
         });
     }
-    async pimlico_experimental_sendUserOperation7702(apiVersion, userOperation, entryPoint, authorizationSignature) {
+    async pimlico_experimental_sendUserOperation7702(apiVersion, userOperation, entryPoint) {
         if (!this.config.enableExperimental7702Endpoints) {
             throw new types_1.RpcError("pimlico_experimental_sendUserOperation7702 endpoint is not enabled", types_1.ValidationErrors.InvalidFields);
         }
         this.ensureEntryPointIsSupported(entryPoint);
         try {
-            await this.addToMempoolIfValid({
-                userOperation,
-                authorization: authorizationSignature
-            }, entryPoint, apiVersion);
+            await this.addToMempoolIfValid(userOperation, entryPoint, apiVersion);
         }
         catch (e) {
             this.logger.error(e);
@@ -528,7 +518,7 @@ class RpcHandler {
         const [_, currentNonceValue] = (0, utils_1.getNonceKeyAndValue)(getNonceResult);
         return currentNonceValue;
     }
-    async estimateGas({ apiVersion, userOperation, entryPoint, stateOverrides, authorization }) {
+    async estimateGas({ apiVersion, userOperation, entryPoint, stateOverrides }) {
         this.ensureEntryPointIsSupported(entryPoint);
         if (userOperation.maxFeePerGas === 0n) {
             throw new types_1.RpcError("user operation max fee per gas must be larger than 0 during gas estimation");
@@ -578,8 +568,7 @@ class RpcHandler {
             entryPoint,
             queuedUserOperations,
             addSenderBalanceOverride: true,
-            stateOverrides: (0, utils_1.deepHexlify)(stateOverrides),
-            authorizationList: authorization ? [authorization] : undefined
+            stateOverrides: (0, utils_1.deepHexlify)(stateOverrides)
         });
         let { verificationGasLimit, callGasLimit, paymasterVerificationGasLimit } = (0, utils_1.calcVerificationGasAndCallGasLimit)(simulationUserOperation, executionResult.data.executionResult, this.config.publicClient.chain.id, executionResult.data);
         let paymasterPostOpGasLimit = 0n;
@@ -648,8 +637,7 @@ class RpcHandler {
                 entryPoint,
                 queuedUserOperations,
                 addSenderBalanceOverride: false,
-                stateOverrides: (0, utils_1.deepHexlify)(stateOverrides),
-                authorizationList: authorization ? [authorization] : undefined
+                stateOverrides: (0, utils_1.deepHexlify)(stateOverrides)
             });
         }
         if ((0, utils_1.isVersion07)(simulationUserOperation)) {