@solana/react-hooks 0.2.5 → 0.5.0

package/dist/index.node.mjs

@@ -1,18 +1,9 @@
-import { createClient, toAddress, toAddressString, stableStringify, createSolTransferController, createSplTransferController, getWalletStandardConnectors, watchWalletStandardConnectors, createTransactionPoolController, createInitialAsyncState, createAsyncState, normalizeSignature, SIGNATURE_STATUS_TIMEOUT_MS, deriveConfirmationStatus, confirmationMeetsCommitment } from '@solana/client';
+import { createClient, toAddress, toAddressString, stableStringify, createSolTransferController, createSplTransferController, createTransactionPoolController, createInitialAsyncState, createAsyncState, normalizeSignature, SIGNATURE_STATUS_TIMEOUT_MS, deriveConfirmationStatus, confirmationMeetsCommitment, deserializeSolanaState, subscribeSolanaState, serializeSolanaState } from '@solana/client';
 import { createContext, useMemo, useEffect, useContext, useCallback, useRef, useSyncExternalStore, useState } from 'react';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
 import useSWR, { SWRConfig } from 'swr';
 import { useStore } from 'zustand';
 import { getBase64EncodedWireTransaction } from '@solana/kit';
-import { address } from '@solana/addresses';
-import { SolanaError, SOLANA_ERROR__SIGNER__WALLET_MULTISIGN_UNIMPLEMENTED } from '@solana/errors';
-import { getAbortablePromise } from '@solana/promises';
-import { getCompiledTransactionMessageDecoder } from '@solana/transaction-messages';
-import { getTransactionCodec, assertIsTransactionWithinSizeLimit, getTransactionLifetimeConstraintFromCompiledTransactionMessage, getTransactionEncoder } from '@solana/transactions';
-import { SolanaSignAndSendTransaction, SolanaSignIn, SolanaSignMessage, SolanaSignTransaction } from '@solana/wallet-standard-features';
-import { WalletStandardError, WALLET_STANDARD_ERROR__FEATURES__WALLET_ACCOUNT_CHAIN_UNSUPPORTED } from '@wallet-standard/errors';
-import { getWalletAccountFeature, getWalletFeature } from '@wallet-standard/ui';
-import { getWalletAccountForUiWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, getWalletForHandle_DO_NOT_USE_OR_YOU_WILL_BE_FIRED, getOrCreateUiWalletAccountForStandardWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED } from '@wallet-standard/ui-registry';
 
 var __defProp = Object.defineProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
@@ -65,11 +56,11 @@ var QUERY_NAMESPACE = "@solana/react-hooks";
 function useSolanaRpcQuery(scope, args, fetcher, options = {}) {
   const client = useSolanaClient();
   const cluster = useClientStore((state) => state.cluster);
-  const { disabled = false, ...restOptions } = options;
+  const { disabled = false, swr } = options;
   const providerSuspensePreference = useQuerySuspensePreference();
   const suspenseEnabled = !disabled && Boolean(providerSuspensePreference);
   const swrOptions = {
-    ...restOptions,
+    ...swr ?? {},
     suspense: suspenseEnabled
   };
   const key = useMemo(() => {
@@ -78,59 +69,105 @@ function useSolanaRpcQuery(scope, args, fetcher, options = {}) {
     }
     return [QUERY_NAMESPACE, scope, cluster.endpoint, cluster.commitment, ...args];
   }, [cluster.commitment, cluster.endpoint, args, scope, disabled]);
-  const swr = useSWR(key, () => fetcher(client), swrOptions);
+  const swrResponse = useSWR(key, () => fetcher(client), swrOptions);
   const [dataUpdatedAt, setDataUpdatedAt] = useState(
-    () => swr.data !== void 0 ? Date.now() : void 0
+    () => swrResponse.data !== void 0 ? Date.now() : void 0
   );
   useEffect(() => {
-    if (swr.data !== void 0) {
+    if (swrResponse.data !== void 0) {
       setDataUpdatedAt(Date.now());
     }
-  }, [swr.data]);
-  const status = swr.error ? "error" : swr.isLoading ? "loading" : swr.data !== void 0 ? "success" : "idle";
-  const refresh = useCallback(() => swr.mutate(void 0, { revalidate: true }), [swr.mutate]);
+  }, [swrResponse.data]);
+  const status = swrResponse.error ? "error" : swrResponse.isLoading ? "loading" : swrResponse.data !== void 0 ? "success" : "idle";
+  const refresh = useCallback(() => swrResponse.mutate(void 0, { revalidate: true }), [swrResponse.mutate]);
   return {
-    data: swr.data,
+    data: swrResponse.data,
     dataUpdatedAt,
-    error: swr.error ?? null,
+    error: swrResponse.error ?? null,
     isError: status === "error",
-    isLoading: swr.isLoading,
+    isLoading: swrResponse.isLoading,
     isSuccess: status === "success",
-    isValidating: swr.isValidating,
-    mutate: swr.mutate,
+    isValidating: swrResponse.isValidating,
+    mutate: swrResponse.mutate,
     refresh,
     status
   };
 }
 __name(useSolanaRpcQuery, "useSolanaRpcQuery");
