@pear-protocol/symmio-client 0.3.11 → 0.3.13

package/dist/react/index.d.mts

@@ -8552,12 +8552,16 @@ declare function useSymmBalances(params: {
 }): _tanstack_react_query.UseQueryResult<node_modules__pear_protocol_symm_core_dist_types.BalanceInfoResponse, Error>;
 
 type SymmTradeAuthParams = {
+    accountAddress?: Address;
     address?: Address;
     chainId?: number;
 };
 
 type OpenBasketMutationRequest = WithOptionalAuthToken<OpenBasketPositionRequest>;
-type ClosePositionMutationRequest = WithOptionalAuthToken<ClosePositionRequest>;
+type ClosePositionMutationRequest = WithOptionalAuthToken<ClosePositionRequest> & {
+    accountAddress?: Address;
+    chainId?: number;
+};
 type CloseAllPositionsMutationRequest = WithOptionalAuthToken<Parameters<NonNullable<ReturnType<typeof useSymmContext>['symmCoreClient']>['positions']['closeAll']>[0]>;
 type UpdatePositionMutationRequest = WithOptionalAuthToken<UpdatePositionRequest>;
 /**
@@ -8575,9 +8579,7 @@ declare function useSymmClosePositionMutation(paramsOrOptions?: SymmTradeAuthPar
     mutation?: SymmMutationConfig<unknown, Error, ClosePositionMutationRequest>;
 }, maybeOptions?: {
     mutation?: SymmMutationConfig<unknown, Error, ClosePositionMutationRequest>;
-}): _tanstack_react_query.UseMutationResult<_pear_protocol_symm_core.ClosePositionResponse | _pear_protocol_symm_core.CloseCommandResult, Error, Omit<ClosePositionRequest, "authToken"> & {
-    authToken?: string | undefined;
-}, unknown>;
+}): _tanstack_react_query.UseMutationResult<_pear_protocol_symm_core.ClosePositionResponse | _pear_protocol_symm_core.CloseCommandResult, Error, ClosePositionMutationRequest, unknown>;
 /**
  * Use case: Close all open positions for the provided request scope.
  */

package/dist/react/index.d.ts

@@ -8552,12 +8552,16 @@ declare function useSymmBalances(params: {
 }): _tanstack_react_query.UseQueryResult<node_modules__pear_protocol_symm_core_dist_types.BalanceInfoResponse, Error>;
 
 type SymmTradeAuthParams = {
+    accountAddress?: Address;
     address?: Address;
     chainId?: number;
 };
 
 type OpenBasketMutationRequest = WithOptionalAuthToken<OpenBasketPositionRequest>;
-type ClosePositionMutationRequest = WithOptionalAuthToken<ClosePositionRequest>;
+type ClosePositionMutationRequest = WithOptionalAuthToken<ClosePositionRequest> & {
+    accountAddress?: Address;
+    chainId?: number;
+};
 type CloseAllPositionsMutationRequest = WithOptionalAuthToken<Parameters<NonNullable<ReturnType<typeof useSymmContext>['symmCoreClient']>['positions']['closeAll']>[0]>;
 type UpdatePositionMutationRequest = WithOptionalAuthToken<UpdatePositionRequest>;
 /**
@@ -8575,9 +8579,7 @@ declare function useSymmClosePositionMutation(paramsOrOptions?: SymmTradeAuthPar
     mutation?: SymmMutationConfig<unknown, Error, ClosePositionMutationRequest>;
 }, maybeOptions?: {
     mutation?: SymmMutationConfig<unknown, Error, ClosePositionMutationRequest>;
-}): _tanstack_react_query.UseMutationResult<_pear_protocol_symm_core.ClosePositionResponse | _pear_protocol_symm_core.CloseCommandResult, Error, Omit<ClosePositionRequest, "authToken"> & {
-    authToken?: string | undefined;
-}, unknown>;
+}): _tanstack_react_query.UseMutationResult<_pear_protocol_symm_core.ClosePositionResponse | _pear_protocol_symm_core.CloseCommandResult, Error, ClosePositionMutationRequest, unknown>;
 /**
  * Use case: Close all open positions for the provided request scope.
  */

