Skip to content

Fix/mock verifying paymaster #218

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

Merged
merged 7 commits into from
Jun 7, 2024
Merged

Fix/mock verifying paymaster #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b52bcc
fix issue with mock paymaster routing
mouseless0x Jun 5, 2024
e318b95
fix issue with mock paymaster routing
mouseless0x Jun 5, 2024
b133b3d
update simulations contract
mouseless0x Jun 5, 2024
d385ed5
sync with main
mouseless0x Jun 5, 2024
3953a9d
ignore lint warnings
mouseless0x Jun 5, 2024
85eed77
undo package.lock and pnpm-lock.yml changes
mouseless0x Jun 5, 2024
4c9b0e4
remove unused functions
mouseless0x Jun 5, 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
2 changes: 1 addition & 1 deletion packages/permissionless-test/mock-aa-infra/alto/src/constants.ts
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 28 additions & 28 deletions packages/permissionless-test/mock-aa-infra/alto/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
parseEther
} from "viem"
import { mnemonicToAccount } from "viem/accounts"
import { getTransactionReceipt, sendTransaction } from "viem/actions"
import { sendTransaction } from "viem/actions"
import { foundry } from "viem/chains"
import {
BICONOMY_ACCOUNT_V2_LOGIC_CREATECALL,
Expand Down Expand Up @@ -389,33 +389,33 @@ const main = async () => {
})

await verifyDeployed([
"0x4e59b44847b379578588920ca78fbf26c0b4956c",
"0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7",
"0x988C135a1049Ce61730724afD342fb7C56CD2776",
"0x0000000071727De22E5E9d8BAf0edAc6f37da032",
"0x91E60e0613810449d098b0b5Ec8b51A0FE8c8985",
"0x74Cb5e4eE81b86e70f9045036a1C5477de69eE87",
"0x2dd68b007B46fBe91B9A7c3EDa5A7a1063cB5b47",
"0x75cf11467937ce3F2f357CE24ffc3DBF8fD5c226",
"0x8EcD4ec46D4D2a6B64fE960B3D64e8B94B2234eb",
"0xa581c4A4DB7175302464fF3C06380BC3270b4037",
"0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67",
"0x41675C099F32341bf84BFc5382aF534df5C7461a",
"0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526",
"0x9641d764fc13c8B624c04430C7356C1C7C8102e2",
"0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789",
"0x9406Cc6185a346906296840746125a0E44976454",
"0x0000001c5b32F37F5beA87BDD5374eB2aC54eA8e",
"0x0000002512019Dafb59528B82CB92D3c5D2423ac",
"0x000000a56Aaca3e9a4C479ea6b6CD0DbcB6634F5",
"0x0bBa6d96BD616BedC6BFaa341742FD43c60b83C1",
"0xd9AB5096a832b9ce79914329DAEE236f8Eea0390",
"0x0DA6a956B9488eD4dd761E59f52FDc6c8068E6B5",
"0x5de4839a76cf55d0c90e2061ef4386d962E15ae3",
"0x8104e3Ad430EA6d354d013A6789fDFc71E671c43",
"0x94F097E1ebEB4ecA3AAE54cabb08905B239A7D27",
"0x6723b44Abeec4E71eBE3232BD5B455805baDD22f",
"0xd703aaE79538628d27099B8c4f621bE4CCd142d5",
"0x4e59b44847b379578588920ca78fbf26c0b4956c", // Determinstic deployer
"0x914d7Fec6aaC8cd542e72Bca78B30650d45643d7", // Safe Singleton Factory
"0x988C135a1049Ce61730724afD342fb7C56CD2776", // Biconomy Singleton Factory
"0x0000000071727De22E5E9d8BAf0edAc6f37da032", // EntryPoint v0.7
"0x91E60e0613810449d098b0b5Ec8b51A0FE8c8985", // Simple Account Factory V0.7
"0x74Cb5e4eE81b86e70f9045036a1C5477de69eE87", // EntryPoint Simulations (Needed for v0.7)
"0x2dd68b007B46fBe91B9A7c3EDa5A7a1063cB5b47", // Safe V0.7 Module Setup
"0x75cf11467937ce3F2f357CE24ffc3DBF8fD5c226", // Safe V0.7 4337 Module
"0x8EcD4ec46D4D2a6B64fE960B3D64e8B94B2234eb", // Safe V0.6 Module Setup
"0xa581c4A4DB7175302464fF3C06380BC3270b4037", // Safe V0.6 4337 Module
"0x4e1DCf7AD4e460CfD30791CCC4F9c8a4f820ec67", // Safe Proxy Factory
"0x41675C099F32341bf84BFc5382aF534df5C7461a", // Safe Singleton
"0x38869bf66a61cF6bDB996A6aE40D5853Fd43B526", // Safe Multi Send
"0x9641d764fc13c8B624c04430C7356C1C7C8102e2", // Safe Multi Send Call Only
"0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789", // EntryPoint V0.6
"0x9406Cc6185a346906296840746125a0E44976454", // Simple Account Factory V0.6
"0x0000001c5b32F37F5beA87BDD5374eB2aC54eA8e", // Biconomy ECDSA Ownership Registry Module
"0x0000002512019Dafb59528B82CB92D3c5D2423ac", // Biconomy Account Logic V0.2
"0x000000a56Aaca3e9a4C479ea6b6CD0DbcB6634F5", // Biconomy Factory Address
"0x0bBa6d96BD616BedC6BFaa341742FD43c60b83C1", // Biconomy Default Fallback Handler
"0xd9AB5096a832b9ce79914329DAEE236f8Eea0390", // Kernel v0.2.2 ECDSA Valdiator
"0x0DA6a956B9488eD4dd761E59f52FDc6c8068E6B5", // Kernel v0.2.2 Account Logic
"0x5de4839a76cf55d0c90e2061ef4386d962E15ae3", // Kernel v0.2.2 Factory
"0x8104e3Ad430EA6d354d013A6789fDFc71E671c43", // Kernel v0.3.0 ECDSA Valdiator
"0x94F097E1ebEB4ecA3AAE54cabb08905B239A7D27", // Kernel v0.3.0 Account Logic
"0x6723b44Abeec4E71eBE3232BD5B455805baDD22f", // Kernel v0.3.0 Factory
"0xd703aaE79538628d27099B8c4f621bE4CCd142d5", // Kernel v0.3.0 Meta Factory
"0x00004EC70002a32400f8ae005A26081065620D20", // LightAccountFactory v1.1.0
"0xae8c656ad28F2B59a196AB61815C16A0AE1c3cba" // LightAccount v1.1.0 implementation
])
Expand Down
16 changes: 5 additions & 11 deletions packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/schema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
import type { FastifyReply } from "fastify"
import { type Hex, getAddress } from "viem"
import { type infer as zodInfer, z } from "zod"

