Merge pull request #463 from pimlicolabs/chore/sonarqube

chore/sonarqube

Author: mouseless0x

.github/workflows/dependabot.yaml renamed to .github/dependabot.yaml

@@ -53,7 +53,7 @@ export const hexNumberSchema = z
             })
         }
     })
-    .transform((val) => BigInt(val))
+    .transform(BigInt)
 
 export const hexDataSchema = z
     .string()
@@ -63,21 +63,21 @@ export const hexDataSchema = z
 const signedAuthorizationSchema = z.union([
     z.object({
         contractAddress: addressSchema,
-        chainId: hexNumberSchema.transform((val) => Number(val)),
-        nonce: hexNumberSchema.transform((val) => Number(val)),
+        chainId: hexNumberSchema.transform(Number),
+        nonce: hexNumberSchema.transform(Number),
         r: hexDataSchema.transform((val) => val as Hex),
         s: hexDataSchema.transform((val) => val as Hex),
         v: hexNumberSchema.optional(),
-        yParity: hexNumberSchema.transform((val) => Number(val))
+        yParity: hexNumberSchema.transform(Number)
     }),
     z.object({
         address: addressSchema,
-        chainId: hexNumberSchema.transform((val) => Number(val)),
-        nonce: hexNumberSchema.transform((val) => Number(val)),
+        chainId: hexNumberSchema.transform(Number),
+        nonce: hexNumberSchema.transform(Number),
         r: hexDataSchema.transform((val) => val as Hex),
         s: hexDataSchema.transform((val) => val as Hex),
         v: hexNumberSchema.optional(),
-        yParity: hexNumberSchema.transform((val) => Number(val))
+        yParity: hexNumberSchema.transform(Number)
     })
 ])
 

packages/mock-paymaster/helpers/schema.ts

@@ -3,11 +3,7 @@ import Fastify from "fastify"
 import { defineInstance } from "prool"
 import { http, createWalletClient } from "viem"
 import { privateKeyToAccount } from "viem/accounts"
-import {
-    deployErc20Token,
-    erc20Address,
-    sudoMintTokens
-} from "./helpers/erc20-utils.js"
+import { deployErc20Token } from "./helpers/erc20-utils.js"
 import { getChain } from "./helpers/utils.js"
 import { createRpcHandler } from "./relay.js"
 import { deployPaymasters } from "./singletonPaymasters.js"
@@ -66,4 +62,4 @@ export const paymaster = defineInstance(
     }
 )
 
-export { erc20Address, sudoMintTokens }
+export { erc20Address, sudoMintTokens } from "./helpers/erc20-utils.js"

packages/mock-paymaster/index.ts

@@ -1,6 +1,5 @@
 import { resolve } from "node:path"
