@kheopskit/core 0.0.1-alpha.0 → 0.0.1

package/dist/index.js

@@ -20,23 +20,58 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
-  getKheopskit$: () => getKheopskit$
+  getKheopskit$: () => getKheopskit$,
+  resolveConfig: () => resolveConfig
 });
 module.exports = __toCommonJS(index_exports);
 
+// src/utils/logObservable.ts
+var import_rxjs = require("rxjs");
+var logObservable = (label, opts) => (0, import_rxjs.tap)((value) => {
+  const { printValue = false, enabled = true } = opts || {};
+  if (!label || !enabled) return;
+  const text = `[kheopskit] observable ${label} emit`;
+  if (printValue) console.debug(text, value);
+  else console.debug(text);
+});
+
 // src/api/kheopskit.ts
-var import_rxjs8 = require("rxjs");
+var import_rxjs10 = require("rxjs");
+
+// src/utils/sortAccounts.ts
+var sortAccounts = (a1, a2) => {
+  if (a1.platform === "polkadot") {
+    if (a2.platform === "polkadot") {
+      if (a1.walletName !== a2.walletName) {
+        if (a1.walletName === "talisman") return -1;
+        if (a2.walletName === "talisman") return 1;
+        return a1.walletName.localeCompare(a2.walletName);
+      }
+      return a1.name !== a2.name ? (a1.name ?? "").localeCompare(a2.name ?? "") : a1.address.localeCompare(a2.address);
+    }
+    return -1;
+  }
+  if (a2.platform === "ethereum") {
+    if (a1.walletName !== a2.walletName) {
+      if (a1.walletName === "Talisman") return -1;
+      if (a2.walletName === "Talisman") return 1;
+      return a1.walletName.localeCompare(a2.walletName);
+    }
+    return 0;
+  }
+  return 0;
+};
 
 // src/api/accounts.ts
-var import_rxjs6 = require("rxjs");
+var import_rxjs5 = require("rxjs");
 
 // src/utils/createStore.ts