+function getLatestBlockhashKey(params = {}) {
+  const { commitment = null, minContextSlot = null } = params;
+  return ["latestBlockhash", commitment, normalizeBigint(minContextSlot)];
+}
+__name(getLatestBlockhashKey, "getLatestBlockhashKey");
+function getProgramAccountsKey(params = {}) {
+  const { programAddress, config } = params;
+  const address = programAddress ? toAddress(programAddress) : void 0;
+  const addressKey = address ? toAddressString(address) : null;
+  const configKey = stableStringify(config ?? null);
+  return ["programAccounts", addressKey, configKey];
+}
+__name(getProgramAccountsKey, "getProgramAccountsKey");
+function getSimulateTransactionKey(params = {}) {
+  const { transaction, config } = params;
+  const wire = transaction ? normalizeWire(transaction) : null;
+  const configKey = stableStringify(config ?? null);
+  return ["simulateTransaction", wire, configKey];
+}
+__name(getSimulateTransactionKey, "getSimulateTransactionKey");
+function getSignatureStatusKey(params = {}) {
+  const { config, signature } = params;
+  const signatureKey = signature?.toString() ?? null;
+  const configKey = JSON.stringify(config ?? null);
+  return ["signatureStatus", signatureKey, configKey];
+}
+__name(getSignatureStatusKey, "getSignatureStatusKey");
+function normalizeBigint(value) {
+  if (value === void 0 || value === null) return null;
+  return typeof value === "bigint" ? value : BigInt(Math.floor(value));
+}
+__name(normalizeBigint, "normalizeBigint");
+function normalizeWire(input) {
+  if (!input) return null;
+  if (typeof input === "string") {
+    return input;
+  }
+  return getBase64EncodedWireTransaction(input);
+}
+__name(normalizeWire, "normalizeWire");
+
+// src/queryHooks.ts
 var DEFAULT_BLOCKHASH_REFRESH_INTERVAL = 3e4;
