@account-kit/smart-contracts 4.0.0-alpha.0 → 4.0.0-alpha.10

package/dist/types/src/msca/utils.d.ts

@@ -2,29 +2,67 @@ import { type GetAccountParameter, type SmartAccountClient, type SmartAccountSig
 import type { Address, Chain, Transport } from "viem";
 import { type MultiOwnerModularAccount } from "./account/multiOwnerAccount.js";
 /**
- * Utility method returning the default multi sig msca factory address given a {@link Chain} object
+ * Utility method returning the default multi sig msca factory address given a chain
  *
- * @param chain - a {@link Chain} object
- * @returns a {@link Address} for the given chain
+ * @param {Chain} chain the chain object for which to get the address
+ * @returns {Address} the address for the given chain
  * @throws if the chain doesn't have an address currently deployed
  */
 export declare const getDefaultMultisigModularAccountFactoryAddress: (chain: Chain) => Address;
 /**
- * Utility method returning the default multi owner msca factory address given a {@link Chain} object
+ * Utility method returning the default multi owner msca factory address given a chain
  *
- * @param chain - a {@link Chain} object
- * @returns a {@link Address} for the given chain
+ * @param {Chain} chain the chain object for which to get the address
+ * @returns {Address} the address for the given chain
  * @throws if the chain doesn't have an address currently deployed
  */
 export declare const getDefaultMultiOwnerModularAccountFactoryAddress: (chain: Chain) => Address;
-export declare function getMSCAUpgradeToData<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TSigner extends SmartAccountSigner = SmartAccountSigner, TAccount extends SmartContractAccountWithSigner<string, TSigner> | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined>(client: SmartAccountClient<TTransport, TChain, TAccount>, args: {
+export type GetMSCAUpgradeToData<TSigner extends SmartAccountSigner = SmartAccountSigner, TAccount extends SmartContractAccountWithSigner<string, TSigner> | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined> = {
     multiOwnerPluginAddress?: Address;
-} & GetAccountParameter<TAccount>): Promise<UpgradeToData & {
+} & GetAccountParameter<TAccount>;
+/**
+ * Retrieves the data necessary to upgrade to a Multi-Signature Contract Account (MSCA) and provides a method to create a Multi-Owner Modular Account.
+ *
+ * @example
+ * ```ts
+ * import { createLightAccountClient, getMSCAUpgradeToData } from "@account-kit/smart-contracts";
+ *
+ * const client = createLightAccountClient(...);
+ * const upgradeData = await getMSCAUpgradeToData(client, {});
+ * ```
+ *
+ * @param {SmartAccountClient<TTransport, TChain, TAccount>} client The smart account client
+ * @param {GetMSCAUpgradeToData<TSigner, TAccount>} args The arguments required for the upgrade
+ * @returns {Promise<UpgradeToData & { createMAAccount: () => Promise<MultiOwnerModularAccount<TSigner>>}>} A promise that resolves to upgrade data augmented with a function to create a Multi-Owner Modular Account
+ */
+export declare function getMSCAUpgradeToData<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TSigner extends SmartAccountSigner = SmartAccountSigner, TAccount extends SmartContractAccountWithSigner<string, TSigner> | undefined = SmartContractAccountWithSigner<string, TSigner> | undefined>(client: SmartAccountClient<TTransport, TChain, TAccount>, args: GetMSCAUpgradeToData<TSigner, TAccount>): Promise<UpgradeToData & {
     createMAAccount: () => Promise<MultiOwnerModularAccount<TSigner>>;
 }>;
-export declare function getMAInitializationData<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined>({ client, multiOwnerPluginAddress, signerAddress, }: {
+export type GetMAInitializationDataParams<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined> = {
     multiOwnerPluginAddress?: Address;
     client: SmartAccountClient<TTransport, TChain, TAccount>;
     signerAddress: Address | Address[];
-}): Promise<UpgradeToData>;
+};
+/**
+ * Retrieves the initialization data for a multi-owner modular account. Throws an error if the client's chain is not found or if the multi-owner plugin address is not retrievable.
+ *
+ * @example
+ * ```ts
+ * import { getMAInitializationData } from "@account-kit/smart-contracts";
+ * import { createSmartAccountClient } from "@aa-sdk/core";
+ *
+ * const client = createSmartAccountClient(...);
+ * const initializationData = await getMAInitializationData({
+ *  client,
+ *  signerAddress: "0x...", // or array of signers
+ * });
+ * ```
+ *
+ * @param {GetMAInitializationDataParams<TTransport, TChain, TAccount>} params the parameters for getting initialization data
+ * @param {SmartAccountClient<TTransport, TChain, TAccount>} params.client the smart account client
+ * @param {Address | Address[]} params.signerAddress the address of the signer or an array of signer addresses
+ * @param {Address} [params.multiOwnerPluginAddress] optional address of the multi-owner plugin
+ * @returns {Promise<UpgradeToData>} a promise that resolves to the initialization data required for upgrading to a multi-owner modular account
+ */
+export declare function getMAInitializationData<TTransport extends Transport = Transport, TChain extends Chain | undefined = Chain | undefined, TAccount extends SmartContractAccount | undefined = SmartContractAccount | undefined>({ client, multiOwnerPluginAddress, signerAddress, }: GetMAInitializationDataParams<TTransport, TChain, TAccount>): Promise<UpgradeToData>;
 //# sourceMappingURL=utils.d.ts.map

package/dist/types/src/msca/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/msca/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAaL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,8BAA8B,EACnC,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAYtD,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,gCAAgC,CAAC;AAGxC;;;;;;GAMG;AACH,eAAO,MAAM,8CAA8C,UAClD,KAAK,KACX,OAeF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gDAAgD,UACpD,KAAK,KACX,OAKF,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAE3E,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EACxD,IAAI,EAAE;IACJ,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,GAChC,OAAO,CACR,aAAa,GAAG;IACd,eAAe,EAAE,MAAM,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;CACnE,CACF,CA6BA;AAED,wBAAsB,uBAAuB,CAC3C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,oBAAoB,GAAG,SAAS,GAC7C,oBAAoB,GACpB,SAAS,EACb,EACA,MAAM,EACN,uBAAuB,EACvB,aAAa,GACd,EAAE;IACD,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzD,aAAa,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;CACpC,GAAG,OAAO,CAAC,aAAa,CAAC,CAwDzB"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/msca/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,8BAA8B,EACnC,KAAK,aAAa,EACnB,MAAM,cAAc,CAAC;AAatB,OAAO,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AAYtD,OAAO,EAEL,KAAK,wBAAwB,EAC9B,MAAM,gCAAgC,CAAC;AAGxC;;;;;;GAMG;AACH,eAAO,MAAM,8CAA8C,UAClD,KAAK,KACX,OAeF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gDAAgD,UACpD,KAAK,KACX,OAKF,CAAC;AAEF,MAAM,MAAM,oBAAoB,CAC9B,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,IACzE;IACF,uBAAuB,CAAC,EAAE,OAAO,CAAC;CACnC,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;AAElC;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,oBAAoB,CACxC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,OAAO,SAAS,kBAAkB,GAAG,kBAAkB,EACvD,QAAQ,SACJ,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/C,SAAS,GAAG,8BAA8B,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,SAAS,EAE3E,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,EACxD,IAAI,EAAE,oBAAoB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAC5C,OAAO,CACR,aAAa,GAAG;IACd,eAAe,EAAE,MAAM,OAAO,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAC;CACnE,CACF,CA6BA;AAED,MAAM,MAAM,6BAA6B,CACvC,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,oBAAoB,GAAG,SAAS,GAC7C,oBAAoB,GACpB,SAAS,IACX;IACF,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,MAAM,EAAE,kBAAkB,CAAC,UAAU,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC;IACzD,aAAa,EAAE,OAAO,GAAG,OAAO,EAAE,CAAC;CACpC,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAsB,uBAAuB,CAC3C,UAAU,SAAS,SAAS,GAAG,SAAS,EACxC,MAAM,SAAS,KAAK,GAAG,SAAS,GAAG,KAAK,GAAG,SAAS,EACpD,QAAQ,SAAS,oBAAoB,GAAG,SAAS,GAC7C,oBAAoB,GACpB,SAAS,EACb,EACA,MAAM,EACN,uBAAuB,EACvB,aAAa,GACd,EAAE,6BAA6B,CAC9B,UAAU,EACV,MAAM,EACN,QAAQ,CACT,GAAG,OAAO,CAAC,aAAa,CAAC,CAwDzB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@account-kit/smart-contracts",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0-alpha.10",
   "description": "aa-sdk compatible interfaces for Alchemy Smart Accounts",
   "author": "Alchemy",
   "license": "MIT",
@@ -40,20 +40,21 @@
     "build:cjs": "tsc --project tsconfig.build.json --module commonjs --outDir ./dist/cjs --removeComments --verbatimModuleSyntax false && echo > ./dist/cjs/package.json '{\"type\":\"commonjs\"}'",
     "build:esm": "tsc --project tsconfig.build.json --module es2020 --outDir ./dist/esm --removeComments && echo > ./dist/esm/package.json '{\"type\":\"module\"}'",
     "build:types": "tsc --project tsconfig.build.json --module esnext --declarationDir ./dist/types --emitDeclarationOnly --declaration --declarationMap",
+    "docs:gen": "npx ak-docgen generate --in ./src/index.ts --out ../../site/pages/reference/account-kit/smart-contracts",
     "clean": "rm -rf ./dist",
     "test": "vitest",
     "test:run": "vitest run",
     "test:run-e2e": "vitest run --config vitest.config.e2e.ts"
   },
   "devDependencies": {
-    "@account-kit/plugingen": "*",
+    "@account-kit/plugingen": "^4.0.0-alpha.10",
     "@wagmi/cli": "^1.5.2",
     "change-case": "^5.1.2",
     "dedent": "^1.5.1",
     "dotenv": "^16.3.1",
     "typescript": "^5.0.4",
     "typescript-template": "*",
-    "vitest": "^0.31.0"
+    "vitest": "^2.0.4"
   },
   "publishConfig": {
     "access": "public",
@@ -67,10 +68,10 @@
     "url": "https://github.com/alchemyplatform/aa-sdk/issues"
   },
   "homepage": "https://github.com/alchemyplatform/aa-sdk#readme",
-  "gitHead": "bd1788c2bd7f28ba762a06c649f30b544f8bade9",
+  "gitHead": "e3446b95cdee38c248f336857b24f78a32694076",
   "dependencies": {
-    "@aa-sdk/core": "^4.0.0-alpha.0",
-    "@account-kit/infra": "^4.0.0-alpha.0",
+    "@aa-sdk/core": "^4.0.0-alpha.10",
+    "@account-kit/infra": "^4.0.0-alpha.10",
     "viem": "2.8.6"
   },
   "peerDependencies": {

package/plugindefs/multi-owner/config.ts

@@ -14,7 +14,7 @@ import {
   sepolia,
   zora,
   zoraSepolia,
-} from "@aa-sdk/core";
+} from "@account-kit/infra";
 import type { PluginConfig } from "@account-kit/plugingen";
 import { parseAbiParameters } from "viem";
 import { MultiOwnerPluginAbi } from "./abi.js";
@@ -33,7 +33,6 @@ export const MultiOwnerPluginGenConfig: PluginConfig = {
     [arbitrum.id]: "0xcE0000007B008F50d762D155002600004cD6c647",
     [arbitrumSepolia.id]: "0xcE0000007B008F50d762D155002600004cD6c647",
     [base.id]: "0xcE0000007B008F50d762D155002600004cD6c647",
-    [baseSepolia.id]: "0xcE0000007B008F50d762D155002600004cD6c647",
     [fraxtal.id]: "0xcE0000007B008F50d762D155002600004cD6c647",
     [fraxtalSepolia.id]: "0xcE0000007B008F50d762D155002600004cD6c647",
     [zora.id]: "0xcE0000007B008F50d762D155002600004cD6c647",

package/plugindefs/multisig/config.ts

@@ -13,7 +13,7 @@ import {
   sepolia,
   zora,
   zoraSepolia,
-} from "@aa-sdk/core";
+} from "@account-kit/infra";
 import type { PluginConfig } from "@account-kit/plugingen";
 import { parseAbiParameters } from "viem";
 import { MultisigPluginAbi } from "./abi.js";

package/plugindefs/session-key/config.ts

@@ -14,7 +14,7 @@ import {
   sepolia,
   zora,
   zoraSepolia,
-} from "@aa-sdk/core";
+} from "@account-kit/infra";
 import type { PluginConfig } from "@account-kit/plugingen";
 import { parseAbiParameters } from "viem";
 import { MultiOwnerPluginGenConfig } from "../multi-owner/config.js";

