Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/erc 7677 #1

Merged
merged 2 commits into from
Jun 27, 2024
Merged

Feat/erc 7677 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44fd3ae
add erc-7677 endpoints to mock verifying paymaster
mouseless0x Jun 27, 2024
3bffc6f
remove paymaster validUntil limit
mouseless0x Jun 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
364 changes: 235 additions & 129 deletions mock-verifying-paymaster/src/helpers/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,156 +1,262 @@
import { type Hex, getAddress } from "viem"
import { type infer as zodInfer, z } from "zod"
import { type Hex, getAddress } from "viem";
import { type infer as zodInfer, z } from "zod";

export enum ValidationErrors {
InvalidFields = -32602,
InsufficientBalance = -32603,
UnsupportedEntryPoint = -32604
InvalidFields = -32602,
InsufficientBalance = -32603,
UnsupportedEntryPoint = -32604,
}

export class InternalBundlerError extends Error {
constructor(msg?: string) {
let message = msg
if (!msg) {
message = "Internal error from bundler"
}
super(message)
}
constructor(msg?: string) {
let message = msg;
if (!msg) {
message = "Internal error from bundler";
}
super(message);
}
}

export class RpcError extends Error {
// error codes from: https://eips.ethereum.org/EIPS/eip-1474
constructor(
msg: string,
readonly code?: number,
readonly data: unknown = undefined
) {
super(msg)
}
// error codes from: https://eips.ethereum.org/EIPS/eip-1474
constructor(
msg: string,
readonly code?: number,
readonly data: unknown = undefined,
) {
super(msg);
}
}

const hexDataPattern = /^0x[0-9A-Fa-f]*$/
const addressPattern = /^0x[0-9,a-f,A-F]{40}$/
const hexDataPattern = /^0x[0-9A-Fa-f]*$/;
const addressPattern = /^0x[0-9,a-f,A-F]{40}$/;

export const addressSchema = z
.string()
.regex(addressPattern, { message: "not a valid hex address" })
.transform((val) => getAddress(val))
.string()
.regex(addressPattern, { message: "not a valid hex address" })
.transform((val) => getAddress(val));

export const hexNumberSchema = z
.string()
.regex(hexDataPattern)
.or(z.number())
.or(z.bigint())
.superRefine((data, ctx) => {
// This function is used to refine the input and provide a context where you have access to the path.
try {
BigInt(data) // Attempt to convert to BigInt to validate it can be done
} catch {
ctx.addIssue({
code: "custom",
message:
"Invalid input, expected a value that can be converted to bigint."
})
}
})
.transform((val) => BigInt(val))
.string()
.regex(hexDataPattern)
.or(z.number())
.or(z.bigint())
.superRefine((data, ctx) => {
// This function is used to refine the input and provide a context where you have access to the path.
try {
BigInt(data); // Attempt to convert to BigInt to validate it can be done
} catch {
ctx.addIssue({
code: "custom",
message:
"Invalid input, expected a value that can be converted to bigint.",
});
}
})
.transform((val) => BigInt(val));

export const hexDataSchema = z
.string()
.regex(hexDataPattern, { message: "not valid hex data" })
.transform((val) => val.toLowerCase() as Hex)
.string()
.regex(hexDataPattern, { message: "not valid hex data" })
.transform((val) => val.toLowerCase() as Hex);

const userOperationSchemaPaymasterV6 = z
.object({
sender: addressSchema,
nonce: hexNumberSchema,
initCode: hexDataSchema,
callData: hexDataSchema,
callGasLimit: hexNumberSchema.default(1n),
verificationGasLimit: hexNumberSchema.default(1n),
preVerificationGas: hexNumberSchema.default(1n),
maxPriorityFeePerGas: hexNumberSchema,
maxFeePerGas: hexNumberSchema,
paymasterAndData: hexDataSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
signature: hexDataSchema.optional().transform((val) => {
if (val === undefined) {
return "0x"
}
return val
})
})
.strict()
.transform((val) => {
return val
})
.object({
sender: addressSchema,
nonce: hexNumberSchema,
initCode: hexDataSchema,
callData: hexDataSchema,
callGasLimit: hexNumberSchema.default(1n),
verificationGasLimit: hexNumberSchema.default(1n),
preVerificationGas: hexNumberSchema.default(1n),
maxPriorityFeePerGas: hexNumberSchema,
maxFeePerGas: hexNumberSchema,
paymasterAndData: hexDataSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
signature: hexDataSchema.optional().transform((val) => {
if (val === undefined) {
return "0x";
}
return val;
}),
})
.strict()
.transform((val) => {
return val;
});

