@pimlico/mock-paymaster 0.0.3 → 0.0.5

package/relay.ts

@@ -1,6 +1,7 @@
 import * as util from "node:util"
 import type { FastifyReply, FastifyRequest } from "fastify"
 import {
+    http,
     type Account,
     type Address,
     BaseError,
@@ -15,6 +16,7 @@ import {
 import {
     type BundlerClient,
     type UserOperation,
+    createBundlerClient,
     entryPoint06Address,
     entryPoint07Address,
     entryPoint08Address
@@ -40,6 +42,8 @@ import {
 } from "./helpers/schema.js"
 import {
     type PaymasterMode,
+    getChain,
+    getPublicClient,
     isTokenSupported,
     maxBigInt
 } from "./helpers/utils.js"
@@ -158,9 +162,9 @@ const handleMethod = async ({
     parsedBody,
     paymasterSigner,
     publicClient,
-    bundler
+    bundlerClient
 }: {
-    bundler: BundlerClient
+    bundlerClient: BundlerClient
     paymasterSigner: WalletClient<Transport, Chain, Account>
     publicClient: PublicClient
     parsedBody: JsonRpcSchema
@@ -196,7 +200,7 @@ const handleMethod = async ({
             entryPoint,
             userOperation,
             paymasterMode: { mode: "verifying" },
-            bundler,
+            bundler: bundlerClient,
             paymaster: epToPaymaster[entryPoint],
             publicClient,
             paymasterSigner,
@@ -284,7 +288,7 @@ const handleMethod = async ({
     }
 
     if (parsedBody.method === "pimlico_getUserOperationGasPrice") {
-        return await bundler.request({
+        return await bundlerClient.request({
             // @ts-ignore
             method: "pimlico_getUserOperationGasPrice",
             // @ts-ignore
@@ -340,15 +344,21 @@ const handleMethod = async ({
 }
 
 export const createRpcHandler = ({
-    bundler,
-    publicClient,
+    altoRpc,
+    anvilRpc,
     paymasterSigner
 }: {
-    bundler: BundlerClient
-    publicClient: PublicClient
+    altoRpc: string
+    anvilRpc: string
     paymasterSigner: WalletClient<Transport, Chain, Account>
 }) => {
     return async (request: FastifyRequest, _reply: FastifyReply) => {
+        const publicClient = await getPublicClient(anvilRpc)
+        const bundlerClient = createBundlerClient({
+            chain: await getChain(anvilRpc),
+            transport: http(altoRpc)
+        })
+
         const body = request.body
         const parsedBody = jsonRpcSchema.safeParse(body)
         if (!parsedBody.success) {
@@ -360,7 +370,7 @@ export const createRpcHandler = ({
 
         try {
             const result = await handleMethod({
-                bundler,
+                bundlerClient,
                 paymasterSigner,
                 parsedBody: parsedBody.data,
                 publicClient

package/singletonPaymasters.ts

@@ -30,7 +30,8 @@ import {
     singletonPaymaster07Abi,
     singletonPaymaster08Abi
 } from "./helpers/abi.js"
-import type { PaymasterMode } from "./helpers/utils.js"
+import { getPaymasterUtilityWallet } from "./helpers/erc20-utils.js"
+import { type PaymasterMode, getPublicClient } from "./helpers/utils.js"
 
 export const getDummyPaymasterData = ({
     is06,
@@ -240,13 +241,14 @@ export const getSignedPaymasterData = async ({
 }
 
 export const deployPaymasters = async ({
-    walletClient,
-    publicClient
+    anvilRpc,
+    paymasterSigner
 }: {
-    walletClient: WalletClient<Transport, Chain, Account>
-    publicClient: PublicClient<Transport, Chain>
+    anvilRpc: string
+    paymasterSigner: Address
 }) => {
-    const owner = walletClient.account.address
+    const walletClient = await getPaymasterUtilityWallet(anvilRpc)
+    const publicClient = await getPublicClient(anvilRpc)
 
     let nonce = await publicClient.getTransactionCount({
         address: walletClient.account.address
@@ -257,7 +259,7 @@ export const deployPaymasters = async ({
         to: constants.deterministicDeployer,
         data: concat([
             constants.create2Salt,
-            getSingletonPaymaster06InitCode(walletClient.account.address)
+            getSingletonPaymaster06InitCode(paymasterSigner)
         ]),
         nonce: nonce++
     })
@@ -267,7 +269,7 @@ export const deployPaymasters = async ({
         to: constants.deterministicDeployer,
         data: concat([
             constants.create2Salt,
-            getSingletonPaymaster07InitCode(walletClient.account.address)
+            getSingletonPaymaster07InitCode(paymasterSigner)
         ]),
         nonce: nonce++
     })
@@ -277,7 +279,7 @@ export const deployPaymasters = async ({
         to: constants.deterministicDeployer,
         data: concat([
             constants.create2Salt,
-            getSingletonPaymaster08InitCode(walletClient.account.address)
+            getSingletonPaymaster08InitCode(paymasterSigner)
         ]),
         nonce: nonce++
     })
@@ -285,17 +287,17 @@ export const deployPaymasters = async ({
     // Initialize contract instances.
     const [singletonPaymaster06, singletonPaymaster07, singletonPaymaster08] = [
         getContract({
-            address: getSingletonPaymaster06Address(owner),
+            address: getSingletonPaymaster06Address(paymasterSigner),
             abi: singletonPaymaster06Abi,
             client: walletClient
         }),
         getContract({
-            address: getSingletonPaymaster07Address(owner),
+            address: getSingletonPaymaster07Address(paymasterSigner),
             abi: singletonPaymaster07Abi,
             client: walletClient
         }),
         getContract({
-            address: getSingletonPaymaster08Address(owner),
+            address: getSingletonPaymaster08Address(paymasterSigner),
             abi: singletonPaymaster08Abi,
             client: walletClient
         })