@pimlico/alto 0.0.6 → 0.0.8

package/lib/rpc/estimation/types.js

@@ -0,0 +1,125 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simulationValidationResultStruct = void 0;
+exports.simulationValidationResultStruct = [
+    {
+        components: [
+            {
+                components: [
+                    {
+                        internalType: "uint256",
+                        name: "preOpGas",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "prefund",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "accountValidationData",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "paymasterValidationData",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "bytes",
+                        name: "paymasterContext",
+                        type: "bytes"
+                    }
+                ],
+                internalType: "struct IEntryPoint.ReturnInfo",
+                name: "returnInfo",
+                type: "tuple"
+            },
+            {
+                components: [
+                    {
+                        internalType: "uint256",
+                        name: "stake",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "unstakeDelaySec",
+                        type: "uint256"
+                    }
+                ],
+                internalType: "struct IStakeManager.StakeInfo",
+                name: "senderInfo",
+                type: "tuple"
+            },
+            {
+                components: [
+                    {
+                        internalType: "uint256",
+                        name: "stake",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "unstakeDelaySec",
+                        type: "uint256"
+                    }
+                ],
+                internalType: "struct IStakeManager.StakeInfo",
+                name: "factoryInfo",
+                type: "tuple"
+            },
+            {
+                components: [
+                    {
+                        internalType: "uint256",
+                        name: "stake",
+                        type: "uint256"
+                    },
+                    {
+                        internalType: "uint256",
+                        name: "unstakeDelaySec",
+                        type: "uint256"
+                    }
+                ],
+                internalType: "struct IStakeManager.StakeInfo",
+                name: "paymasterInfo",
+                type: "tuple"
+            },
+            {
+                components: [
+                    {
+                        internalType: "address",
+                        name: "aggregator",
+                        type: "address"
+                    },
+                    {
+                        components: [
+                            {
+                                internalType: "uint256",
+                                name: "stake",
+                                type: "uint256"
+                            },
+                            {
+                                internalType: "uint256",
+                                name: "unstakeDelaySec",
+                                type: "uint256"
+                            }
+                        ],
+                        internalType: "struct IStakeManager.StakeInfo",
+                        name: "stakeInfo",
+                        type: "tuple"
+                    }
+                ],
+                internalType: "struct IEntryPoint.AggregatorStakeInfo",
+                name: "aggregatorInfo",
+                type: "tuple"
+            }
+        ],
+        internalType: "struct IEntryPointSimulations.ValidationResult",
+        name: "",
+        type: "tuple"
+    }
+];
+//# sourceMappingURL=types.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../rpc/estimation/types.ts"],"names":[],"mappings":";;;AAsCa,QAAA,gCAAgC,GAAG;IAC5C;QACI,UAAU,EAAE;YACR;gBACI,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,UAAU;wBAChB,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,SAAS;wBACf,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,uBAAuB;wBAC7B,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,yBAAyB;wBAC/B,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,OAAO;wBACrB,IAAI,EAAE,kBAAkB;wBACxB,IAAI,EAAE,OAAO;qBAChB;iBACJ;gBACD,YAAY,EAAE,+BAA+B;gBAC7C,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,YAAY,EAAE,gCAAgC;gBAC9C,IAAI,EAAE,YAAY;gBAClB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,YAAY,EAAE,gCAAgC;gBAC9C,IAAI,EAAE,aAAa;gBACnB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,OAAO;wBACb,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,iBAAiB;wBACvB,IAAI,EAAE,SAAS;qBAClB;iBACJ;gBACD,YAAY,EAAE,gCAAgC;gBAC9C,IAAI,EAAE,eAAe;gBACrB,IAAI,EAAE,OAAO;aAChB;YACD;gBACI,UAAU,EAAE;oBACR;wBACI,YAAY,EAAE,SAAS;wBACvB,IAAI,EAAE,YAAY;wBAClB,IAAI,EAAE,SAAS;qBAClB;oBACD;wBACI,UAAU,EAAE;4BACR;gCACI,YAAY,EAAE,SAAS;gCACvB,IAAI,EAAE,OAAO;gCACb,IAAI,EAAE,SAAS;6BAClB;4BACD;gCACI,YAAY,EAAE,SAAS;gCACvB,IAAI,EAAE,iBAAiB;gCACvB,IAAI,EAAE,SAAS;6BAClB;yBACJ;wBACD,YAAY,EAAE,gCAAgC;wBAC9C,IAAI,EAAE,WAAW;wBACjB,IAAI,EAAE,OAAO;qBAChB;iBACJ;gBACD,YAAY,EAAE,wCAAwC;gBACtD,IAAI,EAAE,gBAAgB;gBACtB,IAAI,EAAE,OAAO;aAChB;SACJ;QACD,YAAY,EAAE,gDAAgD;QAC9D,IAAI,EAAE,EAAE;QACR,IAAI,EAAE,OAAO;KAChB;CACK,CAAA"}