package/dist/react/index.js

@@ -72,6 +72,9 @@ function toBinanceSymbol(symmSymbol) {
 // src/utils/binance-ws.ts
 var BINANCE_WS_URL = "wss://fstream.binance.com/market/ws";
 var RECONNECT_DELAYS = [1e3, 2e3, 4e3, 8e3, 16e3, 3e4];
+var IDLE_CLOSE_DELAY_MS = 3e4;
+var STALE_CONNECTION_MS = 3e4;
+var STALE_CHECK_INTERVAL_MS = 1e4;
 var STABLE_QUOTES = ["USDT0", "USDT", "USDC", "USDE", "USDH", "USD"];
 function normalizeBaseSymbol(symbol) {
   const normalized = symbol.toUpperCase().trim();
@@ -121,8 +124,11 @@ var BinanceWsManager = class {
   streams = /* @__PURE__ */ new Map();
   reconnectAttempt = 0;
   reconnectTimer = null;
+  idleCloseTimer = null;
+  staleCheckTimer = null;
   intentionalClose = false;
-  pendingSubscribes = [];
+  pendingSubscribes = /* @__PURE__ */ new Set();
+  lastMessageAt = 0;
   idCounter = 0;
   /**
    * Subscribe to a kline stream. Returns an unsubscribe function.
@@ -195,10 +201,10 @@ var BinanceWsManager = class {
    */
   destroy() {
     this.intentionalClose = true;
-    if (this.reconnectTimer) {
-      clearTimeout(this.reconnectTimer);
-      this.reconnectTimer = null;
-    }
+    this.clearReconnectTimer();
+    this.clearIdleCloseTimer();
+    this.clearStaleCheckTimer();
+    this.pendingSubscribes.clear();
     if (this.ws) {
       this.ws.close();
       this.ws = null;
@@ -218,6 +224,7 @@ var BinanceWsManager = class {
     }
     sub.callbacks.set(id, cb);
     if (isNew) {
+      this.clearIdleCloseTimer();
       this.ensureConnected();
       this.sendSubscribe([streamName]);
     }
@@ -229,18 +236,14 @@ var BinanceWsManager = class {
     if (sub.callbacks.size === 0) {
       this.streams.delete(streamName);
       this.sendUnsubscribe([streamName]);
-      if (this.streams.size === 0 && this.ws) {
-        this.intentionalClose = true;
-        this.ws.close();
-        this.ws = null;
-        this.intentionalClose = false;
-      }
+      this.scheduleIdleClose();
     }
   }
   ensureConnected() {
     if (this.ws && (this.ws.readyState === WebSocket.OPEN || this.ws.readyState === WebSocket.CONNECTING)) {
       return;
     }
+    this.clearReconnectTimer();
     this.connect();
   }
   connect() {
@@ -249,23 +252,27 @@ var BinanceWsManager = class {
     this.ws = new WebSocket(BINANCE_WS_URL);
     this.ws.onopen = () => {
       this.reconnectAttempt = 0;
-      const activeStreams = Array.from(this.streams.keys());
+      this.lastMessageAt = Date.now();
+      this.startStaleCheck();
+      const activeStreams = Array.from(
+        /* @__PURE__ */ new Set([...this.streams.keys(), ...this.pendingSubscribes])
+      );
+      this.pendingSubscribes.clear();
       if (activeStreams.length > 0) {
         this.sendSubscribe(activeStreams);
       }
-      if (this.pendingSubscribes.length > 0) {
-        this.sendSubscribe(this.pendingSubscribes);
-        this.pendingSubscribes = [];
-      }
     };
     this.ws.onmessage = (event) => {
       try {
         const data = JSON.parse(event.data);
+        this.lastMessageAt = Date.now();
         this.handleMessage(data);
       } catch {
       }
     };
     this.ws.onclose = () => {
+      this.ws = null;
+      this.clearStaleCheckTimer();
       if (this.intentionalClose) return;
       this.scheduleReconnect();
     };
@@ -299,25 +306,27 @@ var BinanceWsManager = class {
   }
   sendSubscribe(streams) {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      this.pendingSubscribes.push(...streams);
+      streams.forEach((stream) => this.pendingSubscribes.add(stream));
       return;
     }
+    const params = Array.from(new Set(streams));
+    if (params.length === 0) return;
     this.ws.send(JSON.stringify({
       method: "SUBSCRIBE",
-      params: streams,
+      params,
       id: Date.now()
     }));
   }
   sendUnsubscribe(streams) {
     if (!this.ws || this.ws.readyState !== WebSocket.OPEN) {
-      this.pendingSubscribes = this.pendingSubscribes.filter(
-        (s) => !streams.includes(s)
-      );
+      streams.forEach((stream) => this.pendingSubscribes.delete(stream));
       return;
     }
+    const params = Array.from(new Set(streams));
+    if (params.length === 0) return;
     this.ws.send(JSON.stringify({
       method: "UNSUBSCRIBE",
-      params: streams,
+      params,
       id: Date.now()
     }));
   }
@@ -331,6 +340,44 @@ var BinanceWsManager = class {
       this.connect();
     }, delay);
   }
+  scheduleIdleClose() {
+    if (this.streams.size > 0 || this.idleCloseTimer) return;
+    this.clearReconnectTimer();
+    if (!this.ws) return;
+    this.idleCloseTimer = setTimeout(() => {
+      this.idleCloseTimer = null;
+      if (this.streams.size > 0 || !this.ws) return;
+      this.intentionalClose = true;
+      this.ws.close();
+      this.ws = null;
+      this.intentionalClose = false;
+      this.clearStaleCheckTimer();
+    }, IDLE_CLOSE_DELAY_MS);
+  }
+  startStaleCheck() {
+    this.clearStaleCheckTimer();
+    this.staleCheckTimer = setInterval(() => {
+      if (!this.ws || this.ws.readyState !== WebSocket.OPEN) return;
+      if (this.streams.size === 0) return;
+      if (Date.now() - this.lastMessageAt < STALE_CONNECTION_MS) return;
+      this.ws.close();
+    }, STALE_CHECK_INTERVAL_MS);
+  }
+  clearReconnectTimer() {
+    if (!this.reconnectTimer) return;
+    clearTimeout(this.reconnectTimer);
+    this.reconnectTimer = null;
+  }
+  clearIdleCloseTimer() {
+    if (!this.idleCloseTimer) return;
+    clearTimeout(this.idleCloseTimer);
+    this.idleCloseTimer = null;
+  }
+  clearStaleCheckTimer() {
+    if (!this.staleCheckTimer) return;
+    clearInterval(this.staleCheckTimer);
+    this.staleCheckTimer = null;
+  }
 };
 var _instance = null;
 function getBinanceWsManager() {
@@ -361,6 +408,28 @@ function getNextRefCount(binanceSymbol) {
 function getPrevRefCount(binanceSymbol) {
   return Math.max(0, (refCounts.get(binanceSymbol) ?? 0) - 1);
 }
+function addMappedSymbol(binanceSymbol, symmSymbol) {
+  const symbols = streamSymbols.get(binanceSymbol) ?? /* @__PURE__ */ new Map();
+  symbols.set(symmSymbol, (symbols.get(symmSymbol) ?? 0) + 1);
+  streamSymbols.set(binanceSymbol, symbols);
+}
+function removeMappedSymbol(binanceSymbol, symmSymbol) {
+  const symbols = streamSymbols.get(binanceSymbol);
+  if (!symbols) return false;
+  const currentCount = symbols.get(symmSymbol) ?? 0;
+  if (currentCount <= 0) return false;
+  if (currentCount === 1) {
+    symbols.delete(symmSymbol);
+  } else {
+    symbols.set(symmSymbol, currentCount - 1);
+  }
+  if (symbols.size === 0) {
+    streamSymbols.delete(binanceSymbol);
+  } else {
+    streamSymbols.set(binanceSymbol, symbols);
+  }
+  return true;
+}
 var useBinanceMarkPriceStore = zustand.create((set) => ({
   markPrices: {},
   fundingRates: {},
@@ -369,9 +438,7 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
     const binanceSymbol = normalizeBinanceSymbol(rawBinanceSymbol);
     const nextRefCount = getNextRefCount(binanceSymbol);
     refCounts.set(binanceSymbol, nextRefCount);
-    const symbols = streamSymbols.get(binanceSymbol) ?? /* @__PURE__ */ new Set();
-    symbols.add(symmSymbol);
-    streamSymbols.set(binanceSymbol, symbols);
+    addMappedSymbol(binanceSymbol, symmSymbol);
     if (allMarkPricesRefCount === 0) {
       const wsManager = getBinanceWsManager();
       allMarkPricesUnsubscribe = wsManager.subscribeAllMarkPrices((entries) => {
@@ -386,7 +453,7 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
             nextMarkPrices ??= { ...state.markPrices };
             nextFundingRates ??= { ...state.fundingRates };
             nextFundingTimes ??= { ...state.nextFundingTimes };
-            mappedSymbols.forEach((mappedSymbol) => {
+            mappedSymbols.forEach((_count, mappedSymbol) => {
               nextMarkPrices[mappedSymbol] = entry.markPrice;
               nextFundingRates[mappedSymbol] = entry.fundingRate;
               nextFundingTimes[mappedSymbol] = entry.nextFundingTime;
@@ -407,14 +474,9 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
   },
   unsubscribeSymbol: (symmSymbol, rawBinanceSymbol) => {
     const binanceSymbol = normalizeBinanceSymbol(rawBinanceSymbol);
-    const symbols = streamSymbols.get(binanceSymbol);
-    if (symbols) {
-      symbols.delete(symmSymbol);
-      if (symbols.size === 0) {
-        streamSymbols.delete(binanceSymbol);
-      } else {
-        streamSymbols.set(binanceSymbol, symbols);
-      }
+    const removedSubscription = removeMappedSymbol(binanceSymbol, symmSymbol);
+    if (!removedSubscription) {
+      return;
     }
     const nextRefCount = getPrevRefCount(binanceSymbol);
     if (nextRefCount === 0) {
@@ -428,6 +490,10 @@ var useBinanceMarkPriceStore = zustand.create((set) => ({
       allMarkPricesUnsubscribe = null;
     }
     set((state) => {
+      const hasMappedSymbol = Boolean(streamSymbols.get(binanceSymbol)?.has(symmSymbol));
+      if (hasMappedSymbol) {
+        return state;
+      }
       if (state.markPrices[symmSymbol] == null && state.fundingRates[symmSymbol] == null && state.nextFundingTimes[symmSymbol] == null) {
         return state;
       }
@@ -545,8 +611,33 @@ var useSymmWsStore = zustand.create((set) => ({
 }));
 
 // src/react/hooks/use-symm-ws.ts
-function asUnsubscribeFn(value) {
-  return typeof value === "function" ? value : null;
+var wsOwnerCounts = /* @__PURE__ */ new WeakMap();
+var wsConnectPromises = /* @__PURE__ */ new WeakMap();
+function addWsOwner(ws) {
+  wsOwnerCounts.set(ws, (wsOwnerCounts.get(ws) ?? 0) + 1);
+}
+function removeWsOwner(ws) {
+  const nextCount = Math.max(0, (wsOwnerCounts.get(ws) ?? 0) - 1);
+  if (nextCount === 0) {
+    wsOwnerCounts.delete(ws);
+  } else {
+    wsOwnerCounts.set(ws, nextCount);
+  }
+  return nextCount;
+}
+function connectShared(ws) {
+  if (ws.isConnected()) {
+    return Promise.resolve();
+  }
+  const existing = wsConnectPromises.get(ws);
+  if (existing) {
+    return existing;
+  }
+  const promise = ws.connect().finally(() => {
+    wsConnectPromises.delete(ws);
+  });
+  wsConnectPromises.set(ws, promise);
+  return promise;
 }
 function useSymmWs(params = {}) {
   const ctx = react.useContext(SymmContext);
@@ -563,114 +654,76 @@ function useSymmWs(params = {}) {
     }
     const ws = symmCoreClient.ws;
     const addr = accountAddress;
-    const unsubscribers = [];
     let cancelled = false;
-    const removeOnConnect = ws.onConnect(() => {
-      setConnected(true);
+    addWsOwner(ws);
+    const removeOnConnect = ws.onConnect(() => setConnected(true));
+    const removeOnDisconnect = ws.onDisconnect(() => setConnected(false));
+    const subscriptions = [];
+    const addSubscription = (channel, handler) => {
+      ws.subscribe(channel, addr, chainId, handler);
+      subscriptions.push({ channel, handler });
+    };
+    addSubscription("positions", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.positionsRoot });
     });
-    const removeOnDisconnect = ws.onDisconnect(() => {
-      setConnected(false);
+    addSubscription("open-orders", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
     });
-    const removeOnError = asUnsubscribeFn(ws.onError?.(() => {
-    }));
-    const removeOnWelcome = asUnsubscribeFn(ws.onWelcome?.(() => {
-    }));
-    unsubscribers.push(removeOnConnect, removeOnDisconnect);
-    if (removeOnError) unsubscribers.push(removeOnError);
-    if (removeOnWelcome) unsubscribers.push(removeOnWelcome);
-    const positionsUnsub = asUnsubscribeFn(
-      ws.subscribeToPositions(addr, chainId, () => {
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.positionsRoot
-        });
-      })
-    );
-    if (positionsUnsub) unsubscribers.push(positionsUnsub);
-    const openOrdersUnsub = asUnsubscribeFn(
-      ws.subscribeToOpenOrders(addr, chainId, () => {
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.openOrdersRoot
-        });
-      })
-    );
-    if (openOrdersUnsub) unsubscribers.push(openOrdersUnsub);
-    const tradesUnsub = asUnsubscribeFn(
-      ws.subscribeToTrades(addr, chainId, () => {
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.tradeHistoryRoot
-        });
-      })
-    );
-    if (tradesUnsub) unsubscribers.push(tradesUnsub);
-    const accountSummaryUnsub = asUnsubscribeFn(
-      ws.subscribeToAccountSummary(addr, chainId, () => {
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.balances(accountAddress, chainId)
-        });
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.accountSummary(accountAddress, chainId)
-        });
-      })
-    );
-    if (accountSummaryUnsub) unsubscribers.push(accountSummaryUnsub);
-    const notificationsUnsub = asUnsubscribeFn(
-      ws.subscribeToNotifications(addr, chainId, () => {
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.notifications({ accountAddress, chainId })
-        });
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.unreadCount({ accountAddress, chainId })
-        });
-      })
-    );
-    if (notificationsUnsub) unsubscribers.push(notificationsUnsub);
-    const tpslUnsub = asUnsubscribeFn(
-      ws.subscribeToTpsl(addr, chainId, () => {
-        queryClient.invalidateQueries({ queryKey: symmKeys.tpslOrdersRoot });
-        queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
-      })
-    );
-    if (tpslUnsub) unsubscribers.push(tpslUnsub);
-    const twapUnsub = asUnsubscribeFn(
-      ws.subscribeToTwapOrders(addr, chainId, () => {
-        queryClient.invalidateQueries({ queryKey: symmKeys.twapOrdersRoot });
-        queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
-      })
-    );
-    if (twapUnsub) unsubscribers.push(twapUnsub);
-    const triggerOrdersUnsub = asUnsubscribeFn(
-      ws.subscribeToTriggerOrders(addr, chainId, () => {
-        queryClient.invalidateQueries({ queryKey: symmKeys.triggerOrdersRoot });
-        queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
-      })
-    );
-    if (triggerOrdersUnsub) unsubscribers.push(triggerOrdersUnsub);
-    const executionsUnsub = asUnsubscribeFn(
-      ws.subscribeToExecutions(addr, chainId, () => {
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.positionsRoot
-        });
-        queryClient.invalidateQueries({
-          queryKey: symmKeys.portfolioRoot
-        });
-      })
-    );
-    if (executionsUnsub) unsubscribers.push(executionsUnsub);
-    void ws.connect().then(() => {
-      if (cancelled) {
-        return;
+    addSubscription("trades", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.tradeHistoryRoot });
+    });
+    addSubscription("account-summary", () => {
+      queryClient.invalidateQueries({
+        queryKey: symmKeys.balances(accountAddress, chainId)
+      });
+      queryClient.invalidateQueries({
+        queryKey: symmKeys.accountSummary(accountAddress, chainId)
+      });
+    });
+    addSubscription("notifications", () => {
+      queryClient.invalidateQueries({
+        queryKey: symmKeys.notifications({ accountAddress, chainId })
+      });
+      queryClient.invalidateQueries({
+        queryKey: symmKeys.unreadCount({ accountAddress, chainId })
+      });
+    });
+    addSubscription("tpsl", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.tpslOrdersRoot });
+      queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
+    });
+    addSubscription("twap-orders", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.twapOrdersRoot });
+      queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
+    });
+    addSubscription("trigger-orders", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.triggerOrdersRoot });
+      queryClient.invalidateQueries({ queryKey: symmKeys.openOrdersRoot });
+    });
+    addSubscription("executions", () => {
+      queryClient.invalidateQueries({ queryKey: symmKeys.positionsRoot });
+      queryClient.invalidateQueries({ queryKey: symmKeys.portfolioRoot });
+    });
+    void connectShared(ws).then(() => {
+      if (cancelled) return;
+      if (ws.isConnected()) {
+        setConnected(true);
       }
     }).catch(() => {
-      if (cancelled) {
-        return;
-      }
+      if (cancelled) return;
       setConnected(false);
     });
     return () => {
       cancelled = true;
-      unsubscribers.forEach((unsubscribe) => unsubscribe());
-      ws.disconnect();
-      setConnected(false);
+      removeOnConnect();
+      removeOnDisconnect();
+      subscriptions.forEach(({ channel, handler }) => {
+        ws.unsubscribe(channel, addr, chainId, handler);
+      });
+      if (removeWsOwner(ws) === 0) {
+        ws.disconnect();
+        setConnected(false);
+      }
     };
   }, [symmCoreClient, accountAddress, chainId, queryClient, setConnected]);
   return { isConnected };
