@kheopskit/core 0.1.0 → 0.1.2

package/dist/index.d.mts

@@ -17,6 +17,30 @@ declare const clearCachedObservable: (key: string) => void;
  */
 declare const clearAllCachedObservables: () => void;
 
+type Storage = {
+    getItem: (key: string) => string | null;
+    setItem: (key: string, value: string) => void;
+    removeItem: (key: string) => void;
+};
+/**
+ * Extended storage interface with cross-tab sync support.
+ */
+type SyncableStorage = Storage & {
+    /**
+     * Subscribe to storage changes from other tabs.
+     * Returns an unsubscribe function.
+     */
+    subscribe?: (key: string, callback: (value: string | null) => void) => () => void;
+};
+/**
+ * A safe localStorage wrapper that falls back to noopStorage
+ * when localStorage is not available (e.g., during SSR).
+ * Includes cross-tab sync via the native 'storage' event.
+ *
+ * Lazily initialized on first access to be SSR-safe.
+ */
+declare const getSafeLocalStorage: () => SyncableStorage;
+
 type WalletAccountId = string;
 
 type WalletId = string;
@@ -124,6 +148,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;
@@ -150,6 +176,8 @@ type CachedAccount = {
     platform: WalletPlatform;
     address: string;
     name?: string;
+    /** Cached chain ID for Ethereum accounts. */
+    chainId?: number;
     walletId: WalletId;
     walletName: string;
 };
@@ -228,6 +256,13 @@ declare const createKheopskitStore: (options?: CreateKheopskitStoreOptions) => {
     };
     setCachedState: (wallets: CachedWallet[], accounts: CachedAccount[]) => void;
 };
+type KheopskitStore = ReturnType<typeof createKheopskitStore>;
+/**
+ * Gets the default store, creating it on first access.
+ * Uses localStorage on client, noop on server.
+ * Lazily initialized to avoid SSR issues with module-level code.
+ */
+declare const getDefaultStore: () => KheopskitStore;
 
 type KheopskitState = {
     wallets: Wallet[];
@@ -244,4 +279,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, getKheopskit$, 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 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

@@ -17,6 +17,30 @@ declare const clearCachedObservable: (key: string) => void;
  */
 declare const clearAllCachedObservables: () => void;
 
+type Storage = {
+    getItem: (key: string) => string | null;
+    setItem: (key: string, value: string) => void;
+    removeItem: (key: string) => void;
+};
+/**
+ * Extended storage interface with cross-tab sync support.
+ */
+type SyncableStorage = Storage & {
+    /**
+     * Subscribe to storage changes from other tabs.
+     * Returns an unsubscribe function.
+     */
+    subscribe?: (key: string, callback: (value: string | null) => void) => () => void;
+};
+/**
+ * A safe localStorage wrapper that falls back to noopStorage
+ * when localStorage is not available (e.g., during SSR).
+ * Includes cross-tab sync via the native 'storage' event.
+ *
+ * Lazily initialized on first access to be SSR-safe.
+ */
+declare const getSafeLocalStorage: () => SyncableStorage;
+
 type WalletAccountId = string;
 
 type WalletId = string;
@@ -124,6 +148,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;
@@ -150,6 +176,8 @@ type CachedAccount = {
     platform: WalletPlatform;
     address: string;
     name?: string;
+    /** Cached chain ID for Ethereum accounts. */
+    chainId?: number;
     walletId: WalletId;
     walletName: string;
 };
@@ -228,6 +256,13 @@ declare const createKheopskitStore: (options?: CreateKheopskitStoreOptions) => {
     };
     setCachedState: (wallets: CachedWallet[], accounts: CachedAccount[]) => void;
 };
