@pimlico/alto 0.0.0-main.20250214T151652 → 0.0.0-main.20250225T152738

package/lib/types/schemas.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.receiptSchema = exports.logSchema = exports.hexDataSchema = exports.hexData32Schema = exports.addressSchema = exports.bundlerResponseSchema = exports.pimlicoGetUserOperationGasPriceResponseSchema = exports.pimlicoGetUserOperationStatusResponseSchema = exports.bundlerDumpReputationsResponseSchema = exports.bundlerSetReputationsResponseSchema = exports.bundlerSetBundlingModeResponseSchema = exports.bundlerSendBundleNowResponseSchema = exports.bundlerGetStakeStatusResponseSchema = exports.bundlerDumpMempoolResponseSchema = exports.bundlerClearMempoolResponseSchema = exports.bundlerClearStateResponseSchema = exports.userOperationSchema = exports.jsonRpcResultSchema = exports.jsonRpcSchema = exports.bundlerRequestSchema = exports.pimlicoGetUserOperationGasPriceRequestSchema = exports.pimlicoGetUserOperationStatusRequestSchema = exports.pimlicoGetStakeStatusRequestSchema = exports.bundlerDumpReputationsRequestSchema = exports.bundlerSetReputationsRequestSchema = exports.bundlerSetBundlingModeRequestSchema = exports.bundlerSendBundleNowRequestSchema = exports.bundlerDumpMempoolRequestSchema = exports.bundlerClearMempoolRequestSchema = exports.bundlerClearStateRequestSchema = exports.altoVersions = exports.hexNumberSchema = exports.commaSeperatedAddressPattern = exports.hexData32Pattern = void 0;
+exports.bundlerRpcSchema = exports.bundlerRequestSchema = exports.altoVersions = exports.pimlicoExperimentalSendUserOperation7702Schema = exports.pimlicoExperimentalEstimateUserOperationGas7702Schema = exports.pimlicoSendUserOperationNowSchema = exports.pimlicoGetUserOperationGasPriceSchema = exports.pimlicoGetUserOperationStatusSchema = exports.debugGetStakeStatusSchema = exports.debugClearReputationSchema = exports.debugDumpReputationSchema = exports.debugSetReputationSchema = exports.debugSetBundlingModeSchema = exports.debugSendBundleNowSchema = exports.debugDumpMempoolSchema = exports.debugClearMempoolSchema = exports.debugClearStateSchema = exports.getUserOperationReceiptSchema = exports.getUserOperationByHashSchema = exports.sendUserOperationSchema = exports.estimateUserOperationGasSchema = exports.supportedEntryPointsSchema = exports.chainIdSchema = exports.receiptSchema = exports.logSchema = exports.jsonRpcSchema = exports.stateOverridesSchema = exports.hexData32Schema = exports.hexDataSchema = exports.hexNumberSchema = exports.addressSchema = exports.commaSeperatedAddressPattern = exports.hexData32Pattern = void 0;
 const viem_1 = require("viem");
 const zod_1 = require("zod");
 const hexDataPattern = /^0x[0-9A-Fa-f]*$/;
 const addressPattern = /^0x[0-9,a-f,A-F]{40}$/;
 exports.hexData32Pattern = /^0x([0-9a-fA-F][0-9a-fA-F]){32}$/;
 exports.commaSeperatedAddressPattern = /^(0x[0-9a-fA-F]{40})(,\s*(0x[0-9a-fA-F]{40}))*$/;
-const addressSchema = zod_1.z
+exports.addressSchema = zod_1.z
     .string()
     .regex(addressPattern, { message: "not a valid hex address" })
     .transform((val) => (0, viem_1.getAddress)(val));
-exports.addressSchema = addressSchema;
 exports.hexNumberSchema = zod_1.z
     .string()
     .regex(hexDataPattern)
@@ -21,38 +20,43 @@ exports.hexNumberSchema = zod_1.z
     .refine((val) => val <= viem_1.maxUint256, {
     message: "not a valid uint256"
 });
-const hexDataSchema = zod_1.z
+exports.hexDataSchema = zod_1.z
     .string()
     .regex(hexDataPattern, { message: "not valid hex data" })
     .transform((val) => val);
-exports.hexDataSchema = hexDataSchema;
-const hexData32Schema = zod_1.z
+exports.hexData32Schema = zod_1.z
     .string()
     .regex(exports.hexData32Pattern, { message: "not valid 32-byte hex data" })
     .transform((val) => val);