@@ -833,28 +886,54 @@ async function login(chainId, params) {
 var TOKEN_STORAGE_PREFIX = "symm_access_token";
 var TOKEN_STORAGE_VERSION = 1;
 function cacheKey(address, chainId) {
-  return `${address}:${chainId}`;
+  return `${address.toLowerCase()}:${chainId}`;
 }
 function storageKey(address, chainId) {
   return `${TOKEN_STORAGE_PREFIX}:${TOKEN_STORAGE_VERSION}:${cacheKey(address, chainId)}`;
 }
+function findStorageKey(address, chainId) {
+  const canonicalKey = storageKey(address, chainId);
+  if (typeof window === "undefined") return canonicalKey;
+  if (window.localStorage.getItem(canonicalKey) != null) {
+    return canonicalKey;
+  }
+  const normalizedKey = canonicalKey.toLowerCase();
+  for (let index = 0; index < window.localStorage.length; index += 1) {
+    const key = window.localStorage.key(index);
+    if (key?.toLowerCase() === normalizedKey) {
+      return key;
+    }
+  }
+  return canonicalKey;
+}
+function removeStoredTokenKeys(address, chainId) {
+  if (typeof window === "undefined") return;
+  const normalizedKey = storageKey(address, chainId).toLowerCase();
+  for (let index = window.localStorage.length - 1; index >= 0; index -= 1) {
+    const key = window.localStorage.key(index);
+    if (key?.toLowerCase() === normalizedKey) {
+      window.localStorage.removeItem(key);
+    }
+  }
+}
 function getCachedTokenEntry(address, chainId) {
   if (typeof window === "undefined") return null;
+  const key = findStorageKey(address, chainId);
   try {
-    const raw = window.localStorage.getItem(storageKey(address, chainId));
+    const raw = window.localStorage.getItem(key);
     if (!raw) return null;
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed.token !== "string" || typeof parsed.expiresAt !== "number") {
-      window.localStorage.removeItem(storageKey(address, chainId));
+      window.localStorage.removeItem(key);
       return null;
     }
     if (Date.now() >= parsed.expiresAt) {
-      window.localStorage.removeItem(storageKey(address, chainId));
+      window.localStorage.removeItem(key);
       return null;
     }
     return parsed;
   } catch {
-    window.localStorage.removeItem(storageKey(address, chainId));
+    window.localStorage.removeItem(key);
     return null;
   }
 }
