permissionless 0.2.3 → 0.2.5

package/_types/actions/erc7579/uninstallModules.d.ts

@@ -1,17 +1,19 @@
-import { type Address, type Chain, type Client, type Hex, type Transport } from "viem";
-import { type GetSmartAccountParameter, type SmartAccount } from "viem/account-abstraction";
-import { type ModuleType } from "./supportsModule";
-export type UninstallModulesParameters<TSmartAccount extends SmartAccount | undefined> = GetSmartAccountParameter<TSmartAccount> & {
-    modules: [
-        {
-            type: ModuleType;
-            address: Address;
-            context: Hex;
-        }
-    ];
+import type { Address, Chain, Client, Hex, Narrow, Transport } from "viem";
+import { type PaymasterActions, type SmartAccount, type UserOperationCalls } from "viem/account-abstraction";
+import { type EncodeUninstallModuleParameters } from "../../utils/encodeUninstallModule";
+export type UninstallModulesParameters<TSmartAccount extends SmartAccount | undefined, calls extends readonly unknown[] = readonly unknown[]> = EncodeUninstallModuleParameters<TSmartAccount> & {
     maxFeePerGas?: bigint;
     maxPriorityFeePerGas?: bigint;
     nonce?: bigint;
+    calls?: UserOperationCalls<Narrow<calls>>;
+    paymaster?: Address | true | {
+        /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
+        getPaymasterData?: PaymasterActions["getPaymasterData"] | undefined;
+        /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
+        getPaymasterStubData?: PaymasterActions["getPaymasterStubData"] | undefined;
+    } | undefined;
+    /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
+    paymasterContext?: unknown | undefined;
 };
 export declare function uninstallModules<TSmartAccount extends SmartAccount | undefined>(client: Client<Transport, Chain | undefined, TSmartAccount>, parameters: UninstallModulesParameters<TSmartAccount>): Promise<Hex>;
 //# sourceMappingURL=uninstallModules.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"uninstallModules.d.ts","sourceRoot":"","sources":["../../../actions/erc7579/uninstallModules.ts"],"names":[],"mappings":"AAAA,OAAO,EACH,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,SAAS,EAGjB,MAAM,MAAM,CAAA;AACb,OAAO,EACH,KAAK,wBAAwB,EAC7B,KAAK,YAAY,EAEpB,MAAM,0BAA0B,CAAA;AAIjC,OAAO,EAAE,KAAK,UAAU,EAAqB,MAAM,kBAAkB,CAAA;AAErE,MAAM,MAAM,0BAA0B,CAClC,aAAa,SAAS,YAAY,GAAG,SAAS,IAC9C,wBAAwB,CAAC,aAAa,CAAC,GAAG;IAC1C,OAAO,EAAE;QACL;YACI,IAAI,EAAE,UAAU,CAAA;YAChB,OAAO,EAAE,OAAO,CAAA;YAChB,OAAO,EAAE,GAAG,CAAA;SACf;KACJ,CAAA;IACD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,wBAAsB,gBAAgB,CAClC,aAAa,SAAS,YAAY,GAAG,SAAS,EAE9C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,aAAa,CAAC,EAC3D,UAAU,EAAE,0BAA0B,CAAC,aAAa,CAAC,GACtD,OAAO,CAAC,GAAG,CAAC,CAyDd"}
+{"version":3,"file":"uninstallModules.d.ts","sourceRoot":"","sources":["../../../actions/erc7579/uninstallModules.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,MAAM,CAAA;AAC1E,OAAO,EACH,KAAK,gBAAgB,EACrB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EAE1B,MAAM,0BAA0B,CAAA;AAIjC,OAAO,EACH,KAAK,+BAA+B,EAEvC,MAAM,mCAAmC,CAAA;AAE1C,MAAM,MAAM,0BAA0B,CAClC,aAAa,SAAS,YAAY,GAAG,SAAS,EAC9C,KAAK,SAAS,SAAS,OAAO,EAAE,GAAG,SAAS,OAAO,EAAE,IACrD,+BAA+B,CAAC,aAAa,CAAC,GAAG;IACjD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAA;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,KAAK,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;IACzC,SAAS,CAAC,EACJ,OAAO,GACP,IAAI,GACJ;QACI,uGAAuG;QACvG,gBAAgB,CAAC,EACX,gBAAgB,CAAC,kBAAkB,CAAC,GACpC,SAAS,CAAA;QACf,2FAA2F;QAC3F,oBAAoB,CAAC,EACf,gBAAgB,CAAC,sBAAsB,CAAC,GACxC,SAAS,CAAA;KAClB,GACD,SAAS,CAAA;IACf,wFAAwF;IACxF,gBAAgB,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CACzC,CAAA;AAED,wBAAsB,gBAAgB,CAClC,aAAa,SAAS,YAAY,GAAG,SAAS,EAE9C,MAAM,EAAE,MAAM,CAAC,SAAS,EAAE,KAAK,GAAG,SAAS,EAAE,aAAa,CAAC,EAC3D,UAAU,EAAE,0BAA0B,CAAC,aAAa,CAAC,GACtD,OAAO,CAAC,GAAG,CAAC,CAuCd"}

package/_types/utils/encodeInstallModule.d.ts

@@ -0,0 +1,20 @@
+import { type Address, type Hex, type OneOf } from "viem";
+import type { GetSmartAccountParameter, SmartAccount } from "viem/account-abstraction";
+import { type ModuleType } from "../actions/erc7579/supportsModule";
+export type EncodeInstallModuleParameter = {
+    type: ModuleType;
+    address: Address;
+} & OneOf<{
+    context: Hex;
+} | {
+    initData: Hex;
+}>;
+export type EncodeInstallModuleParameters<TSmartAccount extends SmartAccount | undefined> = GetSmartAccountParameter<TSmartAccount> & {
+    modules: EncodeInstallModuleParameter[] | EncodeInstallModuleParameter;
+};
+export declare function encodeInstallModule<TSmartAccount extends SmartAccount | undefined>(parameters: EncodeInstallModuleParameters<TSmartAccount>): {
+    to: `0x${string}`;
+    value: bigint;
+    data: `0x${string}`;
+}[];
+//# sourceMappingURL=encodeInstallModule.d.ts.map

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

@@ -0,0 +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"}

package/_types/utils/encodeUninstallModule.d.ts

@@ -0,0 +1,20 @@
+import { type Address, type Hex, type OneOf } from "viem";
+import type { GetSmartAccountParameter, SmartAccount } from "viem/account-abstraction";
+import { type ModuleType } from "../actions/erc7579/supportsModule";
+export type EncodeUninstallModuleParameter = {
+    type: ModuleType;
+    address: Address;
+} & OneOf<{
+    context: Hex;
+} | {
+    deInitData: Hex;
+}>;
+export type EncodeUninstallModuleParameters<TSmartAccount extends SmartAccount | undefined> = GetSmartAccountParameter<TSmartAccount> & {
+    modules: EncodeUninstallModuleParameter[] | EncodeUninstallModuleParameter;
+};
+export declare function encodeUninstallModule<TSmartAccount extends SmartAccount | undefined>(parameters: EncodeUninstallModuleParameters<TSmartAccount>): {
+    to: `0x${string}`;
+    value: bigint;
+    data: `0x${string}`;
+}[];
+//# sourceMappingURL=encodeUninstallModule.d.ts.map

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

@@ -0,0 +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"}

package/_types/utils/index.d.ts

@@ -5,6 +5,8 @@ import { isSmartAccountDeployed } from "./isSmartAccountDeployed";
 import { toOwner } from "./toOwner";
 import { decodeNonce } from "./decodeNonce";
 import { encodeNonce } from "./encodeNonce";
+import { type EncodeInstallModuleParameters, encodeInstallModule } from "./encodeInstallModule";
 import { getPackedUserOperation } from "./getPackedUserOperation";
-export { transactionReceiptStatus, deepHexlify, getRequiredPrefund, toOwner, type GetRequiredPrefundReturnType, isSmartAccountDeployed, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, encodeNonce, decodeNonce };
+import { type EncodeCallDataParams, encode7579Calls } from "./encode7579Calls";
+export { transactionReceiptStatus, deepHexlify, getRequiredPrefund, toOwner, type GetRequiredPrefundReturnType, isSmartAccountDeployed, getAddressFromInitCodeOrPaymasterAndData, getPackedUserOperation, encodeNonce, decodeNonce, type EncodeInstallModuleParameters, encodeInstallModule, type EncodeCallDataParams, encode7579Calls };
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EACH,KAAK,4BAA4B,EACjC,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,KAAK,4BAA4B,EACjC,sBAAsB,EACtB,wCAAwC,EACxC,sBAAsB,EACtB,WAAW,EACX,WAAW,EACd,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,wBAAwB,EAAE,MAAM,eAAe,CAAA;AACrE,OAAO,EAAE,wCAAwC,EAAE,MAAM,4CAA4C,CAAA;AACrG,OAAO,EACH,KAAK,4BAA4B,EACjC,kBAAkB,EACrB,MAAM,sBAAsB,CAAA;AAC7B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AACjE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,EACH,KAAK,6BAA6B,EAClC,mBAAmB,EACtB,MAAM,uBAAuB,CAAA;AAC9B,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,OAAO,EAAE,KAAK,oBAAoB,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAE9E,OAAO,EACH,wBAAwB,EACxB,WAAW,EACX,kBAAkB,EAClB,OAAO,EACP,KAAK,4BAA4B,EACjC,sBAAsB,EACtB,wCAAwC,EACxC,sBAAsB,EACtB,WAAW,EACX,WAAW,EACX,KAAK,6BAA6B,EAClC,mBAAmB,EACnB,KAAK,oBAAoB,EACzB,eAAe,EAClB,CAAA"}

package/actions/erc7579/installModule.test.ts

@@ -36,7 +36,7 @@ describe.each(getCoreSmartAccounts())(
                     account: smartClient.account,
                     type: "executor",
                     address: "0xc98B026383885F41d9a995f85FC480E9bb8bB891",
-                    context: name.startsWith("Kernel 7579")
+                    initData: name.startsWith("Kernel 7579")
                         ? encodePacked(
                               ["address", "bytes"],
                               [

package/actions/erc7579/installModule.ts

@@ -1,29 +1,50 @@
-import {
-    type Address,
-    type Client,
-    type Hex,
-    encodeFunctionData,
-    getAddress
-} from "viem"
+import type { Address, Client, Hex, Narrow, OneOf } from "viem"
 import {
     type GetSmartAccountParameter,
+    type PaymasterActions,
     type SmartAccount,
+    type UserOperationCalls,
     sendUserOperation
 } from "viem/account-abstraction"
 import { getAction, parseAccount } from "viem/utils"
 import { AccountNotFoundError } from "../../errors"
-import { type ModuleType, parseModuleTypeId } from "./supportsModule"
+import { encodeInstallModule } from "../../utils"
+import type { ModuleType } from "./supportsModule"
 
 export type InstallModuleParameters<
-    TSmartAccount extends SmartAccount | undefined
+    TSmartAccount extends SmartAccount | undefined,
+    calls extends readonly unknown[] = readonly unknown[]
 > = GetSmartAccountParameter<TSmartAccount> & {
     type: ModuleType
     address: Address
-    context: Hex
     maxFeePerGas?: bigint
     maxPriorityFeePerGas?: bigint
     nonce?: bigint
-}
+    calls?: UserOperationCalls<Narrow<calls>>
+    paymaster?:
+        | Address
+        | true
+        | {
+              /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
+              getPaymasterData?:
+                  | PaymasterActions["getPaymasterData"]
+                  | undefined
+              /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
+              getPaymasterStubData?:
+                  | PaymasterActions["getPaymasterStubData"]
+                  | undefined
+          }
+        | undefined
+    /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
+    paymasterContext?: unknown | undefined
+} & OneOf<
+        | {
+              context: Hex
+          }
+        | {
+              initData: Hex
+          }
+    >
 
 export async function installModule<
     TSmartAccount extends SmartAccount | undefined
@@ -37,7 +58,12 @@ export async function installModule<
         maxPriorityFeePerGas,
         nonce,
         address,
-        context
+        context,
+        initData,
+        type,
+        calls,
+        paymaster,
+        paymasterContext
     } = parameters
 
     if (!account_) {
@@ -54,41 +80,14 @@ export async function installModule<
         "sendUserOperation"
     )({
         calls: [
-            {
-                to: account.address,
-                value: BigInt(0),
-                data: encodeFunctionData({
-                    abi: [
-                        {
-                            name: "installModule",
-                            type: "function",
-                            stateMutability: "nonpayable",
-                            inputs: [
-                                {
-                                    type: "uint256",
-                                    name: "moduleTypeId"
-                                },
-                                {
-                                    type: "address",
-                                    name: "module"
-                                },
-                                {
-                                    type: "bytes",
-                                    name: "initData"
-                                }
-                            ],
-                            outputs: []
-                        }
-                    ],
-                    functionName: "installModule",
-                    args: [
-                        parseModuleTypeId(parameters.type),
-                        getAddress(address),
-                        context
-                    ]
-                })
-            }
+            ...encodeInstallModule({
+                account,
+                modules: [{ address, context: context ?? initData, type }]
+            }),
+            ...(calls ?? [])
         ],
+        paymaster,
+        paymasterContext,
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,

package/actions/erc7579/installModules.test.ts

@@ -34,6 +34,13 @@ describe.each(getCoreSmartAccounts())(
 
                 const opHash = await installModules(smartClient, {
                     account: smartClient.account,
+                    calls: [
+                        {
+                            to: smartClient.account.address,
+                            value: 0n,
+                            data: "0x"
+                        }
+                    ],
                     modules: [
                         {
                             type: "executor",

package/actions/erc7579/installModules.ts

@@ -1,32 +1,41 @@
+import type { Address, Chain, Client, Hex, Narrow, Transport } from "viem"
 import {
-    type Address,
-    type Chain,
-    type Client,
-    type Hex,
-    type Transport,
-    encodeFunctionData,
-    getAddress
-} from "viem"
-import {
-    type GetSmartAccountParameter,
+    type PaymasterActions,
     type SmartAccount,
+    type UserOperationCalls,
     sendUserOperation
 } from "viem/account-abstraction"
 import { getAction, parseAccount } from "viem/utils"
 import { AccountNotFoundError } from "../../errors"
-import { type ModuleType, parseModuleTypeId } from "./supportsModule"
+import {
+    type EncodeInstallModuleParameters,
+    encodeInstallModule
+} from "../../utils/encodeInstallModule"
 
 export type InstallModulesParameters<
-    TSmartAccount extends SmartAccount | undefined
-> = GetSmartAccountParameter<TSmartAccount> & {
-    modules: {
-        type: ModuleType
-        address: Address
-        context: Hex
-    }[]
+    TSmartAccount extends SmartAccount | undefined,
+    calls extends readonly unknown[] = readonly unknown[]
+> = EncodeInstallModuleParameters<TSmartAccount> & {
     maxFeePerGas?: bigint
     maxPriorityFeePerGas?: bigint
     nonce?: bigint
+    calls?: UserOperationCalls<Narrow<calls>>
+    paymaster?:
+        | Address
+        | true
+        | {
+              /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
+              getPaymasterData?:
+                  | PaymasterActions["getPaymasterData"]
+                  | undefined
+              /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
+              getPaymasterStubData?:
+                  | PaymasterActions["getPaymasterStubData"]
+                  | undefined
+          }
+        | undefined
+    /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
+    paymasterContext?: unknown | undefined
 }
 
 export async function installModules<
@@ -40,7 +49,10 @@ export async function installModules<
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,
-        modules
+        modules,
+        paymaster,
+        paymasterContext,
+        calls
     } = parameters
 
     if (!account_) {
@@ -55,36 +67,15 @@ export async function installModules<
         sendUserOperation,
         "sendUserOperation"
     )({
-        calls: modules.map(({ type, address, context }) => ({
-            to: account.address,
-            value: BigInt(0),
-            data: encodeFunctionData({
-                abi: [
-                    {
-                        name: "installModule",
-                        type: "function",
-                        stateMutability: "nonpayable",
-                        inputs: [
-                            {
-                                type: "uint256",
-                                name: "moduleTypeId"
-                            },
-                            {
-                                type: "address",
-                                name: "module"
-                            },
-                            {
-                                type: "bytes",
-                                name: "initData"
-                            }
-                        ],
-                        outputs: []
-                    }
-                ],
-                functionName: "installModule",
-                args: [parseModuleTypeId(type), getAddress(address), context]
-            })
-        })),
+        calls: [
+            ...encodeInstallModule({
+                account,
+                modules
+            }),
+            ...(calls ?? [])
+        ],
+        paymaster,
+        paymasterContext,
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,

package/actions/erc7579/isModuleInstalled.ts

@@ -4,6 +4,7 @@ import {
     type Client,
     ContractFunctionExecutionError,
     type Hex,
+    type OneOf,
     type Transport,
     decodeFunctionResult,
     encodeFunctionData,
@@ -23,8 +24,14 @@ export type IsModuleInstalledParameters<
 > = GetSmartAccountParameter<TSmartAccount> & {
     type: ModuleType
     address: Address
-    context: Hex
-}
+} & OneOf<
+        | {
+              additionalContext: Hex
+          }
+        | {
+              context: Hex
+          }
+    >
 
 export async function isModuleInstalled<
     TSmartAccount extends SmartAccount | undefined
@@ -32,7 +39,12 @@ export async function isModuleInstalled<
     client: Client<Transport, Chain | undefined, TSmartAccount>,
     parameters: IsModuleInstalledParameters<TSmartAccount>
 ): Promise<boolean> {
-    const { account: account_ = client.account, address, context } = parameters
+    const {
+        account: account_ = client.account,
+        address,
+        context,
+        additionalContext
+    } = parameters
 
     if (!account_) {
         throw new AccountNotFoundError({
@@ -82,7 +94,7 @@ export async function isModuleInstalled<
             args: [
                 parseModuleTypeId(parameters.type),
                 getAddress(address),
-                context
+                context ?? additionalContext
             ],
             address: account.address
         })
@@ -104,7 +116,7 @@ export async function isModuleInstalled<
                     args: [
                         parseModuleTypeId(parameters.type),
                         getAddress(address),
-                        context
+                        context ?? additionalContext
                     ]
                 })
             })

package/actions/erc7579/uninstallModule.ts

@@ -1,32 +1,59 @@
-import {
-    type Address,
-    type Chain,
-    type Client,
-    type Hex,
-    type Transport,
-    encodeFunctionData,
-    getAddress
+import type {
+    Address,
+    Chain,
+    Client,
+    Hex,
+    Narrow,
+    OneOf,
+    Transport
 } from "viem"
 import {
     type GetSmartAccountParameter,
+    type PaymasterActions,
     type SmartAccount,
+    type UserOperationCalls,
     sendUserOperation
 } from "viem/account-abstraction"
 import { getAction } from "viem/utils"
 import { parseAccount } from "viem/utils"
 import { AccountNotFoundError } from "../../errors"
-import { type ModuleType, parseModuleTypeId } from "./supportsModule"
+import { encodeUninstallModule } from "../../utils/encodeUninstallModule"
+import type { ModuleType } from "./supportsModule"
 
 export type UninstallModuleParameters<
-    TSmartAccount extends SmartAccount | undefined
+    TSmartAccount extends SmartAccount | undefined,
+    calls extends readonly unknown[] = readonly unknown[]
 > = GetSmartAccountParameter<TSmartAccount> & {
     type: ModuleType
     address: Address
-    context: Hex
     maxFeePerGas?: bigint
     maxPriorityFeePerGas?: bigint
     nonce?: bigint
-}
+    calls?: UserOperationCalls<Narrow<calls>>
+    paymaster?:
+        | Address
+        | true
+        | {
+              /** Retrieves paymaster-related User Operation properties to be used for sending the User Operation. */
+              getPaymasterData?:
+                  | PaymasterActions["getPaymasterData"]
+                  | undefined
+              /** Retrieves paymaster-related User Operation properties to be used for gas estimation. */
+              getPaymasterStubData?:
+                  | PaymasterActions["getPaymasterStubData"]
+                  | undefined
+          }
+        | undefined
+    /** Paymaster context to pass to `getPaymasterData` and `getPaymasterStubData` calls. */
+    paymasterContext?: unknown | undefined
+} & OneOf<
+        | {
+              deInitData: Hex
+          }
+        | {
+              context: Hex
+          }
+    >
 
 export async function uninstallModule<
     TSmartAccount extends SmartAccount | undefined
@@ -40,7 +67,12 @@ export async function uninstallModule<
         maxPriorityFeePerGas,
         nonce,
         address,
-        context
+        context,
+        deInitData,
+        type,
+        calls,
+        paymaster,
+        paymasterContext
     } = parameters
 
     if (!account_) {
@@ -57,41 +89,14 @@ export async function uninstallModule<
         "sendUserOperation"
     )({
         calls: [
-            {
-                to: account.address,
-                value: BigInt(0),
-                data: encodeFunctionData({
-                    abi: [
-                        {
-                            name: "uninstallModule",
-                            type: "function",
-                            stateMutability: "nonpayable",
-                            inputs: [
-                                {
-                                    type: "uint256",
-                                    name: "moduleTypeId"
-                                },
-                                {
-                                    type: "address",
-                                    name: "module"
-                                },
-                                {
-                                    type: "bytes",
-                                    name: "deInitData"
-                                }
-                            ],
-                            outputs: []
-                        }
-                    ],
-                    functionName: "uninstallModule",
-                    args: [
-                        parseModuleTypeId(parameters.type),
-                        getAddress(address),
-                        context
-                    ]
-                })
-            }
+            ...encodeUninstallModule({
+                account,
+                modules: [{ type, address, context: context ?? deInitData }]
+            }),
+            ...(calls ?? [])
         ],
+        paymaster,
+        paymasterContext,
         maxFeePerGas,
         maxPriorityFeePerGas,
         nonce,