@alchemy/smart-accounts 0.0.0-alpha.5 → 0.0.0-alpha.6

package/dist/esm/light-account/accounts/base.d.ts

@@ -1,7 +1,7 @@
 import { type Abi, type Address, type Chain, type Client, type Hex, type JsonRpcAccount, type LocalAccount, type Transport } from "viem";
-import { type SmartAccount, type SmartAccountImplementation } from "viem/account-abstraction";
+import { type SmartAccountImplementation } from "viem/account-abstraction";
 import type { EntryPointFromAccountRegistry, LightAccountType, LightAccountVersion } from "../registry.js";
-import type { SignatureRequest } from "../../types.js";
+import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 export type BaseLightAccountImplementation<TLightAccountType extends LightAccountType = LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>> = SmartAccountImplementation<EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>["abi"], EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>["version"], {
     getLightAccountVersion: () => TLightAccountVersion;
     smartAccountType: TLightAccountType;
@@ -12,7 +12,7 @@ export type BaseLightAccountImplementation<TLightAccountType extends LightAccoun
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
 }, false>;
-export type LightAccountBase<TLightAccountType extends LightAccountType = LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>> = SmartAccount<BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>>;
+export type LightAccountBase<TLightAccountType extends LightAccountType = LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>> = SmartAccountWithDecodeCalls<BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>>;
 export type ToLightAccountBaseParams<TLightAccountType extends LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>, TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     abi: Abi;

package/dist/esm/light-account/accounts/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  concat,\n  concatHex,\n  encodeFunctionData,\n  fromHex,\n  hashMessage,\n  hashTypedData,\n  trim,\n  type Abi,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type TypedDataDefinition,\n} from \"viem\";\nimport {\n  getUserOperationHash,\n  toSmartAccount,\n  type SmartAccount,\n  type SmartAccountImplementation,\n} from \"viem/account-abstraction\";\nimport { getStorageAt, signMessage, signTypedData } from \"viem/actions\";\nimport type {\n  EntryPointFromAccountRegistry,\n  LightAccountType,\n  LightAccountVersion,\n} from \"../registry.js\";\nimport { EIP1967_PROXY_IMPL_STORAGE_SLOT } from \"../utils.js\";\nimport { AccountVersionRegistry } from \"../registry.js\";\nimport {\n  encodeCallsLA as encodeCalls,\n  decodeCallsLA as decodeCalls,\n} from \"./calldataCodec.js\";\nimport { BaseError, lowerAddress } from \"@alchemy/common\";\nimport type {\n  SignatureRequest,\n  StaticSmartAccountImplementation,\n} from \"../../types.js\";\nimport { getAction } from \"viem/utils\";\n\nconst SignaturePrefix = {\n  EOA: \"0x00\",\n  CONTRACT: \"0x01\",\n  CONTRACT_WITH_ADDR: \"0x02\",\n} as const;\n\nexport type BaseLightAccountImplementation<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountImplementation<\n  EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>[\"abi\"],\n  EntryPointFromAccountRegistry<\n    TLightAccountType,\n    TLightAccountVersion\n  >[\"version\"],\n  {\n    getLightAccountVersion: () => TLightAccountVersion;\n    smartAccountType: TLightAccountType;\n    encodeUpgradeToAndCall: (params: {\n      upgradeToAddress: Address;\n      upgradeToInitData: Hex;\n    }) => Promise<Hex>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type LightAccountBase<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccount<\n  BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>\n>;\n\nexport type ToLightAccountBaseParams<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  abi: Abi;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  type: TLightAccountType;\n  version: TLightAccountVersion;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n};\n\nexport async function toLightAccountBase<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n>({\n  client,\n  abi,\n  accountAddress,\n  owner,\n  type,\n  version,\n  getFactoryArgs,\n}: ToLightAccountBaseParams<\n  TLightAccountType,\n  TLightAccountVersion,\n  TTransport\n>): Promise<LightAccountBase<TLightAccountType, TLightAccountVersion>> {\n  const encodeUpgradeToAndCall = async ({\n    upgradeToAddress,\n    upgradeToInitData,\n  }: {\n    upgradeToAddress: Address;\n    upgradeToInitData: Hex;\n  }): Promise<Hex> => {\n    const expectedImplAddresses = (\n      Object.values(\n        AccountVersionRegistry[type],\n      ) as StaticSmartAccountImplementation<false>[]\n    ).map((x) => x.accountImplementation);\n\n    const getStorageAtAction = getAction(client, getStorageAt, \"getStorageAt\");\n    // TODO(v5): This is a super fragile workflow, and we should consider not supporting this on the SmartAccount level in v5.\n    const storage = await getStorageAtAction({\n      address: accountAddress,\n      slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,\n    });\n\n    if (storage == null) {\n      throw new BaseError(\n        `Failed to get storage slot: ${EIP1967_PROXY_IMPL_STORAGE_SLOT}`,\n      );\n    }\n\n    // Only upgrade undeployed accounts (storage 0) or deployed light accounts, else error.\n    if (\n      fromHex(storage, \"number\") !== 0 &&\n      !expectedImplAddresses.some((x) => x === lowerAddress(trim(storage)))\n    ) {\n      throw new BaseError(\n        `could not determine if smart account implementation is ${type} ${String(\n          version,\n        )}`,\n      );\n    }\n\n    return encodeFunctionData({\n      abi,\n      functionName: \"upgradeToAndCall\",\n      args: [upgradeToAddress, upgradeToInitData],\n    });\n  };\n\n  const get1271Wrapper = (\n    hashedMessage: Hex,\n    version: string,\n  ): TypedDataDefinition => {\n    return {\n      // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)\n      // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236\n      domain: {\n        chainId: client.chain.id,\n        name: type,\n        verifyingContract: accountAddress,\n        version,\n      },\n      types: {\n        LightAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: hashedMessage,\n      },\n      primaryType: \"LightAccountMessage\",\n    };\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const messageHash =\n      params.type === \"eth_signTypedData_v4\"\n        ? hashTypedData(params.data)\n        : hashMessage(params.data);\n\n    switch (version) {\n      case \"v1.0.1\":\n        return params;\n      case \"v1.0.2\":\n        throw new BaseError(\n          `Version ${String(version)} of LightAccount doesn't support 1271`,\n        );\n      case \"v1.1.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"1\"),\n        };\n      case \"v2.0.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"2\"),\n        };\n      default:\n        throw new BaseError(\n          `Unknown version ${String(version)} of LightAccount`,\n        );\n    }\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return version === \"v2.0.0\"\n      ? concat([SignaturePrefix.EOA, signature])\n      : signature;\n  };\n\n  const entryPoint = (\n    AccountVersionRegistry[type][version] as StaticSmartAccountImplementation\n  ).entryPoint;\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      return encodeCalls(calls);\n    },\n\n    async decodeCalls(data) {\n      return decodeCalls(data, accountAddress);\n    },\n\n    async getStubSignature() {\n      const signature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      switch (version) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n          return signature;\n        case \"v2.0.0\":\n          return concat([SignaturePrefix.EOA, signature]);\n        default:\n          throw new BaseError(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      const userOpHash = getUserOperationHash({\n        chainId,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...userOperation,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n\n      const signature = await signMessageAction({\n        account: owner,\n        message: { raw: userOpHash },\n      });\n\n      return version === \"v2.0.0\"\n        ? concatHex([SignaturePrefix.EOA, signature])\n        : signature;\n    },\n\n    extend: {\n      smartAccountType: type,\n      getLightAccountVersion: () => version,\n      encodeUpgradeToAndCall,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  concat,\n  concatHex,\n  encodeFunctionData,\n  fromHex,\n  hashMessage,\n  hashTypedData,\n  trim,\n  type Abi,\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type TypedDataDefinition,\n} from \"viem\";\nimport {\n  getUserOperationHash,\n  toSmartAccount,\n  type SmartAccountImplementation,\n} from \"viem/account-abstraction\";\nimport { getStorageAt, signMessage, signTypedData } from \"viem/actions\";\nimport type {\n  EntryPointFromAccountRegistry,\n  LightAccountType,\n  LightAccountVersion,\n} from \"../registry.js\";\nimport { EIP1967_PROXY_IMPL_STORAGE_SLOT } from \"../utils.js\";\nimport { AccountVersionRegistry } from \"../registry.js\";\nimport {\n  encodeCallsLA as encodeCalls,\n  decodeCallsLA as decodeCalls,\n} from \"./calldataCodec.js\";\nimport { BaseError, lowerAddress } from \"@alchemy/common\";\nimport type {\n  SignatureRequest,\n  StaticSmartAccountImplementation,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport { getAction } from \"viem/utils\";\n\nconst SignaturePrefix = {\n  EOA: \"0x00\",\n  CONTRACT: \"0x01\",\n  CONTRACT_WITH_ADDR: \"0x02\",\n} as const;\n\nexport type BaseLightAccountImplementation<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountImplementation<\n  EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>[\"abi\"],\n  EntryPointFromAccountRegistry<\n    TLightAccountType,\n    TLightAccountVersion\n  >[\"version\"],\n  {\n    getLightAccountVersion: () => TLightAccountVersion;\n    smartAccountType: TLightAccountType;\n    encodeUpgradeToAndCall: (params: {\n      upgradeToAddress: Address;\n      upgradeToInitData: Hex;\n    }) => Promise<Hex>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type LightAccountBase<\n  TLightAccountType extends LightAccountType = LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n> = SmartAccountWithDecodeCalls<\n  BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>\n>;\n\nexport type ToLightAccountBaseParams<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  abi: Abi;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  type: TLightAccountType;\n  version: TLightAccountVersion;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n};\n\nexport async function toLightAccountBase<\n  TLightAccountType extends LightAccountType,\n  TLightAccountVersion extends\n    LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,\n  TTransport extends Transport = Transport,\n>({\n  client,\n  abi,\n  accountAddress,\n  owner,\n  type,\n  version,\n  getFactoryArgs,\n}: ToLightAccountBaseParams<\n  TLightAccountType,\n  TLightAccountVersion,\n  TTransport\n>): Promise<LightAccountBase<TLightAccountType, TLightAccountVersion>> {\n  const encodeUpgradeToAndCall = async ({\n    upgradeToAddress,\n    upgradeToInitData,\n  }: {\n    upgradeToAddress: Address;\n    upgradeToInitData: Hex;\n  }): Promise<Hex> => {\n    const expectedImplAddresses = (\n      Object.values(\n        AccountVersionRegistry[type],\n      ) as StaticSmartAccountImplementation<false>[]\n    ).map((x) => x.accountImplementation);\n\n    const getStorageAtAction = getAction(client, getStorageAt, \"getStorageAt\");\n    // TODO(v5): This is a super fragile workflow, and we should consider not supporting this on the SmartAccount level in v5.\n    const storage = await getStorageAtAction({\n      address: accountAddress,\n      slot: EIP1967_PROXY_IMPL_STORAGE_SLOT,\n    });\n\n    if (storage == null) {\n      throw new BaseError(\n        `Failed to get storage slot: ${EIP1967_PROXY_IMPL_STORAGE_SLOT}`,\n      );\n    }\n\n    // Only upgrade undeployed accounts (storage 0) or deployed light accounts, else error.\n    if (\n      fromHex(storage, \"number\") !== 0 &&\n      !expectedImplAddresses.some((x) => x === lowerAddress(trim(storage)))\n    ) {\n      throw new BaseError(\n        `could not determine if smart account implementation is ${type} ${String(\n          version,\n        )}`,\n      );\n    }\n\n    return encodeFunctionData({\n      abi,\n      functionName: \"upgradeToAndCall\",\n      args: [upgradeToAddress, upgradeToInitData],\n    });\n  };\n\n  const get1271Wrapper = (\n    hashedMessage: Hex,\n    version: string,\n  ): TypedDataDefinition => {\n    return {\n      // EIP712Domain(string name,string version,uint256 chainId,address verifyingContract)\n      // https://github.com/alchemyplatform/light-account/blob/main/src/LightAccount.sol#L236\n      domain: {\n        chainId: client.chain.id,\n        name: type,\n        verifyingContract: accountAddress,\n        version,\n      },\n      types: {\n        LightAccountMessage: [{ name: \"message\", type: \"bytes\" }],\n      },\n      message: {\n        message: hashedMessage,\n      },\n      primaryType: \"LightAccountMessage\",\n    };\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const messageHash =\n      params.type === \"eth_signTypedData_v4\"\n        ? hashTypedData(params.data)\n        : hashMessage(params.data);\n\n    switch (version) {\n      case \"v1.0.1\":\n        return params;\n      case \"v1.0.2\":\n        throw new BaseError(\n          `Version ${String(version)} of LightAccount doesn't support 1271`,\n        );\n      case \"v1.1.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"1\"),\n        };\n      case \"v2.0.0\":\n        return {\n          type: \"eth_signTypedData_v4\",\n          data: get1271Wrapper(messageHash, \"2\"),\n        };\n      default:\n        throw new BaseError(\n          `Unknown version ${String(version)} of LightAccount`,\n        );\n    }\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return version === \"v2.0.0\"\n      ? concat([SignaturePrefix.EOA, signature])\n      : signature;\n  };\n\n  const entryPoint = (\n    AccountVersionRegistry[type][version] as StaticSmartAccountImplementation\n  ).entryPoint;\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      return encodeCalls(calls);\n    },\n\n    async decodeCalls(data) {\n      return decodeCalls(data, accountAddress);\n    },\n\n    async getStubSignature() {\n      const signature =\n        \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n\n      switch (version) {\n        case \"v1.0.1\":\n        case \"v1.0.2\":\n        case \"v1.1.0\":\n          return signature;\n        case \"v2.0.0\":\n          return concat([SignaturePrefix.EOA, signature]);\n        default:\n          throw new BaseError(`Unknown version ${type} of ${String(version)}`);\n      }\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition,\n      });\n\n      const sig =\n        type === \"eth_signTypedData_v4\"\n          ? await signTypedDataAction({\n              ...data,\n              account: owner,\n            })\n          : await signMessageAction({ account: owner, message: data });\n\n      return formatSignature(sig);\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      const userOpHash = getUserOperationHash({\n        chainId,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...userOperation,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n\n      const signature = await signMessageAction({\n        account: owner,\n        message: { raw: userOpHash },\n      });\n\n      return version === \"v2.0.0\"\n        ? concatHex([SignaturePrefix.EOA, signature])\n        : signature;\n    },\n\n    extend: {\n      smartAccountType: type,\n      getLightAccountVersion: () => version,\n      encodeUpgradeToAndCall,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}

