@account-kit/smart-contracts 4.35.0 → 4.36.0

package/src/ma-v2/client/client.ts

@@ -28,13 +28,13 @@ import type { ModularAccountV2 } from "../account/common/modularAccountV2Base.js
 export type ModularAccountV2Client<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
   TChain extends Chain = Chain,
-  TTransport extends Transport | AlchemyTransport = Transport
+  TTransport extends Transport | AlchemyTransport = Transport,
 > = SmartAccountClient<TTransport, TChain, ModularAccountV2<TSigner>>;
 
 export type CreateModularAccountV2ClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 > = CreateModularAccountV2Params<TTransport, TSigner> &
   Omit<
     SmartAccountClientConfig<TTransport, TChain>,
@@ -44,7 +44,7 @@ export type CreateModularAccountV2ClientParams<
 export type CreateModularAccountV2AlchemyClientParams<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 > = Omit<
   CreateModularAccountV2ClientParams<TTransport, TChain, TSigner>,
   "transport"
@@ -56,22 +56,22 @@ export type CreateModularAccountV2AlchemyClientParams<
 
 export function createModularAccountV2Client<
   TChain extends Chain = Chain,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 >(
   args: CreateModularAccountV2AlchemyClientParams<
     AlchemyTransport,
     TChain,
     TSigner
-  >
+  >,
 ): Promise<ModularAccountV2Client<TSigner, TChain, AlchemyTransport>>;
 
 export function createModularAccountV2Client<
   TTransport extends Transport = Transport,
   TChain extends Chain = Chain,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 >(
   args: CreateModularAccountV2ClientParams<TTransport, TChain, TSigner> &
-    NotType<TTransport, AlchemyTransport>
+    NotType<TTransport, AlchemyTransport>,
 ): Promise<ModularAccountV2Client<TSigner, TChain>>;
 
 /**
@@ -108,7 +108,7 @@ export function createModularAccountV2Client<
 export async function createModularAccountV2Client(
   config:
     | CreateModularAccountV2ClientParams
-    | CreateModularAccountV2AlchemyClientParams
+    | CreateModularAccountV2AlchemyClientParams,
 ): Promise<SmartAccountClient | AlchemySmartAccountClient> {
   const { transport, chain } = config;
 

package/src/ma-v2/modules/allowlist-module/module.ts

@@ -15,7 +15,7 @@ export const AllowlistModule = {
         selectors: Array<Hex>;
       }>;
     },
-    address: Address
+    address: Address,
   ): {
     hookConfig: HookConfig;
     initData: Hex;
@@ -67,9 +67,9 @@ export const AllowlistModule = {
               input.hasERC20SpendLimit,
               input.erc20SpendLimit,
               input.selectors,
-            ] as const
+            ] as const,
         ),
-      ]
+      ],
     );
   },
 
@@ -108,9 +108,9 @@ export const AllowlistModule = {
               input.hasERC20SpendLimit,
               input.erc20SpendLimit,
               input.selectors,
-            ] as const
+            ] as const,
         ),
-      ]
+      ],
     );
   },
 };

package/src/ma-v2/modules/native-token-limit-module/module.ts

@@ -10,7 +10,7 @@ export const NativeTokenLimitModule = {
     const { entityId, spendLimit } = args;
     return encodeAbiParameters(
       [{ type: "uint32" }, { type: "uint256" }],
-      [entityId, spendLimit]
+      [entityId, spendLimit],
     );
   },
 

package/src/ma-v2/modules/paymaster-guard-module/module.ts

@@ -17,7 +17,7 @@ export const PaymasterGuardModule = {
           type: "address",
         },
       ],
-      [entityId, paymaster]
+      [entityId, paymaster],
     );
   },
   encodeOnUninstallData: (args: { entityId: number }): Hex => {
@@ -29,7 +29,7 @@ export const PaymasterGuardModule = {
           type: "uint32",
         },
       ],
-      [entityId]
+      [entityId],
     );
   },
 };

package/src/ma-v2/modules/single-signer-validation/module.ts

@@ -5,7 +5,7 @@ export const SingleSignerValidationModule = {
     const { entityId, signer } = args;
     return encodeAbiParameters(
       [{ type: "uint32" }, { type: "address" }],
-      [entityId, signer]
+      [entityId, signer],
     );
   },
 
@@ -18,7 +18,7 @@ export const SingleSignerValidationModule = {
           type: "uint32",
         },
       ],
-      [entityId]
+      [entityId],
     );
   },
 };

package/src/ma-v2/modules/single-signer-validation/signer.ts

@@ -1,22 +1,22 @@
 import type { SmartAccountSigner } from "@aa-sdk/core";
 import {
+  type Address,
+  type Chain,
+  concat,
+  concatHex,
   hashMessage,
   hashTypedData,
-  concatHex,
   type Hex,
   type SignableMessage,
   type TypedData,
   type TypedDataDefinition,
-  type Chain,
-  type Address,
-  concat,
 } from "viem";
 import {
   getDefaultSingleSignerValidationModuleAddress,
   SignatureType,
 } from "../utils.js";
 
-import { packUOSignature, pack1271Signature } from "../../utils.js";
+import { pack1271Signature, packUOSignature } from "../../utils.js";
 /**
  * Creates an object with methods for generating a dummy signature, signing user operation hashes, signing messages, and signing typed data.
  *
@@ -47,7 +47,7 @@ export const singleSignerMessageSigner = (
   chain: Chain,
   accountAddress: Address,
   entityId: number,
-  deferredActionData?: Hex
+  deferredActionData?: Hex,
 ) => {
   return {
     getDummySignature: (): Hex => {
@@ -67,7 +67,7 @@ export const singleSignerMessageSigner = (
           packUOSignature({
             // orderedHookData: [],
             validationSignature: signature,
-          })
+          }),
         );
 
       if (deferredActionData) {
@@ -106,14 +106,17 @@ export const singleSignerMessageSigner = (
     // we don't apply the expected 1271 packing since deferred sigs use typed data sigs and don't expect the 1271 packing
     signTypedData: async <
       const typedData extends TypedData | Record<string, unknown>,
-      primaryType extends keyof typedData | "EIP712Domain" = keyof typedData
+      primaryType extends keyof typedData | "EIP712Domain" = keyof typedData,
     >(
-      typedDataDefinition: TypedDataDefinition<typedData, primaryType>
+      typedDataDefinition: TypedDataDefinition<typedData, primaryType>,
     ): Promise<Hex> => {
       // the accounts domain already gives replay protection across accounts for deferred actions, so we don't need to apply another wrapping
       const isDeferredAction =
-        typedDataDefinition?.primaryType === "DeferredAction" &&
-        typedDataDefinition?.domain?.verifyingContract === accountAddress;
+        typedDataDefinition.primaryType === "DeferredAction" &&
+        typedDataDefinition.domain != null &&
+        // @ts-expect-error the domain type I think changed in viem, so this is not working correctly (TODO: fix this)
+        "verifyingContract" in typedDataDefinition.domain &&
+        typedDataDefinition.domain.verifyingContract === accountAddress;
 
       const validationSignature = await signer.signTypedData({
         domain: {

package/src/ma-v2/modules/time-range-module/module.ts

@@ -11,17 +11,17 @@ export const TimeRangeModule = {
       validUntil: number;
       validAfter: number;
     },
-    address: Address
+    address: Address,
   ): { hookConfig: HookConfig; initData: Hex } => {
     if (installArgs.validUntil > 2 ** 48 - 1) {
       throw new Error(
-        "TimeRangeModule.buildHook: validUntil > type(uint48).max"
+        "TimeRangeModule.buildHook: validUntil > type(uint48).max",
       );
     }
 
     if (installArgs.validAfter > 2 ** 48 - 1) {
       throw new Error(
-        "TimeRangeModule.buildHook: validAfter > type(uint48).max"
+        "TimeRangeModule.buildHook: validAfter > type(uint48).max",
       );
     }
 
@@ -56,7 +56,7 @@ export const TimeRangeModule = {
           type: "uint48",
         },
       ],
-      [entityId, validUntil, validAfter]
+      [entityId, validUntil, validAfter],
     );
   },
   encodeOnUninstallData: (args: { entityId: number }): Hex => {
@@ -68,7 +68,7 @@ export const TimeRangeModule = {
           type: "uint32",
         },
       ],
-      [entityId]
+      [entityId],
     );
   },
   encodeSetTimeRange: (args: {
@@ -90,7 +90,7 @@ export const TimeRangeModule = {
           type: "uint48",
         },
       ],
-      [entityId, validUntil, validAfter]
+      [entityId, validUntil, validAfter],
     );
   },
 };

package/src/ma-v2/modules/utils.ts

@@ -32,7 +32,7 @@ export enum SignatureType {
  * @returns {Address} The webauthn validation module address associated with the specified chain ID or a default address if no specific mapping exists
  */
 export const getDefaultWebauthnValidationModuleAddress = (
-  chain: Chain
+  chain: Chain,
 ): Address => {
   switch (chain.id) {
     // TODO: case mekong.id:
@@ -98,7 +98,7 @@ export const getDefaultTimeRangeModuleAddress = (chain: Chain): Address => {
  * @returns {Address} The single signer validation module address associated with the specified chain ID or a default address if no specific mapping exists
  */
 export const getDefaultSingleSignerValidationModuleAddress = (
-  chain: Chain
+  chain: Chain,
 ): Address => {
   switch (chain.id) {
     // TODO: case mekong.id:
@@ -132,7 +132,7 @@ export const getDefaultSingleSignerValidationModuleAddress = (
  * @returns {Address} The paymaster guard module address associated with the specified chain ID or a default address if no specific mapping exists
  */
 export const getDefaultPaymasterGuardModuleAddress = (
-  chain: Chain
+  chain: Chain,
 ): Address => {
   switch (chain.id) {
     // TODO: case mekong.id:
@@ -166,7 +166,7 @@ export const getDefaultPaymasterGuardModuleAddress = (
  * @returns {Address} The native token limit module address associated with the specified chain ID or a default address if no specific mapping exists
  */
 export const getDefaultNativeTokenLimitModuleAddress = (
-  chain: Chain
+  chain: Chain,
 ): Address => {
   switch (chain.id) {
     // TODO: case mekong.id:

package/src/ma-v2/modules/webauthn-validation/module.ts

@@ -9,7 +9,7 @@ export const WebAuthnValidationModule = {
     const { entityId, x, y } = args;
     return encodeAbiParameters(
       [{ type: "uint32" }, { type: "uint256" }, { type: "uint256" }],
-      [entityId, x, y]
+      [entityId, x, y],
     );
   },
 
@@ -22,7 +22,7 @@ export const WebAuthnValidationModule = {
           type: "uint32",
         },
       ],
-      [entityId]
+      [entityId],
     );
   },
 };

package/src/ma-v2/permissionBuilder.ts

@@ -240,7 +240,7 @@ export class PermissionBuilder {
     this.client = client;
     this.validationConfig = {
       moduleAddress: getDefaultSingleSignerValidationModuleAddress(
-        this.client.chain
+        this.client.chain,
       ),
       entityId,
       isUserOpValidation: true,
@@ -301,7 +301,7 @@ export class PermissionBuilder {
             p.data.address === targetAddress) ||
           (p.type === PermissionType.FUNCTIONS_ON_CONTRACT &&
             "address" in p.data &&
-            p.data.address === targetAddress)
+            p.data.address === targetAddress),
       );
 
       if (existingPermissionWithSameAddress) {
@@ -359,15 +359,15 @@ export class PermissionBuilder {
             validUntil: this.deadline,
             validAfter: 0,
           },
-          getDefaultTimeRangeModuleAddress(this.client.chain)
-        )
+          getDefaultTimeRangeModuleAddress(this.client.chain),
+        ),
       );
     }
 
     const installValidationCall = await this.compileRaw();
 
     const { typedData } = await deferralActions(
-      this.client
+      this.client,
     ).createDeferredActionTypedDataObject({
       callData: installValidationCall,
       deadline: this.deadline,
@@ -375,7 +375,7 @@ export class PermissionBuilder {
     });
 
     const preSignatureDigest = deferralActions(
-      this.client
+      this.client,
     ).buildPreSignatureDeferredActionDigest({ typedData });
 
     // Encode additional information to build the full pre-signature digest
@@ -396,7 +396,7 @@ export class PermissionBuilder {
     // Translate all permissions into raw hooks if >0
     if (this.permissions.length > 0) {
       const rawHooks = this.translatePermissions(
-        this.validationConfig.entityId
+        this.validationConfig.entityId,
       );
       // Add the translated permissions as hooks
       this.addHooks(rawHooks);
@@ -454,7 +454,7 @@ export class PermissionBuilder {
           rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER] = {
             hookConfig: {
               address: getDefaultNativeTokenLimitModuleAddress(
-                this.client.chain
+                this.client.chain,
               ),
               entityId,
               hookType: HookType.EXECUTION,
@@ -531,7 +531,7 @@ export class PermissionBuilder {
           rawHooks[HookIdentifier.GAS_LIMIT] = {
             hookConfig: {
               address: getDefaultNativeTokenLimitModuleAddress(
-                this.client.chain
+                this.client.chain,
               ),
               entityId,
               hookType: HookType.VALIDATION,
@@ -654,7 +654,7 @@ export class PermissionBuilder {
 
         // Only add the selectors if they aren't already in this.selectors
         const newSelectors = selectorsToAdd.filter(
-          (selector) => !this.selectors.includes(selector)
+          (selector) => !this.selectors.includes(selector),
         );
 
         this.selectors = [...this.selectors, ...newSelectors];
@@ -669,7 +669,7 @@ export class PermissionBuilder {
       this.hooks.push({
         hookConfig: rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].hookConfig,
         initData: NativeTokenLimitModule.encodeOnInstallData(
-          rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].initData
+          rawHooks[HookIdentifier.NATIVE_TOKEN_TRANSFER].initData,
         ),
       });
     }
@@ -678,7 +678,7 @@ export class PermissionBuilder {
       this.hooks.push({
         hookConfig: rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].hookConfig,
         initData: AllowlistModule.encodeOnInstallData(
-          rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].initData
+          rawHooks[HookIdentifier.ERC20_TOKEN_TRANSFER].initData,
         ),
       });
     }
@@ -687,7 +687,7 @@ export class PermissionBuilder {
       this.hooks.push({
         hookConfig: rawHooks[HookIdentifier.GAS_LIMIT].hookConfig,
         initData: NativeTokenLimitModule.encodeOnInstallData(
-          rawHooks[HookIdentifier.GAS_LIMIT].initData
+          rawHooks[HookIdentifier.GAS_LIMIT].initData,
         ),
       });
     }
@@ -696,7 +696,7 @@ export class PermissionBuilder {
       this.hooks.push({
         hookConfig: rawHooks[HookIdentifier.PREVAL_ALLOWLIST].hookConfig,
         initData: AllowlistModule.encodeOnInstallData(
-          rawHooks[HookIdentifier.PREVAL_ALLOWLIST].initData
+          rawHooks[HookIdentifier.PREVAL_ALLOWLIST].initData,
         ),
       });
     }

package/src/ma-v2/permissionBuilderErrors.ts

@@ -13,7 +13,7 @@ export class RootPermissionOnlyError extends PermissionBuilderError {
    */
   constructor(permission: Permission) {
     super(
-      `Adding ${permission.type}: Cannot add permissions with ROOT permission`
+      `Adding ${permission.type}: Cannot add permissions with ROOT permission`,
     );
   }
 }
@@ -28,7 +28,7 @@ export class AccountAddressAsTargetError extends PermissionBuilderError {
    */
   constructor(permission: Permission) {
     super(
-      `${permission.type}: Account address as target, use ACCOUNT_FUNCTIONS for account address`
+      `${permission.type}: Account address as target, use ACCOUNT_FUNCTIONS for account address`,
     );
   }
 }
@@ -44,7 +44,7 @@ export class DuplicateTargetAddressError extends PermissionBuilderError {
    */
   constructor(permission: Permission, targetAddress: Address) {
     super(
-      `${permission.type}: Address ${targetAddress} already has a permission. Cannot add multiple CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT permissions for the same target address.`
+      `${permission.type}: Address ${targetAddress} already has a permission. Cannot add multiple CONTRACT_ACCESS or FUNCTIONS_ON_CONTRACT permissions for the same target address.`,
     );
   }
 }
@@ -73,7 +73,7 @@ export class ExpiredDeadlineError extends PermissionBuilderError {
    */
   constructor(deadline: number, currentTime: number) {
     super(
-      `compileDeferred(): deadline ${deadline} cannot be before now (${currentTime})`
+      `compileDeferred(): deadline ${deadline} cannot be before now (${currentTime})`,
     );
   }
 }
@@ -88,7 +88,7 @@ export class DeadlineOverLimitError extends PermissionBuilderError {
    */
   constructor(deadline: number) {
     super(
-      `compileDeferred(): deadline ${deadline} cannot be > max uint48 (2^48 - 1)`
+      `compileDeferred(): deadline ${deadline} cannot be > max uint48 (2^48 - 1)`,
     );
   }
 }
@@ -100,7 +100,9 @@ export class ValidationConfigUnsetError extends PermissionBuilderError {
    * Constructor for initializing an error message indicating the validation config is unset.
    */
   constructor() {
-    super("Validation config unset, use permissionBuilder.configure(...)");
+    super(
+      "Missing permission among: functions on contract, functions on all contracts, account functions, contract access, or erc20 token transfer",
+    );
   }
 }
 
@@ -114,7 +116,7 @@ export class MultipleNativeTokenTransferError extends PermissionBuilderError {
    */
   constructor(permission: Permission) {
     super(
-      `${permission.type}: Must have at most ONE native token transfer permission`
+      `${permission.type}: Must have at most ONE native token transfer permission`,
     );
   }
 }

package/src/ma-v2/utils.ts

@@ -166,7 +166,7 @@ export type GetMAV2UpgradeToData<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
   TAccount extends
     | SmartContractAccountWithSigner<string, TSigner>
-    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined
+    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined,
 > = GetAccountParameter<TAccount>;
 
 /**
@@ -191,10 +191,10 @@ export async function getMAV2UpgradeToData<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
   TAccount extends
     | SmartContractAccountWithSigner<string, TSigner>
-    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined
+    | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined,
 >(
   client: SmartAccountClient<TTransport, TChain, TAccount>,
-  args: GetMAV2UpgradeToData<TSigner, TAccount>
+  args: GetMAV2UpgradeToData<TSigner, TAccount>,
 ): Promise<
   UpgradeToData & {
     createModularAccountV2FromExisting: () => Promise<
@@ -269,7 +269,7 @@ export const buildFullNonceKey = ({
 
 // Parses out the 3 components from a deferred action
 export const parseDeferredAction = (
-  deferredAction: Hex
+  deferredAction: Hex,
 ): {
   entityId: number;
   isGlobalValidation: boolean;

package/src/msca/account/multiOwnerAccount.ts

@@ -25,7 +25,7 @@ import { getDefaultMultiOwnerModularAccountFactoryAddress } from "../utils.js";
 import { standardExecutor } from "./standardExecutor.js";
 
 export type MultiOwnerModularAccount<
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 > = SmartContractAccountWithSigner<
   "MultiOwnerModularAccount",
   TSigner,
@@ -36,7 +36,7 @@ export type MultiOwnerModularAccount<
 export type CreateMultiOwnerModularAccountParams<
   TTransport extends Transport = Transport,
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TEntryPointVersion extends "0.6.0" = "0.6.0"
+  TEntryPointVersion extends "0.6.0" = "0.6.0",
 > = Pick<
   ToSmartContractAccountParams<
     "MultiOwnerModularAccount",
@@ -57,9 +57,9 @@ export type CreateMultiOwnerModularAccountParams<
 
 export async function createMultiOwnerModularAccount<
   TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 >(
-  config: CreateMultiOwnerModularAccountParams<TTransport, TSigner>
+  config: CreateMultiOwnerModularAccountParams<TTransport, TSigner>,
 ): Promise<MultiOwnerModularAccount<TSigner>>;
 
 /**
@@ -84,7 +84,7 @@ export async function createMultiOwnerModularAccount<
  * @returns {Promise<MultiOwnerModularAccount>} A promise that resolves to a `MultiOwnerModularAccount` object containing the created account information and methods
  */
 export async function createMultiOwnerModularAccount(
-  config: CreateMultiOwnerModularAccountParams
+  config: CreateMultiOwnerModularAccountParams,
 ): Promise<MultiOwnerModularAccount> {
   const {
     transport,

package/src/msca/account/multisigAccount.ts

@@ -26,7 +26,7 @@ import { standardExecutor } from "./standardExecutor.js";
 export const MULTISIG_ACCOUNT_SOURCE = "MultisigModularAccount";
 
 export type MultisigModularAccount<
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 > = SmartContractAccountWithSigner<
   typeof MULTISIG_ACCOUNT_SOURCE,
   TSigner,
@@ -38,7 +38,7 @@ export type MultisigModularAccount<
 export type CreateMultisigModularAccountParams<
   TTransport extends Transport = Transport,
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TEntryPointVersion extends "0.6.0" = "0.6.0"
+  TEntryPointVersion extends "0.6.0" = "0.6.0",
 > = Pick<
   ToSmartContractAccountParams<
     "MultisigModularAccount",
@@ -59,9 +59,9 @@ export type CreateMultisigModularAccountParams<
 
 export async function createMultisigModularAccount<
   TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner
+  TSigner extends SmartAccountSigner = SmartAccountSigner,
 >(
-  config: CreateMultisigModularAccountParams<TTransport, TSigner>
+  config: CreateMultisigModularAccountParams<TTransport, TSigner>,
 ): Promise<MultisigModularAccount<TSigner>>;
 
 /**
@@ -87,7 +87,7 @@ export async function createMultisigModularAccount<
  * @returns {Promise<MultisigModularAccount>} A promise that resolves to a `MultisigModularAccount` object containing the created account information and methods.
  */
 export async function createMultisigModularAccount(
-  config: CreateMultisigModularAccountParams
+  config: CreateMultisigModularAccountParams,
 ): Promise<MultisigModularAccount> {
   const {
     transport,
@@ -166,7 +166,7 @@ export async function createMultisigModularAccount(
 }
 
 export const isMultisigModularAccount = (
-  acct: SmartContractAccount
+  acct: SmartContractAccount,
 ): acct is MultisigModularAccount => {
   return acct.source === MULTISIG_ACCOUNT_SOURCE;
 };