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

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,

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

@@ -17,11 +17,10 @@ import {
 import { MultiOwnerLightAccountAbi } from "../abis/MultiOwnerLightAccountAbi.js";
 import { MultiOwnerLightAccountFactoryAbi } from "../abis/MultiOwnerLightAccountFactoryAbi.js";
 import type {
-  GetEntryPointForLightAccountVersion,
-  GetLightAccountVersion,
+  LightAccountEntryPointVersion,
+  LightAccountVersion,
 } from "../types.js";
 import {
-  AccountVersionRegistry,
   defaultLightAccountVersion,
   getDefaultMultiOwnerLightAccountFactoryAddress,
 } from "../utils.js";
@@ -33,19 +32,11 @@ import {
 
 export type MultiOwnerLightAccount<
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"MultiOwnerLightAccount"> = GetLightAccountVersion<"MultiOwnerLightAccount">,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    "MultiOwnerLightAccount",
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<
-    "MultiOwnerLightAccount",
-    TLightAccountVersion
-  >
+  TLightAccountVersion extends LightAccountVersion<"MultiOwnerLightAccount"> = LightAccountVersion<"MultiOwnerLightAccount">
 > = LightAccountBase<
   TSigner,
   "MultiOwnerLightAccount",
-  TLightAccountVersion,
-  TEntryPointVersion
+  TLightAccountVersion
 > & {
   encodeUpdateOwners: (
     ownersToAdd: Address[],
@@ -57,54 +48,47 @@ export type MultiOwnerLightAccount<
 export type CreateMultiOwnerLightAccountParams<
   TTransport extends Transport = Transport,
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"MultiOwnerLightAccount"> = GetLightAccountVersion<"MultiOwnerLightAccount">,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    "MultiOwnerLightAccount",
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<
-    "MultiOwnerLightAccount",
-    TLightAccountVersion
-  >
+  TLightAccountVersion extends LightAccountVersion<"MultiOwnerLightAccount"> = LightAccountVersion<"MultiOwnerLightAccount">
 > = Omit<
   CreateLightAccountBaseParams<
-    TTransport,
-    TSigner,
     "MultiOwnerLightAccount",
     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<
+      "MultiOwnerLightAccount",
+      TLightAccountVersion
+    >,
+    Chain
+  >;
   owners?: Address[];
 };
 
 export async function createMultiOwnerLightAccount<
   TTransport extends Transport = Transport,
   TSigner extends SmartAccountSigner = SmartAccountSigner,
-  TLightAccountVersion extends GetLightAccountVersion<"MultiOwnerLightAccount"> = GetLightAccountVersion<"MultiOwnerLightAccount">,
-  TEntryPointVersion extends GetEntryPointForLightAccountVersion<
-    "MultiOwnerLightAccount",
-    TLightAccountVersion
-  > = GetEntryPointForLightAccountVersion<
-    "MultiOwnerLightAccount",
-    TLightAccountVersion
-  >
+  TLightAccountVersion extends LightAccountVersion<"MultiOwnerLightAccount"> = LightAccountVersion<"MultiOwnerLightAccount">
 >(
   config: CreateMultiOwnerLightAccountParams<
     TTransport,
     TSigner,
-    TLightAccountVersion,
-    TEntryPointVersion
+    TLightAccountVersion
   >
-): Promise<
-  MultiOwnerLightAccount<TSigner, TLightAccountVersion, TEntryPointVersion>
->;
+): Promise<MultiOwnerLightAccount<TSigner, TLightAccountVersion>>;
 
 /**
  * Creates a multi-owner light account using the provided parameters, including transport, chain, signer, initialization code, version, account address, factory address, salt, and owners. Ensures the owners list is deduplicated, ordered, and valid.
@@ -131,7 +115,7 @@ export async function createMultiOwnerLightAccount({
   chain,
   signer,
   initCode,
-  version = defaultLightAccountVersion("MultiOwnerLightAccount"),
+  version = defaultLightAccountVersion(),
   entryPoint = getEntryPoint(chain, {
     version: "0.7.0",
   }),
@@ -181,15 +165,17 @@ export async function createMultiOwnerLightAccount({
   });
 
   const account = await createLightAccountBase<
+    "MultiOwnerLightAccount",
+    LightAccountVersion<"MultiOwnerLightAccount">,
     Transport,
-    SmartAccountSigner,
-    "MultiOwnerLightAccount"
+    SmartAccountSigner
   >({
     transport,
     chain,
     signer,
     abi: MultiOwnerLightAccountAbi,
-    version: AccountVersionRegistry["MultiOwnerLightAccount"][version],
+    version,
+    type: "MultiOwnerLightAccount",
     entryPoint,
     accountAddress: address,
     getAccountInitCode,

package/src/light-account/clients/alchemyClient.ts

@@ -1,3 +1,4 @@
+import type { HttpTransport, SmartAccountSigner } from "@aa-sdk/core";
 import {
   AlchemyProviderConfigSchema,
   createAlchemyPublicRpcClient,
@@ -12,7 +13,6 @@ import {
   type LightAccount,
   type LightAccountClientActions,
 } from "@account-kit/smart-contracts";
-import type { HttpTransport, SmartAccountSigner } from "@aa-sdk/core";
 import { custom, type Chain, type CustomTransport, type Transport } from "viem";
 
 export type AlchemyLightAccountClientConfig<
@@ -45,7 +45,7 @@ export async function createLightAccountAlchemyClient<
  * @example
  * ```ts
  * import { createLightAccountAlchemyClient } from "@account-kit/smart-contracts";
- * import { sepolia } from "@account-kit/infra/chains";
+ * import { sepolia } from "@account-kit/infra";
  * import { LocalAccountSigner } from "@aa-sdk/core";
  * import { generatePrivateKey } from "viem"
  *

package/src/light-account/clients/multiOwnerAlchemyClient.ts

@@ -1,3 +1,4 @@
+import type { HttpTransport, SmartAccountSigner } from "@aa-sdk/core";
 import {
   AlchemyProviderConfigSchema,
   createAlchemyPublicRpcClient,
@@ -12,14 +13,13 @@ import {
   type MultiOwnerLightAccount,
   type MultiOwnerLightAccountClientActions,
 } from "@account-kit/smart-contracts";
-import type { HttpTransport, SmartAccountSigner } from "@aa-sdk/core";
 import { custom, type Chain, type CustomTransport, type Transport } from "viem";
 
 export type AlchemyMultiOwnerLightAccountClientConfig<
   TSigner extends SmartAccountSigner = SmartAccountSigner
 > = Omit<
   CreateMultiOwnerLightAccountParams<HttpTransport, TSigner>,
-  "transport" | "chain"
+  "transport" | "chain" | "type"
 > &
   Omit<
     AlchemySmartAccountClientConfig<
@@ -49,7 +49,7 @@ export async function createMultiOwnerLightAccountAlchemyClient<
  * @example
  * ```ts
  * import { createMultiOwnerLightAccountAlchemyClient } from "@account-kit/smart-contracts";
- * import { sepolia } from "@account-kit/infra/chains";
+ * import { sepolia } from "@account-kit/infra";
  * import { LocalAccountSigner } from "@aa-sdk/core";
  * import { generatePrivateKey } from "viem"
  *

package/src/light-account/decorators/lightAccount.ts

@@ -24,7 +24,7 @@ export type LightAccountClientActions<
  * ```ts
  * import { lightAccountClientActions, createLightAccount } from "@account-kit/smart-contracts";
  * import { createAlchemySmartAccountClient } from "@account-kit/infra";
- * import { sepolia } from "@account-kit/infra/chains";
+ * import { sepolia } from "@account-kit/infra";
  *
  * const smartAccountClient = createAlchemySmartAccountClient({
  *  account: await createLightAccount(...),

package/src/light-account/decorators/multiOwnerLightAccount.ts

@@ -24,7 +24,7 @@ export type MultiOwnerLightAccountClientActions<
  * ```ts
  * import { multiOwnerLightAccountClientActions, createMultiOwnerLightAccount } from "@account-kit/smart-contracts";
  * import { createAlchemySmartAccountClient } from "@account-kit/infra";
- * import { sepolia } from "@account-kit/infra/chains";
+ * import { sepolia } from "@account-kit/infra";
  *
  * const smartAccountClient = createAlchemySmartAccountClient({
  *  account: await createMultiOwnerLightAccount(...),

package/src/light-account/types.ts

@@ -1,10 +1,4 @@
-import {
-  type EntryPointVersion,
-  type GetAccountParameter,
-  type OneOf,
-  type SmartAccountSigner,
-  type SmartContractAccount,
-} from "@aa-sdk/core";
+import { type EntryPointVersion } from "@aa-sdk/core";
 import { type Address, type Chain } from "viem";
 import type { LightAccountBase } from "./accounts/base";
 
@@ -12,199 +6,48 @@ import type { LightAccountBase } from "./accounts/base";
  * Light account types supported: LightAccount, MultiOwnerLightAccount
  *
  */
-export type LightAccountType = keyof IAccountVersionRegistry;
+export type LightAccountType = "LightAccount" | "MultiOwnerLightAccount";
 
-/**
- * Account version definition, which is the base type defining the LightAccountVersionDef interface
- *
- * @template {LightAccountType} TLightAccountType type
- * @template {GetLightAccountVersion<TLightAccountType>} TLightAccountVersion version
- * @template {EntryPointVersion} TEntryPointVersion entryPointVersion
- */
-export type AccountVersionDef<
-  TLightAccountType extends LightAccountType = LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TLightAccountType> = GetLightAccountVersion<TLightAccountType>,
+export type LightAccountVersionConfig<
   TEntryPointVersion extends EntryPointVersion = EntryPointVersion
 > = {
-  type: TLightAccountType;
-  version: TLightAccountVersion;
   entryPointVersion: TEntryPointVersion;
-  address: Record<
-    Chain["id"],
-    {
+  addresses: {
+    default: {
       factory: Address;
       impl: Address;
-    }
-  >;
+    };
+    overrides?: Record<
+      Chain["id"],
+      {
+        factory: Address;
+        impl: Address;
+      }
+    >;
+  };
 };
 
-/**
- * Light account version type defs for tightly coupled types for smart accounts
- *
- */
-export type LightAccountVersion =
-  | keyof IAccountVersionRegistry["LightAccount"]
-  | keyof IAccountVersionRegistry["MultiOwnerLightAccount"];
-
-/**
- * Get the light account versions available for the given light account type
- *
- * @template {LightAccountType} TLightAccountType
- */
-export type GetLightAccountVersion<
-  TLightAccountType extends LightAccountType = LightAccountType
-> = keyof IAccountVersionRegistry[TLightAccountType];
-
-/**
- * Light account version definition type based on the light account type and version
- *
- * @template {LightAccountType} TLightAccountType
- * @template {GetLightAccountVersion<TLightAccountType>} TLightAccountVersion
- */
-export type LightAccountVersionDef<
-  TLightAccountType extends LightAccountType = LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TLightAccountType> = GetLightAccountVersion<TLightAccountType>
-> = IAccountVersionRegistry[TLightAccountType][TLightAccountVersion];
-
-/**
- * Light account version registry interface defining the supported light account versions
- *
- */
-export interface IAccountVersionRegistry {
+export type LightAccountVersionConfigs = {
   LightAccount: {
-    /** @deprecated This version does not support 1271 signature validation */
-    "v1.0.1": AccountVersionDef<"LightAccount", "v1.0.1", "0.6.0">;
-    /** @deprecated This version has a known issue with 1271 validation */
-    "v1.0.2": AccountVersionDef<"LightAccount", "v1.0.2", "0.6.0">;
-    "v1.1.0": AccountVersionDef<"LightAccount", "v1.1.0", "0.6.0">;
-    /**
-     * LightAccount v2 Changelog.
-     * It is recommended to use v2.0.0
-     * https://alchemotion.notion.site/External-Light-Account-v2-Changelog-725b306ab1e04eb0a3e596521dd8f0bd
-     */
-    "v2.0.0": AccountVersionDef<"LightAccount", "v2.0.0", "0.7.0">;
+    "v1.0.1": LightAccountVersionConfig<"0.6.0">;
+    "v1.0.2": LightAccountVersionConfig<"0.6.0">;
+    "v1.1.0": LightAccountVersionConfig<"0.6.0">;
+    "v2.0.0": LightAccountVersionConfig<"0.7.0">;
   };
   MultiOwnerLightAccount: {
-    /**
-     * MultiOwnerLightAccount v2 Changelog
-     * It is recommended to use v2.0.0
-     * https://alchemotion.notion.site/External-Light-Account-v2-Changelog-725b306ab1e04eb0a3e596521dd8f0bd
-     */
-    "v2.0.0": AccountVersionDef<"MultiOwnerLightAccount", "v2.0.0", "0.7.0">;
+    "v2.0.0": LightAccountVersionConfig<"0.7.0">;
   };
-}
-
-/**
- * Get the light account version definitions available for the given light account type
- *
- * @template {LightAccountType} TLightAccountType
- *
- * @example
- * type T1 = GetLightAccountVersionsForType<"LightAccount">;
- * const t1: T1 = AccountVersionRegistry.LightAccount["v1.0.2"];
- */
-export type GetLightAccountVersionDefsForType<TType extends LightAccountType> =
-  Extract<
-    IAccountVersionRegistry[TType][keyof IAccountVersionRegistry[TType]],
-    { type: TType }
-  >;
-
-/**
- * Get the light account version definition for the given light account type and version
- *
- * @template {LightAccountType} TType
- * @template {GetLightAccountVersion<TType>} TLightAccountVersion
- */
-export type GetLightAccountVersionDef<
-  TType extends LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TType>
-> = IAccountVersionRegistry[TType][TLightAccountVersion];
-
-/**
- * @example
- * type T = GetLightAccountVersionDefsForEntryPoint<"LightAccount", "0.6.0">;
- * const t_1: T = AccountVersionRegistry.LightAccount["v1.0.2"]; // compiles
- * const t_2: T = AccountVersionRegistry.LightAccount["v2.0.0"]; // errors
- */
-export type GetLightAccountVersionDefsForEntryPoint<
-  TType extends LightAccountType,
-  TEntryPointVersion extends EntryPointVersion
-> = Extract<
-  GetLightAccountVersionDefsForType<TType>,
-  { entryPointVersion: TEntryPointVersion }
->;
-
-/**
- * Get the light account type for the given light account by inferring from its type definition
- *
- * @template {SmartContractAccount | undefined} TAccount
- * @template {SmartContractAccount} TAccountOverride
- */
-export type GetLightAccountType<
-  TAccount extends SmartContractAccount | undefined,
-  TAccountOverride extends SmartContractAccount = SmartContractAccount
-> = GetAccountParameter<TAccount, TAccountOverride> extends LightAccountBase<
-  SmartAccountSigner,
-  infer TLightAccountType
->
-  ? OneOf<TLightAccountType, LightAccountType>
-  : LightAccountType;
-
-/**
- * Get the light account version for the given light account by inferring from its type definition
- *
- * @template {LightAccountBase | undefined} TAccount
- * @template {LightAccountBase} TAccountOverride
- */
-export type GetLightAccountVersionFromAccount<
-  TAccount extends LightAccountBase | undefined,
-  TAccountOverride extends LightAccountBase = LightAccountBase
-> = GetAccountParameter<TAccount, TAccountOverride> extends LightAccountBase<
-  SmartAccountSigner,
-  LightAccountType,
-  infer TLightAccountVersion
->
-  ? OneOf<TLightAccountVersion, LightAccountVersion>
-  : LightAccountVersion;
+};
 
-/**
- * Get the entry point version supported for the given light account type and version
- *
- * @template {LightAccountType} TLightAccountType
- * @template {GetLightAccountVersion<TLightAccountType>} TLightAccountVersion
- */
-export type GetEntryPointForLightAccountVersion<
-  TLightAccountType extends LightAccountType = LightAccountType,
-  TLightAccountVersion extends GetLightAccountVersion<TLightAccountType> = GetLightAccountVersion<TLightAccountType>
-> = GetLightAccountVersionDef<
-  TLightAccountType,
-  TLightAccountVersion
-> extends AccountVersionDef<
-  TLightAccountType,
-  TLightAccountVersion,
-  infer TEntryPointVersion
->
-  ? TEntryPointVersion
-  : EntryPointVersion;
+export type LightAccountVersion<TAccountType extends LightAccountType> =
+  keyof LightAccountVersionConfigs[TAccountType];
 
-/**
- * Get the light account type for the given light account version by inferring from its type definition
- *
- * @template {LightAccountVersion} TLightAccountVersion
- */
-export type GetLightAccountTypesForVersion<
-  TLightAccountVersion extends LightAccountVersion = LightAccountVersion
-> = TLightAccountVersion extends GetLightAccountVersion<infer TLightAccountType>
-  ? TLightAccountType
-  : LightAccountType;
+export type GetLightAccountType<TAccount extends LightAccountBase> =
+  TAccount["source"] extends LightAccountType ? TAccount["source"] : never;
 
-/**
- * Get default light account version for the given light account type
- *
- * @template {LightAccountType} TLightAccountType
- */
-export type GetDefaultLightAccountVersion<
-  TLightAccountType extends LightAccountType = LightAccountType
-> = TLightAccountType extends "MultiOwnerLightAccount"
-  ? "v2.0.0" & LightAccountVersion
-  : "v1.1.0" & LightAccountVersion;
+export type LightAccountEntryPointVersion<
+  TLightAccountType extends LightAccountType,
+  TLightAccountVersion extends LightAccountVersion<TLightAccountType> = LightAccountVersion<TLightAccountType>
+> = LightAccountVersionConfigs[TLightAccountType][TLightAccountVersion] extends LightAccountVersionConfig
+  ? LightAccountVersionConfigs[TLightAccountType][TLightAccountVersion]["entryPointVersion"]
+  : never;