@kheopskit/core 5.0.1 → 5.1.0

package/dist/index.js

@@ -7,30 +7,25 @@
 
 
 
-
-var _chunkB4L6GAYDjs = require('./chunk-B4L6GAYD.js');
+var _chunkSO64R7Z6js = require('./chunk-SO64R7Z6.js');
 require('./chunk-D3EQMFZ2.js');
 
 
 
 
 
+var _chunkEH73P476js = require('./chunk-EH73P476.js');
 
 
 
 
 
-var _chunkXQWJM3KCjs = require('./chunk-XQWJM3KC.js');
-
-
 
 
 
 
 
-
-
-var _chunk4ENHC7G4js = require('./chunk-4ENHC7G4.js');
+var _chunkP7BPHHVVjs = require('./chunk-P7BPHHVV.js');
 
 // src/api/appKit.ts
 
@@ -69,8 +64,8 @@ var resetAppKitCache = () => {
   setCachedAppKit(void 0);
 };
 var dropAccountsCache = (platform) => {
-  _chunk4ENHC7G4js.clearCachedObservablesByPrefix.call(void 0, 
-    `accounts:${_chunk4ENHC7G4js.WALLET_CONNECT_WALLET_ID}:${platform}:`
+  _chunkP7BPHHVVjs.clearCachedObservablesByPrefix.call(void 0, 
+    `accounts:${_chunkP7BPHHVVjs.WALLET_CONNECT_WALLET_ID}:${platform}:`
   );
 };
 var getWalletConnectWallet$ = (config) => {
@@ -164,7 +159,7 @@ var getWalletConnectWallet$ = (config) => {
               const isConnected = platforms.length > 0;
               const walletInfo = appKit.getWalletInfo();
               return {
-                id: _chunk4ENHC7G4js.WALLET_CONNECT_WALLET_ID,
+                id: _chunkP7BPHHVVjs.WALLET_CONNECT_WALLET_ID,
                 type: "walletconnect",
                 platforms,
                 appKit: appKitInstance,
@@ -204,6 +199,87 @@ var getWalletConnectWallet$ = (config) => {
   return cachedAppKit;
 };
 
+// src/api/config.ts
+var DEFAULT_STORAGE_KEY = "kheopskit";
+var DEFAULTS = {
+  autoReconnect: true,
+  debug: false,
+  storageKey: DEFAULT_STORAGE_KEY,
+  hydrationGracePeriod: 500
+};
+var resolveConfig = (config) => {
+  const platforms = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _3 => _3.platforms]), () => ( []));
+  const invalidPlatforms = platforms.filter(
+    (p) => typeof p !== "object" || p === null || typeof p.getWallets$ !== "function"
+  );
+  if (invalidPlatforms.length > 0) {
+    throw new Error(
+      `[kheopskit] config.platforms must contain plugin instances created by the per-platform factories (e.g. platforms: [polkadot(), ethereum(), solana()] imported from "@kheopskit/core/<platform>"). Invalid entries: ${JSON.stringify(invalidPlatforms)}. String platform names like "polkadot" were removed in v4 \u2014 see MIGRATING_TO_V4.md.`
+    );
+  }
+  if (platforms.length === 0) {
+    console.warn(
+      '[kheopskit] No platforms configured; wallets and accounts will be empty. Pass e.g. platforms: [polkadot()] from "@kheopskit/core/polkadot".'
+    );
+  }
+  return Object.assign({}, DEFAULTS, config, { platforms });
+};
+
+// src/utils/sortAccounts.ts
+var PLATFORM_ORDER = {
+  polkadot: 0,
+  ethereum: 1,
+  solana: 2
+};
+var byWalletName = (a1, a2) => {
+  if (a1.walletName.toLowerCase() === "talisman") return -1;
+  if (a2.walletName.toLowerCase() === "talisman") return 1;
+  return a1.walletName.localeCompare(a2.walletName);
+};
+var sortAccounts = (a1, a2) => {
+  if (a1.platform !== a2.platform)
+    return PLATFORM_ORDER[a1.platform] - PLATFORM_ORDER[a2.platform];
+  if (a1.walletName !== a2.walletName) return byWalletName(a1, a2);
+  if (a1.platform === "polkadot" && a2.platform === "polkadot")
+    return a1.name !== a2.name ? (_nullishCoalesce(a1.name, () => ( ""))).localeCompare(_nullishCoalesce(a2.name, () => ( ""))) : a1.address.localeCompare(a2.address);
+  return a1.id.localeCompare(a2.id);
+};
+
+// src/utils/sortWallets.ts
+var PLATFORM_ORDER2 = {
+  polkadot: 0,
+  ethereum: 1,
+  solana: 2
+};
+var orderOf = (wallet) => _chunkP7BPHHVVjs.isWalletConnectWallet.call(void 0, wallet) ? 3 : PLATFORM_ORDER2[wallet.platform];
+var sortWallets = (w1, w2) => {
+  const o1 = orderOf(w1);
+  const o2 = orderOf(w2);
+  if (o1 !== o2) return o1 - o2;
+  if (w1.name.toLowerCase() === "talisman") return -1;
+  if (w2.name.toLowerCase() === "talisman") return 1;
+  return w1.name.localeCompare(w2.name);
+};
+
+// src/api/platform.ts
+var acceptsCachedAccount = (cached, platforms) => {
+  const plugin = platforms.find((p) => p.platform === cached.platform);
+  return _nullishCoalesce(_optionalChain([plugin, 'optionalAccess', _4 => _4.acceptsCachedAccount, 'optionalCall', _5 => _5(cached)]), () => ( true));
+};
+
+// src/api/hydration.ts
+var getHydratedSnapshot = (store, platforms, options = {}) => {
+  const cached = store.getCachedState();
+  const wallets = cached.wallets.map((cachedWallet) => {
+    const wallet = _chunkSO64R7Z6js.hydrateWallet.call(void 0, cachedWallet);
+    if (!options.icons || wallet.icon) return wallet;
+    const icon = _chunkSO64R7Z6js.getCachedIcon.call(void 0, wallet.id);
+    return icon ? { ...wallet, icon } : wallet;
+  }).sort(sortWallets);
+  const accounts = cached.accounts.filter((account) => acceptsCachedAccount(account, platforms)).map(_chunkSO64R7Z6js.hydrateAccount).sort(sortAccounts);
+  return { wallets, accounts };
+};
+
 // src/api/kheopskit.ts
 
 
@@ -348,14 +424,14 @@ var getAccounts$ = (config, wallets) => {
         wallets.pipe(
           _rxjs.map.call(void 0, 
             (ws) => ws.filter(
-              (w) => _chunk4ENHC7G4js.isWalletConnectWallet.call(void 0, w) || w.platform === plugin.platform
+              (w) => _chunkP7BPHHVVjs.isWalletConnectWallet.call(void 0, w) || w.platform === plugin.platform
             )
           )
         )
       )
     );
     const accounts$ = sources.length ? _rxjs.combineLatest.call(void 0, sources).pipe(
-      _rxjs.map.call(void 0, (accounts) => accounts.flat().sort(_chunkB4L6GAYDjs.sortAccounts))
+      _rxjs.map.call(void 0, (accounts) => accounts.flat().sort(sortAccounts))
     ) : _rxjs.of.call(void 0, []);
     const sub = accounts$.subscribe(subscriber);
     return () => {
@@ -364,6 +440,307 @@ var getAccounts$ = (config, wallets) => {
   }).pipe(_rxjs.shareReplay.call(void 0, { refCount: true, bufferSize: 1 }));
 };
 
