@pimlico/mock-paymaster 0.0.4 → 0.0.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (37) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/_cjs/helpers/erc20-utils.js +28 -6
  3. package/_cjs/helpers/erc20-utils.js.map +1 -1
  4. package/_cjs/helpers/utils.js +1 -13
  5. package/_cjs/helpers/utils.js.map +1 -1
  6. package/_cjs/index.js +15 -18
  7. package/_cjs/index.js.map +1 -1
  8. package/_cjs/relay.js +10 -5
  9. package/_cjs/relay.js.map +1 -1
  10. package/_cjs/singletonPaymasters.js +11 -8
  11. package/_cjs/singletonPaymasters.js.map +1 -1
  12. package/_esm/helpers/erc20-utils.js +32 -7
  13. package/_esm/helpers/erc20-utils.js.map +1 -1
  14. package/_esm/helpers/utils.js +1 -12
  15. package/_esm/helpers/utils.js.map +1 -1
  16. package/_esm/index.js +16 -20
  17. package/_esm/index.js.map +1 -1
  18. package/_esm/relay.js +13 -8
  19. package/_esm/relay.js.map +1 -1
  20. package/_esm/singletonPaymasters.js +11 -8
  21. package/_esm/singletonPaymasters.js.map +1 -1
  22. package/_types/helpers/erc20-utils.d.ts +3 -2
  23. package/_types/helpers/erc20-utils.d.ts.map +1 -1
  24. package/_types/helpers/utils.d.ts +1 -5
  25. package/_types/helpers/utils.d.ts.map +1 -1
  26. package/_types/index.d.ts +2 -0
  27. package/_types/index.d.ts.map +1 -1
  28. package/_types/relay.d.ts +4 -5
  29. package/_types/relay.d.ts.map +1 -1
  30. package/_types/singletonPaymasters.d.ts +4 -4
  31. package/_types/singletonPaymasters.d.ts.map +1 -1
  32. package/helpers/erc20-utils.ts +47 -10
  33. package/helpers/utils.ts +0 -24
  34. package/index.ts +24 -21
  35. package/package.json +1 -1
  36. package/relay.ts +19 -9
  37. package/singletonPaymasters.ts +14 -12
package/singletonPaymasters.ts CHANGED
@@ -30,7 +30,8 @@ import {
30
30
  singletonPaymaster07Abi,
31
31
  singletonPaymaster08Abi
32
32
  } from "./helpers/abi.js"
33
- import type { PaymasterMode } from "./helpers/utils.js"
33
+ import { getPaymasterUtilityWallet } from "./helpers/erc20-utils.js"
34
+ import { type PaymasterMode, getPublicClient } from "./helpers/utils.js"
34
35
 
35
36
  export const getDummyPaymasterData = ({
36
37
  is06,
@@ -240,13 +241,14 @@ export const getSignedPaymasterData = async ({
240
241
  }
241
242
 
242
243
  export const deployPaymasters = async ({
243
- walletClient,
244
- publicClient
244
+ anvilRpc,
245
+ paymasterSigner
245
246
  }: {
246
- walletClient: WalletClient<Transport, Chain, Account>
247
- publicClient: PublicClient<Transport, Chain>
247
+ anvilRpc: string
248
+ paymasterSigner: Address
248
249
  }) => {
249
- const owner = walletClient.account.address
250
+ const walletClient = await getPaymasterUtilityWallet(anvilRpc)
251
+ const publicClient = await getPublicClient(anvilRpc)
250
252
 
251
253
  let nonce = await publicClient.getTransactionCount({
252
254
  address: walletClient.account.address
@@ -257,7 +259,7 @@ export const deployPaymasters = async ({
257
259
  to: constants.deterministicDeployer,
258
260
  data: concat([
259
261
  constants.create2Salt,
260
- getSingletonPaymaster06InitCode(walletClient.account.address)
262
+ getSingletonPaymaster06InitCode(paymasterSigner)
261
263
  ]),
262
264
  nonce: nonce++
263
265
  })
@@ -267,7 +269,7 @@ export const deployPaymasters = async ({
267
269
  to: constants.deterministicDeployer,
268
270
  data: concat([
269
271
  constants.create2Salt,
270
- getSingletonPaymaster07InitCode(walletClient.account.address)
272
+ getSingletonPaymaster07InitCode(paymasterSigner)
271
273
  ]),
272
274
  nonce: nonce++
273
275
  })
@@ -277,7 +279,7 @@ export const deployPaymasters = async ({
277
279
  to: constants.deterministicDeployer,
278
280
  data: concat([
279
281
  constants.create2Salt,
280
- getSingletonPaymaster08InitCode(walletClient.account.address)
282
+ getSingletonPaymaster08InitCode(paymasterSigner)
281
283
  ]),
282
284
  nonce: nonce++
283
285
  })
@@ -285,17 +287,17 @@ export const deployPaymasters = async ({
285
287
  // Initialize contract instances.
286
288
  const [singletonPaymaster06, singletonPaymaster07, singletonPaymaster08] = [
287
289
  getContract({
288
- address: getSingletonPaymaster06Address(owner),
290
+ address: getSingletonPaymaster06Address(paymasterSigner),
289
291
  abi: singletonPaymaster06Abi,
290
292
  client: walletClient
291
293
  }),
292
294
  getContract({
293
- address: getSingletonPaymaster07Address(owner),
295
+ address: getSingletonPaymaster07Address(paymasterSigner),
294
296
  abi: singletonPaymaster07Abi,
295
297
  client: walletClient
296
298
  }),
297
299
  getContract({
298
- address: getSingletonPaymaster08Address(owner),
300
+ address: getSingletonPaymaster08Address(paymasterSigner),
299
301
  abi: singletonPaymaster08Abi,
300
302
  client: walletClient
301
303
  })