-exports.hexData32Schema = hexData32Schema;
+exports.stateOverridesSchema = zod_1.z.record(exports.addressSchema, zod_1.z.object({
+    balance: exports.hexNumberSchema.optional(),
+    nonce: exports.hexNumberSchema.optional(),
+    code: exports.hexDataSchema.optional(),
+    state: zod_1.z.record(exports.hexData32Schema, exports.hexData32Schema).optional(),
+    stateDiff: zod_1.z.record(exports.hexData32Schema, exports.hexData32Schema).optional()
+}));
 const signedAuthorizationSchema = zod_1.z.object({
-    contractAddress: addressSchema,
+    contractAddress: exports.addressSchema,
     chainId: exports.hexNumberSchema.transform((val) => Number(val)),
     nonce: exports.hexNumberSchema.transform((val) => Number(val)),
-    r: hexData32Schema.transform((val) => val),
-    s: hexData32Schema.transform((val) => val),
+    r: exports.hexData32Schema.transform((val) => val),
+    s: exports.hexData32Schema.transform((val) => val),
     v: exports.hexNumberSchema,
     yParity: exports.hexNumberSchema.transform((val) => Number(val))
 });
 const userOperationV06Schema = zod_1.z
     .object({
-    sender: addressSchema,
+    sender: exports.addressSchema,
     nonce: exports.hexNumberSchema,
-    initCode: hexDataSchema,
-    callData: hexDataSchema,
+    initCode: exports.hexDataSchema,
+    callData: exports.hexDataSchema,
     callGasLimit: exports.hexNumberSchema,
     verificationGasLimit: exports.hexNumberSchema,
     preVerificationGas: exports.hexNumberSchema,
     maxPriorityFeePerGas: exports.hexNumberSchema,
     maxFeePerGas: exports.hexNumberSchema,
-    paymasterAndData: hexDataSchema,
-    signature: hexDataSchema,
+    paymasterAndData: exports.hexDataSchema,
+    signature: exports.hexDataSchema,
     eip7702auth: signedAuthorizationSchema.optional().nullable()
 })
     .strict()
@@ -61,23 +65,23 @@ const userOperationV06Schema = zod_1.z
 });
 const userOperationV07Schema = zod_1.z
     .object({
-    sender: addressSchema,
+    sender: exports.addressSchema,
     nonce: exports.hexNumberSchema,
-    factory: addressSchema
+    factory: exports.addressSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    factoryData: hexDataSchema
+    factoryData: exports.hexDataSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    callData: hexDataSchema,
+    callData: exports.hexDataSchema,
     callGasLimit: exports.hexNumberSchema,
     verificationGasLimit: exports.hexNumberSchema,
     preVerificationGas: exports.hexNumberSchema,
     maxFeePerGas: exports.hexNumberSchema,
     maxPriorityFeePerGas: exports.hexNumberSchema,
-    paymaster: addressSchema
+    paymaster: exports.addressSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
@@ -89,28 +93,28 @@ const userOperationV07Schema = zod_1.z
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    paymasterData: hexDataSchema
+    paymasterData: exports.hexDataSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    signature: hexDataSchema,
+    signature: exports.hexDataSchema,
     eip7702auth: signedAuthorizationSchema.optional().nullable()
 })
     .strict()
     .transform((val) => val);
 const partialUserOperationV06Schema = zod_1.z
     .object({
-    sender: addressSchema,
+    sender: exports.addressSchema,
     nonce: exports.hexNumberSchema,
-    initCode: hexDataSchema,
-    callData: hexDataSchema,
+    initCode: exports.hexDataSchema,
+    callData: exports.hexDataSchema,
     callGasLimit: exports.hexNumberSchema.default(1n),
     verificationGasLimit: exports.hexNumberSchema.default(1n),
     preVerificationGas: exports.hexNumberSchema.default(1n),
     maxPriorityFeePerGas: exports.hexNumberSchema.default(1n),
     maxFeePerGas: exports.hexNumberSchema.default(1n),
-    paymasterAndData: hexDataSchema,
-    signature: hexDataSchema,
+    paymasterAndData: exports.hexDataSchema,
+    signature: exports.hexDataSchema,
     eip7702auth: signedAuthorizationSchema.optional()
 })
     .strict()
@@ -119,23 +123,23 @@ const partialUserOperationV06Schema = zod_1.z
 });
 const partialUserOperationV07Schema = zod_1.z
     .object({
-    sender: addressSchema,
+    sender: exports.addressSchema,
     nonce: exports.hexNumberSchema,
-    factory: addressSchema
+    factory: exports.addressSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    factoryData: hexDataSchema
+    factoryData: exports.hexDataSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    callData: hexDataSchema,
+    callData: exports.hexDataSchema,
     callGasLimit: exports.hexNumberSchema.default(1n),
     verificationGasLimit: exports.hexNumberSchema.default(1n),
     preVerificationGas: exports.hexNumberSchema.default(1n),
     maxFeePerGas: exports.hexNumberSchema.default(1n),
     maxPriorityFeePerGas: exports.hexNumberSchema.default(1n),
-    paymaster: addressSchema
+    paymaster: exports.addressSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
@@ -147,26 +151,26 @@ const partialUserOperationV07Schema = zod_1.z
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    paymasterData: hexDataSchema
+    paymasterData: exports.hexDataSchema
         .nullable()
         .optional()
         .transform((val) => val ?? null),
-    signature: hexDataSchema,
+    signature: exports.hexDataSchema,
     eip7702auth: signedAuthorizationSchema.optional().nullable()
 })
     .strict()
     .transform((val) => val);
 const packerUserOperationSchema = zod_1.z
     .object({
-    sender: addressSchema,
+    sender: exports.addressSchema,
     nonce: exports.hexNumberSchema,
-    initCode: hexDataSchema,
-    callData: hexDataSchema,
-    accountGasLimits: hexData32Schema,
+    initCode: exports.hexDataSchema,
+    callData: exports.hexDataSchema,
+    accountGasLimits: exports.hexData32Schema,
     preVerificationGas: exports.hexNumberSchema,
-    gasFees: hexData32Schema,
-    paymasterAndData: hexDataSchema,
-    signature: hexDataSchema
+    gasFees: exports.hexData32Schema,
+    paymasterAndData: exports.hexDataSchema,
+    signature: exports.hexDataSchema
 })
     .strict()
     .transform((val) => val);
