complete merge from main

Author: aqk

packages/api-react/src/services/index.ts

@@ -155,8 +155,7 @@ export const {
   useGetTransactionsCountQuery,
   useGetCurrentAddressQuery,
   useGetNextAddressMutation,
-  useGetCoinRecordsByNamesQuery,
-  useLazyGetCoinRecordsByNamesQuery,
+  useGetCoinRecordsByNamesMutation,
   usePushTransactionsMutation,
   useSelectCoinsQuery,
   useLazySelectCoinsQuery,

packages/api-react/src/services/wallet.ts

@@ -544,7 +544,7 @@ export const walletApi = apiWithTag.injectEndpoints({
       invalidatesTags: (result, _error, { walletId }) => (result ? [{ type: 'Address', id: walletId }] : []),
     }),
 
-    getCoinRecordsByNames: query(build, WalletService, 'getCoinRecordsByNames'),
+    getCoinRecordsByNames: mutation(build, WalletService, 'getCoinRecordsByNames'),
 
     pushTransactions: mutation(build, WalletService, 'pushTransactions', {
       invalidatesTags: [{ type: 'Transactions', id: 'LIST' }],
@@ -1567,8 +1567,7 @@ export const {
   useGetTransactionsCountQuery,
   useGetCurrentAddressQuery,
   useGetNextAddressMutation,
-  useGetCoinRecordsByNamesQuery,
-  useLazyGetCoinRecordsByNamesQuery,
+  useGetCoinRecordsByNamesMutation,
   usePushTransactionsMutation,
   useSelectCoinsQuery,
   useLazySelectCoinsQuery,

packages/core/src/hooks/useGetLatestVersionFromWebsite.ts

@@ -46,6 +46,16 @@ export default function useGetLatestVersionFromWebsite(): UseGetLatestVersionFro
       return;
     }
 
+    async function validateBlogUrl(blogUrlPath: string): Promise<boolean> {
+      try {
+        const fullBlogUrl = new URL(blogUrlPath, 'https://www.chia.net/').toString();
+        const blogResponse = await fetch(fullBlogUrl, { method: 'HEAD' });
+        return blogResponse.ok;
+      } catch {
+        return false;
+      }
+    }
+
     async function fetchLatestVersion() {
       try {
         const response = await fetch(latestVersionURL as string, {
@@ -59,11 +69,19 @@ export default function useGetLatestVersionFromWebsite(): UseGetLatestVersionFro
         const data = await response.json();
         const { version, downloadPageUrl, releaseNotesUrl, blogUrl } = data;
 
+        let validatedBlogUrl: string | null = blogUrl ?? null;
+        if (blogUrl) {
+          const blogExists = await validateBlogUrl(blogUrl);
+          if (!blogExists) {
+            validatedBlogUrl = null;
+          }
+        }
+
         setTimeout(() => {
           setLatestVersion(version);
           setDownloadPath(downloadPageUrl);
           setReleaseNotesPath(releaseNotesUrl);
-          setBlogPath(blogUrl);
+          setBlogPath(validatedBlogUrl);
           setIsLoading(false);
         }, 1000); /* we need the delay, otherwise dialog will close too fast */
       } catch (e) {

packages/gui/src/hooks/useWalletConnect.ts

@@ -40,15 +40,18 @@ export default function useWalletConnect(config: UseWalletConnectConfig) {
   const processRef = useRef(process);
   processRef.current = process;
 
+  const pairsRef = useRef(pairs);
+  pairsRef.current = pairs;
+
   const isLoadingData = isLoading || isLoadingWalletConnectCommand;
 
   useEffect(() => {
     if (!client) {
       return undefined;
     }
 
-    return bindEvents(client, pairs, () => processRef.current);
-  }, [client, pairs]);
+    return bindEvents(client, pairsRef.current, () => processRef.current);
+  }, [client]);
 
   const handlePair = useCallback(
     async (uri: string, fingerprints: number[], mainnet = false) => {
@@ -61,7 +64,7 @@ export default function useWalletConnect(config: UseWalletConnectConfig) {
         throw new Error('Pairing failed');
       }
 
-      pairs.addPair({
+      pairsRef.current.addPair({
         topic,
         fingerprints,
         mainnet,
@@ -70,7 +73,7 @@ export default function useWalletConnect(config: UseWalletConnectConfig) {
 
       return topic;
     },
-    [client, pairs],
+    [client],
   );
 
   const handleDisconnect = useCallback(
@@ -79,9 +82,9 @@ export default function useWalletConnect(config: UseWalletConnectConfig) {
         throw new Error('Client is not defined');
       }
 
-      return disconnectPair(client, pairs, topic);
+      return disconnectPair(client, pairsRef.current, topic);
     },
-    [client, pairs],
+    [client],
   );
 
   return {

packages/gui/src/hooks/useWalletConnectClient.ts

@@ -3,6 +3,15 @@ import { useState, useEffect, useCallback, useMemo } from 'react';
 
 import useWalletConnectPreferences from './useWalletConnectPreferences';
 
+function clearWalletConnectStorage(): void {
+  if (typeof indexedDB === 'undefined') return;
+  try {
+    indexedDB.deleteDatabase('WALLET_CONNECT_V2_INDEXED_DB');
+  } catch {
+    /* best-effort */
+  }
+}
+
 const defaultMetadata = {
   name: 'Chia Blockchain',
   description: 'GUI for Chia Blockchain',
@@ -93,7 +102,10 @@ export default function useWalletConnectClient(config: UseWalletConnectConfig) {
             return createdClient;
           })
           .catch((initError) => {
+            console.error('[WC] Client.init() failed, clearing storage', initError);
+            clearWalletConnectStorage();
             singleton.initPromise = undefined;
+            singleton.configKey = undefined;
             throw initError;
           });
       }

packages/gui/src/hooks/useWalletConnectPairs.ts

@@ -34,29 +34,50 @@ export default function useWalletConnectPairs(): Pairs {
   pairsRef.current = localStorageData;
 
   const updatePair = useCallback((topic: string, data: Partial<Omit<Pair, 'topic'>> | ((pair: Pair) => Pair)) => {
-    const [, setPairs] = pairsRef.current;
+    const [latestPairs, setPairs] = pairsRef.current;
+
+    const index = latestPairs.findIndex((item) => item.topic === topic);
+    if (index !== -1) {
+      const oldPair = latestPairs[index];
+      const newPairing = typeof data === 'function' ? data(oldPair) : { ...oldPair, ...data };
+      const newPairings = [...latestPairs];
+      newPairings[index] = newPairing;
+      pairsRef.current = [newPairings, setPairs];
+    }
+
     setPairs((pairs: Pair[]) => {
-      const index = pairs.findIndex((item) => item.topic === topic);
-      if (index === -1) {
+      const idx = pairs.findIndex((item) => item.topic === topic);
+      if (idx === -1) {
         return pairs;
       }
 
-      const oldPair = pairs[index];
+      const oldPair = pairs[idx];
       const newPairing = typeof data === 'function' ? data(oldPair) : { ...oldPair, ...data };
       const newPairings = [...pairs];
-      newPairings[index] = newPairing;
+      newPairings[idx] = newPairing;
 
       return newPairings;
     });
   }, []);
 
   const removePair = useCallback((topic: string) => {
-    const [, setPairs] = pairsRef.current;
+    const [latestPairs, setPairs] = pairsRef.current;
+    if (!latestPairs.some((item) => item.topic === topic)) {
+      return;
+    }
+
+    pairsRef.current = [latestPairs.filter((item) => item.topic !== topic), setPairs];
+
     setPairs((pairs: Pair[]) => pairs.filter((item) => item.topic !== topic));
   }, []);
 
   const removePairBySession = useCallback((sessionTopic: string) => {
-    const [, setPairs] = pairsRef.current;
+    const [latestPairs, setPairs] = pairsRef.current;
+    pairsRef.current = [
+      latestPairs.filter((item) => !item.sessions.find((session) => session.topic === sessionTopic)),
+      setPairs,
+    ];
+
     setPairs((pairs: Pair[]) =>
       pairs.filter((item) => !item.sessions.find((session) => session.topic === sessionTopic)),
     );
@@ -78,19 +99,31 @@ export default function useWalletConnectPairs(): Pairs {
   }, []);
 
   const addPair = useCallback((pair: Pair) => {
-    const [, setPairs] = pairsRef.current;
+    const [latestPairs, setPairs] = pairsRef.current;
+    if (latestPairs.findIndex((item) => item.topic === pair.topic) !== -1) {
+      throw new Error('Pair already exists');
+    }
+
+    pairsRef.current = [[...latestPairs, pair], setPairs];
+
     setPairs((pairs: Pair[]) => {
-      const index = pairs.findIndex((item) => item.topic === pair.topic);
-      if (index !== -1) {
-        throw new Error('Pair already exists');
+      if (pairs.some((item) => item.topic === pair.topic)) {
+        return pairs;
       }
-
       return [...pairs, pair];
     });
   }, []);
 
   const removeSessionFromPair = useCallback((sessionTopic: string) => {
-    const [, setPairs] = pairsRef.current;
+    const [latestPairs, setPairs] = pairsRef.current;
+    pairsRef.current = [
+      latestPairs.map((pair) => ({
+        ...pair,
+        sessions: pair.sessions.filter((item) => item.topic !== sessionTopic),
+      })),
+      setPairs,
+    ];
+
     setPairs((pairs: Pair[]) =>
       pairs.map((pair) => ({
         ...pair,

packages/gui/src/index.tsx

@@ -6,6 +6,31 @@ import { createRoot } from 'react-dom/client';
 import App from './components/app/App';
 import initPrefs from './init-prefs';
 
+// The WalletConnect SDK can reject internal promises with "No matching key"
+// during benign stale-pairing races (e.g. reconnecting after storage cleanup)
+// from async paths outside our try/catch sites, producing noisy errors in
+// DevTools. Suppress those specific rejections but leave a visible breadcrumb
+// so they are not completely silent, and scope the suppression to
+// WalletConnect-originated errors so unrelated code paths are not swallowed.
+window.addEventListener('unhandledrejection', (event) => {
+  const { reason } = event;
+  const message = reason?.message ?? String(reason);
+  const stack: string = reason?.stack ?? '';
+
+  if (!message.includes('No matching key')) {
+    return;
+  }
+
+  const isWalletConnectOrigin = /walletconnect/i.test(stack);
+  if (!isWalletConnectOrigin) {
+    console.warn('[chia-gui] "No matching key" rejection from non-WalletConnect origin; not suppressing:', reason);
+    return;
+  }
+
+  console.info('[chia-gui] Suppressing WalletConnect stale-key rejection:', message);
+  event.preventDefault();
+});
+
 // we need to use additional root for hot reloading
 function Root() {
   return <App />;