-function useLatestBlockhash(options) {
-  const { commitment, minContextSlot, refreshInterval = DEFAULT_BLOCKHASH_REFRESH_INTERVAL, ...rest } = options ?? {};
-  const normalizedMinContextSlot = useMemo(() => {
-    if (minContextSlot === void 0) {
-      return void 0;
-    }
-    return typeof minContextSlot === "bigint" ? minContextSlot : BigInt(Math.floor(minContextSlot));
-  }, [minContextSlot]);
-  const keyArgs = useMemo(
-    () => [commitment ?? null, normalizedMinContextSlot ?? null],
-    [commitment, normalizedMinContextSlot]
-  );
+function useLatestBlockhash(options = {}) {
+  const {
+    commitment,
+    minContextSlot,
+    refreshInterval = DEFAULT_BLOCKHASH_REFRESH_INTERVAL,
+    disabled = false,
+    swr
+  } = options;
   const fetcher = useCallback(
     async (client) => {
       const fallbackCommitment = commitment ?? client.store.getState().cluster.commitment;
       const plan = client.runtime.rpc.getLatestBlockhash({
         commitment: fallbackCommitment,
-        minContextSlot: normalizedMinContextSlot
+        minContextSlot: normalizeMinContextSlot(minContextSlot)
       });
       return plan.send({ abortSignal: AbortSignal.timeout(15e3) });
     },
-    [commitment, normalizedMinContextSlot]
+    [commitment, minContextSlot]
+  );
+  const query = useSolanaRpcQuery(
+    "latestBlockhash",
+    getLatestBlockhashKey(options),
+    fetcher,
+    {
+      disabled,
+      swr: {
+        refreshInterval,
+        ...swr
+      }
+    }
   );
-  const query = useSolanaRpcQuery("latestBlockhash", keyArgs, fetcher, {
-    refreshInterval,
-    ...rest
-  });
   return {
     ...query,
     blockhash: query.data?.value.blockhash ?? null,
@@ -140,14 +177,11 @@ function useLatestBlockhash(options) {
 }
 __name(useLatestBlockhash, "useLatestBlockhash");
 function useProgramAccounts(programAddress, options) {
-  const { commitment, config, ...queryOptions } = options ?? {};
-  const { disabled: disabledOption, ...restQueryOptions } = queryOptions;
-  const address2 = useMemo(() => programAddress ? toAddress(programAddress) : void 0, [programAddress]);
-  const addressKey = useMemo(() => address2 ? toAddressString(address2) : null, [address2]);
-  const configKey = useMemo(() => stableStringify(config ?? null), [config]);
+  const { commitment, config, swr, disabled: disabledOption } = options ?? {};
   const fetcher = useCallback(
     async (client) => {
-      if (!address2) {
+      const address = programAddress ? toAddress(programAddress) : void 0;
+      if (!address) {
         throw new Error("Provide a program address before querying program accounts.");
       }
       const fallbackCommitment = commitment ?? config?.commitment ?? client.store.getState().cluster.commitment;
@@ -155,16 +189,21 @@ function useProgramAccounts(programAddress, options) {
         ...config ?? {},
         commitment: fallbackCommitment
       };
-      const plan = client.runtime.rpc.getProgramAccounts(address2, mergedConfig);
+      const plan = client.runtime.rpc.getProgramAccounts(address, mergedConfig);
       return plan.send({ abortSignal: AbortSignal.timeout(2e4) });
     },
-    [address2, commitment, config]
+    [commitment, config, programAddress]
+  );
+  const disabled = disabledOption ?? !programAddress;
+  const query = useSolanaRpcQuery(
+    "programAccounts",
+    getProgramAccountsKey({ programAddress, config }),
+    fetcher,
+    {
+      disabled,
+      swr
+    }
   );
-  const disabled = disabledOption ?? !address2;
-  const query = useSolanaRpcQuery("programAccounts", [addressKey, configKey], fetcher, {
-    ...restQueryOptions,
-    disabled
-  });
   return {
     ...query,
     accounts: query.data ?? []
@@ -172,8 +211,7 @@ function useProgramAccounts(programAddress, options) {
 }
 __name(useProgramAccounts, "useProgramAccounts");
 function useSimulateTransaction(transaction, options) {
-  const { commitment, config, refreshInterval, ...rest } = options ?? {};
-  const { disabled: disabledOption, revalidateIfStale, revalidateOnFocus, ...queryOptions } = rest;
+  const { commitment, config, refreshInterval, disabled: disabledOption, swr } = options ?? {};
   const wire = useMemo(() => {
     if (!transaction) {
       return null;
@@ -183,7 +221,6 @@ function useSimulateTransaction(transaction, options) {
     }
     return getBase64EncodedWireTransaction(transaction);
   }, [transaction]);
-  const configKey = useMemo(() => stableStringify(config ?? null), [config]);
   const fetcher = useCallback(
     async (client) => {
       if (!wire) {
@@ -199,19 +236,31 @@ function useSimulateTransaction(transaction, options) {
     [commitment, config, wire]
   );
   const disabled = disabledOption ?? !wire;
-  const query = useSolanaRpcQuery("simulateTransaction", [wire, configKey], fetcher, {
-    ...queryOptions,
-    refreshInterval,
-    disabled,
-    revalidateIfStale: revalidateIfStale ?? false,
-    revalidateOnFocus: revalidateOnFocus ?? false
-  });
+  const query = useSolanaRpcQuery(
+    "simulateTransaction",
+    getSimulateTransactionKey({ transaction, config }),
+    fetcher,
+    {
+      disabled,
+      swr: {
+        refreshInterval,
+        revalidateIfStale: false,
+        revalidateOnFocus: false,
+        ...swr
+      }
+    }
+  );
   return {
     ...query,
     logs: query.data?.value.logs ?? []
   };
 }
 __name(useSimulateTransaction, "useSimulateTransaction");
+function normalizeMinContextSlot(minContextSlot) {
+  if (minContextSlot === void 0) return void 0;
+  return typeof minContextSlot === "bigint" ? minContextSlot : BigInt(Math.floor(minContextSlot));
+}
+__name(normalizeMinContextSlot, "normalizeMinContextSlot");
 
 // src/hooks.ts
 function createClusterSelector() {
@@ -361,10 +410,19 @@ function useSplToken(mint, options = {}) {
     }
     return helper.fetchBalance(owner, options.commitment);
   }, [helper, owner, options.commitment]);
-  const { data, error, isLoading, isValidating, mutate } = useSWR(balanceKey, fetchBalance, {
-    revalidateOnFocus: options.revalidateOnFocus ?? false,
-    suspense
-  });
+  const swrOptions = useMemo(
+    () => ({
+      revalidateOnFocus: options.revalidateOnFocus ?? false,
+      suspense,
+      ...options.swr ?? {}
+    }),
+    [options.revalidateOnFocus, options.swr, suspense]
+  );
+  const { data, error, isLoading, isValidating, mutate } = useSWR(
+    balanceKey,
+    fetchBalance,
+    swrOptions
+  );
   const sessionRef = useRef(session);
   useEffect(() => {
     sessionRef.current = session;
@@ -427,42 +485,42 @@ __name(useSplToken, "useSplToken");
 function useAccount(addressLike, options = {}) {
   const client = useSolanaClient();
   const shouldSkip = options.skip ?? !addressLike;
-  const address2 = useMemo(() => {
+  const address = useMemo(() => {
     if (shouldSkip || !addressLike) {
       return void 0;
     }
     return toAddress(addressLike);
   }, [addressLike, shouldSkip]);
-  const accountKey = useMemo(() => address2?.toString(), [address2]);
+  const accountKey = useMemo(() => address?.toString(), [address]);
   const selector = useMemo(() => createAccountSelector(accountKey), [accountKey]);
   const account = useClientStore(selector);
   useSuspenseFetcher({
-    enabled: options.fetch !== false && !shouldSkip && Boolean(address2),
+    enabled: options.fetch !== false && !shouldSkip && Boolean(address),
     fetcher: /* @__PURE__ */ __name(() => {
-      if (!address2) {
+      if (!address) {
         throw new Error("Provide an address before fetching account data.");
       }
-      return client.actions.fetchAccount(address2, options.commitment);
+      return client.actions.fetchAccount(address, options.commitment);
     }, "fetcher"),
     key: accountKey ?? null,
     ready: account !== void 0
   });
   useEffect(() => {
-    if (!address2) {
+    if (!address) {
       return;
     }
     const commitment = options.commitment;
     if (options.fetch !== false && account === void 0) {
-      void client.actions.fetchAccount(address2, commitment).catch(() => void 0);
+      void client.actions.fetchAccount(address, commitment).catch(() => void 0);
     }
     if (options.watch) {
-      const subscription = client.watchers.watchAccount({ address: address2, commitment }, () => void 0);
+      const subscription = client.watchers.watchAccount({ address, commitment }, () => void 0);
       return () => {
         subscription.abort();
       };
     }
     return void 0;
-  }, [account, address2, client, options.commitment, options.fetch, options.watch]);
+  }, [account, address, client, options.commitment, options.fetch, options.watch]);
   return account;
 }
 __name(useAccount, "useAccount");
@@ -478,42 +536,42 @@ function useBalance(addressLike, options = {}) {
   );
   const client = useSolanaClient();
   const shouldSkip = mergedOptions.skip ?? !addressLike;
-  const address2 = useMemo(() => {
+  const address = useMemo(() => {
     if (shouldSkip || !addressLike) {
       return void 0;
     }
     return toAddress(addressLike);
   }, [addressLike, shouldSkip]);
-  const accountKey = useMemo(() => address2?.toString(), [address2]);
+  const accountKey = useMemo(() => address?.toString(), [address]);
   const selector = useMemo(() => createAccountSelector(accountKey), [accountKey]);
   const account = useClientStore(selector);
   useSuspenseFetcher({
-    enabled: mergedOptions.fetch !== false && !shouldSkip && Boolean(address2),
+    enabled: mergedOptions.fetch !== false && !shouldSkip && Boolean(address),
     fetcher: /* @__PURE__ */ __name(() => {
-      if (!address2) {
+      if (!address) {
         throw new Error("Provide an address before fetching balance.");
       }
-      return client.actions.fetchBalance(address2, mergedOptions.commitment);
+      return client.actions.fetchBalance(address, mergedOptions.commitment);
     }, "fetcher"),
     key: accountKey ?? null,
     ready: account !== void 0
   });
   useEffect(() => {
-    if (!address2) {
+    if (!address) {
       return;
     }
     const commitment = mergedOptions.commitment;
     if (mergedOptions.fetch !== false && account === void 0) {
-      void client.actions.fetchBalance(address2, commitment).catch(() => void 0);
+      void client.actions.fetchBalance(address, commitment).catch(() => void 0);
     }
     if (mergedOptions.watch) {
-      const watcher = client.watchers.watchBalance({ address: address2, commitment }, () => void 0);
+      const watcher = client.watchers.watchBalance({ address, commitment }, () => void 0);
       return () => {
         watcher.abort();
       };
     }
     return void 0;
-  }, [account, address2, client, mergedOptions.commitment, mergedOptions.fetch, mergedOptions.watch]);
+  }, [account, address, client, mergedOptions.commitment, mergedOptions.fetch, mergedOptions.watch]);
   const lamports = account?.lamports ?? null;
   const fetching = account?.fetching ?? false;
   const slot = account?.slot;
@@ -530,22 +588,6 @@ function useBalance(addressLike, options = {}) {
   );
 }
 __name(useBalance, "useBalance");
-function useWalletStandardConnectors(options) {
-  const overrides = options?.overrides;
-  const memoisedOptions = useMemo(() => overrides ? { overrides } : void 0, [overrides]);
-  const [connectors, setConnectors] = useState(
-    () => getWalletStandardConnectors(memoisedOptions ?? {})
-  );
-  useEffect(() => {
-    setConnectors(getWalletStandardConnectors(memoisedOptions ?? {}));
-    const unwatch = watchWalletStandardConnectors(setConnectors, memoisedOptions ?? {});
-    return () => {
-      unwatch();
-    };
-  }, [memoisedOptions]);
-  return connectors;
-}
-__name(useWalletStandardConnectors, "useWalletStandardConnectors");
 function useTransactionPool(config = {}) {
   const initialInstructions = useMemo(
     () => config.instructions ?? [],
@@ -679,10 +721,9 @@ function useSendTransaction() {
 }
 __name(useSendTransaction, "useSendTransaction");
 function useSignatureStatus(signatureInput, options = {}) {
-  const { config, ...queryOptions } = options;
+  const { config, disabled: disabledOption, swr } = options;
   const signature = useMemo(() => normalizeSignature(signatureInput), [signatureInput]);
   const signatureKey = signature?.toString() ?? null;
-  const configKey = useMemo(() => JSON.stringify(config ?? null), [config]);
   const fetcher = useCallback(
     async (client) => {
       if (!signatureKey) {
@@ -697,14 +738,14 @@ function useSignatureStatus(signatureInput, options = {}) {
     },
     [config, signature, signatureKey]
   );
-  const disabled = queryOptions.disabled ?? !signatureKey;
+  const disabled = disabledOption ?? !signatureKey;
   const query = useSolanaRpcQuery(
     "signatureStatus",
-    [signatureKey, configKey],
+    getSignatureStatusKey({ signature: signatureInput, config }),
     fetcher,
     {
-      ...queryOptions,
-      disabled
+      disabled,
+      swr
     }
   );
   const confirmationStatus = deriveConfirmationStatus(query.data ?? null);
@@ -723,14 +764,17 @@ function useWaitForSignature(signatureInput, options = {}) {
     watchCommitment,
     ...signatureStatusOptions
   } = options;
-  const { refreshInterval, ...restStatusOptions } = signatureStatusOptions;
+  const { swr, ...restStatusOptions } = signatureStatusOptions;
   const subscribeCommitment = watchCommitment ?? commitment;
   const client = useSolanaClient();
   const normalizedSignature = useMemo(() => normalizeSignature(signatureInput), [signatureInput]);
   const disabled = disabledOption ?? !normalizedSignature;
   const statusQuery = useSignatureStatus(signatureInput, {
     ...restStatusOptions,
-    refreshInterval: refreshInterval ?? 2e3,
+    swr: {
+      refreshInterval: 2e3,
+      ...swr
+    },
     disabled
   });
   const [subscriptionSettled, setSubscriptionSettled] = useState(false);
@@ -786,10 +830,11 @@ function useWaitForSignature(signatureInput, options = {}) {
 __name(useWaitForSignature, "useWaitForSignature");
 var createCache = /* @__PURE__ */ __name(() => /* @__PURE__ */ new Map(), "createCache");
 var DEFAULT_QUERY_CONFIG = Object.freeze({
-  dedupingInterval: 1e3,
-  focusThrottleInterval: 1e3,
+  dedupingInterval: 2e3,
+  focusThrottleInterval: 5e3,
   provider: /* @__PURE__ */ __name(() => createCache(), "provider"),
-  revalidateOnFocus: false,
+  revalidateIfStale: true,
+  revalidateOnFocus: true,
   revalidateOnReconnect: true
 });
 function SolanaQueryProvider({
@@ -836,6 +881,10 @@ function SolanaProvider({ children, client, config, query, walletPersistence })
   const shouldIncludeQueryLayer = query !== false && query?.disabled !== true;
   const queryProps = shouldIncludeQueryLayer && query ? query : {};
   const persistenceConfig = walletPersistence === false ? void 0 : walletPersistence ?? {};
+  const storage = persistenceConfig ? persistenceConfig.storage ?? getDefaultStorage() : null;
+  const storageKey = persistenceConfig?.storageKey ?? DEFAULT_STORAGE_KEY;
+  const persistedState = persistenceConfig ? readPersistedState(storage, storageKey) : { legacyConnectorId: null, state: null };
+  const clientConfig = config && persistenceConfig ? { ...config, initialState: config.initialState ?? persistedState.state ?? void 0 } : config;
   const content = shouldIncludeQueryLayer ? /* @__PURE__ */ jsx(
     SolanaQueryProvider,
     {
@@ -845,21 +894,52 @@ function SolanaProvider({ children, client, config, query, walletPersistence })
       children
     }
   ) : children;
-  return /* @__PURE__ */ jsxs(SolanaClientProvider, { client, config, children: [
-    persistenceConfig ? /* @__PURE__ */ jsx(WalletPersistence, { ...persistenceConfig }) : null,
+  return /* @__PURE__ */ jsxs(SolanaClientProvider, { client, config: clientConfig, children: [
+    persistenceConfig ? /* @__PURE__ */ jsx(
+      WalletPersistence,
+      {
+        autoConnect: persistenceConfig.autoConnect,
+        initialState: clientConfig?.initialState ?? persistedState.state,
+        legacyConnectorId: persistedState.legacyConnectorId,
+        storage,
+        storageKey
+      }
+    ) : null,
     content
   ] });
 }
 __name(SolanaProvider, "SolanaProvider");
 var DEFAULT_STORAGE_KEY = "solana:last-connector";
-function WalletPersistence({ autoConnect = true, storage, storageKey = DEFAULT_STORAGE_KEY }) {
+function readPersistedState(storage, storageKey) {
+  if (!storage) {
+    return { legacyConnectorId: null, state: null };
+  }
+  const raw = safelyRead(() => storage.getItem(storageKey));
+  if (!raw) {
+    return { legacyConnectorId: null, state: null };
+  }
+  const parsed = deserializeSolanaState(raw);
+  if (parsed) {
+    return { legacyConnectorId: null, state: parsed };
+  }
+  return { legacyConnectorId: raw, state: null };
+}
+__name(readPersistedState, "readPersistedState");
+function WalletPersistence({
+  autoConnect = true,
+  initialState = null,
+  legacyConnectorId = null,
+  storage,
+  storageKey = DEFAULT_STORAGE_KEY
+}) {
   const wallet = useWallet();
   const connectWallet = useConnectWallet();
   const client = useSolanaClient();
   const storageRef = useRef(storage ?? getDefaultStorage());
   const [hasAttemptedAutoConnect, setHasAttemptedAutoConnect] = useState(false);
-  const hasPersistedConnectorRef = useRef(false);
   const clientRef = useRef(null);
+  const persistedStateRef = useRef(initialState);
+  const legacyConnectorIdRef = useRef(legacyConnectorId);
   useEffect(() => {
     storageRef.current = storage ?? getDefaultStorage();
   }, [storage]);
@@ -872,19 +952,19 @@ function WalletPersistence({ autoConnect = true, storage, storageKey = DEFAULT_S
   useEffect(() => {
     const activeStorage = storageRef.current;
     if (!activeStorage) return;
-    if ("connectorId" in wallet && wallet.connectorId) {
-      const connectorId = wallet.connectorId;
-      if (connectorId) {
-        safelyWrite(() => activeStorage.setItem(storageKey, connectorId));
-        hasPersistedConnectorRef.current = true;
-        return;
-      }
-    }
-    if (wallet.status === "disconnected" && hasPersistedConnectorRef.current) {
-      safelyWrite(() => activeStorage.removeItem(storageKey));
-      hasPersistedConnectorRef.current = false;
-    }
-  }, [storageKey, wallet]);
+    const unsubscribe = subscribeSolanaState(client, (state) => {
+      persistedStateRef.current = state;
+      legacyConnectorIdRef.current = null;
+      safelyWrite(() => activeStorage.setItem(storageKey, serializeSolanaState(state)));
+    });
+    return () => {
+      unsubscribe();
+    };
+  }, [client, storageKey]);
+  useEffect(() => {
+    persistedStateRef.current = initialState ?? persistedStateRef.current;
+    legacyConnectorIdRef.current = legacyConnectorId;
+  }, [initialState, legacyConnectorId]);
   useEffect(() => {
     if (!autoConnect || hasAttemptedAutoConnect) {
       return;
@@ -893,35 +973,21 @@ function WalletPersistence({ autoConnect = true, storage, storageKey = DEFAULT_S
       setHasAttemptedAutoConnect(true);
       return;
     }
-    const activeStorage = storageRef.current;
-    if (!activeStorage) {
-      setHasAttemptedAutoConnect(true);
-      return;
-    }
-    let cancelled = false;
-    const connectorId = safelyRead(() => activeStorage.getItem(storageKey));
-    if (!connectorId) {
-      setHasAttemptedAutoConnect(true);
-      return;
-    }
+    const state = persistedStateRef.current ?? initialState;
+    const connectorId = state?.lastConnectorId ?? legacyConnectorIdRef.current;
+    const shouldAutoConnect = (state?.autoconnect ?? autoConnect) && connectorId;
+    if (!shouldAutoConnect || !connectorId) return;
     const connector = client.connectors.get(connectorId);
-    if (!connector) {
-      return;
-    }
+    if (!connector) return;
     void (async () => {
       try {
         await connectWallet(connectorId, { autoConnect: true });
       } catch {
       } finally {
-        if (!cancelled) {
-          setHasAttemptedAutoConnect(true);
-        }
+        setHasAttemptedAutoConnect(true);
       }
     })();
-    return () => {
-      cancelled = true;
-    };
-  }, [autoConnect, client, connectWallet, hasAttemptedAutoConnect, storageKey, wallet.status]);
+  }, [autoConnect, client, connectWallet, hasAttemptedAutoConnect, initialState, wallet.status]);
   return null;
 }
 __name(WalletPersistence, "WalletPersistence");
@@ -955,8 +1021,8 @@ function useWalletConnection(options = {}) {
   const wallet = useWallet();
   const connectWallet = useConnectWallet();
   const disconnectWallet = useDisconnectWallet();
-  const discovered = useWalletStandardConnectors(options.discoveryOptions);
-  const connectors = options.connectors ?? discovered;
+  const client = useSolanaClient();
+  const connectors = options.connectors ?? client.connectors.all;
   const connect = useCallback(
     (connectorId, connectOptions) => connectWallet(connectorId, connectOptions),
     [connectWallet]
@@ -964,6 +1030,7 @@ function useWalletConnection(options = {}) {
   const disconnect = useCallback(() => disconnectWallet(), [disconnectWallet]);
   const state = useMemo(() => {
     const connectorId = "connectorId" in wallet ? wallet.connectorId : void 0;
+    const currentConnector = connectorId ? connectors.find((connector) => connector.id === connectorId) : void 0;
     const session = wallet.status === "connected" ? wallet.session : void 0;
     const error = wallet.status === "error" ? wallet.error ?? null : null;
     return {
@@ -972,6 +1039,7 @@ function useWalletConnection(options = {}) {
       connecting: wallet.status === "connecting",
       connectors,
       connectorId,
+      currentConnector,
       disconnect,
       error,
       status: wallet.status,
@@ -981,8 +1049,8 @@ function useWalletConnection(options = {}) {
   return state;
 }
 __name(useWalletConnection, "useWalletConnection");
-function WalletConnectionManager({ children, connectors, discoveryOptions }) {
-  const state = useWalletConnection({ connectors, discoveryOptions });
+function WalletConnectionManager({ children, connectors }) {
+  const state = useWalletConnection({ connectors });
   return /* @__PURE__ */ jsx(Fragment, { children: children(state) });
 }
 __name(WalletConnectionManager, "WalletConnectionManager");
@@ -1017,334 +1085,7 @@ function useWalletModalState(options = {}) {
   };
 }
 __name(useWalletModalState, "useWalletModalState");
-function useSignAndSendTransaction(uiWalletAccount, chain) {
-  const signAndSendTransactions = useSignAndSendTransactions(uiWalletAccount, chain);
-  return useCallback(
-    async (input) => {
-      const [result] = await signAndSendTransactions(input);
-      return result;
-    },
-    [signAndSendTransactions]
-  );
-}
-__name(useSignAndSendTransaction, "useSignAndSendTransaction");
-function useSignAndSendTransactions(uiWalletAccount, chain) {
-  if (!uiWalletAccount.chains.includes(chain)) {
-    throw new WalletStandardError(WALLET_STANDARD_ERROR__FEATURES__WALLET_ACCOUNT_CHAIN_UNSUPPORTED, {
-      address: uiWalletAccount.address,
-      chain,
-      featureName: SolanaSignAndSendTransaction,
-      supportedChains: [...uiWalletAccount.chains],
-      supportedFeatures: [...uiWalletAccount.features]
-    });
-  }
-  const signAndSendTransactionFeature = getWalletAccountFeature(
-    uiWalletAccount,
-    SolanaSignAndSendTransaction
-  );
-  const account = getWalletAccountForUiWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(uiWalletAccount);
-  return useCallback(
-    async (...inputs) => {
-      const inputsWithChainAndAccount = inputs.map(({ options, ...rest }) => {
-        const minContextSlot = options?.minContextSlot;
-        return {
-          ...rest,
-          account,
-          chain,
-          ...minContextSlot != null ? {
-            options: {
-              minContextSlot: Number(minContextSlot)
-            }
-          } : null
-        };
-      });
-      const results = await signAndSendTransactionFeature.signAndSendTransaction(...inputsWithChainAndAccount);
-      return results;
-    },
-    [account, chain, signAndSendTransactionFeature]
-  );
-}
-__name(useSignAndSendTransactions, "useSignAndSendTransactions");
-function useSignIn(uiWalletHandle) {
-  const signIns = useSignIns(uiWalletHandle);
-  return useCallback(
-    async (input) => {
-      const [result] = await signIns(input);
-      return result;
-    },
-    [signIns]
-  );
-}
-__name(useSignIn, "useSignIn");
-function useSignIns(uiWalletHandle) {
-  let signMessageFeature;
-  if ("address" in uiWalletHandle && typeof uiWalletHandle.address === "string") {
-    getWalletAccountForUiWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(uiWalletHandle);
-    signMessageFeature = getWalletAccountFeature(
-      uiWalletHandle,
-      SolanaSignIn
-    );
-  } else {
-    signMessageFeature = getWalletFeature(uiWalletHandle, SolanaSignIn);
-  }
-  const wallet = getWalletForHandle_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(uiWalletHandle);
-  return useCallback(
-    async (...inputs) => {
-      const inputsWithAddressAndChainId = inputs.map((input) => ({
-        ...input,
-        // Prioritize the `UiWalletAccount` address if it exists.
-        ..."address" in uiWalletHandle ? { address: uiWalletHandle.address } : null
-      }));
-      const results = await signMessageFeature.signIn(...inputsWithAddressAndChainId);
-      const resultsWithoutSignatureType = results.map(
-        ({
-          account,
-          signatureType: _signatureType,
-          // Solana signatures are always of type `ed25519` so drop this property.
-          ...rest
-        }) => ({
-          ...rest,
-          account: getOrCreateUiWalletAccountForStandardWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(
-            wallet,
-            account
-          )
-        })
-      );
-      return resultsWithoutSignatureType;
-    },
-    [signMessageFeature, uiWalletHandle, wallet]
-  );
-}
-__name(useSignIns, "useSignIns");
-function useSignMessage(...config) {
-  const signMessages = useSignMessages(...config);
-  return useCallback(
-    async (input) => {
-      const [result] = await signMessages(input);
-      return result;
-    },
-    [signMessages]
-  );
-}
-__name(useSignMessage, "useSignMessage");
-function useSignMessages(uiWalletAccount) {
-  const signMessageFeature = getWalletAccountFeature(
-    uiWalletAccount,
-    SolanaSignMessage
-  );
-  const account = getWalletAccountForUiWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(uiWalletAccount);
-  return useCallback(
-    async (...inputs) => {
-      const inputsWithAccount = inputs.map((input) => ({ ...input, account }));
-      const results = await signMessageFeature.signMessage(...inputsWithAccount);
-      const resultsWithoutSignatureType = results.map(
-        ({
-          signatureType: _signatureType,
-          // Solana signatures are always of type `ed25519` so drop this property.
-          ...rest
-        }) => rest
-      );
-      return resultsWithoutSignatureType;
-    },
-    [signMessageFeature, account]
-  );
-}
-__name(useSignMessages, "useSignMessages");
-function useSignTransaction(uiWalletAccount, chain) {
-  const signTransactions = useSignTransactions(uiWalletAccount, chain);
-  return useCallback(
-    async (input) => {
-      const [result] = await signTransactions(input);
-      return result;
-    },
-    [signTransactions]
-  );
-}
-__name(useSignTransaction, "useSignTransaction");
-function useSignTransactions(uiWalletAccount, chain) {
-  if (!uiWalletAccount.chains.includes(chain)) {
-    throw new WalletStandardError(WALLET_STANDARD_ERROR__FEATURES__WALLET_ACCOUNT_CHAIN_UNSUPPORTED, {
-      address: uiWalletAccount.address,
-      chain,
-      featureName: SolanaSignAndSendTransaction,
-      supportedChains: [...uiWalletAccount.chains],
-      supportedFeatures: [...uiWalletAccount.features]
-    });
-  }
-  const signTransactionFeature = getWalletAccountFeature(
-    uiWalletAccount,
-    SolanaSignTransaction
-  );
-  const account = getWalletAccountForUiWalletAccount_DO_NOT_USE_OR_YOU_WILL_BE_FIRED(uiWalletAccount);
-  return useCallback(
-    async (...inputs) => {
-      const inputsWithAccountAndChain = inputs.map(({ options, ...rest }) => {
-        const minContextSlot = options?.minContextSlot;
-        return {
-          ...rest,
-          account,
-          chain,
-          ...minContextSlot != null ? {
-            options: {
-              minContextSlot: Number(minContextSlot)
-            }
-          } : null
-        };
-      });
-      const results = await signTransactionFeature.signTransaction(...inputsWithAccountAndChain);
-      return results;
-    },
-    [signTransactionFeature, account, chain]
-  );
-}
-__name(useSignTransactions, "useSignTransactions");
-function useWalletAccountMessageSigner(uiWalletAccount) {
-  const signMessage = useSignMessage(uiWalletAccount);
-  return useMemo(
-    () => ({
-      address: address(uiWalletAccount.address),
-      async modifyAndSignMessages(messages, config) {
-        config?.abortSignal?.throwIfAborted();
-        if (messages.length > 1) {
-          throw new SolanaError(SOLANA_ERROR__SIGNER__WALLET_MULTISIGN_UNIMPLEMENTED);
-        }
-        if (messages.length === 0) {
-          return messages;
-        }
-        const { content: originalMessage, signatures: originalSignatureMap } = messages[0];
-        const input = {
-          message: originalMessage
-        };
-        const { signedMessage, signature } = await getAbortablePromise(signMessage(input), config?.abortSignal);
-        const messageWasModified = originalMessage.length !== signedMessage.length || originalMessage.some((originalByte, ii) => originalByte !== signedMessage[ii]);
-        const originalSignature = originalSignatureMap[uiWalletAccount.address];
-        const signatureIsNew = !originalSignature?.every((originalByte, ii) => originalByte === signature[ii]);
-        if (!signatureIsNew && !messageWasModified) {
-          return messages;
-        }
-        const nextSignatureMap = messageWasModified ? { [uiWalletAccount.address]: signature } : { ...originalSignatureMap, [uiWalletAccount.address]: signature };
-        const outputMessages = Object.freeze([
-          Object.freeze({
-            content: signedMessage,
-            signatures: Object.freeze(nextSignatureMap)
-          })
-        ]);
-        return outputMessages;
-      }
-    }),
-    [uiWalletAccount, signMessage]
-  );
-}
-__name(useWalletAccountMessageSigner, "useWalletAccountMessageSigner");
-function useWalletAccountTransactionSigner(uiWalletAccount, chain) {
-  const encoderRef = useRef(null);
-  const signTransaction = useSignTransaction(uiWalletAccount, chain);
-  return useMemo(
-    () => ({
-      address: address(uiWalletAccount.address),
-      async modifyAndSignTransactions(transactions, config = {}) {
-        const { abortSignal, ...options } = config;
-        abortSignal?.throwIfAborted();
-        let transactionCodec = encoderRef.current;
-        if (!transactionCodec) {
-          transactionCodec = getTransactionCodec();
-          encoderRef.current = transactionCodec;
-        }
-        if (transactions.length > 1) {
-          throw new SolanaError(SOLANA_ERROR__SIGNER__WALLET_MULTISIGN_UNIMPLEMENTED);
-        }
-        if (transactions.length === 0) {
-          return transactions;
-        }
-        const [transaction] = transactions;
-        const wireTransactionBytes = transactionCodec.encode(transaction);
-        const inputWithOptions = {
-          ...options,
-          transaction: wireTransactionBytes
-        };
-        const { signedTransaction } = await getAbortablePromise(signTransaction(inputWithOptions), abortSignal);
-        const decodedSignedTransaction = transactionCodec.decode(
-          signedTransaction
-        );
-        assertIsTransactionWithinSizeLimit(decodedSignedTransaction);
-        const existingLifetime = "lifetimeConstraint" in transaction ? transaction.lifetimeConstraint : void 0;
-        if (existingLifetime) {
-          if (uint8ArraysEqual(decodedSignedTransaction.messageBytes, transaction.messageBytes)) {
-            return Object.freeze([
-              {
-                ...decodedSignedTransaction,
-                lifetimeConstraint: existingLifetime
-              }
-            ]);
-          }
-          const compiledTransactionMessage2 = getCompiledTransactionMessageDecoder().decode(
-            decodedSignedTransaction.messageBytes
-          );
-          const currentToken = "blockhash" in existingLifetime ? existingLifetime.blockhash : existingLifetime.nonce;
-          if (compiledTransactionMessage2.lifetimeToken === currentToken) {
-            return Object.freeze([
-              {
-                ...decodedSignedTransaction,
-                lifetimeConstraint: existingLifetime
-              }
-            ]);
-          }
-        }
-        const compiledTransactionMessage = getCompiledTransactionMessageDecoder().decode(
-          decodedSignedTransaction.messageBytes
-        );
-        const lifetimeConstraint = await getTransactionLifetimeConstraintFromCompiledTransactionMessage(compiledTransactionMessage);
-        return Object.freeze([
-          {
-            ...decodedSignedTransaction,
-            lifetimeConstraint
-          }
-        ]);
-      }
-    }),
-    [uiWalletAccount.address, signTransaction]
-  );
-}
-__name(useWalletAccountTransactionSigner, "useWalletAccountTransactionSigner");
-function uint8ArraysEqual(arr1, arr2) {
-  return arr1.length === arr2.length && arr1.every((value, index) => value === arr2[index]);
-}
-__name(uint8ArraysEqual, "uint8ArraysEqual");
-function useWalletAccountTransactionSendingSigner(uiWalletAccount, chain) {
-  const encoderRef = useRef(null);
-  const signAndSendTransaction = useSignAndSendTransaction(uiWalletAccount, chain);
-  return useMemo(
-    () => ({
-      address: address(uiWalletAccount.address),
-      async signAndSendTransactions(transactions, config = {}) {
-        const { abortSignal, ...options } = config;
-        abortSignal?.throwIfAborted();
-        let transactionEncoder = encoderRef.current;
-        if (!transactionEncoder) {
-          transactionEncoder = getTransactionEncoder();
-          encoderRef.current = transactionEncoder;
-        }
-        if (transactions.length > 1) {
-          throw new SolanaError(SOLANA_ERROR__SIGNER__WALLET_MULTISIGN_UNIMPLEMENTED);
-        }
-        if (transactions.length === 0) {
-          return [];
-        }
-        const [transaction] = transactions;
-        const wireTransactionBytes = transactionEncoder.encode(transaction);
-        const inputWithOptions = {
-          ...options,
-          transaction: wireTransactionBytes
-        };
-        const { signature } = await getAbortablePromise(signAndSendTransaction(inputWithOptions), abortSignal);
-        return Object.freeze([signature]);
-      }
-    }),
-    [signAndSendTransaction, uiWalletAccount.address]
-  );
-}
-__name(useWalletAccountTransactionSendingSigner, "useWalletAccountTransactionSendingSigner");
 
-export { SolanaClientProvider, SolanaProvider, SolanaQueryProvider, WalletConnectionManager, useAccount, useBalance, useClientStore, useClusterState, useClusterStatus, useConnectWallet, useDisconnectWallet, useLatestBlockhash, useProgramAccounts, useSendTransaction, useSignAndSendTransaction, useSignIn, useSignMessage, useSignTransaction, useSignatureStatus, useSimulateTransaction, useSolTransfer, useSolanaClient, useSplToken, useTransactionPool, useWaitForSignature, useWallet, useWalletAccountMessageSigner, useWalletAccountTransactionSendingSigner, useWalletAccountTransactionSigner, useWalletActions, useWalletConnection, useWalletModalState, useWalletSession, useWalletStandardConnectors };
+export { SolanaClientProvider, SolanaProvider, SolanaQueryProvider, WalletConnectionManager, getLatestBlockhashKey, getProgramAccountsKey, getSignatureStatusKey, getSimulateTransactionKey, useAccount, useBalance, useClientStore, useClusterState, useClusterStatus, useConnectWallet, useDisconnectWallet, useLatestBlockhash, useProgramAccounts, useSendTransaction, useSignatureStatus, useSimulateTransaction, useSolTransfer, useSolanaClient, useSplToken, useTransactionPool, useWaitForSignature, useWallet, useWalletActions, useWalletConnection, useWalletModalState, useWalletSession };
 //# sourceMappingURL=index.node.mjs.map
 //# sourceMappingURL=index.node.mjs.map