package/dist/esm/ma-v1/accounts/base.d.ts

@@ -1,13 +1,13 @@
 import { type Address, type Chain, type Client, type Hex, type JsonRpcAccount, type LocalAccount, type Transport, type Hash, type TypedDataDefinition } from "viem";
-import { entryPoint06Abi, type SmartAccount, type SmartAccountImplementation } from "viem/account-abstraction";
-import type { SignatureRequest } from "../../types.js";
+import { entryPoint06Abi, type SmartAccountImplementation } from "viem/account-abstraction";
+import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 type MaV1AccountType = "MultiOwnerModularAccountV1";
 export type BaseMaV1AccountImplementation = SmartAccountImplementation<typeof entryPoint06Abi, "0.6", {
     smartAccountType: MaV1AccountType;
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
 }, false>;
-export type ModularAccountV1Base = SmartAccount<BaseMaV1AccountImplementation>;
+export type ModularAccountV1Base = SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;
 export type ToModularAccountV1BaseParams<TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     accountAddress: Address;

package/dist/esm/ma-v1/accounts/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type Hash,\n  type TypedDataDefinition,\n  encodeFunctionData,\n} from \"viem\";\nimport {\n  entryPoint06Abi,\n  toSmartAccount,\n  type SmartAccount,\n  type SmartAccountImplementation,\n  entryPoint06Address,\n  getUserOperationHash,\n} from \"viem/account-abstraction\";\nimport type { SignatureRequest } from \"../../types.js\";\nimport { IStandardExecutorAbi } from \"../abis/IStandardExecutor.js\";\nimport { signMessage, signTypedData } from \"viem/actions\";\nimport {\n  decodeFunctionData,\n  getAction,\n  hashMessage,\n  hashTypedData,\n  isAddressEqual,\n} from \"viem/utils\";\nimport { BaseError } from \"@alchemy/common\";\n\ntype MaV1AccountType = \"MultiOwnerModularAccountV1\"; // Currently no SDK v5 support for \"MultiSigModularAccountV1\".\n\nexport type BaseMaV1AccountImplementation = SmartAccountImplementation<\n  typeof entryPoint06Abi,\n  \"0.6\",\n  {\n    smartAccountType: MaV1AccountType;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type ModularAccountV1Base = SmartAccount<BaseMaV1AccountImplementation>;\n\nexport type ToModularAccountV1BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  get712Wrapper: (msg: Hash) => Promise<TypedDataDefinition>;\n  type: MaV1AccountType;\n};\n\n/**\n * Creates a ModularAccountV1Base instance.\n *\n * @param {ToModularAccountV1BaseParams<TTransport>} params The parameters for creating a ModularAccountV1Base instance\n * @returns {Promise<ModularAccountV1Base>} A promise that resolves to a ModularAccountV1Base instance\n */\nexport async function toModularAccountV1Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  accountAddress,\n  owner,\n  getFactoryArgs,\n  get712Wrapper,\n  type,\n}: ToModularAccountV1BaseParams<TTransport>): Promise<ModularAccountV1Base> {\n  const entryPoint = {\n    abi: entryPoint06Abi,\n    address: entryPoint06Address,\n    version: \"0.6\" as const,\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const data = await get712Wrapper(\n      params.type === \"personal_sign\"\n        ? hashMessage(params.data)\n        : hashTypedData(params.data),\n    );\n    return {\n      type: \"eth_signTypedData_v4\",\n      data,\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return signature;\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (!calls.length) {\n        throw new BaseError(\"No calls to encode.\");\n      }\n\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n        if (isAddressEqual(call.to, accountAddress)) {\n          if (call.data == null) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return call.data;\n        }\n\n        return encodeFunctionData({\n          abi: IStandardExecutorAbi,\n          functionName: \"execute\",\n          args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n        });\n      }\n\n      return encodeFunctionData({\n        abi: IStandardExecutorAbi,\n        functionName: \"executeBatch\",\n        args: [\n          calls.map((call) => ({\n            target: call.to,\n            value: call.value ?? 0n,\n            data: call.data ?? \"0x\",\n          })),\n        ],\n      });\n    },\n\n    // Inverse of `encodeCalls`.\n    async decodeCalls(data) {\n      const decoded = decodeFunctionData({\n        abi: IStandardExecutorAbi,\n        data,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      return \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition, // TODO(v5): try harder to avoid this cast?\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      const userOpHash = getUserOperationHash({\n        chainId,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...userOperation,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      return signMessageAction({\n        account: owner,\n        message: {\n          raw: userOpHash,\n        },\n      });\n    },\n\n    extend: {\n      smartAccountType: type,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Chain,\n  type Client,\n  type Hex,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  type Hash,\n  type TypedDataDefinition,\n  encodeFunctionData,\n} from \"viem\";\nimport {\n  entryPoint06Abi,\n  toSmartAccount,\n  type SmartAccountImplementation,\n  entryPoint06Address,\n  getUserOperationHash,\n} from \"viem/account-abstraction\";\nimport type {\n  SignatureRequest,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport { IStandardExecutorAbi } from \"../abis/IStandardExecutor.js\";\nimport { signMessage, signTypedData } from \"viem/actions\";\nimport {\n  decodeFunctionData,\n  getAction,\n  hashMessage,\n  hashTypedData,\n  isAddressEqual,\n} from \"viem/utils\";\nimport { BaseError } from \"@alchemy/common\";\n\ntype MaV1AccountType = \"MultiOwnerModularAccountV1\"; // Currently no SDK v5 support for \"MultiSigModularAccountV1\".\n\nexport type BaseMaV1AccountImplementation = SmartAccountImplementation<\n  typeof entryPoint06Abi,\n  \"0.6\",\n  {\n    smartAccountType: MaV1AccountType;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  false\n>;\n\nexport type ModularAccountV1Base =\n  SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;\n\nexport type ToModularAccountV1BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  accountAddress: Address;\n  owner: JsonRpcAccount | LocalAccount;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  get712Wrapper: (msg: Hash) => Promise<TypedDataDefinition>;\n  type: MaV1AccountType;\n};\n\n/**\n * Creates a ModularAccountV1Base instance.\n *\n * @param {ToModularAccountV1BaseParams<TTransport>} params The parameters for creating a ModularAccountV1Base instance\n * @returns {Promise<ModularAccountV1Base>} A promise that resolves to a ModularAccountV1Base instance\n */\nexport async function toModularAccountV1Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  accountAddress,\n  owner,\n  getFactoryArgs,\n  get712Wrapper,\n  type,\n}: ToModularAccountV1BaseParams<TTransport>): Promise<ModularAccountV1Base> {\n  const entryPoint = {\n    abi: entryPoint06Abi,\n    address: entryPoint06Address,\n    version: \"0.6\" as const,\n  };\n\n  const prepareSignature = async (\n    params: SignatureRequest,\n  ): Promise<SignatureRequest> => {\n    const data = await get712Wrapper(\n      params.type === \"personal_sign\"\n        ? hashMessage(params.data)\n        : hashTypedData(params.data),\n    );\n    return {\n      type: \"eth_signTypedData_v4\",\n      data,\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return signature;\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (!calls.length) {\n        throw new BaseError(\"No calls to encode.\");\n      }\n\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n        if (isAddressEqual(call.to, accountAddress)) {\n          if (call.data == null) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return call.data;\n        }\n\n        return encodeFunctionData({\n          abi: IStandardExecutorAbi,\n          functionName: \"execute\",\n          args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n        });\n      }\n\n      return encodeFunctionData({\n        abi: IStandardExecutorAbi,\n        functionName: \"executeBatch\",\n        args: [\n          calls.map((call) => ({\n            target: call.to,\n            value: call.value ?? 0n,\n            data: call.data ?? \"0x\",\n          })),\n        ],\n      });\n    },\n\n    // Inverse of `encodeCalls`.\n    async decodeCalls(data) {\n      const decoded = decodeFunctionData({\n        abi: IStandardExecutorAbi,\n        data,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      return \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\";\n    },\n\n    async signMessage({ message }) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signTypedData(params) {\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      const signTypedDataAction = getAction(\n        client,\n        signTypedData,\n        \"signTypedData\",\n      );\n      const { type, data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: params as TypedDataDefinition, // TODO(v5): try harder to avoid this cast?\n      });\n      return type === \"personal_sign\"\n        ? signMessageAction({ account: owner, message: data })\n        : signTypedDataAction({ ...data, account: owner });\n    },\n\n    async signUserOperation(parameters) {\n      const { chainId = client.chain.id, ...userOperation } = parameters;\n      const userOpHash = getUserOperationHash({\n        chainId,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...userOperation,\n          sender: accountAddress,\n        },\n      });\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n      return signMessageAction({\n        account: owner,\n        message: {\n          raw: userOpHash,\n        },\n      });\n    },\n\n    extend: {\n      smartAccountType: type,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}