@@ -178,8 +182,7 @@ const userOperationSchema = zod_1.z.union([
     userOperationV06Schema,
     userOperationV07Schema
 ]);
-exports.userOperationSchema = userOperationSchema;
-const jsonRpcSchema = zod_1.z
+exports.jsonRpcSchema = zod_1.z
     .object({
     jsonrpc: zod_1.z.literal("2.0"),
     id: zod_1.z.number(),
@@ -190,7 +193,6 @@ const jsonRpcSchema = zod_1.z
         .transform((val) => val ?? [])
 })
     .strict();
-exports.jsonRpcSchema = jsonRpcSchema;
 const jsonRpcResultSchema = zod_1.z
     .object({
     jsonrpc: zod_1.z.literal("2.0"),
@@ -198,169 +200,96 @@ const jsonRpcResultSchema = zod_1.z
     result: zod_1.z.unknown()
 })
     .strict();
-exports.jsonRpcResultSchema = jsonRpcResultSchema;
-const chainIdRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("eth_chainId"),
-    params: zod_1.z.tuple([])
-});
-const supportedEntryPointsRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("eth_supportedEntryPoints"),
-    params: zod_1.z.tuple([])
-});
-const stateOverridesSchema = zod_1.z.record(addressSchema, zod_1.z.object({
-    balance: exports.hexNumberSchema.optional(),
-    nonce: exports.hexNumberSchema.optional(),
-    code: hexDataSchema.optional(),
-    state: zod_1.z.record(hexData32Schema, hexData32Schema).optional(),
-    stateDiff: zod_1.z.record(hexData32Schema, hexData32Schema).optional()
-}));
-const estimateUserOperationGasRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("eth_estimateUserOperationGas"),
-    params: zod_1.z.union([
-        zod_1.z.tuple([partialUserOperationSchema, addressSchema]),
-        zod_1.z.tuple([
-            partialUserOperationSchema,
-            addressSchema,
-            stateOverridesSchema
-        ])
-    ])
-});
-const sendUserOperationRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("eth_sendUserOperation"),
-    params: zod_1.z.tuple([userOperationSchema, addressSchema])
-});
-const getUserOperationByHashRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("eth_getUserOperationByHash"),
-    params: zod_1.z.tuple([
-        zod_1.z
-            .string()
-            .regex(exports.hexData32Pattern, { message: "Missing/invalid userOpHash" })
-            .transform((val) => val)
-    ])
-});
-const getUserOperationReceiptRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("eth_getUserOperationReceipt"),
-    params: zod_1.z.tuple([
-        zod_1.z
-            .string()
-            .regex(exports.hexData32Pattern, { message: "Missing/invalid userOpHash" })
-            .transform((val) => val)
-    ])
-});
-const bundlerClearStateRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_clearState"),
-    params: zod_1.z.tuple([])
-});
-exports.bundlerClearStateRequestSchema = bundlerClearStateRequestSchema;
-const bundlerClearMempoolRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_clearMempool"),
-    params: zod_1.z.tuple([])
-});
-exports.bundlerClearMempoolRequestSchema = bundlerClearMempoolRequestSchema;
-const bundlerDumpMempoolRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_dumpMempool"),
-    params: zod_1.z.tuple([addressSchema])
-});
-exports.bundlerDumpMempoolRequestSchema = bundlerDumpMempoolRequestSchema;
-const bundlerSendBundleNowRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_sendBundleNow"),
-    params: zod_1.z.tuple([])
-});
-exports.bundlerSendBundleNowRequestSchema = bundlerSendBundleNowRequestSchema;
-const bundlerSetBundlingModeRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_setBundlingMode"),
-    params: zod_1.z.tuple([zod_1.z.enum(["manual", "auto"])])
-});
-exports.bundlerSetBundlingModeRequestSchema = bundlerSetBundlingModeRequestSchema;
-const bundlerSetReputationsRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_setReputation"),
-    params: zod_1.z.tuple([
-        zod_1.z.array(zod_1.z.object({
-            address: addressSchema,
-            opsSeen: exports.hexNumberSchema,
-            opsIncluded: exports.hexNumberSchema
-        })),
-        addressSchema
-    ])
-});
-exports.bundlerSetReputationsRequestSchema = bundlerSetReputationsRequestSchema;
-const bundlerDumpReputationsRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_dumpReputation"),
-    params: zod_1.z.tuple([addressSchema])
-});
-exports.bundlerDumpReputationsRequestSchema = bundlerDumpReputationsRequestSchema;
-const bundlerClearReputationRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_clearReputation"),
-    params: zod_1.z.tuple([])
-});
-const pimlicoGetStakeStatusRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_getStakeStatus"),
-    params: zod_1.z.tuple([addressSchema, addressSchema])
-});
-exports.pimlicoGetStakeStatusRequestSchema = pimlicoGetStakeStatusRequestSchema;
-const pimlicoGetUserOperationStatusRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("pimlico_getUserOperationStatus"),
-    params: zod_1.z.tuple([hexData32Schema])
-});
-exports.pimlicoGetUserOperationStatusRequestSchema = pimlicoGetUserOperationStatusRequestSchema;
-const pimlicoGetUserOperationGasPriceRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("pimlico_getUserOperationGasPrice"),
-    params: zod_1.z.tuple([])
+exports.logSchema = zod_1.z.object({
+    //removed: z.boolean().optional(),
+    logIndex: exports.hexNumberSchema,
+    transactionIndex: exports.hexNumberSchema,
+    transactionHash: exports.hexData32Schema,
+    blockHash: exports.hexData32Schema,
+    blockNumber: exports.hexNumberSchema,
+    address: exports.addressSchema,
+    data: exports.hexDataSchema,
+    topics: zod_1.z.array(exports.hexData32Schema)
 });