const userOperationSchemaPaymasterV7 = z
.object({
sender: addressSchema,
nonce: hexNumberSchema,
factory: addressSchema.optional().transform((val) => val ?? undefined),
factoryData: hexDataSchema
.optional()
.transform((val) => val ?? undefined),
callData: hexDataSchema,
callGasLimit: hexNumberSchema.default(1n),
verificationGasLimit: hexNumberSchema.default(1n),
preVerificationGas: hexNumberSchema.default(1n),
maxFeePerGas: hexNumberSchema,
maxPriorityFeePerGas: hexNumberSchema,
paymaster: addressSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
paymasterVerificationGasLimit: hexNumberSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
paymasterPostOpGasLimit: hexNumberSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
paymasterData: hexDataSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
signature: hexDataSchema.optional().transform((val) => {
if (val === undefined) {
return "0x"
}
return val
})
})
.strict()
.transform((val) => {
return val
})
.object({
sender: addressSchema,
nonce: hexNumberSchema,
factory: addressSchema.optional().transform((val) => val ?? undefined),
factoryData: hexDataSchema.optional().transform((val) => val ?? undefined),
callData: hexDataSchema,
callGasLimit: hexNumberSchema.default(1n),
verificationGasLimit: hexNumberSchema.default(1n),
preVerificationGas: hexNumberSchema.default(1n),
maxFeePerGas: hexNumberSchema,
maxPriorityFeePerGas: hexNumberSchema,
paymaster: addressSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
paymasterVerificationGasLimit: hexNumberSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
paymasterPostOpGasLimit: hexNumberSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
paymasterData: hexDataSchema
.nullable()
.optional()
.transform((val) => val ?? undefined),
signature: hexDataSchema.optional().transform((val) => {
if (val === undefined) {
return "0x";
}
return val;
}),
})
.strict()
.transform((val) => {
return val;
});

export const jsonRpcResultSchema = z
.object({
jsonrpc: z.literal("2.0"),
id: z.number(),
result: z.unknown()
})
.strict()
.object({
jsonrpc: z.literal("2.0"),
id: z.number(),
result: z.unknown(),
})
.strict();

export const jsonRpcSchema = z
.object({
jsonrpc: z.literal("2.0"),
id: z.number(),
method: z.string(),
params: z.array(z.unknown()).optional().default([])
})
.strict()
.object({
jsonrpc: z.literal("2.0"),
id: z.number(),
method: z.string(),
params: z.array(z.unknown()).optional().default([]),
})
.strict();

export const pmSponsorUserOperationParamsSchema = z.tuple([
z.union([userOperationSchemaPaymasterV6, userOperationSchemaPaymasterV7]),
addressSchema
])
z.union([userOperationSchemaPaymasterV6, userOperationSchemaPaymasterV7]),
addressSchema,
]);

export type UserOperationV7 = zodInfer<typeof userOperationSchemaPaymasterV7>
export type UserOperationV6 = zodInfer<typeof userOperationSchemaPaymasterV6>
export type JsonRpcSchema = zodInfer<typeof jsonRpcSchema>
const eip7677UserOperationSchemaV6 = z
.object({
sender: addressSchema,
nonce: hexNumberSchema,
initCode: hexDataSchema,
callData: hexDataSchema,
callGasLimit: hexNumberSchema,
verificationGasLimit: hexNumberSchema,
preVerificationGas: hexNumberSchema,
maxPriorityFeePerGas: hexNumberSchema,
maxFeePerGas: hexNumberSchema,
paymasterAndData: hexDataSchema
.nullable()
.optional()
.transform((_) => {
return "0x" as Hex;
}),
signature: hexDataSchema
.nullable()
.optional()
.transform((_) => {
return "0x" as Hex;
}),
})
.strict()
.transform((val) => {
return val;
});

const eip7677UserOperationSchemaV7 = z
.object({
sender: addressSchema,
nonce: hexNumberSchema,
factory: addressSchema
.nullable()
.optional()
.transform((val) => val ?? null),
factoryData: hexDataSchema
.nullable()
.optional()
.transform((val) => val ?? null),
callData: hexDataSchema,
callGasLimit: hexNumberSchema,
verificationGasLimit: hexNumberSchema,
preVerificationGas: hexNumberSchema,
maxFeePerGas: hexNumberSchema,
maxPriorityFeePerGas: hexNumberSchema,
paymaster: addressSchema
.nullable()
.optional()
.transform((val) => val ?? null),
paymasterVerificationGasLimit: hexNumberSchema
.nullable()
.optional()
.transform((val) => val ?? null),
paymasterPostOpGasLimit: hexNumberSchema
.nullable()
.optional()
.transform((val) => val ?? null),
paymasterData: hexDataSchema
.nullable()
.optional()
.transform((val) => val ?? null),
signature: hexDataSchema.optional().transform((val) => {
if (val === undefined) {
return "0x";
}
return val;
}),
})
.strict()
.transform((val) => {
return val;
});

const eip7677UserOperationSchema = z.union([
eip7677UserOperationSchemaV6,
eip7677UserOperationSchemaV7,
]);

export const pmGetPaymasterData = z
.union([
z.tuple([
eip7677UserOperationSchema,
addressSchema,
hexNumberSchema,
z.union([z.object({}), z.null()]),
]),
z.tuple([eip7677UserOperationSchema, addressSchema, hexNumberSchema]),
])
.transform((val) => {
return [val[0], val[1], val[2], val[3] ?? null] as const;
});

export const pmGetPaymasterStubDataParamsSchema = z
.union([
z.tuple([
eip7677UserOperationSchema,
addressSchema,
hexNumberSchema,
z.union([z.object({}), z.null()]),
]),
z.tuple([eip7677UserOperationSchema, addressSchema, hexNumberSchema]),
])
.transform((val) => {
return [val[0], val[1], val[2], val[3] ?? null] as const;
});

export type UserOperationV7 = zodInfer<typeof userOperationSchemaPaymasterV7>;
export type UserOperationV6 = zodInfer<typeof userOperationSchemaPaymasterV6>;
export type JsonRpcSchema = zodInfer<typeof jsonRpcSchema>;
Loading
Loading