+// src/api/store.ts
+var _lodashes = require('lodash-es');
+
+// src/utils/createStore.ts
+
+var createStore = (key, defaultValue, storage = _chunkSO64R7Z6js.safeLocalStorage) => {
+  const subject = new (0, _rxjs.BehaviorSubject)(
+    getStoredData(key, defaultValue, storage)
+  );
+  let unsubscribeStorage;
+  if (typeof window !== "undefined" && storage.subscribe) {
+    unsubscribeStorage = storage.subscribe(key, (newValue) => {
+      subject.next(parseData(newValue, defaultValue));
+    });
+  }
+  const update = (val) => {
+    setStoredData(key, val, storage);
+    subject.next(val);
+  };
+  return {
+    observable: subject.asObservable(),
+    set: (val) => update(val),
+    mutate: (transform) => update(transform(subject.getValue())),
+    get: () => structuredClone(subject.getValue()),
+    /**
+     * Cleanup subscriptions. Call this when the store is no longer needed.
+     */
+    destroy: () => {
+      _optionalChain([unsubscribeStorage, 'optionalCall', _6 => _6()]);
+      subject.complete();
+    }
+  };
+};
+var parseData = (str, defaultValue) => {
+  try {
+    if (str) return JSON.parse(str);
+  } catch (e) {
+  }
+  return defaultValue;
+};
+var getStoredData = (key, defaultValue, storage) => {
+  const str = storage.getItem(key);
+  return parseData(str, defaultValue);
+};
+var setStoredData = (key, val, storage) => {
+  const str = JSON.stringify(val);
+  storage.setItem(key, str);
+};
+
+// src/api/compactStore.ts
+var EMPTY_STORE_DATA = {};
+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 toCompactPlatform = (platform) => {
+  switch (platform) {
+    case "polkadot":
+      return 0;
+    case "ethereum":
+      return 1;
+    case "solana":
+      return 2;
+  }
+};
+var fromCompactPlatform = (code) => {
+  switch (code) {
+    case 0:
+      return "polkadot";
+    case 1:
+      return "ethereum";
+    case 2:
+      return "solana";
+    default:
+      return void 0;
+  }
+};
+var isCompactStore = (value) => {
+  if (!value || typeof value !== "object" || Array.isArray(value)) return false;
+  if ("cachedWallets" in value || "cachedAccounts" in value) return false;
+  return "v" in value || "w" in value || "a" in value || "r" in value;
+};
+var toCompactStore = (data) => {
+  const wallets = _optionalChain([data, 'access', _7 => _7.cachedWallets, 'optionalAccess', _8 => _8.map, 'call', _9 => _9(
+    (wallet) => [
+      wallet.id,
+      wallet.name,
+      wallet.isConnected ? 1 : 0,
+      wallet.type === "walletconnect" ? 1 : 0
+    ]
+  )]);
+  const accounts = _optionalChain([data, 'access', _10 => _10.cachedAccounts, 'optionalAccess', _11 => _11.map, 'call', _12 => _12(
+    (account) => [
+      account.walletId,
+      account.address,
+      _nullishCoalesce(account.name, () => ( null)),
+      _nullishCoalesce(account.chainId, () => ( null)),
+      toCompactPolkadotAccountType(account.polkadotAccountType),
+      toCompactPlatform(account.platform)
+    ]
+  )]);
+  return {
+    v: 1,
+    r: data.autoReconnect,
+    w: _optionalChain([wallets, 'optionalAccess', _13 => _13.length]) ? wallets : void 0,
+    a: _optionalChain([accounts, 'optionalAccess', _14 => _14.length]) ? accounts : void 0
+  };
+};
+var fromCompactStore = (data) => {
+  const walletNameMap = /* @__PURE__ */ new Map();
+  const wallets = [];
+  for (const item of Array.isArray(data.w) ? data.w : []) {
+    if (!Array.isArray(item)) continue;
+    const [id, name, isConnected, type] = item;
+    if (!_chunkP7BPHHVVjs.isValidWalletId.call(void 0, id)) continue;
+    const isWalletConnect = id === _chunkP7BPHHVVjs.WALLET_CONNECT_WALLET_ID;
+    const walletType = type === 1 ? "walletconnect" : "injected";
+    if (isWalletConnect !== (walletType === "walletconnect")) continue;
+    walletNameMap.set(id, name);
+    wallets.push({
+      id,
+      platform: isWalletConnect ? void 0 : _chunkP7BPHHVVjs.parseWalletId.call(void 0, id).platform,
+      type: walletType,
+      name,
+      isConnected: isConnected === 1
+    });
+  }
+  const accounts = [];
+  for (const item of Array.isArray(data.a) ? data.a : []) {
+    if (!Array.isArray(item)) continue;
+    const [
+      walletId,
+      address,
+      name,
+      chainId,
+      polkadotAccountType,
+      platformCode
+    ] = item;
+    if (!_chunkP7BPHHVVjs.isValidWalletId.call(void 0, walletId) || typeof address !== "string" || !address)
+      continue;
+    const platform = platformCode != null ? fromCompactPlatform(platformCode) : walletId === _chunkP7BPHHVVjs.WALLET_CONNECT_WALLET_ID ? void 0 : _chunkP7BPHHVVjs.parseWalletId.call(void 0, walletId).platform;
+    if (!_chunkP7BPHHVVjs.isWalletPlatform.call(void 0, platform)) continue;
+    accounts.push({
+      id: _chunkEH73P476js.getWalletAccountId.call(void 0, walletId, address),
+      platform,
+      address,
+      name: _nullishCoalesce(name, () => ( void 0)),
+      chainId: _nullishCoalesce(chainId, () => ( void 0)),
+      polkadotAccountType: platform === "polkadot" ? fromCompactPolkadotAccountType(polkadotAccountType) : void 0,
+      walletId,
+      walletName: _nullishCoalesce(walletNameMap.get(walletId), () => ( walletId))
+    });
+  }
+  return {
+    autoReconnect: data.r,
+    cachedWallets: wallets,
+    cachedAccounts: accounts
+  };
+};
+var decodeStore = (raw, fallback) => {
+  try {
+    const parsed = JSON.parse(raw);
+    if (isCompactStore(parsed)) return fromCompactStore(parsed);
+    return parsed;
+  } catch (e2) {
+    return fallback;
+  }
+};
+var encodeStore = (data) => JSON.stringify(toCompactStore(data));
+var createCompactCookieStorage = (initialCookies) => {
+  const base = _chunkSO64R7Z6js.cookieStorage.call(void 0, initialCookies);
+  return {
+    getItem: (key) => {
+      const raw = base.getItem(key);
+      if (!raw) return null;
+      const expanded = decodeStore(raw, EMPTY_STORE_DATA);
+      if (typeof document !== "undefined") {
+        try {
+          const parsed = JSON.parse(raw);
+          if (!isCompactStore(parsed)) {
+            base.setItem(key, encodeStore(expanded));
+          }
+        } catch (e3) {
+        }
+      }
+      return JSON.stringify(expanded);
+    },
+    setItem: (key, value) => {
+      const expanded = decodeStore(value, EMPTY_STORE_DATA);
+      base.setItem(key, encodeStore(expanded));
+    },
+    removeItem: base.removeItem,
+    subscribe: (key, callback) => {
+      const unsubscribe = _optionalChain([base, 'access', _15 => _15.subscribe, 'optionalCall', _16 => _16(key, (value) => {
+        if (!value) {
+          callback(null);
+          return;
+        }
+        const expanded = decodeStore(value, EMPTY_STORE_DATA);
+        callback(JSON.stringify(expanded));
+      })]);
+      return () => {
+        _optionalChain([unsubscribe, 'optionalCall', _17 => _17()]);
+      };
+    }
+  };
+};
+
+// src/api/store.ts
+var DEFAULT_SETTINGS = {};
+var isValidCachedWallet = (value) => {
+  if (!value || typeof value !== "object") return false;
+  const w = value;
+  if (!_chunkP7BPHHVVjs.isValidWalletId.call(void 0, w.id)) return false;
+  if (typeof w.name !== "string" || typeof w.isConnected !== "boolean")
+    return false;
+  if (w.type === "walletconnect")
+    return w.id === _chunkP7BPHHVVjs.WALLET_CONNECT_WALLET_ID && w.platform === void 0;
+  return w.type === "injected" && _chunkP7BPHHVVjs.isWalletPlatform.call(void 0, w.platform);
+};
+var isValidCachedAccount = (value) => {
+  if (!value || typeof value !== "object") return false;
+  const a = value;
+  return typeof a.id === "string" && !!a.id && _chunkP7BPHHVVjs.isWalletPlatform.call(void 0, a.platform) && typeof a.address === "string" && !!a.address && _chunkP7BPHHVVjs.isValidWalletId.call(void 0, a.walletId) && typeof a.walletName === "string";
+};
+var createKheopskitStore = (options = {}) => {
+  const { ssrCookies, storageKey = DEFAULT_STORAGE_KEY } = options;
+  const storage = ssrCookies !== void 0 ? createCompactCookieStorage(ssrCookies) : _chunkSO64R7Z6js.safeLocalStorage;
+  const store = createStore(storageKey, DEFAULT_SETTINGS, storage);
+  const addEnabledWalletId = (walletId) => {
+    _chunkP7BPHHVVjs.parseWalletId.call(void 0, walletId);
+    store.mutate((prev) => ({
+      ...prev,
+      autoReconnect: _lodashes.uniq.call(void 0, (_nullishCoalesce(prev.autoReconnect, () => ( []))).concat(walletId))
+    }));
+  };
+  const removeEnabledWalletId = (walletId) => {
+    store.mutate((prev) => ({
+      ...prev,
+      autoReconnect: _lodashes.uniq.call(void 0, 
+        (_nullishCoalesce(prev.autoReconnect, () => ( []))).filter((id) => id !== walletId)
+      )
+    }));
+  };
+  const getCachedState = () => {
+    const data = store.get();
+    const cachedWallets = Array.isArray(_optionalChain([data, 'optionalAccess', _18 => _18.cachedWallets])) ? data.cachedWallets : [];
+    const cachedAccounts = Array.isArray(_optionalChain([data, 'optionalAccess', _19 => _19.cachedAccounts])) ? data.cachedAccounts : [];
+    return {
+      wallets: cachedWallets.filter(isValidCachedWallet),
+      accounts: cachedAccounts.filter(isValidCachedAccount)
+    };
+  };
+  const setCachedState = (wallets, accounts) => {
+    store.mutate((prev) => ({
+      ...prev,
+      cachedWallets: wallets,
+      cachedAccounts: accounts
+    }));
+  };
+  return {
+    observable: store.observable,
+    addEnabledWalletId,
+    removeEnabledWalletId,
+    getCachedState,
+    setCachedState
+  };
+};
+var DEFAULT_STORE_SYMBOL = /* @__PURE__ */ Symbol.for("kheopskit.defaultStore");
+var getDefaultStore = () => {
+  const g = globalThis;
+  if (!g[DEFAULT_STORE_SYMBOL]) {
+    g[DEFAULT_STORE_SYMBOL] = createKheopskitStore();
+  }
+  return g[DEFAULT_STORE_SYMBOL];
+};
+
 // src/api/wallets.ts
 
 
