permissionless 0.1.36 → 0.1.39

package/accounts/safe/signerToSafeSmartAccount.ts

@@ -551,7 +551,7 @@ export type SafeSmartAccount<
 const get7579LaunchPadInitData = ({
     safe4337ModuleAddress,
     safeSingletonAddress,
-    erc7569LaunchpadAddress,
+    erc7579LaunchpadAddress,
     owner,
     validators,
     executors,
@@ -562,7 +562,7 @@ const get7579LaunchPadInitData = ({
 }: {
     safe4337ModuleAddress: Address
     safeSingletonAddress: Address
-    erc7569LaunchpadAddress: Address
+    erc7579LaunchpadAddress: Address
     owner: Address
     executors: {
         address: Address
@@ -578,7 +578,7 @@ const get7579LaunchPadInitData = ({
         singleton: safeSingletonAddress,
         owners: [owner],
         threshold: BigInt(1),
-        setupTo: erc7569LaunchpadAddress,
+        setupTo: erc7579LaunchpadAddress,
         setupData: encodeFunctionData({
             abi: initSafe7579Abi,
             functionName: "initSafe7579",
@@ -613,7 +613,7 @@ const getInitializerCode = async ({
     safe4337ModuleAddress,
     multiSendAddress,
     safeSingletonAddress,
-    erc7569LaunchpadAddress,
+    erc7579LaunchpadAddress,
     setupTransactions = [],
     safeModules = [],
     validators = [],
@@ -628,7 +628,7 @@ const getInitializerCode = async ({
     safeModuleSetupAddress: Address
     safe4337ModuleAddress: Address
     multiSendAddress: Address
-    erc7569LaunchpadAddress?: Address
+    erc7579LaunchpadAddress?: Address
     setupTransactions?: {
         to: Address
         data: Address
@@ -645,11 +645,11 @@ const getInitializerCode = async ({
     attesters?: Address[]
     attestersThreshold?: number
 }) => {
-    if (erc7569LaunchpadAddress) {
+    if (erc7579LaunchpadAddress) {
         const initData = get7579LaunchPadInitData({
             safe4337ModuleAddress,
             safeSingletonAddress,
-            erc7569LaunchpadAddress,
+            erc7579LaunchpadAddress,
             owner,
             validators,
             executors,
@@ -793,7 +793,7 @@ const getAccountInitCode = async ({
     safeModuleSetupAddress,
     safe4337ModuleAddress,
     safeSingletonAddress,
-    erc7569LaunchpadAddress,
+    erc7579LaunchpadAddress,
     multiSendAddress,
     saltNonce = BigInt(0),
     setupTransactions = [],
@@ -810,7 +810,7 @@ const getAccountInitCode = async ({
     safe4337ModuleAddress: Address
     safeSingletonAddress: Address
     multiSendAddress: Address
-    erc7569LaunchpadAddress?: Address
+    erc7579LaunchpadAddress?: Address
     saltNonce?: bigint
     setupTransactions?: {
         to: Address
@@ -840,7 +840,7 @@ const getAccountInitCode = async ({
         setupTransactions,
         safeSingletonAddress,
         safeModules,
-        erc7569LaunchpadAddress,
+        erc7579LaunchpadAddress,
         validators,
         executors,
         fallbacks,
@@ -853,7 +853,7 @@ const getAccountInitCode = async ({
         abi: createProxyWithNonceAbi,
         functionName: "createProxyWithNonce",
         args: [
-            erc7569LaunchpadAddress ?? safeSingletonAddress,
+            erc7579LaunchpadAddress ?? safeSingletonAddress,
             initializer,
             saltNonce
         ]
@@ -873,7 +873,7 @@ const getAccountAddress = async <
     safeProxyFactoryAddress,
     safeSingletonAddress,
     multiSendAddress,
-    erc7569LaunchpadAddress,
+    erc7579LaunchpadAddress,
     setupTransactions = [],
     safeModules = [],
     saltNonce = BigInt(0),
@@ -898,7 +898,7 @@ const getAccountAddress = async <
     }[]
     safeModules?: Address[]
     saltNonce?: bigint
-    erc7569LaunchpadAddress?: Address
+    erc7579LaunchpadAddress?: Address
     validators?: { address: Address; context: Address }[]
     executors?: {
         address: Address
@@ -923,7 +923,7 @@ const getAccountAddress = async <
         setupTransactions,
         safeSingletonAddress,
         safeModules,
-        erc7569LaunchpadAddress,
+        erc7579LaunchpadAddress,
         validators,
         executors,
         fallbacks,
@@ -936,7 +936,7 @@ const getAccountAddress = async <
         ["bytes", "uint256"],
         [
             proxyCreationCode,
-            hexToBigInt(erc7569LaunchpadAddress ?? safeSingletonAddress)
+            hexToBigInt(erc7579LaunchpadAddress ?? safeSingletonAddress)
         ]
     )
 
@@ -1051,7 +1051,8 @@ export type SignerToSafeSmartAccountParameters<
     safeVersion: SafeVersion
     entryPoint: entryPoint
     safe4337ModuleAddress?: Address
-    erc7569LaunchpadAddress?: TErc7579
+    erc7569LaunchpadAddress?: Address
+    erc7579LaunchpadAddress?: TErc7579
     safeProxyFactoryAddress?: Address
     safeSingletonAddress?: Address
     address?: Address
@@ -1074,7 +1075,7 @@ function isErc7579Args(
     Address,
     Address
 > {
-    return args.erc7569LaunchpadAddress !== undefined
+    return args.erc7579LaunchpadAddress !== undefined
 }
 
 /**
@@ -1114,7 +1115,7 @@ export async function signerToSafeSmartAccount<
         safe4337ModuleAddress: _safe4337ModuleAddress,
         safeProxyFactoryAddress: _safeProxyFactoryAddress,
         safeSingletonAddress: _safeSingletonAddress,
-        erc7569LaunchpadAddress,
+        erc7579LaunchpadAddress = args.erc7579LaunchpadAddress,
         saltNonce = BigInt(0),
         validUntil = 0,
         validAfter = 0,
@@ -1187,7 +1188,7 @@ export async function signerToSafeSmartAccount<
             safeProxyFactoryAddress,
             safeSingletonAddress,
             multiSendAddress,
-            erc7569LaunchpadAddress,
+            erc7579LaunchpadAddress,
             saltNonce,
             setupTransactions,
             safeModules,
@@ -1316,7 +1317,7 @@ export async function signerToSafeSmartAccount<
 
                 let verifyingContract = safe4337ModuleAddress
 
-                if (erc7569LaunchpadAddress && !isDeployed) {
+                if (erc7579LaunchpadAddress && !isDeployed) {
                     verifyingContract = userOperation.sender
                 }
 
@@ -1387,7 +1388,7 @@ export async function signerToSafeSmartAccount<
                     safe4337ModuleAddress,
                     safeSingletonAddress,
                     multiSendAddress,
-                    erc7569LaunchpadAddress,
+                    erc7579LaunchpadAddress,
                     saltNonce,
                     setupTransactions,
                     safeModules,
@@ -1407,9 +1408,8 @@ export async function signerToSafeSmartAccount<
             async encodeCallData(args) {
                 const isArray = Array.isArray(args)
 
-                if (erc7569LaunchpadAddress) {
+                if (erc7579LaunchpadAddress) {
                     // First transaction will be slower because we need to enable 7579 modules
-
                     safeDeployed =
                         safeDeployed ||
                         (await isSmartAccountDeployed(client, accountAddress))
@@ -1418,7 +1418,7 @@ export async function signerToSafeSmartAccount<
                         const initData = get7579LaunchPadInitData({
                             safe4337ModuleAddress,
                             safeSingletonAddress,
-                            erc7569LaunchpadAddress,
+                            erc7579LaunchpadAddress,
                             owner: viemSigner.address,
                             validators,
                             executors,

package/actions/erc7579/installModule.test.ts

@@ -68,7 +68,117 @@ describe.each(getCoreSmartAccounts())(
                     type: "executor",
                     address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
                     context:
-                        name === "Kernel"
+                        name === "Kernel 7579"
+                            ? encodePacked(
+                                  ["address", "bytes"],
+                                  [
+                                      zeroAddress,
+                                      encodeAbiParameters(
+                                          [
+                                              { type: "bytes" },
+                                              { type: "bytes" }
+                                          ],
+                                          [moduleData, "0x"]
+                                      )
+                                  ]
+                              )
+                            : moduleData
+                })
+
+                const bundlerClientV07 = createBundlerClient({
+                    transport: http(altoRpc),
+                    entryPoint: ENTRYPOINT_ADDRESS_V07
+                })
+
+                expect(isHash(opHash)).toBe(true)
+
+                const userOperationReceipt =
+                    await bundlerClientV07.waitForUserOperationReceipt({
+                        hash: opHash,
+                        timeout: 100000
+                    })
+                expect(userOperationReceipt).not.toBeNull()
+                expect(userOperationReceipt?.userOpHash).toBe(opHash)
+                expect(
+                    userOperationReceipt?.receipt.transactionHash
+                ).toBeTruthy()
+
+                const receipt = await bundlerClientV07.getUserOperationReceipt({
+                    hash: opHash
+                })
+
+                expect(receipt?.receipt.transactionHash).toBe(
+                    userOperationReceipt?.receipt.transactionHash
+                )
+
+                const isModuleInstalled = await smartClient.isModuleInstalled({
+                    type: "executor",
+                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    context: "0x"
+                })
+
+                expect(isModuleInstalled).toBe(true)
+            }
+        )
+        testWithRpc.skipIf(!getErc7579SmartAccountClient)(
+            "installModule",
+            async ({ rpc }) => {
+                const { anvilRpc, altoRpc, paymasterRpc } = rpc
+
+                if (!getErc7579SmartAccountClient) {
+                    throw new Error("getErc7579SmartAccountClient not defined")
+                }
+
+                const privateKey = generatePrivateKey()
+
+                const smartClientWithoutExtend: SmartAccountClient<
+                    ENTRYPOINT_ADDRESS_V07_TYPE,
+                    Transport,
+                    Chain,
+                    SmartAccount<ENTRYPOINT_ADDRESS_V07_TYPE>
+                > = await getErc7579SmartAccountClient({
+                    entryPoint: ENTRYPOINT_ADDRESS_V07,
+                    privateKey: privateKey,
+                    altoRpc: altoRpc,
+                    anvilRpc: anvilRpc,
+                    paymasterClient: getPimlicoPaymasterClient({
+                        entryPoint: ENTRYPOINT_ADDRESS_V07,
+                        paymasterRpc
+                    })
+                })
+
+                const smartClient = smartClientWithoutExtend.extend(
+                    erc7579Actions({
+                        entryPoint: ENTRYPOINT_ADDRESS_V07
+                    })
+                )
+
+                await smartClient.sendTransactions({
+                    transactions: [
+                        {
+                            to: smartClient.account.address,
+                            value: 0n,
+                            data: "0x"
+                        },
+                        {
+                            to: smartClient.account.address,
+                            value: 0n,
+                            data: "0x"
+                        }
+                    ]
+                })
+
+                const moduleData = encodePacked(
+                    ["address"],
+                    [smartClient.account.address]
+                )
+
+                const opHash = await installModule(smartClient as any, {
+                    account: smartClient.account as any,
+                    type: "executor",
+                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    context:
+                        name === "Kernel 7579"
                             ? encodePacked(
                                   ["address", "bytes"],
                                   [

package/actions/erc7579/isModuleInstalled.test.ts

@@ -67,7 +67,7 @@ describe.each(getCoreSmartAccounts())(
                     type: "executor",
                     address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
                     context:
-                        name === "Kernel"
+                        name === "Kernel 7579"
                             ? encodePacked(
                                   ["address", "bytes"],
                                   [

package/actions/erc7579/supportsExecutionMode.ts

@@ -37,9 +37,9 @@ function parseCallType(callType: CallType) {
     switch (callType) {
         case "call":
             return "0x00"
-        case "delegatecall":
-            return "0x01"
         case "batchcall":
+            return "0x01"
+        case "delegatecall":
             return "0xff"
     }
 }

package/actions/erc7579/uninstallModule.test.ts

@@ -77,7 +77,7 @@ describe.each(getCoreSmartAccounts())(
                     type: "executor",
                     address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
                     context:
-                        name === "Kernel"
+                        name === "Kernel 7579"
                             ? encodePacked(
                                   ["address", "bytes"],
                                   [
@@ -111,7 +111,7 @@ describe.each(getCoreSmartAccounts())(
                         type: "executor",
                         address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
                         context:
-                            name === "Kernel"
+                            name === "Kernel 7579"
                                 ? "0x"
                                 : encodeAbiParameters(
                                       [

package/actions/public/getSenderAddress.test.ts

@@ -3,7 +3,7 @@ import { generatePrivateKey } from "viem/accounts"
 import { describe, expect } from "vitest"
 import { testWithRpc } from "../../../permissionless-test/src/testWithRpc"
 import { getSimpleAccountClient } from "../../../permissionless-test/src/utils"
-import type { ENTRYPOINT_ADDRESS_V06_TYPE } from "../../_types/types"
+import type { ENTRYPOINT_ADDRESS_V06_TYPE } from "../../types"
 import { ENTRYPOINT_ADDRESS_V06, ENTRYPOINT_ADDRESS_V07 } from "../../utils"
 import { getSenderAddress } from "./getSenderAddress"
 

package/actions/public/getSenderAddress.ts

@@ -1,14 +1,15 @@
 import {
     type Address,
     BaseError,
-    type CallExecutionErrorType,
     type Chain,
     type Client,
     type ContractFunctionExecutionErrorType,
-    type ContractFunctionRevertedErrorType,
+    ContractFunctionRevertedError,
     type Hex,
-    type RpcRequestErrorType,
+    InvalidInputRpcError,
+    RpcRequestError,
     type Transport,
+    UnknownRpcError,
     concat,
     decodeErrorResult
 } from "viem"
@@ -132,10 +133,15 @@ export const getSenderAddress = async <
             args: [initCode || concat([factory as Hex, factoryData as Hex])]
         })
     } catch (e) {
-        const err = e as ContractFunctionExecutionErrorType
+        const revertError = (e as ContractFunctionExecutionErrorType).walk(
+            (err) =>
+                err instanceof ContractFunctionRevertedError ||
+                err instanceof RpcRequestError ||
+                err instanceof InvalidInputRpcError ||
+                err instanceof UnknownRpcError
+        )
 
-        if (err.cause.name === "ContractFunctionRevertedError") {
-            const revertError = err.cause as ContractFunctionRevertedErrorType
+        if (revertError instanceof ContractFunctionRevertedError) {
             const errorName = revertError.data?.errorName ?? ""
             if (
                 errorName === "SenderAddressResult" &&
@@ -146,84 +152,112 @@ export const getSenderAddress = async <
             }
         }
 
-        if (err.cause.name === "CallExecutionError") {
-            const callExecutionError = err.cause as CallExecutionErrorType
-            if (callExecutionError.cause.name === "RpcRequestError") {
-                const revertError =
-                    callExecutionError.cause as RpcRequestErrorType
+        if (revertError instanceof RpcRequestError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = (revertError as unknown as any).cause.data.match(
+                hexStringRegex
+            )
 
-                const hexStringRegex = /0x[a-fA-F0-9]+/
-                // biome-ignore lint/suspicious/noExplicitAny:
-                const match = (revertError as unknown as any).cause.data.match(
-                    hexStringRegex
+            if (!match) {
+                throw new Error(
+                    "Failed to parse revert bytes from RPC response"
                 )
+            }
 
-                if (!match) {
-                    throw new Error(
-                        "Failed to parse revert bytes from RPC response"
-                    )
-                }
+            const data: Hex = match[0]
 
-                const data: Hex = match[0]
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            })
 
-                const error = decodeErrorResult({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                })
+            return error.args[0] as Address
+        }
+
+        if (revertError instanceof InvalidInputRpcError) {
+            const hexStringRegex = /0x[a-fA-F0-9]+/
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = (revertError as unknown as any).cause.data.match(
+                hexStringRegex
+            )
 
-                return error.args[0] as Address
+            if (!match) {
+                throw new Error(
+                    "Failed to parse revert bytes from RPC response"
+                )
             }
 
-            if (callExecutionError.cause.name === "InvalidInputRpcError") {
-                //Ganache local testing returns "InvalidInputRpcError" with data in regular format
-                const revertError =
-                    callExecutionError.cause as RpcRequestErrorType
+            const data: Hex = match[0]
 
-                const hexStringRegex = /0x[a-fA-F0-9]+/
-                // biome-ignore lint/suspicious/noExplicitAny:
-                const match = (revertError as unknown as any).cause.data.match(
-                    hexStringRegex
-                )
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            })
 
-                if (!match) {
-                    throw new Error(
-                        "Failed to parse revert bytes from RPC response"
-                    )
-                }
+            return error.args[0] as Address
+        }
 
-                const data: Hex = match[0]
+        if (revertError instanceof UnknownRpcError) {
+            const parsedBody = JSON.parse(
+                (revertError as unknown as any).cause.body
+            )
+            const revertData = parsedBody.error.data
 
-                const error = decodeErrorResult({
-                    abi: [
-                        {
-                            inputs: [
-                                {
-                                    internalType: "address",
-                                    name: "sender",
-                                    type: "address"
-                                }
-                            ],
-                            name: "SenderAddressResult",
-                            type: "error"
-                        }
-                    ],
-                    data
-                })
+            const hexStringRegex = /0x[a-fA-F0-9]+/
+            // biome-ignore lint/suspicious/noExplicitAny:
+            const match = revertData.match(hexStringRegex)
 
-                return error.args[0] as Address
+            if (!match) {
+                throw new Error(
+                    "Failed to parse revert bytes from RPC response"
+                )
             }
+
+            const data: Hex = match[0]
+
+            const error = decodeErrorResult({
+                abi: [
+                    {
+                        inputs: [
+                            {
+                                internalType: "address",
+                                name: "sender",
+                                type: "address"
+                            }
+                        ],
+                        name: "SenderAddressResult",
+                        type: "error"
+                    }
+                ],
+                data
+            })
+
+            return error.args[0] as Address
         }
 
         throw e