permissionless 0.2.47 → 0.2.49

package/accounts/simple/toSimpleSmartAccount.ts

@@ -8,6 +8,7 @@ import {
     type JsonRpcAccount,
     type LocalAccount,
     type OneOf,
+    type PrivateKeyAccount,
     type Transport,
     type WalletClient,
     decodeFunctionData,
@@ -22,6 +23,7 @@ import {
     entryPoint07Abi,
     entryPoint07Address,
     entryPoint08Abi,
+    entryPoint08Address,
     getUserOperationHash,
     getUserOperationTypedData,
     toSmartAccount
@@ -71,27 +73,44 @@ const getAccountInitCode = async (
 }
 
 export type ToSimpleSmartAccountParameters<
-    entryPointVersion extends EntryPointVersion
+    entryPointVersion extends EntryPointVersion,
+    owner extends OneOf<
+        | EthereumProvider
+        | WalletClient<Transport, Chain | undefined, Account>
+        | LocalAccount
+    >,
+    eip7702 extends boolean = false
 > = {
     client: Client<
         Transport,
         Chain | undefined,
         JsonRpcAccount | LocalAccount | undefined
     >
-    owner: OneOf<
-        | EthereumProvider
-        | WalletClient<Transport, Chain | undefined, Account>
-        | LocalAccount
-    >
-    factoryAddress?: Address
-    entryPoint?: {
-        address: Address
-        version: entryPointVersion
-    }
-    index?: bigint
-    address?: Address
-    nonceKey?: bigint
-}
+    owner: owner
+    eip7702?: eip7702
+} & (eip7702 extends true
+    ? {
+          entryPoint?: {
+              address: Address
+              version: "0.8"
+          }
+          factoryAddress?: never
+          index?: never
+          address?: never
+          nonceKey?: never
+          accountLogicAddress?: Address
+      }
+    : {
+          entryPoint?: {
+              address: Address
+              version: entryPointVersion
+          }
+          factoryAddress?: Address
+          index?: bigint
+          address?: Address
+          nonceKey?: bigint
+          accountLogicAddress?: Address
+      })
 
 const getFactoryAddress = (
     entryPointVersion: EntryPointVersion,
@@ -121,18 +140,24 @@ const getEntryPointAbi = (entryPointVersion: EntryPointVersion) => {
 }
 
 export type SimpleSmartAccountImplementation<
-    entryPointVersion extends EntryPointVersion = "0.7"
+    entryPointVersion extends EntryPointVersion = "0.7",
+    eip7702 extends boolean = false
 > = Assign<
     SmartAccountImplementation<
         ReturnType<typeof getEntryPointAbi>,
-        entryPointVersion
+        entryPointVersion,
+        eip7702 extends true ? object : object,
+        eip7702
     >,
     { sign: NonNullable<SmartAccountImplementation["sign"]> }
 >
 
 export type ToSimpleSmartAccountReturnType<
-    entryPointVersion extends EntryPointVersion = "0.7"
-> = SmartAccount<SimpleSmartAccountImplementation<entryPointVersion>>
+    entryPointVersion extends EntryPointVersion = "0.7",
+    eip7702 extends boolean = false
+> = eip7702 extends true
+    ? SmartAccount<SimpleSmartAccountImplementation<entryPointVersion, true>>
+    : SmartAccount<SimpleSmartAccountImplementation<entryPointVersion, false>>
 
 /**
  * @description Creates an Simple Account from a private key.
@@ -140,17 +165,29 @@ export type ToSimpleSmartAccountReturnType<
  * @returns A Private Key Simple Account.
  */
 export async function toSimpleSmartAccount<
-    entryPointVersion extends EntryPointVersion
+    entryPointVersion extends EntryPointVersion,
+    owner extends OneOf<
+        | EthereumProvider
+        | WalletClient<Transport, Chain | undefined, Account>
+        | LocalAccount
+    >,
+    eip7702 extends boolean = false
 >(
-    parameters: ToSimpleSmartAccountParameters<entryPointVersion>
-): Promise<ToSimpleSmartAccountReturnType<entryPointVersion>> {
+    parameters: ToSimpleSmartAccountParameters<
+        entryPointVersion,
+        owner,
+        eip7702
+    >
+): Promise<ToSimpleSmartAccountReturnType<entryPointVersion, eip7702>> {
     const {
         client,
         owner,
         factoryAddress: _factoryAddress,
         index = BigInt(0),
         address,
-        nonceKey
+        nonceKey,
+        eip7702 = false,
+        accountLogicAddress = "0xe6Cae83BdE06E4c305530e199D7217f42808555B"
     } = parameters
 
     const localOwner = await toOwner({ owner })
@@ -161,19 +198,23 @@ export async function toSimpleSmartAccount<
               abi: getEntryPointAbi(parameters.entryPoint.version),
               version: parameters.entryPoint.version
           }
-        : ({
-              address: entryPoint07Address,
-              abi: getEntryPointAbi("0.7"),
-              version: "0.7"
-          } as const)
+        : eip7702
+          ? ({
+                address: entryPoint08Address,
+                abi: getEntryPointAbi("0.8"),
+                version: "0.8"
+            } as const)
+          : ({
+                address: entryPoint07Address,
+                abi: getEntryPointAbi("0.7"),
+                version: "0.7"
+            } as const)
 
     const factoryAddress = getFactoryAddress(
         entryPoint.version,
         _factoryAddress
     )
 
-    let accountAddress: Address | undefined = address
-
     let chainId: number
 
     const getMemoizedChainId = async () => {
@@ -184,29 +225,59 @@ export async function toSimpleSmartAccount<
         return chainId
     }
 
-    const getFactoryArgs = async () => {
+    const getFactoryArgsFunc = () => async () => {
         return {
             factory: factoryAddress,
             factoryData: await getAccountInitCode(localOwner.address, index)
         }
     }
 
+    const { accountAddress, getFactoryArgs } = await (async () => {
+        if (eip7702) {
+            return {
+                accountAddress: localOwner.address,
+                getFactoryArgs: async () => {
+                    return {
+                        factory: undefined,
+                        factoryData: undefined
+                    }
+                }
+            }
+        }
+
+        const getFactoryArgs = getFactoryArgsFunc()
+
+        if (address) {
+            return { accountAddress: address, getFactoryArgs }
+        }
+
+        const { factory, factoryData } = await getFactoryArgs()
+
+        const accountAddress = await getSenderAddress(client, {
+            factory,
+            factoryData,
+            entryPointAddress: entryPoint.address
+        })
+
+        return { accountAddress, getFactoryArgs }
+    })()
+
     return toSmartAccount({
         client,
         entryPoint,
         getFactoryArgs,
+        extend: eip7702
+            ? {
+                  implementation: accountLogicAddress
+              }
+            : undefined,
+        authorization: eip7702
+            ? {
+                  address: accountLogicAddress as Address,
+                  account: localOwner as PrivateKeyAccount
+              }
+            : undefined,
         async getAddress() {
-            if (accountAddress) return accountAddress
-
-            const { factory, factoryData } = await getFactoryArgs()
-
-            // Get the sender address based on the init code
-            accountAddress = await getSenderAddress(client, {
-                factory,
-                factoryData,
-                entryPointAddress: entryPoint.address
-            })
-
             return accountAddress
         },
         async encodeCalls(calls) {
@@ -372,12 +443,11 @@ export async function toSimpleSmartAccount<
                     entryPointAddress: entryPoint.address,
                     userOperation: {
                         ...userOperation,
-                        sender:
-                            userOperation.sender ?? (await this.getAddress()),
+                        sender: await this.getAddress(),
                         signature: "0x"
                     }
                 })
-                return await localOwner.signTypedData(typedData)
+                return localOwner.signTypedData(typedData)
             }
 
             return signMessage(client, {
@@ -398,7 +468,7 @@ export async function toSimpleSmartAccount<
                 }
             })
         }
-    }) as Promise<ToSimpleSmartAccountReturnType<entryPointVersion>>
+    }) as Promise<ToSimpleSmartAccountReturnType<entryPointVersion, eip7702>>
 }
 
 const executeSingleAbi = [

package/actions/erc7579/installModule.test.ts

@@ -1,13 +1,17 @@
 import { encodeAbiParameters, encodePacked, isHash, zeroAddress } from "viem"
+import { privateKeyToAccount } from "viem/accounts"
 import { describe, expect } from "vitest"
 import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
-import { getCoreSmartAccounts } from "../../../permissionless-test/src/utils"
+import {
+    getCoreSmartAccounts,
+    getPublicClient
+} from "../../../permissionless-test/src/utils"
 import { erc7579Actions } from "../erc7579"
 import { installModule } from "./installModule"
 
 describe.each(getCoreSmartAccounts())(
     "installModule $name",
-    ({ getErc7579SmartAccountClient, name }) => {
+    ({ getErc7579SmartAccountClient, name, isEip7702Compliant }) => {
         testWithRpc.skipIf(!getErc7579SmartAccountClient)(
             "installModule",
             async ({ rpc }) => {
@@ -15,14 +19,22 @@ describe.each(getCoreSmartAccounts())(
                     throw new Error("getErc7579SmartAccountClient not defined")
                 }
 
+                const privateKey =
+                    "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
+
+                const privateKeyAccount = privateKeyToAccount(privateKey)
+
                 const smartClientWithoutExtend =
                     await getErc7579SmartAccountClient({
                         entryPoint: {
                             version: "0.7"
                         },
+                        privateKey,
                         ...rpc
                     })
 
+                const publicClient = getPublicClient(rpc.anvilRpc)
+
                 const smartClient = smartClientWithoutExtend.extend(
                     erc7579Actions()
                 )
@@ -47,7 +59,17 @@ describe.each(getCoreSmartAccounts())(
                                   )
                               ]
                           )
-                        : moduleData
+                        : moduleData,
+                    authorization: isEip7702Compliant
+                        ? await privateKeyAccount.signAuthorization({
+                              address: (smartClient.account as any)
+                                  .implementation,
+                              chainId: smartClient.chain.id,
+                              nonce: await publicClient.getTransactionCount({
+                                  address: smartClient.account.address
+                              })
+                          })
+                        : undefined
                 })
 
                 expect(isHash(opHash)).toBe(true)
@@ -88,14 +110,22 @@ describe.each(getCoreSmartAccounts())(
                     throw new Error("getErc7579SmartAccountClient not defined")
                 }
 
+                const privateKey =
+                    "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
+
+                const privateKeyAccount = privateKeyToAccount(privateKey)
+
                 const smartClientWithoutExtend =
                     await getErc7579SmartAccountClient({
                         entryPoint: {
                             version: "0.7"
                         },
+                        privateKey,
                         ...rpc
                     })
 
+                const publicClient = getPublicClient(rpc.anvilRpc)
+
                 const smartClient = smartClientWithoutExtend.extend(
                     erc7579Actions()
                 )
@@ -112,7 +142,17 @@ describe.each(getCoreSmartAccounts())(
                             value: 0n,
                             data: "0x"
                         }
-                    ]
+                    ],
+                    authorization: isEip7702Compliant
+                        ? await privateKeyAccount.signAuthorization({
+                              address: (smartClient.account as any)
+                                  .implementation,
+                              chainId: smartClient.chain.id,
+                              nonce: await publicClient.getTransactionCount({
+                                  address: smartClient.account.address
+                              })
+                          })
+                        : undefined
                 })
 
                 await smartClient.waitForUserOperationReceipt({

package/actions/erc7579/installModule.ts

@@ -1,4 +1,4 @@
-import type { Address, Client, Hex, OneOf } from "viem"
+import type { Address, Client, Hex, OneOf, SignedAuthorization } from "viem"
 import {
     type GetSmartAccountParameter,
     type PaymasterActions,
@@ -13,6 +13,7 @@ import type { ModuleType } from "./supportsModule.js"
 export type InstallModuleParameters<
     TSmartAccount extends SmartAccount | undefined
 > = GetSmartAccountParameter<TSmartAccount> & {
+    authorization?: SignedAuthorization<number> | undefined
     type: ModuleType
     address: Address
     maxFeePerGas?: bigint
@@ -63,6 +64,7 @@ export function installModule<TSmartAccount extends SmartAccount | undefined>(
         type,
         calls,
         paymaster,
+        authorization,
         paymasterContext
     } = parameters
 
@@ -91,6 +93,7 @@ export function installModule<TSmartAccount extends SmartAccount | undefined>(
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,
+        authorization,
         account
     })
 }

package/actions/erc7579/installModules.test.ts

@@ -1,13 +1,17 @@
 import { encodeAbiParameters, encodePacked, isHash, zeroAddress } from "viem"
+import { privateKeyToAccount } from "viem/accounts"
 import { describe, expect } from "vitest"
 import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
-import { getCoreSmartAccounts } from "../../../permissionless-test/src/utils"
+import {
+    getCoreSmartAccounts,
+    getPublicClient
+} from "../../../permissionless-test/src/utils"
 import { erc7579Actions } from "../erc7579"
 import { installModules } from "./installModules"
 
 describe.each(getCoreSmartAccounts())(
     "installModules $name",
-    ({ getErc7579SmartAccountClient, name }) => {
+    ({ getErc7579SmartAccountClient, name, isEip7702Compliant }) => {
         testWithRpc.skipIf(!getErc7579SmartAccountClient)(
             "installModules",
             async ({ rpc }) => {
@@ -15,14 +19,22 @@ describe.each(getCoreSmartAccounts())(
                     throw new Error("getErc7579SmartAccountClient not defined")
                 }
 
+                const privateKey =
+                    "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
+
+                const privateKeyAccount = privateKeyToAccount(privateKey)
+
                 const smartClientWithoutExtend =
                     await getErc7579SmartAccountClient({
                         entryPoint: {
                             version: "0.7"
                         },
+                        privateKey,
                         ...rpc
                     })
 
+                const publicClient = getPublicClient(rpc.anvilRpc)
+
                 const smartClient = smartClientWithoutExtend.extend(
                     erc7579Actions()
                 )
@@ -41,6 +53,16 @@ describe.each(getCoreSmartAccounts())(
                             data: "0x"
                         }
                     ],
+                    authorization: isEip7702Compliant
+                        ? await privateKeyAccount.signAuthorization({
+                              address: (smartClient.account as any)
+                                  .implementation,
+                              chainId: smartClient.chain.id,
+                              nonce: await publicClient.getTransactionCount({
+                                  address: smartClient.account.address
+                              })
+                          })
+                        : undefined,
                     modules: [
                         {
                             type: "executor",
@@ -102,19 +124,36 @@ describe.each(getCoreSmartAccounts())(
                     throw new Error("getErc7579SmartAccountClient not defined")
                 }
 
+                const privateKey =
+                    "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
+
+                const privateKeyAccount = privateKeyToAccount(privateKey)
+
                 const smartClientWithoutExtend =
                     await getErc7579SmartAccountClient({
                         entryPoint: {
                             version: "0.7"
                         },
+                        privateKey,
                         ...rpc
                     })
+                const publicClient = getPublicClient(rpc.anvilRpc)
 
                 const smartClient = smartClientWithoutExtend.extend(
                     erc7579Actions()
                 )
 
                 const userOpHash = await smartClient.sendUserOperation({
+                    authorization: isEip7702Compliant
+                        ? await privateKeyAccount.signAuthorization({
+                              address: (smartClient.account as any)
+                                  .implementation,
+                              chainId: smartClient.chain.id,
+                              nonce: await publicClient.getTransactionCount({
+                                  address: smartClient.account.address
+                              })
+                          })
+                        : undefined,
                     calls: [
                         {
                             to: smartClient.account.address,

package/actions/erc7579/installModules.ts

@@ -1,4 +1,11 @@
-import type { Address, Chain, Client, Hex, Transport } from "viem"
+import type {
+    Address,
+    Chain,
+    Client,
+    Hex,
+    SignedAuthorization,
+    Transport
+} from "viem"
 import {
     type PaymasterActions,
     type SmartAccount,
@@ -14,6 +21,7 @@ import {
 export type InstallModulesParameters<
     TSmartAccount extends SmartAccount | undefined
 > = EncodeInstallModuleParameters<TSmartAccount> & {
+    authorization?: SignedAuthorization<number> | undefined
     maxFeePerGas?: bigint
     maxPriorityFeePerGas?: bigint
     nonce?: bigint
@@ -54,6 +62,7 @@ export async function installModules<
         modules,
         paymaster,
         paymasterContext,
+        authorization,
         calls
     } = parameters
 
@@ -80,6 +89,7 @@ export async function installModules<
         paymasterContext,
         maxFeePerGas,
         maxPriorityFeePerGas,
+        authorization,
         nonce,
         account: account
     })

package/actions/erc7579/uninstallModule.test.ts

@@ -1,13 +1,17 @@
 import { encodeAbiParameters, encodePacked, isHash, zeroAddress } from "viem"
+import { privateKeyToAccount } from "viem/accounts"
 import { describe, expect } from "vitest"
 import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
-import { getCoreSmartAccounts } from "../../../permissionless-test/src/utils"
+import {
+    getCoreSmartAccounts,
+    getPublicClient
+} from "../../../permissionless-test/src/utils"
 import { erc7579Actions } from "../erc7579"
 import { uninstallModule } from "./uninstallModule"
 
 describe.each(getCoreSmartAccounts())(
     "uninstallModule $name",
-    ({ getErc7579SmartAccountClient, name }) => {
+    ({ getErc7579SmartAccountClient, name, isEip7702Compliant }) => {
         testWithRpc.skipIf(!getErc7579SmartAccountClient)(
             "uninstallModule",
             async ({ rpc }) => {
@@ -15,14 +19,22 @@ describe.each(getCoreSmartAccounts())(
                     throw new Error("getErc7579SmartAccountClient not defined")
                 }
 
+                const privateKey =
+                    "0x4bbbf85ce3377467afe5d46f804f221813b2bb87f24d81f60f1fcdbf7cbf4356"
+
+                const privateKeyAccount = privateKeyToAccount(privateKey)
+
                 const smartClientWithoutExtend =
                     await getErc7579SmartAccountClient({
                         entryPoint: {
                             version: "0.7"
                         },
+                        privateKey,
                         ...rpc
                     })
 
+                const publicClient = getPublicClient(rpc.anvilRpc)
+
                 const smartClient = smartClientWithoutExtend.extend(
                     erc7579Actions()
                 )
@@ -46,7 +58,17 @@ describe.each(getCoreSmartAccounts())(
                                   )
                               ]
                           )
-                        : moduleData
+                        : moduleData,
+                    authorization: isEip7702Compliant
+                        ? await privateKeyAccount.signAuthorization({
+                              address: (smartClient.account as any)
+                                  .implementation,
+                              chainId: smartClient.chain.id,
+                              nonce: await publicClient.getTransactionCount({
+                                  address: smartClient.account.address
+                              })
+                          })
+                        : undefined
                 })
 
                 await smartClient.waitForUserOperationReceipt({