package/dist/esm/ma-v2/accounts/base.d.ts

@@ -1,7 +1,7 @@
 import { type Address, type Hex, type Chain, type Client, type JsonRpcAccount, type LocalAccount, type Transport } from "viem";
-import { entryPoint07Abi, type SmartAccountImplementation, type SmartAccount, type WebAuthnAccount, type ToSmartAccountParameters } from "viem/account-abstraction";
+import { entryPoint07Abi, type SmartAccountImplementation, type WebAuthnAccount, type ToSmartAccountParameters } from "viem/account-abstraction";
 import { type ExecutionDataView, type SignerEntity, type ValidationDataView } from "../types.js";
-import type { SignatureRequest } from "../../types.js";
+import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 export type ValidationDataParams = {
     validationModuleAddress: Address;
     entityId?: never;
@@ -18,7 +18,7 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<type
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
 }, boolean>;
-export type ModularAccountV2Base = SmartAccount<BaseModularAccountV2Implementation>;
+export type ModularAccountV2Base = SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;
 export type ToModularAccountV2BaseParams<TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;

package/dist/esm/ma-v2/accounts/base.js

@@ -31,10 +31,15 @@ export async function toModularAccountV2Base({ client, owner, accountAddress, ge
     if (entityId > Number(maxUint32)) {
         throw new InvalidEntityIdError(entityId);
     }
+    let isDeployed = false;
     const isAccountDeployed = async () => {
+        if (isDeployed) {
+            return true;
+        }
         const action = getAction(client, getCode, "getCode");
         const code = await action({ address: accountAddress });
-        return code != null && code !== "0x";
+        isDeployed = !!code;
+        return isDeployed;
     };
     // These default values signal that we should not use the set deferred action nonce
     let nonce;

package/dist/esm/ma-v2/accounts/base.js.map

@@ -1 +1 @@
-{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Hex,\n  type Chain,\n  type Client,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  concat,\n  concatHex,\n  encodeFunctionData,\n  hashMessage,\n  hashTypedData,\n  type TypedDataDefinition,\n  maxUint32,\n  maxUint152,\n  zeroAddress,\n} from \"viem\";\nimport {\n  entryPoint07Abi,\n  type SmartAccountImplementation,\n  type SmartAccount,\n  entryPoint07Address,\n  getUserOperationHash,\n  toSmartAccount,\n  type WebAuthnAccount,\n  type ToSmartAccountParameters,\n  estimateUserOperationGas,\n  type UserOperation,\n} from \"viem/account-abstraction\";\nimport {\n  getCode,\n  readContract,\n  signMessage,\n  signTypedData,\n} from \"viem/actions\";\nimport { assertNever, BaseError } from \"@alchemy/common\";\nimport {\n  SignaturePrefix,\n  type ExecutionDataView,\n  type SignerEntity,\n  type ValidationDataView,\n} from \"../types.js\";\nimport { modularAccountAbi } from \"../abis/modularAccountAbi.js\";\nimport type { SignatureRequest } from \"../../types.js\";\nimport {\n  decodeFunctionData,\n  getAction,\n  isAddressEqual,\n  sliceHex,\n} from \"viem/utils\";\nimport {\n  DEFAULT_OWNER_ENTITY_ID,\n  DefaultModuleAddress,\n  EXECUTE_USER_OP_SELECTOR,\n  serializeModuleEntity,\n} from \"../utils/account.js\";\nimport { parseDeferredAction } from \"../utils/deferredActions.js\";\nimport {\n  pack1271Signature,\n  toWebAuthnSignature,\n  toReplaySafeTypedData,\n  packUOSignature,\n  WEBAUTHN_DUMMY_SIGNATURE,\n} from \"../utils/signature.js\";\nimport { chainHas7212 } from \"../../utils.js\";\nimport { InvalidDeferredActionNonceError } from \"../../errors/InvalidDeferredActionNonceError.js\";\nimport { InvalidNonceKeyError } from \"../../errors/InvalidNonceKeyError.js\";\nimport { InvalidEntityIdError } from \"../../errors/InvalidEntityIdError.js\";\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type BaseModularAccountV2Implementation = SmartAccountImplementation<\n  typeof entryPoint07Abi,\n  \"0.7\",\n  {\n    smartAccountType: \"ModularAccountV2\";\n    signerEntity: SignerEntity;\n    encodeCallData: (callData: Hex) => Promise<Hex>;\n    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n    getValidationData: (\n      args: ValidationDataParams,\n    ) => Promise<ValidationDataView>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  boolean\n>;\n\nexport type ModularAccountV2Base =\n  SmartAccount<BaseModularAccountV2Implementation>;\n\nexport type ToModularAccountV2BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;\n  accountAddress: Address;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  signerEntity?: SignerEntity;\n  deferredAction?: Hex;\n  authorization?: ToSmartAccountParameters[\"authorization\"];\n};\n\n/**\n * Creates a ModularAccountV2Base instance.\n *\n * @param {ToModularAccountV2BaseParams<TTransport>} params - The parameters for creating a ModularAccountV2Base instance.\n * @returns {Promise<ModularAccountV2Base>} A promise that resolves to a ModularAccountV2Base instance.\n */\nexport async function toModularAccountV2Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  owner,\n  accountAddress,\n  getFactoryArgs,\n  signerEntity = {\n    isGlobalValidation: true,\n    entityId: DEFAULT_OWNER_ENTITY_ID,\n  },\n  deferredAction,\n  authorization,\n}: ToModularAccountV2BaseParams<TTransport>): Promise<ModularAccountV2Base> {\n  let { isGlobalValidation, entityId } = signerEntity;\n\n  const entryPoint = {\n    abi: entryPoint07Abi,\n    address: entryPoint07Address as Address,\n    version: \"0.7\" as const,\n  };\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  const isAccountDeployed: () => Promise<boolean> = async () => {\n    const action = getAction(client, getCode, \"getCode\");\n    const code = await action({ address: accountAddress });\n    return code != null && code !== \"0x\";\n  };\n\n  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\n    } = parseDeferredAction(deferredAction));\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP.\n    const nextNonceForDeferredAction: bigint = await readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, deferredActionNonce >> 64n],\n    });\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\n      throw new InvalidDeferredActionNonceError();\n    }\n  }\n\n  const getNonce = async (\n    params?: { key?: bigint | undefined } | undefined,\n  ): Promise<bigint> => {\n    if (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\n    }\n\n    const nonceKey = params?.key ?? 0n;\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    return readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, fullNonceKey],\n    });\n  };\n\n  const accountContract = {\n    address: accountAddress,\n    abi: modularAccountAbi,\n  };\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return readContract(client, {\n      ...accountContract,\n      functionName: \"getExecutionData\",\n      args: [selector],\n    });\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    const readContractAction = getAction(client, readContract, \"readContract\");\n    return readContractAction({\n      ...accountContract,\n      functionName: \"getValidationData\",\n      args: [\n        serializeModuleEntity({\n          moduleAddress: validationModuleAddress ?? zeroAddress,\n          entityId: entityId ?? Number(maxUint32),\n        }),\n      ],\n    });\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n    if (hasAssociatedExecHooks) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    return callData;\n  };\n\n  const prepareSignature = async (\n    request: SignatureRequest,\n  ): Promise<Extract<SignatureRequest, { type: \"eth_signTypedData_v4\" }>> => {\n    const isDeferredAction =\n      request.type === \"eth_signTypedData_v4\" &&\n      request.data?.primaryType === \"DeferredAction\" &&\n      request.data?.domain?.verifyingContract === accountAddress;\n\n    if (isDeferredAction && entityId === DEFAULT_OWNER_ENTITY_ID) {\n      return request;\n    }\n\n    const hash =\n      request.type === \"personal_sign\"\n        ? hashMessage(request.data)\n        : request.type === \"eth_signTypedData_v4\"\n          ? hashTypedData(request.data)\n          : assertNever(request, \"Unexpected signature request type\");\n\n    return {\n      type: \"eth_signTypedData_v4\",\n      data: toReplaySafeTypedData({\n        chainId: client.chain.id,\n        hash,\n        ...(owner.type === \"webAuthn\"\n          ? {\n              address: DefaultModuleAddress.WEBAUTHN_VALIDATION,\n              salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n            }\n          : entityId === DEFAULT_OWNER_ENTITY_ID\n            ? { address: accountAddress }\n            : {\n                address: DefaultModuleAddress.SINGLE_SIGNER_VALIDATION,\n                salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n              }),\n      }),\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return pack1271Signature({\n      entityId,\n      validationSignaturePrefix:\n        owner.type === \"webAuthn\" ? null : SignaturePrefix.EOA,\n      validationSignature: signature,\n    });\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n    getNonce,\n    authorization,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        if (isAddressEqual(call.to, accountAddress)) {\n          // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n\n          if (call.data === undefined) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return encodeCallData(call.data);\n        }\n\n        return encodeCallData(\n          encodeFunctionData({\n            abi: modularAccountAbi,\n            functionName: \"execute\",\n            args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n          }),\n        );\n      }\n\n      return encodeCallData(\n        encodeFunctionData({\n          abi: modularAccountAbi,\n          functionName: \"executeBatch\",\n          args: [\n            calls.map((call) => ({\n              target: call.to,\n              data: call.data ?? \"0x\",\n              value: call.value ?? 0n,\n            })),\n          ],\n        }),\n      );\n    },\n\n    async decodeCalls(data) {\n      // Inverse of `encodeCalls`.\n      // Trim the EXECUTE_USER_OP_SELECTOR if it is present.\n      const trimmedData = data\n        .toLowerCase()\n        .startsWith(EXECUTE_USER_OP_SELECTOR.toLowerCase())\n        ? sliceHex(data, 4)\n        : data;\n\n      const decoded = decodeFunctionData({\n        abi: modularAccountAbi,\n        data: trimmedData,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      if (owner.type === \"webAuthn\") {\n        return WEBAUTHN_DUMMY_SIGNATURE;\n      }\n\n      const sig = packUOSignature({\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    async signMessage({ message }) {\n      const { data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({ hash: hashTypedData(data) }),\n        );\n        return formatSignature(validationSignature);\n      }\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return formatSignature(signature);\n    },\n\n    async signTypedData(td) {\n      const isDeferredAction =\n        td.primaryType === \"DeferredAction\" &&\n        td.domain &&\n        typeof td.domain === \"object\" &&\n        \"verifyingContract\" in td.domain &&\n        td.domain.verifyingContract === accountAddress;\n\n      const { data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: td as TypedDataDefinition, // TODO(v5): Try harder to satisfy this w/o casting.\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({ hash: hashTypedData(data) }),\n        );\n        return isDeferredAction\n          ? validationSignature\n          : formatSignature(validationSignature);\n      }\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return isDeferredAction\n        ? concat([SignaturePrefix.EOA, signature])\n        : formatSignature(signature);\n    },\n\n    async signUserOperation(uo) {\n      const hash = getUserOperationHash({\n        chainId: uo.chainId ?? client.chain.id,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...uo,\n          sender: accountAddress,\n        },\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({\n            hash: hashMessage({ raw: hash }),\n          }),\n        );\n\n        const signature = deferredActionData\n          ? concatHex([deferredActionData, validationSignature])\n          : validationSignature;\n        deferredActionData = undefined; // clear once used\n        hasAssociatedExecHooks = false; // set to falsy value once used\n        return concatHex([\"0xff\", signature]);\n      }\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n\n      const validationSignature = await signMessageAction({\n        account: owner,\n        message: { raw: hash },\n      });\n\n      const packedSignature = packUOSignature({\n        validationSignature,\n      });\n\n      const signature = deferredActionData\n        ? concatHex([deferredActionData, packedSignature])\n        : packedSignature;\n\n      deferredActionData = undefined; // clear once used\n      hasAssociatedExecHooks = false; // set to falsy value once used\n\n      return signature;\n    },\n\n    userOperation: {\n      estimateGas: async (uo) => {\n        if (owner.type !== \"webAuthn\") {\n          // Uses the default gas estimator.\n          // Note that we get 7702 support automatically from Viem.\n          return undefined;\n        }\n\n        const estimateGasAction = getAction(\n          client,\n          estimateUserOperationGas,\n          \"estimateUserOperationGas\",\n        );\n\n        const estimate = await estimateGasAction({\n          ...(uo as UserOperation<typeof entryPoint.version>),\n          entryPointAddress: entryPoint.address,\n        });\n\n        const buffer = (await chainHas7212(client)) ? 10000n : 300000n;\n\n        // TODO(v4): iterate numbers. Aim to have ~1000 gas buffer to account for longer authenticatorDatas and clientDataJSONs.\n        return {\n          ...estimate,\n          verificationGasLimit: estimate.verificationGasLimit + buffer,\n        };\n      },\n    },\n\n    extend: {\n      smartAccountType: \"ModularAccountV2\" as const,\n      signerEntity: {\n        entityId,\n        isGlobalValidation,\n      },\n      encodeCallData,\n      getExecutionData,\n      getValidationData,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}
+{"version":3,"file":"base.js","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/base.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  type Address,\n  type Hex,\n  type Chain,\n  type Client,\n  type JsonRpcAccount,\n  type LocalAccount,\n  type Transport,\n  concat,\n  concatHex,\n  encodeFunctionData,\n  hashMessage,\n  hashTypedData,\n  type TypedDataDefinition,\n  maxUint32,\n  maxUint152,\n  zeroAddress,\n} from \"viem\";\nimport {\n  entryPoint07Abi,\n  type SmartAccountImplementation,\n  entryPoint07Address,\n  getUserOperationHash,\n  toSmartAccount,\n  type WebAuthnAccount,\n  type ToSmartAccountParameters,\n  estimateUserOperationGas,\n  type UserOperation,\n} from \"viem/account-abstraction\";\nimport {\n  getCode,\n  readContract,\n  signMessage,\n  signTypedData,\n} from \"viem/actions\";\nimport { assertNever, BaseError } from \"@alchemy/common\";\nimport {\n  SignaturePrefix,\n  type ExecutionDataView,\n  type SignerEntity,\n  type ValidationDataView,\n} from \"../types.js\";\nimport { modularAccountAbi } from \"../abis/modularAccountAbi.js\";\nimport type {\n  SignatureRequest,\n  SmartAccountWithDecodeCalls,\n} from \"../../types.js\";\nimport {\n  decodeFunctionData,\n  getAction,\n  isAddressEqual,\n  sliceHex,\n} from \"viem/utils\";\nimport {\n  DEFAULT_OWNER_ENTITY_ID,\n  DefaultModuleAddress,\n  EXECUTE_USER_OP_SELECTOR,\n  serializeModuleEntity,\n} from \"../utils/account.js\";\nimport { parseDeferredAction } from \"../utils/deferredActions.js\";\nimport {\n  pack1271Signature,\n  toWebAuthnSignature,\n  toReplaySafeTypedData,\n  packUOSignature,\n  WEBAUTHN_DUMMY_SIGNATURE,\n} from \"../utils/signature.js\";\nimport { chainHas7212 } from \"../../utils.js\";\nimport { InvalidDeferredActionNonceError } from \"../../errors/InvalidDeferredActionNonceError.js\";\nimport { InvalidNonceKeyError } from \"../../errors/InvalidNonceKeyError.js\";\nimport { InvalidEntityIdError } from \"../../errors/InvalidEntityIdError.js\";\n\nexport type ValidationDataParams =\n  | {\n      validationModuleAddress: Address;\n      entityId?: never;\n    }\n  | {\n      validationModuleAddress?: never;\n      entityId: number;\n    };\n\nexport type BaseModularAccountV2Implementation = SmartAccountImplementation<\n  typeof entryPoint07Abi,\n  \"0.7\",\n  {\n    smartAccountType: \"ModularAccountV2\";\n    signerEntity: SignerEntity;\n    encodeCallData: (callData: Hex) => Promise<Hex>;\n    getExecutionData: (selector: Hex) => Promise<ExecutionDataView>;\n    getValidationData: (\n      args: ValidationDataParams,\n    ) => Promise<ValidationDataView>;\n    prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;\n    formatSignature: (signature: Hex) => Promise<Hex>;\n  },\n  boolean\n>;\n\nexport type ModularAccountV2Base =\n  SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;\n\nexport type ToModularAccountV2BaseParams<\n  TTransport extends Transport = Transport,\n> = {\n  client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;\n  owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;\n  accountAddress: Address;\n  getFactoryArgs: () => Promise<{\n    factory?: Address | undefined;\n    factoryData?: Hex | undefined;\n  }>;\n  signerEntity?: SignerEntity;\n  deferredAction?: Hex;\n  authorization?: ToSmartAccountParameters[\"authorization\"];\n};\n\n/**\n * Creates a ModularAccountV2Base instance.\n *\n * @param {ToModularAccountV2BaseParams<TTransport>} params - The parameters for creating a ModularAccountV2Base instance.\n * @returns {Promise<ModularAccountV2Base>} A promise that resolves to a ModularAccountV2Base instance.\n */\nexport async function toModularAccountV2Base<\n  TTransport extends Transport = Transport,\n>({\n  client,\n  owner,\n  accountAddress,\n  getFactoryArgs,\n  signerEntity = {\n    isGlobalValidation: true,\n    entityId: DEFAULT_OWNER_ENTITY_ID,\n  },\n  deferredAction,\n  authorization,\n}: ToModularAccountV2BaseParams<TTransport>): Promise<ModularAccountV2Base> {\n  let { isGlobalValidation, entityId } = signerEntity;\n\n  const entryPoint = {\n    abi: entryPoint07Abi,\n    address: entryPoint07Address as Address,\n    version: \"0.7\" as const,\n  };\n\n  if (entityId > Number(maxUint32)) {\n    throw new InvalidEntityIdError(entityId);\n  }\n\n  let isDeployed = false;\n\n  const isAccountDeployed: () => Promise<boolean> = async () => {\n    if (isDeployed) {\n      return true;\n    }\n    const action = getAction(client, getCode, \"getCode\");\n    const code = await action({ address: accountAddress });\n    isDeployed = !!code;\n    return isDeployed;\n  };\n\n  // These default values signal that we should not use the set deferred action nonce\n  let nonce: bigint | undefined;\n  let deferredActionData: Hex | undefined;\n  let hasAssociatedExecHooks: boolean = false;\n\n  if (deferredAction) {\n    let deferredActionNonce = 0n;\n    // We always update entity id and isGlobalValidation to the deferred action value since the client could be used to send multiple calls\n    ({\n      entityId,\n      isGlobalValidation,\n      nonce: deferredActionNonce,\n    } = parseDeferredAction(deferredAction));\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    // Set these values if the deferred action has not been consumed. We check this with the EP.\n    const nextNonceForDeferredAction: bigint = await readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, deferredActionNonce >> 64n],\n    });\n\n    if (deferredActionNonce === nextNonceForDeferredAction) {\n      ({ nonce, deferredActionData, hasAssociatedExecHooks } =\n        parseDeferredAction(deferredAction));\n    } else if (deferredActionNonce > nextNonceForDeferredAction) {\n      // if nonce is greater than the next nonce, its invalid, so we throw\n      throw new InvalidDeferredActionNonceError();\n    }\n  }\n\n  const getNonce = async (\n    params?: { key?: bigint | undefined } | undefined,\n  ): Promise<bigint> => {\n    if (nonce) {\n      const tempNonce = nonce;\n      nonce = undefined; // set to falsy value once used\n      return tempNonce;\n    }\n\n    const nonceKey = params?.key ?? 0n;\n\n    if (nonceKey > maxUint152) {\n      throw new InvalidNonceKeyError(nonceKey);\n    }\n\n    const fullNonceKey =\n      (nonceKey << 40n) +\n      (BigInt(entityId) << 8n) +\n      (isGlobalValidation ? 1n : 0n);\n\n    const readContractAction = getAction(client, readContract, \"readContract\");\n\n    return readContractAction({\n      ...entryPoint,\n      functionName: \"getNonce\",\n      args: [accountAddress, fullNonceKey],\n    });\n  };\n\n  const accountContract = {\n    address: accountAddress,\n    abi: modularAccountAbi,\n  };\n\n  const getExecutionData = async (selector: Hex) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        module: zeroAddress,\n        skipRuntimeValidation: false,\n        allowGlobalValidation: false,\n        executionHooks: [],\n      };\n    }\n\n    return readContract(client, {\n      ...accountContract,\n      functionName: \"getExecutionData\",\n      args: [selector],\n    });\n  };\n\n  const getValidationData = async (args: ValidationDataParams) => {\n    if (!(await isAccountDeployed())) {\n      return {\n        validationHooks: [],\n        executionHooks: [],\n        selectors: [],\n        validationFlags: 0,\n      };\n    }\n\n    const { validationModuleAddress, entityId } = args;\n    const readContractAction = getAction(client, readContract, \"readContract\");\n    return readContractAction({\n      ...accountContract,\n      functionName: \"getValidationData\",\n      args: [\n        serializeModuleEntity({\n          moduleAddress: validationModuleAddress ?? zeroAddress,\n          entityId: entityId ?? Number(maxUint32),\n        }),\n      ],\n    });\n  };\n\n  const encodeCallData = async (callData: Hex): Promise<Hex> => {\n    const validationData = await getValidationData({\n      entityId: Number(entityId),\n    });\n    if (hasAssociatedExecHooks) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    if (validationData.executionHooks.length) {\n      return concatHex([EXECUTE_USER_OP_SELECTOR, callData]);\n    }\n    return callData;\n  };\n\n  const prepareSignature = async (\n    request: SignatureRequest,\n  ): Promise<Extract<SignatureRequest, { type: \"eth_signTypedData_v4\" }>> => {\n    const isDeferredAction =\n      request.type === \"eth_signTypedData_v4\" &&\n      request.data?.primaryType === \"DeferredAction\" &&\n      request.data?.domain?.verifyingContract === accountAddress;\n\n    if (isDeferredAction && entityId === DEFAULT_OWNER_ENTITY_ID) {\n      return request;\n    }\n\n    const hash =\n      request.type === \"personal_sign\"\n        ? hashMessage(request.data)\n        : request.type === \"eth_signTypedData_v4\"\n          ? hashTypedData(request.data)\n          : assertNever(request, \"Unexpected signature request type\");\n\n    return {\n      type: \"eth_signTypedData_v4\",\n      data: toReplaySafeTypedData({\n        chainId: client.chain.id,\n        hash,\n        ...(owner.type === \"webAuthn\"\n          ? {\n              address: DefaultModuleAddress.WEBAUTHN_VALIDATION,\n              salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n            }\n          : entityId === DEFAULT_OWNER_ENTITY_ID\n            ? { address: accountAddress }\n            : {\n                address: DefaultModuleAddress.SINGLE_SIGNER_VALIDATION,\n                salt: concatHex([`0x${\"00\".repeat(12)}`, accountAddress]),\n              }),\n      }),\n    };\n  };\n\n  const formatSignature = async (signature: Hex): Promise<Hex> => {\n    return pack1271Signature({\n      entityId,\n      validationSignaturePrefix:\n        owner.type === \"webAuthn\" ? null : SignaturePrefix.EOA,\n      validationSignature: signature,\n    });\n  };\n\n  return await toSmartAccount({\n    getFactoryArgs,\n    client,\n    entryPoint,\n    getNonce,\n    authorization,\n\n    async getAddress() {\n      return accountAddress;\n    },\n\n    async encodeCalls(calls) {\n      if (calls.length === 1) {\n        const call = calls[0];\n\n        if (isAddressEqual(call.to, accountAddress)) {\n          // If the call is to the account itself, we need to avoid wrapping it in an `execute` call.\n\n          if (call.data === undefined) {\n            throw new BaseError(\"Data is required for an account self-call.\");\n          }\n\n          return encodeCallData(call.data);\n        }\n\n        return encodeCallData(\n          encodeFunctionData({\n            abi: modularAccountAbi,\n            functionName: \"execute\",\n            args: [call.to, call.value ?? 0n, call.data ?? \"0x\"],\n          }),\n        );\n      }\n\n      return encodeCallData(\n        encodeFunctionData({\n          abi: modularAccountAbi,\n          functionName: \"executeBatch\",\n          args: [\n            calls.map((call) => ({\n              target: call.to,\n              data: call.data ?? \"0x\",\n              value: call.value ?? 0n,\n            })),\n          ],\n        }),\n      );\n    },\n\n    async decodeCalls(data) {\n      // Inverse of `encodeCalls`.\n      // Trim the EXECUTE_USER_OP_SELECTOR if it is present.\n      const trimmedData = data\n        .toLowerCase()\n        .startsWith(EXECUTE_USER_OP_SELECTOR.toLowerCase())\n        ? sliceHex(data, 4)\n        : data;\n\n      const decoded = decodeFunctionData({\n        abi: modularAccountAbi,\n        data: trimmedData,\n      });\n\n      if (decoded.functionName === \"execute\") {\n        return [\n          {\n            to: decoded.args[0],\n            value: decoded.args[1],\n            data: decoded.args[2],\n          },\n        ];\n      }\n\n      if (decoded.functionName === \"executeBatch\") {\n        return decoded.args[0].map((call) => ({\n          to: call.target,\n          value: call.value,\n          data: call.data,\n        }));\n      }\n\n      // If the data is not for an `execute` or `executeBatch` call, we treat it as a single call to the account itself.\n      return [\n        {\n          to: accountAddress,\n          data,\n        },\n      ];\n    },\n\n    async getStubSignature() {\n      if (owner.type === \"webAuthn\") {\n        return WEBAUTHN_DUMMY_SIGNATURE;\n      }\n\n      const sig = packUOSignature({\n        validationSignature:\n          \"0xfffffffffffffffffffffffffffffff0000000000000000000000000000000007aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa1c\",\n      });\n      return deferredActionData ? concatHex([deferredActionData, sig]) : sig;\n    },\n\n    async signMessage({ message }) {\n      const { data } = await prepareSignature({\n        type: \"personal_sign\",\n        data: message,\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({ hash: hashTypedData(data) }),\n        );\n        return formatSignature(validationSignature);\n      }\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return formatSignature(signature);\n    },\n\n    async signTypedData(td) {\n      const isDeferredAction =\n        td.primaryType === \"DeferredAction\" &&\n        td.domain &&\n        typeof td.domain === \"object\" &&\n        \"verifyingContract\" in td.domain &&\n        td.domain.verifyingContract === accountAddress;\n\n      const { data } = await prepareSignature({\n        type: \"eth_signTypedData_v4\",\n        data: td as TypedDataDefinition, // TODO(v5): Try harder to satisfy this w/o casting.\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({ hash: hashTypedData(data) }),\n        );\n        return isDeferredAction\n          ? validationSignature\n          : formatSignature(validationSignature);\n      }\n\n      const action = getAction(client, signTypedData, \"signTypedData\");\n\n      const signature = await action({\n        ...data,\n        account: owner,\n      });\n\n      return isDeferredAction\n        ? concat([SignaturePrefix.EOA, signature])\n        : formatSignature(signature);\n    },\n\n    async signUserOperation(uo) {\n      const hash = getUserOperationHash({\n        chainId: uo.chainId ?? client.chain.id,\n        entryPointAddress: entryPoint.address,\n        entryPointVersion: entryPoint.version,\n        userOperation: {\n          ...uo,\n          sender: accountAddress,\n        },\n      });\n\n      if (owner.type === \"webAuthn\") {\n        const validationSignature = toWebAuthnSignature(\n          await owner.sign({\n            hash: hashMessage({ raw: hash }),\n          }),\n        );\n\n        const signature = deferredActionData\n          ? concatHex([deferredActionData, validationSignature])\n          : validationSignature;\n        deferredActionData = undefined; // clear once used\n        hasAssociatedExecHooks = false; // set to falsy value once used\n        return concatHex([\"0xff\", signature]);\n      }\n\n      const signMessageAction = getAction(client, signMessage, \"signMessage\");\n\n      const validationSignature = await signMessageAction({\n        account: owner,\n        message: { raw: hash },\n      });\n\n      const packedSignature = packUOSignature({\n        validationSignature,\n      });\n\n      const signature = deferredActionData\n        ? concatHex([deferredActionData, packedSignature])\n        : packedSignature;\n\n      deferredActionData = undefined; // clear once used\n      hasAssociatedExecHooks = false; // set to falsy value once used\n\n      return signature;\n    },\n\n    userOperation: {\n      estimateGas: async (uo) => {\n        if (owner.type !== \"webAuthn\") {\n          // Uses the default gas estimator.\n          // Note that we get 7702 support automatically from Viem.\n          return undefined;\n        }\n\n        const estimateGasAction = getAction(\n          client,\n          estimateUserOperationGas,\n          \"estimateUserOperationGas\",\n        );\n\n        const estimate = await estimateGasAction({\n          ...(uo as UserOperation<typeof entryPoint.version>),\n          entryPointAddress: entryPoint.address,\n        });\n\n        const buffer = (await chainHas7212(client)) ? 10000n : 300000n;\n\n        // TODO(v4): iterate numbers. Aim to have ~1000 gas buffer to account for longer authenticatorDatas and clientDataJSONs.\n        return {\n          ...estimate,\n          verificationGasLimit: estimate.verificationGasLimit + buffer,\n        };\n      },\n    },\n\n    extend: {\n      smartAccountType: \"ModularAccountV2\" as const,\n      signerEntity: {\n        entityId,\n        isGlobalValidation,\n      },\n      encodeCallData,\n      getExecutionData,\n      getValidationData,\n      prepareSignature,\n      formatSignature,\n    },\n  });\n}\n"]}

package/dist/esm/types.d.ts

@@ -1,10 +1,17 @@
 import type { Abi, Address, Hex, IsUndefined, SignableMessage, TypedDataDefinition } from "viem";
-import type { EntryPointVersion, SmartAccount } from "viem/account-abstraction";
+import type { EntryPointVersion, SmartAccount, SmartAccountImplementation } from "viem/account-abstraction";
 export type GetAccountParameter<TAccount extends SmartAccount | undefined = SmartAccount | undefined, TAccountOverride extends SmartAccount = SmartAccount> = IsUndefined<TAccount> extends true ? {
     account: TAccountOverride;
 } : {
     account?: TAccountOverride;
 };
+/**
+ * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.
+ * This is useful for account implementations that always provide the `decodeCalls` functionality.
+ */
+export type SmartAccountWithDecodeCalls<TImplementation extends SmartAccountImplementation> = SmartAccount<TImplementation> & {
+    decodeCalls: NonNullable<SmartAccount<TImplementation>["decodeCalls"]>;
+};
 export type SignatureRequest = {
     type: "personal_sign";
     data: SignableMessage;

package/dist/esm/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  Abi,\n  Address,\n  Hex,\n  IsUndefined,\n  SignableMessage,\n  TypedDataDefinition,\n} from \"viem\";\nimport type { EntryPointVersion, SmartAccount } from \"viem/account-abstraction\";\n\nexport type GetAccountParameter<\n  TAccount extends SmartAccount | undefined = SmartAccount | undefined,\n  TAccountOverride extends SmartAccount = SmartAccount,\n> =\n  IsUndefined<TAccount> extends true\n    ? { account: TAccountOverride }\n    : { account?: TAccountOverride };\n\nexport type SignatureRequest =\n  | {\n      type: \"personal_sign\";\n      data: SignableMessage;\n    }\n  | {\n      type: \"eth_signTypedData_v4\";\n      data: TypedDataDefinition;\n    };\n\nexport type StaticSmartAccountImplementation<\n  eip7702 extends boolean = boolean,\n  entryPointVersion extends EntryPointVersion = EntryPointVersion,\n  factoryArgs extends {} = {},\n  entryPointAbi extends Abi | readonly unknown[] = Abi,\n  accountAbi extends Abi | readonly unknown[] = Abi,\n  factoryAbi extends Abi | readonly unknown[] = Abi,\n> = {\n  readonly entryPoint: {\n    readonly abi: entryPointAbi;\n    readonly address: Address;\n    readonly version: entryPointVersion;\n  };\n  readonly accountAbi: accountAbi;\n} & (eip7702 extends false\n  ? {\n      // Smart contract account specific fields\n      readonly accountImplementation: Address;\n      readonly getFactoryData: (factoryArgs: factoryArgs) => Hex;\n      readonly predictAccountAddress: (factoryArgs: factoryArgs) => Address;\n      readonly factoryAddress: Address;\n      readonly factoryAbi: factoryAbi;\n    }\n  : {}) &\n  (eip7702 extends true\n    ? {\n        // EIP-7702 account specific fields\n        readonly delegationAddress: Address;\n      }\n    : {});\n"]}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"","sourcesContent":["import type {\n  Abi,\n  Address,\n  Hex,\n  IsUndefined,\n  SignableMessage,\n  TypedDataDefinition,\n} from \"viem\";\nimport type {\n  EntryPointVersion,\n  SmartAccount,\n  SmartAccountImplementation,\n} from \"viem/account-abstraction\";\n\nexport type GetAccountParameter<\n  TAccount extends SmartAccount | undefined = SmartAccount | undefined,\n  TAccountOverride extends SmartAccount = SmartAccount,\n> =\n  IsUndefined<TAccount> extends true\n    ? { account: TAccountOverride }\n    : { account?: TAccountOverride };\n\n/**\n * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.\n * This is useful for account implementations that always provide the `decodeCalls` functionality.\n */\nexport type SmartAccountWithDecodeCalls<\n  TImplementation extends SmartAccountImplementation,\n> = SmartAccount<TImplementation> & {\n  decodeCalls: NonNullable<SmartAccount<TImplementation>[\"decodeCalls\"]>;\n};\n\nexport type SignatureRequest =\n  | {\n      type: \"personal_sign\";\n      data: SignableMessage;\n    }\n  | {\n      type: \"eth_signTypedData_v4\";\n      data: TypedDataDefinition;\n    };\n\nexport type StaticSmartAccountImplementation<\n  eip7702 extends boolean = boolean,\n  entryPointVersion extends EntryPointVersion = EntryPointVersion,\n  factoryArgs extends {} = {},\n  entryPointAbi extends Abi | readonly unknown[] = Abi,\n  accountAbi extends Abi | readonly unknown[] = Abi,\n  factoryAbi extends Abi | readonly unknown[] = Abi,\n> = {\n  readonly entryPoint: {\n    readonly abi: entryPointAbi;\n    readonly address: Address;\n    readonly version: entryPointVersion;\n  };\n  readonly accountAbi: accountAbi;\n} & (eip7702 extends false\n  ? {\n      // Smart contract account specific fields\n      readonly accountImplementation: Address;\n      readonly getFactoryData: (factoryArgs: factoryArgs) => Hex;\n      readonly predictAccountAddress: (factoryArgs: factoryArgs) => Address;\n      readonly factoryAddress: Address;\n      readonly factoryAbi: factoryAbi;\n    }\n  : {}) &\n  (eip7702 extends true\n    ? {\n        // EIP-7702 account specific fields\n        readonly delegationAddress: Address;\n      }\n    : {});\n"]}

