0.2

package.json

@@ -61,6 +61,6 @@
         "get-port": "^7.0.0",
         "tsc-alias": "^1.8.8",
         "vitest": "^1.2.0",
-        "viem": "^2.16.2"
+        "viem": "^2.18.0"
     }
 }

packages/permissionless-test/mock-aa-infra/alto/index.ts

@@ -31,6 +31,7 @@ import {
     KERNEL_V07_V3_1_ECDSA_VALIDATOR_V3_CREATECALL,
     KERNEL_V07_V3_1_FACTORY_CREATECALL,
     LIGHT_ACCOUNT_FACTORY_V110_CREATECALL,
+    LIGHT_ACCOUNT_FACTORY_V200_CREATECALL,
     SAFE_7579_LAUNCHPAD_CREATECALL,
     SAFE_7579_MODULE_CREATECALL,
     SAFE_7579_REGISTRY_CREATECALL,
@@ -234,6 +235,12 @@ export const setupContracts = async (rpc: string) => {
             gas: 15_000_000n,
             nonce: nonce++
         }),
+        walletClient.sendTransaction({
+            to: DETERMINISTIC_DEPLOYER,
+            data: LIGHT_ACCOUNT_FACTORY_V200_CREATECALL,
+            gas: 15_000_000n,
+            nonce: nonce++
+        }),
         walletClient.sendTransaction({
             to: DETERMINISTIC_DEPLOYER,
             data: TRUST_FACTORY_V06_CREATECALL,
@@ -451,6 +458,8 @@ export const setupContracts = async (rpc: string) => {
         "0xaac5D4240AF87249B3f71BC8E4A2cae074A3E419", // Kernel v0.3.1 Factory
         "0x00004EC70002a32400f8ae005A26081065620D20", // LightAccountFactory v1.1.0
         "0xae8c656ad28F2B59a196AB61815C16A0AE1c3cba", // LightAccount v1.1.0 implementation
+        "0x0000000000400CdFef5E2714E63d8040b700BC24", // LightAccountFactory v2.0.0
+        "0x8E8e658E22B12ada97B402fF0b044D6A325013C7", // LightAccount v2.0.0 implementation
         "0x81b9E3689390C7e74cF526594A105Dea21a8cdD5", // Trust Secp256k1VerificationFacet
         "0x729c310186a57833f622630a16d13f710b83272a", // Trust factory
         "0xFde53272dcd7938d16E031A6989753c321728332", // Trust AccountFacet

packages/permissionless-test/mock-aa-infra/mock-paymaster/index.ts

@@ -1,13 +1,9 @@
 import cors from "@fastify/cors"
 import Fastify from "fastify"
 import { defineInstance } from "prool"
-import { http } from "viem"
+import { http, createPublicClient } from "viem"
+import { createBundlerClient } from "viem/account-abstraction"
 import { foundry } from "viem/chains"
-import {
-    ENTRYPOINT_ADDRESS_V06,
-    ENTRYPOINT_ADDRESS_V07
-} from "../../../permissionless"
-import { createPimlicoBundlerClient } from "../../../permissionless/clients/pimlico"
 import { getAnvilWalletClient } from "./helpers/utils"
 import {
     setupVerifyingPaymasterV06,
@@ -39,16 +35,14 @@ export const paymaster = defineInstance(
                     anvilRpc
                 )
 
-                const altoBundlerV07 = createPimlicoBundlerClient({
-                    chain: foundry,
-                    transport: http(altoRpc),
-                    entryPoint: ENTRYPOINT_ADDRESS_V07
+                const publicClient = createPublicClient({
+                    transport: http(anvilRpc),
+                    chain: foundry
                 })
 
-                const altoBundlerV06 = createPimlicoBundlerClient({
+                const bundler = createBundlerClient({
                     chain: foundry,
-                    transport: http(altoRpc),
-                    entryPoint: ENTRYPOINT_ADDRESS_V06
+                    transport: http(altoRpc)
                 })
 
                 app.register(cors, {
@@ -57,10 +51,10 @@ export const paymaster = defineInstance(
                 })
 
                 const rpcHandler = createRpcHandler(
-                    altoBundlerV07,
-                    altoBundlerV06,
+                    bundler,
                     verifyingPaymasterV07,
                     verifyingPaymasterV06,
+                    publicClient,
                     walletClient
                 )
                 app.post("/", {}, rpcHandler)

packages/permissionless-test/mock-aa-infra/mock-paymaster/mockAccount.ts

@@ -0,0 +1,27 @@
+import type { Client } from "viem"
+import type {
+    entryPoint06Abi,
+    entryPoint06Address,
+    entryPoint07Abi,
+    entryPoint07Address
+} from "viem/account-abstraction"
+import { generatePrivateKey, privateKeyToAccount } from "viem/accounts"
+import { toSimpleSmartAccount } from "../../../permissionless/accounts/simple/toSimpleSmartAccount"
+
+export const getMockAccount = ({
+    publicClient,
+    entryPoint
+}: {
+    publicClient: Client
+    entryPoint: {
+        address: typeof entryPoint06Address | typeof entryPoint07Address
+        version: "0.6" | "0.7"
+        abi: typeof entryPoint06Abi | typeof entryPoint07Abi
+    }
+}) => {
+    return toSimpleSmartAccount({
+        client: publicClient,
+        entryPoint,
+        owner: privateKeyToAccount(generatePrivateKey())
+    })
+}