@kheopskit/core 6.0.0-rc.1 → 6.0.0-rc.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @kheopskit/core
 
+## 6.0.0-rc.2
+
+### Minor Changes
+
+- [#155](https://github.com/kheopskit/kheopskit/pull/155) [`d3a05e1`](https://github.com/kheopskit/kheopskit/commit/d3a05e14f6eebebf182f3d2ddfee4057321fbab0) Thanks [@0xKheops](https://github.com/0xKheops)! - Added: `account.name` is readable on every account type. Solana accounts take it from the Wallet Standard `label`, and Ethereum accounts leave it `undefined`.
+
+### Patch Changes
+
+- [#157](https://github.com/kheopskit/kheopskit/pull/157) [`2eb5c08`](https://github.com/kheopskit/kheopskit/commit/2eb5c086c201763e84065e05785012d0a845d05d) Thanks [@0xKheops](https://github.com/0xKheops)! - Fixed: Polkadot discovery now reads `window.injectedWeb3` at `load` and 100, 300, 600 and 1100 ms after it, as it already did after subscribe. `isDiscovering` is `true` until the last read, 1100 ms after `load` or after subscribe, whichever is later, so no read is pending once it turns `false`, and that emission lists every extension injected before that read. With `config.walletConnect`, it also waits for the connector to load. A subscription that starts after `load` no longer reads `false` from its first emission. On the server, the registry is read once and no timer is set.
+  
+  Hydration waits for discovery only while a cached wallet has not been discovered. When every cached wallet is discovered and settled, `isHydrating` ends at the grace period without waiting for `load`.
+
 ## 6.0.0-rc.1
 
 ### Patch Changes

package/MIGRATING_TO_V6.md

@@ -48,8 +48,8 @@ This guide grows with each v6 change. Each section covers one area.
 | Test kit | none; apps fake `injectedWeb3` themselves | `@kheopskit/core/testing` | [6](#6-test-kit) |
 | Placeholder SDK handles | typed as present, `undefined` at runtime while hydrating | absent from the placeholder type; narrow on `isPlaceholder` | [7](#7-placeholders-carry-isplaceholder) |
 | `connect()` on a placeholder | throws `PendingWalletError` | waits for the live wallet, or rejects `WALLET_PENDING` | [7](#7-placeholders-carry-isplaceholder) |
-| Hydration end | `isHydrating` stays `true` until every cached connected wallet reconnected, capped at six times the grace period | `isHydrating` ends once the grace period has elapsed, discovery has ended and every wallet that hydrated as `connecting` has settled, or at `hydrationTimeout` (default 3000 ms) | [8](#8-discovery-hydration-end-and-persistence) |
-| Discovery at page load | the Polkadot registry was read at 0, 100, 300, 600 and 1100 ms after subscribe only | read again at `load` and 100 ms later; `state.isDiscovering` says whether that read has landed | [8](#8-discovery-hydration-end-and-persistence) |
+| Hydration end | `isHydrating` stays `true` until every cached connected wallet reconnected, capped at six times the grace period | `isHydrating` ends once the grace period has elapsed and every cached wallet has settled, or at `hydrationTimeout` (default 3000 ms); a cached wallet not yet discovered settles when discovery ends | [8](#8-discovery-hydration-end-and-persistence) |
+| Discovery at page load | the Polkadot registry was read at 0, 100, 300, 600 and 1100 ms after subscribe only | read at subscribe and at `load`, then 100, 300, 600 and 1100 ms after each; `state.isDiscovering` is `true` until the last read, 1100 ms after `load` or after subscribe, whichever is later, and while a WalletConnect connector loads | [8](#8-discovery-hydration-end-and-persistence) |
 | Cache during a slow reconnect | a reconnect slower than the persistence debounce wrote `isConnected: false` and no accounts | a wallet still `connecting` keeps its previous cached entry and accounts | [8](#8-discovery-hydration-end-and-persistence) |
 | React instance and hooks | `createKheopskit` returns a provider and `useWallets`/`useAccounts`; reaching one wallet means reading the whole state; unmounting the provider leaves the pipeline running | `createKheopskit` also returns `kheopskit$` and `store`; `useWallet`, `useAccount` and `useConnect` read one item; unmounting the provider stops the pipeline | [9](#9-kheopskitreact-one-shared-instance-and-wallet-hooks) |
 
@@ -59,10 +59,13 @@ This guide grows with each v6 change. Each section covers one area.
 
 Each section ends with the app code it makes redundant. In short:
 
-- A page-load gate that waits a fixed delay before concluding that a wallet is
-  missing. Wait for `isDiscovering` to turn `false` (section 8).
+- A gate that delays subscribing until `load`, and a fixed grace after it
+  before concluding that a wallet is missing. Both are redundant, because the
+  read window now runs until 1100 ms after `load` or after subscribe,
+  whichever is later. Wait for `isDiscovering` to turn `false` (section 8).
 - Connect dedup wrappers, such as a `requestOnce` or `connectOnce` map keyed by
-  wallet id (section 1).
+  wallet id (section 1). An app that calls `connect()` in reaction to state
+  must then skip a wallet whose `error.code` is `USER_REJECTED`.
 - `auditTime(20)` or `debounceTime(20)` placed after `kheopskit$` to skip the
   stale intermediate state (section 1).
 - Refusal detection by `error.name === "Error"` or by message text. Branch on
@@ -152,7 +155,9 @@ try {
   no caller without one joined, on `disconnect()`, or when the last `kheopskit$`
   subscriber unsubscribes; those reject every remaining caller `ABORTED`.
 - **Resolution follows the state.** `connect()` resolves once `kheopskit$` has
-  emitted a state in which the wallet has `isConnected: true`. `disconnect()`
+  emitted a state in which the wallet has `isConnected: true`. An injected
+  wallet's refused or failed `connect()` rejects after `kheopskit$` has
+  emitted the wallet `disconnected` with that `error`. `disconnect()`
   first waits for the platform's disconnect, when the platform has one, then
   resolves once a state shows `isConnected: false`, or once a later
   `connect()`, the wallet leaving the list or the end of the subscription
@@ -238,7 +243,12 @@ try {
 ### What to delete in your app
 
 - Dedup wrappers around `connect()`, such as a `requestOnce` or `connectOnce`
-  map keyed by wallet id.
+  map keyed by wallet id. Kheopskit shares only concurrent calls. A refused
+  attempt has ended when its `USER_REJECTED` state is emitted, so a
+  `connect()` made in reaction to that state asks the extension again. An app
+  that connects from state skips a wallet whose `error.code` is
+  `USER_REJECTED`. The map used to hide this, because its entry outlived the
+  emission.
 - `auditTime(20)` or `debounceTime(20)` placed after `kheopskit$` to skip the
   stale intermediate state.
 - Treating `WALLET_ALREADY_CONNECTED` as success and swallowing
@@ -676,19 +686,19 @@ has no live stream behind it, `connect()` rejects `WALLET_PENDING`.
 
 ### New state field: `isDiscovering`
 
-`KheopskitState.isDiscovering` is new and required. It is `true` until the page
-has fired `load` and kheopskit has read `window.injectedWeb3` again, so the
-emission that turns it `false` already lists every Polkadot extension injected
-by then. It is `false` from the first emission when you subscribe after
-`load`, and always `true` on the server.
+`KheopskitState.isDiscovering` is new and required. It is `true` until the
+last read of `window.injectedWeb3`, 1100 ms after `load` or after subscribe,
+whichever is later, so the emission that turns it `false` already lists every
+Polkadot extension injected before that read. With `config.walletConnect`, it
+also waits for the connector to load. It is always `true` on the server.
 
-Kheopskit now reads the Polkadot registry at `load` and 100 ms after `load`, on
-top of the reads at subscribe and 100, 300, 600 and 1100 ms after it. An
-extension that injects after the 1100 ms read but before `load` is listed
-without a reload. Nothing reads the registry after the last of these reads. A
-wallet that injects after `load` is listed only when a read still runs after
-it, the one 100 ms after `load` or a subscribe read still pending, so its
-discovery is not guaranteed.
+Kheopskit reads the Polkadot registry at subscribe and 100, 300, 600 and
+1100 ms after it, as in 5.x. At `load` it starts the same schedule again, and
+drops the subscribe reads still pending. An extension that injects after the
+1100 ms read but before `load`, or up to 1100 ms after `load`, is listed
+without a reload. A wallet that injects after the last read is not listed
+until the next subscription. On the server kheopskit reads once and sets no
+timer.
 
 A state literal or test mock typed as `KheopskitState` must add the field:
 
@@ -702,8 +712,10 @@ A state literal or test mock typed as `KheopskitState` must add the field:
   };
 ```
 
-Hydration now also waits for discovery. With a cache, `isHydrating` stays
-`true` until `load` or `hydrationTimeout`, whichever comes first. A
+Hydration waits for discovery only while a cached wallet has not been
+discovered. When every cached wallet injects early, `isHydrating` ends at the
+grace period without waiting for `load`. A cached wallet that has not appeared
+holds it until discovery ends or `hydrationTimeout`, whichever comes first. A
 `hydrationGracePeriod` of `0` still turns hydration off in `kheopskit$`. Under
 `KheopskitProvider`, the first render still shows the cached placeholders with
 `isHydrating: true` until the first emission.
@@ -724,14 +736,15 @@ grace period.
 
 ### New end rule
 
-`isHydrating` turns `false` once `hydrationGracePeriod` has elapsed, discovery
-has ended (`isDiscovering` is `false`), and every wallet that hydrated as
-`connecting` has settled. A wallet has settled when it is absent from the
-discovered wallets, connected once its account list has been read (an empty
-list counts) or connected with no cached accounts, disconnected with `error`
-set, or disconnected and not remembered when hydration began. At
-`hydrationTimeout` hydration ends whatever is pending, and a wallet whose
-reconnect is still pending stays `connecting`.
+`isHydrating` turns `false` once `hydrationGracePeriod` has elapsed and every
+cached wallet has settled. A cached wallet missing from the discovered wallets
+settles when discovery ends (`isDiscovering` is `false`). A discovered one
+settles at once unless it hydrated as `connecting`. Then it settles when
+connected once its account list has been read (an empty list counts) or
+connected with no cached accounts, disconnected with `error` set, or
+disconnected and not remembered when hydration began. At `hydrationTimeout`
+hydration ends whatever is pending, and a wallet whose reconnect is still
+pending stays `connecting`.
 
 "Its account list has been read" relies on a signal the built-in plugins send.
 A custom `KheopskitPlatform` plugin, or a wrapper that pipes a built-in
@@ -739,9 +752,8 @@ plugin's `getAccounts$`, does not send it. Such a wallet settles on its first
 listed account, as in 5.x, and a reconnected wallet with cached accounts that
 now lists none holds hydration until `hydrationTimeout`.
 
-- Discovery ends only after the page fires `load`, so a page with a cache
-  hydrates until `load` or `hydrationTimeout`, whichever comes first, even
-  when no wallet reconnects.
+- When every cached wallet is discovered and settled, hydration ends at the
+  grace period, without waiting for `load`.
 - A wallet that reconnects without sharing any account with the site settles
   as soon as it answers; its cached accounts leave the list when hydration
   ends.
@@ -757,9 +769,11 @@ now lists none holds hydration until `hydrationTimeout`.
   user answers or `hydrationTimeout` elapses. After a refusal the wallet is
   forgotten, so the next load opens no prompt.
 
-In practice, with the extension removed or with `autoReconnect: false`,
-hydration no longer runs to 3 s. It ends once the grace period has elapsed and
-the page has loaded, or at `hydrationTimeout` if that comes first.
+In practice, hydration no longer runs to 3 s. With `autoReconnect: false` and
+the extension installed, it ends at the grace period. With the extension
+removed, it ends when discovery ends, 1100 ms after `load` or after subscribe,
+whichever is later (or once a WalletConnect connector has loaded, if later),
+or at `hydrationTimeout` if that comes first.
 
 ### Persistence guarantee
 

package/README.md

@@ -110,6 +110,7 @@ implements them.
 ### Discovery
 
 Source: [`api/polkadot/wallets.ts`](https://github.com/kheopskit/kheopskit/blob/main/packages/core/src/api/polkadot/wallets.ts),
+[`utils/registryReads.ts`](https://github.com/kheopskit/kheopskit/blob/main/packages/core/src/utils/registryReads.ts),
 [`utils/pageLoad.ts`](https://github.com/kheopskit/kheopskit/blob/main/packages/core/src/utils/pageLoad.ts),
 [`api/kheopskit.ts`](https://github.com/kheopskit/kheopskit/blob/main/packages/core/src/api/kheopskit.ts).
 
@@ -117,16 +118,15 @@ Polkadot extensions register themselves on `window.injectedWeb3` and send no
 event, so kheopskit reads that registry on a fixed schedule:
 
 - At subscribe, then 100, 300, 600 and 1100 ms after subscribe.
-- When `window` fires `load`, and again 100 ms after `load`. A subscription
-  that starts after `load` skips these two reads.
+- When `window` fires `load`, then 100, 300, 600 and 1100 ms after `load`. The
+  subscribe reads still pending at `load` are dropped. A subscription that
+  starts after `load` has only the subscribe reads.
 
-Nothing reads the registry after the last of these reads. A wallet that
-injects after `load` is listed only when a read still runs after it, the one
-100 ms after `load` or a subscribe read still pending, so its discovery is not
-guaranteed. Wallets inject `injectedWeb3` while the page loads, so a wallet
-that injects after the last read is not listed until the next subscription,
-usually the next page load. Kheopskit has no
-`refreshWallets()` and does not read again on focus or on connect.
+The read window ends 1100 ms after `load` or after subscribe, whichever is
+later. Nothing reads the registry after that, so a wallet that injects later
+is not listed until the next subscription, usually the next page load.
+Kheopskit has no `refreshWallets()` and does not read again on focus or on
+connect. On the server it reads once and sets no timer.
 
 Ethereum (EIP-6963, through `mipd`) and Solana (Wallet Standard) wallets
 announce themselves with events, so those lists update whenever a wallet
@@ -134,19 +134,19 @@ announces or unregisters.
 
 `state.isDiscovering` tells you whether the list may still grow:
 
-- `true` when the subscription started before `document.readyState` was
-  `"complete"`.
-- It turns `false` in the first emission after `load` in which the registry was
-  read again. That emission already lists every extension injected by `load`.
-  Wait for it before you conclude that a wallet is missing.
-- `false` from the first emission when you subscribe after `load`.
+- `true` until the read window ends, 1100 ms after `load` or after subscribe,
+  whichever is later, and while a WalletConnect connector loads.
+- It turns `false` in the emission of the last read, or once the
+  WalletConnect connector has loaded if that comes later. That emission lists
+  every Polkadot extension injected before the last read. Wait for it before
+  you conclude that a wallet is missing.
 - Always `true` on the server.
 
-It says nothing about wallets that inject after `load`. In the end-to-end test
-`e2e/tests/discovery-at-load.spec.ts`, an extension injected 1500 ms after the
-first read and before `load` showed in the wallet list 16.2 ms after `load` on
-vite-react, and 15.8 to 18.3 ms across the three example apps (the test's
-limit is 300 ms).
+In the end-to-end test `e2e/tests/discovery-at-load.spec.ts`, an extension
+injected 1500 ms after the first read and before `load` showed in the wallet
+list 23.9 ms after `load` on vite-react, and 13.1 to 23.9 ms across the three
+example apps (the test's limit is 300 ms). The "Looking for wallets…" status
+went away 1114 to 1124 ms after `load`.
 
 ### Hydration
 
@@ -190,13 +190,14 @@ its `connect()` joins that reconnect. A Polkadot wallet's `extension` stays
 `isHydrating` turns `false` once all three hold:
 
 1. `hydrationGracePeriod` has elapsed (default 500 ms).
-2. Discovery has ended (`isDiscovering` is `false`), so a page with a cache
-   hydrates until `load` or `hydrationTimeout`, whichever comes first.
-3. Every wallet that hydrated as `connecting` has settled. A wallet has
-   settled when it is absent from the discovered wallets, connected once its
-   account list has been read (an empty list counts) or connected with no
-   cached accounts, disconnected with `error` set, or disconnected and not
-   remembered when hydration began.
+2. Every cached wallet has been discovered, or discovery has ended
+   (`isDiscovering` is `false`). When every cached wallet injects early,
+   hydration does not wait for `load`. A cached wallet that has not appeared
+   holds it until discovery ends.
+3. Every discovered wallet that hydrated as `connecting` has settled. It has
+   settled when connected once its account list has been read (an empty list
+   counts) or connected with no cached accounts, disconnected with `error`
+   set, or disconnected and not remembered when hydration began.
 
 At `hydrationTimeout` (default 3000 ms) hydration ends whatever is pending, and
 a wallet whose reconnect is still pending stays `connecting`. The timeout wins
@@ -401,6 +402,13 @@ the order the extension lists them in. `state.wallets` follows the same
 platform order, then the WalletConnect connector, with Talisman first, then by
 name.
 
+Every account has an optional `name`. On Polkadot it is the account name the
+extension lists. On Solana it is the Wallet Standard `label`, when the wallet
+provides one. On Ethereum it is always `undefined`, because EIP-1193 and
+EIP-6963 expose no account name. A wallet can report an empty name, so
+`account.name || account.address` gives a display label on every platform. A
+cached placeholder keeps the `name` of the account it stands for.
+
 ### Persistence
 
 Source: [`api/store.ts`](https://github.com/kheopskit/kheopskit/blob/main/packages/core/src/api/store.ts),
@@ -666,15 +674,19 @@ fail.
 
 ### Design choices
 
-- Kheopskit does not look for wallets that inject after `load`, and has no
-  `refreshWallets()`. Wallets inject at page load, and a rescan would add
-  timers and states for a case no supported wallet produces.
+- Kheopskit stops reading the Polkadot registry when the read window ends, and
+  has no `refreshWallets()`. Wallets inject at page load, and a permanent
+  watcher would add timers and states for a case no supported wallet produces.
 - No `walletsReady` promise. It would be a second surface for the one fact
   `isDiscovering` carries.
-- No longer fixed poll. Any duration is still a guess about how long a page
-  takes to boot, and wallets inject before `load`.
-- Discovery does not end at the last scheduled read (1100 ms). On a warm load
-  that is slower than `load`, for no gain.
+- The read window restarts at `load` instead of running a longer poll from
+  subscribe. Its coverage after `load` then no longer depends on when the app
+  subscribes.
+- Discovery ends with the last read, 1100 ms after `load` (or once a
+  WalletConnect connector has loaded, if later), not at `load`, so a wallet
+  that injects shortly after `load` is listed before `isDiscovering` turns
+  `false`.
+  Hydration waits for that end only while a cached wallet is missing.
 - `remembered` is read once at subscribe. A live read would make a connect in
   one tab connect every open tab, with no matching disconnect.
 - No `persist: false` option. The `autoReconnect` predicate covers "do not

package/dist/ethereum.d.mts

@@ -1,4 +1,4 @@
-import { E as isWalletConnectWallet, N as WalletAccountId, T as isInjectedWallet, b as WalletConnectWallet, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, p as Placeholder, r as BaseWallet } from "./types-lkMXVJNG.mjs";
+import { E as isWalletConnectWallet, N as WalletAccountId, T as isInjectedWallet, b as WalletConnectWallet, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, p as Placeholder, r as BaseWallet } from "./types-DCaL9bIc.mjs";
 import { Account, CustomTransport, EIP1193Provider, WalletClient } from "viem";
 //#region src/utils/isEthereumAddress.d.ts
 /**
@@ -47,6 +47,7 @@ type LiveEthereumAccount = {
   address: `0x${string}`;
   /** Current chain ID the wallet is connected to. `undefined` while loading or after provider disconnect. */
   chainId: number | undefined;
+  name?: string;
   walletName: string;
   walletId: WalletId;
 };

package/dist/ethereum.d.ts

@@ -1,4 +1,4 @@
-import { E as isWalletConnectWallet, N as WalletAccountId, T as isInjectedWallet, b as WalletConnectWallet, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, p as Placeholder, r as BaseWallet } from "./types-lkMXVJNG.js";
+import { E as isWalletConnectWallet, N as WalletAccountId, T as isInjectedWallet, b as WalletConnectWallet, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, p as Placeholder, r as BaseWallet } from "./types-DCaL9bIc.js";
 import { Account, CustomTransport, EIP1193Provider, WalletClient } from "viem";
 //#region src/utils/isEthereumAddress.d.ts
 /**
@@ -47,6 +47,7 @@ type LiveEthereumAccount = {
   address: `0x${string}`;
   /** Current chain ID the wallet is connected to. `undefined` while loading or after provider disconnect. */
   chainId: number | undefined;
+  name?: string;
   walletName: string;
   walletId: WalletId;
 };

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { t as SyncableStorage } from "./storage-D3AwNgqc.mjs";
-import { A as getWalletId, C as WalletStatus, D as KheopskitError, E as isWalletConnectWallet, F as parseWalletAccountId, M as parseWalletId, N as WalletAccountId, O as KheopskitErrorCode, P as getWalletAccountId, S as WalletPlatform, T as isInjectedWallet, _ as WalletConnectMetadata, a as CachedAccount, b as WalletConnectWallet, c as KheopskitConfig, d as KheopskitStore, f as KheopskitStoreData, g as PolkadotAccountType, h as PlatformContext, i as BaseWalletAccount, j as isValidWalletId, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, n as AppKitInstance, o as CachedWallet, p as Placeholder, r as BaseWallet, s as ConnectOptions, t as AccountOf, u as KheopskitState, v as WalletConnectPlugin, w as WalletType, x as WalletOf, y as WalletConnectProvider } from "./types-lkMXVJNG.mjs";
+import { A as getWalletId, C as WalletStatus, D as KheopskitError, E as isWalletConnectWallet, F as parseWalletAccountId, M as parseWalletId, N as WalletAccountId, O as KheopskitErrorCode, P as getWalletAccountId, S as WalletPlatform, T as isInjectedWallet, _ as WalletConnectMetadata, a as CachedAccount, b as WalletConnectWallet, c as KheopskitConfig, d as KheopskitStore, f as KheopskitStoreData, g as PolkadotAccountType, h as PlatformContext, i as BaseWalletAccount, j as isValidWalletId, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, n as AppKitInstance, o as CachedWallet, p as Placeholder, r as BaseWallet, s as ConnectOptions, t as AccountOf, u as KheopskitState, v as WalletConnectPlugin, w as WalletType, x as WalletOf, y as WalletConnectProvider } from "./types-DCaL9bIc.mjs";
 import { t as clearAllCachedObservables } from "./getCachedObservable-LUq9IfEx.mjs";
 import { Observable } from "rxjs";
 //#region src/utils/isValidAddress.d.ts

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { t as SyncableStorage } from "./storage-D3AwNgqc.js";
-import { A as getWalletId, C as WalletStatus, D as KheopskitError, E as isWalletConnectWallet, F as parseWalletAccountId, M as parseWalletId, N as WalletAccountId, O as KheopskitErrorCode, P as getWalletAccountId, S as WalletPlatform, T as isInjectedWallet, _ as WalletConnectMetadata, a as CachedAccount, b as WalletConnectWallet, c as KheopskitConfig, d as KheopskitStore, f as KheopskitStoreData, g as PolkadotAccountType, h as PlatformContext, i as BaseWalletAccount, j as isValidWalletId, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, n as AppKitInstance, o as CachedWallet, p as Placeholder, r as BaseWallet, s as ConnectOptions, t as AccountOf, u as KheopskitState, v as WalletConnectPlugin, w as WalletType, x as WalletOf, y as WalletConnectProvider } from "./types-lkMXVJNG.js";
+import { A as getWalletId, C as WalletStatus, D as KheopskitError, E as isWalletConnectWallet, F as parseWalletAccountId, M as parseWalletId, N as WalletAccountId, O as KheopskitErrorCode, P as getWalletAccountId, S as WalletPlatform, T as isInjectedWallet, _ as WalletConnectMetadata, a as CachedAccount, b as WalletConnectWallet, c as KheopskitConfig, d as KheopskitStore, f as KheopskitStoreData, g as PolkadotAccountType, h as PlatformContext, i as BaseWalletAccount, j as isValidWalletId, k as WalletId, l as KheopskitPlatform, m as PlaceholderWallet, n as AppKitInstance, o as CachedWallet, p as Placeholder, r as BaseWallet, s as ConnectOptions, t as AccountOf, u as KheopskitState, v as WalletConnectPlugin, w as WalletType, x as WalletOf, y as WalletConnectProvider } from "./types-DCaL9bIc.js";
 import { t as clearAllCachedObservables } from "./getCachedObservable-LUq9IfEx.js";
 import { Observable } from "rxjs";
 //#region src/utils/isValidAddress.d.ts

package/dist/index.js

@@ -2,7 +2,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_types = require("./types-BWHvNFlN.js");
 const require_platformAccounts = require("./platformAccounts-BjIeRcFN.js");
 const require_iconCache = require("./iconCache-FR4iy6go.js");
-const require_pageLoad = require("./pageLoad-D1wLeuFG.js");
+const require_registryReads = require("./registryReads-BpHsWLd7.js");
 let rxjs = require("rxjs");
 let lodash_es = require("lodash-es");
 //#region src/api/config.ts
@@ -557,7 +557,7 @@ const getDefaultStore = () => {
 };
 //#endregion
 //#region src/api/wallets.ts
-const getWallets$ = (config, store) => {
+const getWallets$ = (config, store, registryReads$) => {
 	const rememberedWalletIds$ = store.observable.pipe((0, rxjs.map)((s) => s.remembered ?? []), (0, rxjs.take)(1), (0, rxjs.shareReplay)({
 		bufferSize: 1,
 		refCount: true
@@ -565,7 +565,8 @@ const getWallets$ = (config, store) => {
 	return new rxjs.Observable((subscriber) => {
 		const ctx = {
 			config,
-			store
+			store,
+			registryReads$
 		};
 		const observables = config.platforms.map((plugin) => plugin.getWallets$(ctx));
 		const reconnectPolicy = createReconnectPolicy();
@@ -711,26 +712,32 @@ const getKheopskit$ = (config, options = {}) => {
 			wrapped.set(wallet, settled);
 			return settled;
 		};
-		const liveWallets$ = getWallets$(kc, store);
+		const registryReads$ = require_registryReads.createRegistryReads$().pipe((0, rxjs.shareReplay)({
+			bufferSize: 1,
+			refCount: true
+		}));
+		const liveWallets$ = getWallets$(kc, store, registryReads$);
 		const accountFrames$ = getAccounts$(kc, liveWallets$);
 		const liveAccounts$ = accountFrames$.pipe((0, rxjs.map)(({ accounts }) => accounts.map(asLive)));
-		const isDiscovering$ = require_pageLoad.pageLoaded$.pipe((0, rxjs.switchMap)((loaded) => loaded ? liveWallets$.pipe((0, rxjs.take)(1), (0, rxjs.map)(() => false)) : (0, rxjs.of)(true)), (0, rxjs.shareReplay)({
+		const isDiscovering$ = (0, rxjs.concat)((0, rxjs.of)(true), registryReads$.pipe((0, rxjs.ignoreElements)()), liveWallets$.pipe((0, rxjs.take)(1), (0, rxjs.map)(() => false))).pipe((0, rxjs.shareReplay)({
 			bufferSize: 1,
 			refCount: true
 		}));
-		const reconnecting = cachedWallets.filter((w) => w.status === "connecting");
 		const hydrationSettled$ = (0, rxjs.combineLatest)([
 			liveWallets$,
 			accountFrames$.pipe((0, rxjs.startWith)(noAnswerYet)),
 			isDiscovering$,
 			store.observable.pipe((0, rxjs.map)((s) => s.remembered ?? []), (0, rxjs.take)(1))
-		]).pipe((0, rxjs.map)(([wallets, { accounts, answered }, isDiscovering, remembered]) => !isDiscovering && reconnecting.every((cached) => reconnectSettled(cached, {
-			wallets,
-			accounts,
-			answered,
-			cachedAccounts,
-			remembered
-		}))), (0, rxjs.debounceTime)(0, rxjs.asapScheduler), (0, rxjs.distinctUntilChanged)());
+		]).pipe((0, rxjs.map)(([wallets, { accounts, answered }, isDiscovering, remembered]) => cachedWallets.every((cached) => {
+			const wallet = wallets.find((w) => w.id === cached.id);
+			if (!wallet) return !isDiscovering;
+			return cached.status !== "connecting" || reconnectSettled(cached, wallet, {
+				accounts,
+				answered,
+				cachedAccounts,
+				remembered
+			});
+		})), (0, rxjs.debounceTime)(0, rxjs.asapScheduler), (0, rxjs.distinctUntilChanged)());
 		const bufferedWallets$ = createHydrationBuffer(cachedWallets, liveWallets$.pipe((0, rxjs.map)((wallets) => wallets.map(asLive))), kc.hydrationGracePeriod, kc.hydrationTimeout, (w) => w.id, hydrationSettled$, (live, cached) => {
 			const status = sessionRestoring(live, cached) ? "connecting" : live.status;
 			return {
@@ -832,9 +839,7 @@ const noAnswerYet = {
 * waiting for its reconnect: getWallets$ emits the wallet list before its
 * connect() flips the status to connecting.
 */
-const reconnectSettled = (cached, live) => {
-	const wallet = live.wallets.find((w) => w.id === cached.id);
-	if (!wallet) return true;
+const reconnectSettled = (cached, wallet, live) => {
 	const status = sessionRestoring(wallet, cached) ? "connecting" : wallet.status;
 	if (status === "connecting") return false;
 	if (status === "disconnected") return wallet.error !== void 0 || !live.remembered.includes(cached.id);