package/dist/types/light-account/accounts/base.d.ts

@@ -1,7 +1,7 @@
 import { type Abi, type Address, type Chain, type Client, type Hex, type JsonRpcAccount, type LocalAccount, type Transport } from "viem";
-import { type SmartAccount, type SmartAccountImplementation } from "viem/account-abstraction";
+import { type SmartAccountImplementation } from "viem/account-abstraction";
 import type { EntryPointFromAccountRegistry, LightAccountType, LightAccountVersion } from "../registry.js";
-import type { SignatureRequest } from "../../types.js";
+import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 export type BaseLightAccountImplementation<TLightAccountType extends LightAccountType = LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>> = SmartAccountImplementation<EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>["abi"], EntryPointFromAccountRegistry<TLightAccountType, TLightAccountVersion>["version"], {
     getLightAccountVersion: () => TLightAccountVersion;
     smartAccountType: TLightAccountType;
@@ -12,7 +12,7 @@ export type BaseLightAccountImplementation<TLightAccountType extends LightAccoun
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
 }, false>;
-export type LightAccountBase<TLightAccountType extends LightAccountType = LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>> = SmartAccount<BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>>;
+export type LightAccountBase<TLightAccountType extends LightAccountType = LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>> = SmartAccountWithDecodeCalls<BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>>;
 export type ToLightAccountBaseParams<TLightAccountType extends LightAccountType, TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>, TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     abi: Abi;