package/src/index.ts

@@ -24,7 +24,7 @@ export {
   LightAccountUnsupported1271Impls,
   defaultLightAccountVersion,
   getDefaultLightAccountFactoryAddress,
-  getLightAccountVersionDef,
+  getLightAccountVersionForAccount,
 } from "./light-account/utils.js";
 
 //multi-owner-light-account exports
@@ -72,8 +72,8 @@ export {
 export type * from "./msca/plugin-manager/decorator.js";
 export { pluginManagerActions } from "./msca/plugin-manager/decorator.js";
 export { installPlugin } from "./msca/plugin-manager/installPlugin.js";
+export { multiOwnerPluginActions } from "./msca/plugins/multi-owner/extension.js";
 export type * from "./msca/plugins/multi-owner/index.js";
-export { multiOwnerPluginActions } from "./msca/plugins/multi-owner/index.js";
 export {
   MultiOwnerPlugin,
   MultiOwnerPluginAbi,
@@ -86,7 +86,6 @@ export {
   MultisigPluginExecutionFunctionAbi,
   multisigPluginActions,
   multisigSignatureMiddleware,
-  type SignerType,
 } from "./msca/plugins/multisig/index.js";
 export {
   combineSignatures,
@@ -94,8 +93,8 @@ export {
   getSignerType,
   splitAggregatedSignature,
 } from "./msca/plugins/multisig/utils/index.js";
+export { sessionKeyPluginActions } from "./msca/plugins/session-key/extension.js";
 export type * from "./msca/plugins/session-key/index.js";
-export { sessionKeyPluginActions } from "./msca/plugins/session-key/index.js";
 export type * from "./msca/plugins/session-key/permissions.js";
 export {
   SessionKeyAccessListType,

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

@@ -18,13 +18,14 @@ import { LightAccountAbi_v2 } from "../abis/LightAccountAbi_v2.js";
 import { LightAccountFactoryAbi_v1 } from "../abis/LightAccountFactoryAbi_v1.js";
 import { LightAccountFactoryAbi_v2 } from "../abis/LightAccountFactoryAbi_v2.js";
 import type {
-  GetEntryPointForLightAccountVersion,
-  GetLightAccountVersion,
+  LightAccountEntryPointVersion,
+  LightAccountVersion,
 } from "../types.js";
 import {
   AccountVersionRegistry,
   LightAccountUnsupported1271Factories,
   defaultLightAccountVersion,
+  getDefaultLightAccountFactoryAddress,
 } from "../utils.js";
 import {
   createLightAccountBase,
@@ -34,17 +35,8 @@ import {
 
 export type LightAccount<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"LightAccount"> = GetLightAccountVersion<"LightAccount">,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    "LightAccount",
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<"LightAccount", TLightAccountVersion>
-> = LightAccountBase<
-  TSigner,
-  "LightAccount",
-  TLightAccountVersion,
-  TEntryPointVersion
-> & {
+  TLightAccountVersion extends LightAccountVersion<"LightAccount"> = LightAccountVersion<"LightAccount">
+> = LightAccountBase<TSigner, "LightAccount", TLightAccountVersion> & {
   encodeTransferOwnership: (newOwner: Address) => Hex;
   getOwnerAddress: () => Promise<Address>;
 };
@@ -53,69 +45,73 @@ export type LightAccount<
 export type CreateLightAccountParams<
   TTransport extends Transport = Transport,
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"LightAccount"> = GetLightAccountVersion<"LightAccount">,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    "LightAccount",
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<"LightAccount", TLightAccountVersion>
+  TLightAccountVersion extends LightAccountVersion<"LightAccount"> = LightAccountVersion<"LightAccount">
 > = Omit<
   CreateLightAccountBaseParams<
-    TTransport,
-    TSigner,
     "LightAccount",
     TLightAccountVersion,
-    TEntryPointVersion
+    TTransport,
+    TSigner
   >,
-  "getAccountInitCode" | "entryPoint" | "version" | "abi" | "accountAddress"
+  | "getAccountInitCode"
+  | "entryPoint"
+  | "version"
+  | "abi"
+  | "accountAddress"
+  | "type"
 > & {
   salt?: bigint;
   initCode?: Hex;
   accountAddress?: Address;
   factoryAddress?: Address;
   version?: TLightAccountVersion;
-  entryPoint?: EntryPointDef<TEntryPointVersion, Chain>;
+  entryPoint?: EntryPointDef<
+    LightAccountEntryPointVersion<"LightAccount", TLightAccountVersion>,
+    Chain
+  >;
 };
 // [!endregion CreateLightAccountParams]
 
 export async function createLightAccount<
   TTransport extends Transport = Transport,
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"LightAccount"> = "v1.1.0"
+  TLightAccountVersion extends LightAccountVersion<"LightAccount"> = "v2.0.0"
 >(
   config: CreateLightAccountParams<TTransport, TSigner, TLightAccountVersion>
 ): Promise<LightAccount<TSigner, TLightAccountVersion>>;
 
-export async function createLightAccount<
-  TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"LightAccount"> = GetLightAccountVersion<"LightAccount">,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    "LightAccount",
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<"LightAccount", TLightAccountVersion>
->(
-  config: CreateLightAccountParams<
-    TTransport,
-    TSigner,
-    TLightAccountVersion,
-    TEntryPointVersion
-  >
-): Promise<LightAccount<TSigner, TLightAccountVersion, TEntryPointVersion>>;
-
+/**
+ * Creates a light account based on the provided parameters such as transport, chain, signer, init code, and more. Ensures that an account is configured and returned with various capabilities, such as transferring ownership and retrieving the owner's address.
+ *
+ * @example
+ * ```ts
+ * import { createLightAccount } from "@account-kit/smart-contracts";
+ * import { LocalAccountSigner } from "@aa-sdk/core";
+ * import { sepolia } from "viem/chains";
+ * import { http, generatePrivateKey } from "viem"
+ *
+ * const account = await createLightAccount({
+ *  chain: sepolia,
+ *  transport: http("RPC_URL"),
+ *  signer: LocalAccountSigner.privateKeyToAccountSigner(generatePrivateKey())
+ * });
+ * ```
+ *
+ * @param {CreateLightAccountParams} config The parameters for creating a light account
+ * @returns {Promise<LightAccount>} A promise that resolves to a `LightAccount` object containing the created account information and methods
+ */
 export async function createLightAccount({
   transport,
   chain,
   signer,
   initCode,
-  version = defaultLightAccountVersion("LightAccount"),
+  version = defaultLightAccountVersion(),
   entryPoint = getEntryPoint(chain, {
     version: AccountVersionRegistry["LightAccount"][version]
       .entryPointVersion as any,
   }),
   accountAddress,
-  factoryAddress = AccountVersionRegistry["LightAccount"][version].address[
-    chain.id
-  ].factory,
+  factoryAddress = getDefaultLightAccountFactoryAddress(chain, version),
   salt: salt_ = 0n,
 }: CreateLightAccountParams): Promise<LightAccount> {
   const client = createBundlerClient({
@@ -157,15 +153,17 @@ export async function createLightAccount({
   });
 
   const account = await createLightAccountBase<
+    "LightAccount",
+    LightAccountVersion<"LightAccount">,
     Transport,
-    SmartAccountSigner,
-    "LightAccount"
+    SmartAccountSigner
   >({
     transport,
     chain,
     signer,
     abi: accountAbi,
-    version: AccountVersionRegistry["LightAccount"][version],
+    type: "LightAccount",
+    version,
     entryPoint,
     accountAddress: address,
     getAccountInitCode,

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

@@ -23,11 +23,9 @@ import {
   type Transport,
 } from "viem";
 import type {
-  AccountVersionDef,
-  GetEntryPointForLightAccountVersion,
-  GetLightAccountVersion,
+  LightAccountEntryPointVersion,
   LightAccountType,
-  LightAccountVersionDef,
+  LightAccountVersion,
 } from "../types.js";
 import { AccountVersionRegistry } from "../utils.js";
 
@@ -40,91 +38,60 @@ enum SignatureType {
 export type LightAccountBase<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
   TLightAccountType extends LightAccountType = LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TLightAccountType> = GetLightAccountVersion<TLightAccountType>,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    TLightAccountType,
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<
-    TLightAccountType,
-    TLightAccountVersion
-  >
+  TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>
 > = SmartContractAccountWithSigner<
   TLightAccountType,
   TSigner,
-  TEntryPointVersion
+  LightAccountEntryPointVersion<TLightAccountType, TLightAccountVersion>
 > & {
   getLightAccountVersion: () => TLightAccountVersion;
 };
 
 //#region CreateLightAccountBaseParams
 export type CreateLightAccountBaseParams<
+  TLightAccountType extends LightAccountType,
+  TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>,
   TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountType extends LightAccountType = LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TLightAccountType> = GetLightAccountVersion<TLightAccountType>,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    TLightAccountType,
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<
-    TLightAccountType,
-    TLightAccountVersion
-  >
+  TSigner extends SmartAccountSigner = SmartAccountSigner
 > = Pick<
-  ToSmartContractAccountParams<
-    TLightAccountType,
-    TTransport,
-    Chain,
-    TEntryPointVersion
-  >,
+  ToSmartContractAccountParams<TLightAccountType, TTransport, Chain>,
   "transport" | "chain" | "getAccountInitCode"
 > & {
   abi: Abi;
   signer: TSigner;
   accountAddress: Address;
-  version: LightAccountVersionDef<TLightAccountType, TLightAccountVersion>;
-  entryPoint: EntryPointDef<TEntryPointVersion, Chain>;
+  type: TLightAccountType;
+  version: TLightAccountVersion;
+  entryPoint: EntryPointDef<
+    LightAccountEntryPointVersion<TLightAccountType, TLightAccountVersion>,
+    Chain
+  >;
 };
 //#endregion CreateLightAccountBaseParams
 
 export async function createLightAccountBase<
+  TLightAccountType extends LightAccountType,
+  TLightAccountVersion extends LightAccountVersion<TLightAccountType>,
   TTransport extends Transport = Transport,
-  TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountType extends LightAccountType = LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TLightAccountType> = GetLightAccountVersion<TLightAccountType>,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    TLightAccountType,
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<
-    TLightAccountType,
-    TLightAccountVersion
-  >
->(
-  config: CreateLightAccountBaseParams<
-    TTransport,
-    TSigner,
-    TLightAccountType,
-    TLightAccountVersion,
-    TEntryPointVersion
-  >
-): Promise<
-  LightAccountBase<
-    TSigner,
-    TLightAccountType,
-    TLightAccountVersion,
-    TEntryPointVersion
-  >
->;
-
-export async function createLightAccountBase({
+  TSigner extends SmartAccountSigner = SmartAccountSigner
+>({
   transport,
   chain,
   signer,
   abi,
-  version: { version, type },
+  version,
+  type,
   entryPoint,
   accountAddress,
   getAccountInitCode,
-}: CreateLightAccountBaseParams): Promise<LightAccountBase> {
+}: CreateLightAccountBaseParams<
+  TLightAccountType,
+  TLightAccountVersion,
+  TTransport,
+  TSigner
+>): Promise<
+  LightAccountBase<TSigner, TLightAccountType, TLightAccountVersion>
+> {
   const client = createBundlerClient({
     transport,
     chain,
@@ -149,7 +116,9 @@ export async function createLightAccountBase({
 
     const implementationAddresses = Object.values(
       AccountVersionRegistry[type]
-    ).map((x: AccountVersionDef) => x.address[chain.id].impl);
+    ).map(
+      (x) => x.addresses.overrides?.[chain.id]?.impl ?? x.addresses.default.impl
+    );
 
     // only upgrade undeployed accounts (storage 0) or deployed light accounts, error otherwise
     if (
@@ -157,7 +126,9 @@ export async function createLightAccountBase({
       !implementationAddresses.some((x) => x === trim(storage))
     ) {
       throw new Error(
-        `could not determine if smart account implementation is ${type} ${version}`
+        `could not determine if smart account implementation is ${type} ${String(
+          version
+        )}`
       );
     }
 
@@ -234,7 +205,7 @@ export async function createLightAccountBase({
         case "v1.0.1":
           return signer.signMessage(message);
         case "v1.0.2":
-          throw new Error(`${type} ${version} doesn't support 1271`);
+          throw new Error(`${type} ${String(version)} doesn't support 1271`);
         case "v1.1.0":
           return signWith1271WrapperV1(hashMessage(message));
         case "v2.0.0":
@@ -242,7 +213,7 @@ export async function createLightAccountBase({
           // TODO: handle case where signer is an SCA.
           return concat([SignatureType.EOA, signature]);
         default:
-          throw new Error(`Unknown version ${type} of ${version}`);
+          throw new Error(`Unknown version ${type} of ${String(version)}`);
       }
     },
     async signTypedData(params) {
@@ -253,7 +224,7 @@ export async function createLightAccountBase({
           );
         case "v1.0.2":
           throw new Error(
-            `Version ${version} of LightAccount doesn't support 1271`
+            `Version ${String(version)} of LightAccount doesn't support 1271`
           );
         case "v1.1.0":
           return signWith1271WrapperV1(hashTypedData(params));
@@ -262,7 +233,7 @@ export async function createLightAccountBase({
           // TODO: handle case where signer is an SCA.
           return concat([SignatureType.EOA, signature]);
         default:
-          throw new Error(`Unknown version ${version} of LightAccount`);
+          throw new Error(`Unknown version ${String(version)} of LightAccount`);
       }
     },
     getDummySignature: (): Hex => {
@@ -276,7 +247,7 @@ export async function createLightAccountBase({
         case "v2.0.0":
           return concat([SignatureType.EOA, signature]);
         default:
-          throw new Error(`Unknown version ${type} of ${version}`);
+          throw new Error(`Unknown version ${type} of ${String(version)}`);
       }
     },
     encodeUpgradeToAndCall,