@kheopskit/core 0.1.1 → 0.1.2

package/dist/index.d.mts

@@ -148,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;
@@ -174,6 +176,8 @@ type CachedAccount = {
     platform: WalletPlatform;
     address: string;
     name?: string;
+    /** Cached chain ID for Ethereum accounts. */
+    chainId?: number;
     walletId: WalletId;
     walletName: string;
 };

package/dist/index.d.ts

@@ -148,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;
@@ -174,6 +176,8 @@ type CachedAccount = {
     platform: WalletPlatform;
     address: string;
     name?: string;
+    /** Cached chain ID for Ethereum accounts. */
+    chainId?: number;
     walletId: WalletId;
     walletName: string;
 };

package/dist/index.js

@@ -166,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,
@@ -188,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
 });
@@ -697,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)
@@ -712,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 }))
   );
@@ -760,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
@@ -789,6 +837,7 @@ var getAppKitAccounts$ = (wallet) => {
               walletId: wallet.id,
               address: acc.address,
               client,
+              chainId,
               isWalletDefault: i === 0
             };
           })
@@ -823,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
@@ -1039,7 +1090,8 @@ var toCompactStore = (data) => {
     (account) => [
       account.walletId,
       account.address,
-      account.name ?? null
+      account.name ?? null,
+      account.chainId ?? null
     ]
   );
   return {
@@ -1064,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
     };
@@ -1532,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,