package/dist/types/light-account/accounts/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAQL,KAAK,GAAG,EACR,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EAEf,MAAM,MAAM,CAAC;AACd,OAAO,EAGL,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAChC,MAAM,0BAA0B,CAAC;AAElC,OAAO,KAAK,EACV,6BAA6B,EAC7B,gBAAgB,EAChB,mBAAmB,EACpB,MAAM,gBAAgB,CAAC;AAQxB,OAAO,KAAK,EACV,gBAAgB,EAEjB,MAAM,gBAAgB,CAAC;AASxB,MAAM,MAAM,8BAA8B,CACxC,iBAAiB,SAAS,gBAAgB,GAAG,gBAAgB,EAC7D,oBAAoB,SAClB,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,IAC/E,0BAA0B,CAC5B,6BAA6B,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC,KAAK,CAAC,EAC7E,6BAA6B,CAC3B,iBAAiB,EACjB,oBAAoB,CACrB,CAAC,SAAS,CAAC,EACZ;IACE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;IACnD,gBAAgB,EAAE,iBAAiB,CAAC;IACpC,sBAAsB,EAAE,CAAC,MAAM,EAAE;QAC/B,gBAAgB,EAAE,OAAO,CAAC;QAC1B,iBAAiB,EAAE,GAAG,CAAC;KACxB,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IACnB,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3E,eAAe,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACnD,EACD,KAAK,CACN,CAAC;AAEF,MAAM,MAAM,gBAAgB,CAC1B,iBAAiB,SAAS,gBAAgB,GAAG,gBAAgB,EAC7D,oBAAoB,SAClB,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,IAC/E,YAAY,CACd,8BAA8B,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CACxE,CAAC;AAEF,MAAM,MAAM,wBAAwB,CAClC,iBAAiB,SAAS,gBAAgB,EAC1C,oBAAoB,SAClB,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,EACjF,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC;IACF,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAAC,CAAC;IAC7E,GAAG,EAAE,GAAG,CAAC;IACT,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,cAAc,GAAG,YAAY,CAAC;IACrC,IAAI,EAAE,iBAAiB,CAAC;IACxB,OAAO,EAAE,oBAAoB,CAAC;IAC9B,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC9B,WAAW,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;KAC/B,CAAC,CAAC;CACJ,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,iBAAiB,SAAS,gBAAgB,EAC1C,oBAAoB,SAClB,mBAAmB,CAAC,iBAAiB,CAAC,GAAG,mBAAmB,CAAC,iBAAiB,CAAC,EACjF,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,EACA,MAAM,EACN,GAAG,EACH,cAAc,EACd,KAAK,EACL,IAAI,EACJ,OAAO,EACP,cAAc,GACf,EAAE,wBAAwB,CACzB,iBAAiB,EACjB,oBAAoB,EACpB,UAAU,CACX,GAAG,OAAO,CAAC,gBAAgB,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,CAAC,CAgOrE"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/light-account/accounts/base.ts"],"names":[],"mappings":"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"}