-exports.pimlicoGetUserOperationGasPriceRequestSchema = pimlicoGetUserOperationGasPriceRequestSchema;
-const pimlicoSendUserOperationNowRequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("pimlico_sendUserOperationNow"),
-    params: zod_1.z.tuple([userOperationSchema, addressSchema])
+exports.receiptSchema = zod_1.z.object({
+    transactionHash: exports.hexData32Schema,
+    transactionIndex: exports.hexNumberSchema,
+    blockHash: exports.hexData32Schema,
+    blockNumber: exports.hexNumberSchema,
+    from: exports.addressSchema,
+    to: exports.addressSchema.or(zod_1.z.null()),
+    cumulativeGasUsed: exports.hexNumberSchema,
+    gasUsed: exports.hexNumberSchema,
+    contractAddress: exports.addressSchema.or(zod_1.z.null()),
+    logs: zod_1.z.array(exports.logSchema),
+    logsBloom: zod_1.z.string().regex(/^0x[0-9a-f]{512}$/),
+    //root: hexData32Schema,
+    status: exports.hexNumberSchema.or(zod_1.z.null()),
+    effectiveGasPrice: exports.hexNumberSchema.nullish()
+    //type: hexNumberSchema
 });
-const pimlicoExperimentalEstimateUserOperationGas7702RequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("pimlico_experimental_estimateUserOperationGas7702"),
-    params: zod_1.z.union([
-        zod_1.z.tuple([partialUserOperationSchema, addressSchema]),
-        zod_1.z.tuple([
-            partialUserOperationSchema,
-            addressSchema,
-            stateOverridesSchema
-        ])
-    ])
+const userOperationReceiptSchema = zod_1.z
+    .object({
+    userOpHash: exports.hexData32Schema,
+    entryPoint: exports.addressSchema,
+    sender: exports.addressSchema,
+    nonce: exports.hexNumberSchema,
+    paymaster: exports.addressSchema.optional(),
+    actualGasCost: exports.hexNumberSchema,
+    actualGasUsed: exports.hexNumberSchema,
+    success: zod_1.z.boolean(),
+    reason: exports.hexDataSchema.optional(), // revert reason
+    logs: zod_1.z.array(exports.logSchema),
+    receipt: exports.receiptSchema
+})
+    .or(zod_1.z.null());
+const userOperationStatus = zod_1.z.object({
+    status: zod_1.z.enum([
+        "not_found",
+        "not_submitted",
+        "submitted",
+        "rejected",
+        "reverted",
+        "included",
+        "failed"
+    ]),
+    transactionHash: exports.hexData32Schema.or(zod_1.z.null())
 });
