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

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @kheopskit/core
 
+## 6.0.0-rc.3
+
+### Patch Changes
+
+- [#160](https://github.com/kheopskit/kheopskit/pull/160) [`4e55488`](https://github.com/kheopskit/kheopskit/commit/4e5548833b782669f00e33452f5ed4dff9ddcac0) Thanks [@0xKheops](https://github.com/0xKheops)! - Fixed: a remembered wallet forgotten before it injects is no longer reconnected when it does. A placeholder's `disconnect()` now forgets the wallet, or calls the live wallet's `disconnect()` once that one is discovered. `store.forgetWallet(walletId)` during the session cancels the automatic reconnect for good, even if the wallet is remembered again. `disconnect()` now forgets the wallet whatever its status, including while its automatic reconnect waits for the extension or after that reconnect failed, so the next load does not reconnect it. A wallet the user disconnects during hydration no longer holds `isHydrating` until `hydrationTimeout`.
+
 ## 6.0.0-rc.2
 
 ### Minor Changes

package/MIGRATING_TO_V6.md

@@ -274,7 +274,7 @@ try {
 
 The list holds the injected wallets the user connected. Kheopskit adds a
 wallet on every successful connect, whatever `config.autoReconnect` says, and
-removes it when a connected wallet is disconnected. The WalletConnect
+removes it on every `disconnect()`, whatever the wallet's status. The WalletConnect
 connector is never added; AppKit restores its own session. The `autoReconnect`
 config option keeps its name and meaning. It decides whether the remembered
 wallets reconnect on load.
@@ -492,8 +492,8 @@ stays silent. Any other failure sets `wallet.error`, keeps the wallet
 remembered and is retried on the next change to the wallet list, 3 attempts in
 total. A manual `connect()` or `disconnect()` on a remembered wallet ends its
 automatic reconnect for the session. A `disconnect()` while the automatic
-reconnect still waits for the extension aborts it without forgetting the
-wallet, so the next load reconnects it. Automatic reconnect also ends when the
+reconnect still waits for the extension aborts it and forgets the wallet, so
+the next load does not reconnect it. Automatic reconnect also ends when the
 wallet disappears mid-attempt; the wallet stays remembered for the next load.
 Nothing is written to `console.error` any more; `debug: true` logs the failure
 with `console.debug`.
@@ -763,8 +763,6 @@ now lists none holds hydration until `hydrationTimeout`.
   may never happen, so waiting
   for it would hold most failed reconnects until `hydrationTimeout`. A retry
   that does run shows on the live wallet's `status`, not as a placeholder.
-- A remembered wallet the user disconnects during or right after its reconnect
-  holds hydration, and shows its cached accounts, until `hydrationTimeout`.
 - A prompt the extension opens for a revoked site holds hydration until the
   user answers or `hydrationTimeout` elapses. After a refusal the wallet is
   forgotten, so the next load opens no prompt.

package/README.md

@@ -180,7 +180,9 @@ A placeholder wallet is never connected. Its `connect()` waits for kheopskit to
 discover the live wallet with the same id and connects that one. It rejects
 with `WALLET_PENDING` if hydration ends first, and with `ABORTED` if its
 `signal` fires or the last subscriber unsubscribes while it waits. Its
-`disconnect()` resolves at once. A cached wallet that kheopskit has already
+`disconnect()` forgets the wallet and resolves at once, so kheopskit does not
+reconnect it when it injects. Once the live wallet is discovered, it calls the
+live wallet's `disconnect()` instead. A cached wallet that kheopskit has already
 discovered is no longer a placeholder. It carries its live `connect()` and
 `disconnect()` and shows `status: "connecting"` while its reconnect runs, and
 its `connect()` joins that reconnect. A Polkadot wallet's `extension` stays
@@ -197,7 +199,8 @@ its `connect()` joins that reconnect. A Polkadot wallet's `extension` stays
 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.
+   set, or disconnected and not remembered. A wallet remembered after
+   hydration began does not count.
 
 At `hydrationTimeout` (default 3000 ms) hydration ends whatever is pending, and
 a wallet whose reconnect is still pending stays `connecting`. The timeout wins
@@ -209,8 +212,6 @@ over a longer grace period, so an app that raises `hydrationGracePeriod` sets
   ends.
 - A failed reconnect ends that wallet's wait, even when the reconnect policy
   still permits a retry.
-- A remembered wallet the user disconnects during or right after its reconnect
-  holds hydration, and shows its cached accounts, until `hydrationTimeout`.
 - A prompt the extension opens for a revoked site holds hydration until the
   user answers or `hydrationTimeout` elapses.
 - "Its account list has been read" relies on a signal that the built-in
@@ -241,8 +242,8 @@ Source: [`api/wallets.ts`](https://github.com/kheopskit/kheopskit/blob/main/pack
 [`api/injectedWallets.ts`](https://github.com/kheopskit/kheopskit/blob/main/packages/core/src/api/injectedWallets.ts).
 
 Kheopskit adds an injected wallet to the store's `remembered` list on every
-successful `connect()` and removes it when `disconnect()` starts on a
-connected wallet, whatever `autoReconnect` says, so an app can turn reconnect
+successful `connect()` and removes it when `disconnect()` starts, whatever the
+wallet's status and whatever `autoReconnect` says, so an app can turn reconnect
 on later. On the next load it reconnects the remembered injected wallets that
 `autoReconnect` accepts:
 
@@ -277,7 +278,13 @@ or removed, or any wallet's status changing), 3 attempts in total. If the list
 never changes again, no retry runs. A manual `connect()` or `disconnect()` on a
 remembered wallet ends its automatic reconnect for the session. A
 `disconnect()` while the automatic reconnect still waits for the extension
-aborts it without forgetting the wallet, so the next load reconnects it.
+aborts it and forgets the wallet, so the next load does not reconnect it.
+Forgetting a wallet with `store.forgetWallet(walletId)`, or calling
+`disconnect()` on its placeholder before it injects, ends its automatic
+reconnect for the rest of the session, even if the wallet is remembered again.
+The next load reconnects it only if it is remembered by then.
+`store.forgetWallet(walletId)` does not stop an attempt that already
+waits for the extension. The wallet's `disconnect()` does.
 Automatic reconnect also ends when the wallet disappears mid-attempt, and the
 wallet stays remembered for the next load.
 
@@ -432,9 +439,8 @@ goes to `localStorage` as JSON:
 ```
 
 - `remembered` lists the injected wallets the user connected. It is written as
-  soon as a connect succeeds and cleared as soon as `disconnect()` starts on a
-  connected wallet. A `disconnect()` that aborts a pending connect leaves it
-  unchanged.
+  soon as a connect succeeds and cleared as soon as `disconnect()` starts,
+  whatever the wallet's status.
 - `cachedWallets` and `cachedAccounts` are written by the hydration rule above:
   after hydration ends, 1 second after the state stops changing.
 - Wallet icons go to a separate `localStorage` key, `kheopskit-icons`, to keep
@@ -687,8 +693,9 @@ fail.
   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.
+- A wallet remembered after subscribe is not reconnected. Reconnecting it
+  would make a connect in one tab connect every open tab, with no matching
+  disconnect. A wallet forgotten after subscribe is not reconnected either.
 - No `persist: false` option. The `autoReconnect` predicate covers "do not
   reconnect", and `storageKey` keeps two dapps apart.
 

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-DCaL9bIc.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-C3I3w0jb.mjs";
 import { Account, CustomTransport, EIP1193Provider, WalletClient } from "viem";
 //#region src/utils/isEthereumAddress.d.ts
 /**

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-DCaL9bIc.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-C3I3w0jb.js";
 import { Account, CustomTransport, EIP1193Provider, WalletClient } from "viem";
 //#region src/utils/isEthereumAddress.d.ts
 /**

package/dist/ethereum.js

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const require_types = require("./types-BWHvNFlN.js");
 const require_platformAccounts = require("./platformAccounts-BjIeRcFN.js");
-const require_injectedWallets = require("./injectedWallets-Dy8YGKL-.js");
+const require_injectedWallets = require("./injectedWallets-BQBgS-f0.js");
 let rxjs = require("rxjs");
 let viem = require("viem");
 let mipd = require("mipd");

package/dist/ethereum.mjs

@@ -1,6 +1,6 @@
 import { _ as getCachedObservable$, a as isEip1193UserRejection, h as clearCachedObservable, n as isWalletConnectWallet, t as isInjectedWallet, u as getWalletId } from "./types-Yor672md.mjs";
 import { d as isEthereumAddress, i as getSessionCaip10s, o as getWalletAccountId, r as getCaip10Addresses, t as createPlatformAccounts$ } from "./platformAccounts-yyRUrnel.mjs";
-import { t as createInjectedWallets$ } from "./injectedWallets-48L-AL1I.mjs";
+import { t as createInjectedWallets$ } from "./injectedWallets-5GL1Jder.mjs";
 import { Observable, ReplaySubject, combineLatest, distinctUntilChanged, map, of, shareReplay } from "rxjs";
 import { createWalletClient, custom, getAddress } from "viem";
 import { createStore } from "mipd";

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-DCaL9bIc.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-C3I3w0jb.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-DCaL9bIc.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-C3I3w0jb.js";
 import { t as clearAllCachedObservables } from "./getCachedObservable-LUq9IfEx.js";
 import { Observable } from "rxjs";
 //#region src/utils/isValidAddress.d.ts

package/dist/index.js

@@ -3,8 +3,8 @@ const require_types = require("./types-BWHvNFlN.js");
 const require_platformAccounts = require("./platformAccounts-BjIeRcFN.js");
 const require_iconCache = require("./iconCache-FR4iy6go.js");
 const require_registryReads = require("./registryReads-BpHsWLd7.js");
-let rxjs = require("rxjs");
 let lodash_es = require("lodash-es");
+let rxjs = require("rxjs");
 //#region src/api/config.ts
 /**
 * Default storage key for persisting wallet connection state.
@@ -107,6 +107,10 @@ const createReconnectPolicy = ({ maxAttempts = 3 } = {}) => {
 	};
 };
 const reconnectAccepts = (autoReconnect, wallet) => typeof autoReconnect === "function" ? autoReconnect(wallet) : autoReconnect;
+const reconnectCandidates$ = (store) => {
+	const remembered$ = store.observable.pipe((0, rxjs.map)((s) => s.remembered ?? []));
+	return remembered$.pipe((0, rxjs.take)(1), (0, rxjs.switchMap)((initial) => remembered$.pipe((0, rxjs.scan)((remaining, current) => remaining.filter((id) => current.includes(id)), initial))), (0, rxjs.distinctUntilChanged)(lodash_es.isEqual));
+};
 //#endregion
 //#region src/api/hydration.ts
 /**
@@ -558,10 +562,6 @@ const getDefaultStore = () => {
 //#endregion
 //#region src/api/wallets.ts
 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
-	}));
 	return new rxjs.Observable((subscriber) => {
 		const ctx = {
 			config,
@@ -599,7 +599,7 @@ const getWallets$ = (config, store, registryReads$) => {
 		};
 		const subWallets = wallets$.subscribe(subscriber);
 		if (subscriber.closed) return subWallets;
-		const subAutoReconnect = (0, rxjs.combineLatest)([rawWallets$, rememberedWalletIds$]).pipe((0, rxjs.filter)(([, walletIds]) => config.autoReconnect !== false && walletIds.length > 0), (0, rxjs.mergeMap)(([wallets, walletIds]) => wallets.filter(require_types.isInjectedWallet).filter((wallet) => walletIds.includes(wallet.id))), (0, rxjs.tap)((wallet) => {
+		const subAutoReconnect = rawWallets$.pipe((0, rxjs.withLatestFrom)(reconnectCandidates$(store)), (0, rxjs.filter)(([, walletIds]) => config.autoReconnect !== false && walletIds.length > 0), (0, rxjs.mergeMap)(([wallets, walletIds]) => wallets.filter(require_types.isInjectedWallet).filter((wallet) => walletIds.includes(wallet.id))), (0, rxjs.tap)((wallet) => {
 			if (wallet.status === "connected") reconnectPolicy.settle(wallet.id);
 		}), (0, rxjs.filter)((wallet) => wallet.status === "disconnected" && reconnectAccepts(config.autoReconnect, wallet))).subscribe(reconnect);
 		return () => {
@@ -683,6 +683,12 @@ const getKheopskit$ = (config, options = {}) => {
 				const live = await whenLive(placeholder.id, options?.signal);
 				if (closed) throw require_types.abortedError(placeholder.id, "connect");
 				await live.connect(options);
+			},
+			disconnect: async () => {
+				if (closed) return;
+				const live = latest?.wallets.find((w) => w.id === placeholder.id && !w.isPlaceholder);
+				if (live) return live.disconnect();
+				store.forgetWallet(placeholder.id);
 			}
 		});
 		const settleWithState = (wallet) => {
@@ -727,7 +733,7 @@ const getKheopskit$ = (config, options = {}) => {
 			liveWallets$,
 			accountFrames$.pipe((0, rxjs.startWith)(noAnswerYet)),
 			isDiscovering$,
-			store.observable.pipe((0, rxjs.map)((s) => s.remembered ?? []), (0, rxjs.take)(1))
+			reconnectCandidates$(store)
 		]).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;