package/dist/types/ma-v1/accounts/base.d.ts

@@ -1,13 +1,13 @@
 import { type Address, type Chain, type Client, type Hex, type JsonRpcAccount, type LocalAccount, type Transport, type Hash, type TypedDataDefinition } from "viem";
-import { entryPoint06Abi, type SmartAccount, type SmartAccountImplementation } from "viem/account-abstraction";
-import type { SignatureRequest } from "../../types.js";
+import { entryPoint06Abi, type SmartAccountImplementation } from "viem/account-abstraction";
+import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 type MaV1AccountType = "MultiOwnerModularAccountV1";
 export type BaseMaV1AccountImplementation = SmartAccountImplementation<typeof entryPoint06Abi, "0.6", {
     smartAccountType: MaV1AccountType;
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
 }, false>;
-export type ModularAccountV1Base = SmartAccount<BaseMaV1AccountImplementation>;
+export type ModularAccountV1Base = SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;
 export type ToModularAccountV1BaseParams<TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     accountAddress: Address;

package/dist/types/ma-v1/accounts/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,IAAI,EACT,KAAK,mBAAmB,EAEzB,MAAM,MAAM,CAAC;AACd,OAAO,EACL,eAAe,EAEf,KAAK,YAAY,EACjB,KAAK,0BAA0B,EAGhC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAYvD,KAAK,eAAe,GAAG,4BAA4B,CAAC;AAEpD,MAAM,MAAM,6BAA6B,GAAG,0BAA0B,CACpE,OAAO,eAAe,EACtB,KAAK,EACL;IACE,gBAAgB,EAAE,eAAe,CAAC;IAClC,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3E,eAAe,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACnD,EACD,KAAK,CACN,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC,6BAA6B,CAAC,CAAC;AAE/E,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC;IACF,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAAC,CAAC;IAC7E,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,cAAc,GAAG,YAAY,CAAC;IACrC,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC9B,WAAW,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;KAC/B,CAAC,CAAC;IACH,aAAa,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC3D,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,EACA,MAAM,EACN,cAAc,EACd,KAAK,EACL,cAAc,EACd,aAAa,EACb,IAAI,GACL,EAAE,4BAA4B,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAwK1E"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/ma-v1/accounts/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,GAAG,EACR,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EACd,KAAK,IAAI,EACT,KAAK,mBAAmB,EAEzB,MAAM,MAAM,CAAC;AACd,OAAO,EACL,eAAe,EAEf,KAAK,0BAA0B,EAGhC,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AAYxB,KAAK,eAAe,GAAG,4BAA4B,CAAC;AAEpD,MAAM,MAAM,6BAA6B,GAAG,0BAA0B,CACpE,OAAO,eAAe,EACtB,KAAK,EACL;IACE,gBAAgB,EAAE,eAAe,CAAC;IAClC,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3E,eAAe,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACnD,EACD,KAAK,CACN,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC9B,2BAA2B,CAAC,6BAA6B,CAAC,CAAC;AAE7D,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC;IACF,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAAC,CAAC;IAC7E,cAAc,EAAE,OAAO,CAAC;IACxB,KAAK,EAAE,cAAc,GAAG,YAAY,CAAC;IACrC,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC9B,WAAW,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;KAC/B,CAAC,CAAC;IACH,aAAa,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,OAAO,CAAC,mBAAmB,CAAC,CAAC;IAC3D,IAAI,EAAE,eAAe,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,EACA,MAAM,EACN,cAAc,EACd,KAAK,EACL,cAAc,EACd,aAAa,EACb,IAAI,GACL,EAAE,4BAA4B,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAwK1E"}

