@kheopskit/core 0.1.1 → 0.2.0

package/dist/index.d.mts

@@ -48,6 +48,13 @@ type WalletId = string;
 type KheopskitConfig = {
     autoReconnect: boolean;
     platforms: WalletPlatform[];
+    /**
+     * Allowed Polkadot account key types.
+     * Accounts with other key types are filtered out from kheopskit state.
+     *
+     * @default ["sr25519", "ed25519", "ecdsa"]
+     */
+    polkadotAccountTypes: PolkadotAccountType[];
     walletConnect?: {
         projectId: string;
         metadata: Metadata;
@@ -137,7 +144,9 @@ type EthereumAppKitWallet = {
 type EthereumWallet = EthereumInjectedWallet | EthereumAppKitWallet;
 type Wallet = PolkadotWallet | EthereumWallet;
 type WalletPlatform = Wallet["platform"];
-type PolkadotAccount = InjectedPolkadotAccount & {
+type PolkadotAccountType = "sr25519" | "ed25519" | "ecdsa" | "ethereum";
+type PolkadotAccount = Omit<InjectedPolkadotAccount, "type"> & {
+    type: PolkadotAccountType;
     id: WalletAccountId;
     platform: "polkadot";
     walletName: string;
@@ -148,6 +157,8 @@ type EthereumAccount = {
     platform: "ethereum";
     client: WalletClient<CustomTransport, undefined, Account, undefined>;
     address: `0x${string}`;
+    /** Current chain ID the wallet is connected to. `undefined` while loading or after provider disconnect. */
+    chainId: number | undefined;
     walletName: string;
     walletId: string;
     isWalletDefault: boolean;
@@ -174,6 +185,10 @@ type CachedAccount = {
     platform: WalletPlatform;
     address: string;
     name?: string;
+    /** Cached chain ID for Ethereum accounts. */
+    chainId?: number;
+    /** Cached key type for Polkadot accounts. */
+    polkadotAccountType?: PolkadotAccountType;
     walletId: WalletId;
     walletName: string;
 };
@@ -275,4 +290,4 @@ type KheopskitState = {
 };
 declare const getKheopskit$: (config?: Partial<KheopskitConfig>, ssrCookies?: string, existingStore?: ReturnType<typeof createKheopskitStore>) => Observable<KheopskitState>;
 
-export { type CachedAccount, type CachedWallet, DEFAULT_STORAGE_KEY, type EthereumAccount, type EthereumAppKitWallet, type EthereumInjectedWallet, type EthereumWallet, type KheopskitConfig, type KheopskitState, type PolkadotAccount, type PolkadotAppKitWallet, type PolkadotInjectedWallet, type PolkadotWallet, type Wallet, type WalletAccount, type WalletPlatform, clearAllCachedObservables, clearCachedObservable, createKheopskitStore, getCachedIcon, getDefaultStore, getKheopskit$, getSafeLocalStorage, hydrateAccount, hydrateWallet, resetAppKitCache, resolveConfig };
+export { type CachedAccount, type CachedWallet, DEFAULT_STORAGE_KEY, type EthereumAccount, type EthereumAppKitWallet, type EthereumInjectedWallet, type EthereumWallet, type KheopskitConfig, type KheopskitState, type PolkadotAccount, type PolkadotAccountType, type PolkadotAppKitWallet, type PolkadotInjectedWallet, type PolkadotWallet, type Wallet, type WalletAccount, type WalletPlatform, clearAllCachedObservables, clearCachedObservable, createKheopskitStore, getCachedIcon, getDefaultStore, getKheopskit$, getSafeLocalStorage, hydrateAccount, hydrateWallet, resetAppKitCache, resolveConfig };

package/dist/index.d.ts

@@ -48,6 +48,13 @@ type WalletId = string;
 type KheopskitConfig = {
     autoReconnect: boolean;
     platforms: WalletPlatform[];
+    /**
+     * Allowed Polkadot account key types.
+     * Accounts with other key types are filtered out from kheopskit state.
+     *
+     * @default ["sr25519", "ed25519", "ecdsa"]
+     */
+    polkadotAccountTypes: PolkadotAccountType[];
     walletConnect?: {
         projectId: string;
         metadata: Metadata;
@@ -137,7 +144,9 @@ type EthereumAppKitWallet = {
 type EthereumWallet = EthereumInjectedWallet | EthereumAppKitWallet;
 type Wallet = PolkadotWallet | EthereumWallet;
 type WalletPlatform = Wallet["platform"];
-type PolkadotAccount = InjectedPolkadotAccount & {
+type PolkadotAccountType = "sr25519" | "ed25519" | "ecdsa" | "ethereum";
+type PolkadotAccount = Omit<InjectedPolkadotAccount, "type"> & {
+    type: PolkadotAccountType;
     id: WalletAccountId;
     platform: "polkadot";
     walletName: string;
@@ -148,6 +157,8 @@ type EthereumAccount = {
     platform: "ethereum";
     client: WalletClient<CustomTransport, undefined, Account, undefined>;
     address: `0x${string}`;
+    /** Current chain ID the wallet is connected to. `undefined` while loading or after provider disconnect. */
+    chainId: number | undefined;
     walletName: string;
     walletId: string;
     isWalletDefault: boolean;
@@ -174,6 +185,10 @@ type CachedAccount = {
     platform: WalletPlatform;
     address: string;
     name?: string;
+    /** Cached chain ID for Ethereum accounts. */
+    chainId?: number;
+    /** Cached key type for Polkadot accounts. */
+    polkadotAccountType?: PolkadotAccountType;
     walletId: WalletId;
     walletName: string;
 };
@@ -275,4 +290,4 @@ type KheopskitState = {
 };
 declare const getKheopskit$: (config?: Partial<KheopskitConfig>, ssrCookies?: string, existingStore?: ReturnType<typeof createKheopskitStore>) => Observable<KheopskitState>;
 
-export { type CachedAccount, type CachedWallet, DEFAULT_STORAGE_KEY, type EthereumAccount, type EthereumAppKitWallet, type EthereumInjectedWallet, type EthereumWallet, type KheopskitConfig, type KheopskitState, type PolkadotAccount, type PolkadotAppKitWallet, type PolkadotInjectedWallet, type PolkadotWallet, type Wallet, type WalletAccount, type WalletPlatform, clearAllCachedObservables, clearCachedObservable, createKheopskitStore, getCachedIcon, getDefaultStore, getKheopskit$, getSafeLocalStorage, hydrateAccount, hydrateWallet, resetAppKitCache, resolveConfig };
+export { type CachedAccount, type CachedWallet, DEFAULT_STORAGE_KEY, type EthereumAccount, type EthereumAppKitWallet, type EthereumInjectedWallet, type EthereumWallet, type KheopskitConfig, type KheopskitState, type PolkadotAccount, type PolkadotAccountType, type PolkadotAppKitWallet, type PolkadotInjectedWallet, type PolkadotWallet, type Wallet, type WalletAccount, type WalletPlatform, clearAllCachedObservables, clearCachedObservable, createKheopskitStore, getCachedIcon, getDefaultStore, getKheopskit$, getSafeLocalStorage, hydrateAccount, hydrateWallet, resetAppKitCache, resolveConfig };

package/dist/index.js

@@ -152,6 +152,7 @@ var hydrateAccount = (cached) => {
     return {
       id: cached.id,
       platform: "polkadot",
+      type: cached.polkadotAccountType ?? "sr25519",
       address: cached.address,
       name: cached.name,
       walletId: cached.walletId,
@@ -166,6 +167,7 @@ var hydrateAccount = (cached) => {
       id: cached.id,
       platform: "ethereum",
       address: cached.address,
+      chainId: cached.chainId,
       walletId: cached.walletId,
       walletName: cached.walletName,
       isWalletDefault: false,
@@ -188,6 +190,8 @@ var serializeAccount = (account) => ({
   platform: account.platform,
   address: account.address,
   name: "name" in account ? account.name : void 0,
+  chainId: account.platform === "ethereum" ? account.chainId : void 0,
+  polkadotAccountType: account.platform === "polkadot" ? account.type : void 0,
   walletId: account.walletId,
   walletName: account.walletName
 });
@@ -467,12 +471,28 @@ var DEFAULT_STORAGE_KEY = "kheopskit";
 var DEFAULT_CONFIG = {
   autoReconnect: true,
   platforms: ["polkadot"],
+  polkadotAccountTypes: ["sr25519", "ed25519", "ecdsa"],
   debug: false,
   storageKey: DEFAULT_STORAGE_KEY,
   hydrationGracePeriod: 500
 };
+var VALID_POLKADOT_ACCOUNT_TYPES = /* @__PURE__ */ new Set([
+  "sr25519",
+  "ed25519",
+  "ecdsa",
+  "ethereum"
+]);
 var resolveConfig = (config) => {
-  return Object.assign({}, DEFAULT_CONFIG, config);
+  const resolved = Object.assign({}, DEFAULT_CONFIG, config);
+  const invalid = resolved.polkadotAccountTypes.filter(
+    (t) => !VALID_POLKADOT_ACCOUNT_TYPES.has(t)
+  );
+  if (invalid.length > 0) {
+    console.warn(
+      `[kheopskit] Unknown polkadotAccountTypes: ${JSON.stringify(invalid)}. Valid values: "sr25519", "ed25519", "ecdsa", "ethereum".`
+    );
+  }
+  return resolved;
 };
 
 // src/api/kheopskit.ts
@@ -697,12 +717,37 @@ var getWalletAccountId = (walletId, address) => {
 };
 
 // src/api/ethereum/accounts.ts
+var normalizeEvmChainId = (value) => {
+  let raw = value;
+  if (typeof raw === "string" && raw.startsWith("eip155:")) {
+    raw = raw.slice("eip155:".length);
+  }
+  if (typeof raw === "bigint") {
+    return raw >= 0n ? Number(raw) : void 0;
+  }
+  if (typeof raw === "number") {
+    return Number.isInteger(raw) && raw >= 0 ? raw : void 0;
+  }
+  if (typeof raw === "string") {
+    const normalized = raw.trim().toLowerCase();
+    if (!normalized) return void 0;
+    const parsed = normalized.startsWith("0x") ? Number.parseInt(normalized, 16) : Number.parseInt(normalized, 10);
+    return Number.isNaN(parsed) ? void 0 : parsed;
+  }
+  return void 0;
+};
+var toCaipNetworkId = (value) => {
+  const chainId = normalizeEvmChainId(value);
+  return chainId === void 0 ? void 0 : `eip155:${chainId}`;
+};
 var getInjectedWalletAccounts$ = (wallet) => {
   if (!wallet.isConnected) return (0, import_rxjs5.of)([]);
   return getCachedObservable$(
     `accounts:${wallet.id}`,
     () => new import_rxjs5.Observable((subscriber) => {
-      const getAccount = (address, i) => {
+      const addresses$ = new import_rxjs5.ReplaySubject(1);
+      const chainId$ = new import_rxjs5.ReplaySubject(1);
+      const getAccount = (address, i, chainId) => {
         const client = (0, import_viem2.createWalletClient)({
           account: address,
           transport: (0, import_viem2.custom)(wallet.provider)
@@ -712,26 +757,42 @@ var getInjectedWalletAccounts$ = (wallet) => {
           platform: "ethereum",
           client,
           address: (0, import_viem2.getAddress)(address),
+          chainId,
           walletName: wallet.name,
           walletId: wallet.id,
           isWalletDefault: i === 0
         };
       };
-      const handleAccountsChanged = (addresses) => {
-        subscriber.next(addresses.map(getAccount));
+      const handleAccountsChanged = (addrs) => {
+        addresses$.next(addrs);
+      };
+      const handleChainChanged = (chainIdHex) => {
+        chainId$.next(normalizeEvmChainId(chainIdHex));
+      };
+      const handleDisconnect = () => {
+        chainId$.next(void 0);
       };
       wallet.provider.on("accountsChanged", handleAccountsChanged);
-      wallet.provider.request({ method: "eth_accounts" }).then((addresses) => {
-        subscriber.next(addresses.map(getAccount));
-      }).catch((err) => {
+      wallet.provider.on("chainChanged", handleChainChanged);
+      wallet.provider.on("disconnect", handleDisconnect);
+      wallet.provider.request({ method: "eth_accounts" }).then((addrs) => addresses$.next(addrs)).catch((err) => {
         console.error("Failed to get accounts", err);
-        subscriber.next([]);
+        addresses$.next([]);
       });
+      wallet.provider.request({ method: "eth_chainId" }).then(handleChainChanged).catch(() => chainId$.next(void 0));
+      const sub = (0, import_rxjs5.combineLatest)([addresses$, chainId$]).pipe(
+        (0, import_rxjs5.map)(
+          ([addresses, chainId]) => addresses.map((addr, i) => getAccount(addr, i, chainId))
+        )
+      ).subscribe(subscriber);
       return () => {
         wallet.provider.removeListener(
           "accountsChanged",
           handleAccountsChanged
         );
+        wallet.provider.removeListener("chainChanged", handleChainChanged);
+        wallet.provider.removeListener("disconnect", handleDisconnect);
+        sub.unsubscribe();
       };
     }).pipe((0, import_rxjs5.shareReplay)({ refCount: true, bufferSize: 1 }))
   );
@@ -760,24 +821,29 @@ var getAppKitAccounts$ = (wallet) => {
     () => new import_rxjs5.Observable((subscriber) => {
       const caipNetworkId$ = new import_rxjs5.ReplaySubject(1);
       const handleChainChanged = (chainId) => {
-        caipNetworkId$.next(`eip155:${chainId}`);
+        const caipNetworkId = toCaipNetworkId(chainId);
+        if (caipNetworkId) {
+          caipNetworkId$.next(caipNetworkId);
+        }
       };
       provider.on("chainChanged", handleChainChanged);
       provider.request({ method: "eth_chainId" }).then(handleChainChanged);
       const sub = caipNetworkId$.pipe(
         (0, import_rxjs5.distinctUntilChanged)(),
-        (0, import_rxjs5.map)(
-          (caipNetworkId) => (0, import_viem2.custom)(
+        (0, import_rxjs5.map)((caipNetworkId) => {
+          const chainId = normalizeEvmChainId(caipNetworkId);
+          const transport = (0, import_viem2.custom)(
             wrapWalletConnectProvider(
               provider,
               // biome-ignore lint/style/noNonNullAssertion: legacy
               provider.session.topic,
               caipNetworkId
             )
-          )
-        ),
+          );
+          return { transport, chainId };
+        }),
         (0, import_rxjs5.map)(
-          (transport) => account.allAccounts.map((acc, i) => {
+          ({ transport, chainId }) => account.allAccounts.map((acc, i) => {
             const client = (0, import_viem2.createWalletClient)({
               account: acc.address,
               transport
@@ -789,6 +855,7 @@ var getAppKitAccounts$ = (wallet) => {
               walletId: wallet.id,
               address: acc.address,
               client,
+              chainId,
               isWalletDefault: i === 0
             };
           })
@@ -823,7 +890,9 @@ var getEthereumAccounts$ = (ethereumWallets) => new import_rxjs5.Observable((sub
 );
 var isSameAccountsList = (a, b) => {
   if (a.length !== b.length) return false;
-  return a.every((account, i) => account.id === b[i]?.id);
+  return a.every(
+    (account, i) => account.id === b[i]?.id && account.chainId === b[i]?.chainId
+  );
 };
 
 // src/api/polkadot/accounts.ts
@@ -835,6 +904,7 @@ var getInjectedWalletAccounts$2 = (wallet) => {
     const getAccount = (account) => ({
       id: getWalletAccountId(wallet.id, account.address),
       ...account,
+      type: account.type ?? "sr25519",
       platform: "polkadot",
       walletName: wallet.name,
       walletId: wallet.id
@@ -904,12 +974,19 @@ var getAppKitAccounts$2 = (wallet) => {
         polkadotSigner: getAppKitPolkadotSigner(wallet.appKit, acc.address),
         genesisHash: null,
         name: `${wallet.name} Polkadot`,
+        // WalletConnect (Reown AppKit) doesn't expose account key type;
+        // default to sr25519, which is the most common Polkadot key type.
         type: "sr25519"
       })
     )
   );
 };
-var getPolkadotAccounts$ = (polkadotWallets$) => new import_rxjs6.Observable((subscriber) => {
+var getPolkadotAccounts$ = (polkadotWallets$, polkadotAccountTypes) => new import_rxjs6.Observable((subscriber) => {
+  if (polkadotAccountTypes.length === 0) {
+    console.warn(
+      "[kheopskit] config.polkadotAccountTypes is empty; all Polkadot accounts will be filtered out."
+    );
+  }
   const sub = polkadotWallets$.pipe(
     (0, import_rxjs6.map)((wallets) => wallets.filter((w) => w.isConnected)),
     (0, import_rxjs6.switchMap)(
@@ -918,7 +995,9 @@ var getPolkadotAccounts$ = (polkadotWallets$) => new import_rxjs6.Observable((su
         ...wallets.filter((w) => w.type === "appKit").map(getAppKitAccounts$2)
       ]) : (0, import_rxjs6.of)([])
     ),
-    (0, import_rxjs6.map)((accounts) => accounts.flat()),
+    (0, import_rxjs6.map)(
+      (accounts) => accounts.flat().filter((account) => polkadotAccountTypes.includes(account.type))
+    ),
     (0, import_rxjs6.distinctUntilChanged)(isSameAccountsList2)
   ).subscribe(subscriber);
   return () => {
@@ -940,7 +1019,8 @@ var getAccounts$ = (config, wallets) => {
             return getPolkadotAccounts$(
               wallets.pipe(
                 (0, import_rxjs7.map)((w) => w.filter((w2) => w2.platform === "polkadot"))
-              )
+              ),
+              config.polkadotAccountTypes
             );
           case "ethereum":
             return getEthereumAccounts$(
@@ -964,6 +1044,34 @@ var getAccounts$ = (config, wallets) => {
 // src/api/store.ts
 var import_lodash_es = require("lodash-es");
 var DEFAULT_SETTINGS = {};
+var toCompactPolkadotAccountType = (type) => {
+  switch (type) {
+    case "sr25519":
+      return 0;
+    case "ed25519":
+      return 1;
+    case "ecdsa":
+      return 2;
+    case "ethereum":
+      return 3;
+    default:
+      return null;
+  }
+};
+var fromCompactPolkadotAccountType = (type) => {
+  switch (type) {
+    case 0:
+      return "sr25519";
+    case 1:
+      return "ed25519";
+    case 2:
+      return "ecdsa";
+    case 3:
+      return "ethereum";
+    default:
+      return void 0;
+  }
+};
 var createKheopskitStore = (options = {}) => {
   const { ssrCookies, storageKey = DEFAULT_STORAGE_KEY } = options;
   const storage = ssrCookies !== void 0 ? createCompactCookieStorage(ssrCookies) : safeLocalStorage;
@@ -1039,7 +1147,9 @@ var toCompactStore = (data) => {
     (account) => [
       account.walletId,
       account.address,
-      account.name ?? null
+      account.name ?? null,
+      account.chainId ?? null,
+      toCompactPolkadotAccountType(account.polkadotAccountType)
     ]
   );
   return {
@@ -1064,13 +1174,15 @@ var fromCompactStore = (data) => {
     };
   });
   const accounts = (data.a ?? []).map((item) => {
-    const [walletId, address, name] = item;
+    const [walletId, address, name, chainId, polkadotAccountType] = item;
     const { platform } = parseWalletId(walletId);
     return {
       id: getWalletAccountId(walletId, address),
       platform,
       address,
       name: name ?? void 0,
+      chainId: chainId ?? void 0,
+      polkadotAccountType: platform === "polkadot" ? fromCompactPolkadotAccountType(polkadotAccountType) : void 0,
       walletId,
       walletName: walletNameMap.get(walletId) ?? walletId
     };
@@ -1400,7 +1512,9 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
     }
     return wallet;
   });
-  const cachedAccounts = cachedState.accounts.map(hydrateAccount);
+  const cachedAccounts = cachedState.accounts.map(hydrateAccount).filter(
+    (account) => account.platform !== "polkadot" || kc.polkadotAccountTypes.includes(account.type)
+  );
   if (kc.debug && cachedWallets.length > 0) {
     console.debug("[kheopskit] hydrating from cache:", {
       wallets: cachedWallets.length,
@@ -1532,7 +1646,9 @@ var getKheopskit$ = (config, ssrCookies, existingStore) => {
 var arraysEqual = (a, b) => a.length === b.length && a.every((v, i) => v === b[i]);
 var statesEqual = (a, b) => a.isHydrating === b.isHydrating && a.wallets.length === b.wallets.length && a.accounts.length === b.accounts.length && a.wallets.every(
   (w, i) => w.id === b.wallets[i]?.id && w.isConnected === b.wallets[i]?.isConnected
-) && a.accounts.every((acc, i) => acc.id === b.accounts[i]?.id);
+) && a.accounts.every(
+  (acc, i) => acc.id === b.accounts[i]?.id && (acc.platform !== "ethereum" || acc.chainId === b.accounts[i]?.chainId)
+);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   DEFAULT_STORAGE_KEY,