@pear-protocol/symmio-client 0.2.39 → 0.2.41

package/dist/react/index.mjs

@@ -3,6 +3,7 @@ import { createContext, useContext, useMemo, useRef, useCallback, useEffect } fr
 import { createSymmSDK, isAuthExpiredError, isNetworkError, isInsufficientMarginError, isRateLimitedError, isTimeoutError } from '@pear-protocol/symm-core';
 import { create } from 'zustand';
 import { jsx } from 'react/jsx-runtime';
+import { SiweMessage } from 'siwe';
 import { useQuery, useQueryClient, useMutation } from '@tanstack/react-query';
 import { isAddress, encodeFunctionData } from 'viem';
 
@@ -554,19 +555,17 @@ function createSiweMessage(params) {
   const expirationTime = new Date(
     Date.now() + 30 * 24 * 60 * 60 * 1e3
   ).toISOString();
-  const message = [
-    `${params.domain} wants you to sign in with your Ethereum account:`,
-    params.address,
-    "",
-    params.statement,
-    "",
-    `URI: ${params.uri}`,
-    `Version: ${version}`,
-    `Chain ID: ${params.chainId}`,
-    `Nonce: ${params.nonce}`,
-    `Issued At: ${issuedAt}`,
-    `Expiration Time: ${expirationTime}`
-  ].join("\n");
+  const message = new SiweMessage({
+    domain: params.domain,
+    address: params.address,
+    statement: params.statement,
+    chainId: params.chainId,
+    nonce: params.nonce,
+    version,
+    uri: params.uri,
+    issuedAt,
+    expirationTime
+  }).prepareMessage();
   return { message, issuedAt, expirationTime };
 }
 async function getNonce(chainId, subAccount) {
@@ -595,10 +594,24 @@ async function login(chainId, params) {
     body: JSON.stringify(body)
   });
   if (!response.ok) {
-    const errorData = await response.json().catch(() => null);
-    throw new Error(
-      errorData?.error_message ?? `Login failed: ${response.statusText}`
-    );
+    let errorMessage = "";
+    if (typeof response.text === "function") {
+      const rawBody = await response.text().catch(() => "");
+      if (rawBody) {
+        try {
+          const parsed = JSON.parse(rawBody);
+          errorMessage = parsed.error_message ?? parsed.message ?? parsed.detail ?? rawBody;
+        } catch {
+          errorMessage = rawBody;
+        }
+      }
+    }
+    if (!errorMessage && typeof response.json === "function") {
+      const errorData = await response.json().catch(() => null);
+      errorMessage = errorData?.error_message ?? errorData?.message ?? errorData?.detail ?? "";
+    }
+    const reason = errorMessage || response.statusText;
+    throw new Error(reason ? `Login failed: ${reason}` : "Login failed");
   }
   const data = await response.json();
   if (!data.access_token) {
@@ -662,15 +675,15 @@ function clearCachedToken(address, chainId) {
 }
 async function fetchAccessToken(walletClient, signerAddress, accountAddress, chainId, domain) {
   const resolvedDomain = domain ?? (typeof window !== "undefined" ? window.location.host : "localhost");
-  const uri = typeof window !== "undefined" ? window.location.origin : `https://${resolvedDomain}`;
+  const hedgerLoginUrl = new URL("login", getHedgerBaseUrl(chainId)).href;
   const nonce = await getNonce(chainId, accountAddress);
   const { message, issuedAt, expirationTime } = createSiweMessage({
     address: signerAddress,
-    statement: "Sign in to Symm Protocol",
+    statement: `msg: ${accountAddress}`,
     chainId,
     nonce,
     domain: resolvedDomain,
-    uri
+    uri: hedgerLoginUrl
   });
   const signature = await walletClient.signMessage({
     account: signerAddress,
@@ -730,40 +743,30 @@ function logSymmAuth(event, details) {
   }
   console.log("[symm-auth]", event, details ?? {});
 }
-function extractSubaccountAddresses(summary) {
-  const accounts = summary?.data?.accounts;
-  if (!Array.isArray(accounts)) {
-    return [];
-  }
-  return accounts.flatMap((account) => {
-    const accountAddress = account.accountAddress ?? account.address;
-    return accountAddress ? [accountAddress] : [];
-  });
-}
 function useSymmAuth(params) {
   const context = useSymmContext();
   const ctx = context;
-  const { symmCoreClient } = context;
   const address = params?.address ?? ctx.address;
   const chainId = params?.chainId ?? ctx.chainId ?? 42161;
   const walletClient = params?.walletClient ?? ctx.walletClient;
   const siweDomain = params?.siweDomain;
+  const activeAccountAddress = params?.activeAccountAddress ?? address;
   const token = useSymmAuthStore((state) => {
-    if (address) {
-      return state.tokensByKey[symmAuthTokenKey(address, chainId)] ?? null;
+    if (activeAccountAddress) {
+      return state.tokensByKey[symmAuthTokenKey(activeAccountAddress, chainId)] ?? null;
     }
     return ctx.accessToken ?? ctx.authToken ?? null;
   });
   const setToken = useSymmAuthStore((state) => state.setToken);
   const getToken = useSymmAuthStore((state) => state.getToken);
   const clearToken = useSymmAuthStore((state) => state.clearToken);
-  const previousAddressRef = useRef(address);
+  const previousAddressRef = useRef(activeAccountAddress);
   const previousChainIdRef = useRef(chainId);
   const refreshAuthRef = useRef(async () => null);
   const refreshAuth = useCallback(
     async (accountAddress, options) => {
       if (!walletClient || !address) return null;
-      const resolvedAccountAddress = accountAddress ?? address;
+      const resolvedAccountAddress = accountAddress ?? activeAccountAddress ?? address;
       if (!options?.force) {
         const inStore = getToken(resolvedAccountAddress, chainId);
         if (inStore) {
@@ -815,139 +818,70 @@ function useSymmAuth(params) {
         return null;
       }
     },
-    [walletClient, address, chainId, siweDomain, getToken, setToken, clearToken]
+    [walletClient, address, activeAccountAddress, chainId, siweDomain, getToken, setToken, clearToken]
   );
   refreshAuthRef.current = refreshAuth;
   const clearAuth = useCallback(() => {
-    if (address) {
-      clearCachedToken(address, chainId);
-      clearToken(address, chainId);
+    if (activeAccountAddress) {
+      clearCachedToken(activeAccountAddress, chainId);
+      clearToken(activeAccountAddress, chainId);
     }
-  }, [address, chainId, clearToken]);
-  console.log("symm auth", {
-    address,
-    chainId,
-    walletClient,
-    symmCoreClient
-  });
+  }, [activeAccountAddress, chainId, clearToken]);
   useEffect(() => {
     const previousAddress = previousAddressRef.current;
     const previousChainId = previousChainIdRef.current;
-    const addressChanged = previousAddress !== address;
+    const addressChanged = previousAddress !== activeAccountAddress;
     const chainChanged = previousChainId !== chainId;
     let cancelled = false;
-    previousAddressRef.current = address;
+    previousAddressRef.current = activeAccountAddress;
     previousChainIdRef.current = chainId;
     logSymmAuth("bootstrap:dependencies", {
-      address,
+      signerAddress: address,
+      activeAccountAddress,
       chainId,
       hasWalletClient: !!walletClient,
-      hasSymmCoreClient: !!symmCoreClient,
       hasRefreshAuth: !!refreshAuthRef.current,
       addressChanged,
       chainChanged,
       previousAddress,
       previousChainId
     });
-    console.log("bootstrap:dependencies", {
-      address,
-      chainId,
-      hasWalletClient: !!walletClient,
-      hasSymmCoreClient: !!symmCoreClient,
-      hasRefreshAuth: !!refreshAuthRef.current,
-      addressChanged,
-      chainChanged,
-      previousAddress,
-      previousChainId
-    });
-    if (!address) {
-      logSymmAuth("bootstrap:skip-no-address", {
+    if (!activeAccountAddress) {
+      logSymmAuth("bootstrap:skip-no-active-account", {
+        signerAddress: address,
         chainId,
-        hasWalletClient: !!walletClient,
-        hasSymmCoreClient: !!symmCoreClient
-      });
-      console.log("bootstrap:skip-no-address", {
-        chainId,
-        hasWalletClient: !!walletClient,
-        hasSymmCoreClient: !!symmCoreClient
+        hasWalletClient: !!walletClient
       });
       return;
     }
-    const userAddress = address;
     if (previousAddress && (addressChanged || chainChanged)) {
       clearCachedToken(previousAddress, previousChainId);
       clearToken(previousAddress, previousChainId);
     }
     async function bootstrapAuth() {
       logSymmAuth("bootstrap:run", {
-        userAddress,
+        signerAddress: address,
+        activeAccountAddress,
         chainId,
         hasWalletClient: !!walletClient,
-        hasSymmCoreClient: !!symmCoreClient,
         hasRefreshAuth: !!refreshAuthRef.current
       });
-      console.log("bootstrap:run", {
-        userAddress,
-        chainId,
-        hasWalletClient: !!walletClient,
-        hasSymmCoreClient: !!symmCoreClient,
-        hasRefreshAuth: !!refreshAuthRef.current
-      });
-      let targets = [userAddress];
-      if (symmCoreClient) {
-        try {
-          const summary = await symmCoreClient.accounts.getSummary({
-            userAddress,
-            chainId
-          });
-          const subaccounts = extractSubaccountAddresses(summary);
-          if (subaccounts.length > 0) {
-            targets = subaccounts;
-          }
-          logSymmAuth("bootstrap:subaccounts-resolved", {
-            userAddress,
-            chainId,
-            subaccounts
-          });
-          console.log("bootstrap:subaccounts-resolved", {
-            userAddress,
-            chainId,
-            subaccounts
-          });
-        } catch (error) {
-          logSymmAuth("bootstrap:subaccounts-failed", {
-            userAddress,
-            chainId,
-            error: error instanceof Error ? error.message : String(error)
-          });
-          console.log("bootstrap:subaccounts-failed", {
-            userAddress,
-            chainId,
-            error: error instanceof Error ? error.message : String(error)
-          });
-        }
-      }
-      const uniqueTargets = [...new Set(targets)].filter(
-        (accountAddress) => !!accountAddress
-      );
       logSymmAuth("bootstrap:start", {
-        userAddress,
+        signerAddress: address,
         chainId,
-        targets: uniqueTargets,
+        activeAccountAddress,
         walletReady: !!walletClient
       });
-      for (const accountAddress of uniqueTargets) {
-        if (cancelled) {
-          return;
-        }
-        await refreshAuthRef.current(accountAddress);
+      if (cancelled) {
+        return;
       }
+      await refreshAuthRef.current(activeAccountAddress);
     }
-    bootstrapAuth();
+    void bootstrapAuth();
     return () => {
       cancelled = true;
     };
-  }, [address, walletClient, chainId, symmCoreClient]);
+  }, [address, activeAccountAddress, walletClient, chainId, clearToken]);
   return {
     accessToken: token,
     authToken: token,
@@ -25199,6 +25133,7 @@ function useResolveTradeAuthToken(params = {}) {
   const chainId = params.chainId ?? context.chainId;
   const { refreshAuth } = useSymmAuth({
     address,
+    activeAccountAddress: address,
     chainId,
     walletClient: params.walletClient,
     siweDomain: params.siweDomain