fix

Author: binarybaron

monero-rpc-pool/src/discovery.rs

@@ -1,3 +1,4 @@
+use std::collections::HashSet;
 use std::time::{Duration, Instant};
 
 use anyhow::Result;
@@ -76,10 +77,11 @@ impl NodeDiscovery {
         let mut nodes = monero_fail_response.monero.web_compatible;
         nodes.extend(monero_fail_response.monero.clear);
 
-        // Remove duplicates
+        // Remove duplicates using HashSet for O(n) complexity
+        let mut seen = HashSet::new();
         let mut unique_nodes = Vec::new();
         for node in nodes {
-            if !unique_nodes.contains(&node) {
+            if seen.insert(node.clone()) {
                 unique_nodes.push(node);
             }
         }
@@ -330,7 +332,21 @@ impl NodeDiscovery {
         for node_url in nodes.iter() {
             if let Ok(url) = url::Url::parse(node_url) {
                 let scheme = url.scheme();
-                let host = url.host_str().unwrap_or("");
+                
+                // Validate scheme - must be http or https
+                if !matches!(scheme, "http" | "https") {
+                    continue;
+                }
+                
+                // Validate host - must be non-empty
+                let Some(host) = url.host_str() else {
+                    continue;
+                };
+                if host.is_empty() {
+                    continue;
+                }
+                
+                // Validate port - must be present
                 let Some(port) = url.port() else {
                     continue;
                 };

src-gui/src/renderer/components/pages/help/SettingsBox.tsx

@@ -54,6 +54,7 @@ import {
   Delete,
   Edit,
   HourglassEmpty,
+  Refresh,
 } from "@mui/icons-material";
 
 import { getNetwork } from "store/config";
@@ -62,6 +63,8 @@ import InfoBox from "renderer/components/modal/swap/InfoBox";
 import { isValidMultiAddressWithPeerId } from "utils/parseUtils";
 
 import { useAppSelector } from "store/hooks";
+import { getNodeStatus } from "renderer/rpc";
+import { setStatus } from "store/features/nodesSlice";
 
 const PLACEHOLDER_ELECTRUM_RPC_URL = "ssl://blockstream.info:700";
 const PLACEHOLDER_MONERO_NODE_URL = "http://xmr-node.cakewallet.com:18081";
@@ -343,15 +346,49 @@ function MoneroRpcPoolSetting() {
 }
 
 /**
- * A setting that allows you to select the Monero Node URL to use.
- * Only shown when RPC pool is disabled.
+ * A setting that allows you to configure a single Monero Node URL.
+ * Gets disabled when RPC pool is enabled.
  */
 function MoneroNodeUrlSetting() {
-  const [tableVisible, setTableVisible] = useState(false);
   const network = getNetwork();
   const useMoneroRpcPool = useSettings((s) => s.useMoneroRpcPool);
+  const moneroNodeUrl = useSettings((s) => s.nodes[network][Blockchain.Monero][0] || "");
+  const nodeStatuses = useNodes((s) => s.nodes);
+  const dispatch = useAppDispatch();
+  const [isRefreshing, setIsRefreshing] = useState(false);
+
+  const currentNodes = useSettings((s) => s.nodes[network][Blockchain.Monero]);
+  
+  const handleNodeUrlChange = (newUrl: string) => {
+    // Remove existing nodes and add the new one
+    currentNodes.forEach(node => {
+      dispatch(removeNode({ network, type: Blockchain.Monero, node }));
+    });
+    
+    if (newUrl.trim()) {
+      dispatch(addNode({ network, type: Blockchain.Monero, node: newUrl.trim() }));
+    }
+  };
+
+  const handleRefreshStatus = async () => {
+    // Don't refresh if pool is enabled or no node URL is configured
+    if (!moneroNodeUrl || useMoneroRpcPool) return;
+    
+    setIsRefreshing(true);
+    try {
+      const status = await getNodeStatus(moneroNodeUrl, Blockchain.Monero, network);
+      
+      // Update the status in the store
+      dispatch(setStatus({ node: moneroNodeUrl, status, blockchain: Blockchain.Monero }));
+    } catch (error) {
+      console.error("Failed to refresh node status:", error);
+    } finally {
+      setIsRefreshing(false);
+    }
+  };
 
-  const isValid = (url: string) => isValidUrl(url, ["http"]);
+  const isValid = (url: string) => url === "" || isValidUrl(url, ["http"]);
+  const nodeStatus = moneroNodeUrl ? nodeStatuses[Blockchain.Monero][moneroNodeUrl] : null;
 
   return (
     <TableRow>
@@ -360,32 +397,55 @@ function MoneroNodeUrlSetting() {
           label="Custom Monero Node URL"
           tooltip={
             useMoneroRpcPool
-              ? "This setting is disabled because Monero RPC pool is enabled. Disable the RPC pool to configure custom nodes."
+              ? "This setting is disabled because Monero RPC pool is enabled. Disable the RPC pool to configure a custom node."
               : "This is the URL of the Monero node that the GUI will connect to. It is used to sync Monero transactions. If you leave this field empty, the GUI will choose from a list of known servers at random."
           }
           disabled={useMoneroRpcPool}
         />
       </TableCell>
       <TableCell>
-        <IconButton
-          onClick={() => setTableVisible(true)}
-          size="large"
-          disabled={useMoneroRpcPool}
-        >
-          {<Edit />}
-        </IconButton>
-        {tableVisible ? (
-          <NodeTableModal
-            open={tableVisible}
-            onClose={() => setTableVisible(false)}
-            network={network}
-            blockchain={Blockchain.Monero}
-            isValid={isValid}
+        <Box sx={{ display: "flex", alignItems: "center", gap: 1 }}>
+          <ValidatedTextField
+            value={moneroNodeUrl}
+            onValidatedChange={handleNodeUrlChange}
             placeholder={PLACEHOLDER_MONERO_NODE_URL}
+            disabled={useMoneroRpcPool}
+            fullWidth
+            isValid={isValid}
+            variant="outlined"
+            noErrorWhenEmpty
           />
-        ) : (
-          <></>
-        )}
+          <>
+            <Tooltip title={
+              useMoneroRpcPool 
+                ? "Node status checking is disabled when using the pool" 
+                : !moneroNodeUrl 
+                  ? "Enter a node URL to check status"
+                  : "Node status"
+            }>
+              <Box sx={{ display: "flex", alignItems: "center" }}>
+                <Circle
+                  color={useMoneroRpcPool || !moneroNodeUrl ? "gray" : (nodeStatus ? "green" : "red")}
+                />
+              </Box>
+            </Tooltip>
+            <Tooltip title={
+              useMoneroRpcPool 
+                ? "Node status refresh is disabled when using the pool" 
+                : !moneroNodeUrl 
+                  ? "Enter a node URL to refresh status"
+                  : "Refresh node status"
+            }>
+              <IconButton
+                onClick={handleRefreshStatus}
+                disabled={isRefreshing || useMoneroRpcPool || !moneroNodeUrl}
+                size="small"
+              >
+                {isRefreshing ? <HourglassEmpty /> : <Refresh />}
+              </IconButton>
+            </Tooltip>
+          </>
+        </Box>
       </TableCell>
     </TableRow>
   );

src-gui/src/renderer/rpc.ts

@@ -223,43 +223,20 @@ export async function initializeContext() {
   const bitcoinNodes =
     store.getState().settings.nodes[network][Blockchain.Bitcoin];
 
-  // For Monero nodes, check if we should use RPC pool or custom nodes
+  // For Monero nodes, get the configured node URL and pool setting
   const useMoneroRpcPool = store.getState().settings.useMoneroRpcPool;
-  let moneroNode = null;
-
-  if (!useMoneroRpcPool) {
-    // Using custom nodes - check availability and use the first working one
-    const moneroNodes =
-      store.getState().settings.nodes[network][Blockchain.Monero];
-
-    if (moneroNodes.length > 0) {
-      try {
-        moneroNode = await Promise.any(
-          moneroNodes.map(async (node) => {
-            const isAvailable = await getNodeStatus(
-              node,
-              Blockchain.Monero,
-              network,
-            );
-            if (isAvailable) {
-              return node;
-            }
-            throw new Error(`Monero node ${node} is not available`);
-          }),
-        );
-      } catch {
-        // If no Monero node is available, use null
-        moneroNode = null;
-      }
-    }
-  }
-  // If useMoneroRpcPool is true, moneroNode stays null and the backend will use RPC pool
+  const moneroNodes = store.getState().settings.nodes[network][Blockchain.Monero];
+  
+  // Always pass the first configured monero node URL directly without checking availability
+  // The backend will handle whether to use the pool or the custom node
+  const moneroNode = moneroNodes.length > 0 ? moneroNodes[0] : null;
 
   // Initialize Tauri settings
   const tauriSettings: TauriSettings = {
     electrum_rpc_urls: bitcoinNodes,
     monero_node_url: moneroNode,
     use_tor: useTor,
+    use_monero_rpc_pool: useMoneroRpcPool,
   };
 
   logger.info("Initializing context with settings", tauriSettings);

src-tauri/src/lib.rs

@@ -368,13 +368,10 @@ async fn initialize_context(
         .to_string_result()?;
 
     // Determine which Monero node to use:
-    // - If a specific node URL is provided in settings, use that
-    // - If None, start and use the local RPC pool
-    let monero_node_url = if let Some(provided_url) = settings.monero_node_url.clone() {
-        // User provided a specific node URL
-        Some(provided_url)
-    } else {
-        // No specific node provided, start RPC pool and use it
+    // - If using RPC pool, start and use the local RPC pool
+    // - Otherwise, use the provided node URL directly (even if empty)
+    let monero_node_url = if settings.use_monero_rpc_pool {
+        // Start RPC pool and use it
         let data_dir = data::data_dir_from(None, testnet).to_string_result()?;
         match monero_rpc_pool::start_server_with_random_port(
             monero_rpc_pool::config::Config::new_random_port(
@@ -407,6 +404,9 @@ async fn initialize_context(
                 None
             }
         }
+    } else {
+        // Use the provided node URL directly without checking availability
+        settings.monero_node_url.clone()
     };
 
     // Get app handle and create a Tauri handle

swap/src/cli/api/request.rs

@@ -1192,7 +1192,7 @@ pub async fn monero_recovery(
     }
 }
 
-#[tracing::instrument(fields(method = "get_current_swap"), skip(_context))]
+#[tracing::instrument(fields(method = "get_current_swap"), skip(context))]
 pub async fn get_current_swap(context: Arc<Context>) -> Result<serde_json::Value> {
     Ok(json!({
         "swap_id": context.swap_lock.get_current_swap_id().await,

swap/src/cli/api/tauri_bindings.rs

@@ -714,6 +714,8 @@ pub struct TauriSettings {
     pub electrum_rpc_urls: Vec<String>,
     /// Whether to initialize and use a tor client.
     pub use_tor: bool,
+    /// Whether to use the Monero RPC pool instead of custom nodes.
+    pub use_monero_rpc_pool: bool,
 }
 
 #[typeshare]