@kheopskit/core 0.1.0 → 0.1.2

package/dist/index.mjs

@@ -119,6 +119,7 @@ var hydrateAccount = (cached) => {
       id: cached.id,
       platform: "ethereum",
       address: cached.address,
+      chainId: cached.chainId,
       walletId: cached.walletId,
       walletName: cached.walletName,
       isWalletDefault: false,
@@ -141,6 +142,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
 });
@@ -153,7 +155,8 @@ var noopStorage = {
   removeItem: () => {
   }
 };
-var safeLocalStorage = (() => {
+var _safeLocalStorage = null;
+var createSafeLocalStorage = () => {
   if (typeof window === "undefined") return noopStorage;
   try {
     const testKey = "__kheopskit_test__";
@@ -176,7 +179,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(";")) {
@@ -298,16 +317,21 @@ var setCachedIcons = (icons) => {
 };
 
 // src/api/appKit.ts
-import { createAppKit } from "@reown/appkit/core";
 import {
   BehaviorSubject,
   combineLatest,
   distinctUntilChanged,
+  from,
   map,
   Observable,
   of,
-  shareReplay
+  shareReplay,
+  switchMap
 } from "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 = () => {
@@ -315,84 +339,90 @@ var resetAppKitCache = () => {
 };
 var getAppKitWallets$ = (config) => {
   if (!config.walletConnect) return of({});
+  if (typeof window === "undefined") return of({});
   const walletConnect = config.walletConnect;
   if (!cachedAppKit) {
-    cachedAppKit = new 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"]
-          }
-        },
-        allWallets: "HIDE",
-        debug: config.debug,
-        allowUnsupportedChain: true
-      });
-      const status$ = new 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(
-        map((s) => s.isPolkadotConnected),
-        distinctUntilChanged(),
-        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 = from(loadAppKit()).pipe(
+      switchMap((createAppKit) => {
+        return new 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
-          };
-        })
-      ) : of(void 0);
-      const ethereumWallet$ = appKit.chainNamespaces.includes("eip155") ? status$.pipe(
-        map((s) => s.isEthereumConnected),
-        distinctUntilChanged(),
-        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 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(
+            map((s) => s.isPolkadotConnected),
+            distinctUntilChanged(),
+            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
+              };
+            })
+          ) : of(void 0);
+          const ethereumWallet$ = appKit.chainNamespaces.includes("eip155") ? status$.pipe(
+            map((s) => s.isEthereumConnected),
+            distinctUntilChanged(),
+            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
+              };
+            })
+          ) : of(void 0);
+          const sub = combineLatest({
+            polkadot: polkadotWallet$,
+            ethereum: ethereumWallet$
+          }).subscribe(subscriber);
+          return () => {
+            sub.unsubscribe();
+            unsubProviders();
           };
-        })
-      ) : of(void 0);
-      const sub = combineLatest({
-        polkadot: polkadotWallet$,
-        ethereum: ethereumWallet$
-      }).subscribe(subscriber);
-      return () => {
-        sub.unsubscribe();
-        unsubProviders();
-      };
-    }).pipe(shareReplay({ refCount: true, bufferSize: 1 }));
+        });
+      }),
+      shareReplay({ refCount: true, bufferSize: 1 })
+    );
   }
   return cachedAppKit;
 };