-var import_rxjs = require("rxjs");
+var import_rxjs2 = require("rxjs");
 var createStore = (key, defaultValue) => {
-  const subject = new import_rxjs.BehaviorSubject(getStoredData(key, defaultValue));
-  (0, import_rxjs.fromEvent)(window, "storage").pipe(
-    (0, import_rxjs.filter)((event) => event.key === key),
-    (0, import_rxjs.map)((event) => parseData(event.newValue, defaultValue))
+  const subject = new import_rxjs2.BehaviorSubject(getStoredData(key, defaultValue));
+  (0, import_rxjs2.fromEvent)(window, "storage").pipe(
+    (0, import_rxjs2.filter)((event) => event.key === key),
+    (0, import_rxjs2.map)((event) => parseData(event.newValue, defaultValue))
   ).subscribe((newValue) => subject.next(newValue));
   const update = (val) => {
     setStoredData(key, val);
@@ -66,7 +101,8 @@ var setStoredData = (key, val) => {
 };
 
 // src/utils/isEthereumAddress.ts
-var isEthereumAddress = (address) => /^0x[a-fA-F0-9]{40}$/.test(address);
+var import_viem = require("viem");
+var isEthereumAddress = (address) => (0, import_viem.isAddress)(address);
 
 // src/utils/isSs58Address.ts
 var import_polkadot_api = require("polkadot-api");
@@ -76,7 +112,7 @@ var isSs58Address = (address) => {
     if (!address) return false;
     accountIdEncoder(address);
     return true;
-  } catch (_err) {
+  } catch {
     return false;
   }
 };
@@ -86,8 +122,8 @@ var isValidAddress = (address) => {
   return address.startsWith("0x") ? isEthereumAddress(address) : isSs58Address(address);
 };
 
-// src/utils/AccountId.ts
-var getAccountId = (walletId, address) => {
+// src/utils/WalletAccountId.ts
+var getWalletAccountId = (walletId, address) => {
   if (!walletId) throw new Error("Missing walletId");
   if (!isValidAddress(address)) throw new Error("Invalid address");
   return `${walletId}::${address}`;
@@ -96,12 +132,302 @@ var getAccountId = (walletId, address) => {
 // src/utils/isWalletPlatform.ts
 var isWalletPlatform = (platform) => typeof platform === "string" && ["polkadot", "ethereum"].includes(platform);
 
+// src/utils/getCachedObservable.ts
+var CACHE = /* @__PURE__ */ new Map();
+var getCachedObservable$ = (key, create) => {
+  if (!CACHE.has(key)) CACHE.set(key, create());
+  return CACHE.get(key);
+};
+
 // src/api/ethereum/accounts.ts
 var import_rxjs3 = require("rxjs");
-var import_viem = require("viem");
+var import_viem2 = require("viem");
+var getInjectedWalletAccounts$ = (wallet) => {
+  if (!wallet.isConnected) return (0, import_rxjs3.of)([]);
+  return getCachedObservable$(
+    `accounts:${wallet.id}`,
+    () => new import_rxjs3.Observable((subscriber) => {
+      const getAccount = (address, i) => {
+        const client = (0, import_viem2.createWalletClient)({
+          account: address,
+          transport: (0, import_viem2.custom)(wallet.provider)
+        });
+        return {
+          id: getWalletAccountId(wallet.id, address),
+          platform: "ethereum",
+          client,
+          address: (0, import_viem2.getAddress)(address),
+          walletName: wallet.name,
+          walletId: wallet.id,
+          isWalletDefault: i === 0
+        };
+      };
+      const handleAccountsChanged = (addresses) => {
+        subscriber.next(addresses.map(getAccount));
+      };
+      wallet.provider.on("accountsChanged", handleAccountsChanged);
+      wallet.provider.request({ method: "eth_accounts" }).then((addresses) => {
+        subscriber.next(addresses.map(getAccount));
+      }).catch((err) => {
+        console.error("Failed to get accounts", err);
+        subscriber.next([]);
+      });
+      return () => {
+        wallet.provider.removeListener(
+          "accountsChanged",
+          handleAccountsChanged
+        );
+      };
+    }).pipe((0, import_rxjs3.shareReplay)({ refCount: true, bufferSize: 1 }))
+  );
+};
+var wrapWalletConnectProvider = (provider, sessionTopic, caipNetworkId) => {
+  return new Proxy(provider, {
+    get(target, prop, receiver) {
+      if (prop !== "request") return Reflect.get(target, prop, receiver);
+      return (args) => {
+        if (args && typeof args === "object" && args.method) {
+          if (!args.topic) args.topic = sessionTopic;
+          if (!args.chainId) args.chainId = caipNetworkId;
+        }
+        return target.request(args);
+      };
+    }
+  });
+};
+var getAppKitAccounts$ = (wallet) => {
+  const account = wallet.appKit.getAccount("eip155");
+  const provider = wallet.appKit.getProvider("eip155");
+  if (!wallet.isConnected || !wallet.appKit || !account?.allAccounts.length || !provider?.session)
+    return (0, import_rxjs3.of)([]);
+  return getCachedObservable$(
+    "accounts:appKit",
+    () => new import_rxjs3.Observable((subscriber) => {
+      const caipNetworkId$ = new import_rxjs3.ReplaySubject(1);
+      const handleChainChanged = (chainId) => {
+        caipNetworkId$.next(`eip155:${chainId}`);
+      };
+      provider.on("chainChanged", handleChainChanged);
+      provider.request({ method: "eth_chainId" }).then(handleChainChanged);
+      const sub = caipNetworkId$.pipe(
+        (0, import_rxjs3.distinctUntilChanged)(),
+        (0, import_rxjs3.map)(
+          (caipNetworkId) => (0, import_viem2.custom)(
+            wrapWalletConnectProvider(
+              provider,
+              // biome-ignore lint/style/noNonNullAssertion: <explanation>
+              provider.session.topic,
+              caipNetworkId
+            )
+          )
+        ),
+        (0, import_rxjs3.map)(
+          (transport) => account.allAccounts.map((acc, i) => {
+            const client = (0, import_viem2.createWalletClient)({
+              account: acc.address,
+              transport
+            });
+            return {
+              id: getWalletAccountId(wallet.id, acc.address),
+              platform: "ethereum",
+              walletName: wallet.name,
+              walletId: wallet.id,
+              address: acc.address,
+              client,
+              isWalletDefault: i === 0
+            };
+          })
+        )
+      ).subscribe(subscriber);
+      return () => {
+        provider.off("chainChanged", handleChainChanged);
+        sub.unsubscribe();
+      };
+    }).pipe((0, import_rxjs3.shareReplay)({ refCount: true, bufferSize: 1 }))
+  );
+};
+var getEthereumAccounts$ = (ethereumWallets) => new import_rxjs3.Observable((subscriber) => {
+  const sub = ethereumWallets.pipe(
+    (0, import_rxjs3.map)((wallets) => wallets.filter((w) => w.isConnected)),
+    (0, import_rxjs3.switchMap)((wallets) => {
+      return wallets.length ? (0, import_rxjs3.combineLatest)([
+        ...wallets.filter((w) => w.type === "injected").map(getInjectedWalletAccounts$),
+        ...wallets.filter((w) => w.type === "appKit").map(getAppKitAccounts$)
+        // todo appkit
+      ]) : (0, import_rxjs3.of)([]);
+    }),
+    (0, import_rxjs3.map)((accounts) => accounts.flat()),
+    (0, import_rxjs3.distinctUntilChanged)(isSameAccountsList)
+  ).subscribe(subscriber);
+  return () => {
+    sub.unsubscribe();
+  };
+}).pipe(
+  // logObservable("ethereumAccounts$", true),
+  (0, import_rxjs3.shareReplay)({ refCount: true, bufferSize: 1 })
+);
+var isSameAccountsList = (a, b) => {
+  if (a.length !== b.length) return false;
+  return a.every((account, i) => account.id === b[i]?.id);
+};
 
-// src/api/store.ts
-var import_lodash = require("lodash");
+// src/api/polkadot/accounts.ts
+var import_pjs_signer = require("polkadot-api/pjs-signer");
+var import_rxjs4 = require("rxjs");
+var getInjectedWalletAccounts$2 = (wallet) => {
+  if (!wallet.isConnected) return (0, import_rxjs4.of)([]);
+  return new import_rxjs4.Observable((subscriber) => {
+    const getAccount = (account) => ({
+      id: getWalletAccountId(wallet.id, account.address),
+      ...account,
+      platform: "polkadot",
+      walletName: wallet.name,
+      walletId: wallet.id
+    });
+    const extension = wallet.extension;
+    const unsubscribe = extension.subscribe((accounts) => {
+      subscriber.next(accounts.map(getAccount));
+    });
+    subscriber.next(extension.getAccounts().map(getAccount));
+    return () => {
+      return unsubscribe();
+    };
+  });
+};
+var getAppKitPolkadotSigner = (appKit, address) => {
+  const provider = appKit.getProvider("polkadot");
+  if (!provider) throw new Error("No provider found");
+  if (!provider.session) throw new Error("No session found");
+  return (0, import_pjs_signer.getPolkadotSignerFromPjs)(
+    address,
+    (transactionPayload) => {
+      if (!provider.session) throw new Error("No session found");
+      return provider.client.request({
+        topic: provider.session.topic,
+        chainId: `polkadot:${transactionPayload.genesisHash.substring(2, 34)}`,
+        request: {
+          method: "polkadot_signTransaction",
+          params: {
+            address,
+            transactionPayload
+          }
+        }
+      });
+    },
+    async ({ address: address2, data }) => {
+      if (!provider.session) throw new Error("No session found");
+      const networks = appKit.getCaipNetworks("polkadot");
+      const chainId = networks[0]?.caipNetworkId;
+      if (!chainId) throw new Error("No chainId found");
+      return provider.client.request({
+        topic: provider.session.topic,
+        chainId,
+        request: {
+          method: "polkadot_signMessage",
+          params: {
+            address: address2,
+            message: data
+          }
+        }
+      });
+    }
+  );
+};
+var getAppKitAccounts$2 = (wallet) => {
+  const account = wallet.appKit.getAccount("polkadot");
+  const provider = wallet.appKit.getProvider("polkadot");
+  if (!wallet.isConnected || !wallet.appKit || !account?.allAccounts.length || !provider?.session)
+    return (0, import_rxjs4.of)([]);
+  return (0, import_rxjs4.of)(
+    account.allAccounts.map(
+      (acc) => ({
+        id: getWalletAccountId(wallet.id, acc.address),
+        platform: "polkadot",
+        walletName: wallet.name,
+        walletId: wallet.id,
+        address: acc.address,
+        polkadotSigner: getAppKitPolkadotSigner(wallet.appKit, acc.address),
+        genesisHash: null,
+        name: `${wallet.name} Polkadot`,
+        type: "sr25519"
+      })
+    )
+  );
+};
+var getPolkadotAccounts$ = (polkadotWallets$) => new import_rxjs4.Observable((subscriber) => {
+  const sub = polkadotWallets$.pipe(
+    (0, import_rxjs4.map)((wallets) => wallets.filter((w) => w.isConnected)),
+    (0, import_rxjs4.switchMap)(
+      (wallets) => wallets.length ? (0, import_rxjs4.combineLatest)([
+        ...wallets.filter((w) => w.type === "injected").map(getInjectedWalletAccounts$2),
+        ...wallets.filter((w) => w.type === "appKit").map(getAppKitAccounts$2)
+      ]) : (0, import_rxjs4.of)([])
+    ),
+    (0, import_rxjs4.map)((accounts) => accounts.flat()),
+    (0, import_rxjs4.distinctUntilChanged)(isSameAccountsList2)
+  ).subscribe(subscriber);
+  return () => {
+    sub.unsubscribe();
+  };
+}).pipe((0, import_rxjs4.shareReplay)({ refCount: true, bufferSize: 1 }));
+var isSameAccountsList2 = (a, b) => {
+  if (a.length !== b.length) return false;
+  return a.every((account, i) => account.id === b[i]?.id);
+};
+
+// src/api/accounts.ts
+var getAccounts$ = (config, wallets) => {
+  return new import_rxjs5.Observable((subscriber) => {
+    const sources = config.platforms.map(
+      (platform) => {
+        switch (platform) {
+          case "polkadot":
+            return getPolkadotAccounts$(
+              wallets.pipe(
+                (0, import_rxjs5.map)((w) => w.filter((w2) => w2.platform === "polkadot"))
+              )
+            );
+          case "ethereum":
+            return getEthereumAccounts$(
+              wallets.pipe(
+                (0, import_rxjs5.map)((w) => w.filter((w2) => w2.platform === "ethereum"))
+              )
+            );
+        }
+      }
+    );
+    const accounts$ = sources.length ? (0, import_rxjs5.combineLatest)(sources).pipe(
+      (0, import_rxjs5.map)((accounts) => accounts.flat().sort(sortAccounts))
+    ) : (0, import_rxjs5.of)([]);
+    const sub = accounts$.subscribe(subscriber);
+    return () => {
+      sub.unsubscribe();
+    };
+  }).pipe((0, import_rxjs5.shareReplay)({ refCount: true, bufferSize: 1 }));
+};
+
+// src/api/config.ts
+var DEFAULT_CONFIG = {
+  autoReconnect: true,
+  platforms: ["polkadot"],
+  debug: false
+};
+var resolveConfig = (config) => {
+  return Object.assign({}, DEFAULT_CONFIG, config);
+};
+
+// src/utils/sortWallets.ts
+var sortWallets = (w1, w2) => {
+  if (w1.platform !== w2.platform) {
+    return w1.platform === "polkadot" ? -1 : 1;
+  }
+  if (w1.name.toLowerCase() === "talisman") return -1;
+  if (w2.name.toLowerCase() === "talisman") return 1;
+  return w1.name.localeCompare(w2.name);
+};
+
+// src/api/wallets.ts
+var import_rxjs9 = require("rxjs");
 
 // src/utils/WalletId.ts
 var getWalletId = (platform, identifier) => {
@@ -118,6 +444,7 @@ var parseWalletId = (walletId) => {
 };
 
 // src/api/store.ts
+var import_lodash = require("lodash");
 var LOCAL_STORAGE_KEY = "kheopskit";
 var DEFAULT_SETTINGS = {};
 var storage = createStore(LOCAL_STORAGE_KEY, DEFAULT_SETTINGS);
@@ -144,8 +471,94 @@ var store = {
 
 // src/api/ethereum/wallets.ts
 var import_mipd = require("mipd");
-var import_rxjs2 = require("rxjs");
-var providersDetails$ = new import_rxjs2.Observable(
+var import_rxjs7 = require("rxjs");
+
+// src/api/appKit.ts
+var import_core = require("@reown/appkit/core");
+var import_rxjs6 = require("rxjs");
+var WALLET_CONNECT_ICON = "data:image/svg+xml;base64,PHN2ZyBmaWxsPSJub25lIiBoZWlnaHQ9IjQwMCIgdmlld0JveD0iMCAwIDQwMCA0MDAiIHdpZHRoPSI0MDAiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxjbGlwUGF0aCBpZD0iYSI+PHBhdGggZD0ibTAgMGg0MDB2NDAwaC00MDB6Ii8+PC9jbGlwUGF0aD48ZyBjbGlwLXBhdGg9InVybCgjYSkiPjxjaXJjbGUgY3g9IjIwMCIgY3k9IjIwMCIgZmlsbD0iIzMzOTZmZiIgcj0iMTk5LjUiIHN0cm9rZT0iIzY2YjFmZiIvPjxwYXRoIGQ9Im0xMjIuNTE5IDE0OC45NjVjNDIuNzkxLTQxLjcyOSAxMTIuMTcxLTQxLjcyOSAxNTQuOTYyIDBsNS4xNSA1LjAyMmMyLjE0IDIuMDg2IDIuMTQgNS40NjkgMCA3LjU1NWwtMTcuNjE3IDE3LjE4Yy0xLjA3IDEuMDQzLTIuODA0IDEuMDQzLTMuODc0IDBsLTcuMDg3LTYuOTExYy0yOS44NTMtMjkuMTExLTc4LjI1My0yOS4xMTEtMTA4LjEwNiAwbC03LjU5IDcuNDAxYy0xLjA3IDEuMDQzLTIuODA0IDEuMDQzLTMuODc0IDBsLTE3LjYxNy0xNy4xOGMtMi4xNC0yLjA4Ni0yLjE0LTUuNDY5IDAtNy41NTV6bTE5MS4zOTcgMzUuNTI5IDE1LjY3OSAxNS4yOWMyLjE0IDIuMDg2IDIuMTQgNS40NjkgMCA3LjU1NWwtNzAuNyA2OC45NDRjLTIuMTM5IDIuMDg3LTUuNjA4IDIuMDg3LTcuNzQ4IDBsLTUwLjE3OC00OC45MzFjLS41MzUtLjUyMi0xLjQwMi0uNTIyLTEuOTM3IDBsLTUwLjE3OCA0OC45MzFjLTIuMTM5IDIuMDg3LTUuNjA4IDIuMDg3LTcuNzQ4IDBsLTcwLjcwMTUtNjguOTQ1Yy0yLjEzOTYtMi4wODYtMi4xMzk2LTUuNDY5IDAtNy41NTVsMTUuNjc5NS0xNS4yOWMyLjEzOTYtMi4wODYgNS42MDg1LTIuMDg2IDcuNzQ4MSAwbDUwLjE3ODkgNDguOTMyYy41MzUuNTIyIDEuNDAyLjUyMiAxLjkzNyAwbDUwLjE3Ny00OC45MzJjMi4xMzktMi4wODcgNS42MDgtMi4wODcgNy43NDggMGw1MC4xNzkgNDguOTMyYy41MzUuNTIyIDEuNDAyLjUyMiAxLjkzNyAwbDUwLjE3OS00OC45MzFjMi4xMzktMi4wODcgNS42MDgtMi4wODcgNy43NDggMHoiIGZpbGw9IiNmZmYiLz48L2c+PC9zdmc+";
+var cachedAppKit = null;
+var getAppKitWallets$ = (config) => {
+  if (!config.walletConnect) return (0, import_rxjs6.of)({});
+  const walletConnect = config.walletConnect;
+  if (!cachedAppKit) {
+    cachedAppKit = new import_rxjs6.Observable((subscriber) => {
+      const appKit = (0, import_core.createAppKit)({
+        projectId: walletConnect.projectId,
+        metadata: walletConnect.metadata,
+        networks: walletConnect.networks,
+        universalProviderConfigOverride: {
+          methods: {
+            polkadot: ["polkadot_signTransaction", "polkadot_signMessage"]
+          }
+        }
+      });
+      const status$ = new import_rxjs6.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_rxjs6.map)((s) => s.isPolkadotConnected),
+        (0, import_rxjs6.distinctUntilChanged)(),
+        (0, import_rxjs6.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_rxjs6.of)(void 0);
+      const ethereumWallet$ = appKit.chainNamespaces.includes("eip155") ? status$.pipe(
+        (0, import_rxjs6.map)((s) => s.isEthereumConnected),
+        (0, import_rxjs6.distinctUntilChanged)(),
+        (0, import_rxjs6.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_rxjs6.of)(void 0);
+      const sub = (0, import_rxjs6.combineLatest)({
+        polkadot: polkadotWallet$,
+        ethereum: ethereumWallet$
+      }).subscribe(subscriber);
+      return () => {
+        sub.unsubscribe();
+        unsubProviders();
+      };
+    }).pipe((0, import_rxjs6.shareReplay)({ refCount: true, bufferSize: 1 }));
+  }
+  return cachedAppKit;
+};
+
+// src/api/ethereum/wallets.ts
+var providersDetails$ = new import_rxjs7.Observable(
   (subscriber) => {
     const store2 = (0, import_mipd.createStore)();
     const unsubscribe = store2.subscribe((providerDetails2) => {
@@ -158,17 +571,14 @@ var providersDetails$ = new import_rxjs2.Observable(
       store2.destroy();
     };
   }
-).pipe((0, import_rxjs2.shareReplay)({ refCount: true, bufferSize: 1 }));
-providersDetails$.subscribe(() => {
-  console.count("[kheopskit] providers$ emit");
-});
-var ethereumWallets$ = new import_rxjs2.Observable(
+).pipe((0, import_rxjs7.shareReplay)({ refCount: true, bufferSize: 1 }));
+var ethereumInjectedWallets$ = new import_rxjs7.Observable(
   (subscriber) => {
-    const enabledWalletIds$ = new import_rxjs2.BehaviorSubject(/* @__PURE__ */ new Set());
+    const enabledWalletIds$ = new import_rxjs7.BehaviorSubject(/* @__PURE__ */ new Set());
     const connectWallet = async (walletId, provider) => {
       if (enabledWalletIds$.value.has(walletId))
         throw new Error(`Extension ${walletId} already connected`);
-      provider.request({
+      await provider.request({
         method: "eth_requestAccounts"
       });
       const newSet = new Set(enabledWalletIds$.value);
@@ -176,7 +586,7 @@ var ethereumWallets$ = new import_rxjs2.Observable(
       enabledWalletIds$.next(newSet);
       store.addEnabledWalletId(walletId);
     };
-    const disconnectWallet = async (walletId, _provider) => {
+    const disconnectWallet = async (walletId) => {
       if (!enabledWalletIds$.value.has(walletId))
         throw new Error(`Extension ${walletId} is not connected`);
       const newSet = new Set(enabledWalletIds$.value);
@@ -184,21 +594,22 @@ var ethereumWallets$ = new import_rxjs2.Observable(
       enabledWalletIds$.next(newSet);
       store.removeEnabledWalletId(walletId);
     };
-    const sub = (0, import_rxjs2.combineLatest)([providersDetails$, enabledWalletIds$]).pipe(
-      (0, import_rxjs2.map)(([providerDetails, enabledWalletIds]) => {
+    const sub = (0, import_rxjs7.combineLatest)([providersDetails$, enabledWalletIds$]).pipe(
+      (0, import_rxjs7.map)(([providerDetails, enabledWalletIds]) => {
         return providerDetails.map((pd) => {
           const walletId = getWalletId("ethereum", pd.info.rdns);
           const provider = pd.provider;
           return {
             platform: "ethereum",
+            type: "injected",
             id: walletId,
             name: pd.info.name,
             icon: pd.info.icon,
             provider,
-            isEnabled: enabledWalletIds.has(walletId),
+            isConnected: enabledWalletIds.has(walletId),
             providerId: pd.info.rdns,
             connect: () => connectWallet(walletId, provider),
-            disconnect: () => disconnectWallet(walletId, provider)
+            disconnect: () => disconnectWallet(walletId)
           };
         });
       })
@@ -207,221 +618,149 @@ var ethereumWallets$ = new import_rxjs2.Observable(
       sub.unsubscribe();
     };
   }
-).pipe((0, import_rxjs2.shareReplay)({ refCount: true, bufferSize: 1 }));
-ethereumWallets$.subscribe(() => {
-  console.count("[kheopskit] ethereumWallets$ emit");
-});
-
-// src/api/ethereum/accounts.ts
-var getWalletAccounts$ = (wallet) => {
-  if (!wallet.isEnabled) return (0, import_rxjs3.of)([]);
-  return new import_rxjs3.Observable((subscriber) => {
-    const getAccount = (address, i) => ({
-      id: getAccountId(wallet.id, address),
-      platform: "ethereum",
-      provider: wallet.provider,
-      address: (0, import_viem.getAddress)(address),
-      walletName: wallet.name,
-      walletId: wallet.id,
-      isWalletDefault: i === 0
-    });
-    const listener = (addresses) => {
-      subscriber.next(addresses.map(getAccount));
-    };
-    wallet.provider.on("accountsChanged", listener);
-    wallet.provider.request({ method: "eth_accounts" }).then((addresses) => {
-      subscriber.next(addresses.map(getAccount));
-    }).catch((err) => {
-      console.error("Failed to get accounts", err);
-      subscriber.next([]);
-    });
-    return () => {
-      wallet.provider.removeListener("accountsChanged", listener);
-    };
-  });
-};
-var ethereumAccounts$ = new import_rxjs3.Observable(
-  (subscriber) => {
-    const sub = ethereumWallets$.pipe(
-      (0, import_rxjs3.map)((wallets) => wallets.filter((w) => w.isEnabled)),
-      (0, import_rxjs3.switchMap)(
-        (wallets) => wallets.length ? (0, import_rxjs3.combineLatest)(wallets.map(getWalletAccounts$)) : (0, import_rxjs3.of)([])
-      ),
-      (0, import_rxjs3.map)((accounts) => accounts.flat())
+).pipe((0, import_rxjs7.shareReplay)({ refCount: true, bufferSize: 1 }));
+var getEthereumWallets$ = (config) => {
+  return new import_rxjs7.Observable((subscriber) => {
+    const subscription = (0, import_rxjs7.combineLatest)([
+      ethereumInjectedWallets$,
+      getAppKitWallets$(config)?.pipe((0, import_rxjs7.map)((w) => w.ethereum))
+    ]).pipe(
+      (0, import_rxjs7.map)(
+        ([injectedWallets, appKitWallet]) => appKitWallet ? [...injectedWallets, appKitWallet] : injectedWallets
+      )
     ).subscribe(subscriber);
     return () => {
-      sub.unsubscribe();
+      subscription.unsubscribe();
     };
-  }
-).pipe((0, import_rxjs3.shareReplay)({ refCount: true, bufferSize: 1 }));
-ethereumAccounts$.subscribe(() => {
-  console.count("[kheopskit] ethereumAccounts$ emit");
-});
+  }).pipe((0, import_rxjs7.shareReplay)({ refCount: true, bufferSize: 1 }));
+};
 
-// src/api/polkadot/accounts.ts
-var import_rxjs5 = require("rxjs");
+// src/utils/polkadotExtensions.ts
+var POLKADOT_EXTENSIONS = {
+  talisman: {
+    name: "Talisman",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTI4IiBoZWlnaHQ9IjEyOCIgdmlld0JveD0iMCAwIDEyOCAxMjgiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgICA8cGF0aCBmaWxsPSIjZGRmZTc2IiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0wIDcwLjI1YzAgMjEuMjU1IDAgMzEuODgzIDQuNDYzIDM5Ljg1MmEzNSAzNSAwIDAgMCAxMy40MzUgMTMuNDM1QzI1Ljg2NyAxMjggMzYuNDk1IDEyOCA1Ny43NSAxMjhoMTIuNWMyMS4yNTUgMCAzMS44ODMgMCAzOS44NTItNC40NjNhMzUgMzUgMCAwIDAgMTMuNDM1LTEzLjQzNUMxMjggMTAyLjEzMyAxMjggOTEuNTA1IDEyOCA3MC4yNXYtMTIuNWMwLTIxLjI1NSAwLTMxLjg4My00LjQ2My0zOS44NTJhMzUgMzUgMCAwIDAtMTMuNDM1LTEzLjQzNUMxMDIuMTMzIDAgOTEuNTA1IDAgNzAuMjUgMGgtMTIuNUMzNi40OTUgMCAyNS44NjcgMCAxNy44OTggNC40NjNBMzUgMzUgMCAwIDAgNC40NjMgMTcuODk4QzAgMjUuODY3IDAgMzYuNDk1IDAgNTcuNzVaIi8+CiAgICA8cGF0aCBmaWxsPSIjZWE1NzUwIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiIGQ9Im0zMy44NzkgMzUuMTE3LS41IDE5LjE2NWM4LjEwNyA0LjE2OCAxNS43NSA0LjA3NSAyNC43NCAyLjA2MyAzLjU2LTEuMzk3IDYuMDU2LTEuNzAyIDkuNTExIDAgOS4wNjcgMi44MTYgMTYuOTY5IDEuOTUgMjUuMTg1LTIuMjQzbC0uNDg1LTE5LjE4N2MwLTEwLjgwNS03LjAwNC0xNC45NjItMTQuNjMyLTEyLjczOS0uNzc5LjIzMi0xLjk0NCAxLjI3NC0xLjk0NCAyLjIwN2wtLjE4MSAxOC43MzNhMS43NyAxLjc3IDAgMSAxLTMuNTM4LS4wMTVWMjAuMDY3YTguODM4IDguODM4IDAgMCAwLTE3LjY3NSAwVjQzLjFhMS43NyAxLjc3IDAgMSAxLTMuNTM4LjAxNWwtLjE3Ni0xOC43NDNjMC0uOTIzLTEuMTA5LTEuOTYtMS44ODItMi4xOTItOC44LTIuNjEtMTQuODggMi41MzgtMTQuODggMTIuOTM2Wm0yLjQ3NSAyMy44NDNhNDguNDMgNDguNDMgMCAwIDEtNS4yMDktMi4yNTRjLTQuNzMtMi4yNjktMTIuMDk1LTEuNTYyLTE3LjA3MiA0LjExMS0yLjI3NCAyLjYtLjUxNSA2LjM2IDIuNzcgNy40NDggMS41ODMuNTI2IDMuMDE3IDEuNDEzIDQuMzUzIDIuNDA4bC40NjQuMzM2YzQuMTMyIDIuOTY1IDYuNzkzIDcuNDA2IDcuMDU2IDEyLjQ4NmwuMjUzIDQuODEyYTMxLjYxNiAzMS42MTYgMCAwIDAgMTkuNDI4IDI1Ljk1OSAzOC41OSAzOC41OSAwIDAgMCAyOS4zMjcgMCAzMS42MTYgMzEuNjE2IDAgMCAwIDE5LjQyOS0yNS45NTljLjA0Ni0uODI1LjA2MS0xLjY1LjA1MS0yLjQ2NWwuMTI0LTIuMzQ3Yy4yNjMtNS4wOCAyLjkyNC05LjUyIDcuMDU2LTEyLjQ4NmwuNDY0LS4zMzZjMS4zNC0uOTk1IDIuNzctMS44ODIgNC4zNTMtMi40MDggMy4yODUtMS4wODkgNS4wNS00Ljg0OSAyLjc3LTcuNDQ4LTQuOTc4LTUuNjczLTEyLjM0My02LjM3NS0xNy4wNzItNC4xMS0xLjcxOC44MjUtMy40MzUgMS42NS01LjIxIDIuMjUzbC0zLjYyIDEuMjM4LS4wMS4wNDFjLTYuNjU0IDEuODQyLTEyLjEyIDEuODQ3LTE4LjM5OC0uNzQyLTMuMTc3LTEuMzEtNi4zOC0xLjU1OC05LjQ4IDAtNS45NjcgMS44NTYtMTIuMDQ4IDIuNjQtMTguMjA2LjcwMWwtMy42MjYtMS4yMzhabTI2LjY2NSA0NC43MzJjMTMuMzkgMCAyNC4yNDEtMTUuNTk2IDI0LjI0MS0xNS41OTZTNzYuNDEgNzIuNDk5IDYzLjAyIDcyLjQ5OWMtMTMuMzg1IDAtMjQuMjM2IDE1LjU5Ny0yNC4yMzYgMTUuNTk3czEwLjg1MSAxNS41OTYgMjQuMjQgMTUuNTk2Wm0xMC44ODMtMTUuNTk2YzAgNi4wMS00Ljg3MiAxMC44ODItMTAuODgzIDEwLjg4Mi02LjAxIDAtMTAuODgyLTQuODcyLTEwLjg4Mi0xMC44ODJzNC44NzItMTAuODgzIDEwLjg4Mi0xMC44ODMgMTAuODgzIDQuODcyIDEwLjg4MyAxMC44ODNabS0xMC44ODMgNC45MzZhNC45MzYgNC45MzYgMCAxIDAgMC05Ljg3MiA0LjkzNiA0LjkzNiAwIDAgMCAwIDkuODcyWiIvPgo8L3N2Zz4K"
+  },
+  "polkadot-js": {
+    name: "Polkadot.js",
+    icon: "data:image/svg+xml;base64,ICA8c3ZnIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgd2lkdGg9IjEwMCUiIGhlaWdodD0iMTAwJSIgdmlld0JveD0iMCAwIDEwNi4yIDEwNi4yIj4KICAgIDxkZWZzPjwvZGVmcz4KICAgIDxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPgogICAgICA8ZyBpZD0iTGF5ZXJfMS0yIiBkYXRhLW5hbWU9IkxheWVyIDEiPgogICAgICAgIDxjaXJjbGUgY3g9IjUzLjEiIGN5PSI1My4xIiByPSI1My4xIiBmaWxsPSIjZjI5MjM1IiAvPgogICAgICAgIDxwYXRoCiAgICAgICAgICBmaWxsPSIjZmZmIgogICAgICAgICAgZD0iTTU0LjQ3IDEzLjc2YTI4Ljg1IDI4Ljg1IDAgMDAtMjguNzMgMjguNzMgMjkuMzQgMjkuMzQgMCAwMDEuNTIgOS4zNCA0IDQgMCAxMDcuNDktMi41MkExOC42NyAxOC42NyAwIDAxMzMuNjMgNDJhMjAuNzIgMjAuNzIgMCAxMTIyIDIxLjMxcy00IC4yNS02IC40OWMtLjc0LjExLTEuNDguMjYtMi4yLjQ0YS4yOC4yOCAwIDAxLS4zOCAwIC4yNy4yNyAwIDAxMC0uMzJsLjYzLTMuNDEgMy43OS0xN2EzLjk0IDMuOTQgMCAxMC03LjcxLTEuNjVzLTkgNDEuNy05IDQyLjA4YTMuNzkgMy43OSAwIDAwMi43NCA0LjZoLjI4YTMuNzggMy43OCAwIDAwNC42MS0yLjcxLjQzLjQzIDAgMDAwLS4xMXYtLjE5Yy4xMS0uNDkgMS4yNS02IDEuMjUtNmExMC4yMyAxMC4yMyAwIDAxOC40Ni04Yy44Ny0uMTMgNC41My0uMzggNC41My0uMzhhMjguNzEgMjguNzEgMCAwMC0yLjExLTU3LjI3eiIKICAgICAgICAvPgogICAgICAgIDxwYXRoCiAgICAgICAgICBmaWxsPSIjZmZmIgogICAgICAgICAgZD0iTTU2LjIxIDgwYTQuNzggNC43OCAwIDAwLTUuNjYgMy43MS4yNC4yNCAwIDAxMCAuMDggNC43NyA0Ljc3IDAgMDAzLjY1IDUuNjdoLjE0QTQuNyA0LjcgMCAwMDYwIDg2di0uMzJBNSA1IDAgMDA1Ni4yMSA4MHoiCiAgICAgICAgLz4KICAgICAgPC9nPgogICAgPC9nPgogIDwvc3ZnPg=="
+  },
+  "subwallet-js": {
+    name: "SubWallet",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTYwIiBoZWlnaHQ9IjE2MCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj48cGF0aCBkPSJNODAgNGM1Ny42MyAwIDc2IDE4LjM3IDc2IDc2IDAgNTcuNjMtMTguMzcgNzYtNzYgNzYtNTcuNjMgMC03Ni0xOC4zNy03Ni03NkM0IDIyLjM3IDIyLjM3IDQgODAgNFoiIGZpbGw9InVybCgjYSkiLz48ZyBjbGlwLXBhdGg9InVybCgjYikiPjxwYXRoIGQ9Ik0xMTIuNjE1IDY2LjcyVjUzLjM5OEw1OC43NiAzMiA0OCAzNy40MTJsLjA1NyA0MS40NjQgNDAuMjkyIDE2LjA3LTIxLjUyIDkuMDc1di03LjAxOEw1Ni45NSA5My4wM2wtOC44OTMgNC4xNjN2MjUuMzk1TDU4Ljc2OSAxMjhsNTMuODQ2LTI0LjA2MlY4Ni44NjlMNjQuMTU0IDY3LjY1N1Y1NmwzOC40NDkgMTUuMjE2IDEwLjAxMi00LjQ5NloiIGZpbGw9IiNmZmYiLz48L2c+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJhIiB4MT0iODAiIHkxPSI0IiB4Mj0iODAiIHkyPSIxNTYiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIj48c3RvcCBzdG9wLWNvbG9yPSIjMDA0QkZGIi8+PHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNENFQUFDIi8+PC9saW5lYXJHcmFkaWVudD48Y2xpcFBhdGggaWQ9ImIiPjxwYXRoIGZpbGw9IiNmZmYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDQ4IDMyKSIgZD0iTTAgMGg2NC42MTV2OTZIMHoiLz48L2NsaXBQYXRoPjwvZGVmcz48L3N2Zz4="
+  },
+  enkrypt: {
+    name: "Enkrypt",
+    icon: "data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iODEiIGhlaWdodD0iODEiIHZpZXdCb3g9IjAgMCA4MSA4MSIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik0xNy4wMDU3IDE3LjAwNjJDMTguOTMwMyAxNS4wODE2IDIxLjU0MDUgMTQuMDAwNCAyNC4yNjIyIDE0LjAwMDRMNjcuMzI5NiAxNFYyMS44NzQxQzY3LjMyOTYgMjMuODMwNSA2Ni41NTIzIDI1LjcwNjcgNjUuMTY5IDI3LjA5QzYzLjc4NTcgMjguNDczMyA2MS45MDk1IDI5LjI1MDQgNTkuOTUzMiAyOS4yNTA0SDM5LjcwNDVDMzYuOTgyOCAyOS4yNTA0IDM0LjM3MjYgMzAuMzMxNiAzMi40NDggMzIuMjU2MUMzMC41MjM1IDM0LjE4MDcgMjkuNDQyMyAzNi43OTA5IDI5LjQ0MjMgMzkuNTEyNlY0Mi4xMjQyQzI5LjQ0MjMgNDQuODQ1OSAzMC41MjM1IDQ3LjQ1NjEgMzIuNDQ4IDQ5LjM4MDZDMzQuMzcyNiA1MS4zMDUxIDM2Ljk4MjggNTIuMzg2MyAzOS43MDQ1IDUyLjM4NjNINTkuOTUzMkM2MS45MDk1IDUyLjM4NjMgNjMuNzg1NyA1My4xNjM1IDY1LjE2OSA1NC41NDY4QzY2LjU1MjMgNTUuOTMwMSA2Ny4zMjk2IDU3LjgwNjMgNjcuMzI5NiA1OS43NjI2VjY3LjMzSDI0LjI2MjJDMjEuNTQwNSA2Ny4zMyAxOC45MzAzIDY2LjI0ODggMTcuMDA1NyA2NC4zMjQzQzE1LjA4MTIgNjIuMzk5NyAxNCA1OS43ODk1IDE0IDU3LjA2NzhWMjQuMjYyNkMxNCAyMS41NDA5IDE1LjA4MTIgMTguOTMwNyAxNy4wMDU3IDE3LjAwNjJaTTQwLjE0NzkgMzMuNTQyM0g2MC45MTU3QzY0LjQ1OCAzMy41NDIzIDY3LjMyOTUgMzYuNDEzOCA2Ny4zMjk1IDM5Ljk1NjFWNDEuNjgxNkM2Ny4zMjk1IDQ1LjIyMzggNjQuNDU4IDQ4LjA5NTQgNjAuOTE1NyA0OC4wOTU0SDQwLjE0NzlDMzYuNjA1NyA0OC4wOTU0IDMzLjczNDEgNDUuMjIzOCAzMy43MzQxIDQxLjY4MTZWMzkuOTU2MUMzMy43MzQxIDM2LjQxMzggMzYuNjA1NyAzMy41NDIzIDQwLjE0NzkgMzMuNTQyM1oiIGZpbGw9InVybCgjcGFpbnQwX2xpbmVhcl8yODdfMjM1OSkiLz4KPGRlZnM+CjxsaW5lYXJHcmFkaWVudCBpZD0icGFpbnQwX2xpbmVhcl8yODdfMjM1OSIgeDE9IjE5LjM2MDIiIHkxPSIxNCIgeDI9IjU2Ljc2OTYiIHkyPSI2OS44MDA1IiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+CjxzdG9wIHN0b3AtY29sb3I9IiNDNTQ5RkYiLz4KPHN0b3Agb2Zmc2V0PSIxIiBzdG9wLWNvbG9yPSIjNjU0QkZGIi8+CjwvbGluZWFyR3JhZGllbnQ+CjwvZGVmcz4KPC9zdmc+Cg=="
+  }
+};
 
 // src/api/polkadot/wallets.ts
 var import_lodash2 = require("lodash");
-var import_pjs_signer = require("polkadot-api/pjs-signer");
-var import_rxjs4 = require("rxjs");
-var getInjectedWalletsIds = () => (0, import_pjs_signer.getInjectedExtensions)().map((name) => getWalletId("polkadot", name));
-var polkadotInjectedWallets$ = new import_rxjs4.Observable(
-  (subscriber) => {
-    const enabledExtensions$ = new import_rxjs4.BehaviorSubject(/* @__PURE__ */ new Map());
-    const connect = async (walletId) => {
-      if (enabledExtensions$.value.has(walletId))
-        throw new Error(`Extension ${walletId} already connected`);
-      const { identifier } = parseWalletId(walletId);
-      const extension = await (0, import_pjs_signer.connectInjectedExtension)(identifier);
-      const newMap = new Map(enabledExtensions$.value);
-      newMap.set(walletId, extension);
-      enabledExtensions$.next(newMap);
-      store.addEnabledWalletId(walletId);
-    };
-    const disconnect = (walletId) => {
-      if (!enabledExtensions$.value.has(walletId))
-        throw new Error(`Extension ${walletId} is not connected`);
-      const newMap = new Map(enabledExtensions$.value);
-      newMap.delete(walletId);
-      enabledExtensions$.next(newMap);
-      store.removeEnabledWalletId(walletId);
-    };
-    const walletIds$ = (0, import_rxjs4.of)(0, 200, 500, 1e3).pipe(
-      (0, import_rxjs4.mergeMap)((time) => (0, import_rxjs4.timer)(time)),
-      (0, import_rxjs4.map)(() => getInjectedWalletsIds()),
-      (0, import_rxjs4.distinctUntilChanged)(import_lodash2.isEqual)
-    );
-    const subscription = (0, import_rxjs4.combineLatest)([walletIds$, enabledExtensions$]).pipe(
-      (0, import_rxjs4.map)(([walletIds, enabledExtensions]) => {
-        return walletIds.map((id) => {
-          const { identifier } = parseWalletId(id);
-          const extension = enabledExtensions.get(id);
-          return extension ? {
-            id,
-            platform: "polkadot",
-            name: identifier,
-            extensionId: identifier,
-            isEnabled: true,
-            extension,
-            disconnect: () => disconnect(id)
-          } : {
-            id,
-            platform: "polkadot",
-            name: identifier,
-            extensionId: identifier,
-            isEnabled: false,
-            connect: () => connect(id)
-          };
-        });
-      })
+var import_pjs_signer2 = require("polkadot-api/pjs-signer");
+var import_rxjs8 = require("rxjs");
+var getInjectedWalletsIds = () => (0, import_pjs_signer2.getInjectedExtensions)().map((name) => getWalletId("polkadot", name));
+var polkadotInjectedWallets$ = new import_rxjs8.Observable((subscriber) => {
+  const enabledExtensions$ = new import_rxjs8.BehaviorSubject(/* @__PURE__ */ new Map());
+  const connect = async (walletId) => {
+    if (enabledExtensions$.value.has(walletId))
+      throw new Error(`Extension ${walletId} already connected`);
+    const { identifier } = parseWalletId(walletId);
+    const extension = await (0, import_pjs_signer2.connectInjectedExtension)(identifier);
+    const newMap = new Map(enabledExtensions$.value);
+    newMap.set(walletId, extension);
+    enabledExtensions$.next(newMap);
+    store.addEnabledWalletId(walletId);
+  };
+  const disconnect = (walletId) => {
+    if (!enabledExtensions$.value.has(walletId))
+      throw new Error(`Extension ${walletId} is not connected`);
+    const newMap = new Map(enabledExtensions$.value);
+    newMap.delete(walletId);
+    enabledExtensions$.next(newMap);
+    store.removeEnabledWalletId(walletId);
+  };
+  const walletIds$ = (0, import_rxjs8.of)(0, 200, 500, 1e3).pipe(
+    (0, import_rxjs8.mergeMap)((time) => (0, import_rxjs8.timer)(time)),
+    (0, import_rxjs8.map)(() => getInjectedWalletsIds()),
+    (0, import_rxjs8.distinctUntilChanged)(import_lodash2.isEqual)
+  );
+  const subscription = (0, import_rxjs8.combineLatest)([walletIds$, enabledExtensions$]).pipe(
+    (0, import_rxjs8.map)(([walletIds, enabledExtensions]) => {
+      return walletIds.map((id) => {
+        const { identifier } = parseWalletId(id);
+        const extension = enabledExtensions.get(id);
+        const extInfo = POLKADOT_EXTENSIONS[identifier];
+        return {
+          id,
+          type: "injected",
+          platform: "polkadot",
+          name: extInfo?.name ?? identifier,
+          icon: extInfo?.icon ?? "",
+          extensionId: identifier,
+          extension,
+          isConnected: !!extension,
+          connect: () => connect(id),
+          disconnect: () => disconnect(id)
+        };
+      });
+    })
+  ).subscribe(subscriber);
+  return () => {
+    subscription.unsubscribe();
+  };
+}).pipe(
+  // logObservable("polkadotInjectedWallets$"),
+  (0, import_rxjs8.shareReplay)({ refCount: true, bufferSize: 1 })
+);
+var getPolkadotWallets$ = (config) => {
+  return new import_rxjs8.Observable((subscriber) => {
+    const subscription = (0, import_rxjs8.combineLatest)([
+      polkadotInjectedWallets$,
+      getAppKitWallets$(config)?.pipe((0, import_rxjs8.map)((w) => w.polkadot))
+    ]).pipe(
+      (0, import_rxjs8.map)(
+        ([injectedWallets, appKitWallet]) => appKitWallet ? [...injectedWallets, appKitWallet] : injectedWallets
+      )
     ).subscribe(subscriber);
     return () => {
       subscription.unsubscribe();
     };
-  }
-).pipe((0, import_rxjs4.shareReplay)({ refCount: true, bufferSize: 1 }));
-var polkadotWallets$ = polkadotInjectedWallets$;
-polkadotWallets$.subscribe(() => {
-  console.count("[kheopskit] polkadotWallets$ emit");
-});
-
-// src/api/polkadot/accounts.ts
-var getWalletAccounts$2 = (wallet) => {
-  if (!wallet.isEnabled) return (0, import_rxjs5.of)([]);
-  return new import_rxjs5.Observable((subscriber) => {
-    const getAccount = (account) => ({
-      id: getAccountId(wallet.id, account.address),
-      ...account,
-      platform: "polkadot",
-      walletName: wallet.name,
-      walletId: wallet.id
-    });
-    const unsubscribe = wallet.extension.subscribe((accounts) => {
-      subscriber.next(accounts.map(getAccount));
-    });
-    subscriber.next(wallet.extension.getAccounts().map(getAccount));
-    return () => {
-      return unsubscribe();
-    };
-  });
-};
-var polkadotAccounts$ = new import_rxjs5.Observable(
-  (subscriber) => {
-    const sub = polkadotWallets$.pipe(
-      (0, import_rxjs5.map)((wallets) => wallets.filter((w) => w.isEnabled)),
-      (0, import_rxjs5.switchMap)(
-        (wallets) => wallets.length ? (0, import_rxjs5.combineLatest)(wallets.map(getWalletAccounts$2)) : (0, import_rxjs5.of)([])
-      ),
-      (0, import_rxjs5.map)((accounts) => accounts.flat())
-    ).subscribe(subscriber);
-    return () => {
-      sub.unsubscribe();
-    };
-  }
-).pipe((0, import_rxjs5.shareReplay)({ refCount: true, bufferSize: 1 }));
-polkadotAccounts$.subscribe(() => {
-  console.count("[kheopskit] polkadotAccounts$ emit");
-});
-
-// src/api/accounts.ts
-var getAccounts$ = (config) => {
-  return new import_rxjs6.Observable((subscriber) => {
-    const observables = config.platforms.map(
-      (platform) => {
-        switch (platform) {
-          case "polkadot":
-            return polkadotAccounts$;
-          case "ethereum":
-            return ethereumAccounts$;
-        }
-      }
-    );
-    const accounts$ = observables.length ? (0, import_rxjs6.combineLatest)(observables).pipe((0, import_rxjs6.map)((accounts) => accounts.flat())) : (0, import_rxjs6.of)([]);
-    const sub = accounts$.subscribe(subscriber);
-    return () => {
-      sub.unsubscribe();
-    };
-  }).pipe((0, import_rxjs6.shareReplay)({ refCount: true, bufferSize: 1 }));
-};
-
-// src/api/config.ts
-var DEFAULT_CONFIG = {
-  autoReconnect: true,
-  platforms: ["polkadot"]
-};
-var resolveConfig = (config) => {
-  return Object.assign({}, DEFAULT_CONFIG, config);
+  }).pipe(
+    // logObservable("getPolkadotWallets$"),
+    (0, import_rxjs8.shareReplay)({ refCount: true, bufferSize: 1 })
+  );
 };
 
 // src/api/wallets.ts
-var import_rxjs7 = require("rxjs");
 var autoReconnectWalletIds$ = store.observable.pipe(
-  (0, import_rxjs7.map)((s) => s.autoReconnect ?? []),
-  (0, import_rxjs7.take)(1),
-  (0, import_rxjs7.shareReplay)(1)
+  (0, import_rxjs9.map)((s) => s.autoReconnect ?? []),
+  (0, import_rxjs9.take)(1),
+  (0, import_rxjs9.shareReplay)(1)
 );
 var getWallets$ = (config) => {
-  return new import_rxjs7.Observable((subscriber) => {
+  return new import_rxjs9.Observable((subscriber) => {
     const observables = config.platforms.map(
       (platform) => {
         switch (platform) {
           case "polkadot":
-            return polkadotWallets$;
+            return getPolkadotWallets$(config);
           case "ethereum":
-            return ethereumWallets$;
+            return getEthereumWallets$(config);
         }
       }
     );
-    const wallets$ = observables.length ? (0, import_rxjs7.combineLatest)(observables).pipe((0, import_rxjs7.map)((wallets) => wallets.flat())) : (0, import_rxjs7.of)([]);
-    const subAutoReconnect = (0, import_rxjs7.combineLatest)([wallets$, autoReconnectWalletIds$]).pipe(
-      (0, import_rxjs7.filter)(([, walletIds]) => config.autoReconnect && !!walletIds?.length),
-      (0, import_rxjs7.mergeMap)(
+    const wallets$ = observables.length ? (0, import_rxjs9.combineLatest)(observables).pipe(
+      (0, import_rxjs9.map)((wallets) => wallets.flat().sort(sortWallets))
+    ) : (0, import_rxjs9.of)([]);
+    const subAutoReconnect = (0, import_rxjs9.combineLatest)([wallets$, autoReconnectWalletIds$]).pipe(
+      (0, import_rxjs9.filter)(([, walletIds]) => config.autoReconnect && !!walletIds?.length),
+      (0, import_rxjs9.mergeMap)(
         ([wallets, walletIds]) => wallets.filter((wallet) => walletIds?.includes(wallet.id))
       ),
-      (0, import_rxjs7.distinct)((w) => w.id)
+      (0, import_rxjs9.distinct)((w) => w.id)
     ).subscribe(async (wallet) => {
-      if (wallet.isEnabled) {
+      if (wallet.isConnected) {
         console.warn("Wallet %s already connected", wallet.id);
         return;
       }
@@ -436,23 +775,31 @@ var getWallets$ = (config) => {
       subAutoReconnect.unsubscribe();
       subWallets.unsubscribe();
     };
-  }).pipe((0, import_rxjs7.shareReplay)({ refCount: true, bufferSize: 1 }));
+  }).pipe((0, import_rxjs9.shareReplay)({ refCount: true, bufferSize: 1 }));
 };
 
 // src/api/kheopskit.ts
 var getKheopskit$ = (config) => {
-  const c = resolveConfig(config);
-  return new import_rxjs8.Observable(
-    (subscriber) => {
-      const subscription = (0, import_rxjs8.combineLatest)([getWallets$(c), getAccounts$(c)]).pipe((0, import_rxjs8.map)(([wallets, accounts]) => ({ wallets, accounts }))).subscribe(subscriber);
-      return () => {
-        subscription.unsubscribe();
-      };
-    }
-  ).pipe((0, import_rxjs8.shareReplay)({ bufferSize: 1, refCount: true }));
+  const kc = resolveConfig(config);
+  console.debug("[kheopskit] config", kc);
+  return new import_rxjs10.Observable((subscriber) => {
+    const wallets$ = getWallets$(kc);
+    const subscription = (0, import_rxjs10.combineLatest)({
+      wallets: wallets$,
+      accounts: getAccounts$(kc, wallets$)
+    }).pipe((0, import_rxjs10.map)(({ wallets, accounts }) => ({ config: kc, wallets, accounts }))).subscribe(subscriber);
+    return () => {
+      subscription.unsubscribe();
+    };
+  }).pipe(
+    (0, import_rxjs10.throttleTime)(50, void 0, { leading: true, trailing: true }),
+    logObservable("kheopskit$", { enabled: kc.debug, printValue: true }),
+    (0, import_rxjs10.shareReplay)({ bufferSize: 1, refCount: true })
+  );
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getKheopskit$
+  getKheopskit$,
+  resolveConfig
 });
 //# sourceMappingURL=index.js.map