package/dist/types/ma-v2/accounts/base.d.ts

@@ -1,7 +1,7 @@
 import { type Address, type Hex, type Chain, type Client, type JsonRpcAccount, type LocalAccount, type Transport } from "viem";
-import { entryPoint07Abi, type SmartAccountImplementation, type SmartAccount, type WebAuthnAccount, type ToSmartAccountParameters } from "viem/account-abstraction";
+import { entryPoint07Abi, type SmartAccountImplementation, type WebAuthnAccount, type ToSmartAccountParameters } from "viem/account-abstraction";
 import { type ExecutionDataView, type SignerEntity, type ValidationDataView } from "../types.js";
-import type { SignatureRequest } from "../../types.js";
+import type { SignatureRequest, SmartAccountWithDecodeCalls } from "../../types.js";
 export type ValidationDataParams = {
     validationModuleAddress: Address;
     entityId?: never;
@@ -18,7 +18,7 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<type
     prepareSignature: (request: SignatureRequest) => Promise<SignatureRequest>;
     formatSignature: (signature: Hex) => Promise<Hex>;
 }, boolean>;
-export type ModularAccountV2Base = SmartAccount<BaseModularAccountV2Implementation>;
+export type ModularAccountV2Base = SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;
 export type ToModularAccountV2BaseParams<TTransport extends Transport = Transport> = {
     client: Client<TTransport, Chain, JsonRpcAccount | LocalAccount | undefined>;
     owner: JsonRpcAccount | LocalAccount | WebAuthnAccount;

package/dist/types/ma-v2/accounts/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EAUf,MAAM,MAAM,CAAC;AACd,OAAO,EACL,eAAe,EACf,KAAK,0BAA0B,EAC/B,KAAK,YAAY,EAIjB,KAAK,eAAe,EACpB,KAAK,wBAAwB,EAG9B,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AA0BvD,MAAM,MAAM,oBAAoB,GAC5B;IACE,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB,GACD;IACE,uBAAuB,CAAC,EAAE,KAAK,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,kCAAkC,GAAG,0BAA0B,CACzE,OAAO,eAAe,EACtB,KAAK,EACL;IACE,gBAAgB,EAAE,kBAAkB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,IAAI,EAAE,oBAAoB,KACvB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3E,eAAe,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACnD,EACD,OAAO,CACR,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC9B,YAAY,CAAC,kCAAkC,CAAC,CAAC;AAEnD,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC;IACF,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAAC,CAAC;IAC7E,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,eAAe,CAAC;IACvD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC9B,WAAW,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;KAC/B,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,aAAa,CAAC,EAAE,wBAAwB,CAAC,eAAe,CAAC,CAAC;CAC3D,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,EACA,MAAM,EACN,KAAK,EACL,cAAc,EACd,cAAc,EACd,YAGC,EACD,cAAc,EACd,aAAa,GACd,EAAE,4BAA4B,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAmb1E"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../src/ma-v2/accounts/base.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,OAAO,EACZ,KAAK,GAAG,EACR,KAAK,KAAK,EACV,KAAK,MAAM,EACX,KAAK,cAAc,EACnB,KAAK,YAAY,EACjB,KAAK,SAAS,EAUf,MAAM,MAAM,CAAC;AACd,OAAO,EACL,eAAe,EACf,KAAK,0BAA0B,EAI/B,KAAK,eAAe,EACpB,KAAK,wBAAwB,EAG9B,MAAM,0BAA0B,CAAC;AAQlC,OAAO,EAEL,KAAK,iBAAiB,EACtB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACxB,MAAM,aAAa,CAAC;AAErB,OAAO,KAAK,EACV,gBAAgB,EAChB,2BAA2B,EAC5B,MAAM,gBAAgB,CAAC;AA0BxB,MAAM,MAAM,oBAAoB,GAC5B;IACE,uBAAuB,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,EAAE,KAAK,CAAC;CAClB,GACD;IACE,uBAAuB,CAAC,EAAE,KAAK,CAAC;IAChC,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEN,MAAM,MAAM,kCAAkC,GAAG,0BAA0B,CACzE,OAAO,eAAe,EACtB,KAAK,EACL;IACE,gBAAgB,EAAE,kBAAkB,CAAC;IACrC,YAAY,EAAE,YAAY,CAAC;IAC3B,cAAc,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,gBAAgB,EAAE,CAAC,QAAQ,EAAE,GAAG,KAAK,OAAO,CAAC,iBAAiB,CAAC,CAAC;IAChE,iBAAiB,EAAE,CACjB,IAAI,EAAE,oBAAoB,KACvB,OAAO,CAAC,kBAAkB,CAAC,CAAC;IACjC,gBAAgB,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAC3E,eAAe,EAAE,CAAC,SAAS,EAAE,GAAG,KAAK,OAAO,CAAC,GAAG,CAAC,CAAC;CACnD,EACD,OAAO,CACR,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAC9B,2BAA2B,CAAC,kCAAkC,CAAC,CAAC;AAElE,MAAM,MAAM,4BAA4B,CACtC,UAAU,SAAS,SAAS,GAAG,SAAS,IACtC;IACF,MAAM,EAAE,MAAM,CAAC,UAAU,EAAE,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,SAAS,CAAC,CAAC;IAC7E,KAAK,EAAE,cAAc,GAAG,YAAY,GAAG,eAAe,CAAC;IACvD,cAAc,EAAE,OAAO,CAAC;IACxB,cAAc,EAAE,MAAM,OAAO,CAAC;QAC5B,OAAO,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;QAC9B,WAAW,CAAC,EAAE,GAAG,GAAG,SAAS,CAAC;KAC/B,CAAC,CAAC;IACH,YAAY,CAAC,EAAE,YAAY,CAAC;IAC5B,cAAc,CAAC,EAAE,GAAG,CAAC;IACrB,aAAa,CAAC,EAAE,wBAAwB,CAAC,eAAe,CAAC,CAAC;CAC3D,CAAC;AAEF;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,EACA,MAAM,EACN,KAAK,EACL,cAAc,EACd,cAAc,EACd,YAGC,EACD,cAAc,EACd,aAAa,GACd,EAAE,4BAA4B,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAyb1E"}

package/dist/types/types.d.ts

@@ -1,10 +1,17 @@
 import type { Abi, Address, Hex, IsUndefined, SignableMessage, TypedDataDefinition } from "viem";
-import type { EntryPointVersion, SmartAccount } from "viem/account-abstraction";
+import type { EntryPointVersion, SmartAccount, SmartAccountImplementation } from "viem/account-abstraction";
 export type GetAccountParameter<TAccount extends SmartAccount | undefined = SmartAccount | undefined, TAccountOverride extends SmartAccount = SmartAccount> = IsUndefined<TAccount> extends true ? {
     account: TAccountOverride;
 } : {
     account?: TAccountOverride;
 };