export const returnInvalidRequestParams = (
reply: FastifyReply,
errorMsg: string
) => {
reply.status(400).send({
jsonrpc: "2.0",
error: {
message: errorMsg
}
})
export enum ValidationErrors {
InvalidFields = -32602,
InsufficientBalance = -32603,
UnsupportedEntryPoint = -32604
}

export class InternalBundlerError extends Error {
Expand Down Expand Up @@ -160,3 +153,4 @@ export const pmSponsorUserOperationParamsSchema = z.tuple([

export type UserOperationV7 = zodInfer<typeof userOperationSchemaPaymasterV7>
export type UserOperationV6 = zodInfer<typeof userOperationSchemaPaymasterV6>
export type JsonRpcSchema = zodInfer<typeof jsonRpcSchema>
20 changes: 0 additions & 20 deletions packages/permissionless-test/mock-aa-infra/mock-paymaster/src/helpers/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,6 @@
import type { UserOperation } from "permissionless"
import { http, createWalletClient } from "viem"
import { mnemonicToAccount } from "viem/accounts"
import { foundry } from "viem/chains"
import type { UserOperationV6, UserOperationV7 } from "./schema"

// Type predicate to check if the UserOperation is V07.
export function isVersion07(
operation: UserOperationV6 | UserOperationV7
): operation is UserOperation<"v0.7"> {
return (
"factory" in operation ||
"paymaster" in operation ||
"factoryData" in operation
)
}

// Type predicate check if the UserOperation is V06.
export function isVersion06(
operation: UserOperationV6 | UserOperationV7
): operation is UserOperation<"v0.6"> {
return "initCode" in operation || "paymasterAndData" in operation
}

export const getAnvilWalletClient = () => {
const account = mnemonicToAccount(
Expand Down
Loading
Loading