package/lib/rpc/nonceQueuer.d.ts

@@ -1,8 +1,9 @@
+import type { EventManager } from "../handlers/index.js";
+import type { MemoryMempool } from "../mempool/index.js";
 import { type MempoolUserOperation } from "../types/index.js";
 import type { Logger } from "../utils/index.js";
-import { type Address, type Chain, type Hash, type PublicClient, type Transport } from "viem";
-import type { MemoryMempool } from "../mempool/index.js";
-import type { EventManager } from "../handlers/index.js";
+import { type Address, type Hash, type PublicClient } from "viem";
+import type { AltoConfig } from "../createConfig.js";
 type QueuedUserOperation = {
     entryPoint: Address;
     userOperationHash: Hash;
@@ -13,12 +14,15 @@ type QueuedUserOperation = {
 };
 export declare class NonceQueuer {
     queuedUserOperations: QueuedUserOperation[];
+    config: AltoConfig;
     mempool: MemoryMempool;
-    publicClient: PublicClient<Transport, Chain>;
     logger: Logger;
-    blockTagSupport: boolean;
     eventManager: EventManager;
-    constructor(mempool: MemoryMempool, publicClient: PublicClient<Transport, Chain>, logger: Logger, blockTagSupport: boolean, eventManager: EventManager);
+    constructor({ config, mempool, eventManager }: {
+        config: AltoConfig;
+        mempool: MemoryMempool;
+        eventManager: EventManager;
+    });
     process(): Promise<void>;
     add(mempoolUserOperation: MempoolUserOperation, entryPoint: Address): void;
     resubmitUserOperation(mempoolUserOperation: MempoolUserOperation, entryPoint: Address): void;

package/lib/rpc/nonceQueuer.js

@@ -6,16 +6,16 @@ const utils_1 = require("../utils/index.js");
 const viem_1 = require("viem");
 class NonceQueuer {
     queuedUserOperations = [];
+    config;
     mempool;
-    publicClient;
     logger;
-    blockTagSupport;
     eventManager;
-    constructor(mempool, publicClient, logger, blockTagSupport, eventManager) {
+    constructor({ config, mempool, eventManager }) {
+        this.config = config;
         this.mempool = mempool;
-        this.publicClient = publicClient;
-        this.logger = logger;
-        this.blockTagSupport = blockTagSupport;
+        this.logger = config.getLogger({ module: "nonce_queuer" }, {
+            level: config.nonceQueuerLogLevel || config.logLevel
+        });
         this.eventManager = eventManager;
         setInterval(() => {
             this.process();
@@ -29,7 +29,7 @@ class NonceQueuer {
         if (this.queuedUserOperations.length === 0) {
             return;
         }
-        const availableOps = await this.getAvailableUserOperations(this.publicClient);
+        const availableOps = await this.getAvailableUserOperations(this.config.publicClient);
         if (availableOps.length === 0) {
             return;
         }
@@ -46,7 +46,7 @@ class NonceQueuer {
     add(mempoolUserOperation, entryPoint) {
         const userOperation = (0, types_1.deriveUserOperation)(mempoolUserOperation);
         const [nonceKey, nonceValue] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
-        const hash = (0, utils_1.getUserOperationHash)((0, types_1.deriveUserOperation)(mempoolUserOperation), entryPoint, this.publicClient.chain.id);
+        const hash = (0, utils_1.getUserOperationHash)((0, types_1.deriveUserOperation)(mempoolUserOperation), entryPoint, this.config.publicClient.chain.id);
         this.queuedUserOperations.push({
             entryPoint,
             userOperationHash: hash,
@@ -83,7 +83,7 @@ class NonceQueuer {
                         args: [userOperation.sender, qop.nonceKey]
                     };
                 }),
-                blockTag: this.blockTagSupport ? "latest" : undefined
+                blockTag: this.config.blockTagSupport ? "latest" : undefined
             });
         }
         catch (error) {

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

@@ -1,11 +1,12 @@
 import type { Executor, ExecutorManager } from "../executor/index.js";
+import type { CompressionHandler, EventManager, GasPriceManager } from "../handlers/index.js";
 import type { InterfaceReputationManager, MemoryMempool, Monitor } from "../mempool/index.js";
-import type { ApiVersion, StateOverrides, GasPriceMultipliers, ChainType } from "../types/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 { Logger, Metrics } from "../utils/index.js";
-import type { GasPriceManager, CompressionHandler, EventManager } from "../handlers/index.js";
-import { type Chain, type Hex, type PublicClient, type Transport } from "viem";
+import { type Hex } from "viem";
 import type { NonceQueuer } from "./nonceQueuer.js";
+import type { AltoConfig } from "../createConfig.js";
 export interface IRpcEndpoint {
     handleMethod(request: BundlerRequest, apiVersion: ApiVersion): Promise<BundlerResponse>;
     eth_chainId(): ChainIdResponseResult;
@@ -16,31 +17,33 @@ export interface IRpcEndpoint {
     eth_getUserOperationReceipt(userOperationHash: HexData32): Promise<GetUserOperationReceiptResponseResult>;
 }
 export declare class RpcHandler implements IRpcEndpoint {
-    entryPoints: Address[];
-    publicClient: PublicClient<Transport, Chain>;
+    config: AltoConfig;
     validator: InterfaceValidator;
     mempool: MemoryMempool;
     executor: Executor;
     monitor: Monitor;
     nonceQueuer: NonceQueuer;
-    usingTenderly: boolean;
-    rpcMaxBlockRange: number | undefined;
     logger: Logger;
     metrics: Metrics;
-    chainId: number;
-    chainType: ChainType;
-    enableDebugEndpoints: boolean;
     executorManager: ExecutorManager;
     reputationManager: InterfaceReputationManager;
     compressionHandler: CompressionHandler | null;
-    legacyTransactions: boolean;
-    dangerousSkipUserOperationValidation: boolean;
     gasPriceManager: GasPriceManager;
-    gasPriceMultipliers: GasPriceMultipliers;
-    paymasterGasLimitMultiplier: bigint;
     eventManager: EventManager;
-    enableInstantBundlingEndpoint: boolean;
-    constructor(entryPoints: Address[], publicClient: PublicClient<Transport, Chain>, validator: InterfaceValidator, mempool: MemoryMempool, executor: Executor, monitor: Monitor, nonceQueuer: NonceQueuer, executorManager: ExecutorManager, reputationManager: InterfaceReputationManager, usingTenderly: boolean, rpcMaxBlockRange: number | undefined, logger: Logger, metrics: Metrics, enableDebugEndpoints: boolean, compressionHandler: CompressionHandler | null, legacyTransactions: boolean, gasPriceManager: GasPriceManager, gasPriceMultipliers: GasPriceMultipliers, chainType: ChainType, paymasterGasLimitMultiplier: bigint, eventManager: EventManager, enableInstantBundlingEndpoint: boolean, dangerousSkipUserOperationValidation?: boolean);
+    constructor({ config, validator, mempool, executor, monitor, nonceQueuer, executorManager, reputationManager, metrics, compressionHandler, gasPriceManager, eventManager }: {
+        config: AltoConfig;
+        validator: InterfaceValidator;
+        mempool: MemoryMempool;
+        executor: Executor;
+        monitor: Monitor;
+        nonceQueuer: NonceQueuer;
+        executorManager: ExecutorManager;
+        reputationManager: InterfaceReputationManager;
+        metrics: Metrics;
+        compressionHandler: CompressionHandler | null;
+        eventManager: EventManager;
+        gasPriceManager: GasPriceManager;
+    });
     handleMethod(request: BundlerRequest, apiVersion: ApiVersion): Promise<BundlerResponse>;
     ensureEntryPointIsSupported(entryPoint: Address): void;
     ensureDebugEndpointsAreEnabled(methodName: string): void;

package/lib/rpc/rpcHandler.js

@@ -6,55 +6,34 @@ const utils_1 = require("../utils/index.js");
 const viem_1 = require("viem");
 const chains_1 = require("viem/chains");
 class RpcHandler {
-    entryPoints;
-    publicClient;
+    config;
     validator;
     mempool;
     executor;
     monitor;
     nonceQueuer;
-    usingTenderly;
-    rpcMaxBlockRange;
     logger;
     metrics;
-    chainId;
-    chainType;
-    enableDebugEndpoints;
     executorManager;
     reputationManager;
     compressionHandler;
-    legacyTransactions;
-    dangerousSkipUserOperationValidation;
     gasPriceManager;
-    gasPriceMultipliers;
-    paymasterGasLimitMultiplier;
     eventManager;
-    enableInstantBundlingEndpoint;
-    constructor(entryPoints, publicClient, validator, mempool, executor, monitor, nonceQueuer, executorManager, reputationManager, usingTenderly, rpcMaxBlockRange, logger, metrics, enableDebugEndpoints, compressionHandler, legacyTransactions, gasPriceManager, gasPriceMultipliers, chainType, paymasterGasLimitMultiplier, eventManager, enableInstantBundlingEndpoint, dangerousSkipUserOperationValidation = false) {
-        this.entryPoints = entryPoints;
-        this.publicClient = publicClient;
+    constructor({ config, validator, mempool, executor, monitor, nonceQueuer, executorManager, reputationManager, metrics, compressionHandler, gasPriceManager, eventManager }) {
+        this.config = config;
         this.validator = validator;
         this.mempool = mempool;
         this.executor = executor;
         this.monitor = monitor;
         this.nonceQueuer = nonceQueuer;
-        this.usingTenderly = usingTenderly;
-        this.rpcMaxBlockRange = rpcMaxBlockRange;
-        this.logger = logger;
+        this.logger = config.getLogger({ module: "rpc" }, {
+            level: config.rpcLogLevel || config.logLevel
+        });
         this.metrics = metrics;
-        this.enableDebugEndpoints = enableDebugEndpoints;
-        this.chainId = publicClient.chain.id;
         this.executorManager = executorManager;
         this.reputationManager = reputationManager;
         this.compressionHandler = compressionHandler;
-        this.legacyTransactions = legacyTransactions;
-        this.dangerousSkipUserOperationValidation =
-            dangerousSkipUserOperationValidation;
-        this.gasPriceMultipliers = gasPriceMultipliers;
-        this.chainType = chainType;
         this.gasPriceManager = gasPriceManager;
-        this.paymasterGasLimitMultiplier = paymasterGasLimitMultiplier;
-        this.enableInstantBundlingEndpoint = enableInstantBundlingEndpoint;
         this.eventManager = eventManager;
     }
     async handleMethod(request, apiVersion) {
@@ -154,17 +133,17 @@ class RpcHandler {
         }
     }
     ensureEntryPointIsSupported(entryPoint) {
-        if (!this.entryPoints.includes(entryPoint)) {
-            throw new Error(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
+        if (!this.config.entrypoints.includes(entryPoint)) {
+            throw new Error(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.config.entrypoints.join(", ")}`);
         }
     }
     ensureDebugEndpointsAreEnabled(methodName) {
-        if (!this.enableDebugEndpoints) {
+        if (!this.config.enableDebugEndpoints) {
             throw new types_1.RpcError(`${methodName} is only available in development environment`);
         }
     }
     async preMempoolChecks(opHash, userOperation, apiVersion, entryPoint) {
-        if (this.legacyTransactions &&
+        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);
@@ -190,24 +169,38 @@ class RpcHandler {
         }
     }
     eth_chainId() {
-        return BigInt(this.chainId);
+        return BigInt(this.config.publicClient.chain.id);
     }
     eth_supportedEntryPoints() {
-        return this.entryPoints;
+        return this.config.entrypoints;
     }
     async eth_estimateUserOperationGas(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");
         }
-        const preVerificationGas = ((await (0, utils_1.calcPreVerificationGas)(this.publicClient, userOperation, entryPoint, this.chainId, this.chainType, this.gasPriceManager, false)) *
-            110n) /
-            100n;
-        userOperation.preVerificationGas = 1000000n;
-        userOperation.verificationGasLimit = 10000000n;
-        userOperation.callGasLimit = 10000000n;
-        if (this.chainId === chains_1.base.id) {
+        let preVerificationGas = await (0, utils_1.calcPreVerificationGas)({
+            config: this.config,
+            userOperation,
+            entryPoint,
+            gasPriceManager: this.gasPriceManager,
+            validate: false
+        });
+        preVerificationGas = (0, utils_1.scaleBigIntByPercent)(preVerificationGas, 110);
+        // biome-ignore lint/style/noParameterAssign: prepare userOperaiton for simulation
+        userOperation = {
+            ...userOperation,
+            preVerificationGas,
+            verificationGasLimit: 10000000n,
+            callGasLimit: 10000000n
+        };
+        if (this.config.publicClient.chain.id === chains_1.base.id) {
+            userOperation.verificationGasLimit = 5000000n;
+        }
+        if (this.config.chainType === "hedera") {
+            // The eth_call gasLimit is set to 12_500_000 on Hedera.
             userOperation.verificationGasLimit = 5000000n;
+            userOperation.callGasLimit = 4500000n;
         }
         if ((0, utils_1.isVersion07)(userOperation)) {
             userOperation.paymasterPostOpGasLimit = 2000000n;
@@ -238,8 +231,8 @@ class RpcHandler {
                 throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
             }
         }
-        const executionResult = await this.validator.getExecutionResult(userOperation, entryPoint, queuedUserOperations, stateOverrides);
-        let { verificationGasLimit, callGasLimit } = (0, utils_1.calcVerificationGasAndCallGasLimit)(userOperation, executionResult.data.executionResult, this.chainId, executionResult.data.callDataResult);
+        const executionResult = await this.validator.getExecutionResult(userOperation, entryPoint, queuedUserOperations, true, stateOverrides);
+        let { verificationGasLimit, callGasLimit } = (0, utils_1.calcVerificationGasAndCallGasLimit)(userOperation, executionResult.data.executionResult, this.config.publicClient.chain.id, executionResult.data.callDataResult);
         let paymasterVerificationGasLimit = 0n;
         let paymasterPostOpGasLimit = 0n;
         if ((0, utils_1.isVersion07)(userOperation) &&
@@ -253,21 +246,36 @@ class RpcHandler {
             paymasterPostOpGasLimit =
                 executionResult.data.executionResult.paymasterPostOpGasLimit ||
                     1n;
-            const multiplier = this.paymasterGasLimitMultiplier;
-            paymasterVerificationGasLimit =
-                (paymasterVerificationGasLimit * multiplier) / 100n;
-            paymasterPostOpGasLimit =
-                (paymasterPostOpGasLimit * multiplier) / 100n;
+            const multiplier = Number(this.config.paymasterGasLimitMultiplier);
+            paymasterVerificationGasLimit = (0, utils_1.scaleBigIntByPercent)(paymasterVerificationGasLimit, multiplier);
+            paymasterPostOpGasLimit = (0, utils_1.scaleBigIntByPercent)(paymasterPostOpGasLimit, multiplier);
         }
-        if (this.chainId === chains_1.base.id || this.chainId === chains_1.baseSepolia.id) {
+        if (this.config.publicClient.chain.id === chains_1.base.id ||
+            this.config.publicClient.chain.id === chains_1.baseSepolia.id) {
             callGasLimit += 10000n;
         }
-        if (this.chainId === chains_1.base.id || this.chainId === chains_1.optimism.id) {
+        if (this.config.publicClient.chain.id === chains_1.base.id ||
+            this.config.publicClient.chain.id === chains_1.optimism.id) {
             callGasLimit = (0, utils_1.maxBigInt)(callGasLimit, 120000n);
         }
         if (userOperation.callData === "0x") {
             callGasLimit = 0n;
         }
+        if ((0, utils_1.isVersion06)(userOperation)) {
+            callGasLimit = (0, utils_1.scaleBigIntByPercent)(callGasLimit, Number(this.config.callGasLimitMultiplier));
+        }
+        // If a balance override is provided for the sender, perform an additional simulation
+        // to verify the userOperation succeeds with the specified balance.
+        if (stateOverrides?.[userOperation.sender]?.balance) {
+            await this.validator.getExecutionResult({
+                ...userOperation,
+                preVerificationGas,
+                verificationGasLimit,
+                callGasLimit,
+                paymasterVerificationGasLimit,
+                paymasterPostOpGasLimit
+            }, entryPoint, queuedUserOperations, false, (0, utils_1.deepHexlify)(stateOverrides));
+        }
         if ((0, utils_1.isVersion07)(userOperation)) {
             return {
                 preVerificationGas,
@@ -292,7 +300,7 @@ class RpcHandler {
         };
     }
     async eth_sendUserOperation(apiVersion, userOperation, entryPoint) {
-        const hash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.chainId);
+        const hash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.config.publicClient.chain.id);
         this.eventManager.emitReceived(hash);
         let status = "rejected";
         try {
@@ -317,18 +325,18 @@ class RpcHandler {
             abi: types_1.EntryPointV06Abi,
             name: "UserOperationEvent"
         });
-        let fromBlock = undefined;
-        let toBlock = undefined;
-        if (this.rpcMaxBlockRange !== undefined) {
-            const latestBlock = await this.publicClient.getBlockNumber();
-            fromBlock = latestBlock - BigInt(this.rpcMaxBlockRange);
+        let fromBlock;
+        let toBlock;
+        if (this.config.maxBlockRange !== undefined) {
+            const latestBlock = await this.config.publicClient.getBlockNumber();
+            fromBlock = latestBlock - BigInt(this.config.maxBlockRange);
             if (fromBlock < 0n) {
                 fromBlock = 0n;
             }
             toBlock = "latest";
         }
-        const filterResult = await this.publicClient.getLogs({
-            address: this.entryPoints,
+        const filterResult = await this.config.publicClient.getLogs({
+            address: this.config.entrypoints,
             event: userOperationEventAbiItem,
             fromBlock,
             toBlock,
@@ -347,7 +355,9 @@ class RpcHandler {
         }
         const getTransaction = async (txHash) => {
             try {
-                return await this.publicClient.getTransaction({ hash: txHash });
+                return await this.config.publicClient.getTransaction({
+                    hash: txHash
+                });
             }
             catch (e) {
                 if (e instanceof viem_1.TransactionNotFoundError) {
@@ -454,11 +464,11 @@ class RpcHandler {
     }
     async pimlico_getUserOperationGasPrice() {
         let { maxFeePerGas, maxPriorityFeePerGas } = await this.gasPriceManager.getGasPrice();
-        if (this.chainType === "hedera") {
+        if (this.config.chainType === "hedera") {
             maxFeePerGas /= 10n ** 9n;
             maxPriorityFeePerGas /= 10n ** 9n;
         }
-        const { slow, standard, fast } = this.gasPriceMultipliers;
+        const { slow, standard, fast } = this.config.gasPriceMultipliers;
         return {
             slow: {
                 maxFeePerGas: (maxFeePerGas * slow) / 100n,
@@ -478,7 +488,7 @@ class RpcHandler {
     async addToMempoolIfValid(op, entryPoint, apiVersion) {
         this.ensureEntryPointIsSupported(entryPoint);
         const userOperation = (0, types_1.deriveUserOperation)(op);
-        const opHash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.chainId);
+        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);
         const [, userOperationNonceValue] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
@@ -499,11 +509,11 @@ class RpcHandler {
         }
         if (userOperationNonceValue ===
             currentNonceValue + BigInt(queuedUserOperations.length)) {
-            if (this.dangerousSkipUserOperationValidation) {
+            if (this.config.dangerousSkipUserOperationValidation) {
                 const [success, errorReason] = this.mempool.add(op, entryPoint);
                 if (!success) {
                     this.eventManager.emitFailedValidation(opHash, errorReason, (0, utils_1.getAAError)(errorReason));
-                    throw new types_1.RpcError(`UserOperation reverted during simulation with reason: ${errorReason}`, types_1.ValidationErrors.InvalidFields);
+                    throw new types_1.RpcError(errorReason, types_1.ValidationErrors.InvalidFields);
                 }
             }
             else {
@@ -516,7 +526,7 @@ class RpcHandler {
                 const [success, errorReason] = this.mempool.add(op, entryPoint, validationResult.referencedContracts);
                 if (!success) {
                     this.eventManager.emitFailedValidation(opHash, errorReason, (0, utils_1.getAAError)(errorReason));
-                    throw new types_1.RpcError(`UserOperation reverted during simulation with reason: ${errorReason}`, types_1.ValidationErrors.InvalidFields);
+                    throw new types_1.RpcError(errorReason, types_1.ValidationErrors.InvalidFields);
                 }
                 return "added";
             }
@@ -525,11 +535,11 @@ class RpcHandler {
         return "queued";
     }
     async pimlico_sendUserOperationNow(apiVersion, userOperation, entryPoint) {
-        if (!this.enableInstantBundlingEndpoint) {
+        if (!this.config.enableInstantBundlingEndpoint) {
             throw new types_1.RpcError("pimlico_sendUserOperationNow endpoint is not enabled", types_1.ValidationErrors.InvalidFields);
         }
         this.ensureEntryPointIsSupported(entryPoint);
-        const opHash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.chainId);
+        const opHash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.config.publicClient.chain.id);
         await this.preMempoolChecks(opHash, userOperation, apiVersion, entryPoint);
         const result = (await this.executor.bundle(entryPoint, [userOperation]))[0];
         if (result.status === "failure") {
@@ -550,8 +560,9 @@ class RpcHandler {
             throw new types_1.RpcError(`userOperation reverted during simulation with reason: ${error.reason}`);
         }
         const res = result;
+        this.executor.markWalletProcessed(res.value.transactionInfo.executor);
         // wait for receipt
-        const receipt = await this.publicClient.waitForTransactionReceipt({
+        const receipt = await this.config.publicClient.waitForTransactionReceipt({
             hash: res.value.transactionInfo.transactionHash,
             pollingInterval: 100
         });
@@ -563,7 +574,7 @@ class RpcHandler {
         let status = "rejected";
         try {
             const { inflatedOp, inflatorId } = await this.validateAndInflateCompressedUserOperation(inflatorAddress, compressedCalldata);
-            const hash = (0, utils_1.getUserOperationHash)(inflatedOp, entryPoint, this.chainId);
+            const hash = (0, utils_1.getUserOperationHash)(inflatedOp, entryPoint, this.config.publicClient.chain.id);
             this.eventManager.emitReceived(hash, receivedTimestamp);
             const compressedUserOp = {
                 compressedCalldata,
@@ -593,7 +604,7 @@ class RpcHandler {
         if (this.compressionHandler === null) {
             throw new types_1.RpcError("Endpoint not supported");
         }
-        const inflatorId = await this.compressionHandler.getInflatorRegisteredId(inflatorAddress, this.publicClient);
+        const inflatorId = await this.compressionHandler.getInflatorRegisteredId(inflatorAddress, this.config.publicClient);
         if (inflatorId === 0) {
             throw new types_1.RpcError(`Inflator ${inflatorAddress} is not registered`, types_1.ValidationErrors.InvalidFields);
         }
@@ -602,7 +613,7 @@ class RpcHandler {
             address: inflatorAddress,
             abi: types_1.IOpInflatorAbi,
             client: {
-                public: this.publicClient
+                public: this.config.publicClient
             }
         });
         let inflatedOp;
@@ -628,7 +639,7 @@ class RpcHandler {
                 ? types_1.EntryPointV06Abi
                 : types_1.EntryPointV07Abi,
             client: {
-                public: this.publicClient
+                public: this.config.publicClient
             }
         });
         const [nonceKey] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);