@@ -581,7 +611,7 @@ import {
   of as of2,
   ReplaySubject,
   shareReplay as shareReplay3,
-  switchMap
+  switchMap as switchMap2
 } from "rxjs";
 import {
   createWalletClient,
@@ -665,12 +695,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 of2([]);
   return getCachedObservable$(
     `accounts:${wallet.id}`,
     () => new Observable3((subscriber) => {
-      const getAccount = (address, i) => {
+      const addresses$ = new ReplaySubject(1);
+      const chainId$ = new ReplaySubject(1);
+      const getAccount = (address, i, chainId) => {
         const client = createWalletClient({
           account: address,
           transport: custom(wallet.provider)
@@ -680,26 +735,42 @@ var getInjectedWalletAccounts$ = (wallet) => {
           platform: "ethereum",
           client,
           address: 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 = combineLatest3([addresses$, chainId$]).pipe(
+        map3(
+          ([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(shareReplay3({ refCount: true, bufferSize: 1 }))
   );
@@ -728,24 +799,29 @@ var getAppKitAccounts$ = (wallet) => {
     () => new Observable3((subscriber) => {
       const caipNetworkId$ = new 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(
         distinctUntilChanged2(),
-        map3(
-          (caipNetworkId) => custom(
+        map3((caipNetworkId) => {
+          const chainId = normalizeEvmChainId(caipNetworkId);
+          const transport = custom(
             wrapWalletConnectProvider(
               provider,
               // biome-ignore lint/style/noNonNullAssertion: legacy
               provider.session.topic,
               caipNetworkId
             )
-          )
-        ),
+          );
+          return { transport, chainId };
+        }),
         map3(
-          (transport) => account.allAccounts.map((acc, i) => {
+          ({ transport, chainId }) => account.allAccounts.map((acc, i) => {
             const client = createWalletClient({
               account: acc.address,
               transport
@@ -757,6 +833,7 @@ var getAppKitAccounts$ = (wallet) => {
               walletId: wallet.id,
               address: acc.address,
               client,
+              chainId,
               isWalletDefault: i === 0
             };
           })
@@ -772,7 +849,7 @@ var getAppKitAccounts$ = (wallet) => {
 var getEthereumAccounts$ = (ethereumWallets) => new Observable3((subscriber) => {
   const sub = ethereumWallets.pipe(
     map3((wallets) => wallets.filter((w) => w.isConnected)),
-    switchMap((wallets) => {
+    switchMap2((wallets) => {
       return wallets.length ? combineLatest3([
         ...wallets.filter((w) => w.type === "injected").map(getInjectedWalletAccounts$),
         ...wallets.filter((w) => w.type === "appKit").map(getAppKitAccounts$)
@@ -791,7 +868,9 @@ var getEthereumAccounts$ = (ethereumWallets) => new Observable3((subscriber) =>
 );
 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
@@ -805,7 +884,7 @@ import {
   Observable as Observable4,
   of as of3,
   shareReplay as shareReplay4,
-  switchMap as switchMap2
+  switchMap as switchMap3
 } from "rxjs";
 var getInjectedWalletAccounts$2 = (wallet) => {
   if (!wallet.isConnected) return of3([]);
@@ -890,7 +969,7 @@ var getAppKitAccounts$2 = (wallet) => {
 var getPolkadotAccounts$ = (polkadotWallets$) => new Observable4((subscriber) => {
   const sub = polkadotWallets$.pipe(
     map4((wallets) => wallets.filter((w) => w.isConnected)),
-    switchMap2(
+    switchMap3(
       (wallets) => wallets.length ? combineLatest4([
         ...wallets.filter((w) => w.type === "injected").map(getInjectedWalletAccounts$2),
         ...wallets.filter((w) => w.type === "appKit").map(getAppKitAccounts$2)
@@ -983,7 +1062,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;
@@ -1002,7 +1096,8 @@ var toCompactStore = (data) => {
     (account) => [
       account.walletId,
       account.address,
-      account.name ?? null
+      account.name ?? null,
+      account.chainId ?? null
     ]
   );
   return {
@@ -1027,13 +1122,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
     };
@@ -1524,14 +1620,18 @@ 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)
+);
 export {
   DEFAULT_STORAGE_KEY,
   clearAllCachedObservables,
   clearCachedObservable,
   createKheopskitStore,
   getCachedIcon,
+  getDefaultStore,
   getKheopskit$,
+  getSafeLocalStorage,
   hydrateAccount,
   hydrateWallet,
   resetAppKitCache,