fix: show Solana balance and SPL tokens in side panel

Three layered bugs were each sufficient to zero out Solana balance display;
all three are fixed together because fixing any one alone leaves the chain
still broken:

1. Wrong CAIP in shortListSymbolToCaip['SOL'] / shortListNameToCaip.solana.
   Previously pointed at wrapped-SOL SPL token
   (solana:.../solana:so111…, all lowercase). Now points at native SOL
   (solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501), matching
   pioneer-caip's ChainToCaip and vault-v11's config.

2. Wrong Pioneer endpoint for Solana. /charts/portfolio returns empty
   {balances:[], tokens:[]} for any Solana pubkey (verified via direct
   curl). Vault-v11 uses /portfolio via pioneer.GetPortfolioBalances,
   which returns natives + SPL tokens in one flat array. Route Solana
   pubkeys to a third batch hitting /portfolio with the required
   key:public-* Authorization header; EVM/UTXO still go through
   /charts/portfolio for its richer Zapper/Unchained token data.

3. Response case mismatch. Pioneer echoes CAIP/networkId back in
   lowercase regardless of request casing. The side-panel asset list
   uses canonical mixed-case network IDs from ChainToNetworkId, so
   strict b.networkId === asset.networkId comparisons in Balances.tsx
   silently dropped every Solana entry. Rewrite Solana entries to
   canonical casing before they enter the merged balances array.

Also eliminates a first-run race: the initial fetchBalancesFromPioneer()
fired before prefetchSolanaPubkey() persisted the Solana pubkey, so run 1
never included Solana at all. Chain a forced refetch on prefetch resolution
so the Solana entry lands in cachedBalances before the UI mounts.

Verified against the live Pioneer API: for the exact address the client
derives from the device at m/44'/501'/0'/0', /portfolio returns
{native SOL + 3 SPL tokens}.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: BitHighlander

chrome-extension/src/background/chainConfig.ts