+type KheopskitStore = ReturnType<typeof createKheopskitStore>;
+/**
+ * Gets the default store, creating it on first access.
+ * Uses localStorage on client, noop on server.
+ * Lazily initialized to avoid SSR issues with module-level code.
+ */
+declare const getDefaultStore: () => KheopskitStore;
 
 type KheopskitState = {
     wallets: Wallet[];
@@ -244,4 +279,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, getKheopskit$, 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 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

@@ -1,20 +1,30 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
 };
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
+var __copyProps = (to, from2, except, desc) => {
+  if (from2 && typeof from2 === "object" || typeof from2 === "function") {
+    for (let key of __getOwnPropNames(from2))
       if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+        __defProp(to, key, { get: () => from2[key], enumerable: !(desc = __getOwnPropDesc(from2, key)) || desc.enumerable });
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -25,7 +35,9 @@ __export(index_exports, {
   clearCachedObservable: () => clearCachedObservable,
   createKheopskitStore: () => createKheopskitStore,
   getCachedIcon: () => getCachedIcon,
+  getDefaultStore: () => getDefaultStore,
   getKheopskit$: () => getKheopskit$,
+  getSafeLocalStorage: () => getSafeLocalStorage,
   hydrateAccount: () => hydrateAccount,
   hydrateWallet: () => hydrateWallet,
   resetAppKitCache: () => resetAppKitCache,
@@ -154,6 +166,7 @@ var hydrateAccount = (cached) => {
       id: cached.id,
       platform: "ethereum",
       address: cached.address,
+      chainId: cached.chainId,
       walletId: cached.walletId,
       walletName: cached.walletName,
       isWalletDefault: false,
@@ -176,6 +189,7 @@ 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,
   walletId: account.walletId,
   walletName: account.walletName
 });
@@ -188,7 +202,8 @@ var noopStorage = {
   removeItem: () => {
   }
 };
-var safeLocalStorage = (() => {
+var _safeLocalStorage = null;
+var createSafeLocalStorage = () => {
   if (typeof window === "undefined") return noopStorage;
   try {
     const testKey = "__kheopskit_test__";
@@ -211,7 +226,23 @@ var safeLocalStorage = (() => {
   } catch {
     return noopStorage;
   }
-})();
+};
+var getSafeLocalStorage = () => {
+  if (_safeLocalStorage === null) {
+    _safeLocalStorage = createSafeLocalStorage();
+  }
+  return _safeLocalStorage;
+};
+var safeLocalStorage = {
+  getItem: (key) => getSafeLocalStorage().getItem(key),
+  setItem: (key, value) => getSafeLocalStorage().setItem(key, value),
+  removeItem: (key) => getSafeLocalStorage().removeItem(key),
+  subscribe: (key, callback) => {
+    const storage = getSafeLocalStorage();
+    return storage.subscribe?.(key, callback) ?? (() => {
+    });
+  }
+};
 var parseCookie = (cookieString, key) => {
   if (!cookieString) return null;
   for (const cookie of cookieString.split(";")) {
@@ -333,8 +364,11 @@ var setCachedIcons = (icons) => {
 };
 
 // src/api/appKit.ts
-var import_core = require("@reown/appkit/core");
 var import_rxjs = require("rxjs");
+var loadAppKit = async () => {
+  const { createAppKit } = await import("@reown/appkit/core");
+  return createAppKit;
+};
 var WALLET_CONNECT_ICON = "data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjQwMCIgdmlld0JveD0iMCAwIDQwMCA0MDAiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxjbGlwUGF0aCBpZD0iYSI+PHBhdGggZD0ibTAgMGg0MDB2NDAwaC00MDB6Ii8+PC9jbGlwUGF0aD48ZyBjbGlwLXBhdGg9InVybCgjYSkiPjxjaXJjbGUgY3g9IjIwMCIgY3k9IjIwMCIgZmlsbD0iIzMzOTZmZiIgcj0iMTk5LjUiIHN0cm9rZT0iIzY2YjFmZiIvPjxwYXRoIGQ9Im0xMjIuNTE5IDE0OC45NjVjNDIuNzkxLTQxLjcyOSAxMTIuMTcxLTQxLjcyOSAxNTQuOTYyIDBsNS4xNSA1LjAyMmMyLjE0IDIuMDg2IDIuMTQgNS40NjkgMCA3LjU1NWwtMTcuNjE3IDE3LjE4Yy0xLjA3IDEuMDQzLTIuODA0IDEuMDQzLTMuODc0IDBsLTcuMDg3LTYuOTExYy0yOS44NTMtMjkuMTExLTc4LjI1My0yOS4xMTEtMTA4LjEwNiAwbC03LjU5IDcuNDAxYy0xLjA3IDEuMDQzLTIuODA0IDEuMDQzLTMuODc0IDBsLTE3LjYxNy0xNy4xOGMtMi4xNC0yLjA4Ni0yLjE0LTUuNDY5IDAtNy41NTV6bTE5MS4zOTcgMzUuNTI5IDE1LjY3OSAxNS4yOWMyLjE0IDIuMDg2IDIuMTQgNS40NjkgMCA3LjU1NWwtNzAuNyA2OC45NDRjLTIuMTM5IDIuMDg3LTUuNjA4IDIuMDg3LTcuNzQ4IDBsLTUwLjE3OC00OC45MzFjLS41MzUtLjUyMi0xLjQwMi0uNTIyLTEuOTM3IDBsLTUwLjE3OCA0OC45MzFjLTIuMTM5IDIuMDg3LTUuNjA4IDIuMDg3LTcuNzQ4IDBsLTcwLjcwMTUtNjguOTQ1Yy0yLjEzOTYtMi4wODYtMi4xMzk2LTUuNDY5IDAtNy41NTVsMTUuNjc5NS0xNS4yOWMyLjEzOTYtMi4wODYgNS42MDg1LTIuMDg2IDcuNzQ4MSAwbDUwLjE3ODkgNDguOTMyYy41MzUuNTIyIDEuNDAyLjUyMiAxLjkzNyAwbDUwLjE3Ny00OC45MzJjMi4xMzktMi4wODcgNS42MDgtMi4wODcgNy43NDggMGw1MC4xNzkgNDguOTMyYy41MzUuNTIyIDEuNDAyLjUyMiAxLjkzNyAwbDUwLjE3OS00OC45MzFjMi4xMzktMi4wODcgNS42MDgtMi4wODcgNy43NDggMHoiIGZpbGw9IiNmZmYiLz48L2c+PC9zdmc+";
 var cachedAppKit = null;
 var resetAppKitCache = () => {
@@ -342,84 +376,90 @@ var resetAppKitCache = () => {
 };
 var getAppKitWallets$ = (config) => {
   if (!config.walletConnect) return (0, import_rxjs.of)({});
+  if (typeof window === "undefined") return (0, import_rxjs.of)({});
   const walletConnect = config.walletConnect;
   if (!cachedAppKit) {
-    cachedAppKit = new import_rxjs.Observable((subscriber) => {
-      const appKit = (0, import_core.createAppKit)({
-        projectId: walletConnect.projectId,
-        metadata: walletConnect.metadata,
-        networks: walletConnect.networks,
-        themeMode: walletConnect.themeMode,
-        themeVariables: walletConnect.themeVariables,
-        universalProviderConfigOverride: {
-          methods: {
-            polkadot: ["polkadot_signTransaction", "polkadot_signMessage"]
-          }
-        },
-        allWallets: "HIDE",
-        debug: config.debug,
-        allowUnsupportedChain: true
-      });
-      const status$ = new import_rxjs.BehaviorSubject({
-        isPolkadotConnected: false,
-        isEthereumConnected: false
-      });
-      const unsubProviders = appKit.subscribeProviders((providers) => {
-        status$.next({
-          isPolkadotConnected: !!providers.polkadot,
-          isEthereumConnected: !!providers.eip155
-        });
-      });
-      const polkadotWallet$ = appKit.chainNamespaces.includes("polkadot") ? status$.pipe(
-        (0, import_rxjs.map)((s) => s.isPolkadotConnected),
-        (0, import_rxjs.distinctUntilChanged)(),
-        (0, import_rxjs.map)((isConnected) => {
-          const walletInfo = appKit.getWalletInfo();
-          return {
-            id: getWalletId("polkadot", "walletconnect"),
-            platform: "polkadot",
-            type: "appKit",
-            appKit,
-            // todo maybe we dont want to expose the appKit instance
-            name: walletInfo?.name ?? "WalletConnect",
-            icon: walletInfo?.icon ?? WALLET_CONNECT_ICON,
-            connect: async () => {
-              if (!isConnected) await appKit.open();
+    cachedAppKit = (0, import_rxjs.from)(loadAppKit()).pipe(
+      (0, import_rxjs.switchMap)((createAppKit) => {
+        return new import_rxjs.Observable((subscriber) => {
+          const appKit = createAppKit({
+            projectId: walletConnect.projectId,
+            metadata: walletConnect.metadata,
+            networks: walletConnect.networks,
+            themeMode: walletConnect.themeMode,
+            themeVariables: walletConnect.themeVariables,
+            universalProviderConfigOverride: {
+              methods: {
+                polkadot: ["polkadot_signTransaction", "polkadot_signMessage"]
+              }
             },
-            disconnect: () => {
-              if (isConnected) appKit.disconnect();
-            },
-            isConnected
-          };
-        })
-      ) : (0, import_rxjs.of)(void 0);
-      const ethereumWallet$ = appKit.chainNamespaces.includes("eip155") ? status$.pipe(
-        (0, import_rxjs.map)((s) => s.isEthereumConnected),
-        (0, import_rxjs.distinctUntilChanged)(),
-        (0, import_rxjs.map)((isConnected) => {
-          const walletInfo = appKit.getWalletInfo();
-          return {
-            id: getWalletId("ethereum", "walletconnect"),
-            platform: "ethereum",
-            type: "appKit",
-            appKit,
-            name: walletInfo?.name ?? "WalletConnect",
-            icon: walletInfo?.icon ?? WALLET_CONNECT_ICON,
-            connect: () => appKit.open(),
-            disconnect: () => appKit.disconnect(),
-            isConnected
+            allWallets: "HIDE",
+            debug: config.debug,
+            allowUnsupportedChain: true
+          });
+          const status$ = new import_rxjs.BehaviorSubject({
+            isPolkadotConnected: false,
+            isEthereumConnected: false
+          });
+          const unsubProviders = appKit.subscribeProviders((providers) => {
+            status$.next({
+              isPolkadotConnected: !!providers.polkadot,
+              isEthereumConnected: !!providers.eip155
+            });
+          });
+          const polkadotWallet$ = appKit.chainNamespaces.includes("polkadot") ? status$.pipe(
+            (0, import_rxjs.map)((s) => s.isPolkadotConnected),
+            (0, import_rxjs.distinctUntilChanged)(),
+            (0, import_rxjs.map)((isConnected) => {
+              const walletInfo = appKit.getWalletInfo();
+              return {
+                id: getWalletId("polkadot", "walletconnect"),
+                platform: "polkadot",
+                type: "appKit",
+                appKit,
+                // todo maybe we dont want to expose the appKit instance
+                name: walletInfo?.name ?? "WalletConnect",
+                icon: walletInfo?.icon ?? WALLET_CONNECT_ICON,
+                connect: async () => {
+                  if (!isConnected) await appKit.open();
+                },
+                disconnect: () => {
+                  if (isConnected) appKit.disconnect();
+                },
+                isConnected
+              };
+            })
+          ) : (0, import_rxjs.of)(void 0);
+          const ethereumWallet$ = appKit.chainNamespaces.includes("eip155") ? status$.pipe(
+            (0, import_rxjs.map)((s) => s.isEthereumConnected),
+            (0, import_rxjs.distinctUntilChanged)(),
+            (0, import_rxjs.map)((isConnected) => {
+              const walletInfo = appKit.getWalletInfo();
+              return {
+                id: getWalletId("ethereum", "walletconnect"),
+                platform: "ethereum",
+                type: "appKit",
+                appKit,
+                name: walletInfo?.name ?? "WalletConnect",
+                icon: walletInfo?.icon ?? WALLET_CONNECT_ICON,
+                connect: () => appKit.open(),
+                disconnect: () => appKit.disconnect(),
+                isConnected
+              };
+            })
+          ) : (0, import_rxjs.of)(void 0);
+          const sub = (0, import_rxjs.combineLatest)({
+            polkadot: polkadotWallet$,
+            ethereum: ethereumWallet$
+          }).subscribe(subscriber);
+          return () => {
+            sub.unsubscribe();
+            unsubProviders();
           };
-        })
-      ) : (0, import_rxjs.of)(void 0);
-      const sub = (0, import_rxjs.combineLatest)({
-        polkadot: polkadotWallet$,
-        ethereum: ethereumWallet$
-      }).subscribe(subscriber);
-      return () => {
-        sub.unsubscribe();
-        unsubProviders();
-      };
-    }).pipe((0, import_rxjs.shareReplay)({ refCount: true, bufferSize: 1 }));
+        });
+      }),
+      (0, import_rxjs.shareReplay)({ refCount: true, bufferSize: 1 })
+    );
   }
   return cachedAppKit;
 };
@@ -659,12 +699,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)
@@ -674,26 +739,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 }))
   );
@@ -722,24 +803,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
@@ -751,6 +837,7 @@ var getAppKitAccounts$ = (wallet) => {
               walletId: wallet.id,
               address: acc.address,
               client,
+              chainId,
               isWalletDefault: i === 0
             };
           })
@@ -785,7 +872,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
@@ -967,7 +1056,22 @@ var createKheopskitStore = (options = {}) => {
     setCachedState
   };
 };
-var store = createKheopskitStore();
+var _defaultStore = null;
+var getDefaultStore = () => {
+  if (_defaultStore === null) {
+    _defaultStore = createKheopskitStore();
+  }
+  return _defaultStore;
+};
+var store = {
+  get observable() {
+    return getDefaultStore().observable;
+  },
+  addEnabledWalletId: (walletId) => getDefaultStore().addEnabledWalletId(walletId),
+  removeEnabledWalletId: (walletId) => getDefaultStore().removeEnabledWalletId(walletId),
+  getCachedState: () => getDefaultStore().getCachedState(),
+  setCachedState: (wallets, accounts) => getDefaultStore().setCachedState(wallets, accounts)
+};
 var isCompactStore = (value) => {
   if (!value || typeof value !== "object" || Array.isArray(value)) return false;
   if ("cachedWallets" in value || "cachedAccounts" in value) return false;
@@ -986,7 +1090,8 @@ var toCompactStore = (data) => {
     (account) => [
       account.walletId,
       account.address,
-      account.name ?? null
+      account.name ?? null,
+      account.chainId ?? null
     ]
   );
   return {
@@ -1011,13 +1116,14 @@ var fromCompactStore = (data) => {
     };
   });
   const accounts = (data.a ?? []).map((item) => {
-    const [walletId, address, name] = item;
+    const [walletId, address, name, chainId] = item;
     const { platform } = parseWalletId(walletId);
     return {
       id: getWalletAccountId(walletId, address),
       platform,
       address,
       name: name ?? void 0,
+      chainId: chainId ?? void 0,
       walletId,
       walletName: walletNameMap.get(walletId) ?? walletId
     };
@@ -1479,7 +1585,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,
@@ -1487,7 +1595,9 @@ var statesEqual = (a, b) => a.isHydrating === b.isHydrating && a.wallets.length
   clearCachedObservable,
   createKheopskitStore,
   getCachedIcon,
+  getDefaultStore,
   getKheopskit$,
+  getSafeLocalStorage,
   hydrateAccount,
   hydrateWallet,
   resetAppKitCache,