+/**
+ * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.
+ * This is useful for account implementations that always provide the `decodeCalls` functionality.
+ */
+export type SmartAccountWithDecodeCalls<TImplementation extends SmartAccountImplementation> = SmartAccount<TImplementation> & {
+    decodeCalls: NonNullable<SmartAccount<TImplementation>["decodeCalls"]>;
+};
 export type SignatureRequest = {
     type: "personal_sign";
     data: SignableMessage;

package/dist/types/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,OAAO,EACP,GAAG,EACH,WAAW,EACX,eAAe,EACf,mBAAmB,EACpB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAEhF,MAAM,MAAM,mBAAmB,CAC7B,QAAQ,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,EACpE,gBAAgB,SAAS,YAAY,GAAG,YAAY,IAEpD,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GAC9B;IAAE,OAAO,EAAE,gBAAgB,CAAA;CAAE,GAC7B;IAAE,OAAO,CAAC,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAErC,MAAM,MAAM,gBAAgB,GACxB;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,GACD;IACE,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,mBAAmB,CAAC;CAC3B,CAAC;AAEN,MAAM,MAAM,gCAAgC,CAC1C,OAAO,SAAS,OAAO,GAAG,OAAO,EACjC,iBAAiB,SAAS,iBAAiB,GAAG,iBAAiB,EAC/D,WAAW,SAAS,EAAE,GAAG,EAAE,EAC3B,aAAa,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EACpD,UAAU,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EACjD,UAAU,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,IAC/C;IACF,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;QAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;KACrC,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC,GAAG,CAAC,OAAO,SAAS,KAAK,GACtB;IAEE,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,GAAG,CAAC;IAC3D,QAAQ,CAAC,qBAAqB,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC;IACtE,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC,GACD,EAAE,CAAC,GACL,CAAC,OAAO,SAAS,IAAI,GACjB;IAEE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;CACrC,GACD,EAAE,CAAC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,GAAG,EACH,OAAO,EACP,GAAG,EACH,WAAW,EACX,eAAe,EACf,mBAAmB,EACpB,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EACV,iBAAiB,EACjB,YAAY,EACZ,0BAA0B,EAC3B,MAAM,0BAA0B,CAAC;AAElC,MAAM,MAAM,mBAAmB,CAC7B,QAAQ,SAAS,YAAY,GAAG,SAAS,GAAG,YAAY,GAAG,SAAS,EACpE,gBAAgB,SAAS,YAAY,GAAG,YAAY,IAEpD,WAAW,CAAC,QAAQ,CAAC,SAAS,IAAI,GAC9B;IAAE,OAAO,EAAE,gBAAgB,CAAA;CAAE,GAC7B;IAAE,OAAO,CAAC,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAErC;;;GAGG;AACH,MAAM,MAAM,2BAA2B,CACrC,eAAe,SAAS,0BAA0B,IAChD,YAAY,CAAC,eAAe,CAAC,GAAG;IAClC,WAAW,EAAE,WAAW,CAAC,YAAY,CAAC,eAAe,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC;CACxE,CAAC;AAEF,MAAM,MAAM,gBAAgB,GACxB;IACE,IAAI,EAAE,eAAe,CAAC;IACtB,IAAI,EAAE,eAAe,CAAC;CACvB,GACD;IACE,IAAI,EAAE,sBAAsB,CAAC;IAC7B,IAAI,EAAE,mBAAmB,CAAC;CAC3B,CAAC;AAEN,MAAM,MAAM,gCAAgC,CAC1C,OAAO,SAAS,OAAO,GAAG,OAAO,EACjC,iBAAiB,SAAS,iBAAiB,GAAG,iBAAiB,EAC/D,WAAW,SAAS,EAAE,GAAG,EAAE,EAC3B,aAAa,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EACpD,UAAU,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,EACjD,UAAU,SAAS,GAAG,GAAG,SAAS,OAAO,EAAE,GAAG,GAAG,IAC/C;IACF,QAAQ,CAAC,UAAU,EAAE;QACnB,QAAQ,CAAC,GAAG,EAAE,aAAa,CAAC;QAC5B,QAAQ,CAAC,OAAO,EAAE,OAAO,CAAC;QAC1B,QAAQ,CAAC,OAAO,EAAE,iBAAiB,CAAC;KACrC,CAAC;IACF,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC,GAAG,CAAC,OAAO,SAAS,KAAK,GACtB;IAEE,QAAQ,CAAC,qBAAqB,EAAE,OAAO,CAAC;IACxC,QAAQ,CAAC,cAAc,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,GAAG,CAAC;IAC3D,QAAQ,CAAC,qBAAqB,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC;IACtE,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IACjC,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CACjC,GACD,EAAE,CAAC,GACL,CAAC,OAAO,SAAS,IAAI,GACjB;IAEE,QAAQ,CAAC,iBAAiB,EAAE,OAAO,CAAC;CACrC,GACD,EAAE,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alchemy/smart-accounts",
-  "version": "0.0.0-alpha.5",
+  "version": "0.0.0-alpha.6",
   "description": "This package contains all of the viem interfaces for Alchemy's Smart Contract Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -39,13 +39,14 @@
     "test:run": "vitest run"
   },
   "devDependencies": {
-    "@alchemy/aa-infra": "0.0.0-alpha.5",
+    "@alchemy/aa-infra": "0.0.0-alpha.6",
     "typescript-template": "*"
   },
   "dependencies": {
-    "@alchemy/common": "0.0.0-alpha.5",
+    "@alchemy/common": "0.0.0-alpha.6",
     "ox": "^0.9.6",
-    "viem": "^2.32.0"
+    "viem": "^2.32.0",
+    "webauthn-p256": "^0.0.10"
   },
   "publishConfig": {
     "access": "public",
@@ -59,5 +60,5 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "ab29ae32b4dd4688a2edd348d730c7a0b6de5f40"
+  "gitHead": "51d1115bb8a1507ba5fa56ad6b28ca03562106a6"
 }

package/src/light-account/accounts/base.ts

@@ -19,7 +19,6 @@ import {
 import {
   getUserOperationHash,
   toSmartAccount,
-  type SmartAccount,
   type SmartAccountImplementation,
 } from "viem/account-abstraction";
 import { getStorageAt, signMessage, signTypedData } from "viem/actions";
@@ -38,6 +37,7 @@ import { BaseError, lowerAddress } from "@alchemy/common";
 import type {
   SignatureRequest,
   StaticSmartAccountImplementation,
+  SmartAccountWithDecodeCalls,
 } from "../../types.js";
 import { getAction } from "viem/utils";
 
@@ -74,7 +74,7 @@ export type LightAccountBase<
   TLightAccountType extends LightAccountType = LightAccountType,
   TLightAccountVersion extends
     LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,
-> = SmartAccount<
+> = SmartAccountWithDecodeCalls<
   BaseLightAccountImplementation<TLightAccountType, TLightAccountVersion>
 >;
 

package/src/ma-v1/accounts/base.ts

@@ -13,12 +13,14 @@ import {
 import {
   entryPoint06Abi,
   toSmartAccount,
-  type SmartAccount,
   type SmartAccountImplementation,
   entryPoint06Address,
   getUserOperationHash,
 } from "viem/account-abstraction";
-import type { SignatureRequest } from "../../types.js";
+import type {
+  SignatureRequest,
+  SmartAccountWithDecodeCalls,
+} from "../../types.js";
 import { IStandardExecutorAbi } from "../abis/IStandardExecutor.js";
 import { signMessage, signTypedData } from "viem/actions";
 import {
@@ -43,7 +45,8 @@ export type BaseMaV1AccountImplementation = SmartAccountImplementation<
   false
 >;
 
-export type ModularAccountV1Base = SmartAccount<BaseMaV1AccountImplementation>;
+export type ModularAccountV1Base =
+  SmartAccountWithDecodeCalls<BaseMaV1AccountImplementation>;
 
 export type ToModularAccountV1BaseParams<
   TTransport extends Transport = Transport,

package/src/ma-v2/accounts/base.ts

@@ -19,7 +19,6 @@ import {
 import {
   entryPoint07Abi,
   type SmartAccountImplementation,
-  type SmartAccount,
   entryPoint07Address,
   getUserOperationHash,
   toSmartAccount,
@@ -42,7 +41,10 @@ import {
   type ValidationDataView,
 } from "../types.js";
 import { modularAccountAbi } from "../abis/modularAccountAbi.js";
-import type { SignatureRequest } from "../../types.js";
+import type {
+  SignatureRequest,
+  SmartAccountWithDecodeCalls,
+} from "../../types.js";
 import {
   decodeFunctionData,
   getAction,
@@ -96,7 +98,7 @@ export type BaseModularAccountV2Implementation = SmartAccountImplementation<
 >;
 
 export type ModularAccountV2Base =
-  SmartAccount<BaseModularAccountV2Implementation>;
+  SmartAccountWithDecodeCalls<BaseModularAccountV2Implementation>;
 
 export type ToModularAccountV2BaseParams<
   TTransport extends Transport = Transport,
@@ -145,10 +147,16 @@ export async function toModularAccountV2Base<
     throw new InvalidEntityIdError(entityId);
   }
 
+  let isDeployed = false;
+
   const isAccountDeployed: () => Promise<boolean> = async () => {
+    if (isDeployed) {
+      return true;
+    }
     const action = getAction(client, getCode, "getCode");
     const code = await action({ address: accountAddress });
-    return code != null && code !== "0x";
+    isDeployed = !!code;
+    return isDeployed;
   };
 
   // These default values signal that we should not use the set deferred action nonce

package/src/types.ts

@@ -6,7 +6,11 @@ import type {
   SignableMessage,
   TypedDataDefinition,
 } from "viem";
-import type { EntryPointVersion, SmartAccount } from "viem/account-abstraction";
+import type {
+  EntryPointVersion,
+  SmartAccount,
+  SmartAccountImplementation,
+} from "viem/account-abstraction";
 
 export type GetAccountParameter<
   TAccount extends SmartAccount | undefined = SmartAccount | undefined,
@@ -16,6 +20,16 @@ export type GetAccountParameter<
     ? { account: TAccountOverride }
     : { account?: TAccountOverride };
 
+/**
+ * Helper type that converts a SmartAccount type to have a required `decodeCalls` function.
+ * This is useful for account implementations that always provide the `decodeCalls` functionality.
+ */
+export type SmartAccountWithDecodeCalls<
+  TImplementation extends SmartAccountImplementation,
+> = SmartAccount<TImplementation> & {
+  decodeCalls: NonNullable<SmartAccount<TImplementation>["decodeCalls"]>;
+};
+
 export type SignatureRequest =
   | {
       type: "personal_sign";