-const pimlicoExperimentalSendUserOperation7702RequestSchema = zod_1.z.object({
-    method: zod_1.z.literal("pimlico_experimental_sendUserOperation7702"),
-    params: zod_1.z.tuple([userOperationSchema, addressSchema])
+const gasPriceSchema = zod_1.z.object({
+    slow: zod_1.z.object({
+        maxFeePerGas: zod_1.z.bigint(),
+        maxPriorityFeePerGas: zod_1.z.bigint()
+    }),
+    standard: zod_1.z.object({
+        maxFeePerGas: zod_1.z.bigint(),
+        maxPriorityFeePerGas: zod_1.z.bigint()
+    }),
+    fast: zod_1.z.object({
+        maxFeePerGas: zod_1.z.bigint(),
+        maxPriorityFeePerGas: zod_1.z.bigint()
+    })
 });
-exports.altoVersions = zod_1.z.enum(["v1", "v2"]);
-const bundlerRequestSchema = zod_1.z.discriminatedUnion("method", [
-    chainIdRequestSchema,
-    supportedEntryPointsRequestSchema,
-    estimateUserOperationGasRequestSchema,
-    sendUserOperationRequestSchema,
-    getUserOperationByHashRequestSchema,
-    getUserOperationReceiptRequestSchema,
-    bundlerClearStateRequestSchema,
-    bundlerClearMempoolRequestSchema,
-    bundlerDumpMempoolRequestSchema,
-    bundlerSendBundleNowRequestSchema,
-    bundlerSetBundlingModeRequestSchema,
-    bundlerSetReputationsRequestSchema,
-    bundlerDumpReputationsRequestSchema,
-    bundlerClearReputationRequestSchema,
-    pimlicoGetStakeStatusRequestSchema,
-    pimlicoGetUserOperationStatusRequestSchema,
-    pimlicoGetUserOperationGasPriceRequestSchema,
-    pimlicoSendUserOperationNowRequestSchema,
-    pimlicoExperimentalSendUserOperation7702RequestSchema,
-    pimlicoExperimentalEstimateUserOperationGas7702RequestSchema
-]);
-exports.bundlerRequestSchema = bundlerRequestSchema;
-const chainIdResponseSchema = zod_1.z.object({
+// Combined schemas (request + response)
+exports.chainIdSchema = zod_1.z.object({
     method: zod_1.z.literal("eth_chainId"),
+    params: zod_1.z.tuple([]),
     result: exports.hexNumberSchema
 });
-const supportedEntryPointsResponseSchema = zod_1.z.object({
+exports.supportedEntryPointsSchema = zod_1.z.object({
     method: zod_1.z.literal("eth_supportedEntryPoints"),
-    result: zod_1.z.array(addressSchema)
+    params: zod_1.z.tuple([]),
+    result: zod_1.z.array(exports.addressSchema)
 });
-const estimateUserOperationGasResponseSchema = zod_1.z.object({
+exports.estimateUserOperationGasSchema = zod_1.z.object({
     method: zod_1.z.literal("eth_estimateUserOperationGas"),
+    params: zod_1.z.union([
+        zod_1.z.tuple([partialUserOperationSchema, exports.addressSchema]),
+        zod_1.z.tuple([
+            partialUserOperationSchema,
+            exports.addressSchema,
+            exports.stateOverridesSchema
+        ])
+    ]),
     result: zod_1.z.union([
         zod_1.z.object({
             callGasLimit: exports.hexNumberSchema,
@@ -377,182 +306,136 @@ const estimateUserOperationGasResponseSchema = zod_1.z.object({
         })
     ])
 });
-const sendUserOperationResponseSchema = zod_1.z.object({
+exports.sendUserOperationSchema = zod_1.z.object({
     method: zod_1.z.literal("eth_sendUserOperation"),
-    result: hexData32Schema
+    params: zod_1.z.tuple([userOperationSchema, exports.addressSchema]),
+    result: exports.hexData32Schema
 });
-const getUserOperationByHashResponseSchema = zod_1.z.object({
+exports.getUserOperationByHashSchema = zod_1.z.object({
     method: zod_1.z.literal("eth_getUserOperationByHash"),
+    params: zod_1.z.tuple([
+        zod_1.z
+            .string()
+            .regex(exports.hexData32Pattern, { message: "Missing/invalid userOpHash" })
+            .transform((val) => val)
+    ]),
     result: zod_1.z
         .object({
         userOperation: userOperationSchema,
-        entryPoint: addressSchema,
+        entryPoint: exports.addressSchema,
         blockNumber: exports.hexNumberSchema,
-        blockHash: hexData32Schema,
-        transactionHash: hexData32Schema
+        blockHash: exports.hexData32Schema,
+        transactionHash: exports.hexData32Schema
     })
         .or(zod_1.z.null())
 });
-const logSchema = zod_1.z.object({
-    //removed: z.boolean().optional(),
-    logIndex: exports.hexNumberSchema,
-    transactionIndex: exports.hexNumberSchema,
-    transactionHash: hexData32Schema,
-    blockHash: hexData32Schema,
-    blockNumber: exports.hexNumberSchema,
-    address: addressSchema,
-    data: hexDataSchema,
-    topics: zod_1.z.array(hexData32Schema)
-});
-exports.logSchema = logSchema;
-const receiptSchema = zod_1.z.object({
-    transactionHash: hexData32Schema,
-    transactionIndex: exports.hexNumberSchema,
-    blockHash: hexData32Schema,
-    blockNumber: exports.hexNumberSchema,
-    from: addressSchema,
-    to: addressSchema.or(zod_1.z.null()),
-    cumulativeGasUsed: exports.hexNumberSchema,
-    gasUsed: exports.hexNumberSchema,
-    contractAddress: addressSchema.or(zod_1.z.null()),
-    logs: zod_1.z.array(logSchema),
-    logsBloom: zod_1.z.string().regex(/^0x[0-9a-f]{512}$/),
-    //root: hexData32Schema,
-    status: exports.hexNumberSchema.or(zod_1.z.null()),
-    effectiveGasPrice: exports.hexNumberSchema.nullish()
-    //type: hexNumberSchema
-});
-exports.receiptSchema = receiptSchema;
-const userOperationReceiptSchema = zod_1.z
-    .object({
-    userOpHash: hexData32Schema,
-    entryPoint: addressSchema,
-    sender: addressSchema,
-    nonce: exports.hexNumberSchema,
-    paymaster: addressSchema.optional(),
-    actualGasCost: exports.hexNumberSchema,
-    actualGasUsed: exports.hexNumberSchema,
-    success: zod_1.z.boolean(),
-    reason: hexDataSchema.optional(), // revert reason
-    logs: zod_1.z.array(logSchema),
-    receipt: receiptSchema
-})
-    .or(zod_1.z.null());
-const getUserOperationReceiptResponseSchema = zod_1.z.object({
+exports.getUserOperationReceiptSchema = zod_1.z.object({
     method: zod_1.z.literal("eth_getUserOperationReceipt"),
+    params: zod_1.z.tuple([
+        zod_1.z
+            .string()
+            .regex(exports.hexData32Pattern, { message: "Missing/invalid userOpHash" })
+            .transform((val) => val)
+    ]),
     result: userOperationReceiptSchema
 });
-const bundlerClearStateResponseSchema = zod_1.z.object({
+exports.debugClearStateSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_clearState"),
+    params: zod_1.z.tuple([]),
     result: zod_1.z.literal("ok")
 });
-exports.bundlerClearStateResponseSchema = bundlerClearStateResponseSchema;
-const bundlerClearMempoolResponseSchema = zod_1.z.object({
+exports.debugClearMempoolSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_clearMempool"),
+    params: zod_1.z.tuple([]),
     result: zod_1.z.literal("ok")
 });
-exports.bundlerClearMempoolResponseSchema = bundlerClearMempoolResponseSchema;
-const bundlerDumpMempoolResponseSchema = zod_1.z.object({
+exports.debugDumpMempoolSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_dumpMempool"),
+    params: zod_1.z.tuple([exports.addressSchema]),
     result: zod_1.z.array(userOperationSchema)
 });
-exports.bundlerDumpMempoolResponseSchema = bundlerDumpMempoolResponseSchema;
-const bundlerGetStakeStatusResponseSchema = zod_1.z.object({
-    method: zod_1.z.literal("debug_bundler_getStakeStatus"),
-    result: zod_1.z.object({
-        stakeInfo: zod_1.z.object({
-            addr: zod_1.z.string(),
-            stake: zod_1.z
-                .string()
-                .or(zod_1.z.number())
-                .or(zod_1.z.bigint())
-                .transform((val) => Number(val).toString()),
-            unstakeDelaySec: zod_1.z
-                .string()
-                .or(zod_1.z.number())
-                .or(zod_1.z.bigint())
-                .transform((val) => Number(val).toString())
-        }),
-        isStaked: zod_1.z.boolean()
-    })
-});
-exports.bundlerGetStakeStatusResponseSchema = bundlerGetStakeStatusResponseSchema;
-const bundlerSendBundleNowResponseSchema = zod_1.z.object({
+exports.debugSendBundleNowSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_sendBundleNow"),
+    params: zod_1.z.tuple([]),
     result: zod_1.z.literal("ok")
 });
-exports.bundlerSendBundleNowResponseSchema = bundlerSendBundleNowResponseSchema;
-const bundlerSetBundlingModeResponseSchema = zod_1.z.object({
+exports.debugSetBundlingModeSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_setBundlingMode"),
+    params: zod_1.z.tuple([zod_1.z.enum(["manual", "auto"])]),
     result: zod_1.z.literal("ok")
 });
-exports.bundlerSetBundlingModeResponseSchema = bundlerSetBundlingModeResponseSchema;
-const bundlerSetReputationsResponseSchema = zod_1.z.object({
+exports.debugSetReputationSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_setReputation"),
+    params: zod_1.z.tuple([
+        zod_1.z.array(zod_1.z.object({
+            address: exports.addressSchema,
+            opsSeen: exports.hexNumberSchema,
+            opsIncluded: exports.hexNumberSchema
+        })),
+        exports.addressSchema
+    ]),
     result: zod_1.z.literal("ok")
 });
-exports.bundlerSetReputationsResponseSchema = bundlerSetReputationsResponseSchema;
-const bundlerDumpReputationsResponseSchema = zod_1.z.object({
+exports.debugDumpReputationSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_dumpReputation"),
-    // TODO: FIX
+    params: zod_1.z.tuple([exports.addressSchema]),
     result: zod_1.z.array(zod_1.z.object({
-        address: addressSchema,
+        address: exports.addressSchema,
         opsSeen: exports.hexNumberSchema,
         opsIncluded: exports.hexNumberSchema,
         status: exports.hexNumberSchema.optional()
     }))
 });
-exports.bundlerDumpReputationsResponseSchema = bundlerDumpReputationsResponseSchema;
-const bundlerClearReputationResponseSchema = zod_1.z.object({
+exports.debugClearReputationSchema = zod_1.z.object({
     method: zod_1.z.literal("debug_bundler_clearReputation"),
+    params: zod_1.z.tuple([]),
     result: zod_1.z.literal("ok")
 });
-const userOperationStatus = zod_1.z.object({
-    status: zod_1.z.enum([
-        "not_found",
-        "not_submitted",
-        "submitted",
-        "rejected",
-        "reverted",
-        "included",
-        "failed"
-    ]),
-    transactionHash: hexData32Schema.or(zod_1.z.null())
+exports.debugGetStakeStatusSchema = zod_1.z.object({
+    method: zod_1.z.literal("debug_bundler_getStakeStatus"),
+    params: zod_1.z.tuple([exports.addressSchema, exports.addressSchema]),
+    result: zod_1.z.object({
+        stakeInfo: zod_1.z.object({
+            addr: zod_1.z.string(),
+            stake: zod_1.z
+                .string()
+                .or(zod_1.z.number())
+                .or(zod_1.z.bigint())
+                .transform((val) => Number(val).toString()),
+            unstakeDelaySec: zod_1.z
+                .string()
+                .or(zod_1.z.number())
+                .or(zod_1.z.bigint())
+                .transform((val) => Number(val).toString())
+        }),
+        isStaked: zod_1.z.boolean()
+    })
 });
-const pimlicoGetUserOperationStatusResponseSchema = zod_1.z.object({
+exports.pimlicoGetUserOperationStatusSchema = zod_1.z.object({
     method: zod_1.z.literal("pimlico_getUserOperationStatus"),
+    params: zod_1.z.tuple([exports.hexData32Schema]),
     result: userOperationStatus
 });
-exports.pimlicoGetUserOperationStatusResponseSchema = pimlicoGetUserOperationStatusResponseSchema;
-const gasPriceSchema = zod_1.z.object({
-    slow: zod_1.z.object({
-        maxFeePerGas: zod_1.z.bigint(),
-        maxPriorityFeePerGas: zod_1.z.bigint()
-    }),
-    standard: zod_1.z.object({
-        maxFeePerGas: zod_1.z.bigint(),
-        maxPriorityFeePerGas: zod_1.z.bigint()
-    }),
-    fast: zod_1.z.object({
-        maxFeePerGas: zod_1.z.bigint(),
-        maxPriorityFeePerGas: zod_1.z.bigint()
-    })
-});
-const pimlicoGetUserOperationGasPriceResponseSchema = zod_1.z.object({
+exports.pimlicoGetUserOperationGasPriceSchema = zod_1.z.object({
     method: zod_1.z.literal("pimlico_getUserOperationGasPrice"),
+    params: zod_1.z.tuple([]),
     result: gasPriceSchema
 });
-exports.pimlicoGetUserOperationGasPriceResponseSchema = pimlicoGetUserOperationGasPriceResponseSchema;
-const pimlicoSendUserOperationNowResponseSchema = zod_1.z.object({
+exports.pimlicoSendUserOperationNowSchema = zod_1.z.object({
     method: zod_1.z.literal("pimlico_sendUserOperationNow"),
+    params: zod_1.z.tuple([userOperationSchema, exports.addressSchema]),
     result: userOperationReceiptSchema
 });
-const pimlicoExperimentalSendUserOperation7702ResponseSchema = zod_1.z.object({
-    method: zod_1.z.literal("pimlico_experimental_sendUserOperation7702"),
-    result: hexData32Schema
-});
-const pimlicoExperimentalEstimateUserOperation7702ResponseSchema = zod_1.z.object({
+exports.pimlicoExperimentalEstimateUserOperationGas7702Schema = zod_1.z.object({
     method: zod_1.z.literal("pimlico_experimental_estimateUserOperationGas7702"),
+    params: zod_1.z.union([
+        zod_1.z.tuple([partialUserOperationSchema, exports.addressSchema]),
+        zod_1.z.tuple([
+            partialUserOperationSchema,
+            exports.addressSchema,
+            exports.stateOverridesSchema
+        ])
+    ]),
     result: zod_1.z.union([
         zod_1.z.object({
             callGasLimit: exports.hexNumberSchema,
@@ -569,29 +452,59 @@ const pimlicoExperimentalEstimateUserOperation7702ResponseSchema = zod_1.z.objec
         })
     ])
 });
-const bundlerResponseSchema = zod_1.z.discriminatedUnion("method", [
-    chainIdResponseSchema,
-    supportedEntryPointsResponseSchema,
-    estimateUserOperationGasResponseSchema,
-    sendUserOperationResponseSchema,
-    getUserOperationByHashResponseSchema,
-    getUserOperationReceiptResponseSchema,
-    bundlerClearStateResponseSchema,
-    bundlerClearMempoolResponseSchema,
-    bundlerDumpMempoolResponseSchema,
-    bundlerGetStakeStatusResponseSchema,
-    bundlerSendBundleNowResponseSchema,
-    bundlerSetBundlingModeResponseSchema,
-    bundlerSetReputationsResponseSchema,
-    bundlerDumpReputationsResponseSchema,
-    bundlerClearReputationResponseSchema,
-    pimlicoGetUserOperationStatusResponseSchema,
-    pimlicoGetUserOperationGasPriceResponseSchema,
-    pimlicoSendUserOperationNowResponseSchema,
-    pimlicoExperimentalSendUserOperation7702ResponseSchema,
-    pimlicoExperimentalEstimateUserOperation7702ResponseSchema
+exports.pimlicoExperimentalSendUserOperation7702Schema = zod_1.z.object({
+    method: zod_1.z.literal("pimlico_experimental_sendUserOperation7702"),
+    params: zod_1.z.tuple([userOperationSchema, exports.addressSchema]),
+    result: exports.hexData32Schema
+});
+exports.altoVersions = zod_1.z.enum(["v1", "v2"]);
+// Create request and response discriminated unions from the combined schemas
+exports.bundlerRequestSchema = zod_1.z.discriminatedUnion("method", [
+    exports.chainIdSchema.omit({ result: true }),
+    exports.supportedEntryPointsSchema.omit({ result: true }),
+    exports.estimateUserOperationGasSchema.omit({ result: true }),
+    exports.sendUserOperationSchema.omit({ result: true }),
+    exports.getUserOperationByHashSchema.omit({ result: true }),
+    exports.getUserOperationReceiptSchema.omit({ result: true }),
+    exports.debugClearStateSchema.omit({ result: true }),
+    exports.debugClearMempoolSchema.omit({ result: true }),
+    exports.debugDumpMempoolSchema.omit({ result: true }),
+    exports.debugSendBundleNowSchema.omit({ result: true }),
+    exports.debugSetBundlingModeSchema.omit({ result: true }),
+    exports.debugSetReputationSchema.omit({ result: true }),
+    exports.debugDumpReputationSchema.omit({ result: true }),
+    exports.debugClearReputationSchema.omit({ result: true }),
+    exports.debugGetStakeStatusSchema.omit({ result: true }),
+    exports.pimlicoGetUserOperationStatusSchema.omit({ result: true }),
+    exports.pimlicoGetUserOperationGasPriceSchema.omit({ result: true }),
+    exports.pimlicoSendUserOperationNowSchema.omit({ result: true }),
+    exports.pimlicoExperimentalSendUserOperation7702Schema.omit({ result: true }),
+    exports.pimlicoExperimentalEstimateUserOperationGas7702Schema.omit({
+        result: true
+    })
+]);
+exports.bundlerRpcSchema = zod_1.z.union([
+    exports.chainIdSchema,
+    exports.supportedEntryPointsSchema,
+    exports.estimateUserOperationGasSchema,
+    exports.sendUserOperationSchema,
+    exports.getUserOperationByHashSchema,
+    exports.getUserOperationReceiptSchema,
+    exports.debugClearStateSchema,
+    exports.debugClearMempoolSchema,
+    exports.debugDumpMempoolSchema,
+    exports.debugSendBundleNowSchema,
+    exports.debugSetBundlingModeSchema,
+    exports.debugSetReputationSchema,
+    exports.debugDumpReputationSchema,
+    exports.debugClearReputationSchema,
+    exports.debugGetStakeStatusSchema,
+    exports.pimlicoGetUserOperationStatusSchema,
+    exports.pimlicoGetUserOperationGasPriceSchema,
+    exports.pimlicoSendUserOperationNowSchema,
+    exports.pimlicoExperimentalSendUserOperation7702Schema,
+    exports.pimlicoExperimentalEstimateUserOperationGas7702Schema
 ]);
-exports.bundlerResponseSchema = bundlerResponseSchema;
 const OpEventType = zod_1.z.union([
     zod_1.z.object({
         eventType: zod_1.z.literal("received")
@@ -618,25 +531,25 @@ const OpEventType = zod_1.z.union([
     }),
     zod_1.z.object({
         eventType: zod_1.z.literal("submitted"),
-        transactionHash: hexData32Schema
+        transactionHash: exports.hexData32Schema
     }),
     zod_1.z.object({
         eventType: zod_1.z.literal("included_onchain"),
-        transactionHash: hexData32Schema,
+        transactionHash: exports.hexData32Schema,
         data: zod_1.z.object({
             blockNumber: zod_1.z.number()
         })
     }),
     zod_1.z.object({
         eventType: zod_1.z.literal("frontran_onchain"),
-        transactionHash: hexData32Schema,
+        transactionHash: exports.hexData32Schema,
         data: zod_1.z.object({
             blockNumber: zod_1.z.number()
         })
     }),
     zod_1.z.object({
         eventType: zod_1.z.literal("failed_onchain"),
-        transactionHash: hexData32Schema,
+        transactionHash: exports.hexData32Schema,
         data: zod_1.z.object({
             blockNumber: zod_1.z.number(),
             reason: zod_1.z.string().optional(),
@@ -645,7 +558,7 @@ const OpEventType = zod_1.z.union([
     }),
     zod_1.z.object({
         eventType: zod_1.z.literal("execution_reverted_onchain"),
-        transactionHash: hexData32Schema,
+        transactionHash: exports.hexData32Schema,
         data: zod_1.z.object({
             blockNumber: zod_1.z.number(),
             reason: zod_1.z.string().optional()