@@ -375,14 +752,42 @@ var getAccounts$ = (config, wallets) => {
 
 
 
-var getWallets$ = (config, store2 = _chunkXQWJM3KCjs.store) => {
-  const autoReconnectWalletIds$ = store2.observable.pipe(
+
+// src/api/reconnectPolicy.ts
+var createReconnectPolicy = ({
+  maxAttempts = 3
+} = {}) => {
+  const reconnecting = /* @__PURE__ */ new Set();
+  const reconnected = /* @__PURE__ */ new Set();
+  const failedAttempts = /* @__PURE__ */ new Map();
+  const shouldAttempt = (walletId) => !reconnecting.has(walletId) && !reconnected.has(walletId) && (_nullishCoalesce(failedAttempts.get(walletId), () => ( 0))) < maxAttempts;
+  const attempt = async (walletId, connect) => {
+    if (!shouldAttempt(walletId)) return false;
+    reconnecting.add(walletId);
+    try {
+      await connect();
+      reconnected.add(walletId);
+      failedAttempts.delete(walletId);
+      return true;
+    } catch (err) {
+      failedAttempts.set(walletId, (_nullishCoalesce(failedAttempts.get(walletId), () => ( 0))) + 1);
+      throw err;
+    } finally {
+      reconnecting.delete(walletId);
+    }
+  };
+  return { shouldAttempt, attempt };
+};
+
+// src/api/wallets.ts
+var getWallets$ = (config, store) => {
+  const autoReconnectWalletIds$ = store.observable.pipe(
     _rxjs.map.call(void 0, (s) => _nullishCoalesce(s.autoReconnect, () => ( []))),
     _rxjs.take.call(void 0, 1),
     _rxjs.shareReplay.call(void 0, { bufferSize: 1, refCount: true })
   );
   return new (0, _rxjs.Observable)((subscriber) => {
-    const ctx = { config, store: store2 };
+    const ctx = { config, store };
     const observables = config.platforms.map(
       (plugin) => plugin.getWallets$(ctx)
     );
@@ -393,36 +798,22 @@ var getWallets$ = (config, store2 = _chunkXQWJM3KCjs.store) => {
     ]).pipe(
       _rxjs.map.call(void 0, ([platformWallets, walletConnect]) => {
         const all = walletConnect ? [...platformWallets, walletConnect] : platformWallets;
-        return all.sort(_chunkB4L6GAYDjs.sortWallets);
+        return all.sort(sortWallets);
       })
       // Note: No startWith([]) here - the hydration buffer handles initial state
     );
-    const reconnectingWallets = /* @__PURE__ */ new Set();
-    const reconnectedWallets = /* @__PURE__ */ new Set();
-    const MAX_RECONNECT_ATTEMPTS = 3;
-    const failedAttempts = /* @__PURE__ */ new Map();
+    const reconnectPolicy = createReconnectPolicy();
     const subAutoReconnect = _rxjs.combineLatest.call(void 0, [wallets$, autoReconnectWalletIds$]).pipe(
-      _rxjs.filter.call(void 0, ([, walletIds]) => config.autoReconnect && !!_optionalChain([walletIds, 'optionalAccess', _3 => _3.length])),
+      _rxjs.filter.call(void 0, ([, walletIds]) => config.autoReconnect && !!_optionalChain([walletIds, 'optionalAccess', _20 => _20.length])),
       _rxjs.mergeMap.call(void 0, 
-        ([wallets, walletIds]) => wallets.filter((wallet) => _optionalChain([walletIds, 'optionalAccess', _4 => _4.includes, 'call', _5 => _5(wallet.id)]))
+        ([wallets, walletIds]) => wallets.filter((wallet) => _optionalChain([walletIds, 'optionalAccess', _21 => _21.includes, 'call', _22 => _22(wallet.id)]))
       )
     ).subscribe(async (wallet) => {
-      if (wallet.isConnected || reconnectingWallets.has(wallet.id) || reconnectedWallets.has(wallet.id) || (_nullishCoalesce(failedAttempts.get(wallet.id), () => ( 0))) >= MAX_RECONNECT_ATTEMPTS) {
-        return;
-      }
-      reconnectingWallets.add(wallet.id);
+      if (wallet.isConnected) return;
       try {
-        await wallet.connect();
-        reconnectedWallets.add(wallet.id);
-        failedAttempts.delete(wallet.id);
+        await reconnectPolicy.attempt(wallet.id, () => wallet.connect());
       } catch (err) {
-        failedAttempts.set(
-          wallet.id,
-          (_nullishCoalesce(failedAttempts.get(wallet.id), () => ( 0))) + 1
-        );
         console.error("Failed to reconnect wallet %s", wallet.id, { err });
-      } finally {
-        reconnectingWallets.delete(wallet.id);
       }
     });
     const subWallets = wallets$.subscribe(subscriber);
@@ -436,26 +827,15 @@ var getWallets$ = (config, store2 = _chunkXQWJM3KCjs.store) => {
 // src/api/kheopskit.ts
 var getKheopskit$ = (config, options = {}) => {
   const { ssrCookies, store: existingStore } = options;
-  const kc = _chunkXQWJM3KCjs.resolveConfig.call(void 0, config);
-  const store2 = _nullishCoalesce(existingStore, () => ( _chunkXQWJM3KCjs.createKheopskitStore.call(void 0, { ssrCookies, storageKey: kc.storageKey })));
+  const kc = resolveConfig(config);
+  const store = _nullishCoalesce(existingStore, () => ( createKheopskitStore({ ssrCookies, storageKey: kc.storageKey })));
   if (kc.debug) console.debug("[kheopskit] config", kc);
   if (kc.debug && typeof window === "undefined" && ssrCookies === void 0) {
     console.warn(
       "[kheopskit] Running on server without `ssrCookies`. Wallet state will not be hydrated. Pass cookies for SSR support."
     );
   }
-  const cachedState = store2.getCachedState();
-  const cachedWallets = cachedState.wallets.map((w) => {
-    const wallet = _chunkB4L6GAYDjs.hydrateWallet.call(void 0, w);
-    if (!wallet.icon) {
-      const cachedIcon = _chunkB4L6GAYDjs.getCachedIcon.call(void 0, wallet.id);
-      if (cachedIcon) {
-        return { ...wallet, icon: cachedIcon };
-      }
-    }
-    return wallet;
-  });
-  const cachedAccounts = cachedState.accounts.filter((cached) => _chunkB4L6GAYDjs.acceptsCachedAccount.call(void 0, cached, kc.platforms)).map(_chunkB4L6GAYDjs.hydrateAccount);
+  const { wallets: cachedWallets, accounts: cachedAccounts } = getHydratedSnapshot(store, kc.platforms, { icons: true });
   if (kc.debug && cachedWallets.length > 0) {
     console.debug("[kheopskit] hydrating from cache:", {
       wallets: cachedWallets.length,
@@ -463,7 +843,7 @@ var getKheopskit$ = (config, options = {}) => {
     });
   }
   return new (0, _rxjs.Observable)((subscriber) => {
-    const liveWallets$ = getWallets$(kc, store2);
+    const liveWallets$ = getWallets$(kc, store);
     const liveAccounts$ = getAccounts$(kc, liveWallets$);
     const bufferedWallets$ = createHydrationBuffer(
       cachedWallets,
@@ -484,7 +864,7 @@ var getKheopskit$ = (config, options = {}) => {
       (live, cached) => ({
         ...cached,
         // Priority: cached icon > localStorage cache > live icon
-        icon: cached.icon || _chunkB4L6GAYDjs.getCachedIcon.call(void 0, cached.id) || live.icon,
+        icon: cached.icon || _chunkSO64R7Z6js.getCachedIcon.call(void 0, cached.id) || live.icon,
         // Use live wallet's connect/disconnect functions
         connect: live.connect,
         disconnect: live.disconnect
@@ -492,7 +872,7 @@ var getKheopskit$ = (config, options = {}) => {
       // Transform cached-only items: add icon from localStorage cache
       (cached) => ({
         ...cached,
-        icon: cached.icon || _chunkB4L6GAYDjs.getCachedIcon.call(void 0, cached.id) || ""
+        icon: cached.icon || _chunkSO64R7Z6js.getCachedIcon.call(void 0, cached.id) || ""
       })
     );
     const bufferedAccounts$ = createAccountHydrationBuffer(
@@ -529,8 +909,8 @@ var getKheopskit$ = (config, options = {}) => {
         }
         return {
           config: kc,
-          wallets: [...wallets.items].sort(_chunkB4L6GAYDjs.sortWallets),
-          accounts: [...accounts.items].sort(_chunkB4L6GAYDjs.sortAccounts),
+          wallets: [...wallets.items].sort(sortWallets),
+          accounts: [...accounts.items].sort(sortAccounts),
           isHydrating: wallets.isHydrating || accounts.isHydrating
         };
       })
@@ -569,9 +949,9 @@ var getKheopskit$ = (config, options = {}) => {
           accounts: relevantAccounts.length
         });
       }
-      store2.setCachedState(
-        wallets.items.map(_chunkB4L6GAYDjs.serializeWallet),
-        relevantAccounts.map(_chunkB4L6GAYDjs.serializeAccount)
+      store.setCachedState(
+        wallets.items.map(_chunkSO64R7Z6js.serializeWallet),
+        relevantAccounts.map(_chunkSO64R7Z6js.serializeAccount)
       );
       const icons = {};
       for (const wallet of wallets.items) {
@@ -579,7 +959,7 @@ var getKheopskit$ = (config, options = {}) => {
           icons[wallet.id] = wallet.icon;
         }
       }
-      _chunkB4L6GAYDjs.setCachedIcons.call(void 0, icons);
+      _chunkSO64R7Z6js.setCachedIcons.call(void 0, icons);
     });
     return () => {
       subscription.unsubscribe();
@@ -608,7 +988,7 @@ var accountChangeKey = (account) => {
       return account.id;
   }
 };
-var walletPlatforms = (wallet) => _chunk4ENHC7G4js.isWalletConnectWallet.call(void 0, wallet) ? wallet.platforms.join(",") : "";
+var walletPlatforms = (wallet) => _chunkP7BPHHVVjs.isWalletConnectWallet.call(void 0, wallet) ? wallet.platforms.join(",") : "";
 var walletPersistKey = (wallet) => `${wallet.id}|${wallet.isConnected ? 1 : 0}|${wallet.name}`;
 var walletUiKey = (wallet) => `${walletPersistKey(wallet)}|${wallet.icon}|${walletPlatforms(wallet)}`;
 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) => {
@@ -635,5 +1015,6 @@ var statesEqual = (a, b) => a.isHydrating === b.isHydrating && a.wallets.length
 
 
 
-exports.DEFAULT_STORAGE_KEY = _chunkXQWJM3KCjs.DEFAULT_STORAGE_KEY; exports.KheopskitError = _chunkXQWJM3KCjs.KheopskitError; exports.clearAllCachedObservables = _chunk4ENHC7G4js.clearAllCachedObservables; exports.createKheopskitStore = _chunkXQWJM3KCjs.createKheopskitStore; exports.getDefaultStore = _chunkXQWJM3KCjs.getDefaultStore; exports.getKheopskit$ = getKheopskit$; exports.getWalletAccountId = _chunkXQWJM3KCjs.getWalletAccountId; exports.getWalletId = _chunk4ENHC7G4js.getWalletId; exports.isInjectedWallet = _chunk4ENHC7G4js.isInjectedWallet; exports.isValidAddress = _chunkXQWJM3KCjs.isValidAddress; exports.isValidWalletId = _chunk4ENHC7G4js.isValidWalletId; exports.isWalletConnectWallet = _chunk4ENHC7G4js.isWalletConnectWallet; exports.parseWalletAccountId = _chunkXQWJM3KCjs.parseWalletAccountId; exports.parseWalletId = _chunk4ENHC7G4js.parseWalletId; exports.resetAppKitCache = resetAppKitCache; exports.resolveConfig = _chunkXQWJM3KCjs.resolveConfig;
+
+exports.DEFAULT_STORAGE_KEY = DEFAULT_STORAGE_KEY; exports.KheopskitError = _chunkEH73P476js.KheopskitError; exports.clearAllCachedObservables = _chunkP7BPHHVVjs.clearAllCachedObservables; exports.createKheopskitStore = createKheopskitStore; exports.getDefaultStore = getDefaultStore; exports.getHydratedSnapshot = getHydratedSnapshot; exports.getKheopskit$ = getKheopskit$; exports.getWalletAccountId = _chunkEH73P476js.getWalletAccountId; exports.getWalletId = _chunkP7BPHHVVjs.getWalletId; exports.isInjectedWallet = _chunkP7BPHHVVjs.isInjectedWallet; exports.isValidAddress = _chunkEH73P476js.isValidAddress; exports.isValidWalletId = _chunkP7BPHHVVjs.isValidWalletId; exports.isWalletConnectWallet = _chunkP7BPHHVVjs.isWalletConnectWallet; exports.parseWalletAccountId = _chunkEH73P476js.parseWalletAccountId; exports.parseWalletId = _chunkP7BPHHVVjs.parseWalletId; exports.resetAppKitCache = resetAppKitCache; exports.resolveConfig = resolveConfig;
 //# sourceMappingURL=index.js.map