@pimlico/alto 0.0.0-staging.20240606T093925 → 0.0.0-staging.20240606T095015

package/lib/rpc/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../rpc/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,+CAA4B;AAC5B,2CAAwB;AACxB,+CAA4B;AAC5B,gDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../rpc/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,UAAU,CAAA;AACxB,cAAc,cAAc,CAAA;AAC5B,cAAc,eAAe,CAAA"}

package/lib/rpc/nonceQueuer.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NonceQueuer = void 0;
-const types_1 = require("../types/index.js");
-const utils_1 = require("../utils/index.js");
-const viem_1 = require("viem");
-class NonceQueuer {
+import { EntryPointV06Abi, deriveUserOperation, EntryPointV07Abi } from "../types/index.js";
+import { getNonceKeyAndValue, getUserOperationHash, isVersion06 } from "../utils/index.js";
+import { getContract } from "viem";
+export class NonceQueuer {
     queuedUserOperations = [];
     mempool;
     publicClient;
@@ -40,11 +37,11 @@ class NonceQueuer {
         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);
-        const [nonceKey, nonceValue] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
+        const userOperation = deriveUserOperation(mempoolUserOperation);
+        const [nonceKey, nonceValue] = getNonceKeyAndValue(userOperation.nonce);
         this.queuedUserOperations.push({
             entryPoint,
-            userOperationHash: (0, utils_1.getUserOperationHash)((0, types_1.deriveUserOperation)(mempoolUserOperation), entryPoint, this.publicClient.chain.id),
+            userOperationHash: getUserOperationHash(deriveUserOperation(mempoolUserOperation), entryPoint, this.publicClient.chain.id),
             mempoolUserOperation: mempoolUserOperation,
             nonceKey: nonceKey,
             nonceValue: nonceValue,
@@ -68,11 +65,11 @@ class NonceQueuer {
         try {
             results = await publicClient.multicall({
                 contracts: queuedUserOperations.map((qop) => {
-                    const userOperation = (0, types_1.deriveUserOperation)(qop.mempoolUserOperation);
-                    const isUserOpV06 = (0, utils_1.isVersion06)(userOperation);
+                    const userOperation = deriveUserOperation(qop.mempoolUserOperation);
+                    const isUserOpV06 = isVersion06(userOperation);
                     return {
                         address: qop.entryPoint,
-                        abi: isUserOpV06 ? types_1.EntryPointV06Abi : types_1.EntryPointV07Abi,
+                        abi: isUserOpV06 ? EntryPointV06Abi : EntryPointV07Abi,
                         functionName: "getNonce",
                         args: [userOperation.sender, qop.nonceKey]
                     };
@@ -83,19 +80,19 @@ 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 = deriveUserOperation(qop.mempoolUserOperation);
                 try {
-                    const isUserOpV06 = (0, utils_1.isVersion06)(userOperation);
+                    const isUserOpV06 = isVersion06(userOperation);
                     const entryPointContract = isUserOpV06
-                        ? (0, viem_1.getContract)({
-                            abi: types_1.EntryPointV06Abi,
+                        ? getContract({
+                            abi: EntryPointV06Abi,
                             address: qop.entryPoint,
                             client: {
                                 public: publicClient
                             }
                         })
-                        : (0, viem_1.getContract)({
-                            abi: types_1.EntryPointV07Abi,
+                        : getContract({
+                            abi: EntryPointV07Abi,
                             address: qop.entryPoint,
                             client: {
                                 public: publicClient
@@ -135,5 +132,4 @@ class NonceQueuer {
         return currentOutstandingOps;
     }
 }
-exports.NonceQueuer = NonceQueuer;
 //# sourceMappingURL=nonceQueuer.js.map

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.js

@@ -1,36 +1,10 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcHandler = void 0;
-const types_1 = require("../types/index.js");
-const utils_1 = require("../utils/index.js");
-const viem_1 = require("viem");
-const chains = __importStar(require("viem/chains"));
-const zod_1 = require("zod");
-const zod_validation_error_1 = require("zod-validation-error");
-class RpcHandler {
+import { EntryPointV06Abi, EntryPointV07Abi, IOpInflatorAbi, RpcError, ValidationErrors, bundlerGetStakeStatusResponseSchema, deriveUserOperation, logSchema, receiptSchema } from "../types/index.js";
+import { calcPreVerificationGas, calcVerificationGasAndCallGasLimit, getNonceKeyAndValue, getUserOperationHash, isVersion06, isVersion07, maxBigInt, toUnpackedUserOperation } from "../utils/index.js";
+import { TransactionNotFoundError, TransactionReceiptNotFoundError, decodeFunctionData, getAbiItem, getAddress, getContract, encodeEventTopics, zeroAddress, decodeEventLog, parseAbi } from "viem";
+import * as chains from "viem/chains";
+import { z } from "zod";
+import { fromZodError } from "zod-validation-error";
+export class RpcHandler {
     entryPoints;
     publicClient;
     validator;
@@ -181,9 +155,9 @@ class RpcHandler {
             throw new Error(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
         }
         if (userOperation.maxFeePerGas === 0n) {
-            throw new types_1.RpcError("user operation max fee per gas must be larger than 0 during gas estimation");
+            throw new 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)) *
+        const preVerificationGas = ((await calcPreVerificationGas(this.publicClient, userOperation, entryPoint, this.chainId, this.chainType, this.gasPriceManager, false)) *
             110n) /
             100n;
         userOperation.preVerificationGas = 1000000n;
@@ -197,7 +171,7 @@ class RpcHandler {
             userOperation.verificationGasLimit = 1000000n;
             userOperation.callGasLimit = 1000000n;
         }
-        if ((0, utils_1.isVersion07)(userOperation)) {
+        if (isVersion07(userOperation)) {
             userOperation.paymasterPostOpGasLimit = 2000000n;
             userOperation.paymasterVerificationGasLimit = 5000000n;
         }
@@ -210,27 +184,27 @@ class RpcHandler {
         // 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] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
+        const [, userOperationNonceValue] = getNonceKeyAndValue(userOperation.nonce);
         let queuedUserOperations = [];
         if (userOperationNonceValue < currentNonceValue) {
-            throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+            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 ((0, utils_1.isVersion06)(userOperation)) {
-                throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+            if (isVersion06(userOperation)) {
+                throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
             }
             queuedUserOperations = await this.mempool.getQueuedUserOperations(userOperation, entryPoint, currentNonceValue);
             if (userOperationNonceValue >
                 currentNonceValue + BigInt(queuedUserOperations.length)) {
-                throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+                throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", 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);
+        let { verificationGasLimit, callGasLimit } = calcVerificationGasAndCallGasLimit(userOperation, executionResult.data.executionResult, this.chainId, executionResult.data.callDataResult);
         let paymasterVerificationGasLimit = 0n;
         let paymasterPostOpGasLimit = 0n;
-        if ((0, utils_1.isVersion07)(userOperation) &&
+        if (isVersion07(userOperation) &&
             userOperation.paymaster !== null &&
             "paymasterVerificationGasLimit" in
                 executionResult.data.executionResult &&
@@ -253,12 +227,12 @@ class RpcHandler {
         }
         if (this.chainId === chains.base.id ||
             this.chainId === chains.optimism.id) {
-            callGasLimit = (0, utils_1.maxBigInt)(callGasLimit, 120000n);
+            callGasLimit = maxBigInt(callGasLimit, 120000n);
         }
         if (userOperation.callData === "0x") {
             callGasLimit = 0n;
         }
-        if ((0, utils_1.isVersion07)(userOperation)) {
+        if (isVersion07(userOperation)) {
             return {
                 preVerificationGas,
                 verificationGasLimit,
@@ -285,7 +259,7 @@ class RpcHandler {
         let status = "rejected";
         try {
             status = await this.addToMempoolIfValid(userOperation, entryPoint, apiVersion);
-            const hash = (0, utils_1.getUserOperationHash)(userOperation, entryPoint, this.chainId);
+            const hash = getUserOperationHash(userOperation, entryPoint, this.chainId);
             return hash;
         }
         catch (error) {
@@ -302,8 +276,8 @@ class RpcHandler {
         }
     }
     async eth_getUserOperationByHash(userOperationHash) {
-        const userOperationEventAbiItem = (0, viem_1.getAbiItem)({
-            abi: types_1.EntryPointV06Abi,
+        const userOperationEventAbiItem = getAbiItem({
+            abi: EntryPointV06Abi,
             name: "UserOperationEvent"
         });
         let fromBlock = undefined;
@@ -339,7 +313,7 @@ class RpcHandler {
                 return await this.publicClient.getTransaction({ hash: txHash });
             }
             catch (e) {
-                if (e instanceof viem_1.TransactionNotFoundError) {
+                if (e instanceof TransactionNotFoundError) {
                     return getTransaction(txHash);
                 }
                 throw e;
@@ -351,8 +325,8 @@ class RpcHandler {
         }
         let op = undefined;
         try {
-            const decoded = (0, viem_1.decodeFunctionData)({
-                abi: types_1.EntryPointV06Abi,
+            const decoded = decodeFunctionData({
+                abi: EntryPointV06Abi,
                 data: tx.input
             });
             if (decoded.functionName !== "handleOps") {
@@ -369,8 +343,8 @@ class RpcHandler {
             return null;
         }
         const result = {
-            userOperation: (0, utils_1.isVersion06)(op) ? op : (0, utils_1.toUnpackedUserOperation)(op),
-            entryPoint: (0, viem_1.getAddress)(tx.to),
+            userOperation: isVersion06(op) ? op : toUnpackedUserOperation(op),
+            entryPoint: getAddress(tx.to),
             transactionHash: txHash,
             blockHash: tx.blockHash ?? "0x",
             blockNumber: BigInt(tx.blockNumber ?? 0n)
@@ -378,8 +352,8 @@ class RpcHandler {
         return result;
     }
     async eth_getUserOperationReceipt(userOperationHash) {
-        const userOperationEventAbiItem = (0, viem_1.getAbiItem)({
-            abi: types_1.EntryPointV06Abi,
+        const userOperationEventAbiItem = getAbiItem({
+            abi: EntryPointV06Abi,
             name: "UserOperationEvent"
         });
         let fromBlock = undefined;
@@ -428,7 +402,7 @@ class RpcHandler {
                     });
                 }
                 catch (e) {
-                    if (e instanceof viem_1.TransactionReceiptNotFoundError) {
+                    if (e instanceof TransactionReceiptNotFoundError) {
                         continue;
                     }
                     throw e;
@@ -446,13 +420,13 @@ class RpcHandler {
             // transaction pending
             return null;
         }
-        const userOperationRevertReasonAbi = (0, viem_1.parseAbi)([
+        const userOperationRevertReasonAbi = parseAbi([
             "event UserOperationRevertReason(bytes32 indexed userOpHash, address indexed sender, uint256 nonce, bytes revertReason)"
         ]);
-        const userOperationRevertReasonTopicEvent = (0, viem_1.encodeEventTopics)({
+        const userOperationRevertReasonTopicEvent = encodeEventTopics({
             abi: userOperationRevertReasonAbi
         })[0];
-        let entryPoint = viem_1.zeroAddress;
+        let entryPoint = zeroAddress;
         let revertReason = undefined;
         let startIndex = -1;
         let endIndex = -1;
@@ -473,7 +447,7 @@ class RpcHandler {
                 // process UserOperationRevertReason
                 if (log.topics[1] === userOperationEvent.topics[1]) {
                     // it's our userOpHash. capture revert reason.
-                    const decodedLog = (0, viem_1.decodeEventLog)({
+                    const decodedLog = decodeEventLog({
                         abi: userOperationRevertReasonAbi,
                         data: log.data,
                         topics: log.topics
@@ -486,21 +460,21 @@ class RpcHandler {
             throw new Error("fatal: no UserOperationEvent in logs");
         }
         const filteredLogs = logs.slice(startIndex + 1, endIndex);
-        const logsParsing = zod_1.z.array(types_1.logSchema).safeParse(filteredLogs);
+        const logsParsing = z.array(logSchema).safeParse(filteredLogs);
         if (!logsParsing.success) {
-            const err = (0, zod_validation_error_1.fromZodError)(logsParsing.error);
+            const err = fromZodError(logsParsing.error);
             throw err;
         }
-        const receiptParsing = types_1.receiptSchema.safeParse({
+        const receiptParsing = receiptSchema.safeParse({
             ...receipt,
             status: receipt.status === "success" ? 1 : 0
         });
         if (!receiptParsing.success) {
-            const err = (0, zod_validation_error_1.fromZodError)(receiptParsing.error);
+            const err = fromZodError(receiptParsing.error);
             throw err;
         }
         let paymaster = userOperationEvent.args.paymaster;
-        paymaster = paymaster === viem_1.zeroAddress ? undefined : paymaster;
+        paymaster = paymaster === zeroAddress ? undefined : paymaster;
         const userOperationReceipt = {
             userOpHash: userOperationHash,
             entryPoint,
@@ -518,7 +492,7 @@ class RpcHandler {
     }
     debug_bundler_clearState() {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_clearState is only available in development environment");
+            throw new RpcError("debug_bundler_clearState is only available in development environment");
         }
         this.mempool.clear();
         this.reputationManager.clear();
@@ -526,7 +500,7 @@ class RpcHandler {
     }
     debug_bundler_clearMempool() {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_clearMempool is only available in development environment");
+            throw new RpcError("debug_bundler_clearMempool is only available in development environment");
         }
         this.mempool.clear();
         this.reputationManager.clearEntityCount();
@@ -534,53 +508,53 @@ class RpcHandler {
     }
     async debug_bundler_dumpMempool(entryPoint) {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_dumpMempool is only available in development environment");
+            throw new RpcError("debug_bundler_dumpMempool is only available in development environment");
         }
         if (!this.entryPoints.includes(entryPoint)) {
-            throw new types_1.RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
+            throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
         }
         return this.mempool
             .dumpOutstanding()
-            .map((userOpInfo) => (0, types_1.deriveUserOperation)(userOpInfo.mempoolUserOperation));
+            .map((userOpInfo) => deriveUserOperation(userOpInfo.mempoolUserOperation));
     }
     async debug_bundler_sendBundleNow() {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_sendBundleNow is only available in development environment");
+            throw new RpcError("debug_bundler_sendBundleNow is only available in development environment");
         }
         const transactions = await this.executorManager.bundleNow();
         return transactions[0];
     }
     debug_bundler_setBundlingMode(bundlingMode) {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_setBundlingMode is only available in development environment");
+            throw new RpcError("debug_bundler_setBundlingMode is only available in development environment");
         }
         this.executorManager.setBundlingMode(bundlingMode);
         return "ok";
     }
     debug_bundler_dumpReputation(entryPoint) {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_setRe is only available in development environment");
+            throw new RpcError("debug_bundler_setRe is only available in development environment");
         }
         if (!this.entryPoints.includes(entryPoint)) {
-            throw new types_1.RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
+            throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
         }
         return this.reputationManager.dumpReputations(entryPoint);
     }
     async debug_bundler_getStakeStatus(address, entryPoint) {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_getStakeStatus is only available in development environment");
+            throw new RpcError("debug_bundler_getStakeStatus is only available in development environment");
         }
         if (!this.entryPoints.includes(entryPoint)) {
-            throw new types_1.RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
+            throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
         }
-        return types_1.bundlerGetStakeStatusResponseSchema.parse({
+        return bundlerGetStakeStatusResponseSchema.parse({
             method: "debug_bundler_getStakeStatus",
             result: await this.reputationManager.getStakeStatus(entryPoint, address)
         }).result;
     }
     debug_bundler_setReputation(args) {
         if (!this.enableDebugEndpoints) {
-            throw new types_1.RpcError("debug_bundler_setReputation is only available in development environment");
+            throw new RpcError("debug_bundler_setReputation is only available in development environment");
         }
         this.reputationManager.setReputation(args[1], args[0]);
         return "ok";
@@ -608,15 +582,15 @@ class RpcHandler {
     }
     // check if we want to bundle userOperation. If yes, add to mempool
     async addToMempoolIfValid(op, entryPoint, apiVersion) {
-        const userOperation = (0, types_1.deriveUserOperation)(op);
+        const userOperation = deriveUserOperation(op);
         if (!this.entryPoints.includes(entryPoint)) {
-            throw new types_1.RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
+            throw new RpcError(`EntryPoint ${entryPoint} not supported, supported EntryPoints: ${this.entryPoints.join(", ")}`);
         }
         if (this.chainId === chains.celoAlfajores.id ||
             this.chainId === chains.celo.id) {
             if (userOperation.maxFeePerGas !==
                 userOperation.maxPriorityFeePerGas) {
-                throw new types_1.RpcError("maxPriorityFeePerGas must equal maxFeePerGas on Celo chains");
+                throw new RpcError("maxPriorityFeePerGas must equal maxFeePerGas on Celo chains");
             }
         }
         if (apiVersion !== "v1") {
@@ -626,24 +600,24 @@ class RpcHandler {
             });
         }
         if (userOperation.verificationGasLimit < 10000n) {
-            throw new types_1.RpcError("verificationGasLimit must be at least 10000");
+            throw new RpcError("verificationGasLimit must be at least 10000");
         }
         this.logger.trace({ userOperation, entryPoint }, "beginning validation");
         if (userOperation.preVerificationGas === 0n ||
             userOperation.verificationGasLimit === 0n) {
-            throw new types_1.RpcError("user operation gas limits must be larger than 0");
+            throw new RpcError("user operation gas limits must be larger than 0");
         }
         const currentNonceValue = await this.getNonceValue(userOperation, entryPoint);
-        const [, userOperationNonceValue] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
+        const [, userOperationNonceValue] = getNonceKeyAndValue(userOperation.nonce);
         if (userOperationNonceValue < currentNonceValue) {
-            throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+            throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
         }
         if (userOperationNonceValue > currentNonceValue + 10n) {
-            throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+            throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
         }
         let queuedUserOperations = [];
         if (userOperationNonceValue > currentNonceValue &&
-            (0, utils_1.isVersion07)(userOperation)) {
+            isVersion07(userOperation)) {
             queuedUserOperations = await this.mempool.getQueuedUserOperations(userOperation, entryPoint, currentNonceValue);
         }
         if (userOperationNonceValue ===
@@ -651,7 +625,7 @@ class RpcHandler {
             if (this.dangerousSkipUserOperationValidation) {
                 const success = this.mempool.add(op, entryPoint);
                 if (!success) {
-                    throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+                    throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
                 }
             }
             else {
@@ -663,7 +637,7 @@ class RpcHandler {
                 await this.mempool.checkEntityMultipleRoleViolation(userOperation);
                 const success = this.mempool.add(op, entryPoint, validationResult.referencedContracts);
                 if (!success) {
-                    throw new types_1.RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", types_1.ValidationErrors.InvalidFields);
+                    throw new RpcError("UserOperation reverted during simulation with reason: AA25 invalid account nonce", ValidationErrors.InvalidFields);
                 }
                 return "added";
             }
@@ -683,7 +657,7 @@ class RpcHandler {
             };
             // check userOps inputs.
             status = await this.addToMempoolIfValid(compressedUserOp, entryPoint, apiVersion);
-            const hash = (0, utils_1.getUserOperationHash)(inflatedOp, entryPoint, this.chainId);
+            const hash = getUserOperationHash(inflatedOp, entryPoint, this.chainId);
             return hash;
         }
         catch (error) {
@@ -702,16 +676,16 @@ class RpcHandler {
     async validateAndInflateCompressedUserOperation(inflatorAddress, compressedCalldata) {
         // check if inflator is registered with our PerOpInflator.
         if (this.compressionHandler === null) {
-            throw new types_1.RpcError("Endpoint not supported");
+            throw new RpcError("Endpoint not supported");
         }
         const inflatorId = await this.compressionHandler.getInflatorRegisteredId(inflatorAddress, this.publicClient);
         if (inflatorId === 0) {
-            throw new types_1.RpcError(`Inflator ${inflatorAddress} is not registered`, types_1.ValidationErrors.InvalidFields);
+            throw new RpcError(`Inflator ${inflatorAddress} is not registered`, ValidationErrors.InvalidFields);
         }
         // infalte + start to validate user op.
-        const inflatorContract = (0, viem_1.getContract)({
+        const inflatorContract = getContract({
             address: inflatorAddress,
-            abi: types_1.IOpInflatorAbi,
+            abi: IOpInflatorAbi,
             client: {
                 public: this.publicClient
             }
@@ -723,32 +697,31 @@ class RpcHandler {
             ]);
         }
         catch (e) {
-            throw new types_1.RpcError(`Inflator ${inflatorAddress} failed to inflate calldata ${compressedCalldata}, due to ${e}`, types_1.ValidationErrors.InvalidFields);
+            throw new RpcError(`Inflator ${inflatorAddress} failed to inflate calldata ${compressedCalldata}, due to ${e}`, ValidationErrors.InvalidFields);
         }
         // check if perUseropIsRegisterd to target BundleBulker
         const perOpInflatorId = this.compressionHandler.perOpInflatorId;
         if (perOpInflatorId === 0) {
-            throw new types_1.RpcError(`PerUserOp ${this.compressionHandler.perOpInflatorAddress} has not been registered with BundelBulker`, types_1.ValidationErrors.InvalidFields);
+            throw new RpcError(`PerUserOp ${this.compressionHandler.perOpInflatorAddress} has not been registered with BundelBulker`, ValidationErrors.InvalidFields);
         }
         return { inflatedOp, inflatorId };
     }
     async getNonceValue(userOperation, entryPoint) {
-        const entryPointContract = (0, viem_1.getContract)({
+        const entryPointContract = getContract({
             address: entryPoint,
-            abi: (0, utils_1.isVersion06)(userOperation)
-                ? types_1.EntryPointV06Abi
-                : types_1.EntryPointV07Abi,
+            abi: isVersion06(userOperation)
+                ? EntryPointV06Abi
+                : EntryPointV07Abi,
             client: {
                 public: this.publicClient
             }
         });
-        const [nonceKey] = (0, utils_1.getNonceKeyAndValue)(userOperation.nonce);
+        const [nonceKey] = getNonceKeyAndValue(userOperation.nonce);
         const getNonceResult = await entryPointContract.read.getNonce([userOperation.sender, nonceKey], {
             blockTag: "latest"
         });
-        const [_, currentNonceValue] = (0, utils_1.getNonceKeyAndValue)(getNonceResult);
+        const [_, currentNonceValue] = getNonceKeyAndValue(getNonceResult);
         return currentNonceValue;
     }
 }
-exports.RpcHandler = RpcHandler;
 //# sourceMappingURL=rpcHandler.js.map