permissionless 0.2.13 → 0.2.14

package/_types/actions/erc7579/isModuleInstalled.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"isModuleInstalled.d.ts","sourceRoot":"","sources":["../../../actions/erc7579/isModuleInstalled.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AAIjC,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,kBAAkB,CAAA;AAErE,MAAM,MAAM,2BAA2B,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACC;IACI,iBAAiB,EAAE,GAAG,CAAA;CACzB,GACD;IACI,OAAO,EAAE,GAAG,CAAA;CACf,CACN,CAAA;AAEL,wBAAsB,iBAAiB,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,EAE9C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,aAAa,CAAC,EAC3D,UAAU,EAAE,2BAA2B,CAAC,aAAa,CAAC,GACvD,OAAO,CAAC,OAAO,CAAC,CAgGlB"}
+{"version":3,"file":"isModuleInstalled.d.ts","sourceRoot":"","sources":["../../../actions/erc7579/isModuleInstalled.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EAEX,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,SAAS,EAIjB,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AAIjC,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,kBAAkB,CAAA;AAErE,MAAM,MAAM,2BAA2B,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACC;IACI,iBAAiB,EAAE,GAAG,CAAA;CACzB,GACD;IACI,OAAO,EAAE,GAAG,CAAA;CACf,CACN,CAAA;AAEL,wBAAsB,iBAAiB,CACnC,aAAa,SAAS,YAAY,GAAG,SAAS,EAE9C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,aAAa,CAAC,EAC3D,UAAU,EAAE,2BAA2B,CAAC,aAAa,CAAC,GACvD,OAAO,CAAC,OAAO,CAAC,CA2FlB"}

package/_types/utils/encodeInstallModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encodeInstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeInstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,4BAA4B,GAAG;IACvC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,QAAQ,EAAE,GAAG,CAAA;CAChB,CACN,CAAA;AAED,MAAM,MAAM,6BAA6B,CACrC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,4BAA4B,EAAE,GAAG,4BAA4B,CAAA;CACzE,CAAA;AAED,wBAAgB,mBAAmB,CAC/B,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,6BAA6B,CAAC,aAAa,CAAC;;;;IA+CzD"}
+{"version":3,"file":"encodeInstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeInstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,4BAA4B,GAAG;IACvC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,QAAQ,EAAE,GAAG,CAAA;CAChB,CACN,CAAA;AAED,MAAM,MAAM,6BAA6B,CACrC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,4BAA4B,EAAE,GAAG,4BAA4B,CAAA;CACzE,CAAA;AAED,wBAAgB,mBAAmB,CAC/B,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,6BAA6B,CAAC,aAAa,CAAC;;;;IAkDzD"}

package/_types/utils/encodeUninstallModule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"encodeUninstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeUninstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,8BAA8B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,UAAU,EAAE,GAAG,CAAA;CAClB,CACN,CAAA;AAED,MAAM,MAAM,+BAA+B,CACvC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,8BAA8B,EAAE,GAAG,8BAA8B,CAAA;CAC7E,CAAA;AAED,wBAAgB,qBAAqB,CACjC,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,+BAA+B,CAAC,aAAa,CAAC;;;;IA+C3D"}
+{"version":3,"file":"encodeUninstallModule.d.ts","sourceRoot":"","sources":["../../utils/encodeUninstallModule.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EAGb,MAAM,MAAM,CAAA;AACb,OAAO,KAAK,EACR,wBAAwB,EACxB,YAAY,EACf,MAAM,0BAA0B,CAAA;AACjC,OAAO,EACH,KAAK,UAAU,EAElB,MAAM,mCAAmC,CAAA;AAG1C,MAAM,MAAM,8BAA8B,GAAG;IACzC,IAAI,EAAE,UAAU,CAAA;IAChB,OAAO,EAAE,OAAO,CAAA;CACnB,GAAG,KAAK,CACH;IACI,OAAO,EAAE,GAAG,CAAA;CACf,GACD;IACI,UAAU,EAAE,GAAG,CAAA;CAClB,CACN,CAAA;AAED,MAAM,MAAM,+BAA+B,CACvC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE,8BAA8B,EAAE,GAAG,8BAA8B,CAAA;CAC7E,CAAA;AAED,wBAAgB,qBAAqB,CACjC,aAAa,SAAS,YAAY,GAAG,SAAS,EAChD,UAAU,EAAE,+BAA+B,CAAC,aAAa,CAAC;;;;IAkD3D"}

package/accounts/biconomy/toBiconomySmartAccount.ts

@@ -176,15 +176,9 @@ const getAccountAddress = async ({
 }
 
 /**
- * Build a Biconomy modular smart account from a private key, that use the ECDSA signer behind the scene
- * @param client
- * @param privateKey
- * @param entryPoint
- * @param index
- * @param factoryAddress
- * @param ecdsaModuleAddress
+ * @deprecated Biconomy Smart Account is deprecated. Please use toNexusSmartAccount instead.
+ * @see toNexusSmartAccount
  */
-
 export async function toBiconomySmartAccount(
     parameters: ToBiconomySmartAccountParameters
 ): Promise<ToBiconomySmartAccountReturnType> {

package/accounts/index.ts

@@ -43,6 +43,13 @@ import {
     toBiconomySmartAccount
 } from "./biconomy/toBiconomySmartAccount"
 
+import {
+    type NexusSmartAccountImplementation,
+    type ToNexusSmartAccountParameters,
+    type ToNexusSmartAccountReturnType,
+    toNexusSmartAccount
+} from "./nexus/toNexusSmartAccount"
+
 import {
     type ThirdwebSmartAccountImplementation,
     type ToThirdwebSmartAccountParameters,
@@ -74,6 +81,10 @@ export {
     type SafeVersion,
     type KernelVersion,
     toEcdsaKernelSmartAccount,
+    type NexusSmartAccountImplementation,
+    type ToNexusSmartAccountParameters,
+    type ToNexusSmartAccountReturnType,
+    toNexusSmartAccount,
     type ToBiconomySmartAccountReturnType,
     type ToBiconomySmartAccountParameters,
     type BiconomySmartAccountImplementation,

package/accounts/nexus/toNexusSmartAccount.ts

@@ -0,0 +1,331 @@
+import type {
+    Account,
+    Assign,
+    Chain,
+    EIP1193Provider,
+    OneOf,
+    Prettify,
+    Transport,
+    TypedDataDefinition,
+    WalletClient
+} from "viem"
+import {
+    type Address,
+    type Client,
+    type Hex,
+    type LocalAccount,
+    concat,
+    concatHex,
+    domainSeparator,
+    encodeAbiParameters,
+    encodeFunctionData,
+    encodePacked,
+    getTypesForEIP712Domain,
+    hashMessage,
+    hashTypedData,
+    keccak256,
+    stringToHex,
+    toHex,
+    validateTypedData
+} from "viem"
+import {
+    type SmartAccount,
+    type SmartAccountImplementation,
+    entryPoint07Abi,
+    entryPoint07Address,
+    getUserOperationHash,
+    toSmartAccount
+} from "viem/account-abstraction"
+import { getChainId, readContract } from "viem/actions"
+import { getAction } from "viem/utils"
+import { getAccountNonce } from "../../actions/public/getAccountNonce"
+import { encode7579Calls } from "../../utils"
+import { toOwner } from "../../utils/toOwner"
+
+const wrapMessageHash = (
+    messageHash: Hex,
+    {
+        accountAddress,
+        version,
+        chainId
+    }: {
+        accountAddress: Address
+        version: "1.0.0"
+        chainId: number
+    }
+) => {
+    const _domainSeparator = domainSeparator({
+        domain: {
+            name: "Nexus",
+            version: version,
+            chainId,
+            verifyingContract: accountAddress
+        }
+    })
+    const parentStructHash = keccak256(
+        encodeAbiParameters(
+            [{ type: "bytes32" }, { type: "bytes32" }],
+            [
+                keccak256(stringToHex("PersonalSign(bytes prefixed)")),
+                messageHash
+            ]
+        )
+    )
+    return keccak256(concatHex(["0x1901", _domainSeparator, parentStructHash]))
+}
+
+/**
+ * The account creation ABI for Biconomy Smart Account (from the biconomy SmartAccountFactory)
+ */
+
+/**
+ * Default addresses for Biconomy Smart Account
+ */
+const BICONOMY_ADDRESSES: {
+    K1_VALIDATOR_FACTORY_ADDRESS: Address
+    K1_VALIDATOR_ADDRESS: Address
+} = {
+    K1_VALIDATOR_FACTORY_ADDRESS: "0x00000bb19a3579F4D779215dEf97AFbd0e30DB55",
+    K1_VALIDATOR_ADDRESS: "0x00000004171351c442B202678c48D8AB5B321E8f"
+}
+
+export type ToNexusSmartAccountParameters = Prettify<{
+    client: Client
+    owners: [
+        OneOf<
+            | EIP1193Provider
+            | WalletClient<Transport, Chain | undefined, Account>
+            | LocalAccount
+        >
+    ]
+    version: "1.0.0"
+    address?: Address | undefined
+    entryPoint?: {
+        address: Address
+        version: "0.7"
+    }
+    index?: bigint
+    factoryAddress?: Address
+    validatorAddress?: Address
+    attesters?: Address[]
+    threshold?: number
+}>
+
+export type NexusSmartAccountImplementation = Assign<
+    SmartAccountImplementation<typeof entryPoint07Abi, "0.7">,
+    { sign: NonNullable<SmartAccountImplementation["sign"]> }
+>
+
+export type ToNexusSmartAccountReturnType = Prettify<
+    SmartAccount<NexusSmartAccountImplementation>
+>
+
+export async function toNexusSmartAccount(
+    parameters: ToNexusSmartAccountParameters
+): Promise<ToNexusSmartAccountReturnType> {
+    const {
+        owners,
+        client,
+        index = 0n,
+        address,
+        version,
+        factoryAddress = BICONOMY_ADDRESSES.K1_VALIDATOR_FACTORY_ADDRESS,
+        validatorAddress = BICONOMY_ADDRESSES.K1_VALIDATOR_ADDRESS,
+        attesters = [],
+        threshold = 0
+    } = parameters
+
+    const localOwner = await toOwner({ owner: owners[0] })
+
+    const entryPoint = {
+        address: parameters.entryPoint?.address ?? entryPoint07Address,
+        abi: entryPoint07Abi,
+        version: parameters.entryPoint?.version ?? "0.7"
+    }
+
+    let accountAddress: Address | undefined = address
+
+    const getFactoryArgs = async () => {
+        return {
+            factory: factoryAddress,
+            factoryData: encodeFunctionData({
+                abi: [
+                    {
+                        name: "createAccount",
+                        type: "function",
+                        stateMutability: "nonpayable",
+                        inputs: [
+                            { type: "address", name: "eoaOwner" },
+                            { type: "uint256", name: "index" },
+                            { type: "address[]", name: "attesters" },
+                            { type: "uint8", name: "threshold" }
+                        ],
+                        outputs: [{ type: "address" }]
+                    }
+                ],
+                functionName: "createAccount",
+                args: [localOwner.address, index, attesters, threshold]
+            })
+        }
+    }
+
+    let chainId: number
+    const getMemoizedChainId = async () => {
+        if (chainId) return chainId
+        chainId = client.chain
+            ? client.chain.id
+            : await getAction(client, getChainId, "getChainId")({})
+        return chainId
+    }
+
+    return toSmartAccount({
+        client,
+        entryPoint,
+        getFactoryArgs,
+        async getAddress() {
+            if (accountAddress) return accountAddress
+
+            accountAddress = await readContract(client, {
+                address: factoryAddress,
+                abi: [
+                    {
+                        name: "computeAccountAddress",
+                        type: "function",
+                        stateMutability: "view",
+                        inputs: [
+                            { type: "address", name: "eoaOwner" },
+                            { type: "uint256", name: "index" },
+                            { type: "address[]", name: "attesters" },
+                            { type: "uint8", name: "threshold" }
+                        ],
+                        outputs: [{ type: "address" }]
+                    }
+                ],
+                functionName: "computeAccountAddress",
+                args: [localOwner.address, index, attesters, threshold]
+            })
+
+            return accountAddress
+        },
+        async getNonce(args) {
+            const TIMESTAMP_ADJUSTMENT = 16777215n // max value for size 3
+            const defaultedKey = (args?.key ?? 0n) % TIMESTAMP_ADJUSTMENT
+            const defaultedValidationMode = "0x00"
+            const key = concat([
+                toHex(defaultedKey, { size: 3 }),
+                defaultedValidationMode,
+                validatorAddress
+            ])
+
+            const address = await this.getAddress()
+
+            return getAccountNonce(client, {
+                address,
+                entryPointAddress: entryPoint.address,
+                key: BigInt(key)
+            })
+        },
+        encodeCalls: async (calls) => {
+            return encode7579Calls({
+                mode: {
+                    type: calls.length > 1 ? "batchcall" : "call",
+                    revertOnError: false,
+                    selector: "0x",
+                    context: "0x"
+                },
+                callData: calls
+            })
+        },
+        async getStubSignature() {
+            const dynamicPart = validatorAddress.substring(2).padEnd(40, "0")
+            return `0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000${dynamicPart}000000000000000000000000000000000000000000000000000000000000004181d4b4981670cb18f99f0b4a66446df1bf5b204d24cfcb659bf38ba27a4359b5711649ec2423c5e1247245eba2964679b6a1dbb85c992ae40b9b00c6935b02ff1b00000000000000000000000000000000000000000000000000000000000000` as Hex
+        },
+        async sign({ hash }) {
+            return this.signMessage({ message: hash })
+        },
+        async signMessage({ message }) {
+            const wrappedMessageHash = wrapMessageHash(hashMessage(message), {
+                version,
+                accountAddress: await this.getAddress(),
+                chainId: await getMemoizedChainId()
+            })
+
+            const signature = await localOwner.signMessage({
+                message: {
+                    raw: wrappedMessageHash
+                }
+            })
+
+            return encodePacked(
+                ["address", "bytes"],
+                [validatorAddress, signature]
+            )
+        },
+        async signTypedData(typedData) {
+            const {
+                message,
+                primaryType,
+                types: _types,
+                domain
+            } = typedData as TypedDataDefinition
+
+            const types = {
+                EIP712Domain: getTypesForEIP712Domain({
+                    domain: domain
+                }),
+                ..._types
+            }
+
+            validateTypedData({
+                domain,
+                message,
+                primaryType,
+                types
+            })
+
+            const typedHash = hashTypedData({
+                message,
+                primaryType,
+                types,
+                domain
+            })
+
+            const wrappedMessageHash = wrapMessageHash(typedHash, {
+                version,
+                accountAddress: await this.getAddress(),
+                chainId: await getMemoizedChainId()
+            })
+
+            const signature = await localOwner.signMessage({
+                message: {
+                    raw: wrappedMessageHash
+                }
+            })
+
+            return encodePacked(
+                ["address", "bytes"],
+                [validatorAddress, signature]
+            )
+        },
+        async signUserOperation(parameters) {
+            const { chainId = await getMemoizedChainId(), ...userOperation } =
+                parameters
+
+            if (!chainId) throw new Error("Chain id not found")
+
+            const hash = getUserOperationHash({
+                userOperation: {
+                    ...userOperation,
+                    sender: userOperation.sender ?? (await this.getAddress()),
+                    signature: "0x"
+                },
+                entryPointAddress: entryPoint.address,
+                entryPointVersion: entryPoint.version,
+                chainId: chainId
+            })
+            return await localOwner.signMessage({
+                message: { raw: hash as Hex }
+            })
+        }
+    })
+}

package/accounts/safe/toSafeSmartAccount.ts

@@ -1439,12 +1439,9 @@ export async function toSafeSmartAccount<
                 entryPoint: entryPoint.address
             }
 
-            let isDeployed = false
-
             if ("initCode" in userOperation) {
                 message.paymasterAndData =
                     userOperation.paymasterAndData ?? "0x"
-                isDeployed = userOperation.initCode === "0x"
             }
 
             if ("factory" in userOperation) {
@@ -1458,14 +1455,6 @@ export async function toSafeSmartAccount<
                     ...userOperation,
                     sender: userOperation.sender ?? (await this.getAddress())
                 })
-                isDeployed = !userOperation.factory
-            }
-
-            let verifyingContract = safe4337ModuleAddress
-
-            if (erc7579LaunchpadAddress && !isDeployed) {
-                verifyingContract =
-                    userOperation.sender ?? (await this.getAddress())
             }
 
             const signatures = [
@@ -1475,7 +1464,7 @@ export async function toSafeSmartAccount<
                         account: localOwner,
                         domain: {
                             chainId,
-                            verifyingContract
+                            verifyingContract: safe4337ModuleAddress
                         },
                         types:
                             entryPoint.version === "0.6"

package/actions/erc7579/installModule.test.ts

@@ -35,7 +35,7 @@ describe.each(getCoreSmartAccounts())(
                 const opHash = await installModule(smartClient, {
                     account: smartClient.account,
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     initData: name.startsWith("Kernel 7579")
                         ? encodePacked(
                               ["address", "bytes"],
@@ -74,7 +74,7 @@ describe.each(getCoreSmartAccounts())(
 
                 const isModuleInstalled = await smartClient.isModuleInstalled({
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: "0x"
                 })
 
@@ -127,7 +127,7 @@ describe.each(getCoreSmartAccounts())(
                 const opHash = await installModule(smartClient, {
                     account: smartClient.account,
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: name.startsWith("Kernel 7579")
                         ? encodePacked(
                               ["address", "bytes"],
@@ -165,7 +165,7 @@ describe.each(getCoreSmartAccounts())(
 
                 const isModuleInstalled = await smartClient.isModuleInstalled({
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: "0x"
                 })
 

package/actions/erc7579/installModules.test.ts

@@ -45,7 +45,7 @@ describe.each(getCoreSmartAccounts())(
                         {
                             type: "executor",
                             address:
-                                "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                                "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                             context: name.startsWith("Kernel 7579")
                                 ? encodePacked(
                                       ["address", "bytes"],
@@ -88,7 +88,7 @@ describe.each(getCoreSmartAccounts())(
 
                 const isModuleInstalled = await smartClient.isModuleInstalled({
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: "0x"
                 })
 
@@ -144,7 +144,7 @@ describe.each(getCoreSmartAccounts())(
                         {
                             type: "executor",
                             address:
-                                "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                                "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                             context: name.startsWith("Kernel 7579")
                                 ? encodePacked(
                                       ["address", "bytes"],
@@ -187,7 +187,7 @@ describe.each(getCoreSmartAccounts())(
 
                 const isModuleInstalled = await smartClient.isModuleInstalled({
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: "0x"
                 })
 

package/actions/erc7579/isModuleInstalled.test.ts

@@ -35,7 +35,7 @@ describe.each(getCoreSmartAccounts())(
                 const opHash = await smartClient.installModule({
                     account: smartClient.account as any,
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: name.startsWith("Kernel 7579")
                         ? encodePacked(
                               ["address", "bytes"],
@@ -60,7 +60,7 @@ describe.each(getCoreSmartAccounts())(
                     {
                         account: smartClient.account,
                         type: "executor",
-                        address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                        address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                         context: "0x"
                     }
                 )

package/actions/erc7579/isModuleInstalled.ts

@@ -58,28 +58,23 @@ export async function isModuleInstalled<
 
     const abi = [
         {
-            name: "isModuleInstalled",
             type: "function",
-            stateMutability: "view",
+            name: "isModuleInstalled",
             inputs: [
                 {
+                    name: "moduleType",
                     type: "uint256",
-                    name: "moduleTypeId"
-                },
-                {
-                    type: "address",
-                    name: "module"
+                    internalType: "uint256"
                 },
+                { name: "module", type: "address", internalType: "address" },
                 {
+                    name: "additionalContext",
                     type: "bytes",
-                    name: "additionalContext"
+                    internalType: "bytes"
                 }
             ],
-            outputs: [
-                {
-                    type: "bool"
-                }
-            ]
+            outputs: [{ name: "", type: "bool", internalType: "bool" }],
+            stateMutability: "view"
         }
     ] as const
 

package/actions/erc7579/uninstallModule.test.ts

@@ -34,7 +34,7 @@ describe.each(getCoreSmartAccounts())(
 
                 const opHash = await smartClient.installModule({
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: name.startsWith("Kernel 7579")
                         ? encodePacked(
                               ["address", "bytes"],
@@ -59,7 +59,7 @@ describe.each(getCoreSmartAccounts())(
                     {
                         account: smartClient.account,
                         type: "executor",
-                        address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                        address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                         context: name.startsWith("Kernel 7579")
                             ? "0x"
                             : encodeAbiParameters(

package/actions/erc7579/uninstallModules.test.ts

@@ -34,7 +34,7 @@ describe.each(getCoreSmartAccounts())(
 
                 const opHash = await smartClient.installModule({
                     type: "executor",
-                    address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                    address: "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                     context: name.startsWith("Kernel 7579")
                         ? encodePacked(
                               ["address", "bytes"],
@@ -62,7 +62,7 @@ describe.each(getCoreSmartAccounts())(
                             {
                                 type: "executor",
                                 address:
-                                    "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
+                                    "0x4Fd8d57b94966982B62e9588C27B4171B55E8354",
                                 context: name.startsWith("Kernel 7579")
                                     ? "0x"
                                     : encodeAbiParameters(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "permissionless",
-    "version": "0.2.13",
+    "version": "0.2.14",
     "author": "Pimlico",
     "homepage": "https://docs.pimlico.io/permissionless",
     "repository": "github:pimlicolabs/permissionless.js",

package/utils/encodeInstallModule.ts

@@ -54,24 +54,27 @@ export function encodeInstallModule<
         data: encodeFunctionData({
             abi: [
                 {
-                    name: "installModule",
                     type: "function",
-                    stateMutability: "nonpayable",
+                    name: "installModule",
                     inputs: [
                         {
+                            name: "moduleType",
                             type: "uint256",
-                            name: "moduleTypeId"
+                            internalType: "uint256"
                         },
                         {
+                            name: "module",
                             type: "address",
-                            name: "module"
+                            internalType: "address"
                         },
                         {
+                            name: "initData",
                             type: "bytes",
-                            name: "initData"
+                            internalType: "bytes"
                         }
                     ],
-                    outputs: []
+                    outputs: [],
+                    stateMutability: "nonpayable"
                 }
             ],
             functionName: "installModule",

package/utils/encodeUninstallModule.ts

@@ -54,24 +54,27 @@ export function encodeUninstallModule<
         data: encodeFunctionData({
             abi: [
                 {
-                    name: "uninstallModule",
                     type: "function",
-                    stateMutability: "nonpayable",
+                    name: "uninstallModule",
                     inputs: [
                         {
+                            name: "moduleType",
                             type: "uint256",
-                            name: "moduleTypeId"
+                            internalType: "uint256"
                         },
                         {
+                            name: "module",
                             type: "address",
-                            name: "module"
+                            internalType: "address"
                         },
                         {
+                            name: "deInitData",
                             type: "bytes",
-                            name: "deInitData"
+                            internalType: "bytes"
                         }
                     ],
-                    outputs: []
+                    outputs: [],
+                    stateMutability: "nonpayable"
                 }
             ],
             functionName: "uninstallModule",