-import { defineInstance } from "prool"
-import { toArgs } from "prool"
+import { defineInstance, toArgs } from "prool"
 import { execa } from "prool/processes"
 
 export type AltoParameters = {
@@ -267,8 +266,6 @@ export const alto = defineInstance((parameters?: AltoParameters) => {
                 return ["node", resolve(libPath, "../cli/alto.js")]
             })()
 
-            const command = `${binary} ${toArgs({ port, ...args })}`
-
             await process.start(
                 ($) => $`${binary} ${toArgs({ port, ...args })}`,
                 {

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

@@ -117,7 +117,7 @@ export const testWithRpc = test.extend<{
             paymasterRpc
         })
 
-        await Promise.all([...instances.map((instance) => instance.stop())])
+        await Promise.all(instances.map((instance) => instance.stop()))
         ports = ports.filter(
             (port) =>
                 port !== altoPort ||

packages/permissionless-test/src/testWithRpc.ts

@@ -202,20 +202,26 @@ export const getPimlicoClient = <entryPointVersion extends EntryPointVersion>({
 }: {
     entryPointVersion: entryPointVersion
     altoRpc: string
-}) =>
-    createPimlicoClient({
+}) => {
+    const address = (() => {
+        if (entryPointVersion === "0.6") {
+            return entryPoint06Address
+        }
+        if (entryPointVersion === "0.7") {
+            return entryPoint07Address
+        }
+        return entryPoint08Address
+    })()
+
+    return createPimlicoClient({
         chain: foundry,
         entryPoint: {
-            address:
-                entryPointVersion === "0.6"
-                    ? entryPoint06Address
-                    : entryPointVersion === "0.7"
-                      ? entryPoint07Address
-                      : entryPoint08Address,
+            address,
             version: entryPointVersion
         },
         transport: http(altoRpc)
     })
+}
 
 export const getPublicClient = (anvilRpc: string) => {
     const transport = http(anvilRpc, {

packages/permissionless-test/src/utils.ts

@@ -1,18 +1,16 @@
-import type {
-    Account,
-    Assign,
-    Chain,
-    JsonRpcAccount,
-    OneOf,
-    Prettify,
-    Transport,
-    WalletClient
-} from "viem"
 import {
+    type Account,
     type Address,
+    type Assign,
+    type Chain,
     type Client,
     type Hex,
+    type JsonRpcAccount,
     type LocalAccount,
+    type OneOf,
+    type Prettify,
+    type Transport,
+    type WalletClient,
     decodeFunctionData,
     encodeAbiParameters,
     encodeFunctionData,

packages/permissionless/accounts/biconomy/toBiconomySmartAccount.ts

@@ -1,11 +1,12 @@
 import {
+    type Address,
     type Hex,
     concatHex,
+    domainSeparator,
     encodeAbiParameters,
     keccak256,
     stringToHex
 } from "viem"
-import { type Address, domainSeparator } from "viem"
 
 export type WrapMessageHashParams = {
     accountAddress: Address

packages/permissionless/accounts/etherspot/utils/wrapMessageHash.ts

@@ -1,140 +1,86 @@
-import {
+export {
     type SimpleSmartAccountImplementation,
     type ToSimpleSmartAccountParameters,
     type ToSimpleSmartAccountReturnType,
     toSimpleSmartAccount
 } from "./simple/toSimpleSmartAccount.js"
 
-import {
+export {
     type To7702SimpleSmartAccountImplementation,
     type To7702SimpleSmartAccountParameters,
     type To7702SimpleSmartAccountReturnType,
     to7702SimpleSmartAccount
 } from "./simple/to7702SimpleSmartAccount.js"
 
-import {
+export {
     type LightAccountVersion,
     type LightSmartAccountImplementation,
     type ToLightSmartAccountParameters,
     type ToLightSmartAccountReturnType,
     toLightSmartAccount
 } from "./light/toLightSmartAccount.js"
 
-import {
+export {
     type ToTrustSmartAccountParameters,
     type ToTrustSmartAccountReturnType,
     type TrustSmartAccountImplementation,
     toTrustSmartAccount
 } from "./trust/toTrustSmartAccount.js"
 
-import {
+export {
     type EtherspotSmartAccountImplementation,
     type ToEtherspotSmartAccountParameters,
     type ToEtherspotSmartAccountReturnType,
     toEtherspotSmartAccount
 } from "./etherspot/toEtherspotSmartAccount.js"
 
-import {
+export {
     type SafeSmartAccountImplementation,
     type SafeVersion,
     type ToSafeSmartAccountParameters,
     type ToSafeSmartAccountReturnType,
     toSafeSmartAccount
 } from "./safe/toSafeSmartAccount.js"
 
-import {
+export {
     type EcdsaKernelSmartAccountImplementation,
     type ToEcdsaKernelSmartAccountParameters,
     type ToEcdsaKernelSmartAccountReturnType,
     toEcdsaKernelSmartAccount
 } from "./kernel/toEcdsaKernelSmartAccount.js"
 
-import {
+export {
     type To7702KernelSmartAccountImplementation,
     type To7702KernelSmartAccountParameters,
     type To7702KernelSmartAccountReturnType,
     to7702KernelSmartAccount
 } from "./kernel/to7702KernelSmartAccount.js"
 
-import {
+export {
     type KernelSmartAccountImplementation,
     type KernelVersion,
     type ToKernelSmartAccountParameters,
     type ToKernelSmartAccountReturnType,
     toKernelSmartAccount
 } from "./kernel/toKernelSmartAccount.js"
 
-import {
+export {
     type BiconomySmartAccountImplementation,
     type ToBiconomySmartAccountParameters,
     type ToBiconomySmartAccountReturnType,
     toBiconomySmartAccount
 } from "./biconomy/toBiconomySmartAccount.js"
 
-import {
+export {
     type NexusSmartAccountImplementation,
     type ToNexusSmartAccountParameters,
     type ToNexusSmartAccountReturnType,
     toNexusSmartAccount
 } from "./nexus/toNexusSmartAccount.js"
 
-import {
+export {
     type ThirdwebSmartAccountImplementation,
     type ToThirdwebSmartAccountParameters,
     type ToThirdwebSmartAccountReturnType,
     toThirdwebSmartAccount
 } from "./thirdweb/toThirdwebSmartAccount.js"
-
-export {
-    type ToSimpleSmartAccountParameters,
-    type SimpleSmartAccountImplementation,
-    type ToSimpleSmartAccountReturnType,
-    toSimpleSmartAccount,
-    type To7702SimpleSmartAccountParameters,
-    type To7702SimpleSmartAccountImplementation,
-    type To7702SimpleSmartAccountReturnType,
-    to7702SimpleSmartAccount,
-    type LightAccountVersion,
-    type ToLightSmartAccountParameters,
-    type LightSmartAccountImplementation,
-    type ToLightSmartAccountReturnType,
-    toLightSmartAccount,
-    type ToTrustSmartAccountParameters,
-    type TrustSmartAccountImplementation,
-    type ToTrustSmartAccountReturnType,
-    toTrustSmartAccount,
-    type ToSafeSmartAccountParameters,
-    type SafeSmartAccountImplementation,
-    type ToSafeSmartAccountReturnType,
-    type SafeVersion,
-    toSafeSmartAccount,
-    type ToEcdsaKernelSmartAccountParameters,
-    type EcdsaKernelSmartAccountImplementation,
-    type ToEcdsaKernelSmartAccountReturnType,
-    toEcdsaKernelSmartAccount,
-    type KernelSmartAccountImplementation,
-    type ToKernelSmartAccountReturnType,
-    type ToKernelSmartAccountParameters,
-    type KernelVersion,
-    toKernelSmartAccount,
-    type NexusSmartAccountImplementation,
-    type ToNexusSmartAccountParameters,
-    type ToNexusSmartAccountReturnType,
-    toNexusSmartAccount,
-    type ToBiconomySmartAccountReturnType,
-    type ToBiconomySmartAccountParameters,
-    type BiconomySmartAccountImplementation,
-    toBiconomySmartAccount,
-    type ToThirdwebSmartAccountReturnType,
-    type ToThirdwebSmartAccountParameters,
-    type ThirdwebSmartAccountImplementation,
-    toThirdwebSmartAccount,
-    type ToEtherspotSmartAccountParameters,
-    type EtherspotSmartAccountImplementation,
-    type ToEtherspotSmartAccountReturnType,
-    toEtherspotSmartAccount,
-    type To7702KernelSmartAccountParameters,
-    type To7702KernelSmartAccountImplementation,
-    type To7702KernelSmartAccountReturnType,
-    to7702KernelSmartAccount
-}

packages/permissionless/accounts/index.ts

@@ -1,19 +1,17 @@
 import { Base64, Hex, PublicKey } from "ox"
-import type {
-    Account,
-    Assign,
-    Chain,
-    JsonRpcAccount,
-    OneOf,
-    PrivateKeyAccount,
-    Transport,
-    WalletClient
-} from "viem"
 import {
+    type Account,
     type Address,
+    type Assign,
+    type Chain,
     type Client,
+    type JsonRpcAccount,
     type LocalAccount,
+    type OneOf,
+    type PrivateKeyAccount,
+    type Transport,
     type TypedDataDefinition,
+    type WalletClient,
     concatHex,
     decodeFunctionData,
     encodeAbiParameters,