@@ -39,7 +39,7 @@ export const shortListSymbolToCaip: Record<string, string> = {
   AVAX: 'eip155:43114/slip44:60',
   BSC: 'eip155:56/slip44:60',
   BNB: 'eip155:56/slip44:60',
-  SOL: 'solana:5eykt4usfv8p8njdtrepy1vzqkqzkvdp/solana:so11111111111111111111111111111111111111112',
+  SOL: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
 };
 
 export const shortListNameToCaip: Record<string, string> = {
@@ -60,7 +60,7 @@ export const shortListNameToCaip: Record<string, string> = {
   ripple: 'ripple:4109c6f2045fc7eff4cde8f9905d19c2/slip44:144',
   optimism: 'eip155:10/slip44:60',
   base: 'eip155:8453/slip44:60',
-  solana: 'solana:5eykt4usfv8p8njdtrepy1vzqkqzkvdp/solana:so11111111111111111111111111111111111111112',
+  solana: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
 };
 
 // ---- bip32ToAddressNList ----

chrome-extension/src/background/index.ts

@@ -181,22 +181,25 @@ async function fetchBalancesFromPioneer(forceRefresh = false): Promise<any[]> {
       console.log(`[fetchBalances] Sending ${pioneerPubkeys.length} pubkeys to Pioneer API`);
       console.log(`[fetchBalances] Sample pubkeys:`, pioneerPubkeys.slice(0, 3));
 
-      // Use /api/v1/charts/portfolio endpoint — blocking, includes Zapper/Unchained token fetch
-      const portfolioUrl = `${PIONEER_API}/api/v1/charts/portfolio`;
-
-      // Split into address-based (EVM, Cosmos, etc.) and xpub-based (UTXO) batches
-      // to prevent a bad xpub from poisoning the entire request
-      const addressPubkeys = pioneerPubkeys.filter(
+      // Two Pioneer endpoints, chosen per chain:
+      //   /charts/portfolio — EVM + UTXO + Cosmos (unauthenticated, returns tokens via Zapper/Unchained).
+      //                       Returns EMPTY for Solana, so Solana pubkeys must NOT go here.
+      //   /portfolio        — Solana (authenticated). Returns natives + SPL tokens in one flat array.
+      const chartsPortfolioUrl = `${PIONEER_API}/api/v1/charts/portfolio`;
+
+      const solanaPubkeys = pioneerPubkeys.filter(p => p.caip.toLowerCase().startsWith('solana:'));
+      const nonSolana = pioneerPubkeys.filter(p => !p.caip.toLowerCase().startsWith('solana:'));
+      const addressPubkeys = nonSolana.filter(
         p => !p.pubkey.startsWith('xpub') && !p.pubkey.startsWith('zpub') && !p.pubkey.startsWith('ypub'),
       );
-      const xpubPubkeys = pioneerPubkeys.filter(
+      const xpubPubkeys = nonSolana.filter(
         p => p.pubkey.startsWith('xpub') || p.pubkey.startsWith('zpub') || p.pubkey.startsWith('ypub'),
       );
 
       const fetchBatch = async (batch: typeof pioneerPubkeys, label: string) => {
         if (batch.length === 0) return { balances: [] as any[], tokens: [] as any[] };
         try {
-          const response = await fetch(portfolioUrl, {
+          const response = await fetch(chartsPortfolioUrl, {
             method: 'POST',
             headers: { 'Content-Type': 'application/json' },
             body: JSON.stringify({ pubkeys: batch, forceRefresh }),
@@ -217,14 +220,68 @@ async function fetchBalancesFromPioneer(forceRefresh = false): Promise<any[]> {
         }
       };
 
-      // Fetch both batches in parallel
-      const [addressResult, xpubResult] = await Promise.all([
+      // Pioneer echoes CAIP/networkId back in lowercase even when sent mixed-case.
+      // The side-panel asset list uses canonical mixed-case network IDs from
+      // ChainToNetworkId, so strict b.networkId === asset.networkId matches fail.
+      // Rewrite Solana entries back to canonical casing before returning.
+      const SOL_NETWORK_CANONICAL = 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp';
+      const normalizeSolanaCasing = (entry: any) => {
+        const caip = entry.caip || '';
+        const netId = entry.networkId || '';
+        if (netId.toLowerCase() === SOL_NETWORK_CANONICAL.toLowerCase()) {
+          entry.networkId = SOL_NETWORK_CANONICAL;
+        }
+        if (caip.toLowerCase().startsWith(SOL_NETWORK_CANONICAL.toLowerCase() + '/')) {
+          entry.caip = SOL_NETWORK_CANONICAL + caip.slice(SOL_NETWORK_CANONICAL.length);
+        }
+        return entry;
+      };
+
+      const fetchSolanaBatch = async (batch: typeof pioneerPubkeys) => {
+        if (batch.length === 0) return { balances: [] as any[], tokens: [] as any[] };
+        try {
+          const url = `${PIONEER_API}/api/v1/portfolio${forceRefresh ? '?forceRefresh=true' : ''}`;
+          const response = await fetch(url, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+              // Pioneer requires a queryKey — any public key works for read-only lookups.
+              Authorization: `key:public-${Date.now()}`,
+            },
+            body: JSON.stringify({ pubkeys: batch }),
+          });
+          if (!response.ok) {
+            console.warn(`[fetchBalances] solana batch returned ${response.status}`);
+            return { balances: [] as any[], tokens: [] as any[] };
+          }
+          const json = await response.json();
+          const allEntries: any[] = json?.balances || [];
+          const natives: any[] = [];
+          const tokens: any[] = [];
+          for (const raw of allEntries) {
+            const entry = normalizeSolanaCasing({ ...raw });
+            const caipPath = (entry.caip || '').split('/')[1] || '';
+            const isToken =
+              entry.type === 'token' || caipPath.startsWith('token:') || caipPath.startsWith('spl:');
+            if (isToken) tokens.push(entry);
+            else natives.push(entry);
+          }
+          console.log(`[fetchBalances] solana batch: ${natives.length} natives, ${tokens.length} tokens`);
+          return { balances: natives, tokens };
+        } catch (e: any) {
+          console.warn('[fetchBalances] solana batch error:', e.message);
+          return { balances: [] as any[], tokens: [] as any[] };
+        }
+      };
+
+      const [addressResult, xpubResult, solanaResult] = await Promise.all([
         fetchBatch(addressPubkeys, 'address'),
         fetchBatch(xpubPubkeys, 'xpub'),
+        fetchSolanaBatch(solanaPubkeys),
       ]);
 
-      const rawBalances: any[] = [...addressResult.balances, ...xpubResult.balances];
-      const rawTokens: any[] = [...addressResult.tokens, ...xpubResult.tokens];
+      const rawBalances: any[] = [...addressResult.balances, ...xpubResult.balances, ...solanaResult.balances];
+      const rawTokens: any[] = [...addressResult.tokens, ...xpubResult.tokens, ...solanaResult.tokens];
 
       if (rawBalances.length === 0 && rawTokens.length === 0) {
         console.warn('[fetchBalances] Pioneer returned 0 balances for', pioneerPubkeys.length, 'pubkeys');
@@ -438,12 +495,17 @@ const onStart = async function () {
         await web3ProviderStorage.saveWeb3Provider(defaultProvider);
       }
 
-      // Fetch balances in background (non-blocking)
+      // Fetch balances in background (non-blocking). First pass covers EVM/UTXO
+      // quickly — on first run the Solana pubkey hasn't been derived yet, so it
+      // won't be in this request.
       fetchBalancesFromPioneer().catch(e => console.warn(tag, 'Initial balance fetch failed:', e));
 
-      // Prefetch Solana pubkey so it shows up in the network dropdown without
-      // waiting for a dapp request. Non-blocking, silently no-ops in watch-only.
-      prefetchSolanaPubkey().catch(() => {});
+      // Prefetch Solana pubkey so it shows up in the network dropdown. Once the
+      // pubkey is registered, force a second balance fetch so Solana natives +
+      // SPL tokens land in cachedBalances (fixes first-run race).
+      prefetchSolanaPubkey()
+        .then(() => fetchBalancesFromPioneer(true))
+        .catch(() => {});
     } else {
       console.error(tag, 'FAILED TO INIT, No Ethereum address found');
     }