@@ -869,9 +948,7 @@ function writeStoredToken(address, chainId, cached) {
   }
 }
 function clearCachedToken(address, chainId) {
-  if (typeof window !== "undefined") {
-    window.localStorage.removeItem(storageKey(address, chainId));
-  }
+  removeStoredTokenKeys(address, chainId);
 }
 async function fetchAccessTokenEntry(walletClient, signerAddress, accountAddress, chainId, domain) {
   const resolvedDomain = domain ?? (typeof window !== "undefined" ? window.location.hostname : "localhost");
@@ -905,7 +982,7 @@ async function fetchAccessTokenEntry(walletClient, signerAddress, accountAddress
   return cachedToken;
 }
 function authStoreKey(accountAddress, chainId, signerAddress) {
-  return `${accountAddress}:${chainId}:${signerAddress ?? ""}`;
+  return `${accountAddress.toLowerCase()}:${chainId}:${signerAddress?.toLowerCase() ?? ""}`;
 }
 function getEntryFromSnapshot(state, accountAddress, chainId, signerAddress) {
   const signerScoped = state.entries[authStoreKey(accountAddress, chainId, signerAddress)];
@@ -2346,14 +2423,15 @@ function splitTradeHookArgs(paramsOrOptions, options) {
 function useResolveTradeAuthToken(params = {}) {
   const context = useSymmContext();
   const address = params.address ?? context.address;
+  const defaultAccountAddress = params.accountAddress ?? address;
   const chainId = params.chainId ?? context.chainId;
   return react.useCallback(
-    async (providedAuthToken, accountAddress, overrideChainId) => {
+    async (providedAuthToken, requestAccountAddress, overrideChainId) => {
       const resolvedChainId = overrideChainId ?? chainId;
       if (providedAuthToken) {
         return providedAuthToken;
       }
-      const resolvedAccountAddress = accountAddress ?? address;
+      const resolvedAccountAddress = requestAccountAddress ?? defaultAccountAddress;
       if (!resolvedAccountAddress) {
         return null;
       }
@@ -2367,7 +2445,7 @@ function useResolveTradeAuthToken(params = {}) {
       }
       return null;
     },
-    [address, chainId]
+    [address, defaultAccountAddress, chainId]
   );
 }
 
@@ -25616,7 +25694,8 @@ function useSymmClosePositionMutation(paramsOrOptions, maybeOptions) {
       const typedRequest = request;
       const authToken = await resolveAuthToken(
         typedRequest.authToken,
-        typedRequest.accountAddress
+        typedRequest.accountAddress,
+        typedRequest.chainId
       );
       if (!authToken) {
         throw new Error("auth token is required to close a position");