From ce31302404b3cf2ef6b324336ad0d8552625b1e5 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Mon, 15 Sep 2025 12:12:45 -0400
Subject: [PATCH 01/27] First UI pieces

---
 .../src/components/RouterTooltip.tsx          | 14 +++
 .../src/components/SpecifyRoutersCheckbox.tsx | 27 ++++++
 .../register-ui/src/pages/CommitDotOsName.tsx | 91 ++++++++++++++++---
 3 files changed, 121 insertions(+), 11 deletions(-)
 create mode 100644 hyperdrive/src/register-ui/src/components/RouterTooltip.tsx
 create mode 100644 hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx

diff --git a/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx b/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx
new file mode 100644
index 000000000..5abcbb518
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import { Tooltip } from "./Tooltip";
+
+export const RouterTooltip: React.FC = () => {
+    return (
+        <Tooltip
+            text={`
+        For indirect nodes, you can specify which router nodes to use for networking.
+        Routers are direct nodes that help relay traffic for indirect nodes.
+        If unchecked, the system will automatically select appropriate routers.
+      `}
+        />
+    );
+};
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
new file mode 100644
index 000000000..f618e85c1
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
@@ -0,0 +1,27 @@
+
+import { RouterTooltip } from "./RouterTooltip";
+import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
+
+interface SpecifyRoutersProps {
+    specifyRouters: boolean;
+    setSpecifyRouters: (specifyRouters: boolean) => void;
+}
+
+export default function SpecifyRoutersCheckbox({ specifyRouters, setSpecifyRouters }: SpecifyRoutersProps) {
+    return (
+        <div className="flex gap-2 items-center">
+            <button className="icon" onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setSpecifyRouters(!specifyRouters);
+            }}>
+                {specifyRouters ? <FaSquareCheck /> : <FaRegSquare />}
+            </button>
+            <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
+                <span className="text-sm">Specify routers for an indirect node.</span>
+                <span className="text-xs">If you are unsure, leave unchecked.</span>
+            </div>
+            <RouterTooltip />
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index df2d06150..064a263e7 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -6,6 +6,7 @@ import Loader from "../components/Loader";
 import { PageProps } from "../lib/types";
 
 import DirectNodeCheckbox from "../components/DirectCheckbox";
+import SpecifyRoutersCheckbox from "../components/SpecifyRoutersCheckbox";
 import { Tooltip } from "../components/Tooltip";
 
 import { useAccount, useWaitForTransactionReceipt, useWriteContract } from "wagmi";
@@ -17,15 +18,15 @@ import BackButton from "../components/BackButton";
 interface RegisterOsNameProps extends PageProps { }
 
 function CommitDotOsName({
-    direct,
-    setDirect,
-    setHnsName,
-    setNetworkingKey,
-    setIpAddress,
-    setWsPort,
-    setTcpPort,
-    setRouters,
-}: RegisterOsNameProps) {
+                             direct,
+                             setDirect,
+                             setHnsName,
+                             setNetworkingKey,
+                             setIpAddress,
+                             setWsPort,
+                             setTcpPort,
+                             setRouters,
+                         }: RegisterOsNameProps) {
     let { address } = useAccount();
     let navigate = useNavigate();
     let { openConnectModal } = useConnectModal();
@@ -47,6 +48,43 @@ function CommitDotOsName({
     const [nameValidities, setNameValidities] = useState<string[]>([])
     const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false)
     const [isConfirmed, setIsConfirmed] = useState(false)
+    const [specifyRouters, setSpecifyRouters] = useState(false)
+    const [customRouters, setCustomRouters] = useState('')
+
+    // Modified setDirect function to handle mutual exclusivity
+    const handleSetDirect = (value: boolean) => {
+        setDirect(value);
+        if (value) {
+            setSpecifyRouters(false);
+            setCustomRouters(''); // Clear custom routers when switching to direct
+        }
+    };
+
+    // Modified setSpecifyRouters function to handle mutual exclusivity
+    const handleSetSpecifyRouters = (value: boolean) => {
+        setSpecifyRouters(value);
+        if (value) {
+            setDirect(false);
+        } else {
+            setCustomRouters(''); // Clear custom routers when unchecking
+        }
+    };
+
+    // Add a validation function for custom routers
+    const getValidCustomRouters = () => {
+        if (!specifyRouters) return [];
+        return customRouters
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0);
+    };
+
+    const isCustomRoutersValid = () => {
+        if (!specifyRouters) return true; // Not required if checkbox is unchecked
+        return getValidCustomRouters().length > 0;
+    };
+
+
 
     useEffect(() => {
         document.title = "Register"
@@ -143,8 +181,39 @@ function CommitDotOsName({
                                 <EnterHnsName {...enterOsNameProps} />
                                 <details className="advanced-options">
                                     <summary>Advanced Options</summary>
-                                    <DirectNodeCheckbox {...{ direct, setDirect }} />
+                                    <div className="flex flex-col gap-3">
+                                        <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                                        <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
+                                        {specifyRouters && (
+                                            <div className="flex flex-col gap-2 ml-6">
+                                                <label htmlFor="custom-routers" className="text-sm font-medium">
+                                                    Router Names: <span className="text-red-500">*</span>
+                                                </label>
+                                                <textarea
+                                                    id="custom-routers"
+                                                    value={customRouters}
+                                                    onChange={(e) => setCustomRouters(e.target.value)}
+                                                    placeholder="Enter router names, one per line&#10;e.g.:&#10;router1.os&#10;router2.os&#10;myrouter.os"
+                                                    className={`input resize-vertical min-h-[80px] ${
+                                                        specifyRouters && !isCustomRoutersValid()
+                                                            ? 'border-red-500 focus:border-red-500'
+                                                            : ''
+                                                    }`}
+                                                    rows={4}
+                                                />
+                                                <span className={`text-xs ${
+                                                    !isCustomRoutersValid() ? 'text-red-500' : 'text-gray-500'
+                                                }`}>
+                                                    {!isCustomRoutersValid()
+                                                        ? 'At least one router name is required'
+                                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                                    }
+                                                </span>
+                                            </div>
+                                        )}
+                                    </div>
                                 </details>
+
                                 <div className="flex flex-col gap-1">
                                     <button
                                         disabled={nameValidities.length !== 0 || isPending || isConfirming}
@@ -172,4 +241,4 @@ function CommitDotOsName({
     );
 }
 
-export default CommitDotOsName;
+export default CommitDotOsName;
\ No newline at end of file

From 033c61efc92ea73839f0f45a0d805317938241c2 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Mon, 15 Sep 2025 17:34:42 -0400
Subject: [PATCH 02/27] Adding to custom and reset, plumbing thru mint

---
 .../src/register-ui/src/abis/helpers.ts       |  9 +-
 .../register-ui/src/pages/CommitDotOsName.tsx | 20 ++++-
 .../src/register-ui/src/pages/MintCustom.tsx  | 84 ++++++++++++++++--
 .../register-ui/src/pages/MintDotOsName.tsx   | 60 +++++++------
 .../src/register-ui/src/pages/ResetName.tsx   | 87 +++++++++++++++++--
 5 files changed, 217 insertions(+), 43 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/abis/helpers.ts b/hyperdrive/src/register-ui/src/abis/helpers.ts
index b4765ed46..cd2db8602 100644
--- a/hyperdrive/src/register-ui/src/abis/helpers.ts
+++ b/hyperdrive/src/register-ui/src/abis/helpers.ts
@@ -19,6 +19,7 @@ export const generateNetworkingKeys = async ({
     setTcpPort,
     setRouters,
     reset,
+    customRouters,
 }: {
     direct: boolean,
     label: string,
@@ -29,6 +30,7 @@ export const generateNetworkingKeys = async ({
     setTcpPort: (tcpPort: number) => void;
     setRouters: (routers: string[]) => void;
     reset: boolean;
+    customRouters?: string[];
 }) => {
     const {
         networking_key,
@@ -45,13 +47,16 @@ export const generateNetworkingKeys = async ({
 
     const ipAddress = ipToBytes(ip_address);
 
+    const routersToUse = customRouters && customRouters.length > 0 ? customRouters : allowed_routers;
+
     setNetworkingKey(networking_key);
     // setIpAddress(ipAddress);
     setWsPort(ws_port || 0);
     setTcpPort(tcp_port || 0);
-    setRouters(allowed_routers);
+    setRouters(routersToUse);
 
     console.log("networking_key: ", networking_key);
+    console.log("routers being used: ", routersToUse);
 
     const netkeycall = encodeFunctionData({
         abi: hypermapAbi,
@@ -92,7 +97,7 @@ export const generateNetworkingKeys = async ({
             ]
         });
 
-    const encodedRouters = encodeRouters(allowed_routers);
+    const encodedRouters = encodeRouters(routersToUse);
 
     const router_call =
         encodeFunctionData({
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index 064a263e7..4440987dd 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -109,6 +109,18 @@ function CommitDotOsName({
         }
         setName(toAscii(name));
         console.log("committing to .os name: ", name)
+
+        if (specifyRouters && customRouters.trim()) {
+            const routersToUse = customRouters
+                .split('\n')
+                .map(router => router.trim())
+                .filter(router => router.length > 0);
+
+            // Update the routers in your app state for the next page to use
+            setRouters(routersToUse);
+            console.log("Custom routers will be used:", routersToUse);
+        }
+
         const commit = keccak256(
             encodeAbiParameters(
                 parseAbiParameters('bytes memory, address'),
@@ -145,7 +157,7 @@ function CommitDotOsName({
             throw err;
         }
 
-    }, [name, direct, address, writeContract, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal])
+    }, [name, specifyRouters, customRouters, direct, address, writeContract, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal])
 
     useEffect(() => {
         if (txConfirmed) {
@@ -216,7 +228,11 @@ function CommitDotOsName({
 
                                 <div className="flex flex-col gap-1">
                                     <button
-                                        disabled={nameValidities.length !== 0 || isPending || isConfirming}
+                                        disabled={nameValidities.length !== 0 ||
+                                            isPending ||
+                                            isConfirming ||
+                                            (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
+                                        }
                                         type="submit"
                                         className="button"
                                     >
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index 535cb4b9f..dfd2bd0fc 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -4,6 +4,7 @@ import Loader from "../components/Loader";
 import { PageProps } from "../lib/types";
 
 import DirectNodeCheckbox from "../components/DirectCheckbox";
+import SpecifyRoutersCheckbox from "../components/SpecifyRoutersCheckbox";
 
 import { useAccount, useWaitForTransactionReceipt, useSendTransaction } from "wagmi";
 import { useConnectModal, useAddRecentTransaction } from "@rainbow-me/rainbowkit"
@@ -41,6 +42,27 @@ function MintCustom({
     const addRecentTransaction = useAddRecentTransaction();
 
     const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false)
+    const [specifyRouters, setSpecifyRouters] = useState(false)
+    const [customRouters, setCustomRouters] = useState('')
+
+    // Modified setDirect function to handle mutual exclusivity
+    const handleSetDirect = (value: boolean) => {
+        setDirect(value);
+        if (value) {
+            setSpecifyRouters(false);
+            setCustomRouters(''); // Clear custom routers when switching to direct
+        }
+    };
+
+    // Modified setSpecifyRouters function to handle mutual exclusivity
+    const handleSetSpecifyRouters = (value: boolean) => {
+        setSpecifyRouters(value);
+        if (value) {
+            setDirect(false);
+        } else {
+            setCustomRouters(''); // Clear custom routers when unchecking
+        }
+    };
 
     useEffect(() => {
         document.title = "Mint"
@@ -65,6 +87,19 @@ function MintCustom({
             return
         }
 
+        // Process custom routers if specified
+        let routersToUse: string[] = [];
+        if (specifyRouters && customRouters.trim()) {
+            routersToUse = customRouters
+                .split('\n')
+                .map(router => router.trim())
+                .filter(router => router.length > 0);
+
+            // Update the routers in your app state
+            setRouters(routersToUse);
+            console.log("Custom routers:", routersToUse);
+        }
+
         const initCall = await generateNetworkingKeys({
             direct,
             our_address: address,
@@ -73,8 +108,9 @@ function MintCustom({
             setIpAddress,
             setWsPort,
             setTcpPort,
-            setRouters,
+            setRouters: routersToUse.length > 0 ? () => setRouters(routersToUse) : setRouters,
             reset: false,
+            customRouters: routersToUse.length > 0 ? routersToUse : undefined,
         });
 
         setHnsName(formData.get('full-hns-name') as string)
@@ -107,7 +143,7 @@ function MintCustom({
         } catch (error) {
             console.error('Failed to send transaction:', error)
         }
-    }, [direct, address, sendTransaction, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal])
+    }, [direct, specifyRouters, customRouters, address, sendTransaction, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal])
 
     useEffect(() => {
         if (isConfirmed) {
@@ -132,17 +168,55 @@ function MintCustom({
                                 <input type="text" name="name" placeholder="Enter hypermap name" />
                                 <input type="text" name="full-hns-name" placeholder="Enter full HNS name" />
                                 <input type="text" name="tba" placeholder="Enter TBA to mint under" />
-                                <details>
+                                <details className="advanced-options">
                                     <summary>Advanced Options</summary>
-                                    <DirectNodeCheckbox {...{ direct, setDirect }} />
+                                    <div className="flex flex-col gap-3">
+                                        <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                                        <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
+                                        {specifyRouters && (
+                                            <div className="flex flex-col gap-2 ml-6">
+                                                <label htmlFor="custom-routers" className="text-sm font-medium">
+                                                    Router Names: <span className="text-red-500">*</span>
+                                                </label>
+                                                <textarea
+                                                    id="custom-routers-mint"
+                                                    value={customRouters}
+                                                    onChange={(e) => setCustomRouters(e.target.value)}
+                                                    placeholder="Enter router names, one per line&#10;e.g.:&#10;router1.os&#10;router2.os&#10;myrouter.os"
+                                                    className={`input resize-vertical min-h-[80px] ${
+                                                        specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                                            ? 'border-red-500 focus:border-red-500'
+                                                            : ''
+                                                    }`}
+                                                    rows={4}
+                                                />
+                                                <span className={`text-xs ${
+                                                    customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                                        ? 'text-red-500'
+                                                        : 'text-gray-500'
+                                                }`}>
+                                                    {customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                                        ? 'At least one router name is required'
+                                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                                    }
+                                                </span>
+                                            </div>
+                                        )}
+                                    </div>
                                 </details>
                                 <div className="flex flex-col gap-1">
                                     <button
                                         type="submit"
                                         className="button"
-                                        disabled={isPending || isConfirming || !hnsName}>
+                                        disabled={
+                                            isPending ||
+                                            isConfirming ||
+                                            !hnsName ||
+                                            (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
+                                        }>
                                         Mint custom name
                                     </button>
+
                                     <BackButton mode="wide" />
                                 </div>
                             </>
diff --git a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
index 2ccf86eda..99b9d5ed3 100644
--- a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
@@ -1,3 +1,4 @@
+
 import { useState, useEffect, useCallback } from "react";
 import { useNavigate } from "react-router-dom";
 import Loader from "../components/Loader";
@@ -12,14 +13,15 @@ import { base } from 'viem/chains'
 interface RegisterOsNameProps extends PageProps { }
 
 function MintDotOsName({
-  direct,
-  hnsName,
-  setNetworkingKey,
-  setIpAddress,
-  setWsPort,
-  setTcpPort,
-  setRouters,
-}: RegisterOsNameProps) {
+                         direct,
+                         hnsName,
+                         setNetworkingKey,
+                         setIpAddress,
+                         setWsPort,
+                         setTcpPort,
+                         setRouters,
+                         routers, // Add this prop to access current routers from app state
+                       }: RegisterOsNameProps) {
   let { address } = useAccount();
   let navigate = useNavigate();
   let { openConnectModal } = useConnectModal();
@@ -32,9 +34,9 @@ function MintDotOsName({
     }
   });
   const { isLoading: isConfirming, isSuccess: isConfirmed } =
-    useWaitForTransactionReceipt({
-      hash,
-    });
+      useWaitForTransactionReceipt({
+        hash,
+      });
   const addRecentTransaction = useAddRecentTransaction();
 
   const [hasMinted, setHasMinted] = useState(false);
@@ -60,6 +62,9 @@ function MintDotOsName({
 
     setHasMinted(true);
 
+    // Use the routers from app state if they exist (custom routers from previous page)
+    const customRoutersToUse = routers && routers.length > 0 ? routers : undefined;
+
     const initCall = await generateNetworkingKeys({
       direct,
       our_address: address,
@@ -70,6 +75,7 @@ function MintDotOsName({
       setTcpPort,
       setRouters,
       reset: false,
+      customRouters: customRoutersToUse, // Pass the custom routers
     });
 
     // strip .os suffix
@@ -108,7 +114,7 @@ function MintDotOsName({
       }
       throw err;
     }
-  }, [direct, address, writeContract, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal, hnsName, hasMinted])
+  }, [direct, address, writeContract, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, openConnectModal, hnsName, hasMinted, routers])
 
   useEffect(() => {
     if (address && !isPending && !isConfirming) {
@@ -123,23 +129,23 @@ function MintDotOsName({
   }, [isConfirmed, address, navigate]);
 
   return (
-    <div className="container fade-in">
-      <div className="section">
-        <div className="form">
-          {isPending || isConfirming ? (
-            <Loader msg={isConfirming ? 'Minting name...' : 'Please confirm the transaction in your wallet'} />
-          ) : (
-            <Loader msg="Preparing to mint..." />
-          )}
-          {isError && (
-            <p className="text-red-500 wrap-anywhere mt-2">
-              Error: {error?.message || 'There was an error minting your name, please try again.'}
-            </p>
-          )}
+      <div className="container fade-in">
+        <div className="section">
+          <div className="form">
+            {isPending || isConfirming ? (
+                <Loader msg={isConfirming ? 'Minting name...' : 'Please confirm the transaction in your wallet'} />
+            ) : (
+                <Loader msg="Preparing to mint..." />
+            )}
+            {isError && (
+                <p className="text-red-500 wrap-anywhere mt-2">
+                  Error: {error?.message || 'There was an error minting your name, please try again.'}
+                </p>
+            )}
+          </div>
         </div>
       </div>
-    </div>
   );
 }
 
-export default MintDotOsName;
+export default MintDotOsName;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index b92c18f92..e44d9c337 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -9,6 +9,7 @@ import Loader from "../components/Loader";
 import { PageProps } from "../lib/types";
 import { MULTICALL, generateNetworkingKeys, mechAbi } from "../abis";
 import DirectNodeCheckbox from "../components/DirectCheckbox";
+import SpecifyRoutersCheckbox from "../components/SpecifyRoutersCheckbox";
 import EnterHnsName from "../components/EnterHnsName";
 
 import { useAccount, useWaitForTransactionReceipt, useWriteContract } from "wagmi";
@@ -50,6 +51,27 @@ function ResetHnsName({
   const [nameValidities, setNameValidities] = useState<string[]>([])
   const [tba, setTba] = useState<string>("");
   const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false);
+  const [specifyRouters, setSpecifyRouters] = useState(false)
+  const [customRouters, setCustomRouters] = useState('')
+
+  // Modified setDirect function to handle mutual exclusivity
+  const handleSetDirect = (value: boolean) => {
+    setDirect(value);
+    if (value) {
+      setSpecifyRouters(false);
+      setCustomRouters(''); // Clear custom routers when switching to direct
+    }
+  };
+
+  // Modified setSpecifyRouters function to handle mutual exclusivity
+  const handleSetSpecifyRouters = (value: boolean) => {
+    setSpecifyRouters(value);
+    if (value) {
+      setDirect(false);
+    } else {
+      setCustomRouters(''); // Clear custom routers when unchecking
+    }
+  };
 
   useEffect(() => {
     document.title = "Reset";
@@ -75,6 +97,18 @@ function ResetHnsName({
       }
 
       setHnsName(name);
+      // Process custom routers if specified
+      let routersToUse: string[] = [];
+      if (specifyRouters && customRouters.trim()) {
+        routersToUse = customRouters
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0);
+
+        // Update the routers in your app state
+        setRouters(routersToUse);
+        console.log("Custom routers:", routersToUse);
+      }
 
       try {
         const data = await generateNetworkingKeys({
@@ -85,8 +119,9 @@ function ResetHnsName({
           setIpAddress,
           setWsPort,
           setTcpPort,
-          setRouters,
+          setRouters: routersToUse.length > 0 ? () => setRouters(routersToUse) : setRouters,
           reset: true,
+          customRouters: routersToUse.length > 0 ? routersToUse : undefined,
         });
 
         writeContract({
@@ -105,7 +140,7 @@ function ResetHnsName({
         console.error("An error occurred:", error);
       }
     },
-    [address, direct, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal]
+    [address, direct, specifyRouters, customRouters, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal]
   );
 
   useEffect(() => {
@@ -133,20 +168,58 @@ function ResetHnsName({
                 <p className="text-sm text-gray-500">
                   Nodes use an onchain username in order to identify themselves to other nodes in the network.
                 </p>
-                <details>
+                <details className="advanced-options">
                   <summary>Advanced Options</summary>
-                  <DirectNodeCheckbox {...{ direct, setDirect }} />
+                  <div className="flex flex-col gap-3">
+                    <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                    <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
+                    {specifyRouters && (
+                        <div className="flex flex-col gap-2 ml-6">
+                          <label htmlFor="custom-routers" className="text-sm font-medium">
+                            Router Names: <span className="text-red-500">*</span>
+                          </label>
+                          <textarea
+                              id="custom-routers-reset"
+                              value={customRouters}
+                              onChange={(e) => setCustomRouters(e.target.value)}
+                              placeholder="Enter router names, one per line&#10;e.g.:&#10;router1.os&#10;router2.os&#10;myrouter.os"
+                              className={`input resize-vertical min-h-[80px] ${
+                                  specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                      ? 'border-red-500 focus:border-red-500'
+                                      : ''
+                              }`}
+                              rows={4}
+                          />
+                          <span className={`text-xs ${
+                              customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                  ? 'text-red-500'
+                                  : 'text-gray-500'
+                          }`}>
+                                                    {customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                                        ? 'At least one router name is required'
+                                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                                    }
+                                                </span>
+                        </div>
+                    )}
+                  </div>
                 </details>
                 <p className="text-sm text-gray-500">
                   A reset will not delete any data. It only updates the networking info your node publishes onchain.
                 </p>
                 <button
-                  type="submit"
-                  className="button mt-2 self-stretch"
-                  disabled={isPending || isConfirming || nameValidities.length !== 0}
+                    type="submit"
+                    className="button mt-2 self-stretch"
+                    disabled={
+                        isPending ||
+                        isConfirming ||
+                        nameValidities.length !== 0 ||
+                        (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
+                    }
                 >
                   Reset Node
                 </button>
+
                 <BackButton mode="wide" />
               </>
             )}

From 2fdb183bd55bcf4281a43a50c0a3f0ffbf8883a7 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Tue, 16 Sep 2025 09:51:29 -0400
Subject: [PATCH 03/27] debug output, setting routers before mint

---
 .../src/register-ui/src/abis/helpers.ts       | 18 +++++++++++++++++
 .../register-ui/src/pages/CommitDotOsName.tsx | 14 +++++++++++--
 .../register-ui/src/pages/MintDotOsName.tsx   | 20 +++++++++++++++++++
 3 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/abis/helpers.ts b/hyperdrive/src/register-ui/src/abis/helpers.ts
index cd2db8602..9cae65453 100644
--- a/hyperdrive/src/register-ui/src/abis/helpers.ts
+++ b/hyperdrive/src/register-ui/src/abis/helpers.ts
@@ -49,6 +49,13 @@ export const generateNetworkingKeys = async ({
 
     const routersToUse = customRouters && customRouters.length > 0 ? customRouters : allowed_routers;
 
+    console.log("=== DEBUG NETWORKING KEYS ===");
+    console.log("direct:", direct);
+    console.log("customRouters:", customRouters);
+    console.log("allowed_routers from API:", allowed_routers);
+    console.log("routersToUse:", routersToUse);
+    console.log("reset:", reset);
+
     setNetworkingKey(networking_key);
     // setIpAddress(ipAddress);
     setWsPort(ws_port || 0);
@@ -99,6 +106,9 @@ export const generateNetworkingKeys = async ({
 
     const encodedRouters = encodeRouters(routersToUse);
 
+    console.log("encodedRouters:", encodedRouters);
+    console.log("encodedRouters length:", encodedRouters.length);
+
     const router_call =
         encodeFunctionData({
             abi: hypermapAbi,
@@ -121,12 +131,17 @@ export const generateNetworkingKeys = async ({
         { target: HYPERMAP, callData: router_call },
     ];
 
+    console.log("calls:", calls);
+    console.log("router_call data:", router_call);
+
     const multicalls = encodeFunctionData({
         abi: multicallAbi,
         functionName: 'aggregate',
         args: [calls]
     });
 
+    console.log("multicalls:", multicalls);
+
     if (reset) return multicalls;
 
     const initCall = encodeFunctionData({
@@ -140,6 +155,9 @@ export const generateNetworkingKeys = async ({
         ]
     });
 
+    console.log("final initCall:", initCall);
+    console.log("===========================");
+
     return initCall;
 
     // to mint a subname of your own, you would do something like this.
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index 4440987dd..79a937200 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -162,14 +162,24 @@ function CommitDotOsName({
     useEffect(() => {
         if (txConfirmed) {
             console.log("confirmed commit to .os name: ", name)
+            console.log("Custom routers at navigation time:", customRouters)
             console.log("waiting 16 seconds to make commit valid...")
             setTimeout(() => {
                 setIsConfirmed(true);
                 setHnsName(`${name}.os`);
-                navigate("/mint-os-name");
+
+                if (specifyRouters && customRouters.trim()) {
+                    const routersToUse = customRouters
+                        .split('\n')
+                        .map(router => router.trim())
+                        .filter(router => router.length > 0);
+                    setRouters(routersToUse);
+                    console.log("Re-setting routers before navigation:", routersToUse);
+                }
+                    navigate("/mint-os-name");
             }, 16000)
         }
-    }, [txConfirmed, address, name, setHnsName, navigate]);
+    }, [txConfirmed, address, name, setHnsName, navigate, specifyRouters, customRouters, setRouters]);
 
     return (
         <div className="container fade-in">
diff --git a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
index 99b9d5ed3..c4646d5c8 100644
--- a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
@@ -26,6 +26,17 @@ function MintDotOsName({
   let navigate = useNavigate();
   let { openConnectModal } = useConnectModal();
 
+  // Add debugging for props received
+  useEffect(() => {
+    console.log("=== MintDotOsName Props Debug ===");
+    console.log("direct:", direct);
+    console.log("hnsName:", hnsName);
+    console.log("routers from props:", routers);
+    console.log("routers type:", typeof routers);
+    console.log("routers length:", routers?.length);
+    console.log("================================");
+  }, [direct, hnsName, routers]);
+
   const { data: hash, writeContract, isPending, isError, error } = useWriteContract({
     mutation: {
       onSuccess: (data) => {
@@ -60,6 +71,12 @@ function MintDotOsName({
       return
     }
 
+    console.log("=== MintDotOsName handleMint Debug ===");
+    console.log("routers from props:", routers);
+    console.log("direct:", direct);
+    console.log("address:", address);
+    console.log("hnsName:", hnsName);
+
     setHasMinted(true);
 
     // Use the routers from app state if they exist (custom routers from previous page)
@@ -78,6 +95,9 @@ function MintDotOsName({
       customRouters: customRoutersToUse, // Pass the custom routers
     });
 
+    console.log("Generated initCall:", initCall);
+    console.log("=====================================");
+
     // strip .os suffix
     const name = hnsName.replace(/\.os$/, '');
 

From 9b227637f7d260b5bdf97f611c208bae0508d2d2 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Wed, 17 Sep 2025 09:32:11 -0400
Subject: [PATCH 04/27] Passing routers in the boot payload

---
 hyperdrive/src/register-ui/src/pages/SetPassword.tsx | 3 +++
 hyperdrive/src/register.rs                           | 8 +++++++-
 lib/src/kernel.rs                                    | 1 +
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index 7556ed524..cbeaa95e6 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -14,6 +14,7 @@ type SetPasswordProps = {
   setPw: React.Dispatch<React.SetStateAction<string>>;
   nodeChainId: string;
   closeConnect: () => void;
+  routers?: string[];
 };
 
 function SetPassword({
@@ -22,6 +23,7 @@ function SetPassword({
   pw,
   reset,
   setPw,
+  routers,
 }: SetPasswordProps) {
   const [pw2, setPw2] = useState("");
   const [error, setError] = useState("");
@@ -114,6 +116,7 @@ function SetPassword({
                 timestamp,
                 signature,
                 chain_id: chainId,
+                custom_routers: routers && routers.length > 0 ? routers : null,
               }),
             });
             const base64String = await result.json();
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index a0fa844b8..1290e3e78 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -348,8 +348,14 @@ async fn handle_boot(
     if info.direct {
         our.both_to_direct();
     } else {
-        our.both_to_routers();
+        // Set custom routers if provided
+        if let Some(custom_routers) = info.custom_routers {
+            our.routing = NodeRouting::Routers(custom_routers);
+        } else {
+            our.both_to_routers(); // Use defaults
+        }
     }
+
     let jwt_seed = SystemRandom::new();
     let mut jwt_secret = [0u8, 32];
     ring::rand::SecureRandom::fill(&jwt_seed, &mut jwt_secret).unwrap();
diff --git a/lib/src/kernel.rs b/lib/src/kernel.rs
index 3cac2f241..95ec8c620 100644
--- a/lib/src/kernel.rs
+++ b/lib/src/kernel.rs
@@ -50,6 +50,7 @@ pub struct BootInfo {
     pub signature: String,
     pub timestamp: u64,
     pub chain_id: u64,
+    pub custom_routers: Option<Vec<String>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

From 62e224cee5259f85a3319b76419c0560daeaa411 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Wed, 17 Sep 2025 10:13:40 -0400
Subject: [PATCH 05/27] cleaning up console logging

---
 hyperdrive/src/register-ui/src/abis/helpers.ts | 18 ------------------
 .../register-ui/src/pages/CommitDotOsName.tsx  |  5 +----
 .../src/register-ui/src/pages/MintCustom.tsx   |  2 +-
 .../register-ui/src/pages/MintDotOsName.tsx    | 11 +----------
 .../src/register-ui/src/pages/ResetName.tsx    |  2 +-
 5 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/abis/helpers.ts b/hyperdrive/src/register-ui/src/abis/helpers.ts
index 9cae65453..cd2db8602 100644
--- a/hyperdrive/src/register-ui/src/abis/helpers.ts
+++ b/hyperdrive/src/register-ui/src/abis/helpers.ts
@@ -49,13 +49,6 @@ export const generateNetworkingKeys = async ({
 
     const routersToUse = customRouters && customRouters.length > 0 ? customRouters : allowed_routers;
 
-    console.log("=== DEBUG NETWORKING KEYS ===");
-    console.log("direct:", direct);
-    console.log("customRouters:", customRouters);
-    console.log("allowed_routers from API:", allowed_routers);
-    console.log("routersToUse:", routersToUse);
-    console.log("reset:", reset);
-
     setNetworkingKey(networking_key);
     // setIpAddress(ipAddress);
     setWsPort(ws_port || 0);
@@ -106,9 +99,6 @@ export const generateNetworkingKeys = async ({
 
     const encodedRouters = encodeRouters(routersToUse);
 
-    console.log("encodedRouters:", encodedRouters);
-    console.log("encodedRouters length:", encodedRouters.length);
-
     const router_call =
         encodeFunctionData({
             abi: hypermapAbi,
@@ -131,17 +121,12 @@ export const generateNetworkingKeys = async ({
         { target: HYPERMAP, callData: router_call },
     ];
 
-    console.log("calls:", calls);
-    console.log("router_call data:", router_call);
-
     const multicalls = encodeFunctionData({
         abi: multicallAbi,
         functionName: 'aggregate',
         args: [calls]
     });
 
-    console.log("multicalls:", multicalls);
-
     if (reset) return multicalls;
 
     const initCall = encodeFunctionData({
@@ -155,9 +140,6 @@ export const generateNetworkingKeys = async ({
         ]
     });
 
-    console.log("final initCall:", initCall);
-    console.log("===========================");
-
     return initCall;
 
     // to mint a subname of your own, you would do something like this.
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index 79a937200..52219ea88 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -118,7 +118,6 @@ function CommitDotOsName({
 
             // Update the routers in your app state for the next page to use
             setRouters(routersToUse);
-            console.log("Custom routers will be used:", routersToUse);
         }
 
         const commit = keccak256(
@@ -162,7 +161,6 @@ function CommitDotOsName({
     useEffect(() => {
         if (txConfirmed) {
             console.log("confirmed commit to .os name: ", name)
-            console.log("Custom routers at navigation time:", customRouters)
             console.log("waiting 16 seconds to make commit valid...")
             setTimeout(() => {
                 setIsConfirmed(true);
@@ -174,7 +172,6 @@ function CommitDotOsName({
                         .map(router => router.trim())
                         .filter(router => router.length > 0);
                     setRouters(routersToUse);
-                    console.log("Re-setting routers before navigation:", routersToUse);
                 }
                     navigate("/mint-os-name");
             }, 16000)
@@ -215,7 +212,7 @@ function CommitDotOsName({
                                                     id="custom-routers"
                                                     value={customRouters}
                                                     onChange={(e) => setCustomRouters(e.target.value)}
-                                                    placeholder="Enter router names, one per line&#10;e.g.:&#10;router1.os&#10;router2.os&#10;myrouter.os"
+                                                    placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
                                                     className={`input resize-vertical min-h-[80px] ${
                                                         specifyRouters && !isCustomRoutersValid()
                                                             ? 'border-red-500 focus:border-red-500'
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index dfd2bd0fc..2bc108f3e 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -182,7 +182,7 @@ function MintCustom({
                                                     id="custom-routers-mint"
                                                     value={customRouters}
                                                     onChange={(e) => setCustomRouters(e.target.value)}
-                                                    placeholder="Enter router names, one per line&#10;e.g.:&#10;router1.os&#10;router2.os&#10;myrouter.os"
+                                                    placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
                                                     className={`input resize-vertical min-h-[80px] ${
                                                         specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
                                                             ? 'border-red-500 focus:border-red-500'
diff --git a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
index c4646d5c8..38f645882 100644
--- a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
@@ -20,7 +20,7 @@ function MintDotOsName({
                          setWsPort,
                          setTcpPort,
                          setRouters,
-                         routers, // Add this prop to access current routers from app state
+                         routers,
                        }: RegisterOsNameProps) {
   let { address } = useAccount();
   let navigate = useNavigate();
@@ -71,12 +71,6 @@ function MintDotOsName({
       return
     }
 
-    console.log("=== MintDotOsName handleMint Debug ===");
-    console.log("routers from props:", routers);
-    console.log("direct:", direct);
-    console.log("address:", address);
-    console.log("hnsName:", hnsName);
-
     setHasMinted(true);
 
     // Use the routers from app state if they exist (custom routers from previous page)
@@ -95,9 +89,6 @@ function MintDotOsName({
       customRouters: customRoutersToUse, // Pass the custom routers
     });
 
-    console.log("Generated initCall:", initCall);
-    console.log("=====================================");
-
     // strip .os suffix
     const name = hnsName.replace(/\.os$/, '');
 
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index e44d9c337..66fffd051 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -182,7 +182,7 @@ function ResetHnsName({
                               id="custom-routers-reset"
                               value={customRouters}
                               onChange={(e) => setCustomRouters(e.target.value)}
-                              placeholder="Enter router names, one per line&#10;e.g.:&#10;router1.os&#10;router2.os&#10;myrouter.os"
+                              placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
                               className={`input resize-vertical min-h-[80px] ${
                                   specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
                                       ? 'border-red-500 focus:border-red-500'

From 3c93c96b4fa3c108b44646c93c4ed44d8234e8d9 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Wed, 17 Sep 2025 14:51:44 -0400
Subject: [PATCH 06/27] missed some console logging

---
 hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
index 38f645882..02326dba4 100644
--- a/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintDotOsName.tsx
@@ -28,13 +28,6 @@ function MintDotOsName({
 
   // Add debugging for props received
   useEffect(() => {
-    console.log("=== MintDotOsName Props Debug ===");
-    console.log("direct:", direct);
-    console.log("hnsName:", hnsName);
-    console.log("routers from props:", routers);
-    console.log("routers type:", typeof routers);
-    console.log("routers length:", routers?.length);
-    console.log("================================");
   }, [direct, hnsName, routers]);
 
   const { data: hash, writeContract, isPending, isError, error } = useWriteContract({

From 1a34d7b67286d47b12d63b0c074ca4873120b4ae Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Wed, 24 Sep 2025 09:43:27 -0400
Subject: [PATCH 07/27] page 2 advanced settings

---
 hyperdrive/src/eth_config_utils.rs            |  39 ++
 hyperdrive/src/main.rs                        |  65 ++-
 .../BaseL2AccessProviderTooltip.tsx           |  14 +
 .../src/components/CacheSourceTooltip.tsx     |  14 +
 .../SpecifyBaseL2AccessProvidersCheckbox.tsx  |  26 ++
 .../SpecifyCacheSourcesCheckbox.tsx           |  26 ++
 .../src/register-ui/src/pages/SetPassword.tsx | 382 ++++++++++++------
 hyperdrive/src/register.rs                    |   7 +
 lib/src/kernel.rs                             |   2 +
 9 files changed, 403 insertions(+), 172 deletions(-)
 create mode 100644 hyperdrive/src/eth_config_utils.rs
 create mode 100644 hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx
 create mode 100644 hyperdrive/src/register-ui/src/components/CacheSourceTooltip.tsx
 create mode 100644 hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
 create mode 100644 hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx

diff --git a/hyperdrive/src/eth_config_utils.rs b/hyperdrive/src/eth_config_utils.rs
new file mode 100644
index 000000000..671efe150
--- /dev/null
+++ b/hyperdrive/src/eth_config_utils.rs
@@ -0,0 +1,39 @@
+use lib::eth::{SavedConfigs, ProviderConfig};
+
+pub fn add_provider_to_config(
+    eth_provider_config: &mut SavedConfigs,
+    new_provider: ProviderConfig,
+) {
+    match &new_provider.provider {
+        lib::eth::NodeOrRpcUrl::RpcUrl { url, .. } => {
+            // Remove any existing provider with this URL
+            eth_provider_config.0.retain(|config| {
+                if let lib::eth::NodeOrRpcUrl::RpcUrl {
+                    url: existing_url, ..
+                } = &config.provider
+                {
+                    existing_url != url
+                } else {
+                    true
+                }
+            });
+        }
+        lib::eth::NodeOrRpcUrl::Node { hns_update, .. } => {
+            // Remove any existing provider with this node name
+            eth_provider_config.0.retain(|config| {
+                if let lib::eth::NodeOrRpcUrl::Node {
+                    hns_update: existing_update,
+                    ..
+                } = &config.provider
+                {
+                    existing_update.name != hns_update.name
+                } else {
+                    true
+                }
+            });
+        }
+    }
+
+    // Insert the new provider at the front (position 0)
+    eth_provider_config.0.insert(0, new_provider);
+}
\ No newline at end of file
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index bd087a5ba..61eaf409c 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -1,3 +1,4 @@
+use crate::eth_config_utils::add_provider_to_config;
 use anyhow::Result;
 use clap::{arg, value_parser, Command};
 use lib::types::core::{
@@ -15,6 +16,7 @@ use std::sync::Arc;
 use tokio::sync::mpsc;
 
 mod eth;
+mod eth_config_utils;
 #[cfg(feature = "simulation-mode")]
 mod fakenet;
 pub mod fd_manager;
@@ -397,7 +399,29 @@ async fn main() {
     .await
     .expect("state load failed!");
 
+    // Create the nested directory structure before spawning tasks
+    let vfs_dir = home_directory_path.join("vfs");
+    let hypermap_cacher_dir = vfs_dir.join("hypermap-cacher:sys");
+    let initfiles_dir = hypermap_cacher_dir.join("initfiles");
+
+    // Create all directories at once (creates parent directories if they don't exist)
+    if let Err(e) = tokio::fs::create_dir_all(&initfiles_dir).await {
+        eprintln!("Failed to create directory structure {}: {}", initfiles_dir.display(), e);
+        // You might want to handle this error based on your needs
+    } else {
+        println!("✓ Created directory structure: {}", initfiles_dir.display());
+    }
+
+    // Create the data.txt file with test content
+    let data_file_path = initfiles_dir.join("data.txt");
+    if let Err(e) = tokio::fs::write(&data_file_path, "TESTDATA").await {
+        eprintln!("Failed to create data.txt file: {}", e);
+    } else {
+        println!("✓ Created test file: {}", data_file_path.display());
+    }
+
     let mut tasks = tokio::task::JoinSet::<Result<()>>::new();
+    println!("spawning the kernel task\r");
     tasks.spawn(kernel::kernel(
         our.clone(),
         networking_keypair_arc.clone(),
@@ -429,6 +453,7 @@ async fn main() {
             })
             .collect(),
     ));
+    println!("spawning the net task\r");
     tasks.spawn(net::networking(
         our.clone(),
         our_ip.to_string(),
@@ -498,6 +523,7 @@ async fn main() {
         timer_service_receiver,
         print_sender.clone(),
     ));
+    println!("spawning the eth task\r");
     tasks.spawn(eth::provider(
         our.name.clone(),
         home_directory_path.clone(),
@@ -1017,45 +1043,6 @@ async fn login_with_password(
     (our, disk_keyfile, k)
 }
 
-/// Add a provider config with deduplication logic (same as runtime system)
-fn add_provider_to_config(
-    eth_provider_config: &mut lib::eth::SavedConfigs,
-    new_provider: lib::eth::ProviderConfig,
-) {
-    match &new_provider.provider {
-        lib::eth::NodeOrRpcUrl::RpcUrl { url, .. } => {
-            // Remove any existing provider with this URL
-            eth_provider_config.0.retain(|config| {
-                if let lib::eth::NodeOrRpcUrl::RpcUrl {
-                    url: existing_url, ..
-                } = &config.provider
-                {
-                    existing_url != url
-                } else {
-                    true
-                }
-            });
-        }
-        lib::eth::NodeOrRpcUrl::Node { hns_update, .. } => {
-            // Remove any existing provider with this node name
-            eth_provider_config.0.retain(|config| {
-                if let lib::eth::NodeOrRpcUrl::Node {
-                    hns_update: existing_update,
-                    ..
-                } = &config.provider
-                {
-                    existing_update.name != hns_update.name
-                } else {
-                    true
-                }
-            });
-        }
-    }
-
-    // Insert the new provider at the front (position 0)
-    eth_provider_config.0.insert(0, new_provider);
-}
-
 fn make_remote_link(url: &str, text: &str) -> String {
     format!("\x1B]8;;{}\x1B\\{}\x1B]8;;\x1B\\", url, text)
 }
diff --git a/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx b/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx
new file mode 100644
index 000000000..86db3f528
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import { Tooltip } from "./Tooltip";
+
+export const BaseL2AccessProviderTooltip: React.FC = () => {
+    return (
+        <Tooltip
+            text={`
+        Base L2 Access Providers are specialized nodes that provide access to Base Layer 2 blockchain data.
+        These providers help your node interact with Base L2 for faster and cheaper transactions.
+        If unchecked, the system will use default Base L2 access providers.
+      `}
+        />
+    );
+};
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/CacheSourceTooltip.tsx b/hyperdrive/src/register-ui/src/components/CacheSourceTooltip.tsx
new file mode 100644
index 000000000..ec83b1ea1
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/CacheSourceTooltip.tsx
@@ -0,0 +1,14 @@
+import React from "react";
+import { Tooltip } from "./Tooltip";
+
+export const CacheSourceTooltip: React.FC = () => {
+    return (
+        <Tooltip
+            text={`
+        Cache sources are nodes that provide cached hypermap data to improve performance.
+        These nodes store and serve frequently accessed blockchain data locally.
+        If unchecked, the system will use default cache sources.
+      `}
+        />
+    );
+};
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
new file mode 100644
index 000000000..9d067f2aa
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
@@ -0,0 +1,26 @@
+import { BaseL2AccessProviderTooltip } from "./BaseL2AccessProviderTooltip";
+import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
+
+interface SpecifyBaseL2AccessProvidersProps {
+    specifyBaseL2AccessProviders: boolean;
+    setSpecifyBaseL2AccessProviders: (specifyBaseL2AccessProviders: boolean) => void;
+}
+
+export default function SpecifyBaseL2AccessProvidersCheckbox({ specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders }: SpecifyBaseL2AccessProvidersProps) {
+    return (
+        <div className="flex gap-2 items-center">
+            <button className="icon" onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setSpecifyBaseL2AccessProviders(!specifyBaseL2AccessProviders);
+            }}>
+                {specifyBaseL2AccessProviders ? <FaSquareCheck /> : <FaRegSquare />}
+            </button>
+            <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
+                <span className="text-sm">Specify Base L2 access providers.</span>
+                <span className="text-xs">If you are unsure, leave unchecked.</span>
+            </div>
+            <BaseL2AccessProviderTooltip />
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
new file mode 100644
index 000000000..19e2c87ec
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
@@ -0,0 +1,26 @@
+import { CacheSourceTooltip } from "./CacheSourceTooltip";
+import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
+
+interface SpecifyCacheSourcesProps {
+    specifyCacheSources: boolean;
+    setSpecifyCacheSources: (specifyCacheSources: boolean) => void;
+}
+
+export default function SpecifyCacheSourcesCheckbox({ specifyCacheSources, setSpecifyCacheSources }: SpecifyCacheSourcesProps) {
+    return (
+        <div className="flex gap-2 items-center">
+            <button className="icon" onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setSpecifyCacheSources(!specifyCacheSources);
+            }}>
+                {specifyCacheSources ? <FaSquareCheck /> : <FaRegSquare />}
+            </button>
+            <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
+                <span className="text-sm">Specify cache sources for hypermap data.</span>
+                <span className="text-xs">If you are unsure, leave unchecked.</span>
+            </div>
+            <CacheSourceTooltip />
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index cbeaa95e6..c747da244 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -5,6 +5,8 @@ import { Tooltip } from "../components/Tooltip";
 import { useSignTypedData, useAccount, useChainId } from 'wagmi'
 import { HYPERMAP } from "../abis";
 import { redirectToHomepage } from "../utils/redirect-to-homepage";
+import SpecifyCacheSourcesCheckbox from "../components/SpecifyCacheSourcesCheckbox";
+import SpecifyBaseL2AccessProvidersCheckbox from "../components/SpecifyBaseL2AccessProvidersCheckbox";
 
 type SetPasswordProps = {
   direct: boolean;
@@ -18,17 +20,23 @@ type SetPasswordProps = {
 };
 
 function SetPassword({
-  hnsName,
-  direct,
-  pw,
-  reset,
-  setPw,
-  routers,
-}: SetPasswordProps) {
+                       hnsName,
+                       direct,
+                       pw,
+                       reset,
+                       setPw,
+                       routers,
+                     }: SetPasswordProps) {
   const [pw2, setPw2] = useState("");
   const [error, setError] = useState("");
   const [loading, setLoading] = useState<boolean>(false);
 
+  // Advanced options state - cache sources and Base L2 access providers
+  const [specifyCacheSources, setSpecifyCacheSources] = useState(false);
+  const [customCacheSources, setCustomCacheSources] = useState('');
+  const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
+  const [customBaseL2AccessProviders, setCustomBaseL2AccessProviders] = useState('');
+
   const { signTypedDataAsync } = useSignTypedData();
   const { address } = useAccount();
   const chainId = useChainId();
@@ -42,143 +50,251 @@ function SetPassword({
   }, [pw, pw2]);
 
   const handleSubmit = useCallback(
-    async (e: FormEvent) => {
-      e.preventDefault();
-
-      if (pw !== pw2) {
-        setError("Passwords do not match");
-        return false;
-      }
-
-      setTimeout(async () => {
-        setLoading(true);
-
-        // salt is either node name (if node name is longer than 8 characters)
-        //  or node name repeated enough times to be longer than 8 characters
-        const minSaltL = 8;
-        const nodeL = hnsName.length;
-        const salt = nodeL >= minSaltL ? hnsName : hnsName.repeat(1 + Math.floor(minSaltL / nodeL));
-        console.log(salt);
-
-        //@ts-ignore
-        argon2.hash({
-          pass: pw,
-          salt: salt,
-          hashLen: 32,
-          time: 2,
-          mem: 19456,
+      async (e: FormEvent) => {
+        e.preventDefault();
+
+        if (pw !== pw2) {
+          setError("Passwords do not match");
+          return false;
+        }
+
+        setTimeout(async () => {
+          setLoading(true);
+
+          // Process custom cache sources if specified
+          let cacheSourcesToUse: string[] | undefined = undefined;
+          if (specifyCacheSources && customCacheSources.trim()) {
+            cacheSourcesToUse = customCacheSources
+                .split('\n')
+                .map(source => source.trim())
+                .filter(source => source.length > 0);
+
+            console.log("Custom cache sources:", cacheSourcesToUse);
+          }
+
+          // Process custom Base L2 access providers if specified
+          let baseL2AccessProvidersToUse: string[] | undefined = undefined;
+          if (specifyBaseL2AccessProviders && customBaseL2AccessProviders.trim()) {
+            baseL2AccessProvidersToUse = customBaseL2AccessProviders
+                .split('\n')
+                .map(provider => provider.trim())
+                .filter(provider => provider.length > 0);
+
+            console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
+          }
+
+          // salt is either node name (if node name is longer than 8 characters)
+          //  or node name repeated enough times to be longer than 8 characters
+          const minSaltL = 8;
+          const nodeL = hnsName.length;
+          const salt = nodeL >= minSaltL ? hnsName : hnsName.repeat(1 + Math.floor(minSaltL / nodeL));
+          console.log(salt);
+
           //@ts-ignore
-          type: argon2.ArgonType.Argon2id
-        }).then(async (h: any) => {
-          const hashed_password_hex = `0x${h.hashHex}` as `0x${string}`;
-          let owner = address;
-          let timestamp = Date.now();
-
-          const signature = await signTypedDataAsync({
-            domain: {
-              name: "Hypermap",
-              version: "1",
-              chainId: chainId,
-              verifyingContract: HYPERMAP,
-            },
-            types: {
-              Boot: [
-                { name: 'username', type: 'string' },
-                { name: 'password_hash', type: 'bytes32' },
-                { name: 'timestamp', type: 'uint256' },
-                { name: 'direct', type: 'bool' },
-                { name: 'reset', type: 'bool' },
-                { name: 'chain_id', type: 'uint256' },
-              ],
-            },
-            primaryType: 'Boot',
-            message: {
-              username: hnsName,
-              password_hash: hashed_password_hex,
-              timestamp: BigInt(timestamp),
-              direct,
-              reset,
-              chain_id: BigInt(chainId),
-            },
-          });
+          argon2.hash({
+            pass: pw,
+            salt: salt,
+            hashLen: 32,
+            time: 2,
+            mem: 19456,
+            //@ts-ignore
+            type: argon2.ArgonType.Argon2id
+          }).then(async (h: any) => {
+            const hashed_password_hex = `0x${h.hashHex}` as `0x${string}`;
+            let owner = address;
+            let timestamp = Date.now();
 
-          try {
-            const result = await fetch("/boot", {
-              method: "POST",
-              headers: { "Content-Type": "application/json" },
-              credentials: "include",
-              body: JSON.stringify({
-                password_hash: hashed_password_hex,
-                reset,
+            const signature = await signTypedDataAsync({
+              domain: {
+                name: "Hypermap",
+                version: "1",
+                chainId: chainId,
+                verifyingContract: HYPERMAP,
+              },
+              types: {
+                Boot: [
+                  { name: 'username', type: 'string' },
+                  { name: 'password_hash', type: 'bytes32' },
+                  { name: 'timestamp', type: 'uint256' },
+                  { name: 'direct', type: 'bool' },
+                  { name: 'reset', type: 'bool' },
+                  { name: 'chain_id', type: 'uint256' },
+                ],
+              },
+              primaryType: 'Boot',
+              message: {
                 username: hnsName,
+                password_hash: hashed_password_hex,
+                timestamp: BigInt(timestamp),
                 direct,
-                owner,
-                timestamp,
-                signature,
-                chain_id: chainId,
-                custom_routers: routers && routers.length > 0 ? routers : null,
-              }),
+                reset,
+                chain_id: BigInt(chainId),
+              },
             });
-            const base64String = await result.json();
 
-            downloadKeyfile(hnsName, base64String);
-            redirectToHomepage();
+            try {
+              const result = await fetch("/boot", {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                credentials: "include",
+                body: JSON.stringify({
+                  password_hash: hashed_password_hex,
+                  reset,
+                  username: hnsName,
+                  direct,
+                  owner,
+                  timestamp,
+                  signature,
+                  chain_id: chainId,
+                  custom_routers: routers && routers.length > 0 ? routers : null,
+                  custom_cache_sources: cacheSourcesToUse && cacheSourcesToUse.length > 0 ? cacheSourcesToUse : null,
+                  custom_base_l2_access_providers: baseL2AccessProvidersToUse && baseL2AccessProvidersToUse.length > 0 ? baseL2AccessProvidersToUse : null,
+                }),
+              });
+              const base64String = await result.json();
+
+              downloadKeyfile(hnsName, base64String);
+              redirectToHomepage();
 
-          } catch {
-            alert("There was an error setting your password, please try again.");
+            } catch {
+              alert("There was an error setting your password, please try again.");
+              setLoading(false);
+            }
+          }).catch((err: any) => {
+            alert(String(err));
             setLoading(false);
-          }
-        }).catch((err: any) => {
-          alert(String(err));
-          setLoading(false);
-        });
-      }, 500);
-    },
-    [direct, pw, pw2, reset, hnsName]
+          });
+        }, 500);
+      },
+      [direct, pw, pw2, reset, hnsName, routers, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, customBaseL2AccessProviders]
   );
 
   return (
-    <>
-      {loading ? (
-        <Loader msg="Please sign the structured message in your wallet to set your password." />
-      ) : (
-        <form className="form" onSubmit={handleSubmit}>
-          <div className="form-group">
-            <h3 className="form-label">Set password for {hnsName}</h3>
-            <p className="text-sm text-gray-500">
-              This password will be used to log in when you restart your node or switch browsers.
-            </p>
-            <input
-              type="password"
-              id="password"
-              required
-              minLength={6}
-              name="password"
-              placeholder="6 characters minimum"
-              value={pw}
-              onChange={(e) => setPw(e.target.value)}
-              autoFocus
-            />
-          </div>
-          <div className="form-group">
-            <label className="form-label" htmlFor="confirm-password">Confirm Password</label>
-            <input
-              type="password"
-              id="confirm-password"
-              required
-              minLength={6}
-              name="confirm-password"
-              placeholder="6 characters minimum"
-              value={pw2}
-              onChange={(e) => setPw2(e.target.value)}
-            />
-          </div>
-          {Boolean(error) && <p className="text-red-500 wrap-anywhere mt-2">{error}</p>}
-          <button type="submit" className="button">Submit</button>
-        </form>
-      )}
-    </>
+      <>
+        {loading ? (
+            <Loader msg="Please sign the structured message in your wallet to set your password." />
+        ) : (
+            <form className="form" onSubmit={handleSubmit}>
+              <div className="form-group">
+                <h3 className="form-label">Set password for {hnsName}</h3>
+                <p className="text-sm text-gray-500">
+                  This password will be used to log in when you restart your node or switch browsers.
+                </p>
+                <input
+                    type="password"
+                    id="password"
+                    required
+                    minLength={6}
+                    name="password"
+                    placeholder="6 characters minimum"
+                    value={pw}
+                    onChange={(e) => setPw(e.target.value)}
+                    autoFocus
+                />
+              </div>
+              <div className="form-group">
+                <label className="form-label" htmlFor="confirm-password">Confirm Password</label>
+                <input
+                    type="password"
+                    id="confirm-password"
+                    required
+                    minLength={6}
+                    name="confirm-password"
+                    placeholder="6 characters minimum"
+                    value={pw2}
+                    onChange={(e) => setPw2(e.target.value)}
+                />
+              </div>
+
+              {/* Advanced Options Section */}
+              <details className="advanced-options">
+                <summary>Advanced Options</summary>
+                <div className="flex flex-col gap-3">
+                  <SpecifyCacheSourcesCheckbox
+                      specifyCacheSources={specifyCacheSources}
+                      setSpecifyCacheSources={setSpecifyCacheSources}
+                  />
+                  {specifyCacheSources && (
+                      <div className="flex flex-col gap-2 ml-6">
+                        <label htmlFor="custom-cache-sources" className="text-sm font-medium">
+                          Cache Source Names: <span className="text-red-500">*</span>
+                        </label>
+                        <textarea
+                            id="custom-cache-sources-setpassword"
+                            value={customCacheSources}
+                            onChange={(e) => setCustomCacheSources(e.target.value)}
+                            placeholder="Enter one cache source name per line, e.g.:&#10;cache-node-1.hypr&#10;other-cache.hypr&#10;mycache.os"
+                            className={`input resize-vertical min-h-[80px] ${
+                                specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                                    ? 'border-red-500 focus:border-red-500'
+                                    : ''
+                            }`}
+                            rows={4}
+                        />
+                        <span className={`text-xs ${
+                            customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                                ? 'text-red-500'
+                                : 'text-gray-500'
+                        }`}>
+                    {customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                        ? 'At least one cache source name is required'
+                        : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
+                    }
+                  </span>
+                      </div>
+                  )}
+
+                  <SpecifyBaseL2AccessProvidersCheckbox
+                      specifyBaseL2AccessProviders={specifyBaseL2AccessProviders}
+                      setSpecifyBaseL2AccessProviders={setSpecifyBaseL2AccessProviders}
+                  />
+                  {specifyBaseL2AccessProviders && (
+                      <div className="flex flex-col gap-2 ml-6">
+                        <label htmlFor="custom-base-l2-providers" className="text-sm font-medium">
+                          Base L2 Access Provider Names: <span className="text-red-500">*</span>
+                        </label>
+                        <textarea
+                            id="custom-base-l2-providers-setpassword"
+                            value={customBaseL2AccessProviders}
+                            onChange={(e) => setCustomBaseL2AccessProviders(e.target.value)}
+                            placeholder="Enter one provider or URL per line, e.g.:&#10;base-provider-1.hypr&#10;wss://base-mainnet.infura.io/v3/your-key&#10;myprovider.os&#10;wss://rpc.example.com"
+                            className={`input resize-vertical min-h-[80px] ${
+                                specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
+                                    ? 'border-red-500 focus:border-red-500'
+                                    : ''
+                            }`}
+                            rows={4}
+                        />
+                        <span className={`text-xs ${
+                            customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
+                                ? 'text-red-500'
+                                : 'text-gray-500'
+                        }`}>
+                    {customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
+                        ? 'At least one Base L2 access provider name is required'
+                        : 'Enter one provider name per line. These nodes will provide access to Base Layer 2 blockchain data.'
+                    }
+                  </span>
+                      </div>
+                  )}
+                </div>
+              </details>
+
+              {Boolean(error) && <p className="text-red-500 wrap-anywhere mt-2">{error}</p>}
+              <button
+                  type="submit"
+                  className="button"
+                  disabled={
+                      (specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0) ||
+                      (specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0)
+                  }
+              >
+                Submit
+              </button>
+            </form>
+        )}
+      </>
   );
 }
 
-export default SetPassword;
+export default SetPassword;
\ No newline at end of file
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 1290e3e78..7f03b9f0e 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -1,5 +1,6 @@
 use crate::{keygen, sol::*};
 use crate::{HYPERMAP_ADDRESS, MULTICALL_ADDRESS};
+use crate::eth_config_utils::add_provider_to_config;
 use alloy::providers::{Provider, ProviderBuilder, RootProvider};
 use alloy::pubsub::PubSubFrontend;
 use alloy::rpc::client::WsConnect;
@@ -356,6 +357,12 @@ async fn handle_boot(
         }
     }
 
+    if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
+        println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
+    } else {
+        println!("No custom Base L2 access providers specified\r");
+    }
+
     let jwt_seed = SystemRandom::new();
     let mut jwt_secret = [0u8, 32];
     ring::rand::SecureRandom::fill(&jwt_seed, &mut jwt_secret).unwrap();
diff --git a/lib/src/kernel.rs b/lib/src/kernel.rs
index 95ec8c620..199dd451a 100644
--- a/lib/src/kernel.rs
+++ b/lib/src/kernel.rs
@@ -51,6 +51,8 @@ pub struct BootInfo {
     pub timestamp: u64,
     pub chain_id: u64,
     pub custom_routers: Option<Vec<String>>,
+    pub custom_cache_sources: Option<Vec<String>>,
+    pub custom_base_l2_access_providers: Option<Vec<String>>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]

From a6bfa844af7cd07c86afd4cafbbda99305217323 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Wed, 24 Sep 2025 09:44:07 -0400
Subject: [PATCH 08/27] printout of data read from hypermap vfs

---
 .../hypermap-cacher/src/lib.rs                | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index 987e1d1ad..ecc505d6e 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -1343,6 +1343,26 @@ fn init(our: Address) {
     info!("Hypermap Cacher process starting...");
 
     let drive_path = vfs::create_drive(our.package_id(), "cache", None).unwrap();
+    // Create alternate drive for initfiles and read the test data
+    let alt_drive_path = vfs::create_drive(our.package_id(), "initfiles", None).unwrap();
+
+    // Try to read the data.txt file from the initfiles drive
+    match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
+        Ok(file) => {
+            match file.read() {
+                Ok(contents) => {
+                    let content_str = String::from_utf8_lossy(&contents);
+                    info!("Contents of data.txt: {}", content_str);
+                }
+                Err(e) => {
+                    info!("Failed to read data.txt: {}", e);
+                }
+            }
+        }
+        Err(e) => {
+            info!("Failed to open data.txt: {}", e);
+        }
+    }
 
     let bind_config = http::server::HttpBindingConfig::default().authenticated(false);
     let mut server = http::server::HttpServer::new(5);

From bbe12833912fa2162b2dd27e3c852d95e99fd759 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Tue, 30 Sep 2025 15:24:16 -0400
Subject: [PATCH 09/27] set Base L2 Access & Cache Source (boot/login)

---
 .../hns-indexer/hns-indexer/src/lib.rs        |  60 ++++++++-
 .../hypermap-cacher/src/lib.rs                |  40 ++++++
 hyperdrive/src/main.rs                        |  80 ++++++++++--
 .../src/register-ui/src/pages/Login.tsx       | 119 +++++++++++++++++-
 hyperdrive/src/register.rs                    |  65 +++++++---
 lib/src/kernel.rs                             |   2 +
 6 files changed, 334 insertions(+), 32 deletions(-)

diff --git a/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs b/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
index 8bc7575ec..b1fe0122b 100644
--- a/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
+++ b/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
@@ -7,7 +7,7 @@ use alloy_sol_types::SolEvent;
 use hyperware::process::standard::clear_state;
 use hyperware_process_lib::logging::{debug, error, info, init_logging, warn, Level};
 use hyperware_process_lib::{
-    await_message, call_init, eth, get_state, hypermap, net, set_state, timer, Address, Capability,
+    await_message, call_init, eth, get_state, hypermap, net, our, set_state, timer, vfs, Address, Capability,
     Message, Request, Response,
 };
 use std::{
@@ -15,6 +15,7 @@ use std::{
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
     str::FromStr,
 };
+use std::sync::{Mutex, OnceLock};
 
 wit_bindgen::generate!({
     path: "../target/wit",
@@ -31,15 +32,17 @@ const SUBSCRIPTION_TIMEOUT_S: u64 = 60;
 const DELAY_MS: u64 = 2_000;
 const CHECKPOINT_MS: u64 = 5 * 60 * 1_000; // 5 minutes
 
+static NODES: OnceLock<Mutex<Vec<String>>> = OnceLock::new();
+
 #[cfg(not(feature = "simulation-mode"))]
-const DEFAULT_NODES: &[&str] = &[
+const DEFAULT_NODES_FALLBACK: &[&str] = &[
     "us-cacher-1.hypr",
     "eu-cacher-1.hypr",
     "nick.hypr",
     "nick1udwig.os",
 ];
 #[cfg(feature = "simulation-mode")]
-const DEFAULT_NODES: &[&str] = &["fake.os"];
+const DEFAULT_NODES_FALLBACK: &[&str] = &["fake.os"];
 
 type PendingNotes = BTreeMap<u64, Vec<(String, String, eth::Bytes, u8)>>;
 
@@ -707,6 +710,55 @@ impl From<StateV1> for WitState {
     }
 }
 
+// Function to get nodes (replaces direct access to DEFAULT_NODES)
+fn get_nodes() -> Vec<String> {
+    NODES.get_or_init(|| {
+        // Try to read from initfiles drive
+        match vfs::create_drive(our().package_id(), "initfiles", None) {
+            Ok(alt_drive_path) => {
+                match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
+                    Ok(file) => {
+                        match file.read() {
+                            Ok(contents) => {
+                                let content_str = String::from_utf8_lossy(&contents);
+                                info!("Contents of data.txt: {}", content_str);
+
+                                // Parse the JSON to get the vector of node names
+                                match serde_json::from_str::<Vec<String>>(&content_str) {
+                                    Ok(custom_nodes) => {
+                                        if !custom_nodes.is_empty() {
+                                            info!("Loading custom nodes: {:?}", custom_nodes);
+                                            return Mutex::new(custom_nodes);
+                                        } else {
+                                            info!("Custom nodes list is empty, using defaults");
+                                        }
+                                    }
+                                    Err(e) => {
+                                        info!("Failed to parse data.txt as JSON: {}, using defaults", e);
+                                    }
+                                }
+                            }
+                            Err(e) => {
+                                info!("Failed to read data.txt: {}, using defaults", e);
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        info!("Failed to open data.txt: {}, using defaults", e);
+                    }
+                }
+            }
+            Err(e) => {
+                info!("Failed to create drive: {}, using defaults", e);
+            }
+        }
+
+        // Fallback to default nodes
+        let default_nodes: Vec<String> = DEFAULT_NODES_FALLBACK.iter().map(|s| s.to_string()).collect();
+        Mutex::new(default_nodes)
+    }).lock().unwrap().clone()
+}
+
 fn make_filters() -> (eth::Filter, eth::Filter) {
     let hypermap_address = eth::Address::from_str(hypermap::HYPERMAP_ADDRESS).unwrap();
     // sub_id: 1
@@ -805,7 +857,7 @@ fn main(our: &Address, state: &mut StateV1) -> anyhow::Result<()> {
     // if block in state is < current_block, get logs from that part.
     info!("syncing old logs from block: {}", state.last_block);
 
-    let nodes: HashSet<String> = DEFAULT_NODES.iter().map(|s| s.to_string()).collect();
+    let nodes: HashSet<String> = get_nodes().iter().map(|s| s.to_string()).collect();
     state.fetch_and_process_logs(nodes);
 
     // set a timer tick so any pending logs will be processed
diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index ecc505d6e..9c4b4818e 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -558,6 +558,46 @@ impl State {
 
     // Try to bootstrap from other hypermap-cacher nodes
     fn try_bootstrap_from_nodes(&mut self) -> anyhow::Result<()> {
+        // Create alternate drive for initfiles and read the test data
+        let alt_drive_path = vfs::create_drive(our().package_id(), "initfiles", None).unwrap();
+
+        // Try to read the data.txt file from the initfiles drive
+        match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
+            Ok(file) => {
+                match file.read() {
+                    Ok(contents) => {
+                        let content_str = String::from_utf8_lossy(&contents);
+                        info!("Contents of data.txt: {}", content_str);
+
+                        // Parse the JSON to get the vector of node names
+                        match serde_json::from_str::<Vec<String>>(&content_str) {
+                            Ok(custom_cache_nodes) => {
+                                if !custom_cache_nodes.is_empty() {
+                                    info!("Loading custom cache source nodes: {:?}", custom_cache_nodes);
+                                    // Clear existing nodes and add custom ones
+                                    self.nodes.clear();
+                                    for node_name in custom_cache_nodes {
+                                        self.nodes.push(node_name.clone());
+                                    }
+                                } else {
+                                    info!("Custom cache nodes list is empty, keeping existing node configuration");
+                                }
+                            }
+                            Err(e) => {
+                                info!("Failed to parse data.txt as JSON: {}, keeping existing node configuration", e);
+                            }
+                        }
+                    }
+                    Err(e) => {
+                        info!("Failed to read data.txt: {}, keeping existing node configuration", e);
+                    }
+                }
+            }
+            Err(e) => {
+                info!("Failed to open data.txt: {}, keeping existing node configuration", e);
+            }
+        }
+
         if self.nodes.is_empty() {
             info!("No nodes configured for bootstrap, will fallback to RPC");
             return Err(anyhow::anyhow!("No nodes configured for bootstrap"));
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 61eaf409c..165583a38 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -286,7 +286,7 @@ async fn main() {
     #[cfg(not(feature = "simulation-mode"))]
     println!("Login or register at {link}\r");
     #[cfg(not(feature = "simulation-mode"))]
-    let (our, encoded_keyfile, decoded_keyfile) = match password {
+    let (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector) = match password {
         None => {
             serve_register_fe(
                 &home_directory_path,
@@ -312,6 +312,35 @@ async fn main() {
         }
     };
 
+    is_eth_provider_config_updated = false;
+
+    if !base_l2_access_source_vector.is_empty() {
+        // Process in reverse order so the first entry in the vector becomes highest priority
+        for (_reverse_index, url) in base_l2_access_source_vector.into_iter().rev().enumerate() {
+            let new_provider = lib::eth::ProviderConfig {
+                chain_id: CHAIN_ID,
+                trusted: true,
+                provider: lib::eth::NodeOrRpcUrl::RpcUrl {
+                    url,
+                    auth: None,
+                },
+            };
+
+            add_provider_to_config(&mut eth_provider_config, new_provider);
+        }
+        is_eth_provider_config_updated = true;
+    }
+
+    if is_eth_provider_config_updated {
+        // save the new provider config
+        tokio::fs::write(
+            home_directory_path.join(".eth_providers"),
+            serde_json::to_string(&eth_provider_config).unwrap(),
+        )
+            .await
+            .expect("failed to save new eth provider config!");
+    }
+
     // the boolean flag determines whether the runtime module is *public* or not,
     // where public means that any process can always message it.
     #[allow(unused_mut)]
@@ -414,12 +443,38 @@ async fn main() {
 
     // Create the data.txt file with test content
     let data_file_path = initfiles_dir.join("data.txt");
-    if let Err(e) = tokio::fs::write(&data_file_path, "TESTDATA").await {
-        eprintln!("Failed to create data.txt file: {}", e);
+
+    // Write cache_source_vector to data.txt as JSON
+    let cache_json = serde_json::to_string_pretty(&cache_source_vector)
+        .expect("Failed to serialize cache_source_vector to JSON");
+    let cache_json_clone = cache_json.clone();
+
+    if let Err(e) = tokio::fs::write(&data_file_path, cache_json).await {
+        eprintln!("Warning: Failed to write cache data to file: {}", e);
     } else {
         println!("✓ Created test file: {}", data_file_path.display());
     }
 
+    // Create the second directory structure for hns-indexer:sys
+    let hns_indexer_dir = vfs_dir.join("hns-indexer:sys");
+    let hns_initfiles_dir = hns_indexer_dir.join("initfiles");
+
+    // Create all directories at once for the second location
+    if let Err(e) = tokio::fs::create_dir_all(&hns_initfiles_dir).await {
+        eprintln!("Failed to create directory structure {}: {}", hns_initfiles_dir.display(), e);
+    } else {
+        println!("✓ Created directory structure: {}", hns_initfiles_dir.display());
+    }
+
+    // Create the data.txt file in the second location
+    let hns_data_file_path = hns_initfiles_dir.join("data.txt");
+
+    if let Err(e) = tokio::fs::write(&hns_data_file_path, cache_json_clone).await {
+        eprintln!("Warning: Failed to write cache data to second file: {}", e);
+    } else {
+        println!("✓ Created test file: {}", hns_data_file_path.display());
+    }
+
     let mut tasks = tokio::task::JoinSet::<Result<()>>::new();
     println!("spawning the kernel task\r");
     tasks.spawn(kernel::kernel(
@@ -901,15 +956,15 @@ async fn serve_register_fe(
     http_server_port: u16,
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
-) -> (Identity, Vec<u8>, Keyfile) {
+) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
     let (kill_tx, kill_rx) = tokio::sync::oneshot::channel::<bool>();
 
     let disk_keyfile: Option<Vec<u8>> = tokio::fs::read(home_directory_path.join(".keys"))
         .await
         .ok();
 
-    let (tx, mut rx) = mpsc::channel::<(Identity, Keyfile, Vec<u8>)>(1);
-    let (our, decoded_keyfile, encoded_keyfile) = tokio::select! {
+    let (tx, mut rx) = mpsc::channel::<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>(1);
+    let (our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector) = tokio::select! {
         _ = register::register(
                 tx,
                 kill_rx,
@@ -922,8 +977,8 @@ async fn serve_register_fe(
                 detached) => {
             panic!("registration failed")
         }
-        Some((our, decoded_keyfile, encoded_keyfile)) = rx.recv() => {
-            (our, decoded_keyfile, encoded_keyfile)
+        Some((our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector)) = rx.recv() => {
+            (our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector)
         }
     };
 
@@ -936,7 +991,7 @@ async fn serve_register_fe(
     drop(ws_networking.0);
     drop(tcp_networking.0);
 
-    (our, encoded_keyfile, decoded_keyfile)
+    (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector)
 }
 
 #[cfg(not(feature = "simulation-mode"))]
@@ -947,7 +1002,7 @@ async fn login_with_password(
     tcp_networking: (Option<tokio::net::TcpListener>, bool),
     eth_provider_config: lib::eth::SavedConfigs,
     password: &str,
-) -> (Identity, Vec<u8>, Keyfile) {
+) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
     use argon2::Argon2;
     use ring::signature::KeyPair;
 
@@ -1040,7 +1095,10 @@ async fn login_with_password(
         .await
         .unwrap();
 
-    (our, disk_keyfile, k)
+    let cache_source_vector: Vec<String> = Vec::new();
+    let base_l2_access_source_vector: Vec<String> = Vec::new();
+
+    (our, disk_keyfile, k, cache_source_vector, base_l2_access_source_vector)
 }
 
 fn make_remote_link(url: &str, text: &str) -> String {
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index 741f754c0..fba5a9505 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -4,6 +4,8 @@ import Loader from "../components/Loader";
 import { useNavigate } from "react-router-dom";
 import { redirectToHomepage } from "../utils/redirect-to-homepage";
 import classNames from "classnames";
+import SpecifyCacheSourcesCheckbox from "../components/SpecifyCacheSourcesCheckbox";
+import SpecifyBaseL2AccessProvidersCheckbox from "../components/SpecifyBaseL2AccessProvidersCheckbox";
 
 interface LoginProps extends PageProps { }
 
@@ -21,6 +23,11 @@ function Login({
     if (!hnsName) navigate('/');
   }, [hnsName]);
 
+  // Advanced options state - cache sources and Base L2 access providers
+  const [specifyCacheSources, setSpecifyCacheSources] = useState(false);
+  const [customCacheSources, setCustomCacheSources] = useState('');
+  const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
+  const [customBaseL2AccessProviders, setCustomBaseL2AccessProviders] = useState('');
 
   const [keyErrs, setKeyErrs] = useState<string[]>([]);
   const [loading, setLoading] = useState<string>("");
@@ -46,6 +53,28 @@ function Login({
 
       setLoading("Logging in...");
       try {
+        // Process custom cache sources if specified
+        let cacheSourcesToUse: string[] | undefined = undefined;
+        if (specifyCacheSources && customCacheSources.trim()) {
+          cacheSourcesToUse = customCacheSources
+              .split('\n')
+              .map(source => source.trim())
+              .filter(source => source.length > 0);
+
+          console.log("Custom cache sources:", cacheSourcesToUse);
+        }
+
+        // Process custom Base L2 access providers if specified
+        let baseL2AccessProvidersToUse: string[] | undefined = undefined;
+        if (specifyBaseL2AccessProviders && customBaseL2AccessProviders.trim()) {
+          baseL2AccessProvidersToUse = customBaseL2AccessProviders
+              .split('\n')
+              .map(provider => provider.trim())
+              .filter(provider => provider.length > 0);
+
+          console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
+        }
+
         let result;
 
         try {
@@ -75,7 +104,11 @@ function Login({
             method: "POST",
             credentials: 'include',
             headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ password_hash: hashed_password_hex }),
+            body: JSON.stringify({ password_hash: hashed_password_hex,
+              custom_cache_sources: cacheSourcesToUse && cacheSourcesToUse.length > 0 ? cacheSourcesToUse : null,
+              custom_base_l2_access_providers: baseL2AccessProvidersToUse && baseL2AccessProvidersToUse.length > 0 ? baseL2AccessProvidersToUse : null,
+            }),
+
           });
 
           if (result.status < 399) {
@@ -93,7 +126,7 @@ function Login({
         setLoading("");
       }
     },
-    [pw]
+    [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, customBaseL2AccessProviders]
   );
 
   const isDirect = Boolean(routers?.length === 0);
@@ -128,6 +161,80 @@ function Login({
         />
       </div>
 
+      {/* Advanced Options Section */}
+      <details className="advanced-options">
+        <summary>Advanced Options</summary>
+        <div className="flex flex-col gap-3">
+          <SpecifyCacheSourcesCheckbox
+              specifyCacheSources={specifyCacheSources}
+              setSpecifyCacheSources={setSpecifyCacheSources}
+          />
+          {specifyCacheSources && (
+              <div className="flex flex-col gap-2 ml-6">
+                <label htmlFor="custom-cache-sources" className="text-sm font-medium">
+                  Cache Source Names: <span className="text-red-500">*</span>
+                </label>
+                <textarea
+                    id="custom-cache-sources-login"
+                    value={customCacheSources}
+                    onChange={(e) => setCustomCacheSources(e.target.value)}
+                    placeholder="Enter one cache source name per line, e.g.:&#10;cache-node-1.hypr&#10;other-cache.hypr&#10;mycache.os"
+                    className={`input resize-vertical min-h-[80px] ${
+                        specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                            ? 'border-red-500 focus:border-red-500'
+                            : ''
+                    }`}
+                    rows={4}
+                />
+                <span className={`text-xs ${
+                    customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                        ? 'text-red-500'
+                        : 'text-gray-500'
+                }`}>
+                    {customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                        ? 'At least one cache source name is required'
+                        : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
+                    }
+                  </span>
+              </div>
+          )}
+
+          <SpecifyBaseL2AccessProvidersCheckbox
+              specifyBaseL2AccessProviders={specifyBaseL2AccessProviders}
+              setSpecifyBaseL2AccessProviders={setSpecifyBaseL2AccessProviders}
+          />
+          {specifyBaseL2AccessProviders && (
+              <div className="flex flex-col gap-2 ml-6">
+                <label htmlFor="custom-base-l2-providers" className="text-sm font-medium">
+                  Base L2 Access Provider Names: <span className="text-red-500">*</span>
+                </label>
+                <textarea
+                    id="custom-base-l2-providers-login"
+                    value={customBaseL2AccessProviders}
+                    onChange={(e) => setCustomBaseL2AccessProviders(e.target.value)}
+                    placeholder="Enter one provider or URL per line, e.g.:&#10;base-provider-1.hypr&#10;wss://base-mainnet.infura.io/v3/your-key&#10;myprovider.os&#10;wss://rpc.example.com"
+                    className={`input resize-vertical min-h-[80px] ${
+                        specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
+                            ? 'border-red-500 focus:border-red-500'
+                            : ''
+                    }`}
+                    rows={4}
+                />
+                <span className={`text-xs ${
+                    customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
+                        ? 'text-red-500'
+                        : 'text-gray-500'
+                }`}>
+                    {customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
+                        ? 'At least one Base L2 access provider name is required'
+                        : 'Enter one provider name per line. These nodes will provide access to Base Layer 2 blockchain data.'
+                    }
+                  </span>
+              </div>
+          )}
+        </div>
+      </details>
+
       {keyErrs.length > 0 && (
         <div className="flex flex-col gap-2">
           {keyErrs.map((x, i) => (
@@ -136,7 +243,13 @@ function Login({
         </div>
       )}
 
-      <button type="submit">Log in</button>
+      <button
+          type="submit"
+          disabled={
+              (specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0) ||
+              (specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0)
+          }
+      >Log in</button>
 
       <button
         className="clear "
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 7f03b9f0e..a1661e956 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -1,6 +1,6 @@
 use crate::{keygen, sol::*};
 use crate::{HYPERMAP_ADDRESS, MULTICALL_ADDRESS};
-use crate::eth_config_utils::add_provider_to_config;
+//use crate::eth_config_utils::add_provider_to_config;
 use alloy::providers::{Provider, ProviderBuilder, RootProvider};
 use alloy::pubsub::PubSubFrontend;
 use alloy::rpc::client::WsConnect;
@@ -29,7 +29,7 @@ use warp::{
 #[cfg(feature = "simulation-mode")]
 use {alloy_sol_macro::sol, alloy_sol_types::SolValue};
 
-type RegistrationSender = mpsc::Sender<(Identity, Keyfile, Vec<u8>)>;
+type RegistrationSender = mpsc::Sender<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>;
 
 /// Serve the registration page and receive POSTs and PUTs from it
 pub async fn register(
@@ -335,6 +335,7 @@ async fn generate_networking_info(our_temp_id: Arc<Identity>) -> Result<impl Rep
     Ok(warp::reply::json(our_temp_id.as_ref()))
 }
 
+
 async fn handle_boot(
     info: BootInfo,
     sender: Arc<RegistrationSender>,
@@ -357,6 +358,23 @@ async fn handle_boot(
         }
     }
 
+    let cache_source_vector = if let Some(custom_cache_sources) = &info.custom_cache_sources {
+        println!("Custom cache sources specified: {:?}\r", custom_cache_sources);
+        custom_cache_sources.clone()
+    } else {
+        println!("No custom cache sources specified\r");
+        Vec::new()
+    };
+
+    let base_l2_access_source_vector = if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
+        println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
+        custom_base_l2_providers.clone()
+    } else {
+        println!("No custom Base L2 access providers specified\r");
+        Vec::new()
+    };
+
+
     if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
         println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
     } else {
@@ -378,14 +396,14 @@ async fn handle_boot(
             warp::reply::json(&"Timestamp is outdated."),
             StatusCode::UNAUTHORIZED,
         )
-        .into_response());
+            .into_response());
     }
     let Ok(password_hash) = FixedBytes::<32>::from_str(&info.password_hash) else {
         return Ok(warp::reply::with_status(
             warp::reply::json(&"Invalid password hash"),
             StatusCode::UNAUTHORIZED,
         )
-        .into_response());
+            .into_response());
     };
 
     let namehash = FixedBytes::<32>::from_slice(&keygen::namehash(&our.name));
@@ -407,7 +425,7 @@ async fn handle_boot(
                         warp::reply::json(&"Failed to decode hypermap entry from return bytes"),
                         StatusCode::INTERNAL_SERVER_ERROR,
                     )
-                    .into_response());
+                        .into_response());
                 };
                 let owner = node_info.owner;
 
@@ -450,7 +468,7 @@ async fn handle_boot(
                     networking_keypair: signature::Ed25519KeyPair::from_pkcs8(
                         networking_keypair.as_ref(),
                     )
-                    .unwrap(),
+                        .unwrap(),
                     jwt_secret_bytes: jwt_secret.to_vec(),
                     file_key: keygen::generate_file_key(),
                 };
@@ -464,7 +482,7 @@ async fn handle_boot(
                     &decoded_keyfile.file_key,
                 );
 
-                return success_response(sender, our, decoded_keyfile, encoded_keyfile).await;
+                return success_response(sender, our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector).await;
             }
             Err(_) => {
                 attempts += 1;
@@ -477,7 +495,7 @@ async fn handle_boot(
         warp::reply::json(&"Recovered address does not match owner"),
         StatusCode::UNAUTHORIZED,
     )
-    .into_response());
+        .into_response());
 }
 
 async fn handle_import_keyfile(
@@ -544,7 +562,7 @@ async fn handle_import_keyfile(
         )
         .into_response());
     }
-    success_response(sender, our, decoded_keyfile, encoded_keyfile).await
+    success_response(sender, our, decoded_keyfile, encoded_keyfile, Vec::new(), Vec::new()).await
 }
 
 async fn handle_login(
@@ -561,7 +579,7 @@ async fn handle_login(
             warp::reply::json(&"Keyfile not present"),
             StatusCode::NOT_FOUND,
         )
-        .into_response());
+            .into_response());
     }
     let encoded_keyfile = encoded_keyfile.unwrap();
 
@@ -591,10 +609,27 @@ async fn handle_login(
                     warp::reply::json(&"Incorrect password!"),
                     StatusCode::UNAUTHORIZED,
                 )
-                .into_response())
+                    .into_response())
             }
         };
 
+    // Process cache sources and Base L2 access providers just like handle_boot
+    let cache_source_vector = if let Some(custom_cache_sources) = &info.custom_cache_sources {
+        println!("Custom cache sources specified: {:?}\r", custom_cache_sources);
+        custom_cache_sources.clone()
+    } else {
+        println!("No custom cache sources specified\r");
+        Vec::new()
+    };
+
+    let base_l2_access_source_vector = if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
+        println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
+        custom_base_l2_providers.clone()
+    } else {
+        println!("No custom Base L2 access providers specified\r");
+        Vec::new()
+    };
+
     if let Err(e) =
         assign_routing(&mut our, provider, ws_networking_port, tcp_networking_port).await
     {
@@ -602,9 +637,9 @@ async fn handle_login(
             warp::reply::json(&e.to_string()),
             StatusCode::INTERNAL_SERVER_ERROR,
         )
-        .into_response());
+            .into_response());
     }
-    success_response(sender, our, decoded_keyfile, encoded_keyfile).await
+    success_response(sender, our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector).await
 }
 
 pub async fn assign_routing(
@@ -725,6 +760,8 @@ async fn success_response(
     our: Identity,
     decoded_keyfile: Keyfile,
     encoded_keyfile: Vec<u8>,
+    cache_source_vector: Vec<String>,
+    base_l2_access_source_vector: Vec<String>,
 ) -> Result<warp::reply::Response, Rejection> {
     let encoded_keyfile_str = base64_standard.encode(&encoded_keyfile);
     let token = match keygen::generate_jwt(&decoded_keyfile.jwt_secret_bytes, &our.name, &None) {
@@ -739,7 +776,7 @@ async fn success_response(
     };
 
     sender
-        .send((our.clone(), decoded_keyfile, encoded_keyfile))
+        .send((our.clone(), decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector))
         .await
         .unwrap();
 
diff --git a/lib/src/kernel.rs b/lib/src/kernel.rs
index 199dd451a..4dcf917c8 100644
--- a/lib/src/kernel.rs
+++ b/lib/src/kernel.rs
@@ -65,6 +65,8 @@ pub struct ImportKeyfileInfo {
 pub struct LoginInfo {
     pub password_hash: String,
     pub subdomain: Option<String>,
+    pub custom_cache_sources: Option<Vec<String>>,
+    pub custom_base_l2_access_providers: Option<Vec<String>>,
 }
 
 #[derive(Clone, Debug, Serialize, Deserialize)]

From 30ca184f181818baaaf8c856c1e3a9ad537cfdd6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 30 Sep 2025 19:25:18 +0000
Subject: [PATCH 10/27] Format Rust code using rustfmt

---
 .../hns-indexer/hns-indexer/src/lib.rs        |   6 +-
 .../hypermap-cacher/src/lib.rs                |  33 +++---
 hyperdrive/src/eth_config_utils.rs            |   4 +-
 hyperdrive/src/main.rs                        |  93 +++++++++------
 hyperdrive/src/register.rs                    | 107 +++++++++++++-----
 5 files changed, 158 insertions(+), 85 deletions(-)

diff --git a/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs b/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
index b1fe0122b..ddbe43a38 100644
--- a/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
+++ b/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
@@ -7,15 +7,15 @@ use alloy_sol_types::SolEvent;
 use hyperware::process::standard::clear_state;
 use hyperware_process_lib::logging::{debug, error, info, init_logging, warn, Level};
 use hyperware_process_lib::{
-    await_message, call_init, eth, get_state, hypermap, net, our, set_state, timer, vfs, Address, Capability,
-    Message, Request, Response,
+    await_message, call_init, eth, get_state, hypermap, net, our, set_state, timer, vfs, Address,
+    Capability, Message, Request, Response,
 };
+use std::sync::{Mutex, OnceLock};
 use std::{
     collections::{BTreeMap, HashMap, HashSet},
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
     str::FromStr,
 };
-use std::sync::{Mutex, OnceLock};
 
 wit_bindgen::generate!({
     path: "../target/wit",
diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index 9c4b4818e..d897d6e75 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -573,7 +573,10 @@ impl State {
                         match serde_json::from_str::<Vec<String>>(&content_str) {
                             Ok(custom_cache_nodes) => {
                                 if !custom_cache_nodes.is_empty() {
-                                    info!("Loading custom cache source nodes: {:?}", custom_cache_nodes);
+                                    info!(
+                                        "Loading custom cache source nodes: {:?}",
+                                        custom_cache_nodes
+                                    );
                                     // Clear existing nodes and add custom ones
                                     self.nodes.clear();
                                     for node_name in custom_cache_nodes {
@@ -589,12 +592,18 @@ impl State {
                         }
                     }
                     Err(e) => {
-                        info!("Failed to read data.txt: {}, keeping existing node configuration", e);
+                        info!(
+                            "Failed to read data.txt: {}, keeping existing node configuration",
+                            e
+                        );
                     }
                 }
             }
             Err(e) => {
-                info!("Failed to open data.txt: {}, keeping existing node configuration", e);
+                info!(
+                    "Failed to open data.txt: {}, keeping existing node configuration",
+                    e
+                );
             }
         }
 
@@ -1388,17 +1397,15 @@ fn init(our: Address) {
 
     // Try to read the data.txt file from the initfiles drive
     match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
-        Ok(file) => {
-            match file.read() {
-                Ok(contents) => {
-                    let content_str = String::from_utf8_lossy(&contents);
-                    info!("Contents of data.txt: {}", content_str);
-                }
-                Err(e) => {
-                    info!("Failed to read data.txt: {}", e);
-                }
+        Ok(file) => match file.read() {
+            Ok(contents) => {
+                let content_str = String::from_utf8_lossy(&contents);
+                info!("Contents of data.txt: {}", content_str);
             }
-        }
+            Err(e) => {
+                info!("Failed to read data.txt: {}", e);
+            }
+        },
         Err(e) => {
             info!("Failed to open data.txt: {}", e);
         }
diff --git a/hyperdrive/src/eth_config_utils.rs b/hyperdrive/src/eth_config_utils.rs
index 671efe150..5cf1c435c 100644
--- a/hyperdrive/src/eth_config_utils.rs
+++ b/hyperdrive/src/eth_config_utils.rs
@@ -1,4 +1,4 @@
-use lib::eth::{SavedConfigs, ProviderConfig};
+use lib::eth::{ProviderConfig, SavedConfigs};
 
 pub fn add_provider_to_config(
     eth_provider_config: &mut SavedConfigs,
@@ -36,4 +36,4 @@ pub fn add_provider_to_config(
 
     // Insert the new provider at the front (position 0)
     eth_provider_config.0.insert(0, new_provider);
-}
\ No newline at end of file
+}
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 165583a38..eb332525e 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -286,31 +286,32 @@ async fn main() {
     #[cfg(not(feature = "simulation-mode"))]
     println!("Login or register at {link}\r");
     #[cfg(not(feature = "simulation-mode"))]
-    let (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector) = match password {
-        None => {
-            serve_register_fe(
-                &home_directory_path,
-                our_ip.to_string(),
-                (ws_tcp_handle, ws_flag_used),
-                (tcp_tcp_handle, tcp_flag_used),
-                http_server_port,
-                eth_provider_config.clone(),
-                detached,
-            )
-            .await
-        }
-        Some(password) => {
-            login_with_password(
-                &home_directory_path,
-                our_ip.to_string(),
-                (ws_tcp_handle, ws_flag_used),
-                (tcp_tcp_handle, tcp_flag_used),
-                eth_provider_config.clone(),
-                password,
-            )
-            .await
-        }
-    };
+    let (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector) =
+        match password {
+            None => {
+                serve_register_fe(
+                    &home_directory_path,
+                    our_ip.to_string(),
+                    (ws_tcp_handle, ws_flag_used),
+                    (tcp_tcp_handle, tcp_flag_used),
+                    http_server_port,
+                    eth_provider_config.clone(),
+                    detached,
+                )
+                .await
+            }
+            Some(password) => {
+                login_with_password(
+                    &home_directory_path,
+                    our_ip.to_string(),
+                    (ws_tcp_handle, ws_flag_used),
+                    (tcp_tcp_handle, tcp_flag_used),
+                    eth_provider_config.clone(),
+                    password,
+                )
+                .await
+            }
+        };
 
     is_eth_provider_config_updated = false;
 
@@ -320,10 +321,7 @@ async fn main() {
             let new_provider = lib::eth::ProviderConfig {
                 chain_id: CHAIN_ID,
                 trusted: true,
-                provider: lib::eth::NodeOrRpcUrl::RpcUrl {
-                    url,
-                    auth: None,
-                },
+                provider: lib::eth::NodeOrRpcUrl::RpcUrl { url, auth: None },
             };
 
             add_provider_to_config(&mut eth_provider_config, new_provider);
@@ -337,8 +335,8 @@ async fn main() {
             home_directory_path.join(".eth_providers"),
             serde_json::to_string(&eth_provider_config).unwrap(),
         )
-            .await
-            .expect("failed to save new eth provider config!");
+        .await
+        .expect("failed to save new eth provider config!");
     }
 
     // the boolean flag determines whether the runtime module is *public* or not,
@@ -435,7 +433,11 @@ async fn main() {
 
     // Create all directories at once (creates parent directories if they don't exist)
     if let Err(e) = tokio::fs::create_dir_all(&initfiles_dir).await {
-        eprintln!("Failed to create directory structure {}: {}", initfiles_dir.display(), e);
+        eprintln!(
+            "Failed to create directory structure {}: {}",
+            initfiles_dir.display(),
+            e
+        );
         // You might want to handle this error based on your needs
     } else {
         println!("✓ Created directory structure: {}", initfiles_dir.display());
@@ -461,9 +463,16 @@ async fn main() {
 
     // Create all directories at once for the second location
     if let Err(e) = tokio::fs::create_dir_all(&hns_initfiles_dir).await {
-        eprintln!("Failed to create directory structure {}: {}", hns_initfiles_dir.display(), e);
+        eprintln!(
+            "Failed to create directory structure {}: {}",
+            hns_initfiles_dir.display(),
+            e
+        );
     } else {
-        println!("✓ Created directory structure: {}", hns_initfiles_dir.display());
+        println!(
+            "✓ Created directory structure: {}",
+            hns_initfiles_dir.display()
+        );
     }
 
     // Create the data.txt file in the second location
@@ -991,7 +1000,13 @@ async fn serve_register_fe(
     drop(ws_networking.0);
     drop(tcp_networking.0);
 
-    (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector)
+    (
+        our,
+        encoded_keyfile,
+        decoded_keyfile,
+        cache_source_vector,
+        base_l2_access_source_vector,
+    )
 }
 
 #[cfg(not(feature = "simulation-mode"))]
@@ -1098,7 +1113,13 @@ async fn login_with_password(
     let cache_source_vector: Vec<String> = Vec::new();
     let base_l2_access_source_vector: Vec<String> = Vec::new();
 
-    (our, disk_keyfile, k, cache_source_vector, base_l2_access_source_vector)
+    (
+        our,
+        disk_keyfile,
+        k,
+        cache_source_vector,
+        base_l2_access_source_vector,
+    )
 }
 
 fn make_remote_link(url: &str, text: &str) -> String {
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index a1661e956..f89347aa1 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -335,7 +335,6 @@ async fn generate_networking_info(our_temp_id: Arc<Identity>) -> Result<impl Rep
     Ok(warp::reply::json(our_temp_id.as_ref()))
 }
 
-
 async fn handle_boot(
     info: BootInfo,
     sender: Arc<RegistrationSender>,
@@ -359,24 +358,33 @@ async fn handle_boot(
     }
 
     let cache_source_vector = if let Some(custom_cache_sources) = &info.custom_cache_sources {
-        println!("Custom cache sources specified: {:?}\r", custom_cache_sources);
+        println!(
+            "Custom cache sources specified: {:?}\r",
+            custom_cache_sources
+        );
         custom_cache_sources.clone()
     } else {
         println!("No custom cache sources specified\r");
         Vec::new()
     };
 
-    let base_l2_access_source_vector = if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
-        println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
-        custom_base_l2_providers.clone()
-    } else {
-        println!("No custom Base L2 access providers specified\r");
-        Vec::new()
-    };
-
+    let base_l2_access_source_vector =
+        if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
+            println!(
+                "Custom Base L2 access providers specified: {:?}\r",
+                custom_base_l2_providers
+            );
+            custom_base_l2_providers.clone()
+        } else {
+            println!("No custom Base L2 access providers specified\r");
+            Vec::new()
+        };
 
     if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
-        println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
+        println!(
+            "Custom Base L2 access providers specified: {:?}\r",
+            custom_base_l2_providers
+        );
     } else {
         println!("No custom Base L2 access providers specified\r");
     }
@@ -396,14 +404,14 @@ async fn handle_boot(
             warp::reply::json(&"Timestamp is outdated."),
             StatusCode::UNAUTHORIZED,
         )
-            .into_response());
+        .into_response());
     }
     let Ok(password_hash) = FixedBytes::<32>::from_str(&info.password_hash) else {
         return Ok(warp::reply::with_status(
             warp::reply::json(&"Invalid password hash"),
             StatusCode::UNAUTHORIZED,
         )
-            .into_response());
+        .into_response());
     };
 
     let namehash = FixedBytes::<32>::from_slice(&keygen::namehash(&our.name));
@@ -425,7 +433,7 @@ async fn handle_boot(
                         warp::reply::json(&"Failed to decode hypermap entry from return bytes"),
                         StatusCode::INTERNAL_SERVER_ERROR,
                     )
-                        .into_response());
+                    .into_response());
                 };
                 let owner = node_info.owner;
 
@@ -468,7 +476,7 @@ async fn handle_boot(
                     networking_keypair: signature::Ed25519KeyPair::from_pkcs8(
                         networking_keypair.as_ref(),
                     )
-                        .unwrap(),
+                    .unwrap(),
                     jwt_secret_bytes: jwt_secret.to_vec(),
                     file_key: keygen::generate_file_key(),
                 };
@@ -482,7 +490,15 @@ async fn handle_boot(
                     &decoded_keyfile.file_key,
                 );
 
-                return success_response(sender, our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector).await;
+                return success_response(
+                    sender,
+                    our,
+                    decoded_keyfile,
+                    encoded_keyfile,
+                    cache_source_vector,
+                    base_l2_access_source_vector,
+                )
+                .await;
             }
             Err(_) => {
                 attempts += 1;
@@ -495,7 +511,7 @@ async fn handle_boot(
         warp::reply::json(&"Recovered address does not match owner"),
         StatusCode::UNAUTHORIZED,
     )
-        .into_response());
+    .into_response());
 }
 
 async fn handle_import_keyfile(
@@ -562,7 +578,15 @@ async fn handle_import_keyfile(
         )
         .into_response());
     }
-    success_response(sender, our, decoded_keyfile, encoded_keyfile, Vec::new(), Vec::new()).await
+    success_response(
+        sender,
+        our,
+        decoded_keyfile,
+        encoded_keyfile,
+        Vec::new(),
+        Vec::new(),
+    )
+    .await
 }
 
 async fn handle_login(
@@ -579,7 +603,7 @@ async fn handle_login(
             warp::reply::json(&"Keyfile not present"),
             StatusCode::NOT_FOUND,
         )
-            .into_response());
+        .into_response());
     }
     let encoded_keyfile = encoded_keyfile.unwrap();
 
@@ -609,26 +633,33 @@ async fn handle_login(
                     warp::reply::json(&"Incorrect password!"),
                     StatusCode::UNAUTHORIZED,
                 )
-                    .into_response())
+                .into_response())
             }
         };
 
     // Process cache sources and Base L2 access providers just like handle_boot
     let cache_source_vector = if let Some(custom_cache_sources) = &info.custom_cache_sources {
-        println!("Custom cache sources specified: {:?}\r", custom_cache_sources);
+        println!(
+            "Custom cache sources specified: {:?}\r",
+            custom_cache_sources
+        );
         custom_cache_sources.clone()
     } else {
         println!("No custom cache sources specified\r");
         Vec::new()
     };
 
-    let base_l2_access_source_vector = if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
-        println!("Custom Base L2 access providers specified: {:?}\r", custom_base_l2_providers);
-        custom_base_l2_providers.clone()
-    } else {
-        println!("No custom Base L2 access providers specified\r");
-        Vec::new()
-    };
+    let base_l2_access_source_vector =
+        if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
+            println!(
+                "Custom Base L2 access providers specified: {:?}\r",
+                custom_base_l2_providers
+            );
+            custom_base_l2_providers.clone()
+        } else {
+            println!("No custom Base L2 access providers specified\r");
+            Vec::new()
+        };
 
     if let Err(e) =
         assign_routing(&mut our, provider, ws_networking_port, tcp_networking_port).await
@@ -637,9 +668,17 @@ async fn handle_login(
             warp::reply::json(&e.to_string()),
             StatusCode::INTERNAL_SERVER_ERROR,
         )
-            .into_response());
+        .into_response());
     }
-    success_response(sender, our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector).await
+    success_response(
+        sender,
+        our,
+        decoded_keyfile,
+        encoded_keyfile,
+        cache_source_vector,
+        base_l2_access_source_vector,
+    )
+    .await
 }
 
 pub async fn assign_routing(
@@ -776,7 +815,13 @@ async fn success_response(
     };
 
     sender
-        .send((our.clone(), decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector))
+        .send((
+            our.clone(),
+            decoded_keyfile,
+            encoded_keyfile,
+            cache_source_vector,
+            base_l2_access_source_vector,
+        ))
         .await
         .unwrap();
 

From dfdd761ca658e0dca98e0562c3fb24fb011005c1 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Tue, 30 Sep 2025 15:31:32 -0400
Subject: [PATCH 11/27] disambiguate Set-Password/Login Advanced Options

---
 hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx | 2 +-
 hyperdrive/src/register-ui/src/pages/MintCustom.tsx      | 2 +-
 hyperdrive/src/register-ui/src/pages/ResetName.tsx       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index 52219ea88..bb0aa96df 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -199,7 +199,7 @@ function CommitDotOsName({
                                 </p>
                                 <EnterHnsName {...enterOsNameProps} />
                                 <details className="advanced-options">
-                                    <summary>Advanced Options</summary>
+                                    <summary>Network Options</summary>
                                     <div className="flex flex-col gap-3">
                                         <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
                                         <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index 2bc108f3e..d3ba0875c 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -169,7 +169,7 @@ function MintCustom({
                                 <input type="text" name="full-hns-name" placeholder="Enter full HNS name" />
                                 <input type="text" name="tba" placeholder="Enter TBA to mint under" />
                                 <details className="advanced-options">
-                                    <summary>Advanced Options</summary>
+                                    <summary>Network Options</summary>
                                     <div className="flex flex-col gap-3">
                                         <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
                                         <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index 66fffd051..ee2b148ed 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -169,7 +169,7 @@ function ResetHnsName({
                   Nodes use an onchain username in order to identify themselves to other nodes in the network.
                 </p>
                 <details className="advanced-options">
-                  <summary>Advanced Options</summary>
+                  <summary>Network Options</summary>
                   <div className="flex flex-col gap-3">
                     <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
                     <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />

From 437e4f1d34b55fb66c3c0f0f054adb0efc1067ce Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Thu, 2 Oct 2025 09:30:23 -0400
Subject: [PATCH 12/27] prepopulating cache srcs and base L2 access srcs

---
 hyperdrive/Cargo.toml                         |   1 +
 hyperdrive/src/main.rs                        | 142 +++++---
 hyperdrive/src/options_config_utils.rs        |  95 ++++++
 hyperdrive/src/register-ui/src/lib/types.ts   |   7 +
 .../src/register-ui/src/pages/Login.tsx       | 214 ++++++------
 .../src/register-ui/src/pages/ResetName.tsx   | 309 ++++++++++--------
 .../src/register-ui/src/pages/SetPassword.tsx |  28 +-
 hyperdrive/src/register.rs                    |  62 ++--
 lib/src/kernel.rs                             |   8 +
 9 files changed, 557 insertions(+), 309 deletions(-)
 create mode 100644 hyperdrive/src/options_config_utils.rs

diff --git a/hyperdrive/Cargo.toml b/hyperdrive/Cargo.toml
index 0a92005b4..74b8aa4b5 100644
--- a/hyperdrive/Cargo.toml
+++ b/hyperdrive/Cargo.toml
@@ -48,6 +48,7 @@ chrono = "0.4.31"
 clap = { version = "4.4", features = ["derive"] }
 crossterm = { version = "0.27.0", features = ["event-stream", "bracketed-paste"] }
 dashmap = "5.5.3"
+dirs = "5.0"
 futures = "0.3"
 generic-array = "0.14.7"
 hex = "0.4.3"
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index eb332525e..5baa7a3d2 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -13,10 +13,13 @@ use std::collections::HashMap;
 use std::env;
 use std::path::Path;
 use std::sync::Arc;
-use tokio::sync::mpsc;
+use tokio::sync::{mpsc, oneshot};
 
 mod eth;
 mod eth_config_utils;
+mod options_config_utils;
+use options_config_utils::*;
+
 #[cfg(feature = "simulation-mode")]
 mod fakenet;
 pub mod fd_manager;
@@ -91,6 +94,8 @@ async fn main() {
         std::fs::canonicalize(&p).expect(&format!("specified rpc-config path {p} not found"))
     });
 
+    crate::options_config_utils::initialize_home_directory(home_directory_path.to_path_buf());
+
     // Prevent using both --rpc and --rpc-config flags simultaneously
     if rpc.is_some() && rpc_config.is_some() {
         panic!("Cannot use both --rpc and --rpc-config flags simultaneously. Please use either --rpc for a single RPC URL or --rpc-config for multiple URLs and/or advanced configs (e.g., auth), but not both.");
@@ -285,11 +290,22 @@ async fn main() {
     println!("Serving Hyperdrive at {link}\r");
     #[cfg(not(feature = "simulation-mode"))]
     println!("Login or register at {link}\r");
+
+    println!("DEBUG: Looking for keyfile in home directory: {}\r", home_directory_path.display());
+    let keyfile_path = home_directory_path.join(".keyfile");
+    println!("DEBUG: Expected keyfile path: {}\r", keyfile_path.display());
+    if keyfile_path.exists() {
+        println!("DEBUG: Keyfile exists at expected location\r");
+    } else {
+        println!("DEBUG: Keyfile NOT found at expected location\r");
+    }
+
     #[cfg(not(feature = "simulation-mode"))]
     let (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector) =
         match password {
             None => {
-                serve_register_fe(
+                println!("DEBUG: Starting registration/login flow (no password provided)\r");
+                let result = serve_register_fe(
                     &home_directory_path,
                     our_ip.to_string(),
                     (ws_tcp_handle, ws_flag_used),
@@ -298,10 +314,13 @@ async fn main() {
                     eth_provider_config.clone(),
                     detached,
                 )
-                .await
+                .await;
+                println!("DEBUG: Registration/login flow completed\r");
+                result
             }
             Some(password) => {
-                login_with_password(
+                println!("DEBUG: Starting Command line login flow (password provided)\r");
+                let result = login_with_password(
                     &home_directory_path,
                     our_ip.to_string(),
                     (ws_tcp_handle, ws_flag_used),
@@ -309,12 +328,38 @@ async fn main() {
                     eth_provider_config.clone(),
                     password,
                 )
-                .await
+                .await;
+                println!("DEBUG: Command line login flow completed\r");
+                result
             }
         };
 
+    // Add debug output after login/registration
+    println!("DEBUG: After login/registration - checking keyfile again\r");
+    if keyfile_path.exists() {
+        println!("DEBUG: Keyfile NOW exists at expected location\r");
+        if let Ok(keyfile_content) = std::fs::read(&keyfile_path) {
+            println!("DEBUG: Keyfile size: {} bytes\r", keyfile_content.len());
+        }
+    } else {
+        println!("DEBUG: Keyfile STILL does not exist at expected location\r");
+
+        // Check if there are other files that might be the keyfile
+        if let Ok(entries) = std::fs::read_dir(&home_directory_path) {
+            println!("DEBUG: Files in home directory:\r");
+            for entry in entries.flatten() {
+                if let Ok(file_name) = entry.file_name().into_string() {
+                    println!("DEBUG: - {}\r", file_name);
+                }
+            }
+        }
+    }
+
     is_eth_provider_config_updated = false;
 
+    let cache_source_vector_for_config = cache_source_vector.clone();
+    let base_l2_access_source_vector_for_config = base_l2_access_source_vector.clone();
+
     if !base_l2_access_source_vector.is_empty() {
         // Process in reverse order so the first entry in the vector becomes highest priority
         for (_reverse_index, url) in base_l2_access_source_vector.into_iter().rev().enumerate() {
@@ -339,6 +384,18 @@ async fn main() {
         .expect("failed to save new eth provider config!");
     }
 
+    // Save the cache sources and Base L2 providers configuration
+    if !cache_source_vector_for_config.is_empty() || !base_l2_access_source_vector_for_config.is_empty() {
+        let options_config = OptionsConfig {
+            cache_sources: cache_source_vector_for_config,
+            base_l2_providers: base_l2_access_source_vector_for_config,
+        };
+
+        save_options_config(&options_config)
+            .await
+            .expect("failed to save options config!");
+    }
+
     // the boolean flag determines whether the runtime module is *public* or not,
     // where public means that any process can always message it.
     #[allow(unused_mut)]
@@ -966,47 +1023,52 @@ async fn serve_register_fe(
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
 ) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
-    let (kill_tx, kill_rx) = tokio::sync::oneshot::channel::<bool>();
+    // Load options config from file
+    let options_config = load_options_config().await;
 
-    let disk_keyfile: Option<Vec<u8>> = tokio::fs::read(home_directory_path.join(".keys"))
-        .await
-        .ok();
-
-    let (tx, mut rx) = mpsc::channel::<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>(1);
-    let (our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector) = tokio::select! {
-        _ = register::register(
-                tx,
-                kill_rx,
-                our_ip,
-                (ws_networking.0.as_ref(), ws_networking.1),
-                (tcp_networking.0.as_ref(), tcp_networking.1),
-                http_server_port,
-                disk_keyfile,
-                eth_provider_config,
-                detached) => {
-            panic!("registration failed")
-        }
-        Some((our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector)) = rx.recv() => {
-            (our, decoded_keyfile, encoded_keyfile, cache_source_vector, base_l2_access_source_vector)
-        }
-    };
+    let (tx, mut rx): (
+        mpsc::Sender<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>,
+        mpsc::Receiver<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>
+    ) = mpsc::channel(32);
+    let (kill_tx, kill_rx) = oneshot::channel::<bool>();
 
-    tokio::fs::write(home_directory_path.join(".keys"), &encoded_keyfile)
-        .await
-        .unwrap();
+    let keyfile_path = home_directory_path.join(".keys");
+    let keyfile: Option<Vec<u8>> = tokio::fs::read(&keyfile_path).await.ok();
+
+    tokio::spawn(async move {
+        register::register(
+            tx,
+            kill_rx,
+            our_ip,
+            (ws_networking.0.as_ref(), ws_networking.1),
+            (tcp_networking.0.as_ref(), tcp_networking.1),
+            http_server_port,
+            keyfile,
+            eth_provider_config,
+            detached,
+            Some(options_config.cache_sources),        // Pass from config
+            Some(options_config.base_l2_providers),    // Pass from config
+        )
+            .await;
+    });
 
+    let (our, decoded_keyfile, encoded_keyfile, cache_sources, base_l2_providers) = rx.recv().await.unwrap();
     let _ = kill_tx.send(true);
 
-    drop(ws_networking.0);
-    drop(tcp_networking.0);
+    // Save the keyfile to disk
+    tokio::fs::write(home_directory_path.join(".keys"), &encoded_keyfile)
+        .await
+        .expect("failed to write keyfile");
+
+    // Save the options config with the received cache sources and base L2 providers
+    if let Err(e) = update_options_config(
+        cache_sources.clone(),
+        base_l2_providers.clone(),
+    ).await {
+        eprintln!("Failed to save options config: {}", e);
+    }
 
-    (
-        our,
-        encoded_keyfile,
-        decoded_keyfile,
-        cache_source_vector,
-        base_l2_access_source_vector,
-    )
+    (our, encoded_keyfile, decoded_keyfile, cache_sources, base_l2_providers)
 }
 
 #[cfg(not(feature = "simulation-mode"))]
diff --git a/hyperdrive/src/options_config_utils.rs b/hyperdrive/src/options_config_utils.rs
new file mode 100644
index 000000000..b3acc770f
--- /dev/null
+++ b/hyperdrive/src/options_config_utils.rs
@@ -0,0 +1,95 @@
+use serde::{Deserialize, Serialize};
+use std::path::PathBuf;
+use std::sync::LazyLock;
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct OptionsConfig {
+    pub cache_sources: Vec<String>,
+    pub base_l2_providers: Vec<String>,
+}
+
+impl Default for OptionsConfig {
+    fn default() -> Self {
+        Self {
+            cache_sources: Vec::new(),
+            base_l2_providers: Vec::new(),
+        }
+    }
+}
+
+const OPTIONS_CONFIG_FILE: &str = ".options_config.json";
+
+/// Global home directory path, initialized once on first access
+static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
+    // First try environment variable
+    if let Ok(home_path) = std::env::var("HYPERDRIVE_HOME") {
+        return PathBuf::from(home_path);
+    }
+
+    // Fall back to default location in user's home directory
+    dirs::home_dir()
+        .unwrap_or_else(|| PathBuf::from("."))
+        .join(".hyperdrive")
+});
+
+/// Initialize the home directory path explicitly (must be called before first use of config functions)
+pub fn initialize_home_directory(home_directory_path: PathBuf) {
+    std::env::set_var("HYPERDRIVE_HOME", home_directory_path.to_string_lossy().to_string());
+}
+
+/// Get the configured home directory path
+pub fn get_home_directory() -> &'static PathBuf {
+    &HOME_DIR
+}
+
+/// Load the options configuration from the configured home directory.
+/// Returns default config if file doesn't exist or can't be parsed.
+pub async fn load_options_config() -> OptionsConfig {
+    let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
+
+    match tokio::fs::read_to_string(&config_path).await {
+        Ok(contents) => {
+            match serde_json::from_str::<OptionsConfig>(&contents) {
+                Ok(config) => config,
+                Err(e) => {
+                    eprintln!("Warning: Failed to parse options config: {}", e);
+                    OptionsConfig::default()
+                }
+            }
+        }
+        Err(_) => {
+            // File doesn't exist, return defaults
+            OptionsConfig::default()
+        }
+    }
+}
+
+/// Save the options configuration to the configured home directory.
+pub async fn save_options_config(config: &OptionsConfig) -> Result<(), std::io::Error> {
+    let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
+
+    // Ensure the directory exists
+    if let Some(parent) = config_path.parent() {
+        tokio::fs::create_dir_all(parent).await?;
+    }
+
+    let contents = serde_json::to_string_pretty(config)?;
+    tokio::fs::write(config_path, contents).await
+}
+
+/// Update the options configuration with new values.
+/// This is the function that should be called from anywhere in the codebase
+/// when the runtime state changes and needs to be persisted.
+pub async fn update_options_config(
+    current_cache_sources: Vec<String>,
+    current_base_l2_providers: Vec<String>,
+) -> Result<(), std::io::Error> {
+    let config = OptionsConfig {
+        cache_sources: current_cache_sources,
+        base_l2_providers: current_base_l2_providers,
+    };
+
+    save_options_config(&config).await?;
+    println!("Options configuration saved to {}", OPTIONS_CONFIG_FILE);
+    Ok(())
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/lib/types.ts b/hyperdrive/src/register-ui/src/lib/types.ts
index a47f5f304..6bf2caba5 100644
--- a/hyperdrive/src/register-ui/src/lib/types.ts
+++ b/hyperdrive/src/register-ui/src/lib/types.ts
@@ -43,3 +43,10 @@ export type UnencryptedIdentity = {
   name: string,
   allowed_routers: string[]
 }
+
+export type InfoResponse = {
+  name: string;
+  allowed_routers: string[];
+  initial_cache_sources: string[];
+  initial_base_l2_providers: string[];
+}
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index fba5a9505..d878d109c 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -1,5 +1,5 @@
 import { FormEvent, useCallback, useEffect, useState } from "react";
-import { PageProps, UnencryptedIdentity } from "../lib/types";
+import { PageProps, InfoResponse } from "../lib/types";
 import Loader from "../components/Loader";
 import { useNavigate } from "react-router-dom";
 import { redirectToHomepage } from "../utils/redirect-to-homepage";
@@ -10,13 +10,13 @@ import SpecifyBaseL2AccessProvidersCheckbox from "../components/SpecifyBaseL2Acc
 interface LoginProps extends PageProps { }
 
 function Login({
-  pw,
-  setPw,
-  routers,
-  setRouters,
-  hnsName,
-  setHnsName,
-}: LoginProps) {
+                 pw,
+                 setPw,
+                 routers,
+                 setRouters,
+                 hnsName,
+                 setHnsName,
+               }: LoginProps) {
   const navigate = useNavigate();
 
   useEffect(() => {
@@ -38,95 +38,109 @@ function Login({
     (async () => {
       try {
         const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
-          res.json()
-        )) as UnencryptedIdentity;
+            res.json()
+        )) as InfoResponse;
         setRouters(infoData.allowed_routers);
         setHnsName(infoData.name);
-      } catch { }
+
+        // Prepopulate the fields with default values from the server
+        if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
+          setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
+          setSpecifyCacheSources(true); // Auto-check the checkbox
+        }
+
+        if (infoData.initial_base_l2_providers && infoData.initial_base_l2_providers.length > 0) {
+          setCustomBaseL2AccessProviders(infoData.initial_base_l2_providers.join('\n'));
+          setSpecifyBaseL2AccessProviders(true); // Auto-check the checkbox
+        }
+      } catch (error) {
+        console.error('Failed to fetch node info:', error);
+        // Continue without defaults if fetch fails
+      }
     })();
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
   const handleLogin = useCallback(
-    async (e?: FormEvent) => {
-      e?.preventDefault();
-      e?.stopPropagation();
+      async (e?: FormEvent) => {
+        e?.preventDefault();
+        e?.stopPropagation();
 
-      setLoading("Logging in...");
-      try {
-        // Process custom cache sources if specified
-        let cacheSourcesToUse: string[] | undefined = undefined;
-        if (specifyCacheSources && customCacheSources.trim()) {
-          cacheSourcesToUse = customCacheSources
-              .split('\n')
-              .map(source => source.trim())
-              .filter(source => source.length > 0);
-
-          console.log("Custom cache sources:", cacheSourcesToUse);
-        }
+        setLoading("Logging in...");
+        try {
+          // Process custom cache sources if specified
+          let cacheSourcesToUse: string[] | undefined = undefined;
+          if (specifyCacheSources && customCacheSources.trim()) {
+            cacheSourcesToUse = customCacheSources
+                .split('\n')
+                .map(source => source.trim())
+                .filter(source => source.length > 0);
 
-        // Process custom Base L2 access providers if specified
-        let baseL2AccessProvidersToUse: string[] | undefined = undefined;
-        if (specifyBaseL2AccessProviders && customBaseL2AccessProviders.trim()) {
-          baseL2AccessProvidersToUse = customBaseL2AccessProviders
-              .split('\n')
-              .map(provider => provider.trim())
-              .filter(provider => provider.length > 0);
+            console.log("Custom cache sources:", cacheSourcesToUse);
+          }
 
-          console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
-        }
+          // Process custom Base L2 access providers if specified
+          let baseL2AccessProvidersToUse: string[] | undefined = undefined;
+          if (specifyBaseL2AccessProviders && customBaseL2AccessProviders.trim()) {
+            baseL2AccessProvidersToUse = customBaseL2AccessProviders
+                .split('\n')
+                .map(provider => provider.trim())
+                .filter(provider => provider.length > 0);
 
-        let result;
+            console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
+          }
+
+          let result;
+
+          try {
+            // Try argon2 hash first
+
+            // salt is either node name (if node name is longer than 8 characters)
+            //  or node name repeated enough times to be longer than 8 characters
+            const minSaltL = 8;
+            const nodeL = hnsName.length;
+            const salt = nodeL >= minSaltL ? hnsName : hnsName.repeat(1 + Math.floor(minSaltL / nodeL));
+            console.log(salt);
 
-        try {
-          // Try argon2 hash first
-
-          // salt is either node name (if node name is longer than 8 characters)
-          //  or node name repeated enough times to be longer than 8 characters
-          const minSaltL = 8;
-          const nodeL = hnsName.length;
-          const salt = nodeL >= minSaltL ? hnsName : hnsName.repeat(1 + Math.floor(minSaltL / nodeL));
-          console.log(salt);
-
-          //@ts-ignore
-          const h = await argon2.hash({
-            pass: pw,
-            salt: salt,
-            hashLen: 32,
-            time: 2,
-            mem: 19456,
             //@ts-ignore
-            type: argon2.ArgonType.Argon2id
-          });
+            const h = await argon2.hash({
+              pass: pw,
+              salt: salt,
+              hashLen: 32,
+              time: 2,
+              mem: 19456,
+              //@ts-ignore
+              type: argon2.ArgonType.Argon2id
+            });
 
-          const hashed_password_hex = `0x${h.hashHex}`;
+            const hashed_password_hex = `0x${h.hashHex}`;
 
-          result = await fetch("/login", {
-            method: "POST",
-            credentials: 'include',
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify({ password_hash: hashed_password_hex,
-              custom_cache_sources: cacheSourcesToUse && cacheSourcesToUse.length > 0 ? cacheSourcesToUse : null,
-              custom_base_l2_access_providers: baseL2AccessProvidersToUse && baseL2AccessProvidersToUse.length > 0 ? baseL2AccessProvidersToUse : null,
-            }),
+            result = await fetch("/login", {
+              method: "POST",
+              credentials: 'include',
+              headers: { "Content-Type": "application/json" },
+              body: JSON.stringify({ password_hash: hashed_password_hex,
+                custom_cache_sources: cacheSourcesToUse && cacheSourcesToUse.length > 0 ? cacheSourcesToUse : null,
+                custom_base_l2_access_providers: baseL2AccessProvidersToUse && baseL2AccessProvidersToUse.length > 0 ? baseL2AccessProvidersToUse : null,
+              }),
 
-          });
+            });
 
-          if (result.status < 399) {
-            redirectToHomepage();
-            return;
+            if (result.status < 399) {
+              redirectToHomepage();
+              return;
+            }
+          } catch (argonErr) {
+            console.log("This node was instantiated before the switch to argon2");
           }
-        } catch (argonErr) {
-          console.log("This node was instantiated before the switch to argon2");
-        }
 
-        throw new Error(result ? await result.text() : "Login failed");
+          throw new Error(result ? await result.text() : "Login failed");
 
-      } catch (err) {
-        setKeyErrs([String(err)]);
-        setLoading("");
-      }
-    },
-    [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, customBaseL2AccessProviders]
+        } catch (err) {
+          setKeyErrs([String(err)]);
+          setLoading("");
+        }
+      },
+      [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, customBaseL2AccessProviders]
   );
 
   const isDirect = Boolean(routers?.length === 0);
@@ -136,11 +150,11 @@ function Login({
       <Loader msg={loading} className="text-black dark:text-white" />
     </div>}
     <form
-      id="registerui--login-form"
-      className={classNames("flex flex-col gap-2 items-stretch", {
-        'invisible': loading
-      })}
-      onSubmit={handleLogin}
+        id="registerui--login-form"
+        className={classNames("flex flex-col gap-2 items-stretch", {
+          'invisible': loading
+        })}
+        onSubmit={handleLogin}
     >
 
       <div className="form-group">
@@ -149,15 +163,15 @@ function Login({
           <div className="text-xs opacity-50">Login - {isDirect ? "direct" : "indirect"} node</div>
         </div>
         <input
-          type="password"
-          id="password"
-          required
-          minLength={6}
-          name="password"
-          placeholder="Password"
-          value={pw}
-          onChange={(e) => setPw(e.target.value)}
-          autoFocus
+            type="password"
+            id="password"
+            required
+            minLength={6}
+            name="password"
+            placeholder="Password"
+            value={pw}
+            onChange={(e) => setPw(e.target.value)}
+            autoFocus
         />
       </div>
 
@@ -236,11 +250,11 @@ function Login({
       </details>
 
       {keyErrs.length > 0 && (
-        <div className="flex flex-col gap-2">
-          {keyErrs.map((x, i) => (
-            <div key={i} className="text-red-500 wrap-anywhere mt-2">{x}</div>
-          ))}
-        </div>
+          <div className="flex flex-col gap-2">
+            {keyErrs.map((x, i) => (
+                <div key={i} className="text-red-500 wrap-anywhere mt-2">{x}</div>
+            ))}
+          </div>
       )}
 
       <button
@@ -252,8 +266,8 @@ function Login({
       >Log in</button>
 
       <button
-        className="clear "
-        onClick={() => navigate('/reset')}
+          className="clear "
+          onClick={() => navigate('/reset')}
       >
         Reset Password & Networking Info
       </button>
@@ -261,4 +275,4 @@ function Login({
   </div>;
 }
 
-export default Login;
+export default Login;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index ee2b148ed..5d2fc0696 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -6,7 +6,7 @@ import {
 } from "react";
 import { useNavigate } from "react-router-dom";
 import Loader from "../components/Loader";
-import { PageProps } from "../lib/types";
+import { PageProps, UnencryptedIdentity } from "../lib/types";
 import { MULTICALL, generateNetworkingKeys, mechAbi } from "../abis";
 import DirectNodeCheckbox from "../components/DirectCheckbox";
 import SpecifyRoutersCheckbox from "../components/SpecifyRoutersCheckbox";
@@ -19,17 +19,17 @@ import BackButton from "../components/BackButton";
 interface ResetProps extends PageProps { }
 
 function ResetHnsName({
-  direct,
-  setDirect,
-  setReset,
-  hnsName,
-  setHnsName,
-  setNetworkingKey,
-  setIpAddress,
-  setWsPort,
-  setTcpPort,
-  setRouters,
-}: ResetProps) {
+                        direct,
+                        setDirect,
+                        setReset,
+                        hnsName,
+                        setHnsName,
+                        setNetworkingKey,
+                        setIpAddress,
+                        setWsPort,
+                        setTcpPort,
+                        setRouters,
+                      }: ResetProps) {
   const { address } = useAccount();
   const navigate = useNavigate();
   const { openConnectModal } = useConnectModal();
@@ -42,9 +42,9 @@ function ResetHnsName({
     }
   });
   const { isLoading: isConfirming, isSuccess: isConfirmed } =
-    useWaitForTransactionReceipt({
-      hash,
-    });
+      useWaitForTransactionReceipt({
+        hash,
+      });
   const addRecentTransaction = useAddRecentTransaction();
 
   const [name, setName] = useState<string>(hnsName);
@@ -75,6 +75,25 @@ function ResetHnsName({
 
   useEffect(() => {
     document.title = "Reset";
+
+    // Fetch current node info and prepopulate routers if indirect node
+    (async () => {
+      try {
+        const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
+            res.json()
+        )) as UnencryptedIdentity;
+
+        // Prepopulate customRouters if this is an indirect node with existing routers
+        if (infoData.allowed_routers && infoData.allowed_routers.length > 0) {
+          const routersText = infoData.allowed_routers.join('\n');
+          setCustomRouters(routersText);
+          setSpecifyRouters(true); // Auto-enable the checkbox
+          setDirect(false); // Ensure direct is false for indirect nodes
+        }
+      } catch (error) {
+        console.log("Could not fetch node info:", error);
+      }
+    })();
   }, []);
 
   // so inputs will validate once wallet is connected
@@ -87,60 +106,60 @@ function ResetHnsName({
   }, [address, openConnectModal]);
 
   const handleResetRecords = useCallback(
-    async (e: FormEvent) => {
-      e.preventDefault();
-      e.stopPropagation();
+      async (e: FormEvent) => {
+        e.preventDefault();
+        e.stopPropagation();
 
-      if (!address) {
-        openConnectModal?.();
-        return;
-      }
+        if (!address) {
+          openConnectModal?.();
+          return;
+        }
 
-      setHnsName(name);
-      // Process custom routers if specified
-      let routersToUse: string[] = [];
-      if (specifyRouters && customRouters.trim()) {
-        routersToUse = customRouters
-            .split('\n')
-            .map(router => router.trim())
-            .filter(router => router.length > 0);
-
-        // Update the routers in your app state
-        setRouters(routersToUse);
-        console.log("Custom routers:", routersToUse);
-      }
+        setHnsName(name);
+        // Process custom routers if specified
+        let routersToUse: string[] = [];
+        if (specifyRouters && customRouters.trim()) {
+          routersToUse = customRouters
+              .split('\n')
+              .map(router => router.trim())
+              .filter(router => router.length > 0);
 
-      try {
-        const data = await generateNetworkingKeys({
-          direct,
-          label: name,
-          our_address: address,
-          setNetworkingKey,
-          setIpAddress,
-          setWsPort,
-          setTcpPort,
-          setRouters: routersToUse.length > 0 ? () => setRouters(routersToUse) : setRouters,
-          reset: true,
-          customRouters: routersToUse.length > 0 ? routersToUse : undefined,
-        });
-
-        writeContract({
-          address: tba as `0x${string}`,
-          abi: mechAbi,
-          functionName: "execute",
-          args: [
-            MULTICALL,
-            BigInt(0),
-            data,
-            1
-          ],
-          gas: 1000000n,
-        });
-      } catch (error) {
-        console.error("An error occurred:", error);
-      }
-    },
-    [address, direct, specifyRouters, customRouters, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal]
+          // Update the routers in your app state
+          setRouters(routersToUse);
+          console.log("Custom routers:", routersToUse);
+        }
+
+        try {
+          const data = await generateNetworkingKeys({
+            direct,
+            label: name,
+            our_address: address,
+            setNetworkingKey,
+            setIpAddress,
+            setWsPort,
+            setTcpPort,
+            setRouters: routersToUse.length > 0 ? () => setRouters(routersToUse) : setRouters,
+            reset: true,
+            customRouters: routersToUse.length > 0 ? routersToUse : undefined,
+          });
+
+          writeContract({
+            address: tba as `0x${string}`,
+            abi: mechAbi,
+            functionName: "execute",
+            args: [
+              MULTICALL,
+              BigInt(0),
+              data,
+              1
+            ],
+            gas: 1000000n,
+          });
+        } catch (error) {
+          console.error("An error occurred:", error);
+        }
+      },
+      [address, direct, specifyRouters, customRouters, name, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal]
   );
 
   useEffect(() => {
@@ -153,85 +172,85 @@ function ResetHnsName({
 
 
   return (
-    <div className="container fade-in" id="register-ui--reset-name">
-      <div className="section">
-        {
-          <form className="form" onSubmit={handleResetRecords}>
-            {isPending || isConfirming ? (
-              <Loader msg={isConfirming ? "Resetting Networking Information..." : "Please confirm the transaction in your wallet"} />
-            ) : (
-              <>
-                <h3 className="text-iris dark:text-neon">
-                  Node ID to reset:
-                </h3>
-                <EnterHnsName {...{ address, name, setName, triggerNameCheck, nameValidities, setNameValidities, setTba, isReset: true }} />
-                <p className="text-sm text-gray-500">
-                  Nodes use an onchain username in order to identify themselves to other nodes in the network.
-                </p>
-                <details className="advanced-options">
-                  <summary>Network Options</summary>
-                  <div className="flex flex-col gap-3">
-                    <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
-                    <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
-                    {specifyRouters && (
-                        <div className="flex flex-col gap-2 ml-6">
-                          <label htmlFor="custom-routers" className="text-sm font-medium">
-                            Router Names: <span className="text-red-500">*</span>
-                          </label>
-                          <textarea
-                              id="custom-routers-reset"
-                              value={customRouters}
-                              onChange={(e) => setCustomRouters(e.target.value)}
-                              placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
-                              className={`input resize-vertical min-h-[80px] ${
-                                  specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                      ? 'border-red-500 focus:border-red-500'
-                                      : ''
-                              }`}
-                              rows={4}
-                          />
-                          <span className={`text-xs ${
-                              customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                  ? 'text-red-500'
-                                  : 'text-gray-500'
-                          }`}>
-                                                    {customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                                        ? 'At least one router name is required'
-                                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
-                                                    }
-                                                </span>
-                        </div>
-                    )}
-                  </div>
-                </details>
-                <p className="text-sm text-gray-500">
-                  A reset will not delete any data. It only updates the networking info your node publishes onchain.
-                </p>
-                <button
-                    type="submit"
-                    className="button mt-2 self-stretch"
-                    disabled={
-                        isPending ||
-                        isConfirming ||
-                        nameValidities.length !== 0 ||
-                        (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
-                    }
-                >
-                  Reset Node
-                </button>
-
-                <BackButton mode="wide" />
-              </>
-            )}
-            {isError && (
-              <p className="text-red-500 wrap-anywhere mt-2">
-                Error: {error?.message || "An error occurred, please try again."}
-              </p>
-            )}
-          </form>
-        }
+      <div className="container fade-in" id="register-ui--reset-name">
+        <div className="section">
+          {
+            <form className="form" onSubmit={handleResetRecords}>
+              {isPending || isConfirming ? (
+                  <Loader msg={isConfirming ? "Resetting Networking Information..." : "Please confirm the transaction in your wallet"} />
+              ) : (
+                  <>
+                    <h3 className="text-iris dark:text-neon">
+                      Node ID to reset:
+                    </h3>
+                    <EnterHnsName {...{ address, name, setName, triggerNameCheck, nameValidities, setNameValidities, setTba, isReset: true }} />
+                    <p className="text-sm text-gray-500">
+                      Nodes use an onchain username in order to identify themselves to other nodes in the network.
+                    </p>
+                    <details className="advanced-options">
+                      <summary>Network Options</summary>
+                      <div className="flex flex-col gap-3">
+                        <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                        <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
+                        {specifyRouters && (
+                            <div className="flex flex-col gap-2 ml-6">
+                              <label htmlFor="custom-routers" className="text-sm font-medium">
+                                Router Names: <span className="text-red-500">*</span>
+                              </label>
+                              <textarea
+                                  id="custom-routers-reset"
+                                  value={customRouters}
+                                  onChange={(e) => setCustomRouters(e.target.value)}
+                                  placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
+                                  className={`input resize-vertical min-h-[80px] ${
+                                      specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                          ? 'border-red-500 focus:border-red-500'
+                                          : ''
+                                  }`}
+                                  rows={4}
+                              />
+                              <span className={`text-xs ${
+                                  customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                      ? 'text-red-500'
+                                      : 'text-gray-500'
+                              }`}>
+                            {customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                ? 'At least one router name is required'
+                                : 'Enter one router name per line. These routers will be used for your indirect node.'
+                            }
+                          </span>
+                            </div>
+                        )}
+                      </div>
+                    </details>
+                    <p className="text-sm text-gray-500">
+                      A reset will not delete any data. It only updates the networking info your node publishes onchain.
+                    </p>
+                    <button
+                        type="submit"
+                        className="button mt-2 self-stretch"
+                        disabled={
+                            isPending ||
+                            isConfirming ||
+                            nameValidities.length !== 0 ||
+                            (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
+                        }
+                    >
+                      Reset Node
+                    </button>
+
+                    <BackButton mode="wide" />
+                  </>
+              )}
+              {isError && (
+                  <p className="text-red-500 wrap-anywhere mt-2">
+                    Error: {error?.message || "An error occurred, please try again."}
+                  </p>
+              )}
+            </form>
+          }
+        </div>
       </div>
-    </div>
   );
 }
-export default ResetHnsName;
+export default ResetHnsName;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index c747da244..e3f499e0c 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -1,12 +1,12 @@
 import React, { useState, useEffect, FormEvent, useCallback } from "react";
 import Loader from "../components/Loader";
 import { downloadKeyfile } from "../utils/download-keyfile";
-import { Tooltip } from "../components/Tooltip";
 import { useSignTypedData, useAccount, useChainId } from 'wagmi'
 import { HYPERMAP } from "../abis";
 import { redirectToHomepage } from "../utils/redirect-to-homepage";
 import SpecifyCacheSourcesCheckbox from "../components/SpecifyCacheSourcesCheckbox";
 import SpecifyBaseL2AccessProvidersCheckbox from "../components/SpecifyBaseL2AccessProvidersCheckbox";
+import { InfoResponse } from "../lib/types";
 
 type SetPasswordProps = {
   direct: boolean;
@@ -45,6 +45,32 @@ function SetPassword({
     document.title = "Set Password";
   }, []);
 
+  // Fetch default values from /info endpoint
+  useEffect(() => {
+    (async () => {
+      try {
+        const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
+            res.json()
+        )) as InfoResponse;
+
+        // Prepopulate the fields with default values
+        if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
+          setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
+          setSpecifyCacheSources(true); // Auto-check the checkbox
+        }
+
+        if (infoData.initial_base_l2_providers && infoData.initial_base_l2_providers.length > 0) {
+          setCustomBaseL2AccessProviders(infoData.initial_base_l2_providers.join('\n'));
+          setSpecifyBaseL2AccessProviders(true); // Auto-check the checkbox
+        }
+      } catch (error) {
+        console.error('Failed to fetch default configuration:', error);
+        // Continue without defaults if fetch fails
+      }
+    })();
+  }, []);
+
+
   useEffect(() => {
     setError("");
   }, [pw, pw2]);
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index f89347aa1..8eed2b665 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -10,7 +10,7 @@ use alloy_primitives::{Address as EthAddress, Bytes, FixedBytes, U256};
 use alloy_sol_types::{eip712_domain, SolCall, SolStruct};
 use base64::{engine::general_purpose::STANDARD as base64_standard, Engine};
 use lib::types::core::{
-    BootInfo, Identity, ImportKeyfileInfo, Keyfile, LoginInfo, NodeRouting, UnencryptedIdentity,
+    BootInfo, Identity, ImportKeyfileInfo, Keyfile, LoginInfo, NodeRouting, InfoResponse,
 };
 use ring::{rand::SystemRandom, signature, signature::KeyPair};
 use std::{
@@ -42,6 +42,8 @@ pub async fn register(
     keyfile: Option<Vec<u8>>,
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
+    initial_cache_sources: Option<Vec<String>>,        // <- Add this
+    initial_base_l2_providers: Option<Vec<String>>,
 ) {
     // Networking info is generated and passed to the UI, but not used until confirmed
     let (public_key, serialized_networking_keypair) = keygen::generate_networking_key();
@@ -117,7 +119,7 @@ pub async fn register(
         .or(warp::path("set-password"))
         .or(warp::path("custom-register"))
         .and(warp::get())
-        .map(move |_| warp::reply::html(include_str!("register-ui/build/index.html")));
+        .map(move |_| warp::reply::html(include_str!("register-ui/build/index.html").to_string()));
     #[cfg(target_os = "windows")]
     let react_app = warp::path::end()
         .or(warp::path("login"))
@@ -129,21 +131,26 @@ pub async fn register(
         .or(warp::path("set-password"))
         .or(warp::path("custom-register"))
         .and(warp::get())
-        .map(move |_| warp::reply::html(include_str!("register-ui\\build\\index.html")));
+        .map(move |_| warp::reply::html(include_str!("register-ui\\build\\index.html").to_string()));
 
     let boot_provider = provider.clone();
     let login_provider = provider.clone();
     let import_provider = provider.clone();
 
+    let initial_cache_sources_arc = Arc::new(initial_cache_sources.clone());
+    let initial_base_l2_providers_arc = Arc::new(initial_base_l2_providers.clone());
+
     let api = warp::path("info")
         .and(
             warp::get()
                 .and(keyfile.clone())
+                .and(warp::any().map(move || initial_cache_sources_arc.clone()))
+                .and(warp::any().map(move || initial_base_l2_providers_arc.clone()))
                 .and_then(get_unencrypted_info),
         )
         .or(warp::path("current-chain")
             .and(warp::get())
-            .map(move || warp::reply::json(&"0xa")))
+            .map(move || warp::reply::json(&"0xa".to_string())))
         .or(warp::path("our").and(warp::get()).and(keyfile.clone()).map(
             move |keyfile: Option<Vec<u8>>| {
                 if let Some(keyfile) = keyfile {
@@ -299,36 +306,45 @@ pub async fn connect_to_provider_from_config(
     );
 }
 
-async fn get_unencrypted_info(keyfile: Option<Vec<u8>>) -> Result<impl Reply, Rejection> {
+async fn get_unencrypted_info(
+    keyfile: Option<Vec<u8>>,
+    initial_cache_sources: Arc<Option<Vec<String>>>,
+    initial_base_l2_providers: Arc<Option<Vec<String>>>,
+) -> Result<impl Reply, Rejection> {
     let (name, allowed_routers) = {
         match keyfile {
             Some(encoded_keyfile) => match keygen::get_username_and_routers(&encoded_keyfile) {
                 Ok(k) => k,
                 Err(_) => {
                     return Ok(warp::reply::with_status(
-                        warp::reply::json(&"keyfile deserialization went wrong"),
+                        warp::reply::json(&"keyfile deserialization went wrong".to_string()),
                         StatusCode::UNAUTHORIZED,
                     )
-                    .into_response())
+                        .into_response())
                 }
             },
             None => {
                 return Ok(warp::reply::with_status(
-                    warp::reply::json(&"Keyfile not present"),
+                    warp::reply::json(&"Keyfile not present".to_string()),
                     StatusCode::NOT_FOUND,
                 )
-                .into_response())
+                    .into_response())
             }
         }
     };
+
+    let response = InfoResponse {
+        name,
+        allowed_routers,
+        initial_cache_sources: initial_cache_sources.as_ref().clone().unwrap_or_default(),
+        initial_base_l2_providers: initial_base_l2_providers.as_ref().clone().unwrap_or_default(),
+    };
+
     return Ok(warp::reply::with_status(
-        warp::reply::json(&UnencryptedIdentity {
-            name,
-            allowed_routers,
-        }),
+        warp::reply::json(&response),
         StatusCode::OK,
     )
-    .into_response());
+        .into_response());
 }
 
 async fn generate_networking_info(our_temp_id: Arc<Identity>) -> Result<impl Reply, Rejection> {
@@ -401,14 +417,14 @@ async fn handle_boot(
 
     if info.timestamp < now + 120 {
         return Ok(warp::reply::with_status(
-            warp::reply::json(&"Timestamp is outdated."),
+            warp::reply::json(&"Timestamp is outdated.".to_string()),
             StatusCode::UNAUTHORIZED,
         )
         .into_response());
     }
     let Ok(password_hash) = FixedBytes::<32>::from_str(&info.password_hash) else {
         return Ok(warp::reply::with_status(
-            warp::reply::json(&"Invalid password hash"),
+            warp::reply::json(&"Invalid password hash".to_string()),
             StatusCode::UNAUTHORIZED,
         )
         .into_response());
@@ -430,7 +446,7 @@ async fn handle_boot(
             Ok(get) => {
                 let Ok(node_info) = getCall::abi_decode_returns(&get, false) else {
                     return Ok(warp::reply::with_status(
-                        warp::reply::json(&"Failed to decode hypermap entry from return bytes"),
+                        warp::reply::json(&"Failed to decode hypermap entry from return bytes".to_string()),
                         StatusCode::INTERNAL_SERVER_ERROR,
                     )
                     .into_response());
@@ -508,7 +524,7 @@ async fn handle_boot(
     }
 
     return Ok(warp::reply::with_status(
-        warp::reply::json(&"Recovered address does not match owner"),
+        warp::reply::json(&"Recovered address does not match owner".to_string()),
         StatusCode::UNAUTHORIZED,
     )
     .into_response());
@@ -528,7 +544,7 @@ async fn handle_import_keyfile(
         Ok(k) => k,
         Err(_) => {
             return Ok(warp::reply::with_status(
-                warp::reply::json(&"Keyfile not valid base64"),
+                warp::reply::json(&"Keyfile not valid base64".to_string()),
                 StatusCode::BAD_REQUEST,
             )
             .into_response())
@@ -600,7 +616,7 @@ async fn handle_login(
 ) -> Result<impl Reply, Rejection> {
     if encoded_keyfile.is_none() {
         return Ok(warp::reply::with_status(
-            warp::reply::json(&"Keyfile not present"),
+            warp::reply::json(&"Keyfile not present".to_string()),
             StatusCode::NOT_FOUND,
         )
         .into_response());
@@ -630,7 +646,7 @@ async fn handle_login(
             }
             Err(_) => {
                 return Ok(warp::reply::with_status(
-                    warp::reply::json(&"Incorrect password!"),
+                    warp::reply::json(&"Incorrect password!".to_string()),
                     StatusCode::UNAUTHORIZED,
                 )
                 .into_response())
@@ -807,7 +823,7 @@ async fn success_response(
         Some(token) => token,
         None => {
             return Ok(warp::reply::with_status(
-                warp::reply::json(&"Failed to generate JWT"),
+                warp::reply::json(&"Failed to generate JWT".to_string()),
                 StatusCode::SERVICE_UNAVAILABLE,
             )
             .into_response())
@@ -844,7 +860,7 @@ async fn success_response(
         }
         Err(_) => {
             return Ok(warp::reply::with_status(
-                warp::reply::json(&"Failed to generate Auth JWT"),
+                warp::reply::json(&"Failed to generate Auth JWT".to_string()),
                 StatusCode::INTERNAL_SERVER_ERROR,
             )
             .into_response())
diff --git a/lib/src/kernel.rs b/lib/src/kernel.rs
index 4dcf917c8..f438779f3 100644
--- a/lib/src/kernel.rs
+++ b/lib/src/kernel.rs
@@ -178,6 +178,14 @@ pub struct UnencryptedIdentity {
     pub allowed_routers: Vec<NodeId>,
 }
 
+#[derive(serde::Serialize)]
+pub struct InfoResponse {
+    pub name: String,
+    pub allowed_routers: Vec<String>,
+    pub initial_cache_sources: Vec<String>,
+    pub initial_base_l2_providers: Vec<String>,
+}
+
 //
 // kernel types that runtime modules use
 //

From 7fde5025fc3bb0ee6db73ab4779a3910b29ddc38 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Oct 2025 13:31:48 +0000
Subject: [PATCH 13/27] Format Rust code using rustfmt

---
 hyperdrive/src/main.rs                 | 33 ++++++++++++++++----------
 hyperdrive/src/options_config_utils.rs | 21 ++++++++--------
 hyperdrive/src/register.rs             | 29 ++++++++++++----------
 3 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 5baa7a3d2..4ca085972 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -291,7 +291,10 @@ async fn main() {
     #[cfg(not(feature = "simulation-mode"))]
     println!("Login or register at {link}\r");
 
-    println!("DEBUG: Looking for keyfile in home directory: {}\r", home_directory_path.display());
+    println!(
+        "DEBUG: Looking for keyfile in home directory: {}\r",
+        home_directory_path.display()
+    );
     let keyfile_path = home_directory_path.join(".keyfile");
     println!("DEBUG: Expected keyfile path: {}\r", keyfile_path.display());
     if keyfile_path.exists() {
@@ -385,7 +388,9 @@ async fn main() {
     }
 
     // Save the cache sources and Base L2 providers configuration
-    if !cache_source_vector_for_config.is_empty() || !base_l2_access_source_vector_for_config.is_empty() {
+    if !cache_source_vector_for_config.is_empty()
+        || !base_l2_access_source_vector_for_config.is_empty()
+    {
         let options_config = OptionsConfig {
             cache_sources: cache_source_vector_for_config,
             base_l2_providers: base_l2_access_source_vector_for_config,
@@ -1028,7 +1033,7 @@ async fn serve_register_fe(
 
     let (tx, mut rx): (
         mpsc::Sender<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>,
-        mpsc::Receiver<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>
+        mpsc::Receiver<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>,
     ) = mpsc::channel(32);
     let (kill_tx, kill_rx) = oneshot::channel::<bool>();
 
@@ -1046,13 +1051,14 @@ async fn serve_register_fe(
             keyfile,
             eth_provider_config,
             detached,
-            Some(options_config.cache_sources),        // Pass from config
-            Some(options_config.base_l2_providers),    // Pass from config
+            Some(options_config.cache_sources), // Pass from config
+            Some(options_config.base_l2_providers), // Pass from config
         )
-            .await;
+        .await;
     });
 
-    let (our, decoded_keyfile, encoded_keyfile, cache_sources, base_l2_providers) = rx.recv().await.unwrap();
+    let (our, decoded_keyfile, encoded_keyfile, cache_sources, base_l2_providers) =
+        rx.recv().await.unwrap();
     let _ = kill_tx.send(true);
 
     // Save the keyfile to disk
@@ -1061,14 +1067,17 @@ async fn serve_register_fe(
         .expect("failed to write keyfile");
 
     // Save the options config with the received cache sources and base L2 providers
-    if let Err(e) = update_options_config(
-        cache_sources.clone(),
-        base_l2_providers.clone(),
-    ).await {
+    if let Err(e) = update_options_config(cache_sources.clone(), base_l2_providers.clone()).await {
         eprintln!("Failed to save options config: {}", e);
     }
 
-    (our, encoded_keyfile, decoded_keyfile, cache_sources, base_l2_providers)
+    (
+        our,
+        encoded_keyfile,
+        decoded_keyfile,
+        cache_sources,
+        base_l2_providers,
+    )
 }
 
 #[cfg(not(feature = "simulation-mode"))]
diff --git a/hyperdrive/src/options_config_utils.rs b/hyperdrive/src/options_config_utils.rs
index b3acc770f..1a5a56919 100644
--- a/hyperdrive/src/options_config_utils.rs
+++ b/hyperdrive/src/options_config_utils.rs
@@ -34,7 +34,10 @@ static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
 
 /// Initialize the home directory path explicitly (must be called before first use of config functions)
 pub fn initialize_home_directory(home_directory_path: PathBuf) {
-    std::env::set_var("HYPERDRIVE_HOME", home_directory_path.to_string_lossy().to_string());
+    std::env::set_var(
+        "HYPERDRIVE_HOME",
+        home_directory_path.to_string_lossy().to_string(),
+    );
 }
 
 /// Get the configured home directory path
@@ -48,15 +51,13 @@ pub async fn load_options_config() -> OptionsConfig {
     let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
 
     match tokio::fs::read_to_string(&config_path).await {
-        Ok(contents) => {
-            match serde_json::from_str::<OptionsConfig>(&contents) {
-                Ok(config) => config,
-                Err(e) => {
-                    eprintln!("Warning: Failed to parse options config: {}", e);
-                    OptionsConfig::default()
-                }
+        Ok(contents) => match serde_json::from_str::<OptionsConfig>(&contents) {
+            Ok(config) => config,
+            Err(e) => {
+                eprintln!("Warning: Failed to parse options config: {}", e);
+                OptionsConfig::default()
             }
-        }
+        },
         Err(_) => {
             // File doesn't exist, return defaults
             OptionsConfig::default()
@@ -92,4 +93,4 @@ pub async fn update_options_config(
     save_options_config(&config).await?;
     println!("Options configuration saved to {}", OPTIONS_CONFIG_FILE);
     Ok(())
-}
\ No newline at end of file
+}
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 8eed2b665..9315c1f28 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -10,7 +10,7 @@ use alloy_primitives::{Address as EthAddress, Bytes, FixedBytes, U256};
 use alloy_sol_types::{eip712_domain, SolCall, SolStruct};
 use base64::{engine::general_purpose::STANDARD as base64_standard, Engine};
 use lib::types::core::{
-    BootInfo, Identity, ImportKeyfileInfo, Keyfile, LoginInfo, NodeRouting, InfoResponse,
+    BootInfo, Identity, ImportKeyfileInfo, InfoResponse, Keyfile, LoginInfo, NodeRouting,
 };
 use ring::{rand::SystemRandom, signature, signature::KeyPair};
 use std::{
@@ -42,7 +42,7 @@ pub async fn register(
     keyfile: Option<Vec<u8>>,
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
-    initial_cache_sources: Option<Vec<String>>,        // <- Add this
+    initial_cache_sources: Option<Vec<String>>, // <- Add this
     initial_base_l2_providers: Option<Vec<String>>,
 ) {
     // Networking info is generated and passed to the UI, but not used until confirmed
@@ -131,7 +131,9 @@ pub async fn register(
         .or(warp::path("set-password"))
         .or(warp::path("custom-register"))
         .and(warp::get())
-        .map(move |_| warp::reply::html(include_str!("register-ui\\build\\index.html").to_string()));
+        .map(move |_| {
+            warp::reply::html(include_str!("register-ui\\build\\index.html").to_string())
+        });
 
     let boot_provider = provider.clone();
     let login_provider = provider.clone();
@@ -320,7 +322,7 @@ async fn get_unencrypted_info(
                         warp::reply::json(&"keyfile deserialization went wrong".to_string()),
                         StatusCode::UNAUTHORIZED,
                     )
-                        .into_response())
+                    .into_response())
                 }
             },
             None => {
@@ -328,7 +330,7 @@ async fn get_unencrypted_info(
                     warp::reply::json(&"Keyfile not present".to_string()),
                     StatusCode::NOT_FOUND,
                 )
-                    .into_response())
+                .into_response())
             }
         }
     };
@@ -337,14 +339,15 @@ async fn get_unencrypted_info(
         name,
         allowed_routers,
         initial_cache_sources: initial_cache_sources.as_ref().clone().unwrap_or_default(),
-        initial_base_l2_providers: initial_base_l2_providers.as_ref().clone().unwrap_or_default(),
+        initial_base_l2_providers: initial_base_l2_providers
+            .as_ref()
+            .clone()
+            .unwrap_or_default(),
     };
 
-    return Ok(warp::reply::with_status(
-        warp::reply::json(&response),
-        StatusCode::OK,
-    )
-        .into_response());
+    return Ok(
+        warp::reply::with_status(warp::reply::json(&response), StatusCode::OK).into_response(),
+    );
 }
 
 async fn generate_networking_info(our_temp_id: Arc<Identity>) -> Result<impl Reply, Rejection> {
@@ -446,7 +449,9 @@ async fn handle_boot(
             Ok(get) => {
                 let Ok(node_info) = getCall::abi_decode_returns(&get, false) else {
                     return Ok(warp::reply::with_status(
-                        warp::reply::json(&"Failed to decode hypermap entry from return bytes".to_string()),
+                        warp::reply::json(
+                            &"Failed to decode hypermap entry from return bytes".to_string(),
+                        ),
                         StatusCode::INTERNAL_SERVER_ERROR,
                     )
                     .into_response());

From 915ad0aab54fa3a90910720d3f2bd8c50b90fde8 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Sun, 5 Oct 2025 13:50:46 -0400
Subject: [PATCH 14/27] bi-directional data flow for cache and base L2 src

---
 .../hypermap-cacher/src/lib.rs                |  36 +++-
 hyperdrive/src/eth/mod.rs                     |  15 +-
 hyperdrive/src/eth_config_utils.rs            |  30 ++++
 hyperdrive/src/main.rs                        | 146 +++++++++++++++--
 hyperdrive/src/options_config_utils.rs        | 103 ++++++++++--
 .../BaseL2AccessProviderTooltip.tsx           |   2 +-
 .../src/components/RpcProviderEditor.tsx      | 154 ++++++++++++++++++
 .../SpecifyBaseL2AccessProvidersCheckbox.tsx  |   2 +-
 hyperdrive/src/register-ui/src/lib/types.ts   |   9 +
 .../src/register-ui/src/pages/Login.tsx       | 128 ++++++++-------
 .../src/register-ui/src/pages/SetPassword.tsx | 128 ++++++++-------
 hyperdrive/src/register.rs                    |   2 +-
 12 files changed, 603 insertions(+), 152 deletions(-)
 create mode 100644 hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx

diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index d897d6e75..9395b38cd 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -742,6 +742,33 @@ impl State {
         Err(anyhow::anyhow!("Failed to bootstrap from any node"))
     }
 
+    // Helper function to write nodes to data.txt file
+    fn write_nodes_to_file(&self) -> anyhow::Result<()> {
+        info!("Beginning of subroutine");
+        let alt_drive_path = vfs::create_drive(our().package_id(), "initfiles", None)?;
+        info!("drive path defined");
+        let nodes_json = serde_json::to_string(&self.nodes)?;
+        info!("nodes_json defined");
+        let file_path = format!("{}/data.txt", alt_drive_path);
+        info!("file_path defined");
+
+        // Open file in write mode which should truncate, but to be safe we'll write exact bytes
+        let mut file = vfs::open_file(&file_path, true, None)?;
+
+        // Get the bytes to write
+        let bytes = nodes_json.as_bytes();
+
+        // Write all bytes
+        file.write_all(bytes)?;
+
+        // Explicitly set the file length to the exact size of what we wrote
+        // This ensures any old content beyond this point is truncated
+        file.set_len(bytes.len() as u64)?;
+
+        info!("Updated data.txt with {} nodes", self.nodes.len());
+        Ok(())
+    }
+
     // Process received log caches and write them to VFS
     fn process_received_log_caches(
         &mut self,
@@ -1238,6 +1265,11 @@ fn handle_request(
             }
             state.nodes = new_nodes;
             state.save();
+            info!("Nodes have been saved to state");
+            if let Err(e) = state.write_nodes_to_file() {
+                error!("Failed to write nodes to data.txt: {:?}", e);
+            }
+            info!("If statement complete");
             info!("Nodes updated to: {:?}", state.nodes);
             CacherResponse::SetNodes(Ok("Nodes updated successfully".to_string()))
         }
@@ -1264,7 +1296,9 @@ fn handle_request(
                 *state = State::new(&state.drive_path);
                 state.nodes = nodes;
                 state.save();
-
+                if let Err(e) = state.write_nodes_to_file() {
+                    error!("Failed to write nodes to data.txt: {:?}", e);
+                }
                 info!(
                     "Hypermap-cacher reset complete. New nodes: {:?}",
                     state.nodes
diff --git a/hyperdrive/src/eth/mod.rs b/hyperdrive/src/eth/mod.rs
index e8d67acb1..8ca85701e 100644
--- a/hyperdrive/src/eth/mod.rs
+++ b/hyperdrive/src/eth/mod.rs
@@ -1460,13 +1460,24 @@ async fn handle_eth_config_action(
         };
     }
     if save_providers {
+        let saved_configs = providers_to_saved_configs(&state.providers);
+
         if let Ok(()) = tokio::fs::write(
             state.home_directory_path.join(".eth_providers"),
-            serde_json::to_string(&providers_to_saved_configs(&state.providers)).unwrap(),
+            serde_json::to_string(&saved_configs).unwrap(),
         )
-        .await
+            .await
         {
             verbose_print(&state.print_tx, "eth: saved new provider settings").await;
+
+            /* TODO CLEANUP
+            // Also update the base L2 providers in options config
+            if let Err(e) = crate::options_config_utils::update_base_l2_providers_from_saved_configs(&saved_configs).await {
+                verbose_print(&state.print_tx, &format!("eth: failed to update base L2 providers in options config: {}", e)).await;
+            } else {
+                verbose_print(&state.print_tx, "eth: updated base L2 providers in options config").await;
+            }
+            */
         };
     }
     if provider_not_found {
diff --git a/hyperdrive/src/eth_config_utils.rs b/hyperdrive/src/eth_config_utils.rs
index 5cf1c435c..7b79c9127 100644
--- a/hyperdrive/src/eth_config_utils.rs
+++ b/hyperdrive/src/eth_config_utils.rs
@@ -37,3 +37,33 @@ pub fn add_provider_to_config(
     // Insert the new provider at the front (position 0)
     eth_provider_config.0.insert(0, new_provider);
 }
+
+/// Extract unauthenticated RPC URLs from SavedConfigs
+/// Similar to update_base_l2_providers_from_saved_configs but just returns the Vec
+pub fn extract_rpc_url_providers_for_default_chain(saved_configs: &lib::eth::SavedConfigs) -> Vec<lib::eth::NodeOrRpcUrl> {
+    saved_configs.0
+        .iter()
+        .filter_map(|provider_config| {
+            // Only include providers for the default chain (8453 for mainnet, 31337 for simulation)
+            #[cfg(not(feature = "simulation-mode"))]
+            let target_chain_id = crate::CHAIN_ID; // 8453
+            #[cfg(feature = "simulation-mode")]
+            let target_chain_id = crate::CHAIN_ID; // 31337
+
+            if provider_config.chain_id != target_chain_id {
+                return None;
+            }
+
+            match &provider_config.provider {
+                lib::eth::NodeOrRpcUrl::RpcUrl { url, auth } => {
+                    // Return the full RpcUrl enum variant with both url and auth
+                    Some(lib::eth::NodeOrRpcUrl::RpcUrl {
+                        url: url.clone(),
+                        auth: auth.clone(),
+                    })
+                }
+                lib::eth::NodeOrRpcUrl::Node { .. } => None, // Skip node providers
+            }
+        })
+        .collect()
+}
\ No newline at end of file
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 4ca085972..b47129cf1 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -365,14 +365,45 @@ async fn main() {
 
     if !base_l2_access_source_vector.is_empty() {
         // Process in reverse order so the first entry in the vector becomes highest priority
-        for (_reverse_index, url) in base_l2_access_source_vector.into_iter().rev().enumerate() {
-            let new_provider = lib::eth::ProviderConfig {
-                chain_id: CHAIN_ID,
-                trusted: true,
-                provider: lib::eth::NodeOrRpcUrl::RpcUrl { url, auth: None },
-            };
+        for (_reverse_index, provider_str) in base_l2_access_source_vector.into_iter().rev().enumerate() {
+            // Parse the JSON string to extract url and auth fields
+            match serde_json::from_str::<serde_json::Value>(&provider_str) {
+                Ok(provider_json) => {
+                    let url = match provider_json.get("url").and_then(|v| v.as_str()) {
+                        Some(u) => u.to_string(),
+                        None => {
+                            eprintln!("Skipping provider entry with missing or invalid 'url' field");
+                            continue;
+                        }
+                    };
+
+                    // Extract auth field - convert null to None
+                    let auth = match provider_json.get("auth") {
+                        Some(auth_value) if !auth_value.is_null() => {
+                            // Try to deserialize the auth object into Authorization
+                            match serde_json::from_value::<lib::eth::Authorization>(auth_value.clone()) {
+                                Ok(auth_obj) => Some(auth_obj),
+                                Err(e) => {
+                                    eprintln!("Failed to parse auth field for {}: {:?}", url, e);
+                                    None
+                                }
+                            }
+                        }
+                        _ => None, // null or missing -> None
+                    };
+
+                    let new_provider = lib::eth::ProviderConfig {
+                        chain_id: CHAIN_ID,
+                        trusted: true,
+                        provider: lib::eth::NodeOrRpcUrl::RpcUrl { url, auth },
+                    };
 
-            add_provider_to_config(&mut eth_provider_config, new_provider);
+                    add_provider_to_config(&mut eth_provider_config, new_provider);
+                }
+                Err(e) => {
+                    eprintln!("Failed to parse provider JSON '{}': {:?}", provider_str, e);
+                }
+            }
         }
         is_eth_provider_config_updated = true;
     }
@@ -387,6 +418,7 @@ async fn main() {
         .expect("failed to save new eth provider config!");
     }
 
+    /* TODO CLEANUP
     // Save the cache sources and Base L2 providers configuration
     if !cache_source_vector_for_config.is_empty()
         || !base_l2_access_source_vector_for_config.is_empty()
@@ -400,6 +432,7 @@ async fn main() {
             .await
             .expect("failed to save options config!");
     }
+    */
 
     // the boolean flag determines whether the runtime module is *public* or not,
     // where public means that any process can always message it.
@@ -1018,6 +1051,8 @@ async fn find_public_ip() -> std::net::Ipv4Addr {
 /// username, networking key, and routing info.
 /// if any do not match, we should prompt user to create a "transaction"
 /// that updates their PKI info on-chain.
+
+
 #[cfg(not(feature = "simulation-mode"))]
 async fn serve_register_fe(
     home_directory_path: &Path,
@@ -1028,9 +1063,46 @@ async fn serve_register_fe(
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
 ) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
-    // Load options config from file
+    // Load options config to get cache sources
     let options_config = load_options_config().await;
 
+    // Read cache sources from data.txt file instead of options_config
+    let cache_sources_from_file = {
+        let vfs_dir = home_directory_path.join("vfs");
+        let hypermap_cacher_dir = vfs_dir.join("hypermap-cacher:sys");
+        let initfiles_dir = hypermap_cacher_dir.join("initfiles");
+        let data_file_path = initfiles_dir.join("data.txt");
+
+        match tokio::fs::read_to_string(&data_file_path).await {
+            Ok(contents) => {
+                match serde_json::from_str::<Vec<String>>(&contents) {
+                    Ok(cache_sources) if !cache_sources.is_empty() => {
+                        println!("Loaded cache sources from data.txt: {:?}\r", cache_sources);
+                        Some(cache_sources)
+                    }
+                    _ => {
+                        println!("Failed to parse data.txt or empty, using default empty list\r");
+                        Some(Vec::new())
+                    }
+                }
+            }
+            Err(_) => {
+                println!("data.txt not found, using default empty list\r");
+                Some(Vec::new())
+            }
+        }
+    };
+
+    // Convert RpcUrl providers to serializable format for the registration UI
+    let initial_base_l2_providers = if !options_config.base_l2_providers.is_empty() {
+        // Use providers from options config if available
+        options_config.base_l2_providers
+    } else {
+        // Extract from eth_provider_config and serialize to JSON strings
+        let rpc_providers = eth_config_utils::extract_rpc_url_providers_for_default_chain(&eth_provider_config);
+        serialize_rpc_providers_for_ui(rpc_providers)
+    };
+
     let (tx, mut rx): (
         mpsc::Sender<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>,
         mpsc::Receiver<(Identity, Keyfile, Vec<u8>, Vec<String>, Vec<String>)>,
@@ -1051,10 +1123,10 @@ async fn serve_register_fe(
             keyfile,
             eth_provider_config,
             detached,
-            Some(options_config.cache_sources), // Pass from config
-            Some(options_config.base_l2_providers), // Pass from config
+            cache_sources_from_file, // Pass cache sources from config
+            Some(initial_base_l2_providers), // Pass providers - now properly unwrapped
         )
-        .await;
+            .await;
     });
 
     let (our, decoded_keyfile, encoded_keyfile, cache_sources, base_l2_providers) =
@@ -1066,11 +1138,6 @@ async fn serve_register_fe(
         .await
         .expect("failed to write keyfile");
 
-    // Save the options config with the received cache sources and base L2 providers
-    if let Err(e) = update_options_config(cache_sources.clone(), base_l2_providers.clone()).await {
-        eprintln!("Failed to save options config: {}", e);
-    }
-
     (
         our,
         encoded_keyfile,
@@ -1196,3 +1263,50 @@ async fn login_with_password(
 fn make_remote_link(url: &str, text: &str) -> String {
     format!("\x1B]8;;{}\x1B\\{}\x1B]8;;\x1B\\", url, text)
 }
+
+// ... existing code ...
+
+/// Serialize RpcUrl providers to JSON strings for the UI
+/// Each provider is serialized as a JSON object containing url and auth
+pub fn serialize_rpc_providers_for_ui(providers: Vec<lib::eth::NodeOrRpcUrl>) -> Vec<String> {
+    providers
+        .into_iter()
+        .filter_map(|provider| {
+            match provider {
+                lib::eth::NodeOrRpcUrl::RpcUrl { url, auth } => {
+                    // Create a serializable object with url and auth
+                    let provider_obj = serde_json::json!({
+                        "url": url,
+                        "auth": auth
+                    });
+                    // Serialize to string
+                    serde_json::to_string(&provider_obj).ok()
+                }
+                lib::eth::NodeOrRpcUrl::Node { .. } => None,
+            }
+        })
+        .collect()
+}
+
+/// Deserialize RpcUrl provider strings from the UI back to NodeOrRpcUrl objects
+pub fn deserialize_rpc_providers_from_ui(provider_strings: Vec<String>) -> Vec<lib::eth::NodeOrRpcUrl> {
+    provider_strings
+        .into_iter()
+        .filter_map(|provider_str| {
+            // Try to parse as JSON object first
+            if let Ok(provider_obj) = serde_json::from_str::<serde_json::Value>(&provider_str) {
+                if let (Some(url), auth) = (
+                    provider_obj.get("url").and_then(|v| v.as_str()).map(String::from),
+                    provider_obj.get("auth").and_then(|v| serde_json::from_value(v.clone()).ok())
+                ) {
+                    return Some(lib::eth::NodeOrRpcUrl::RpcUrl { url, auth });
+                }
+            }
+            // Fall back to treating it as a plain URL string (for backward compatibility)
+            Some(lib::eth::NodeOrRpcUrl::RpcUrl {
+                url: provider_str,
+                auth: None
+            })
+        })
+        .collect()
+}
\ No newline at end of file
diff --git a/hyperdrive/src/options_config_utils.rs b/hyperdrive/src/options_config_utils.rs
index 1a5a56919..b81f86ab6 100644
--- a/hyperdrive/src/options_config_utils.rs
+++ b/hyperdrive/src/options_config_utils.rs
@@ -1,7 +1,11 @@
+
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::sync::LazyLock;
 
+// Import the types we need from the eth module
+use lib::eth::{SavedConfigs, ProviderConfig, NodeOrRpcUrl};
+
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct OptionsConfig {
     pub cache_sources: Vec<String>,
@@ -34,10 +38,7 @@ static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
 
 /// Initialize the home directory path explicitly (must be called before first use of config functions)
 pub fn initialize_home_directory(home_directory_path: PathBuf) {
-    std::env::set_var(
-        "HYPERDRIVE_HOME",
-        home_directory_path.to_string_lossy().to_string(),
-    );
+    std::env::set_var("HYPERDRIVE_HOME", home_directory_path.to_string_lossy().to_string());
 }
 
 /// Get the configured home directory path
@@ -51,13 +52,15 @@ pub async fn load_options_config() -> OptionsConfig {
     let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
 
     match tokio::fs::read_to_string(&config_path).await {
-        Ok(contents) => match serde_json::from_str::<OptionsConfig>(&contents) {
-            Ok(config) => config,
-            Err(e) => {
-                eprintln!("Warning: Failed to parse options config: {}", e);
-                OptionsConfig::default()
+        Ok(contents) => {
+            match serde_json::from_str::<OptionsConfig>(&contents) {
+                Ok(config) => config,
+                Err(e) => {
+                    eprintln!("Warning: Failed to parse options config: {}", e);
+                    OptionsConfig::default()
+                }
             }
-        },
+        }
         Err(_) => {
             // File doesn't exist, return defaults
             OptionsConfig::default()
@@ -78,9 +81,8 @@ pub async fn save_options_config(config: &OptionsConfig) -> Result<(), std::io::
     tokio::fs::write(config_path, contents).await
 }
 
-/// Update the options configuration with new values.
-/// This is the function that should be called from anywhere in the codebase
-/// when the runtime state changes and needs to be persisted.
+/// Update the options configuration with new values for both fields.
+/// This is the function that should be called when you want to update both cache sources and base L2 providers.
 pub async fn update_options_config(
     current_cache_sources: Vec<String>,
     current_base_l2_providers: Vec<String>,
@@ -94,3 +96,78 @@ pub async fn update_options_config(
     println!("Options configuration saved to {}", OPTIONS_CONFIG_FILE);
     Ok(())
 }
+
+/// Update only the base L2 providers, keeping existing cache sources unchanged.
+/// This loads the current config, updates only the base_l2_providers field, and saves it back.
+pub async fn update_base_l2_providers(new_base_l2_providers: Vec<String>) -> Result<(), std::io::Error> {
+    let mut config = load_options_config().await;
+    config.base_l2_providers = new_base_l2_providers;
+
+    save_options_config(&config).await?;
+    println!("Base L2 providers updated in {}", OPTIONS_CONFIG_FILE);
+    Ok(())
+}
+
+/// Update base L2 providers from a SavedConfigs object, extracting only RPC URLs without authentication.
+/// This filters the SavedConfigs to find RpcUrl providers that have no auth (None),
+/// extracts their URLs, and saves them as the new base L2 providers.
+/// Keeps existing cache sources unchanged.
+pub async fn update_base_l2_providers_from_saved_configs(saved_configs: &SavedConfigs) -> Result<(), std::io::Error> {
+    let mut config = load_options_config().await;
+
+    // Extract URLs from RpcUrl providers that have no authentication
+    let unauthenticated_urls: Vec<String> = saved_configs.0
+        .iter()
+        .filter_map(|provider_config| {
+            match &provider_config.provider {
+                NodeOrRpcUrl::RpcUrl { url, auth } => {
+                    // Only include URLs that have no authentication
+                    if auth.is_none() {
+                        Some(url.clone())
+                    } else {
+                        None
+                    }
+                }
+                NodeOrRpcUrl::Node { .. } => None, // Skip node providers
+            }
+        })
+        .collect();
+
+    config.base_l2_providers = unauthenticated_urls;
+
+    save_options_config(&config).await?;
+    println!("Base L2 providers updated from SavedConfigs (unauthenticated RPC URLs only) in {}", OPTIONS_CONFIG_FILE);
+    Ok(())
+}
+
+/// Update only the cache sources, keeping existing base L2 providers unchanged.
+/// This loads the current config, updates only the cache_sources field, and saves it back.
+pub async fn update_cache_sources(new_cache_sources: Vec<String>) -> Result<(), std::io::Error> {
+    let mut config = load_options_config().await;
+    config.cache_sources = new_cache_sources;
+
+    save_options_config(&config).await?;
+    println!("Cache sources updated in {}", OPTIONS_CONFIG_FILE);
+    Ok(())
+}
+
+/// Update the options configuration with optional values.
+/// Pass None to keep the existing value for that field, or Some(vec) to update it.
+pub async fn update_options_config_partial(
+    cache_sources: Option<Vec<String>>,
+    base_l2_providers: Option<Vec<String>>,
+) -> Result<(), std::io::Error> {
+    let mut config = load_options_config().await;
+
+    if let Some(new_cache_sources) = cache_sources {
+        config.cache_sources = new_cache_sources;
+    }
+
+    if let Some(new_base_l2_providers) = base_l2_providers {
+        config.base_l2_providers = new_base_l2_providers;
+    }
+
+    save_options_config(&config).await?;
+    println!("Options configuration updated in {}", OPTIONS_CONFIG_FILE);
+    Ok(())
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx b/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx
index 86db3f528..6c856378a 100644
--- a/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx
+++ b/hyperdrive/src/register-ui/src/components/BaseL2AccessProviderTooltip.tsx
@@ -7,7 +7,7 @@ export const BaseL2AccessProviderTooltip: React.FC = () => {
             text={`
         Base L2 Access Providers are specialized nodes that provide access to Base Layer 2 blockchain data.
         These providers help your node interact with Base L2 for faster and cheaper transactions.
-        If unchecked, the system will use default Base L2 access providers.
+        If unchecked, the system will use default/existing Base L2 access providers.
       `}
         />
     );
diff --git a/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx b/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
new file mode 100644
index 000000000..470a7683f
--- /dev/null
+++ b/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
@@ -0,0 +1,154 @@
+import { useState } from 'react';
+import classNames from 'classnames';
+
+export interface RpcProviderData {
+    url: string;
+    auth: {
+        type: 'Basic' | 'Bearer' | 'Raw' | null;
+        value: string;
+    } | null;
+}
+
+interface RpcProviderEditorProps {
+    providers: RpcProviderData[];
+    onChange: (providers: RpcProviderData[]) => void;
+    label?: string;
+}
+
+export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEditorProps) {
+    const addProvider = () => {
+        onChange([...providers, { url: '', auth: null }]);
+    };
+
+    const removeProvider = (index: number) => {
+        onChange(providers.filter((_, i) => i !== index));
+    };
+
+    const updateProvider = (index: number, updates: Partial<RpcProviderData>) => {
+        const newProviders = [...providers];
+        newProviders[index] = { ...newProviders[index], ...updates };
+        onChange(newProviders);
+    };
+
+    const updateAuth = (index: number, authType: 'Basic' | 'Bearer' | 'Raw' | null, authValue: string = '') => {
+        const newProviders = [...providers];
+        if (authType === null) {
+            newProviders[index].auth = null;
+        } else {
+            newProviders[index].auth = { type: authType, value: authValue };
+        }
+        onChange(newProviders);
+    };
+
+    const hasEmptyRequired = providers.some(p => !p.url.trim());
+
+    return (
+        <div className="flex flex-col gap-3">
+            {label && (
+                <label className="text-sm font-medium">
+                    {label} {providers.length > 0 && <span className="text-red-500">*</span>}
+                </label>
+            )}
+
+            {providers.map((provider, index) => (
+                <div key={index} className="flex flex-col gap-2 p-3 border border-gray-300 dark:border-gray-600 rounded">
+                    <div className="flex gap-2 items-start">
+                        <div className="flex-1 flex flex-col gap-2">
+                            {/* URL Field */}
+                            <div className="flex flex-col gap-1">
+                                <label className="text-xs font-medium opacity-70">
+                                    WebSocket URL <span className="text-red-500">*</span>
+                                </label>
+                                <input
+                                    type="text"
+                                    value={provider.url}
+                                    onChange={(e) => updateProvider(index, { url: e.target.value })}
+                                    placeholder="wss://base-mainnet.infura.io/ws/v3/YOUR-API-KEY"
+                                    className={classNames("input text-sm", {
+                                        'border-red-500 focus:border-red-500': !provider.url.trim()
+                                    })}
+                                />
+                            </div>
+
+                            {/* Auth Type Selector */}
+                            <div className="flex flex-col gap-1">
+                                <label className="text-xs font-medium opacity-70">Authentication (Optional)</label>
+                                <select
+                                    value={provider.auth?.type || 'none'}
+                                    onChange={(e) => {
+                                        const value = e.target.value;
+                                        if (value === 'none') {
+                                            updateAuth(index, null);
+                                        } else {
+                                            updateAuth(index, value as 'Basic' | 'Bearer' | 'Raw', provider.auth?.value || '');
+                                        }
+                                    }}
+                                    className="input text-sm"
+                                >
+                                    <option value="none">No Authentication</option>
+                                    <option value="Bearer">Bearer Token</option>
+                                    <option value="Basic">Basic Auth</option>
+                                    <option value="Raw">Raw Header</option>
+                                </select>
+                            </div>
+
+                            {/* Auth Value Field (conditional) */}
+                            {provider.auth && (
+                                <div className="flex flex-col gap-1">
+                                    <label className="text-xs font-medium opacity-70">
+                                        Auth Value <span className="text-red-500">*</span>
+                                    </label>
+                                    <input
+                                        type="text"
+                                        value={provider.auth.value}
+                                        onChange={(e) => updateAuth(index, provider.auth!.type, e.target.value)}
+                                        placeholder={
+                                            provider.auth.type === 'Bearer' ? 'your-bearer-token' :
+                                                provider.auth.type === 'Basic' ? 'username:password (base64 encoded)' :
+                                                    'custom-header-value'
+                                        }
+                                        className={classNames("input text-sm", {
+                                            'border-red-500 focus:border-red-500': !provider.auth.value.trim()
+                                        })}
+                                    />
+                                </div>
+                            )}
+                        </div>
+
+                        {/* Remove Button */}
+                        <button
+                            type="button"
+                            onClick={() => removeProvider(index)}
+                            className="px-2 py-1 text-red-500 hover:text-red-700 text-sm"
+                            title="Remove provider"
+                        >
+                            ✕
+                        </button>
+                    </div>
+                </div>
+            ))}
+
+            {/* Add Provider Button */}
+            <button
+                type="button"
+                onClick={addProvider}
+                className="px-3 py-2 text-sm border border-gray-300 dark:border-gray-600 rounded hover:bg-gray-100 dark:hover:bg-gray-800"
+            >
+                + Add RPC Provider
+            </button>
+
+            {/* Validation Message */}
+            {providers.length > 0 && hasEmptyRequired && (
+                <span className="text-xs text-red-500">
+          All providers must have a valid WebSocket URL
+        </span>
+            )}
+
+            {providers.length > 0 && !hasEmptyRequired && (
+                <span className="text-xs text-gray-500">
+          {providers.length} provider{providers.length !== 1 ? 's' : ''} configured
+        </span>
+            )}
+        </div>
+    );
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
index 9d067f2aa..9253aaaa3 100644
--- a/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
@@ -17,7 +17,7 @@ export default function SpecifyBaseL2AccessProvidersCheckbox({ specifyBaseL2Acce
                 {specifyBaseL2AccessProviders ? <FaSquareCheck /> : <FaRegSquare />}
             </button>
             <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
-                <span className="text-sm">Specify Base L2 access providers.</span>
+                <span className="text-sm">Add Base L2 access providers.</span>
                 <span className="text-xs">If you are unsure, leave unchecked.</span>
             </div>
             <BaseL2AccessProviderTooltip />
diff --git a/hyperdrive/src/register-ui/src/lib/types.ts b/hyperdrive/src/register-ui/src/lib/types.ts
index 6bf2caba5..f09a9cedc 100644
--- a/hyperdrive/src/register-ui/src/lib/types.ts
+++ b/hyperdrive/src/register-ui/src/lib/types.ts
@@ -50,3 +50,12 @@ export type InfoResponse = {
   initial_cache_sources: string[];
   initial_base_l2_providers: string[];
 }
+
+export interface RpcProviderConfig {
+  url: string;
+  auth: {
+    Basic?: string;
+    Bearer?: string;
+    Raw?: string;
+  } | null;
+}
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index d878d109c..6b4999615 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -6,6 +6,7 @@ import { redirectToHomepage } from "../utils/redirect-to-homepage";
 import classNames from "classnames";
 import SpecifyCacheSourcesCheckbox from "../components/SpecifyCacheSourcesCheckbox";
 import SpecifyBaseL2AccessProvidersCheckbox from "../components/SpecifyBaseL2AccessProvidersCheckbox";
+import { RpcProviderEditor, RpcProviderData } from "../components/RpcProviderEditor";
 
 interface LoginProps extends PageProps { }
 
@@ -27,7 +28,7 @@ function Login({
   const [specifyCacheSources, setSpecifyCacheSources] = useState(false);
   const [customCacheSources, setCustomCacheSources] = useState('');
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
-  const [customBaseL2AccessProviders, setCustomBaseL2AccessProviders] = useState('');
+  const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
 
   const [keyErrs, setKeyErrs] = useState<string[]>([]);
   const [loading, setLoading] = useState<string>("");
@@ -43,19 +44,45 @@ function Login({
         setRouters(infoData.allowed_routers);
         setHnsName(infoData.name);
 
-        // Prepopulate the fields with default values from the server
+        // Prepopulate cache sources
         if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
           setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
-          setSpecifyCacheSources(true); // Auto-check the checkbox
+          setSpecifyCacheSources(true);
         }
 
+        // Parse and prepopulate Base L2 providers
         if (infoData.initial_base_l2_providers && infoData.initial_base_l2_providers.length > 0) {
-          setCustomBaseL2AccessProviders(infoData.initial_base_l2_providers.join('\n'));
-          setSpecifyBaseL2AccessProviders(true); // Auto-check the checkbox
+          const parsedProviders: RpcProviderData[] = infoData.initial_base_l2_providers.map(providerStr => {
+            try {
+              const parsed = JSON.parse(providerStr);
+              // Convert from backend format to frontend format
+              let authData = null;
+              if (parsed.auth) {
+                if (parsed.auth.Basic) {
+                  authData = { type: 'Basic' as const, value: parsed.auth.Basic };
+                } else if (parsed.auth.Bearer) {
+                  authData = { type: 'Bearer' as const, value: parsed.auth.Bearer };
+                } else if (parsed.auth.Raw) {
+                  authData = { type: 'Raw' as const, value: parsed.auth.Raw };
+                }
+              }
+              return {
+                url: parsed.url,
+                auth: authData
+              };
+            } catch {
+              // If parsing fails, treat as plain URL string
+              return {
+                url: providerStr,
+                auth: null
+              };
+            }
+          });
+          setRpcProviders(parsedProviders);
+          setSpecifyBaseL2AccessProviders(true);
         }
       } catch (error) {
         console.error('Failed to fetch node info:', error);
-        // Continue without defaults if fetch fails
       }
     })();
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
@@ -78,13 +105,21 @@ function Login({
             console.log("Custom cache sources:", cacheSourcesToUse);
           }
 
-          // Process custom Base L2 access providers if specified
+          // Process RPC providers - convert to JSON strings
           let baseL2AccessProvidersToUse: string[] | undefined = undefined;
-          if (specifyBaseL2AccessProviders && customBaseL2AccessProviders.trim()) {
-            baseL2AccessProvidersToUse = customBaseL2AccessProviders
-                .split('\n')
-                .map(provider => provider.trim())
-                .filter(provider => provider.length > 0);
+          if (specifyBaseL2AccessProviders && rpcProviders.length > 0) {
+            baseL2AccessProvidersToUse = rpcProviders.map(provider => {
+              let authObj = null;
+              if (provider.auth) {
+                authObj = {
+                  [provider.auth.type]: provider.auth.value
+                };
+              }
+              return JSON.stringify({
+                url: provider.url,
+                auth: authObj
+              });
+            });
 
             console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
           }
@@ -93,13 +128,9 @@ function Login({
 
           try {
             // Try argon2 hash first
-
-            // salt is either node name (if node name is longer than 8 characters)
-            //  or node name repeated enough times to be longer than 8 characters
             const minSaltL = 8;
             const nodeL = hnsName.length;
             const salt = nodeL >= minSaltL ? hnsName : hnsName.repeat(1 + Math.floor(minSaltL / nodeL));
-            console.log(salt);
 
             //@ts-ignore
             const h = await argon2.hash({
@@ -118,11 +149,11 @@ function Login({
               method: "POST",
               credentials: 'include',
               headers: { "Content-Type": "application/json" },
-              body: JSON.stringify({ password_hash: hashed_password_hex,
+              body: JSON.stringify({
+                password_hash: hashed_password_hex,
                 custom_cache_sources: cacheSourcesToUse && cacheSourcesToUse.length > 0 ? cacheSourcesToUse : null,
                 custom_base_l2_access_providers: baseL2AccessProvidersToUse && baseL2AccessProvidersToUse.length > 0 ? baseL2AccessProvidersToUse : null,
               }),
-
             });
 
             if (result.status < 399) {
@@ -140,11 +171,20 @@ function Login({
           setLoading("");
         }
       },
-      [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, customBaseL2AccessProviders]
+      [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, rpcProviders]
   );
 
   const isDirect = Boolean(routers?.length === 0);
 
+  // Validation for the submit button
+  const hasInvalidRpcProviders = specifyBaseL2AccessProviders && (
+      rpcProviders.length === 0 ||
+      rpcProviders.some(p => !p.url.trim() || (p.auth && !p.auth.value.trim()))
+  );
+
+  const hasInvalidCacheSources = specifyCacheSources &&
+      customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0;
+
   return <div className="relative flex flex-col gap-2 items-stretch self-stretch">
     {loading && <div className="absolute top-0 left-0 w-full h-full flex place-content-center place-items-center">
       <Loader msg={loading} className="text-black dark:text-white" />
@@ -193,19 +233,11 @@ function Login({
                     value={customCacheSources}
                     onChange={(e) => setCustomCacheSources(e.target.value)}
                     placeholder="Enter one cache source name per line, e.g.:&#10;cache-node-1.hypr&#10;other-cache.hypr&#10;mycache.os"
-                    className={`input resize-vertical min-h-[80px] ${
-                        specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
-                            ? 'border-red-500 focus:border-red-500'
-                            : ''
-                    }`}
+                    className={`input resize-vertical min-h-[80px] ${hasInvalidCacheSources ? 'border-red-500 focus:border-red-500' : ''}`}
                     rows={4}
                 />
-                <span className={`text-xs ${
-                    customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
-                        ? 'text-red-500'
-                        : 'text-gray-500'
-                }`}>
-                    {customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
+                <span className={`text-xs ${hasInvalidCacheSources ? 'text-red-500' : 'text-gray-500'}`}>
+                    {hasInvalidCacheSources
                         ? 'At least one cache source name is required'
                         : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
                     }
@@ -218,32 +250,12 @@ function Login({
               setSpecifyBaseL2AccessProviders={setSpecifyBaseL2AccessProviders}
           />
           {specifyBaseL2AccessProviders && (
-              <div className="flex flex-col gap-2 ml-6">
-                <label htmlFor="custom-base-l2-providers" className="text-sm font-medium">
-                  Base L2 Access Provider Names: <span className="text-red-500">*</span>
-                </label>
-                <textarea
-                    id="custom-base-l2-providers-login"
-                    value={customBaseL2AccessProviders}
-                    onChange={(e) => setCustomBaseL2AccessProviders(e.target.value)}
-                    placeholder="Enter one provider or URL per line, e.g.:&#10;base-provider-1.hypr&#10;wss://base-mainnet.infura.io/v3/your-key&#10;myprovider.os&#10;wss://rpc.example.com"
-                    className={`input resize-vertical min-h-[80px] ${
-                        specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
-                            ? 'border-red-500 focus:border-red-500'
-                            : ''
-                    }`}
-                    rows={4}
+              <div className="ml-6">
+                <RpcProviderEditor
+                    providers={rpcProviders}
+                    onChange={setRpcProviders}
+                    label="Base L2 RPC Providers"
                 />
-                <span className={`text-xs ${
-                    customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
-                        ? 'text-red-500'
-                        : 'text-gray-500'
-                }`}>
-                    {customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
-                        ? 'At least one Base L2 access provider name is required'
-                        : 'Enter one provider name per line. These nodes will provide access to Base Layer 2 blockchain data.'
-                    }
-                  </span>
               </div>
           )}
         </div>
@@ -259,14 +271,12 @@ function Login({
 
       <button
           type="submit"
-          disabled={
-              (specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0) ||
-              (specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0)
-          }
+          disabled={hasInvalidCacheSources || hasInvalidRpcProviders}
       >Log in</button>
 
       <button
           className="clear "
+          type="button"
           onClick={() => navigate('/reset')}
       >
         Reset Password & Networking Info
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index e3f499e0c..52cc563b5 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -6,6 +6,7 @@ import { HYPERMAP } from "../abis";
 import { redirectToHomepage } from "../utils/redirect-to-homepage";
 import SpecifyCacheSourcesCheckbox from "../components/SpecifyCacheSourcesCheckbox";
 import SpecifyBaseL2AccessProvidersCheckbox from "../components/SpecifyBaseL2AccessProvidersCheckbox";
+import { RpcProviderEditor, RpcProviderData } from "../components/RpcProviderEditor";
 import { InfoResponse } from "../lib/types";
 
 type SetPasswordProps = {
@@ -35,7 +36,7 @@ function SetPassword({
   const [specifyCacheSources, setSpecifyCacheSources] = useState(false);
   const [customCacheSources, setCustomCacheSources] = useState('');
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
-  const [customBaseL2AccessProviders, setCustomBaseL2AccessProviders] = useState('');
+  const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
 
   const { signTypedDataAsync } = useSignTypedData();
   const { address } = useAccount();
@@ -53,24 +54,49 @@ function SetPassword({
             res.json()
         )) as InfoResponse;
 
-        // Prepopulate the fields with default values
+        // Prepopulate cache sources
         if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
           setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
-          setSpecifyCacheSources(true); // Auto-check the checkbox
+          setSpecifyCacheSources(true);
         }
 
+        // Parse and prepopulate Base L2 providers
         if (infoData.initial_base_l2_providers && infoData.initial_base_l2_providers.length > 0) {
-          setCustomBaseL2AccessProviders(infoData.initial_base_l2_providers.join('\n'));
-          setSpecifyBaseL2AccessProviders(true); // Auto-check the checkbox
+          const parsedProviders: RpcProviderData[] = infoData.initial_base_l2_providers.map(providerStr => {
+            try {
+              const parsed = JSON.parse(providerStr);
+              // Convert from backend format to frontend format
+              let authData = null;
+              if (parsed.auth) {
+                if (parsed.auth.Basic) {
+                  authData = { type: 'Basic' as const, value: parsed.auth.Basic };
+                } else if (parsed.auth.Bearer) {
+                  authData = { type: 'Bearer' as const, value: parsed.auth.Bearer };
+                } else if (parsed.auth.Raw) {
+                  authData = { type: 'Raw' as const, value: parsed.auth.Raw };
+                }
+              }
+              return {
+                url: parsed.url,
+                auth: authData
+              };
+            } catch {
+              // If parsing fails, treat as plain URL string
+              return {
+                url: providerStr,
+                auth: null
+              };
+            }
+          });
+          setRpcProviders(parsedProviders);
+          setSpecifyBaseL2AccessProviders(true);
         }
       } catch (error) {
         console.error('Failed to fetch default configuration:', error);
-        // Continue without defaults if fetch fails
       }
     })();
   }, []);
 
-
   useEffect(() => {
     setError("");
   }, [pw, pw2]);
@@ -98,13 +124,21 @@ function SetPassword({
             console.log("Custom cache sources:", cacheSourcesToUse);
           }
 
-          // Process custom Base L2 access providers if specified
+          // Process RPC providers - convert to JSON strings
           let baseL2AccessProvidersToUse: string[] | undefined = undefined;
-          if (specifyBaseL2AccessProviders && customBaseL2AccessProviders.trim()) {
-            baseL2AccessProvidersToUse = customBaseL2AccessProviders
-                .split('\n')
-                .map(provider => provider.trim())
-                .filter(provider => provider.length > 0);
+          if (specifyBaseL2AccessProviders && rpcProviders.length > 0) {
+            baseL2AccessProvidersToUse = rpcProviders.map(provider => {
+              let authObj = null;
+              if (provider.auth) {
+                authObj = {
+                  [provider.auth.type]: provider.auth.value
+                };
+              }
+              return JSON.stringify({
+                url: provider.url,
+                auth: authObj
+              });
+            });
 
             console.log("Custom Base L2 access providers:", baseL2AccessProvidersToUse);
           }
@@ -192,9 +226,18 @@ function SetPassword({
           });
         }, 500);
       },
-      [direct, pw, pw2, reset, hnsName, routers, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, customBaseL2AccessProviders]
+      [direct, pw, pw2, reset, hnsName, routers, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, rpcProviders, address, chainId, signTypedDataAsync]
   );
 
+  // Validation for the submit button
+  const hasInvalidRpcProviders = specifyBaseL2AccessProviders && (
+      rpcProviders.length === 0 ||
+      rpcProviders.some(p => !p.url.trim() || (p.auth && !p.auth.value.trim()))
+  );
+
+  const hasInvalidCacheSources = specifyCacheSources &&
+      customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0;
+
   return (
       <>
         {loading ? (
@@ -250,23 +293,15 @@ function SetPassword({
                             value={customCacheSources}
                             onChange={(e) => setCustomCacheSources(e.target.value)}
                             placeholder="Enter one cache source name per line, e.g.:&#10;cache-node-1.hypr&#10;other-cache.hypr&#10;mycache.os"
-                            className={`input resize-vertical min-h-[80px] ${
-                                specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
-                                    ? 'border-red-500 focus:border-red-500'
-                                    : ''
-                            }`}
+                            className={`input resize-vertical min-h-[80px] ${hasInvalidCacheSources ? 'border-red-500 focus:border-red-500' : ''}`}
                             rows={4}
                         />
-                        <span className={`text-xs ${
-                            customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
-                                ? 'text-red-500'
-                                : 'text-gray-500'
-                        }`}>
-                    {customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0
-                        ? 'At least one cache source name is required'
-                        : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
-                    }
-                  </span>
+                        <span className={`text-xs ${hasInvalidCacheSources ? 'text-red-500' : 'text-gray-500'}`}>
+                          {hasInvalidCacheSources
+                              ? 'At least one cache source name is required'
+                              : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
+                          }
+                        </span>
                       </div>
                   )}
 
@@ -275,32 +310,12 @@ function SetPassword({
                       setSpecifyBaseL2AccessProviders={setSpecifyBaseL2AccessProviders}
                   />
                   {specifyBaseL2AccessProviders && (
-                      <div className="flex flex-col gap-2 ml-6">
-                        <label htmlFor="custom-base-l2-providers" className="text-sm font-medium">
-                          Base L2 Access Provider Names: <span className="text-red-500">*</span>
-                        </label>
-                        <textarea
-                            id="custom-base-l2-providers-setpassword"
-                            value={customBaseL2AccessProviders}
-                            onChange={(e) => setCustomBaseL2AccessProviders(e.target.value)}
-                            placeholder="Enter one provider or URL per line, e.g.:&#10;base-provider-1.hypr&#10;wss://base-mainnet.infura.io/v3/your-key&#10;myprovider.os&#10;wss://rpc.example.com"
-                            className={`input resize-vertical min-h-[80px] ${
-                                specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
-                                    ? 'border-red-500 focus:border-red-500'
-                                    : ''
-                            }`}
-                            rows={4}
+                      <div className="ml-6">
+                        <RpcProviderEditor
+                            providers={rpcProviders}
+                            onChange={setRpcProviders}
+                            label="Base L2 RPC Providers"
                         />
-                        <span className={`text-xs ${
-                            customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
-                                ? 'text-red-500'
-                                : 'text-gray-500'
-                        }`}>
-                    {customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0
-                        ? 'At least one Base L2 access provider name is required'
-                        : 'Enter one provider name per line. These nodes will provide access to Base Layer 2 blockchain data.'
-                    }
-                  </span>
                       </div>
                   )}
                 </div>
@@ -310,10 +325,7 @@ function SetPassword({
               <button
                   type="submit"
                   className="button"
-                  disabled={
-                      (specifyCacheSources && customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0) ||
-                      (specifyBaseL2AccessProviders && customBaseL2AccessProviders.split('\n').map(p => p.trim()).filter(p => p.length > 0).length === 0)
-                  }
+                  disabled={hasInvalidCacheSources || hasInvalidRpcProviders}
               >
                 Submit
               </button>
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 9315c1f28..b984ee3bd 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -42,7 +42,7 @@ pub async fn register(
     keyfile: Option<Vec<u8>>,
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
-    initial_cache_sources: Option<Vec<String>>, // <- Add this
+    initial_cache_sources: Option<Vec<String>>,
     initial_base_l2_providers: Option<Vec<String>>,
 ) {
     // Networking info is generated and passed to the UI, but not used until confirmed

From c7cabc853b799d18f72266e4107e81d1e4edc99f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 17:51:54 +0000
Subject: [PATCH 15/27] Format Rust code using rustfmt

---
 hyperdrive/src/eth/mod.rs              |  2 +-
 hyperdrive/src/eth_config_utils.rs     |  9 ++--
 hyperdrive/src/main.rs                 | 57 +++++++++++++++-----------
 hyperdrive/src/options_config_utils.rs | 40 ++++++++++--------
 4 files changed, 65 insertions(+), 43 deletions(-)

diff --git a/hyperdrive/src/eth/mod.rs b/hyperdrive/src/eth/mod.rs
index 8ca85701e..c9835f434 100644
--- a/hyperdrive/src/eth/mod.rs
+++ b/hyperdrive/src/eth/mod.rs
@@ -1466,7 +1466,7 @@ async fn handle_eth_config_action(
             state.home_directory_path.join(".eth_providers"),
             serde_json::to_string(&saved_configs).unwrap(),
         )
-            .await
+        .await
         {
             verbose_print(&state.print_tx, "eth: saved new provider settings").await;
 
diff --git a/hyperdrive/src/eth_config_utils.rs b/hyperdrive/src/eth_config_utils.rs
index 7b79c9127..c6c2e3d90 100644
--- a/hyperdrive/src/eth_config_utils.rs
+++ b/hyperdrive/src/eth_config_utils.rs
@@ -40,8 +40,11 @@ pub fn add_provider_to_config(
 
 /// Extract unauthenticated RPC URLs from SavedConfigs
 /// Similar to update_base_l2_providers_from_saved_configs but just returns the Vec
-pub fn extract_rpc_url_providers_for_default_chain(saved_configs: &lib::eth::SavedConfigs) -> Vec<lib::eth::NodeOrRpcUrl> {
-    saved_configs.0
+pub fn extract_rpc_url_providers_for_default_chain(
+    saved_configs: &lib::eth::SavedConfigs,
+) -> Vec<lib::eth::NodeOrRpcUrl> {
+    saved_configs
+        .0
         .iter()
         .filter_map(|provider_config| {
             // Only include providers for the default chain (8453 for mainnet, 31337 for simulation)
@@ -66,4 +69,4 @@ pub fn extract_rpc_url_providers_for_default_chain(saved_configs: &lib::eth::Sav
             }
         })
         .collect()
-}
\ No newline at end of file
+}
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index b47129cf1..9dd191fcb 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -365,14 +365,18 @@ async fn main() {
 
     if !base_l2_access_source_vector.is_empty() {
         // Process in reverse order so the first entry in the vector becomes highest priority
-        for (_reverse_index, provider_str) in base_l2_access_source_vector.into_iter().rev().enumerate() {
+        for (_reverse_index, provider_str) in
+            base_l2_access_source_vector.into_iter().rev().enumerate()
+        {
             // Parse the JSON string to extract url and auth fields
             match serde_json::from_str::<serde_json::Value>(&provider_str) {
                 Ok(provider_json) => {
                     let url = match provider_json.get("url").and_then(|v| v.as_str()) {
                         Some(u) => u.to_string(),
                         None => {
-                            eprintln!("Skipping provider entry with missing or invalid 'url' field");
+                            eprintln!(
+                                "Skipping provider entry with missing or invalid 'url' field"
+                            );
                             continue;
                         }
                     };
@@ -381,7 +385,9 @@ async fn main() {
                     let auth = match provider_json.get("auth") {
                         Some(auth_value) if !auth_value.is_null() => {
                             // Try to deserialize the auth object into Authorization
-                            match serde_json::from_value::<lib::eth::Authorization>(auth_value.clone()) {
+                            match serde_json::from_value::<lib::eth::Authorization>(
+                                auth_value.clone(),
+                            ) {
                                 Ok(auth_obj) => Some(auth_obj),
                                 Err(e) => {
                                     eprintln!("Failed to parse auth field for {}: {:?}", url, e);
@@ -1052,7 +1058,6 @@ async fn find_public_ip() -> std::net::Ipv4Addr {
 /// if any do not match, we should prompt user to create a "transaction"
 /// that updates their PKI info on-chain.
 
-
 #[cfg(not(feature = "simulation-mode"))]
 async fn serve_register_fe(
     home_directory_path: &Path,
@@ -1074,18 +1079,16 @@ async fn serve_register_fe(
         let data_file_path = initfiles_dir.join("data.txt");
 
         match tokio::fs::read_to_string(&data_file_path).await {
-            Ok(contents) => {
-                match serde_json::from_str::<Vec<String>>(&contents) {
-                    Ok(cache_sources) if !cache_sources.is_empty() => {
-                        println!("Loaded cache sources from data.txt: {:?}\r", cache_sources);
-                        Some(cache_sources)
-                    }
-                    _ => {
-                        println!("Failed to parse data.txt or empty, using default empty list\r");
-                        Some(Vec::new())
-                    }
+            Ok(contents) => match serde_json::from_str::<Vec<String>>(&contents) {
+                Ok(cache_sources) if !cache_sources.is_empty() => {
+                    println!("Loaded cache sources from data.txt: {:?}\r", cache_sources);
+                    Some(cache_sources)
                 }
-            }
+                _ => {
+                    println!("Failed to parse data.txt or empty, using default empty list\r");
+                    Some(Vec::new())
+                }
+            },
             Err(_) => {
                 println!("data.txt not found, using default empty list\r");
                 Some(Vec::new())
@@ -1099,7 +1102,8 @@ async fn serve_register_fe(
         options_config.base_l2_providers
     } else {
         // Extract from eth_provider_config and serialize to JSON strings
-        let rpc_providers = eth_config_utils::extract_rpc_url_providers_for_default_chain(&eth_provider_config);
+        let rpc_providers =
+            eth_config_utils::extract_rpc_url_providers_for_default_chain(&eth_provider_config);
         serialize_rpc_providers_for_ui(rpc_providers)
     };
 
@@ -1123,10 +1127,10 @@ async fn serve_register_fe(
             keyfile,
             eth_provider_config,
             detached,
-            cache_sources_from_file, // Pass cache sources from config
+            cache_sources_from_file,         // Pass cache sources from config
             Some(initial_base_l2_providers), // Pass providers - now properly unwrapped
         )
-            .await;
+        .await;
     });
 
     let (our, decoded_keyfile, encoded_keyfile, cache_sources, base_l2_providers) =
@@ -1289,15 +1293,22 @@ pub fn serialize_rpc_providers_for_ui(providers: Vec<lib::eth::NodeOrRpcUrl>) ->
 }
 
 /// Deserialize RpcUrl provider strings from the UI back to NodeOrRpcUrl objects
-pub fn deserialize_rpc_providers_from_ui(provider_strings: Vec<String>) -> Vec<lib::eth::NodeOrRpcUrl> {
+pub fn deserialize_rpc_providers_from_ui(
+    provider_strings: Vec<String>,
+) -> Vec<lib::eth::NodeOrRpcUrl> {
     provider_strings
         .into_iter()
         .filter_map(|provider_str| {
             // Try to parse as JSON object first
             if let Ok(provider_obj) = serde_json::from_str::<serde_json::Value>(&provider_str) {
                 if let (Some(url), auth) = (
-                    provider_obj.get("url").and_then(|v| v.as_str()).map(String::from),
-                    provider_obj.get("auth").and_then(|v| serde_json::from_value(v.clone()).ok())
+                    provider_obj
+                        .get("url")
+                        .and_then(|v| v.as_str())
+                        .map(String::from),
+                    provider_obj
+                        .get("auth")
+                        .and_then(|v| serde_json::from_value(v.clone()).ok()),
                 ) {
                     return Some(lib::eth::NodeOrRpcUrl::RpcUrl { url, auth });
                 }
@@ -1305,8 +1316,8 @@ pub fn deserialize_rpc_providers_from_ui(provider_strings: Vec<String>) -> Vec<l
             // Fall back to treating it as a plain URL string (for backward compatibility)
             Some(lib::eth::NodeOrRpcUrl::RpcUrl {
                 url: provider_str,
-                auth: None
+                auth: None,
             })
         })
         .collect()
-}
\ No newline at end of file
+}
diff --git a/hyperdrive/src/options_config_utils.rs b/hyperdrive/src/options_config_utils.rs
index b81f86ab6..94faec2e7 100644
--- a/hyperdrive/src/options_config_utils.rs
+++ b/hyperdrive/src/options_config_utils.rs
@@ -1,10 +1,9 @@
-
 use serde::{Deserialize, Serialize};
 use std::path::PathBuf;
 use std::sync::LazyLock;
 
 // Import the types we need from the eth module
-use lib::eth::{SavedConfigs, ProviderConfig, NodeOrRpcUrl};
+use lib::eth::{NodeOrRpcUrl, ProviderConfig, SavedConfigs};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct OptionsConfig {
@@ -38,7 +37,10 @@ static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
 
 /// Initialize the home directory path explicitly (must be called before first use of config functions)
 pub fn initialize_home_directory(home_directory_path: PathBuf) {
-    std::env::set_var("HYPERDRIVE_HOME", home_directory_path.to_string_lossy().to_string());
+    std::env::set_var(
+        "HYPERDRIVE_HOME",
+        home_directory_path.to_string_lossy().to_string(),
+    );
 }
 
 /// Get the configured home directory path
@@ -52,15 +54,13 @@ pub async fn load_options_config() -> OptionsConfig {
     let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
 
     match tokio::fs::read_to_string(&config_path).await {
-        Ok(contents) => {
-            match serde_json::from_str::<OptionsConfig>(&contents) {
-                Ok(config) => config,
-                Err(e) => {
-                    eprintln!("Warning: Failed to parse options config: {}", e);
-                    OptionsConfig::default()
-                }
+        Ok(contents) => match serde_json::from_str::<OptionsConfig>(&contents) {
+            Ok(config) => config,
+            Err(e) => {
+                eprintln!("Warning: Failed to parse options config: {}", e);
+                OptionsConfig::default()
             }
-        }
+        },
         Err(_) => {
             // File doesn't exist, return defaults
             OptionsConfig::default()
@@ -99,7 +99,9 @@ pub async fn update_options_config(
 
 /// Update only the base L2 providers, keeping existing cache sources unchanged.
 /// This loads the current config, updates only the base_l2_providers field, and saves it back.
-pub async fn update_base_l2_providers(new_base_l2_providers: Vec<String>) -> Result<(), std::io::Error> {
+pub async fn update_base_l2_providers(
+    new_base_l2_providers: Vec<String>,
+) -> Result<(), std::io::Error> {
     let mut config = load_options_config().await;
     config.base_l2_providers = new_base_l2_providers;
 
@@ -112,11 +114,14 @@ pub async fn update_base_l2_providers(new_base_l2_providers: Vec<String>) -> Res
 /// This filters the SavedConfigs to find RpcUrl providers that have no auth (None),
 /// extracts their URLs, and saves them as the new base L2 providers.
 /// Keeps existing cache sources unchanged.
-pub async fn update_base_l2_providers_from_saved_configs(saved_configs: &SavedConfigs) -> Result<(), std::io::Error> {
+pub async fn update_base_l2_providers_from_saved_configs(
+    saved_configs: &SavedConfigs,
+) -> Result<(), std::io::Error> {
     let mut config = load_options_config().await;
 
     // Extract URLs from RpcUrl providers that have no authentication
-    let unauthenticated_urls: Vec<String> = saved_configs.0
+    let unauthenticated_urls: Vec<String> = saved_configs
+        .0
         .iter()
         .filter_map(|provider_config| {
             match &provider_config.provider {
@@ -136,7 +141,10 @@ pub async fn update_base_l2_providers_from_saved_configs(saved_configs: &SavedCo
     config.base_l2_providers = unauthenticated_urls;
 
     save_options_config(&config).await?;
-    println!("Base L2 providers updated from SavedConfigs (unauthenticated RPC URLs only) in {}", OPTIONS_CONFIG_FILE);
+    println!(
+        "Base L2 providers updated from SavedConfigs (unauthenticated RPC URLs only) in {}",
+        OPTIONS_CONFIG_FILE
+    );
     Ok(())
 }
 
@@ -170,4 +178,4 @@ pub async fn update_options_config_partial(
     save_options_config(&config).await?;
     println!("Options configuration updated in {}", OPTIONS_CONFIG_FILE);
     Ok(())
-}
\ No newline at end of file
+}

From e091c910299f066eabc2cbfe3e03766e1fd3c47d Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Sun, 5 Oct 2025 14:32:03 -0400
Subject: [PATCH 16/27] remove options_config file and helper code

---
 hyperdrive/src/main.rs                 |  17 +--
 hyperdrive/src/options_config_utils.rs | 181 -------------------------
 2 files changed, 7 insertions(+), 191 deletions(-)
 delete mode 100644 hyperdrive/src/options_config_utils.rs

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 9dd191fcb..e117b911b 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -17,8 +17,8 @@ use tokio::sync::{mpsc, oneshot};
 
 mod eth;
 mod eth_config_utils;
-mod options_config_utils;
-use options_config_utils::*;
+//mod options_config_utils;
+//use options_config_utils::*;
 
 #[cfg(feature = "simulation-mode")]
 mod fakenet;
@@ -94,7 +94,7 @@ async fn main() {
         std::fs::canonicalize(&p).expect(&format!("specified rpc-config path {p} not found"))
     });
 
-    crate::options_config_utils::initialize_home_directory(home_directory_path.to_path_buf());
+    //crate::options_config_utils::initialize_home_directory(home_directory_path.to_path_buf());
 
     // Prevent using both --rpc and --rpc-config flags simultaneously
     if rpc.is_some() && rpc_config.is_some() {
@@ -360,8 +360,8 @@ async fn main() {
 
     is_eth_provider_config_updated = false;
 
-    let cache_source_vector_for_config = cache_source_vector.clone();
-    let base_l2_access_source_vector_for_config = base_l2_access_source_vector.clone();
+    //let cache_source_vector_for_config = cache_source_vector.clone();
+    //let base_l2_access_source_vector_for_config = base_l2_access_source_vector.clone();
 
     if !base_l2_access_source_vector.is_empty() {
         // Process in reverse order so the first entry in the vector becomes highest priority
@@ -1069,7 +1069,7 @@ async fn serve_register_fe(
     detached: bool,
 ) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
     // Load options config to get cache sources
-    let options_config = load_options_config().await;
+    //let options_config = load_options_config().await;
 
     // Read cache sources from data.txt file instead of options_config
     let cache_sources_from_file = {
@@ -1097,10 +1097,7 @@ async fn serve_register_fe(
     };
 
     // Convert RpcUrl providers to serializable format for the registration UI
-    let initial_base_l2_providers = if !options_config.base_l2_providers.is_empty() {
-        // Use providers from options config if available
-        options_config.base_l2_providers
-    } else {
+    let initial_base_l2_providers = {
         // Extract from eth_provider_config and serialize to JSON strings
         let rpc_providers =
             eth_config_utils::extract_rpc_url_providers_for_default_chain(&eth_provider_config);
diff --git a/hyperdrive/src/options_config_utils.rs b/hyperdrive/src/options_config_utils.rs
deleted file mode 100644
index 94faec2e7..000000000
--- a/hyperdrive/src/options_config_utils.rs
+++ /dev/null
@@ -1,181 +0,0 @@
-use serde::{Deserialize, Serialize};
-use std::path::PathBuf;
-use std::sync::LazyLock;
-
-// Import the types we need from the eth module
-use lib::eth::{NodeOrRpcUrl, ProviderConfig, SavedConfigs};
-
-#[derive(Debug, Clone, Serialize, Deserialize)]
-pub struct OptionsConfig {
-    pub cache_sources: Vec<String>,
-    pub base_l2_providers: Vec<String>,
-}
-
-impl Default for OptionsConfig {
-    fn default() -> Self {
-        Self {
-            cache_sources: Vec::new(),
-            base_l2_providers: Vec::new(),
-        }
-    }
-}
-
-const OPTIONS_CONFIG_FILE: &str = ".options_config.json";
-
-/// Global home directory path, initialized once on first access
-static HOME_DIR: LazyLock<PathBuf> = LazyLock::new(|| {
-    // First try environment variable
-    if let Ok(home_path) = std::env::var("HYPERDRIVE_HOME") {
-        return PathBuf::from(home_path);
-    }
-
-    // Fall back to default location in user's home directory
-    dirs::home_dir()
-        .unwrap_or_else(|| PathBuf::from("."))
-        .join(".hyperdrive")
-});
-
-/// Initialize the home directory path explicitly (must be called before first use of config functions)
-pub fn initialize_home_directory(home_directory_path: PathBuf) {
-    std::env::set_var(
-        "HYPERDRIVE_HOME",
-        home_directory_path.to_string_lossy().to_string(),
-    );
-}
-
-/// Get the configured home directory path
-pub fn get_home_directory() -> &'static PathBuf {
-    &HOME_DIR
-}
-
-/// Load the options configuration from the configured home directory.
-/// Returns default config if file doesn't exist or can't be parsed.
-pub async fn load_options_config() -> OptionsConfig {
-    let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
-
-    match tokio::fs::read_to_string(&config_path).await {
-        Ok(contents) => match serde_json::from_str::<OptionsConfig>(&contents) {
-            Ok(config) => config,
-            Err(e) => {
-                eprintln!("Warning: Failed to parse options config: {}", e);
-                OptionsConfig::default()
-            }
-        },
-        Err(_) => {
-            // File doesn't exist, return defaults
-            OptionsConfig::default()
-        }
-    }
-}
-
-/// Save the options configuration to the configured home directory.
-pub async fn save_options_config(config: &OptionsConfig) -> Result<(), std::io::Error> {
-    let config_path = HOME_DIR.join(OPTIONS_CONFIG_FILE);
-
-    // Ensure the directory exists
-    if let Some(parent) = config_path.parent() {
-        tokio::fs::create_dir_all(parent).await?;
-    }
-
-    let contents = serde_json::to_string_pretty(config)?;
-    tokio::fs::write(config_path, contents).await
-}
-
-/// Update the options configuration with new values for both fields.
-/// This is the function that should be called when you want to update both cache sources and base L2 providers.
-pub async fn update_options_config(
-    current_cache_sources: Vec<String>,
-    current_base_l2_providers: Vec<String>,
-) -> Result<(), std::io::Error> {
-    let config = OptionsConfig {
-        cache_sources: current_cache_sources,
-        base_l2_providers: current_base_l2_providers,
-    };
-
-    save_options_config(&config).await?;
-    println!("Options configuration saved to {}", OPTIONS_CONFIG_FILE);
-    Ok(())
-}
-
-/// Update only the base L2 providers, keeping existing cache sources unchanged.
-/// This loads the current config, updates only the base_l2_providers field, and saves it back.
-pub async fn update_base_l2_providers(
-    new_base_l2_providers: Vec<String>,
-) -> Result<(), std::io::Error> {
-    let mut config = load_options_config().await;
-    config.base_l2_providers = new_base_l2_providers;
-
-    save_options_config(&config).await?;
-    println!("Base L2 providers updated in {}", OPTIONS_CONFIG_FILE);
-    Ok(())
-}
-
-/// Update base L2 providers from a SavedConfigs object, extracting only RPC URLs without authentication.
-/// This filters the SavedConfigs to find RpcUrl providers that have no auth (None),
-/// extracts their URLs, and saves them as the new base L2 providers.
-/// Keeps existing cache sources unchanged.
-pub async fn update_base_l2_providers_from_saved_configs(
-    saved_configs: &SavedConfigs,
-) -> Result<(), std::io::Error> {
-    let mut config = load_options_config().await;
-
-    // Extract URLs from RpcUrl providers that have no authentication
-    let unauthenticated_urls: Vec<String> = saved_configs
-        .0
-        .iter()
-        .filter_map(|provider_config| {
-            match &provider_config.provider {
-                NodeOrRpcUrl::RpcUrl { url, auth } => {
-                    // Only include URLs that have no authentication
-                    if auth.is_none() {
-                        Some(url.clone())
-                    } else {
-                        None
-                    }
-                }
-                NodeOrRpcUrl::Node { .. } => None, // Skip node providers
-            }
-        })
-        .collect();
-
-    config.base_l2_providers = unauthenticated_urls;
-
-    save_options_config(&config).await?;
-    println!(
-        "Base L2 providers updated from SavedConfigs (unauthenticated RPC URLs only) in {}",
-        OPTIONS_CONFIG_FILE
-    );
-    Ok(())
-}
-
-/// Update only the cache sources, keeping existing base L2 providers unchanged.
-/// This loads the current config, updates only the cache_sources field, and saves it back.
-pub async fn update_cache_sources(new_cache_sources: Vec<String>) -> Result<(), std::io::Error> {
-    let mut config = load_options_config().await;
-    config.cache_sources = new_cache_sources;
-
-    save_options_config(&config).await?;
-    println!("Cache sources updated in {}", OPTIONS_CONFIG_FILE);
-    Ok(())
-}
-
-/// Update the options configuration with optional values.
-/// Pass None to keep the existing value for that field, or Some(vec) to update it.
-pub async fn update_options_config_partial(
-    cache_sources: Option<Vec<String>>,
-    base_l2_providers: Option<Vec<String>>,
-) -> Result<(), std::io::Error> {
-    let mut config = load_options_config().await;
-
-    if let Some(new_cache_sources) = cache_sources {
-        config.cache_sources = new_cache_sources;
-    }
-
-    if let Some(new_base_l2_providers) = base_l2_providers {
-        config.base_l2_providers = new_base_l2_providers;
-    }
-
-    save_options_config(&config).await?;
-    println!("Options configuration updated in {}", OPTIONS_CONFIG_FILE);
-    Ok(())
-}

From b514bec9e519a260df8437969a4fd5ccf1f4188b Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Sun, 5 Oct 2025 16:40:25 -0400
Subject: [PATCH 17/27] purge options_config, data.txt -> cache_sourcese

---
 .../hns-indexer/hns-indexer/src/lib.rs        | 10 ++---
 .../hypermap-cacher/src/lib.rs                | 32 +++++++--------
 hyperdrive/src/main.rs                        | 41 ++++---------------
 3 files changed, 30 insertions(+), 53 deletions(-)

diff --git a/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs b/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
index ddbe43a38..76cdde67b 100644
--- a/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
+++ b/hyperdrive/packages/hns-indexer/hns-indexer/src/lib.rs
@@ -716,12 +716,12 @@ fn get_nodes() -> Vec<String> {
         // Try to read from initfiles drive
         match vfs::create_drive(our().package_id(), "initfiles", None) {
             Ok(alt_drive_path) => {
-                match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
+                match vfs::open_file(&format!("{}/cache_sources", alt_drive_path), false, None) {
                     Ok(file) => {
                         match file.read() {
                             Ok(contents) => {
                                 let content_str = String::from_utf8_lossy(&contents);
-                                info!("Contents of data.txt: {}", content_str);
+                                info!("Contents of cache_sources: {}", content_str);
 
                                 // Parse the JSON to get the vector of node names
                                 match serde_json::from_str::<Vec<String>>(&content_str) {
@@ -734,17 +734,17 @@ fn get_nodes() -> Vec<String> {
                                         }
                                     }
                                     Err(e) => {
-                                        info!("Failed to parse data.txt as JSON: {}, using defaults", e);
+                                        info!("Failed to parse cache_sources as JSON: {}, using defaults", e);
                                     }
                                 }
                             }
                             Err(e) => {
-                                info!("Failed to read data.txt: {}, using defaults", e);
+                                info!("Failed to read cache_sources: {}, using defaults", e);
                             }
                         }
                     }
                     Err(e) => {
-                        info!("Failed to open data.txt: {}, using defaults", e);
+                        info!("Failed to open cache_sources: {}, using defaults", e);
                     }
                 }
             }
diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index 9395b38cd..bc6f624d3 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -561,13 +561,13 @@ impl State {
         // Create alternate drive for initfiles and read the test data
         let alt_drive_path = vfs::create_drive(our().package_id(), "initfiles", None).unwrap();
 
-        // Try to read the data.txt file from the initfiles drive
-        match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
+        // Try to read the cache_sources file from the initfiles drive
+        match vfs::open_file(&format!("{}/cache_sources", alt_drive_path), false, None) {
             Ok(file) => {
                 match file.read() {
                     Ok(contents) => {
                         let content_str = String::from_utf8_lossy(&contents);
-                        info!("Contents of data.txt: {}", content_str);
+                        info!("Contents of cache_sources: {}", content_str);
 
                         // Parse the JSON to get the vector of node names
                         match serde_json::from_str::<Vec<String>>(&content_str) {
@@ -587,13 +587,13 @@ impl State {
                                 }
                             }
                             Err(e) => {
-                                info!("Failed to parse data.txt as JSON: {}, keeping existing node configuration", e);
+                                info!("Failed to parse cache_sources as JSON: {}, keeping existing node configuration", e);
                             }
                         }
                     }
                     Err(e) => {
                         info!(
-                            "Failed to read data.txt: {}, keeping existing node configuration",
+                            "Failed to read cache_sources: {}, keeping existing node configuration",
                             e
                         );
                     }
@@ -601,7 +601,7 @@ impl State {
             }
             Err(e) => {
                 info!(
-                    "Failed to open data.txt: {}, keeping existing node configuration",
+                    "Failed to open cache_sources: {}, keeping existing node configuration",
                     e
                 );
             }
@@ -742,14 +742,14 @@ impl State {
         Err(anyhow::anyhow!("Failed to bootstrap from any node"))
     }
 
-    // Helper function to write nodes to data.txt file
+    // Helper function to write nodes to cache_sources file
     fn write_nodes_to_file(&self) -> anyhow::Result<()> {
         info!("Beginning of subroutine");
         let alt_drive_path = vfs::create_drive(our().package_id(), "initfiles", None)?;
         info!("drive path defined");
         let nodes_json = serde_json::to_string(&self.nodes)?;
         info!("nodes_json defined");
-        let file_path = format!("{}/data.txt", alt_drive_path);
+        let file_path = format!("{}/cache_sources", alt_drive_path);
         info!("file_path defined");
 
         // Open file in write mode which should truncate, but to be safe we'll write exact bytes
@@ -765,7 +765,7 @@ impl State {
         // This ensures any old content beyond this point is truncated
         file.set_len(bytes.len() as u64)?;
 
-        info!("Updated data.txt with {} nodes", self.nodes.len());
+        info!("Updated cache_sources with {} nodes", self.nodes.len());
         Ok(())
     }
 
@@ -1267,7 +1267,7 @@ fn handle_request(
             state.save();
             info!("Nodes have been saved to state");
             if let Err(e) = state.write_nodes_to_file() {
-                error!("Failed to write nodes to data.txt: {:?}", e);
+                error!("Failed to write nodes to cache_sources: {:?}", e);
             }
             info!("If statement complete");
             info!("Nodes updated to: {:?}", state.nodes);
@@ -1297,7 +1297,7 @@ fn handle_request(
                 state.nodes = nodes;
                 state.save();
                 if let Err(e) = state.write_nodes_to_file() {
-                    error!("Failed to write nodes to data.txt: {:?}", e);
+                    error!("Failed to write nodes to cache_sources: {:?}", e);
                 }
                 info!(
                     "Hypermap-cacher reset complete. New nodes: {:?}",
@@ -1429,19 +1429,19 @@ fn init(our: Address) {
     // Create alternate drive for initfiles and read the test data
     let alt_drive_path = vfs::create_drive(our.package_id(), "initfiles", None).unwrap();
 
-    // Try to read the data.txt file from the initfiles drive
-    match vfs::open_file(&format!("{}/data.txt", alt_drive_path), false, None) {
+    // Try to read the cache_sources file from the initfiles drive
+    match vfs::open_file(&format!("{}/cache_sources", alt_drive_path), false, None) {
         Ok(file) => match file.read() {
             Ok(contents) => {
                 let content_str = String::from_utf8_lossy(&contents);
-                info!("Contents of data.txt: {}", content_str);
+                info!("Contents of cache_sources: {}", content_str);
             }
             Err(e) => {
-                info!("Failed to read data.txt: {}", e);
+                info!("Failed to read cache_sources: {}", e);
             }
         },
         Err(e) => {
-            info!("Failed to open data.txt: {}", e);
+            info!("Failed to open cache_sources: {}", e);
         }
     }
 
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index e117b911b..cf7b33f51 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -17,8 +17,6 @@ use tokio::sync::{mpsc, oneshot};
 
 mod eth;
 mod eth_config_utils;
-//mod options_config_utils;
-//use options_config_utils::*;
 
 #[cfg(feature = "simulation-mode")]
 mod fakenet;
@@ -94,8 +92,6 @@ async fn main() {
         std::fs::canonicalize(&p).expect(&format!("specified rpc-config path {p} not found"))
     });
 
-    //crate::options_config_utils::initialize_home_directory(home_directory_path.to_path_buf());
-
     // Prevent using both --rpc and --rpc-config flags simultaneously
     if rpc.is_some() && rpc_config.is_some() {
         panic!("Cannot use both --rpc and --rpc-config flags simultaneously. Please use either --rpc for a single RPC URL or --rpc-config for multiple URLs and/or advanced configs (e.g., auth), but not both.");
@@ -424,22 +420,6 @@ async fn main() {
         .expect("failed to save new eth provider config!");
     }
 
-    /* TODO CLEANUP
-    // Save the cache sources and Base L2 providers configuration
-    if !cache_source_vector_for_config.is_empty()
-        || !base_l2_access_source_vector_for_config.is_empty()
-    {
-        let options_config = OptionsConfig {
-            cache_sources: cache_source_vector_for_config,
-            base_l2_providers: base_l2_access_source_vector_for_config,
-        };
-
-        save_options_config(&options_config)
-            .await
-            .expect("failed to save options config!");
-    }
-    */
-
     // the boolean flag determines whether the runtime module is *public* or not,
     // where public means that any process can always message it.
     #[allow(unused_mut)]
@@ -544,10 +524,10 @@ async fn main() {
         println!("✓ Created directory structure: {}", initfiles_dir.display());
     }
 
-    // Create the data.txt file with test content
-    let data_file_path = initfiles_dir.join("data.txt");
+    // Create the cache_sources file with test content
+    let data_file_path = initfiles_dir.join("cache_sources");
 
-    // Write cache_source_vector to data.txt as JSON
+    // Write cache_source_vector to cache_sources as JSON
     let cache_json = serde_json::to_string_pretty(&cache_source_vector)
         .expect("Failed to serialize cache_source_vector to JSON");
     let cache_json_clone = cache_json.clone();
@@ -576,8 +556,8 @@ async fn main() {
         );
     }
 
-    // Create the data.txt file in the second location
-    let hns_data_file_path = hns_initfiles_dir.join("data.txt");
+    // Create the cache_sources file in the second location
+    let hns_data_file_path = hns_initfiles_dir.join("cache_sources");
 
     if let Err(e) = tokio::fs::write(&hns_data_file_path, cache_json_clone).await {
         eprintln!("Warning: Failed to write cache data to second file: {}", e);
@@ -1068,29 +1048,26 @@ async fn serve_register_fe(
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
 ) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
-    // Load options config to get cache sources
-    //let options_config = load_options_config().await;
 
-    // Read cache sources from data.txt file instead of options_config
     let cache_sources_from_file = {
         let vfs_dir = home_directory_path.join("vfs");
         let hypermap_cacher_dir = vfs_dir.join("hypermap-cacher:sys");
         let initfiles_dir = hypermap_cacher_dir.join("initfiles");
-        let data_file_path = initfiles_dir.join("data.txt");
+        let data_file_path = initfiles_dir.join("cache_sources");
 
         match tokio::fs::read_to_string(&data_file_path).await {
             Ok(contents) => match serde_json::from_str::<Vec<String>>(&contents) {
                 Ok(cache_sources) if !cache_sources.is_empty() => {
-                    println!("Loaded cache sources from data.txt: {:?}\r", cache_sources);
+                    println!("Loaded cache sources from cache_sources: {:?}\r", cache_sources);
                     Some(cache_sources)
                 }
                 _ => {
-                    println!("Failed to parse data.txt or empty, using default empty list\r");
+                    println!("Failed to parse cache_sources or empty, using default empty list\r");
                     Some(Vec::new())
                 }
             },
             Err(_) => {
-                println!("data.txt not found, using default empty list\r");
+                println!("cache_sources not found, using default empty list\r");
                 Some(Vec::new())
             }
         }

From 1708d53941736a2e4960b6992389ea4cd2de9f13 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Sun, 5 Oct 2025 18:21:47 -0400
Subject: [PATCH 18/27] front end validations

---
 hyperdrive/src/main.rs                        |   2 -
 .../register-ui/src/pages/CommitDotOsName.tsx |  85 +++-
 .../src/register-ui/src/pages/Login.tsx       | 125 ++++-
 .../src/register-ui/src/pages/MintCustom.tsx  | 111 +++-
 .../src/register-ui/src/pages/ResetName.tsx   | 480 ++++++++++--------
 .../src/register-ui/src/pages/SetPassword.tsx | 125 ++++-
 6 files changed, 612 insertions(+), 316 deletions(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index cf7b33f51..a72bdca9c 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -1242,8 +1242,6 @@ fn make_remote_link(url: &str, text: &str) -> String {
     format!("\x1B]8;;{}\x1B\\{}\x1B]8;;\x1B\\", url, text)
 }
 
-// ... existing code ...
-
 /// Serialize RpcUrl providers to JSON strings for the UI
 /// Each provider is serialized as a JSON object containing url and auth
 pub fn serialize_rpc_providers_for_ui(providers: Vec<lib::eth::NodeOrRpcUrl>) -> Vec<String> {
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index bb0aa96df..5ada9e778 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -7,7 +7,6 @@ import { PageProps } from "../lib/types";
 
 import DirectNodeCheckbox from "../components/DirectCheckbox";
 import SpecifyRoutersCheckbox from "../components/SpecifyRoutersCheckbox";
-import { Tooltip } from "../components/Tooltip";
 
 import { useAccount, useWaitForTransactionReceipt, useWriteContract } from "wagmi";
 import { useConnectModal, useAddRecentTransaction } from "@rainbow-me/rainbowkit"
@@ -17,6 +16,9 @@ import { base } from 'viem/chains'
 import BackButton from "../components/BackButton";
 interface RegisterOsNameProps extends PageProps { }
 
+// Regex for valid router names (domain format)
+const ROUTER_NAME_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
+
 function CommitDotOsName({
                              direct,
                              setDirect,
@@ -50,6 +52,7 @@ function CommitDotOsName({
     const [isConfirmed, setIsConfirmed] = useState(false)
     const [specifyRouters, setSpecifyRouters] = useState(false)
     const [customRouters, setCustomRouters] = useState('')
+    const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
     // Modified setDirect function to handle mutual exclusivity
     const handleSetDirect = (value: boolean) => {
@@ -57,6 +60,7 @@ function CommitDotOsName({
         if (value) {
             setSpecifyRouters(false);
             setCustomRouters(''); // Clear custom routers when switching to direct
+            setRouterValidationErrors([]);
         }
     };
 
@@ -67,6 +71,37 @@ function CommitDotOsName({
             setDirect(false);
         } else {
             setCustomRouters(''); // Clear custom routers when unchecking
+            setRouterValidationErrors([]);
+        }
+    };
+
+    // Validate custom routers against the regex
+    const validateRouters = (routersText: string): string[] => {
+        if (!routersText.trim()) return [];
+
+        const routers = routersText
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0);
+
+        const errors: string[] = [];
+        routers.forEach((router, index) => {
+            if (!ROUTER_NAME_REGEX.test(router)) {
+                errors.push(`Line ${index + 1}: "${router}" is not a valid router name`);
+            }
+        });
+
+        return errors;
+    };
+
+    // Handle custom routers change with validation
+    const handleCustomRoutersChange = (value: string) => {
+        setCustomRouters(value);
+        if (specifyRouters && value.trim()) {
+            const errors = validateRouters(value);
+            setRouterValidationErrors(errors);
+        } else {
+            setRouterValidationErrors([]);
         }
     };
 
@@ -76,16 +111,15 @@ function CommitDotOsName({
         return customRouters
             .split('\n')
             .map(router => router.trim())
-            .filter(router => router.length > 0);
+            .filter(router => router.length > 0 && ROUTER_NAME_REGEX.test(router));
     };
 
     const isCustomRoutersValid = () => {
         if (!specifyRouters) return true; // Not required if checkbox is unchecked
-        return getValidCustomRouters().length > 0;
+        const validRouters = getValidCustomRouters();
+        return validRouters.length > 0 && routerValidationErrors.length === 0;
     };
 
-
-
     useEffect(() => {
         document.title = "Register"
     }, [])
@@ -111,10 +145,7 @@ function CommitDotOsName({
         console.log("committing to .os name: ", name)
 
         if (specifyRouters && customRouters.trim()) {
-            const routersToUse = customRouters
-                .split('\n')
-                .map(router => router.trim())
-                .filter(router => router.length > 0);
+            const routersToUse = getValidCustomRouters();
 
             // Update the routers in your app state for the next page to use
             setRouters(routersToUse);
@@ -167,13 +198,10 @@ function CommitDotOsName({
                 setHnsName(`${name}.os`);
 
                 if (specifyRouters && customRouters.trim()) {
-                    const routersToUse = customRouters
-                        .split('\n')
-                        .map(router => router.trim())
-                        .filter(router => router.length > 0);
+                    const routersToUse = getValidCustomRouters();
                     setRouters(routersToUse);
                 }
-                    navigate("/mint-os-name");
+                navigate("/mint-os-name");
             }, 16000)
         }
     }, [txConfirmed, address, name, setHnsName, navigate, specifyRouters, customRouters, setRouters]);
@@ -211,7 +239,7 @@ function CommitDotOsName({
                                                 <textarea
                                                     id="custom-routers"
                                                     value={customRouters}
-                                                    onChange={(e) => setCustomRouters(e.target.value)}
+                                                    onChange={(e) => handleCustomRoutersChange(e.target.value)}
                                                     placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
                                                     className={`input resize-vertical min-h-[80px] ${
                                                         specifyRouters && !isCustomRoutersValid()
@@ -220,14 +248,23 @@ function CommitDotOsName({
                                                     }`}
                                                     rows={4}
                                                 />
-                                                <span className={`text-xs ${
-                                                    !isCustomRoutersValid() ? 'text-red-500' : 'text-gray-500'
-                                                }`}>
-                                                    {!isCustomRoutersValid()
-                                                        ? 'At least one router name is required'
-                                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
-                                                    }
-                                                </span>
+                                                {routerValidationErrors.length > 0 ? (
+                                                    <div className="text-xs text-red-500">
+                                                        {routerValidationErrors.map((error, idx) => (
+                                                            <div key={idx}>{error}</div>
+                                                        ))}
+                                                        <div className="mt-1">Router names must contain only lowercase letters, numbers, hyphens (not at start/end), and dots.</div>
+                                                    </div>
+                                                ) : (
+                                                    <span className={`text-xs ${
+                                                        !isCustomRoutersValid() ? 'text-red-500' : 'text-gray-500'
+                                                    }`}>
+                                                        {!isCustomRoutersValid()
+                                                            ? 'At least one valid router name is required'
+                                                            : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                                        }
+                                                    </span>
+                                                )}
                                             </div>
                                         )}
                                     </div>
@@ -238,7 +275,7 @@ function CommitDotOsName({
                                         disabled={nameValidities.length !== 0 ||
                                             isPending ||
                                             isConfirming ||
-                                            (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
+                                            (specifyRouters && !isCustomRoutersValid())
                                         }
                                         type="submit"
                                         className="button"
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index 6b4999615..ce1df8b87 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -10,6 +10,15 @@ import { RpcProviderEditor, RpcProviderData } from "../components/RpcProviderEdi
 
 interface LoginProps extends PageProps { }
 
+// Regex for valid cache source names (domain format)
+const CACHE_SOURCE_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
+
+// Validate that URL is a secure WebSocket URL
+const validateWebSocketUrl = (url: string): boolean => {
+  if (!url.trim()) return false;
+  return url.startsWith('wss://');
+};
+
 function Login({
                  pw,
                  setPw,
@@ -27,6 +36,7 @@ function Login({
   // Advanced options state - cache sources and Base L2 access providers
   const [specifyCacheSources, setSpecifyCacheSources] = useState(false);
   const [customCacheSources, setCustomCacheSources] = useState('');
+  const [cacheSourceValidationErrors, setCacheSourceValidationErrors] = useState<string[]>([]);
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
   const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
 
@@ -87,6 +97,60 @@ function Login({
     })();
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
+  // Modified setSpecifyCacheSources function to handle clearing
+  const handleSetSpecifyCacheSources = (value: boolean) => {
+    setSpecifyCacheSources(value);
+    if (!value) {
+      setCustomCacheSources('');
+      setCacheSourceValidationErrors([]);
+    }
+  };
+
+  // Validate custom cache sources against the regex
+  const validateCacheSources = (sourcesText: string): string[] => {
+    if (!sourcesText.trim()) return [];
+
+    const sources = sourcesText
+        .split('\n')
+        .map(source => source.trim())
+        .filter(source => source.length > 0);
+
+    const errors: string[] = [];
+    sources.forEach((source, index) => {
+      if (!CACHE_SOURCE_REGEX.test(source)) {
+        errors.push(`Line ${index + 1}: "${source}" is not a valid cache source name`);
+      }
+    });
+
+    return errors;
+  };
+
+  // Handle custom cache sources change with validation
+  const handleCustomCacheSourcesChange = (value: string) => {
+    setCustomCacheSources(value);
+    if (specifyCacheSources && value.trim()) {
+      const errors = validateCacheSources(value);
+      setCacheSourceValidationErrors(errors);
+    } else {
+      setCacheSourceValidationErrors([]);
+    }
+  };
+
+  // Add a validation function for custom cache sources
+  const getValidCustomCacheSources = () => {
+    if (!specifyCacheSources) return [];
+    return customCacheSources
+        .split('\n')
+        .map(source => source.trim())
+        .filter(source => source.length > 0 && CACHE_SOURCE_REGEX.test(source));
+  };
+
+  const isCustomCacheSourcesValid = () => {
+    if (!specifyCacheSources) return true; // Not required if checkbox is unchecked
+    const validSources = getValidCustomCacheSources();
+    return validSources.length > 0 && cacheSourceValidationErrors.length === 0;
+  };
+
   const handleLogin = useCallback(
       async (e?: FormEvent) => {
         e?.preventDefault();
@@ -97,11 +161,7 @@ function Login({
           // Process custom cache sources if specified
           let cacheSourcesToUse: string[] | undefined = undefined;
           if (specifyCacheSources && customCacheSources.trim()) {
-            cacheSourcesToUse = customCacheSources
-                .split('\n')
-                .map(source => source.trim())
-                .filter(source => source.length > 0);
-
+            cacheSourcesToUse = getValidCustomCacheSources();
             console.log("Custom cache sources:", cacheSourcesToUse);
           }
 
@@ -109,12 +169,10 @@ function Login({
           let baseL2AccessProvidersToUse: string[] | undefined = undefined;
           if (specifyBaseL2AccessProviders && rpcProviders.length > 0) {
             baseL2AccessProvidersToUse = rpcProviders.map(provider => {
-              let authObj = null;
-              if (provider.auth) {
-                authObj = {
-                  [provider.auth.type]: provider.auth.value
-                };
-              }
+              const authObj: Record<string, string> | null = provider.auth ? {
+                [provider.auth.type]: provider.auth.value
+              } : null;
+
               return JSON.stringify({
                 url: provider.url,
                 auth: authObj
@@ -179,12 +237,9 @@ function Login({
   // Validation for the submit button
   const hasInvalidRpcProviders = specifyBaseL2AccessProviders && (
       rpcProviders.length === 0 ||
-      rpcProviders.some(p => !p.url.trim() || (p.auth && !p.auth.value.trim()))
+      rpcProviders.some(p => !p.url.trim() || !validateWebSocketUrl(p.url) || (p.auth && !p.auth.value.trim()))
   );
 
-  const hasInvalidCacheSources = specifyCacheSources &&
-      customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0;
-
   return <div className="relative flex flex-col gap-2 items-stretch self-stretch">
     {loading && <div className="absolute top-0 left-0 w-full h-full flex place-content-center place-items-center">
       <Loader msg={loading} className="text-black dark:text-white" />
@@ -221,7 +276,7 @@ function Login({
         <div className="flex flex-col gap-3">
           <SpecifyCacheSourcesCheckbox
               specifyCacheSources={specifyCacheSources}
-              setSpecifyCacheSources={setSpecifyCacheSources}
+              setSpecifyCacheSources={handleSetSpecifyCacheSources}
           />
           {specifyCacheSources && (
               <div className="flex flex-col gap-2 ml-6">
@@ -231,17 +286,32 @@ function Login({
                 <textarea
                     id="custom-cache-sources-login"
                     value={customCacheSources}
-                    onChange={(e) => setCustomCacheSources(e.target.value)}
+                    onChange={(e) => handleCustomCacheSourcesChange(e.target.value)}
                     placeholder="Enter one cache source name per line, e.g.:&#10;cache-node-1.hypr&#10;other-cache.hypr&#10;mycache.os"
-                    className={`input resize-vertical min-h-[80px] ${hasInvalidCacheSources ? 'border-red-500 focus:border-red-500' : ''}`}
+                    className={`input resize-vertical min-h-[80px] ${
+                        specifyCacheSources && !isCustomCacheSourcesValid()
+                            ? 'border-red-500 focus:border-red-500'
+                            : ''
+                    }`}
                     rows={4}
                 />
-                <span className={`text-xs ${hasInvalidCacheSources ? 'text-red-500' : 'text-gray-500'}`}>
-                    {hasInvalidCacheSources
-                        ? 'At least one cache source name is required'
-                        : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
-                    }
-                  </span>
+                {cacheSourceValidationErrors.length > 0 ? (
+                    <div className="text-xs text-red-500">
+                      {cacheSourceValidationErrors.map((error, idx) => (
+                          <div key={idx}>{error}</div>
+                      ))}
+                      <div className="mt-1">Cache source names must contain only lowercase letters, numbers, hyphens (not at start/end), and dots.</div>
+                    </div>
+                ) : (
+                    <span className={`text-xs ${
+                        !isCustomCacheSourcesValid() ? 'text-red-500' : 'text-gray-500'
+                    }`}>
+                      {!isCustomCacheSourcesValid()
+                          ? 'At least one valid cache source name is required'
+                          : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
+                      }
+                    </span>
+                )}
               </div>
           )}
 
@@ -256,6 +326,11 @@ function Login({
                     onChange={setRpcProviders}
                     label="Base L2 RPC Providers"
                 />
+                {hasInvalidRpcProviders && (
+                    <div className="text-xs text-red-500 mt-2">
+                      All RPC provider URLs must be secure WebSocket URLs starting with wss://
+                    </div>
+                )}
               </div>
           )}
         </div>
@@ -271,7 +346,7 @@ function Login({
 
       <button
           type="submit"
-          disabled={hasInvalidCacheSources || hasInvalidRpcProviders}
+          disabled={specifyCacheSources && !isCustomCacheSourcesValid() || hasInvalidRpcProviders}
       >Log in</button>
 
       <button
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index d3ba0875c..dd3407bb5 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -13,17 +13,20 @@ import { encodePacked, encodeFunctionData, stringToHex } from "viem";
 import BackButton from "../components/BackButton";
 interface MintCustomNameProps extends PageProps { }
 
+// Regex for valid router names (domain format)
+const ROUTER_NAME_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
+
 function MintCustom({
-    direct,
-    setDirect,
-    hnsName,
-    setHnsName,
-    setNetworkingKey,
-    setIpAddress,
-    setWsPort,
-    setTcpPort,
-    setRouters,
-}: MintCustomNameProps) {
+                        direct,
+                        setDirect,
+                        hnsName,
+                        setHnsName,
+                        setNetworkingKey,
+                        setIpAddress,
+                        setWsPort,
+                        setTcpPort,
+                        setRouters,
+                    }: MintCustomNameProps) {
     let { address } = useAccount();
     let navigate = useNavigate();
     let { openConnectModal } = useConnectModal();
@@ -44,6 +47,7 @@ function MintCustom({
     const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false)
     const [specifyRouters, setSpecifyRouters] = useState(false)
     const [customRouters, setCustomRouters] = useState('')
+    const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
     // Modified setDirect function to handle mutual exclusivity
     const handleSetDirect = (value: boolean) => {
@@ -51,6 +55,7 @@ function MintCustom({
         if (value) {
             setSpecifyRouters(false);
             setCustomRouters(''); // Clear custom routers when switching to direct
+            setRouterValidationErrors([]);
         }
     };
 
@@ -61,9 +66,55 @@ function MintCustom({
             setDirect(false);
         } else {
             setCustomRouters(''); // Clear custom routers when unchecking
+            setRouterValidationErrors([]);
+        }
+    };
+
+    // Validate custom routers against the regex
+    const validateRouters = (routersText: string): string[] => {
+        if (!routersText.trim()) return [];
+
+        const routers = routersText
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0);
+
+        const errors: string[] = [];
+        routers.forEach((router, index) => {
+            if (!ROUTER_NAME_REGEX.test(router)) {
+                errors.push(`Line ${index + 1}: "${router}" is not a valid router name`);
+            }
+        });
+
+        return errors;
+    };
+
+    // Handle custom routers change with validation
+    const handleCustomRoutersChange = (value: string) => {
+        setCustomRouters(value);
+        if (specifyRouters && value.trim()) {
+            const errors = validateRouters(value);
+            setRouterValidationErrors(errors);
+        } else {
+            setRouterValidationErrors([]);
         }
     };
 
+    // Add a validation function for custom routers
+    const getValidCustomRouters = () => {
+        if (!specifyRouters) return [];
+        return customRouters
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0 && ROUTER_NAME_REGEX.test(router));
+    };
+
+    const isCustomRoutersValid = () => {
+        if (!specifyRouters) return true; // Not required if checkbox is unchecked
+        const validRouters = getValidCustomRouters();
+        return validRouters.length > 0 && routerValidationErrors.length === 0;
+    };
+
     useEffect(() => {
         document.title = "Mint"
     }, [])
@@ -90,10 +141,7 @@ function MintCustom({
         // Process custom routers if specified
         let routersToUse: string[] = [];
         if (specifyRouters && customRouters.trim()) {
-            routersToUse = customRouters
-                .split('\n')
-                .map(router => router.trim())
-                .filter(router => router.length > 0);
+            routersToUse = getValidCustomRouters();
 
             // Update the routers in your app state
             setRouters(routersToUse);
@@ -181,25 +229,32 @@ function MintCustom({
                                                 <textarea
                                                     id="custom-routers-mint"
                                                     value={customRouters}
-                                                    onChange={(e) => setCustomRouters(e.target.value)}
+                                                    onChange={(e) => handleCustomRoutersChange(e.target.value)}
                                                     placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
                                                     className={`input resize-vertical min-h-[80px] ${
-                                                        specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
+                                                        specifyRouters && !isCustomRoutersValid()
                                                             ? 'border-red-500 focus:border-red-500'
                                                             : ''
                                                     }`}
                                                     rows={4}
                                                 />
-                                                <span className={`text-xs ${
-                                                    customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                                        ? 'text-red-500'
-                                                        : 'text-gray-500'
-                                                }`}>
-                                                    {customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                                        ? 'At least one router name is required'
-                                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
-                                                    }
-                                                </span>
+                                                {routerValidationErrors.length > 0 ? (
+                                                    <div className="text-xs text-red-500">
+                                                        {routerValidationErrors.map((error, idx) => (
+                                                            <div key={idx}>{error}</div>
+                                                        ))}
+                                                        <div className="mt-1">Router names must contain only lowercase letters, numbers, hyphens (not at start/end), and dots.</div>
+                                                    </div>
+                                                ) : (
+                                                    <span className={`text-xs ${
+                                                        !isCustomRoutersValid() ? 'text-red-500' : 'text-gray-500'
+                                                    }`}>
+                                                        {!isCustomRoutersValid()
+                                                            ? 'At least one valid router name is required'
+                                                            : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                                        }
+                                                    </span>
+                                                )}
                                             </div>
                                         )}
                                     </div>
@@ -212,7 +267,7 @@ function MintCustom({
                                             isPending ||
                                             isConfirming ||
                                             !hnsName ||
-                                            (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
+                                            (specifyRouters && !isCustomRoutersValid())
                                         }>
                                         Mint custom name
                                     </button>
@@ -233,4 +288,4 @@ function MintCustom({
     );
 }
 
-export default MintCustom;
+export default MintCustom;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index 5d2fc0696..7490d5482 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -1,8 +1,8 @@
 import {
-  FormEvent,
-  useCallback,
-  useEffect,
-  useState,
+    FormEvent,
+    useCallback,
+    useEffect,
+    useState,
 } from "react";
 import { useNavigate } from "react-router-dom";
 import Loader from "../components/Loader";
@@ -18,239 +18,295 @@ import BackButton from "../components/BackButton";
 
 interface ResetProps extends PageProps { }
 
+// Regex for valid router names (domain format)
+const ROUTER_NAME_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
+
 function ResetHnsName({
-                        direct,
-                        setDirect,
-                        setReset,
-                        hnsName,
-                        setHnsName,
-                        setNetworkingKey,
-                        setIpAddress,
-                        setWsPort,
-                        setTcpPort,
-                        setRouters,
+                          direct,
+                          setDirect,
+                          setReset,
+                          hnsName,
+                          setHnsName,
+                          setNetworkingKey,
+                          setIpAddress,
+                          setWsPort,
+                          setTcpPort,
+                          setRouters,
                       }: ResetProps) {
-  const { address } = useAccount();
-  const navigate = useNavigate();
-  const { openConnectModal } = useConnectModal();
+    const { address } = useAccount();
+    const navigate = useNavigate();
+    const { openConnectModal } = useConnectModal();
+
+    const { data: hash, writeContract, isPending, isError, error } = useWriteContract({
+        mutation: {
+            onSuccess: (data) => {
+                addRecentTransaction({ hash: data, description: `Reset HNS ID: ${name}` });
+            }
+        }
+    });
+    const { isLoading: isConfirming, isSuccess: isConfirmed } =
+        useWaitForTransactionReceipt({
+            hash,
+        });
+    const addRecentTransaction = useAddRecentTransaction();
+
+    const [name, setName] = useState<string>(hnsName);
+    const [nameValidities, setNameValidities] = useState<string[]>([])
+    const [tba, setTba] = useState<string>("");
+    const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false);
+    const [specifyRouters, setSpecifyRouters] = useState(false)
+    const [customRouters, setCustomRouters] = useState('')
+    const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
-  const { data: hash, writeContract, isPending, isError, error } = useWriteContract({
-    mutation: {
-      onSuccess: (data) => {
-        addRecentTransaction({ hash: data, description: `Reset HNS ID: ${name}` });
-      }
-    }
-  });
-  const { isLoading: isConfirming, isSuccess: isConfirmed } =
-      useWaitForTransactionReceipt({
-        hash,
-      });
-  const addRecentTransaction = useAddRecentTransaction();
+    // Modified setDirect function to handle mutual exclusivity
+    const handleSetDirect = (value: boolean) => {
+        setDirect(value);
+        if (value) {
+            setSpecifyRouters(false);
+            setCustomRouters(''); // Clear custom routers when switching to direct
+            setRouterValidationErrors([]);
+        }
+    };
 
-  const [name, setName] = useState<string>(hnsName);
-  const [nameValidities, setNameValidities] = useState<string[]>([])
-  const [tba, setTba] = useState<string>("");
-  const [triggerNameCheck, setTriggerNameCheck] = useState<boolean>(false);
-  const [specifyRouters, setSpecifyRouters] = useState(false)
-  const [customRouters, setCustomRouters] = useState('')
+    // Modified setSpecifyRouters function to handle mutual exclusivity
+    const handleSetSpecifyRouters = (value: boolean) => {
+        setSpecifyRouters(value);
+        if (value) {
+            setDirect(false);
+        } else {
+            setCustomRouters(''); // Clear custom routers when unchecking
+            setRouterValidationErrors([]);
+        }
+    };
 
-  // Modified setDirect function to handle mutual exclusivity
-  const handleSetDirect = (value: boolean) => {
-    setDirect(value);
-    if (value) {
-      setSpecifyRouters(false);
-      setCustomRouters(''); // Clear custom routers when switching to direct
-    }
-  };
+    // Validate custom routers against the regex
+    const validateRouters = (routersText: string): string[] => {
+        if (!routersText.trim()) return [];
 
-  // Modified setSpecifyRouters function to handle mutual exclusivity
-  const handleSetSpecifyRouters = (value: boolean) => {
-    setSpecifyRouters(value);
-    if (value) {
-      setDirect(false);
-    } else {
-      setCustomRouters(''); // Clear custom routers when unchecking
-    }
-  };
+        const routers = routersText
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0);
 
-  useEffect(() => {
-    document.title = "Reset";
+        const errors: string[] = [];
+        routers.forEach((router, index) => {
+            if (!ROUTER_NAME_REGEX.test(router)) {
+                errors.push(`Line ${index + 1}: "${router}" is not a valid router name`);
+            }
+        });
 
-    // Fetch current node info and prepopulate routers if indirect node
-    (async () => {
-      try {
-        const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
-            res.json()
-        )) as UnencryptedIdentity;
+        return errors;
+    };
 
-        // Prepopulate customRouters if this is an indirect node with existing routers
-        if (infoData.allowed_routers && infoData.allowed_routers.length > 0) {
-          const routersText = infoData.allowed_routers.join('\n');
-          setCustomRouters(routersText);
-          setSpecifyRouters(true); // Auto-enable the checkbox
-          setDirect(false); // Ensure direct is false for indirect nodes
+    // Handle custom routers change with validation
+    const handleCustomRoutersChange = (value: string) => {
+        setCustomRouters(value);
+        if (specifyRouters && value.trim()) {
+            const errors = validateRouters(value);
+            setRouterValidationErrors(errors);
+        } else {
+            setRouterValidationErrors([]);
         }
-      } catch (error) {
-        console.log("Could not fetch node info:", error);
-      }
-    })();
-  }, []);
+    };
+
+    // Add a validation function for custom routers
+    const getValidCustomRouters = () => {
+        if (!specifyRouters) return [];
+        return customRouters
+            .split('\n')
+            .map(router => router.trim())
+            .filter(router => router.length > 0 && ROUTER_NAME_REGEX.test(router));
+    };
+
+    const isCustomRoutersValid = () => {
+        if (!specifyRouters) return true; // Not required if checkbox is unchecked
+        const validRouters = getValidCustomRouters();
+        return validRouters.length > 0 && routerValidationErrors.length === 0;
+    };
 
-  // so inputs will validate once wallet is connected
-  useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address]); // eslint-disable-line react-hooks/exhaustive-deps
+    useEffect(() => {
+        document.title = "Reset";
 
-  useEffect(() => {
-    if (!address) {
-      openConnectModal?.();
-    }
-  }, [address, openConnectModal]);
+        // Fetch current node info and prepopulate routers if indirect node
+        (async () => {
+            try {
+                const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
+                    res.json()
+                )) as UnencryptedIdentity;
 
-  const handleResetRecords = useCallback(
-      async (e: FormEvent) => {
-        e.preventDefault();
-        e.stopPropagation();
+                // Prepopulate customRouters if this is an indirect node with existing routers
+                if (infoData.allowed_routers && infoData.allowed_routers.length > 0) {
+                    const routersText = infoData.allowed_routers.join('\n');
+                    setCustomRouters(routersText);
+                    setSpecifyRouters(true); // Auto-enable the checkbox
+                    setDirect(false); // Ensure direct is false for indirect nodes
+                }
+            } catch (error) {
+                console.log("Could not fetch node info:", error);
+            }
+        })();
+    }, []);
 
+    // so inputs will validate once wallet is connected
+    useEffect(() => setTriggerNameCheck(!triggerNameCheck), [address]); // eslint-disable-line react-hooks/exhaustive-deps
+
+    useEffect(() => {
         if (!address) {
-          openConnectModal?.();
-          return;
+            openConnectModal?.();
         }
+    }, [address, openConnectModal]);
 
-        setHnsName(name);
-        // Process custom routers if specified
-        let routersToUse: string[] = [];
-        if (specifyRouters && customRouters.trim()) {
-          routersToUse = customRouters
-              .split('\n')
-              .map(router => router.trim())
-              .filter(router => router.length > 0);
+    const handleResetRecords = useCallback(
+        async (e: FormEvent) => {
+            e.preventDefault();
+            e.stopPropagation();
 
-          // Update the routers in your app state
-          setRouters(routersToUse);
-          console.log("Custom routers:", routersToUse);
-        }
+            if (!address) {
+                openConnectModal?.();
+                return;
+            }
+
+            setHnsName(name);
+            // Process custom routers if specified
+            let routersToUse: string[] = [];
+            if (specifyRouters && customRouters.trim()) {
+                routersToUse = getValidCustomRouters();
+
+                // Update the routers in your app state
+                setRouters(routersToUse);
+                console.log("Custom routers:", routersToUse);
+            }
 
-        try {
-          const data = await generateNetworkingKeys({
-            direct,
-            label: name,
-            our_address: address,
-            setNetworkingKey,
-            setIpAddress,
-            setWsPort,
-            setTcpPort,
-            setRouters: routersToUse.length > 0 ? () => setRouters(routersToUse) : setRouters,
-            reset: true,
-            customRouters: routersToUse.length > 0 ? routersToUse : undefined,
-          });
+            try {
+                const data = await generateNetworkingKeys({
+                    direct,
+                    label: name,
+                    our_address: address,
+                    setNetworkingKey,
+                    setIpAddress,
+                    setWsPort,
+                    setTcpPort,
+                    setRouters: routersToUse.length > 0 ? () => setRouters(routersToUse) : setRouters,
+                    reset: true,
+                    customRouters: routersToUse.length > 0 ? routersToUse : undefined,
+                });
 
-          writeContract({
-            address: tba as `0x${string}`,
-            abi: mechAbi,
-            functionName: "execute",
-            args: [
-              MULTICALL,
-              BigInt(0),
-              data,
-              1
-            ],
-            gas: 1000000n,
-          });
-        } catch (error) {
-          console.error("An error occurred:", error);
+                writeContract({
+                    address: tba as `0x${string}`,
+                    abi: mechAbi,
+                    functionName: "execute",
+                    args: [
+                        MULTICALL,
+                        BigInt(0),
+                        data,
+                        1
+                    ],
+                    gas: 1000000n,
+                });
+            } catch (error) {
+                console.error("An error occurred:", error);
+            }
+        },
+        [address, direct, specifyRouters, customRouters, name, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal]
+    );
+
+    useEffect(() => {
+        if (isConfirmed) {
+            setReset(true);
+            setDirect(direct);
+            navigate("/set-password");
         }
-      },
-      [address, direct, specifyRouters, customRouters, name, tba, setNetworkingKey, setIpAddress, setWsPort, setTcpPort, setRouters, writeContract, openConnectModal]
-  );
+    }, [isConfirmed, setReset, setDirect, direct, navigate]);
 
-  useEffect(() => {
-    if (isConfirmed) {
-      setReset(true);
-      setDirect(direct);
-      navigate("/set-password");
-    }
-  }, [isConfirmed, setReset, setDirect, direct, navigate]);
 
+    return (
+        <div className="container fade-in" id="register-ui--reset-name">
+            <div className="section">
+                {
+                    <form className="form" onSubmit={handleResetRecords}>
+                        {isPending || isConfirming ? (
+                            <Loader msg={isConfirming ? "Resetting Networking Information..." : "Please confirm the transaction in your wallet"} />
+                        ) : (
+                            <>
+                                <h3 className="text-iris dark:text-neon">
+                                    Node ID to reset:
+                                </h3>
+                                <EnterHnsName {...{ address, name, setName, triggerNameCheck, nameValidities, setNameValidities, setTba, isReset: true }} />
+                                <p className="text-sm text-gray-500">
+                                    Nodes use an onchain username in order to identify themselves to other nodes in the network.
+                                </p>
+                                <details className="advanced-options">
+                                    <summary>Network Options</summary>
+                                    <div className="flex flex-col gap-3">
+                                        <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
+                                        <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
+                                        {specifyRouters && (
+                                            <div className="flex flex-col gap-2 ml-6">
+                                                <label htmlFor="custom-routers" className="text-sm font-medium">
+                                                    Router Names: <span className="text-red-500">*</span>
+                                                </label>
+                                                <textarea
+                                                    id="custom-routers-reset"
+                                                    value={customRouters}
+                                                    onChange={(e) => handleCustomRoutersChange(e.target.value)}
+                                                    placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
+                                                    className={`input resize-vertical min-h-[80px] ${
+                                                        specifyRouters && !isCustomRoutersValid()
+                                                            ? 'border-red-500 focus:border-red-500'
+                                                            : ''
+                                                    }`}
+                                                    rows={4}
+                                                />
+                                                {routerValidationErrors.length > 0 ? (
+                                                    <div className="text-xs text-red-500">
+                                                        {routerValidationErrors.map((error, idx) => (
+                                                            <div key={idx}>{error}</div>
+                                                        ))}
+                                                        <div className="mt-1">Router names must contain only lowercase letters, numbers, hyphens (not at start/end), and dots.</div>
+                                                    </div>
+                                                ) : (
+                                                    <span className={`text-xs ${
+                                                        !isCustomRoutersValid() ? 'text-red-500' : 'text-gray-500'
+                                                    }`}>
+                                    {!isCustomRoutersValid()
+                                        ? 'At least one valid router name is required'
+                                        : 'Enter one router name per line. These routers will be used for your indirect node.'
+                                    }
+                                  </span>
+                                                )}
+                                            </div>
+                                        )}
+                                    </div>
+                                </details>
+                                <p className="text-sm text-gray-500">
+                                    A reset will not delete any data. It only updates the networking info your node publishes onchain.
+                                </p>
+                                <button
+                                    type="submit"
+                                    className="button mt-2 self-stretch"
+                                    disabled={
+                                        isPending ||
+                                        isConfirming ||
+                                        nameValidities.length !== 0 ||
+                                        (specifyRouters && !isCustomRoutersValid())
+                                    }
+                                >
+                                    Reset Node
+                                </button>
 
-  return (
-      <div className="container fade-in" id="register-ui--reset-name">
-        <div className="section">
-          {
-            <form className="form" onSubmit={handleResetRecords}>
-              {isPending || isConfirming ? (
-                  <Loader msg={isConfirming ? "Resetting Networking Information..." : "Please confirm the transaction in your wallet"} />
-              ) : (
-                  <>
-                    <h3 className="text-iris dark:text-neon">
-                      Node ID to reset:
-                    </h3>
-                    <EnterHnsName {...{ address, name, setName, triggerNameCheck, nameValidities, setNameValidities, setTba, isReset: true }} />
-                    <p className="text-sm text-gray-500">
-                      Nodes use an onchain username in order to identify themselves to other nodes in the network.
-                    </p>
-                    <details className="advanced-options">
-                      <summary>Network Options</summary>
-                      <div className="flex flex-col gap-3">
-                        <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
-                        <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
-                        {specifyRouters && (
-                            <div className="flex flex-col gap-2 ml-6">
-                              <label htmlFor="custom-routers" className="text-sm font-medium">
-                                Router Names: <span className="text-red-500">*</span>
-                              </label>
-                              <textarea
-                                  id="custom-routers-reset"
-                                  value={customRouters}
-                                  onChange={(e) => setCustomRouters(e.target.value)}
-                                  placeholder="Enter one router name per line, e.g.:&#10;router-node-1.hypr&#10;other-router.hypr&#10;myrouter.os"
-                                  className={`input resize-vertical min-h-[80px] ${
-                                      specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                          ? 'border-red-500 focus:border-red-500'
-                                          : ''
-                                  }`}
-                                  rows={4}
-                              />
-                              <span className={`text-xs ${
-                                  customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                      ? 'text-red-500'
-                                      : 'text-gray-500'
-                              }`}>
-                            {customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0
-                                ? 'At least one router name is required'
-                                : 'Enter one router name per line. These routers will be used for your indirect node.'
-                            }
-                          </span>
-                            </div>
+                                <BackButton mode="wide" />
+                            </>
                         )}
-                      </div>
-                    </details>
-                    <p className="text-sm text-gray-500">
-                      A reset will not delete any data. It only updates the networking info your node publishes onchain.
-                    </p>
-                    <button
-                        type="submit"
-                        className="button mt-2 self-stretch"
-                        disabled={
-                            isPending ||
-                            isConfirming ||
-                            nameValidities.length !== 0 ||
-                            (specifyRouters && customRouters.split('\n').map(r => r.trim()).filter(r => r.length > 0).length === 0)
-                        }
-                    >
-                      Reset Node
-                    </button>
-
-                    <BackButton mode="wide" />
-                  </>
-              )}
-              {isError && (
-                  <p className="text-red-500 wrap-anywhere mt-2">
-                    Error: {error?.message || "An error occurred, please try again."}
-                  </p>
-              )}
-            </form>
-          }
+                        {isError && (
+                            <p className="text-red-500 wrap-anywhere mt-2">
+                                Error: {error?.message || "An error occurred, please try again."}
+                            </p>
+                        )}
+                    </form>
+                }
+            </div>
         </div>
-      </div>
-  );
+    );
 }
+
 export default ResetHnsName;
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index 52cc563b5..9638b305c 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -20,6 +20,15 @@ type SetPasswordProps = {
   routers?: string[];
 };
 
+// Regex for valid cache source names (domain format)
+const CACHE_SOURCE_REGEX = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?(?:\.[a-z0-9](?:[a-z0-9-]*[a-z0-9])?)*$/;
+
+// Validate that URL is a secure WebSocket URL
+const validateWebSocketUrl = (url: string): boolean => {
+  if (!url.trim()) return false;
+  return url.startsWith('wss://');
+};
+
 function SetPassword({
                        hnsName,
                        direct,
@@ -35,6 +44,7 @@ function SetPassword({
   // Advanced options state - cache sources and Base L2 access providers
   const [specifyCacheSources, setSpecifyCacheSources] = useState(false);
   const [customCacheSources, setCustomCacheSources] = useState('');
+  const [cacheSourceValidationErrors, setCacheSourceValidationErrors] = useState<string[]>([]);
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
   const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
 
@@ -101,6 +111,60 @@ function SetPassword({
     setError("");
   }, [pw, pw2]);
 
+  // Modified setSpecifyCacheSources function to handle clearing
+  const handleSetSpecifyCacheSources = (value: boolean) => {
+    setSpecifyCacheSources(value);
+    if (!value) {
+      setCustomCacheSources('');
+      setCacheSourceValidationErrors([]);
+    }
+  };
+
+  // Validate custom cache sources against the regex
+  const validateCacheSources = (sourcesText: string): string[] => {
+    if (!sourcesText.trim()) return [];
+
+    const sources = sourcesText
+        .split('\n')
+        .map(source => source.trim())
+        .filter(source => source.length > 0);
+
+    const errors: string[] = [];
+    sources.forEach((source, index) => {
+      if (!CACHE_SOURCE_REGEX.test(source)) {
+        errors.push(`Line ${index + 1}: "${source}" is not a valid cache source name`);
+      }
+    });
+
+    return errors;
+  };
+
+  // Handle custom cache sources change with validation
+  const handleCustomCacheSourcesChange = (value: string) => {
+    setCustomCacheSources(value);
+    if (specifyCacheSources && value.trim()) {
+      const errors = validateCacheSources(value);
+      setCacheSourceValidationErrors(errors);
+    } else {
+      setCacheSourceValidationErrors([]);
+    }
+  };
+
+  // Add a validation function for custom cache sources
+  const getValidCustomCacheSources = () => {
+    if (!specifyCacheSources) return [];
+    return customCacheSources
+        .split('\n')
+        .map(source => source.trim())
+        .filter(source => source.length > 0 && CACHE_SOURCE_REGEX.test(source));
+  };
+
+  const isCustomCacheSourcesValid = () => {
+    if (!specifyCacheSources) return true; // Not required if checkbox is unchecked
+    const validSources = getValidCustomCacheSources();
+    return validSources.length > 0 && cacheSourceValidationErrors.length === 0;
+  };
+
   const handleSubmit = useCallback(
       async (e: FormEvent) => {
         e.preventDefault();
@@ -116,11 +180,7 @@ function SetPassword({
           // Process custom cache sources if specified
           let cacheSourcesToUse: string[] | undefined = undefined;
           if (specifyCacheSources && customCacheSources.trim()) {
-            cacheSourcesToUse = customCacheSources
-                .split('\n')
-                .map(source => source.trim())
-                .filter(source => source.length > 0);
-
+            cacheSourcesToUse = getValidCustomCacheSources();
             console.log("Custom cache sources:", cacheSourcesToUse);
           }
 
@@ -128,12 +188,10 @@ function SetPassword({
           let baseL2AccessProvidersToUse: string[] | undefined = undefined;
           if (specifyBaseL2AccessProviders && rpcProviders.length > 0) {
             baseL2AccessProvidersToUse = rpcProviders.map(provider => {
-              let authObj = null;
-              if (provider.auth) {
-                authObj = {
-                  [provider.auth.type]: provider.auth.value
-                };
-              }
+              const authObj: Record<string, string> | null = provider.auth ? {
+                [provider.auth.type]: provider.auth.value
+              } : null;
+
               return JSON.stringify({
                 url: provider.url,
                 auth: authObj
@@ -232,12 +290,9 @@ function SetPassword({
   // Validation for the submit button
   const hasInvalidRpcProviders = specifyBaseL2AccessProviders && (
       rpcProviders.length === 0 ||
-      rpcProviders.some(p => !p.url.trim() || (p.auth && !p.auth.value.trim()))
+      rpcProviders.some(p => !p.url.trim() || !validateWebSocketUrl(p.url) || (p.auth && !p.auth.value.trim()))
   );
 
-  const hasInvalidCacheSources = specifyCacheSources &&
-      customCacheSources.split('\n').map(c => c.trim()).filter(c => c.length > 0).length === 0;
-
   return (
       <>
         {loading ? (
@@ -281,7 +336,7 @@ function SetPassword({
                 <div className="flex flex-col gap-3">
                   <SpecifyCacheSourcesCheckbox
                       specifyCacheSources={specifyCacheSources}
-                      setSpecifyCacheSources={setSpecifyCacheSources}
+                      setSpecifyCacheSources={handleSetSpecifyCacheSources}
                   />
                   {specifyCacheSources && (
                       <div className="flex flex-col gap-2 ml-6">
@@ -291,17 +346,32 @@ function SetPassword({
                         <textarea
                             id="custom-cache-sources-setpassword"
                             value={customCacheSources}
-                            onChange={(e) => setCustomCacheSources(e.target.value)}
+                            onChange={(e) => handleCustomCacheSourcesChange(e.target.value)}
                             placeholder="Enter one cache source name per line, e.g.:&#10;cache-node-1.hypr&#10;other-cache.hypr&#10;mycache.os"
-                            className={`input resize-vertical min-h-[80px] ${hasInvalidCacheSources ? 'border-red-500 focus:border-red-500' : ''}`}
+                            className={`input resize-vertical min-h-[80px] ${
+                                specifyCacheSources && !isCustomCacheSourcesValid()
+                                    ? 'border-red-500 focus:border-red-500'
+                                    : ''
+                            }`}
                             rows={4}
                         />
-                        <span className={`text-xs ${hasInvalidCacheSources ? 'text-red-500' : 'text-gray-500'}`}>
-                          {hasInvalidCacheSources
-                              ? 'At least one cache source name is required'
-                              : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
-                          }
-                        </span>
+                        {cacheSourceValidationErrors.length > 0 ? (
+                            <div className="text-xs text-red-500">
+                              {cacheSourceValidationErrors.map((error, idx) => (
+                                  <div key={idx}>{error}</div>
+                              ))}
+                              <div className="mt-1">Cache source names must contain only lowercase letters, numbers, hyphens (not at start/end), and dots.</div>
+                            </div>
+                        ) : (
+                            <span className={`text-xs ${
+                                !isCustomCacheSourcesValid() ? 'text-red-500' : 'text-gray-500'
+                            }`}>
+                              {!isCustomCacheSourcesValid()
+                                  ? 'At least one valid cache source name is required'
+                                  : 'Enter one cache source name per line. These nodes will serve as cache sources for hypermap data.'
+                              }
+                            </span>
+                        )}
                       </div>
                   )}
 
@@ -316,6 +386,11 @@ function SetPassword({
                             onChange={setRpcProviders}
                             label="Base L2 RPC Providers"
                         />
+                        {hasInvalidRpcProviders && (
+                            <div className="text-xs text-red-500 mt-2">
+                              All RPC provider URLs must be secure WebSocket URLs starting with wss://
+                            </div>
+                        )}
                       </div>
                   )}
                 </div>
@@ -325,7 +400,7 @@ function SetPassword({
               <button
                   type="submit"
                   className="button"
-                  disabled={hasInvalidCacheSources || hasInvalidRpcProviders}
+                  disabled={specifyCacheSources && !isCustomCacheSourcesValid() || hasInvalidRpcProviders}
               >
                 Submit
               </button>

From ee29cb3966fd97ae8fdf1b698e5732ac0f9ecd1a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 5 Oct 2025 22:35:59 +0000
Subject: [PATCH 19/27] Format Rust code using rustfmt

---
 hyperdrive/src/main.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index a72bdca9c..651acd715 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -1048,7 +1048,6 @@ async fn serve_register_fe(
     eth_provider_config: lib::eth::SavedConfigs,
     detached: bool,
 ) -> (Identity, Vec<u8>, Keyfile, Vec<String>, Vec<String>) {
-
     let cache_sources_from_file = {
         let vfs_dir = home_directory_path.join("vfs");
         let hypermap_cacher_dir = vfs_dir.join("hypermap-cacher:sys");
@@ -1058,7 +1057,10 @@ async fn serve_register_fe(
         match tokio::fs::read_to_string(&data_file_path).await {
             Ok(contents) => match serde_json::from_str::<Vec<String>>(&contents) {
                 Ok(cache_sources) if !cache_sources.is_empty() => {
-                    println!("Loaded cache sources from cache_sources: {:?}\r", cache_sources);
+                    println!(
+                        "Loaded cache sources from cache_sources: {:?}\r",
+                        cache_sources
+                    );
                     Some(cache_sources)
                 }
                 _ => {

From 063c6ca067d03803f02c14a401d577b053d1b135 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Mon, 6 Oct 2025 20:04:55 -0400
Subject: [PATCH 20/27] initial state, leave checked/unchecked recommend

---
 hyperdrive/src/main.rs                        | 39 +----------
 .../src/components/DirectCheckbox.tsx         | 48 ++++++++-----
 .../src/components/RpcProviderEditor.tsx      | 69 +++++++++++++++----
 .../SpecifyBaseL2AccessProvidersCheckbox.tsx  | 13 +++-
 .../SpecifyCacheSourcesCheckbox.tsx           | 17 +++--
 .../src/components/SpecifyRoutersCheckbox.tsx | 36 +++++++---
 hyperdrive/src/register-ui/src/lib/types.ts   |  4 +-
 .../src/register-ui/src/pages/Login.tsx       | 35 +++++++---
 .../src/register-ui/src/pages/ResetName.tsx   | 32 +++++++--
 .../src/register-ui/src/pages/SetPassword.tsx |  8 +++
 hyperdrive/src/register.rs                    | 28 +++-----
 lib/src/kernel.rs                             |  4 +-
 12 files changed, 211 insertions(+), 122 deletions(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 651acd715..6bf6a946b 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -287,23 +287,10 @@ async fn main() {
     #[cfg(not(feature = "simulation-mode"))]
     println!("Login or register at {link}\r");
 
-    println!(
-        "DEBUG: Looking for keyfile in home directory: {}\r",
-        home_directory_path.display()
-    );
-    let keyfile_path = home_directory_path.join(".keyfile");
-    println!("DEBUG: Expected keyfile path: {}\r", keyfile_path.display());
-    if keyfile_path.exists() {
-        println!("DEBUG: Keyfile exists at expected location\r");
-    } else {
-        println!("DEBUG: Keyfile NOT found at expected location\r");
-    }
-
     #[cfg(not(feature = "simulation-mode"))]
     let (our, encoded_keyfile, decoded_keyfile, cache_source_vector, base_l2_access_source_vector) =
         match password {
             None => {
-                println!("DEBUG: Starting registration/login flow (no password provided)\r");
                 let result = serve_register_fe(
                     &home_directory_path,
                     our_ip.to_string(),
@@ -314,11 +301,9 @@ async fn main() {
                     detached,
                 )
                 .await;
-                println!("DEBUG: Registration/login flow completed\r");
                 result
             }
             Some(password) => {
-                println!("DEBUG: Starting Command line login flow (password provided)\r");
                 let result = login_with_password(
                     &home_directory_path,
                     our_ip.to_string(),
@@ -328,32 +313,10 @@ async fn main() {
                     password,
                 )
                 .await;
-                println!("DEBUG: Command line login flow completed\r");
                 result
             }
         };
 
-    // Add debug output after login/registration
-    println!("DEBUG: After login/registration - checking keyfile again\r");
-    if keyfile_path.exists() {
-        println!("DEBUG: Keyfile NOW exists at expected location\r");
-        if let Ok(keyfile_content) = std::fs::read(&keyfile_path) {
-            println!("DEBUG: Keyfile size: {} bytes\r", keyfile_content.len());
-        }
-    } else {
-        println!("DEBUG: Keyfile STILL does not exist at expected location\r");
-
-        // Check if there are other files that might be the keyfile
-        if let Ok(entries) = std::fs::read_dir(&home_directory_path) {
-            println!("DEBUG: Files in home directory:\r");
-            for entry in entries.flatten() {
-                if let Ok(file_name) = entry.file_name().into_string() {
-                    println!("DEBUG: - {}\r", file_name);
-                }
-            }
-        }
-    }
-
     is_eth_provider_config_updated = false;
 
     //let cache_source_vector_for_config = cache_source_vector.clone();
@@ -1058,7 +1021,7 @@ async fn serve_register_fe(
             Ok(contents) => match serde_json::from_str::<Vec<String>>(&contents) {
                 Ok(cache_sources) if !cache_sources.is_empty() => {
                     println!(
-                        "Loaded cache sources from cache_sources: {:?}\r",
+                        "Loaded cache sources: {:?}\r",
                         cache_sources
                     );
                     Some(cache_sources)
diff --git a/hyperdrive/src/register-ui/src/components/DirectCheckbox.tsx b/hyperdrive/src/register-ui/src/components/DirectCheckbox.tsx
index c11b5ad64..72a32b182 100644
--- a/hyperdrive/src/register-ui/src/components/DirectCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/DirectCheckbox.tsx
@@ -2,25 +2,35 @@ import { DirectTooltip } from "./DirectTooltip";
 import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
 
 interface DNCBProps {
-  direct: boolean;
-  setDirect: (direct: boolean) => void;
+    direct: boolean;
+    setDirect: (direct: boolean) => void;
+    initiallyChecked?: boolean;
 }
 
-export default function DirectNodeCheckbox({ direct, setDirect }: DNCBProps) {
-  return (
-    <div className="flex gap-2 items-center">
-      <button className="icon" onClick={(e) => {
-        e.preventDefault();
-        e.stopPropagation();
-        setDirect(!direct);
-      }}>
-        {direct ? <FaSquareCheck /> : <FaRegSquare />}
-      </button>
-      <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
-        <span className="text-sm">Register as a direct node.</span>
-        <span className="text-xs">If you are unsure, leave unchecked.</span>
-      </div>
-      <DirectTooltip />
-    </div>
-  );
+export default function DirectNodeCheckbox({ direct, setDirect, initiallyChecked }: DNCBProps) {
+    const getHelpText = () => {
+        if (initiallyChecked === undefined) {
+            return "If you are unsure, leave unchecked.";
+        }
+        return initiallyChecked
+            ? "If you are unsure, leave checked."
+            : "If you are unsure, leave unchecked.";
+    };
+
+    return (
+        <div className="flex gap-2 items-center">
+            <button className="icon" onClick={(e) => {
+                e.preventDefault();
+                e.stopPropagation();
+                setDirect(!direct);
+            }}>
+                {direct ? <FaSquareCheck /> : <FaRegSquare />}
+            </button>
+            <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
+                <span className="text-sm">Register as a direct node.</span>
+                <span className="text-xs">{getHelpText()}</span>
+            </div>
+            <DirectTooltip />
+        </div>
+    );
 }
\ No newline at end of file
diff --git a/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx b/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
index 470a7683f..aaea75650 100644
--- a/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
+++ b/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
@@ -16,12 +16,18 @@ interface RpcProviderEditorProps {
 }
 
 export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEditorProps) {
+    const [showAuthValues, setShowAuthValues] = useState<Record<number, boolean>>({});
+
     const addProvider = () => {
         onChange([...providers, { url: '', auth: null }]);
     };
 
     const removeProvider = (index: number) => {
         onChange(providers.filter((_, i) => i !== index));
+        // Clean up the showAuthValues state for this index
+        const newShowAuthValues = { ...showAuthValues };
+        delete newShowAuthValues[index];
+        setShowAuthValues(newShowAuthValues);
     };
 
     const updateProvider = (index: number, updates: Partial<RpcProviderData>) => {
@@ -40,6 +46,13 @@ export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEdi
         onChange(newProviders);
     };
 
+    const toggleAuthVisibility = (index: number) => {
+        setShowAuthValues(prev => ({
+            ...prev,
+            [index]: !prev[index]
+        }));
+    };
+
     const hasEmptyRequired = providers.some(p => !p.url.trim());
 
     return (
@@ -98,19 +111,49 @@ export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEdi
                                     <label className="text-xs font-medium opacity-70">
                                         Auth Value <span className="text-red-500">*</span>
                                     </label>
-                                    <input
-                                        type="text"
-                                        value={provider.auth.value}
-                                        onChange={(e) => updateAuth(index, provider.auth!.type, e.target.value)}
-                                        placeholder={
-                                            provider.auth.type === 'Bearer' ? 'your-bearer-token' :
-                                                provider.auth.type === 'Basic' ? 'username:password (base64 encoded)' :
-                                                    'custom-header-value'
-                                        }
-                                        className={classNames("input text-sm", {
-                                            'border-red-500 focus:border-red-500': !provider.auth.value.trim()
-                                        })}
-                                    />
+
+                                    <div className="relative">
+                                        <input
+                                            type={showAuthValues[index] ? "text" : "password"}
+                                            value={provider.auth.value}
+                                            onChange={(e) => updateAuth(index, provider.auth!.type, e.target.value)}
+                                            placeholder={
+                                                provider.auth.type === 'Bearer' ? 'your-bearer-token' :
+                                                    provider.auth.type === 'Basic' ? 'username:password (base64 encoded)' :
+                                                        'custom-header-value'
+                                            }
+                                            className={classNames("input text-sm", {
+                                                'border-red-500 focus:border-red-500': !provider.auth.value.trim()
+                                            })}
+                                            style={{ paddingRight: '88px' }}
+                                            autoComplete="off"
+                                        />
+                                        <button
+                                            type="button"
+                                            onClick={() => toggleAuthVisibility(index)}
+                                            className="absolute top-1/2 -translate-y-1/2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 flex items-center gap-1 py-2 pr-2 pl-2"
+                                            style={{ right: '0px' }}
+                                            title={showAuthValues[index] ? "Hide" : "Show"}
+                                        >
+                                            {showAuthValues[index] ? (
+                                                // Eye icon (visible/show state)
+                                                <span className="flex items-center gap-1">
+                                                    <svg width="20" height="20" viewBox="0 0 576 512" fill="currentColor" className="inline-block">
+                                                        <path d="M38.8 5.1C28.4-3.1 13.3-1.2 5.1 9.2S-1.2 34.7 9.2 42.9l592 464c10.4 8.2 25.5 6.3 33.7-4.1s6.3-25.5-4.1-33.7L525.6 386.7c39.6-40.6 66.4-86.1 79.9-118.4c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C465.5 68.8 400.8 32 320 32c-68.2 0-125 26.3-169.3 60.8L38.8 5.1zM223.1 149.5C248.6 126.2 282.7 112 320 112c79.5 0 144 64.5 144 144c0 24.9-6.3 48.3-17.4 68.7L408 294.5c8.4-19.3 10.6-41.4 4.8-63.3c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3c0 10.2-2.4 19.8-6.6 28.3l-90.3-70.8zM373 389.9c-16.4 6.5-34.3 10.1-53 10.1c-79.5 0-144-64.5-144-144c0-6.9 .5-13.6 1.4-20.2L83.1 161.5C60.3 191.2 44 220.8 34.5 243.7c-3.3 7.9-3.3 16.7 0 24.6c14.9 35.7 46.2 87.7 93 131.1C174.5 443.2 239.2 480 320 480c47.8 0 89.9-12.9 126.2-32.5L373 389.9z"></path>
+                                                    </svg>
+                                                    <span className="text-xs">Hude</span>
+                                                </span>
+                                            ) : (
+                                                // Eye-off icon (hidden state)
+                                                <span className="flex items-center gap-1">
+                                                    <svg width="20" height="20" viewBox="0 0 640 512" fill="currentColor" className="inline-block">
+                                                        <path d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM144 256a144 144 0 1 1 288 0 144 144 0 1 1 -288 0zm144-64c0 35.3-28.7 64-64 64c-7.1 0-13.9-1.2-20.3-3.3c-5.5-1.8-11.9 1.6-11.7 7.4c.3 6.9 1.3 13.8 3.2 20.7c13.7 51.2 66.4 81.6 117.6 67.9s81.6-66.4 67.9-117.6c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3z"></path>
+                                                    </svg>
+                                                    <span className="text-xs">Shew</span>
+                                                </span>
+                                            )}
+                                        </button>
+                                    </div>
                                 </div>
                             )}
                         </div>
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
index 9253aaaa3..f44456048 100644
--- a/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/SpecifyBaseL2AccessProvidersCheckbox.tsx
@@ -4,9 +4,14 @@ import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
 interface SpecifyBaseL2AccessProvidersProps {
     specifyBaseL2AccessProviders: boolean;
     setSpecifyBaseL2AccessProviders: (specifyBaseL2AccessProviders: boolean) => void;
+    initiallyChecked?: boolean;
 }
 
-export default function SpecifyBaseL2AccessProvidersCheckbox({ specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders }: SpecifyBaseL2AccessProvidersProps) {
+export default function SpecifyBaseL2AccessProvidersCheckbox({
+                                                                 specifyBaseL2AccessProviders,
+                                                                 setSpecifyBaseL2AccessProviders,
+                                                                 initiallyChecked = false
+                                                             }: SpecifyBaseL2AccessProvidersProps) {
     return (
         <div className="flex gap-2 items-center">
             <button className="icon" onClick={(e) => {
@@ -16,9 +21,11 @@ export default function SpecifyBaseL2AccessProvidersCheckbox({ specifyBaseL2Acce
             }}>
                 {specifyBaseL2AccessProviders ? <FaSquareCheck /> : <FaRegSquare />}
             </button>
-            <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
+            <div className="flex flex-col gap-1 flex-1 min-w-0 wrap-anywhere">
                 <span className="text-sm">Add Base L2 access providers.</span>
-                <span className="text-xs">If you are unsure, leave unchecked.</span>
+                <span className="text-xs">
+                    If you are unsure, leave {initiallyChecked ? 'checked' : 'unchecked'}.
+                </span>
             </div>
             <BaseL2AccessProviderTooltip />
         </div>
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
index 19e2c87ec..8b3c86e01 100644
--- a/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
@@ -1,12 +1,17 @@
 import { CacheSourceTooltip } from "./CacheSourceTooltip";
 import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
 
-interface SpecifyCacheSourcesProps {
+interface SpecifyCacheSourcesCheckboxProps {
     specifyCacheSources: boolean;
     setSpecifyCacheSources: (specifyCacheSources: boolean) => void;
+    initiallyChecked?: boolean;
 }
 
-export default function SpecifyCacheSourcesCheckbox({ specifyCacheSources, setSpecifyCacheSources }: SpecifyCacheSourcesProps) {
+export default function SpecifyCacheSourcesCheckbox({
+                                                        specifyCacheSources,
+                                                        setSpecifyCacheSources,
+                                                        initiallyChecked = false
+                                                    }: SpecifyCacheSourcesCheckboxProps) {
     return (
         <div className="flex gap-2 items-center">
             <button className="icon" onClick={(e) => {
@@ -16,9 +21,11 @@ export default function SpecifyCacheSourcesCheckbox({ specifyCacheSources, setSp
             }}>
                 {specifyCacheSources ? <FaSquareCheck /> : <FaRegSquare />}
             </button>
-            <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
-                <span className="text-sm">Specify cache sources for hypermap data.</span>
-                <span className="text-xs">If you are unsure, leave unchecked.</span>
+            <div className="flex flex-col gap-1 flex-1 min-w-0 wrap-anywhere">
+                <span className="text-sm">Specify cache sources.</span>
+                <span className="text-xs">
+                    If you are unsure, leave {initiallyChecked ? 'checked' : 'unchecked'}.
+                </span>
             </div>
             <CacheSourceTooltip />
         </div>
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
index f618e85c1..02ec264f2 100644
--- a/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
@@ -1,25 +1,41 @@
-
 import { RouterTooltip } from "./RouterTooltip";
 import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
 
-interface SpecifyRoutersProps {
+interface SRCBProps {
     specifyRouters: boolean;
     setSpecifyRouters: (specifyRouters: boolean) => void;
+    initiallyChecked?: boolean;
 }
 
-export default function SpecifyRoutersCheckbox({ specifyRouters, setSpecifyRouters }: SpecifyRoutersProps) {
+export default function SpecifyRoutersCheckbox({
+                                                   specifyRouters,
+                                                   setSpecifyRouters,
+                                                   initiallyChecked
+                                               }: SRCBProps) {
+    const getHelpText = () => {
+        if (initiallyChecked === undefined) {
+            return "If you are unsure, leave unchecked.";
+        }
+        return initiallyChecked
+            ? "If you are unsure, leave checked."
+            : "If you are unsure, leave unchecked.";
+    };
+
     return (
         <div className="flex gap-2 items-center">
-            <button className="icon" onClick={(e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                setSpecifyRouters(!specifyRouters);
-            }}>
+            <button
+                className="icon"
+                onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    setSpecifyRouters(!specifyRouters);
+                }}
+            >
                 {specifyRouters ? <FaSquareCheck /> : <FaRegSquare />}
             </button>
             <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
-                <span className="text-sm">Specify routers for an indirect node.</span>
-                <span className="text-xs">If you are unsure, leave unchecked.</span>
+                <span className="text-sm">Specify routers to register as an indirect node.</span>
+                <span className="text-xs">{getHelpText()}</span>
             </div>
             <RouterTooltip />
         </div>
diff --git a/hyperdrive/src/register-ui/src/lib/types.ts b/hyperdrive/src/register-ui/src/lib/types.ts
index f09a9cedc..f3afbbacc 100644
--- a/hyperdrive/src/register-ui/src/lib/types.ts
+++ b/hyperdrive/src/register-ui/src/lib/types.ts
@@ -45,8 +45,8 @@ export type UnencryptedIdentity = {
 }
 
 export type InfoResponse = {
-  name: string;
-  allowed_routers: string[];
+  name?: string;
+  allowed_routers?: string[];
   initial_cache_sources: string[];
   initial_base_l2_providers: string[];
 }
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index ce1df8b87..20701bd12 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -1,3 +1,4 @@
+
 import { FormEvent, useCallback, useEffect, useState } from "react";
 import { PageProps, InfoResponse } from "../lib/types";
 import Loader from "../components/Loader";
@@ -40,6 +41,10 @@ function Login({
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
   const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
 
+  // Track initial states after data is loaded
+  const [initialCacheSourcesChecked, setInitialCacheSourcesChecked] = useState(false);
+  const [initialBaseL2ProvidersChecked, setInitialBaseL2ProvidersChecked] = useState(false);
+
   const [keyErrs, setKeyErrs] = useState<string[]>([]);
   const [loading, setLoading] = useState<string>("");
 
@@ -51,13 +56,19 @@ function Login({
         const infoData = (await fetch("/info", { method: "GET", credentials: 'include' }).then((res) =>
             res.json()
         )) as InfoResponse;
-        setRouters(infoData.allowed_routers);
-        setHnsName(infoData.name);
+
+        if (infoData.allowed_routers) {
+          setRouters(infoData.allowed_routers);
+        }
+        if (infoData.name) {
+          setHnsName(infoData.name);
+        }
 
         // Prepopulate cache sources
         if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
           setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
           setSpecifyCacheSources(true);
+          setInitialCacheSourcesChecked(true);  // Track initial state
         }
 
         // Parse and prepopulate Base L2 providers
@@ -90,6 +101,7 @@ function Login({
           });
           setRpcProviders(parsedProviders);
           setSpecifyBaseL2AccessProviders(true);
+          setInitialBaseL2ProvidersChecked(true);  // Track initial state
         }
       } catch (error) {
         console.error('Failed to fetch node info:', error);
@@ -169,13 +181,18 @@ function Login({
           let baseL2AccessProvidersToUse: string[] | undefined = undefined;
           if (specifyBaseL2AccessProviders && rpcProviders.length > 0) {
             baseL2AccessProvidersToUse = rpcProviders.map(provider => {
-              const authObj: Record<string, string> | null = provider.auth ? {
-                [provider.auth.type]: provider.auth.value
-              } : null;
-
+              if (provider.auth) {
+                const authObj: Record<string, string> = {
+                  [provider.auth.type]: provider.auth.value
+                };
+                return JSON.stringify({
+                  url: provider.url,
+                  auth: authObj
+                });
+              }
               return JSON.stringify({
                 url: provider.url,
-                auth: authObj
+                auth: null
               });
             });
 
@@ -229,7 +246,7 @@ function Login({
           setLoading("");
         }
       },
-      [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, rpcProviders]
+      [pw, hnsName, specifyCacheSources, customCacheSources, specifyBaseL2AccessProviders, rpcProviders, getValidCustomCacheSources]
   );
 
   const isDirect = Boolean(routers?.length === 0);
@@ -277,6 +294,7 @@ function Login({
           <SpecifyCacheSourcesCheckbox
               specifyCacheSources={specifyCacheSources}
               setSpecifyCacheSources={handleSetSpecifyCacheSources}
+              initiallyChecked={initialCacheSourcesChecked}
           />
           {specifyCacheSources && (
               <div className="flex flex-col gap-2 ml-6">
@@ -318,6 +336,7 @@ function Login({
           <SpecifyBaseL2AccessProvidersCheckbox
               specifyBaseL2AccessProviders={specifyBaseL2AccessProviders}
               setSpecifyBaseL2AccessProviders={setSpecifyBaseL2AccessProviders}
+              initiallyChecked={initialBaseL2ProvidersChecked}
           />
           {specifyBaseL2AccessProviders && (
               <div className="ml-6">
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index 7490d5482..3dd8ec8ae 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -58,6 +58,10 @@ function ResetHnsName({
     const [customRouters, setCustomRouters] = useState('')
     const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
+    // Track initial states for checkbox help text
+    const [initiallyDirect, setInitiallyDirect] = useState<boolean | undefined>(undefined);
+    const [initiallySpecifyRouters, setInitiallySpecifyRouters] = useState<boolean | undefined>(undefined);
+
     // Modified setDirect function to handle mutual exclusivity
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
@@ -134,12 +138,24 @@ function ResetHnsName({
                     res.json()
                 )) as UnencryptedIdentity;
 
+                // Determine if node has specified routers (indirect node)
+                const hasRouters = infoData.allowed_routers && infoData.allowed_routers.length > 0;
+
+                // If allowed_routers is empty, the node is direct; if it has routers, it's indirect
+                const isDirect = !hasRouters;
+
+                // Set initial states for checkbox help text
+                setInitiallyDirect(isDirect);
+                setInitiallySpecifyRouters(hasRouters);
+
+                // Set the current state to match the node's current configuration
+                setDirect(isDirect);
+
                 // Prepopulate customRouters if this is an indirect node with existing routers
-                if (infoData.allowed_routers && infoData.allowed_routers.length > 0) {
+                if (hasRouters) {
                     const routersText = infoData.allowed_routers.join('\n');
                     setCustomRouters(routersText);
                     setSpecifyRouters(true); // Auto-enable the checkbox
-                    setDirect(false); // Ensure direct is false for indirect nodes
                 }
             } catch (error) {
                 console.log("Could not fetch node info:", error);
@@ -238,8 +254,16 @@ function ResetHnsName({
                                 <details className="advanced-options">
                                     <summary>Network Options</summary>
                                     <div className="flex flex-col gap-3">
-                                        <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
-                                        <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
+                                        <DirectNodeCheckbox
+                                            direct={direct}
+                                            setDirect={handleSetDirect}
+                                            initiallyChecked={initiallyDirect}
+                                        />
+                                        <SpecifyRoutersCheckbox
+                                            specifyRouters={specifyRouters}
+                                            setSpecifyRouters={handleSetSpecifyRouters}
+                                            initiallyChecked={initiallySpecifyRouters}
+                                        />
                                         {specifyRouters && (
                                             <div className="flex flex-col gap-2 ml-6">
                                                 <label htmlFor="custom-routers" className="text-sm font-medium">
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index 9638b305c..2a232f934 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -48,6 +48,10 @@ function SetPassword({
   const [specifyBaseL2AccessProviders, setSpecifyBaseL2AccessProviders] = useState(false);
   const [rpcProviders, setRpcProviders] = useState<RpcProviderData[]>([]);
 
+  // Track initial states after data is loaded
+  const [initialCacheSourcesChecked, setInitialCacheSourcesChecked] = useState(false);
+  const [initialBaseL2ProvidersChecked, setInitialBaseL2ProvidersChecked] = useState(false);
+
   const { signTypedDataAsync } = useSignTypedData();
   const { address } = useAccount();
   const chainId = useChainId();
@@ -68,6 +72,7 @@ function SetPassword({
         if (infoData.initial_cache_sources && infoData.initial_cache_sources.length > 0) {
           setCustomCacheSources(infoData.initial_cache_sources.join('\n'));
           setSpecifyCacheSources(true);
+          setInitialCacheSourcesChecked(true);
         }
 
         // Parse and prepopulate Base L2 providers
@@ -100,6 +105,7 @@ function SetPassword({
           });
           setRpcProviders(parsedProviders);
           setSpecifyBaseL2AccessProviders(true);
+          setInitialBaseL2ProvidersChecked(true);
         }
       } catch (error) {
         console.error('Failed to fetch default configuration:', error);
@@ -337,6 +343,7 @@ function SetPassword({
                   <SpecifyCacheSourcesCheckbox
                       specifyCacheSources={specifyCacheSources}
                       setSpecifyCacheSources={handleSetSpecifyCacheSources}
+                      initiallyChecked={initialCacheSourcesChecked}
                   />
                   {specifyCacheSources && (
                       <div className="flex flex-col gap-2 ml-6">
@@ -378,6 +385,7 @@ function SetPassword({
                   <SpecifyBaseL2AccessProvidersCheckbox
                       specifyBaseL2AccessProviders={specifyBaseL2AccessProviders}
                       setSpecifyBaseL2AccessProviders={setSpecifyBaseL2AccessProviders}
+                      initiallyChecked={initialBaseL2ProvidersChecked}
                   />
                   {specifyBaseL2AccessProviders && (
                       <div className="ml-6">
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index b984ee3bd..7a65834e2 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -313,26 +313,18 @@ async fn get_unencrypted_info(
     initial_cache_sources: Arc<Option<Vec<String>>>,
     initial_base_l2_providers: Arc<Option<Vec<String>>>,
 ) -> Result<impl Reply, Rejection> {
-    let (name, allowed_routers) = {
-        match keyfile {
-            Some(encoded_keyfile) => match keygen::get_username_and_routers(&encoded_keyfile) {
-                Ok(k) => k,
-                Err(_) => {
-                    return Ok(warp::reply::with_status(
-                        warp::reply::json(&"keyfile deserialization went wrong".to_string()),
-                        StatusCode::UNAUTHORIZED,
-                    )
-                    .into_response())
-                }
-            },
-            None => {
+    let (name, allowed_routers, status_code) = match keyfile {
+        Some(encoded_keyfile) => match keygen::get_username_and_routers(&encoded_keyfile) {
+            Ok(k) => (Some(k.0), Some(k.1), StatusCode::OK),
+            Err(_) => {
                 return Ok(warp::reply::with_status(
-                    warp::reply::json(&"Keyfile not present".to_string()),
-                    StatusCode::NOT_FOUND,
+                    warp::reply::json(&"keyfile deserialization went wrong".to_string()),
+                    StatusCode::UNAUTHORIZED,
                 )
-                .into_response())
+                    .into_response())
             }
-        }
+        },
+        None => (None, None, StatusCode::NOT_FOUND),
     };
 
     let response = InfoResponse {
@@ -346,7 +338,7 @@ async fn get_unencrypted_info(
     };
 
     return Ok(
-        warp::reply::with_status(warp::reply::json(&response), StatusCode::OK).into_response(),
+        warp::reply::with_status(warp::reply::json(&response), status_code).into_response(),
     );
 }
 
diff --git a/lib/src/kernel.rs b/lib/src/kernel.rs
index f438779f3..4a2323473 100644
--- a/lib/src/kernel.rs
+++ b/lib/src/kernel.rs
@@ -180,8 +180,8 @@ pub struct UnencryptedIdentity {
 
 #[derive(serde::Serialize)]
 pub struct InfoResponse {
-    pub name: String,
-    pub allowed_routers: Vec<String>,
+    pub name: Option<String>,
+    pub allowed_routers: Option<Vec<String>>,
     pub initial_cache_sources: Vec<String>,
     pub initial_base_l2_providers: Vec<String>,
 }

From 4edd1127484171d0f37d008c57286a04643da13b Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Mon, 6 Oct 2025 21:00:06 -0400
Subject: [PATCH 21/27] UI improvements

---
 .../src/components/RouterTooltip.tsx          |   2 +-
 .../src/components/RpcProviderEditor.tsx      | 238 ++++++++++--------
 .../register-ui/src/pages/CommitDotOsName.tsx |  52 ++--
 .../src/register-ui/src/pages/Login.tsx       |   5 -
 .../src/register-ui/src/pages/MintCustom.tsx  |  46 ++--
 .../src/register-ui/src/pages/ResetName.tsx   |  17 +-
 .../src/register-ui/src/pages/SetPassword.tsx |   5 -
 7 files changed, 181 insertions(+), 184 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx b/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx
index 5abcbb518..983b8ba32 100644
--- a/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx
+++ b/hyperdrive/src/register-ui/src/components/RouterTooltip.tsx
@@ -7,7 +7,7 @@ export const RouterTooltip: React.FC = () => {
             text={`
         For indirect nodes, you can specify which router nodes to use for networking.
         Routers are direct nodes that help relay traffic for indirect nodes.
-        If unchecked, the system will automatically select appropriate routers.
+        If both boxes are unchecked, the system will choose appropriate routers.
       `}
         />
     );
diff --git a/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx b/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
index aaea75650..0005f1c5e 100644
--- a/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
+++ b/hyperdrive/src/register-ui/src/components/RpcProviderEditor.tsx
@@ -53,7 +53,23 @@ export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEdi
         }));
     };
 
-    const hasEmptyRequired = providers.some(p => !p.url.trim());
+    // Validate individual provider
+    const validateProvider = (provider: RpcProviderData): string | null => {
+        if (!provider.url.trim()) {
+            return 'WebSocket URL is required';
+        }
+        if (!provider.url.startsWith('wss://')) {
+            return 'URL must be a secure WebSocket URL starting with wss://';
+        }
+        if (provider.auth && !provider.auth.value.trim()) {
+            return 'Auth value is required when auth type is specified';
+        }
+        return null;
+    };
+
+    // Get validation errors for all providers
+    const validationErrors = providers.map(validateProvider);
+    const hasErrors = validationErrors.some(error => error !== null);
 
     return (
         <div className="flex flex-col gap-3">
@@ -63,113 +79,123 @@ export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEdi
                 </label>
             )}
 
-            {providers.map((provider, index) => (
-                <div key={index} className="flex flex-col gap-2 p-3 border border-gray-300 dark:border-gray-600 rounded">
-                    <div className="flex gap-2 items-start">
-                        <div className="flex-1 flex flex-col gap-2">
-                            {/* URL Field */}
-                            <div className="flex flex-col gap-1">
-                                <label className="text-xs font-medium opacity-70">
-                                    WebSocket URL <span className="text-red-500">*</span>
-                                </label>
-                                <input
-                                    type="text"
-                                    value={provider.url}
-                                    onChange={(e) => updateProvider(index, { url: e.target.value })}
-                                    placeholder="wss://base-mainnet.infura.io/ws/v3/YOUR-API-KEY"
-                                    className={classNames("input text-sm", {
-                                        'border-red-500 focus:border-red-500': !provider.url.trim()
-                                    })}
-                                />
-                            </div>
-
-                            {/* Auth Type Selector */}
-                            <div className="flex flex-col gap-1">
-                                <label className="text-xs font-medium opacity-70">Authentication (Optional)</label>
-                                <select
-                                    value={provider.auth?.type || 'none'}
-                                    onChange={(e) => {
-                                        const value = e.target.value;
-                                        if (value === 'none') {
-                                            updateAuth(index, null);
-                                        } else {
-                                            updateAuth(index, value as 'Basic' | 'Bearer' | 'Raw', provider.auth?.value || '');
-                                        }
-                                    }}
-                                    className="input text-sm"
-                                >
-                                    <option value="none">No Authentication</option>
-                                    <option value="Bearer">Bearer Token</option>
-                                    <option value="Basic">Basic Auth</option>
-                                    <option value="Raw">Raw Header</option>
-                                </select>
-                            </div>
-
-                            {/* Auth Value Field (conditional) */}
-                            {provider.auth && (
+            {providers.map((provider, index) => {
+                const error = validationErrors[index];
+                return (
+                    <div key={index} className="flex flex-col gap-2 p-3 border border-gray-300 dark:border-gray-600 rounded">
+                        <div className="flex gap-2 items-start">
+                            <div className="flex-1 flex flex-col gap-2">
+                                {/* URL Field */}
                                 <div className="flex flex-col gap-1">
                                     <label className="text-xs font-medium opacity-70">
-                                        Auth Value <span className="text-red-500">*</span>
+                                        WebSocket URL <span className="text-red-500">*</span>
                                     </label>
+                                    <input
+                                        type="text"
+                                        value={provider.url}
+                                        onChange={(e) => updateProvider(index, { url: e.target.value })}
+                                        placeholder="wss://base-mainnet.infura.io/ws/v3/YOUR-API-KEY"
+                                        className={classNames("input text-sm", {
+                                            'border-red-500 focus:border-red-500': error !== null
+                                        })}
+                                    />
+                                </div>
 
-                                    <div className="relative">
-                                        <input
-                                            type={showAuthValues[index] ? "text" : "password"}
-                                            value={provider.auth.value}
-                                            onChange={(e) => updateAuth(index, provider.auth!.type, e.target.value)}
-                                            placeholder={
-                                                provider.auth.type === 'Bearer' ? 'your-bearer-token' :
-                                                    provider.auth.type === 'Basic' ? 'username:password (base64 encoded)' :
-                                                        'custom-header-value'
+                                {/* Auth Type Selector */}
+                                <div className="flex flex-col gap-1">
+                                    <label className="text-xs font-medium opacity-70">Authentication (Optional)</label>
+                                    <select
+                                        value={provider.auth?.type || 'none'}
+                                        onChange={(e) => {
+                                            const value = e.target.value;
+                                            if (value === 'none') {
+                                                updateAuth(index, null);
+                                            } else {
+                                                updateAuth(index, value as 'Basic' | 'Bearer' | 'Raw', provider.auth?.value || '');
                                             }
-                                            className={classNames("input text-sm", {
-                                                'border-red-500 focus:border-red-500': !provider.auth.value.trim()
-                                            })}
-                                            style={{ paddingRight: '88px' }}
-                                            autoComplete="off"
-                                        />
-                                        <button
-                                            type="button"
-                                            onClick={() => toggleAuthVisibility(index)}
-                                            className="absolute top-1/2 -translate-y-1/2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 flex items-center gap-1 py-2 pr-2 pl-2"
-                                            style={{ right: '0px' }}
-                                            title={showAuthValues[index] ? "Hide" : "Show"}
-                                        >
-                                            {showAuthValues[index] ? (
-                                                // Eye icon (visible/show state)
-                                                <span className="flex items-center gap-1">
-                                                    <svg width="20" height="20" viewBox="0 0 576 512" fill="currentColor" className="inline-block">
-                                                        <path d="M38.8 5.1C28.4-3.1 13.3-1.2 5.1 9.2S-1.2 34.7 9.2 42.9l592 464c10.4 8.2 25.5 6.3 33.7-4.1s6.3-25.5-4.1-33.7L525.6 386.7c39.6-40.6 66.4-86.1 79.9-118.4c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C465.5 68.8 400.8 32 320 32c-68.2 0-125 26.3-169.3 60.8L38.8 5.1zM223.1 149.5C248.6 126.2 282.7 112 320 112c79.5 0 144 64.5 144 144c0 24.9-6.3 48.3-17.4 68.7L408 294.5c8.4-19.3 10.6-41.4 4.8-63.3c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3c0 10.2-2.4 19.8-6.6 28.3l-90.3-70.8zM373 389.9c-16.4 6.5-34.3 10.1-53 10.1c-79.5 0-144-64.5-144-144c0-6.9 .5-13.6 1.4-20.2L83.1 161.5C60.3 191.2 44 220.8 34.5 243.7c-3.3 7.9-3.3 16.7 0 24.6c14.9 35.7 46.2 87.7 93 131.1C174.5 443.2 239.2 480 320 480c47.8 0 89.9-12.9 126.2-32.5L373 389.9z"></path>
-                                                    </svg>
-                                                    <span className="text-xs">Hude</span>
-                                                </span>
-                                            ) : (
-                                                // Eye-off icon (hidden state)
-                                                <span className="flex items-center gap-1">
-                                                    <svg width="20" height="20" viewBox="0 0 640 512" fill="currentColor" className="inline-block">
-                                                        <path d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM144 256a144 144 0 1 1 288 0 144 144 0 1 1 -288 0zm144-64c0 35.3-28.7 64-64 64c-7.1 0-13.9-1.2-20.3-3.3c-5.5-1.8-11.9 1.6-11.7 7.4c.3 6.9 1.3 13.8 3.2 20.7c13.7 51.2 66.4 81.6 117.6 67.9s81.6-66.4 67.9-117.6c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3z"></path>
-                                                    </svg>
-                                                    <span className="text-xs">Shew</span>
-                                                </span>
-                                            )}
-                                        </button>
-                                    </div>
+                                        }}
+                                        className="input text-sm"
+                                    >
+                                        <option value="none">No Authentication</option>
+                                        <option value="Bearer">Bearer Token</option>
+                                        <option value="Basic">Basic Auth</option>
+                                        <option value="Raw">Raw Header</option>
+                                    </select>
                                 </div>
-                            )}
+
+                                {/* Auth Value Field (conditional) */}
+                                {provider.auth && (
+                                    <div className="flex flex-col gap-1">
+                                        <label className="text-xs font-medium opacity-70">
+                                            Auth Value <span className="text-red-500">*</span>
+                                        </label>
+
+                                        <div className="relative">
+                                            <input
+                                                type={showAuthValues[index] ? "text" : "password"}
+                                                value={provider.auth.value}
+                                                onChange={(e) => updateAuth(index, provider.auth!.type, e.target.value)}
+                                                placeholder={
+                                                    provider.auth.type === 'Bearer' ? 'your-bearer-token' :
+                                                        provider.auth.type === 'Basic' ? 'user:pass (base64 encoded)' :
+                                                            'custom-header-value'
+                                                }
+                                                className={classNames("input text-sm", {
+                                                    'border-red-500 focus:border-red-500': provider.auth && !provider.auth.value.trim()
+                                                })}
+                                                style={{ paddingRight: '88px' }}
+                                                autoComplete="off"
+                                            />
+                                            <button
+                                                type="button"
+                                                onClick={() => toggleAuthVisibility(index)}
+                                                className="absolute top-1/2 -translate-y-1/2 text-gray-500 hover:text-gray-700 dark:text-gray-400 dark:hover:text-gray-200 flex items-center gap-1 py-2 pr-2 pl-2"
+                                                style={{ right: '0px' }}
+                                                title={showAuthValues[index] ? "Hide" : "Show"}
+                                            >
+                                                {showAuthValues[index] ? (
+                                                    // Eye icon (visible/show state)
+                                                    <span className="flex items-center gap-1">
+                                                        <svg width="20" height="20" viewBox="0 0 576 512" fill="currentColor" className="inline-block">
+                                                            <path d="M38.8 5.1C28.4-3.1 13.3-1.2 5.1 9.2S-1.2 34.7 9.2 42.9l592 464c10.4 8.2 25.5 6.3 33.7-4.1s6.3-25.5-4.1-33.7L525.6 386.7c39.6-40.6 66.4-86.1 79.9-118.4c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C465.5 68.8 400.8 32 320 32c-68.2 0-125 26.3-169.3 60.8L38.8 5.1zM223.1 149.5C248.6 126.2 282.7 112 320 112c79.5 0 144 64.5 144 144c0 24.9-6.3 48.3-17.4 68.7L408 294.5c8.4-19.3 10.6-41.4 4.8-63.3c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3c0 10.2-2.4 19.8-6.6 28.3l-90.3-70.8zM373 389.9c-16.4 6.5-34.3 10.1-53 10.1c-79.5 0-144-64.5-144-144c0-6.9 .5-13.6 1.4-20.2L83.1 161.5C60.3 191.2 44 220.8 34.5 243.7c-3.3 7.9-3.3 16.7 0 24.6c14.9 35.7 46.2 87.7 93 131.1C174.5 443.2 239.2 480 320 480c47.8 0 89.9-12.9 126.2-32.5L373 389.9z"></path>
+                                                        </svg>
+                                                        <span className="text-xs">Hide</span>
+                                                    </span>
+                                                ) : (
+                                                    // Eye-off icon (hidden state)
+                                                    <span className="flex items-center gap-1">
+                                                        <svg width="20" height="20" viewBox="0 0 640 512" fill="currentColor" className="inline-block">
+                                                            <path d="M288 32c-80.8 0-145.5 36.8-192.6 80.6C48.6 156 17.3 208 2.5 243.7c-3.3 7.9-3.3 16.7 0 24.6C17.3 304 48.6 356 95.4 399.4C142.5 443.2 207.2 480 288 480s145.5-36.8 192.6-80.6c46.8-43.5 78.1-95.4 93-131.1c3.3-7.9 3.3-16.7 0-24.6c-14.9-35.7-46.2-87.7-93-131.1C433.5 68.8 368.8 32 288 32zM144 256a144 144 0 1 1 288 0 144 144 0 1 1 -288 0zm144-64c0 35.3-28.7 64-64 64c-7.1 0-13.9-1.2-20.3-3.3c-5.5-1.8-11.9 1.6-11.7 7.4c.3 6.9 1.3 13.8 3.2 20.7c13.7 51.2 66.4 81.6 117.6 67.9s81.6-66.4 67.9-117.6c-11.1-41.5-47.8-69.4-88.6-71.1c-5.8-.2-9.2 6.1-7.4 11.7c2.1 6.4 3.3 13.2 3.3 20.3z"></path>
+                                                        </svg>
+                                                        <span className="text-xs">Show</span>
+                                                    </span>
+                                                )}
+                                            </button>
+                                        </div>
+                                    </div>
+                                )}
+                            </div>
+
+                            {/* Remove Button */}
+                            <button
+                                type="button"
+                                onClick={() => removeProvider(index)}
+                                className="px-2 py-1 text-red-500 hover:text-red-700 text-sm"
+                                title="Remove provider"
+                            >
+                                ✕
+                            </button>
                         </div>
 
-                        {/* Remove Button */}
-                        <button
-                            type="button"
-                            onClick={() => removeProvider(index)}
-                            className="px-2 py-1 text-red-500 hover:text-red-700 text-sm"
-                            title="Remove provider"
-                        >
-                            ✕
-                        </button>
+                        {/* Error message for this specific provider */}
+                        {error && (
+                            <span className="text-xs text-red-500">
+                                {error}
+                            </span>
+                        )}
                     </div>
-                </div>
-            ))}
+                );
+            })}
 
             {/* Add Provider Button */}
             <button
@@ -180,17 +206,11 @@ export function RpcProviderEditor({ providers, onChange, label }: RpcProviderEdi
                 + Add RPC Provider
             </button>
 
-            {/* Validation Message */}
-            {providers.length > 0 && hasEmptyRequired && (
-                <span className="text-xs text-red-500">
-          All providers must have a valid WebSocket URL
-        </span>
-            )}
-
-            {providers.length > 0 && !hasEmptyRequired && (
+            {/* Overall validation summary */}
+            {providers.length > 0 && !hasErrors && (
                 <span className="text-xs text-gray-500">
-          {providers.length} provider{providers.length !== 1 ? 's' : ''} configured
-        </span>
+                    {providers.length} provider{providers.length !== 1 ? 's' : ''} to be added
+                </span>
             )}
         </div>
     );
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index 5ada9e778..9430ea1fd 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -54,24 +54,19 @@ function CommitDotOsName({
     const [customRouters, setCustomRouters] = useState('')
     const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
-    // Modified setDirect function to handle mutual exclusivity
+    // Modified setDirect function - no longer clears custom routers
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
         if (value) {
             setSpecifyRouters(false);
-            setCustomRouters(''); // Clear custom routers when switching to direct
-            setRouterValidationErrors([]);
         }
     };
 
-    // Modified setSpecifyRouters function to handle mutual exclusivity
+    // Modified setSpecifyRouters function - no longer clears custom routers
     const handleSetSpecifyRouters = (value: boolean) => {
         setSpecifyRouters(value);
         if (value) {
             setDirect(false);
-        } else {
-            setCustomRouters(''); // Clear custom routers when unchecking
-            setRouterValidationErrors([]);
         }
     };
 
@@ -144,11 +139,13 @@ function CommitDotOsName({
         setName(toAscii(name));
         console.log("committing to .os name: ", name)
 
+        // Process custom routers only if the checkbox is checked
         if (specifyRouters && customRouters.trim()) {
             const routersToUse = getValidCustomRouters();
-
-            // Update the routers in your app state for the next page to use
             setRouters(routersToUse);
+        } else {
+            // Clear routers in app state if not specifying custom routers
+            setRouters([]);
         }
 
         const commit = keccak256(
@@ -269,29 +266,28 @@ function CommitDotOsName({
                                         )}
                                     </div>
                                 </details>
-
-                                <div className="flex flex-col gap-1">
-                                    <button
-                                        disabled={nameValidities.length !== 0 ||
-                                            isPending ||
-                                            isConfirming ||
-                                            (specifyRouters && !isCustomRoutersValid())
-                                        }
-                                        type="submit"
-                                        className="button"
-                                    >
-                                        Register name
-                                    </button>
-                                    <Link to="/reset" className="button clear">
-                                        Already have a node?
-                                    </Link>
-                                    <BackButton mode="wide" />
-                                </div>
+                                <p className="text-sm text-gray-500">
+                                    By registering a name, you agree to the terms of service at <a href="https://hyperwareware.xyz/tos">hyperwareware.xyz/tos</a>.
+                                </p>
+                                <button
+                                    type="submit"
+                                    className="button"
+                                    disabled={
+                                        isPending ||
+                                        isConfirming ||
+                                        nameValidities.length !== 0 ||
+                                        (specifyRouters && !isCustomRoutersValid())
+                                    }
+                                >
+                                    Pre-commit
+                                </button>
+
+                                <BackButton mode="wide" />
                             </>
                         )}
                         {isError && (
                             <p className="text-red-500 wrap-anywhere mt-2">
-                                Error: {error?.message || 'There was an error registering your name, please try again.'}
+                                Error: {error?.message || "An error occurred, please try again."}
                             </p>
                         )}
                     </form>
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index 20701bd12..d829f9522 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -345,11 +345,6 @@ function Login({
                     onChange={setRpcProviders}
                     label="Base L2 RPC Providers"
                 />
-                {hasInvalidRpcProviders && (
-                    <div className="text-xs text-red-500 mt-2">
-                      All RPC provider URLs must be secure WebSocket URLs starting with wss://
-                    </div>
-                )}
               </div>
           )}
         </div>
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index dd3407bb5..661c9226e 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -49,24 +49,19 @@ function MintCustom({
     const [customRouters, setCustomRouters] = useState('')
     const [routerValidationErrors, setRouterValidationErrors] = useState<string[]>([])
 
-    // Modified setDirect function to handle mutual exclusivity
+    // Modified setDirect function - no longer clears custom routers
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
         if (value) {
             setSpecifyRouters(false);
-            setCustomRouters(''); // Clear custom routers when switching to direct
-            setRouterValidationErrors([]);
         }
     };
 
-    // Modified setSpecifyRouters function to handle mutual exclusivity
+    // Modified setSpecifyRouters function - no longer clears custom routers
     const handleSetSpecifyRouters = (value: boolean) => {
         setSpecifyRouters(value);
         if (value) {
             setDirect(false);
-        } else {
-            setCustomRouters(''); // Clear custom routers when unchecking
-            setRouterValidationErrors([]);
         }
     };
 
@@ -138,14 +133,15 @@ function MintCustom({
             return
         }
 
-        // Process custom routers if specified
+        // Process custom routers only if the checkbox is checked
         let routersToUse: string[] = [];
         if (specifyRouters && customRouters.trim()) {
             routersToUse = getValidCustomRouters();
-
-            // Update the routers in your app state
             setRouters(routersToUse);
             console.log("Custom routers:", routersToUse);
+        } else {
+            // Clear routers in app state if not specifying custom routers
+            setRouters([]);
         }
 
         const initCall = await generateNetworkingKeys({
@@ -259,26 +255,24 @@ function MintCustom({
                                         )}
                                     </div>
                                 </details>
-                                <div className="flex flex-col gap-1">
-                                    <button
-                                        type="submit"
-                                        className="button"
-                                        disabled={
-                                            isPending ||
-                                            isConfirming ||
-                                            !hnsName ||
-                                            (specifyRouters && !isCustomRoutersValid())
-                                        }>
-                                        Mint custom name
-                                    </button>
-
-                                    <BackButton mode="wide" />
-                                </div>
+                                <button
+                                    type="submit"
+                                    className="button"
+                                    disabled={
+                                        isPending ||
+                                        isConfirming ||
+                                        (specifyRouters && !isCustomRoutersValid())
+                                    }
+                                >
+                                    Mint Custom Name
+                                </button>
+
+                                <BackButton mode="wide" />
                             </>
                         )}
                         {isError && (
                             <p className="text-red-500 wrap-anywhere mt-2">
-                                Error: {error?.message || 'There was an error minting your name, please try again.'}
+                                Error: {error?.message || "An error occurred, please try again."}
                             </p>
                         )}
                     </form>
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index 3dd8ec8ae..26211d481 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -62,24 +62,19 @@ function ResetHnsName({
     const [initiallyDirect, setInitiallyDirect] = useState<boolean | undefined>(undefined);
     const [initiallySpecifyRouters, setInitiallySpecifyRouters] = useState<boolean | undefined>(undefined);
 
-    // Modified setDirect function to handle mutual exclusivity
+    // Modified setDirect function - no longer clears custom routers
     const handleSetDirect = (value: boolean) => {
         setDirect(value);
         if (value) {
             setSpecifyRouters(false);
-            setCustomRouters(''); // Clear custom routers when switching to direct
-            setRouterValidationErrors([]);
         }
     };
 
-    // Modified setSpecifyRouters function to handle mutual exclusivity
+    // Modified setSpecifyRouters function - no longer clears custom routers
     const handleSetSpecifyRouters = (value: boolean) => {
         setSpecifyRouters(value);
         if (value) {
             setDirect(false);
-        } else {
-            setCustomRouters(''); // Clear custom routers when unchecking
-            setRouterValidationErrors([]);
         }
     };
 
@@ -183,14 +178,16 @@ function ResetHnsName({
             }
 
             setHnsName(name);
-            // Process custom routers if specified
+
+            // Process custom routers only if the checkbox is checked
             let routersToUse: string[] = [];
             if (specifyRouters && customRouters.trim()) {
                 routersToUse = getValidCustomRouters();
-
-                // Update the routers in your app state
                 setRouters(routersToUse);
                 console.log("Custom routers:", routersToUse);
+            } else {
+                // Clear routers in app state if not specifying custom routers
+                setRouters([]);
             }
 
             try {
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index 2a232f934..19626108a 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -394,11 +394,6 @@ function SetPassword({
                             onChange={setRpcProviders}
                             label="Base L2 RPC Providers"
                         />
-                        {hasInvalidRpcProviders && (
-                            <div className="text-xs text-red-500 mt-2">
-                              All RPC provider URLs must be secure WebSocket URLs starting with wss://
-                            </div>
-                        )}
                       </div>
                   )}
                 </div>

From 33f32b142def60f6e4b5a61bcd2dd0db173d1dd9 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Tue, 7 Oct 2025 10:30:39 -0400
Subject: [PATCH 22/27] =?UTF-8?q?don=E2=80=99t=20autoclear=20cache-sources?=
 =?UTF-8?q?=20on=20toggle?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 hyperdrive/src/main.rs                           | 16 ----------------
 .../components/SpecifyCacheSourcesCheckbox.tsx   | 16 ++++++++++++----
 hyperdrive/src/register-ui/src/pages/Login.tsx   |  8 ++------
 .../src/register-ui/src/pages/SetPassword.tsx    |  8 ++------
 hyperdrive/src/register.rs                       |  9 ---------
 5 files changed, 16 insertions(+), 41 deletions(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 6bf6a946b..8c306cdb2 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -483,8 +483,6 @@ async fn main() {
             e
         );
         // You might want to handle this error based on your needs
-    } else {
-        println!("✓ Created directory structure: {}", initfiles_dir.display());
     }
 
     // Create the cache_sources file with test content
@@ -497,8 +495,6 @@ async fn main() {
 
     if let Err(e) = tokio::fs::write(&data_file_path, cache_json).await {
         eprintln!("Warning: Failed to write cache data to file: {}", e);
-    } else {
-        println!("✓ Created test file: {}", data_file_path.display());
     }
 
     // Create the second directory structure for hns-indexer:sys
@@ -512,11 +508,6 @@ async fn main() {
             hns_initfiles_dir.display(),
             e
         );
-    } else {
-        println!(
-            "✓ Created directory structure: {}",
-            hns_initfiles_dir.display()
-        );
     }
 
     // Create the cache_sources file in the second location
@@ -524,12 +515,9 @@ async fn main() {
 
     if let Err(e) = tokio::fs::write(&hns_data_file_path, cache_json_clone).await {
         eprintln!("Warning: Failed to write cache data to second file: {}", e);
-    } else {
-        println!("✓ Created test file: {}", hns_data_file_path.display());
     }
 
     let mut tasks = tokio::task::JoinSet::<Result<()>>::new();
-    println!("spawning the kernel task\r");
     tasks.spawn(kernel::kernel(
         our.clone(),
         networking_keypair_arc.clone(),
@@ -561,7 +549,6 @@ async fn main() {
             })
             .collect(),
     ));
-    println!("spawning the net task\r");
     tasks.spawn(net::networking(
         our.clone(),
         our_ip.to_string(),
@@ -631,7 +618,6 @@ async fn main() {
         timer_service_receiver,
         print_sender.clone(),
     ));
-    println!("spawning the eth task\r");
     tasks.spawn(eth::provider(
         our.name.clone(),
         home_directory_path.clone(),
@@ -1027,12 +1013,10 @@ async fn serve_register_fe(
                     Some(cache_sources)
                 }
                 _ => {
-                    println!("Failed to parse cache_sources or empty, using default empty list\r");
                     Some(Vec::new())
                 }
             },
             Err(_) => {
-                println!("cache_sources not found, using default empty list\r");
                 Some(Vec::new())
             }
         }
diff --git a/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
index 8b3c86e01..fad52290f 100644
--- a/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/SpecifyCacheSourcesCheckbox.tsx
@@ -1,3 +1,4 @@
+
 import { CacheSourceTooltip } from "./CacheSourceTooltip";
 import { FaSquareCheck, FaRegSquare } from "react-icons/fa6";
 
@@ -10,8 +11,17 @@ interface SpecifyCacheSourcesCheckboxProps {
 export default function SpecifyCacheSourcesCheckbox({
                                                         specifyCacheSources,
                                                         setSpecifyCacheSources,
-                                                        initiallyChecked = false
+                                                        initiallyChecked
                                                     }: SpecifyCacheSourcesCheckboxProps) {
+    const getHelpText = () => {
+        if (initiallyChecked === undefined) {
+            return "If you are unsure, leave unchecked.";
+        }
+        return initiallyChecked
+            ? "If you are unsure, leave checked."
+            : "If you are unsure, leave unchecked.";
+    };
+
     return (
         <div className="flex gap-2 items-center">
             <button className="icon" onClick={(e) => {
@@ -23,9 +33,7 @@ export default function SpecifyCacheSourcesCheckbox({
             </button>
             <div className="flex flex-col gap-1 flex-1 min-w-0 wrap-anywhere">
                 <span className="text-sm">Specify cache sources.</span>
-                <span className="text-xs">
-                    If you are unsure, leave {initiallyChecked ? 'checked' : 'unchecked'}.
-                </span>
+                <span className="text-xs">{getHelpText()}</span>
             </div>
             <CacheSourceTooltip />
         </div>
diff --git a/hyperdrive/src/register-ui/src/pages/Login.tsx b/hyperdrive/src/register-ui/src/pages/Login.tsx
index d829f9522..fd6a08d13 100644
--- a/hyperdrive/src/register-ui/src/pages/Login.tsx
+++ b/hyperdrive/src/register-ui/src/pages/Login.tsx
@@ -109,13 +109,9 @@ function Login({
     })();
   }, []); // eslint-disable-line react-hooks/exhaustive-deps
 
-  // Modified setSpecifyCacheSources function to handle clearing
+  // Modified setSpecifyCacheSources function - no longer clears cache sources
   const handleSetSpecifyCacheSources = (value: boolean) => {
     setSpecifyCacheSources(value);
-    if (!value) {
-      setCustomCacheSources('');
-      setCacheSourceValidationErrors([]);
-    }
   };
 
   // Validate custom cache sources against the regex
@@ -170,7 +166,7 @@ function Login({
 
         setLoading("Logging in...");
         try {
-          // Process custom cache sources if specified
+          // Process custom cache sources only if checkbox is checked
           let cacheSourcesToUse: string[] | undefined = undefined;
           if (specifyCacheSources && customCacheSources.trim()) {
             cacheSourcesToUse = getValidCustomCacheSources();
diff --git a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
index 19626108a..ad1afbacf 100644
--- a/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
+++ b/hyperdrive/src/register-ui/src/pages/SetPassword.tsx
@@ -117,13 +117,9 @@ function SetPassword({
     setError("");
   }, [pw, pw2]);
 
-  // Modified setSpecifyCacheSources function to handle clearing
+  // Modified setSpecifyCacheSources function - no longer clears cache sources
   const handleSetSpecifyCacheSources = (value: boolean) => {
     setSpecifyCacheSources(value);
-    if (!value) {
-      setCustomCacheSources('');
-      setCacheSourceValidationErrors([]);
-    }
   };
 
   // Validate custom cache sources against the regex
@@ -183,7 +179,7 @@ function SetPassword({
         setTimeout(async () => {
           setLoading(true);
 
-          // Process custom cache sources if specified
+          // Process custom cache sources only if checkbox is checked
           let cacheSourcesToUse: string[] | undefined = undefined;
           if (specifyCacheSources && customCacheSources.trim()) {
             cacheSourcesToUse = getValidCustomCacheSources();
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 7a65834e2..08b4c790e 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -391,15 +391,6 @@ async fn handle_boot(
             Vec::new()
         };
 
-    if let Some(custom_base_l2_providers) = &info.custom_base_l2_access_providers {
-        println!(
-            "Custom Base L2 access providers specified: {:?}\r",
-            custom_base_l2_providers
-        );
-    } else {
-        println!("No custom Base L2 access providers specified\r");
-    }
-
     let jwt_seed = SystemRandom::new();
     let mut jwt_secret = [0u8, 32];
     ring::rand::SecureRandom::fill(&jwt_seed, &mut jwt_secret).unwrap();

From a7bb7ea4d5f7c2fdd39cd52cc807091a6ee7bce3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 14:31:29 +0000
Subject: [PATCH 23/27] Format Rust code using rustfmt

---
 hyperdrive/src/main.rs     | 13 +++----------
 hyperdrive/src/register.rs |  6 ++----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 8c306cdb2..a14bc7d80 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -1006,19 +1006,12 @@ async fn serve_register_fe(
         match tokio::fs::read_to_string(&data_file_path).await {
             Ok(contents) => match serde_json::from_str::<Vec<String>>(&contents) {
                 Ok(cache_sources) if !cache_sources.is_empty() => {
-                    println!(
-                        "Loaded cache sources: {:?}\r",
-                        cache_sources
-                    );
+                    println!("Loaded cache sources: {:?}\r", cache_sources);
                     Some(cache_sources)
                 }
-                _ => {
-                    Some(Vec::new())
-                }
+                _ => Some(Vec::new()),
             },
-            Err(_) => {
-                Some(Vec::new())
-            }
+            Err(_) => Some(Vec::new()),
         }
     };
 
diff --git a/hyperdrive/src/register.rs b/hyperdrive/src/register.rs
index 08b4c790e..247fd3209 100644
--- a/hyperdrive/src/register.rs
+++ b/hyperdrive/src/register.rs
@@ -321,7 +321,7 @@ async fn get_unencrypted_info(
                     warp::reply::json(&"keyfile deserialization went wrong".to_string()),
                     StatusCode::UNAUTHORIZED,
                 )
-                    .into_response())
+                .into_response())
             }
         },
         None => (None, None, StatusCode::NOT_FOUND),
@@ -337,9 +337,7 @@ async fn get_unencrypted_info(
             .unwrap_or_default(),
     };
 
-    return Ok(
-        warp::reply::with_status(warp::reply::json(&response), status_code).into_response(),
-    );
+    return Ok(warp::reply::with_status(warp::reply::json(&response), status_code).into_response());
 }
 
 async fn generate_networking_info(our_temp_id: Arc<Identity>) -> Result<impl Reply, Rejection> {

From 00aae21407e4e1393e9d262715ab57c1a95b06b2 Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Tue, 7 Oct 2025 10:55:06 -0400
Subject: [PATCH 24/27] trivial cleanup

---
 .../packages/hypermap-cacher/hypermap-cacher/src/lib.rs  | 4 +---
 hyperdrive/src/eth/mod.rs                                | 9 ---------
 hyperdrive/src/eth_config_utils.rs                       | 1 -
 hyperdrive/src/main.rs                                   | 5 +----
 4 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index bc6f624d3..2b5106d7a 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -1265,12 +1265,10 @@ fn handle_request(
             }
             state.nodes = new_nodes;
             state.save();
-            info!("Nodes have been saved to state");
             if let Err(e) = state.write_nodes_to_file() {
                 error!("Failed to write nodes to cache_sources: {:?}", e);
             }
-            info!("If statement complete");
-            info!("Nodes updated to: {:?}", state.nodes);
+]            info!("Nodes updated to: {:?}", state.nodes);
             CacherResponse::SetNodes(Ok("Nodes updated successfully".to_string()))
         }
         CacherRequest::Reset(custom_nodes) => {
diff --git a/hyperdrive/src/eth/mod.rs b/hyperdrive/src/eth/mod.rs
index c9835f434..9b5d3630e 100644
--- a/hyperdrive/src/eth/mod.rs
+++ b/hyperdrive/src/eth/mod.rs
@@ -1469,15 +1469,6 @@ async fn handle_eth_config_action(
         .await
         {
             verbose_print(&state.print_tx, "eth: saved new provider settings").await;
-
-            /* TODO CLEANUP
-            // Also update the base L2 providers in options config
-            if let Err(e) = crate::options_config_utils::update_base_l2_providers_from_saved_configs(&saved_configs).await {
-                verbose_print(&state.print_tx, &format!("eth: failed to update base L2 providers in options config: {}", e)).await;
-            } else {
-                verbose_print(&state.print_tx, "eth: updated base L2 providers in options config").await;
-            }
-            */
         };
     }
     if provider_not_found {
diff --git a/hyperdrive/src/eth_config_utils.rs b/hyperdrive/src/eth_config_utils.rs
index c6c2e3d90..b5b713b43 100644
--- a/hyperdrive/src/eth_config_utils.rs
+++ b/hyperdrive/src/eth_config_utils.rs
@@ -39,7 +39,6 @@ pub fn add_provider_to_config(
 }
 
 /// Extract unauthenticated RPC URLs from SavedConfigs
-/// Similar to update_base_l2_providers_from_saved_configs but just returns the Vec
 pub fn extract_rpc_url_providers_for_default_chain(
     saved_configs: &lib::eth::SavedConfigs,
 ) -> Vec<lib::eth::NodeOrRpcUrl> {
diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index a14bc7d80..5bd6785c2 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -319,9 +319,6 @@ async fn main() {
 
     is_eth_provider_config_updated = false;
 
-    //let cache_source_vector_for_config = cache_source_vector.clone();
-    //let base_l2_access_source_vector_for_config = base_l2_access_source_vector.clone();
-
     if !base_l2_access_source_vector.is_empty() {
         // Process in reverse order so the first entry in the vector becomes highest priority
         for (_reverse_index, provider_str) in
@@ -1234,4 +1231,4 @@ pub fn deserialize_rpc_providers_from_ui(
             })
         })
         .collect()
-}
+}
\ No newline at end of file

From 1f2d7e83a02f4b2a303d11f05613d4bf5b3b40ef Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Tue, 7 Oct 2025 11:01:15 -0400
Subject: [PATCH 25/27] extraneous character

---
 hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
index 2b5106d7a..e64affc86 100644
--- a/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
+++ b/hyperdrive/packages/hypermap-cacher/hypermap-cacher/src/lib.rs
@@ -1268,7 +1268,7 @@ fn handle_request(
             if let Err(e) = state.write_nodes_to_file() {
                 error!("Failed to write nodes to cache_sources: {:?}", e);
             }
-]            info!("Nodes updated to: {:?}", state.nodes);
+            info!("Nodes updated to: {:?}", state.nodes);
             CacherResponse::SetNodes(Ok("Nodes updated successfully".to_string()))
         }
         CacherRequest::Reset(custom_nodes) => {

From 721c91d1b86fead9adcdf76db7707205ff75a31d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Oct 2025 15:01:40 +0000
Subject: [PATCH 26/27] Format Rust code using rustfmt

---
 hyperdrive/src/main.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hyperdrive/src/main.rs b/hyperdrive/src/main.rs
index 5bd6785c2..021950a88 100644
--- a/hyperdrive/src/main.rs
+++ b/hyperdrive/src/main.rs
@@ -1231,4 +1231,4 @@ pub fn deserialize_rpc_providers_from_ui(
             })
         })
         .collect()
-}
\ No newline at end of file
+}

From 361c8e8dbbbcb14e599570876cf9cdf7ba7d66ab Mon Sep 17 00:00:00 2001
From: Johnathan Reale <johnathanreale@icloud.com>
Date: Wed, 8 Oct 2025 08:37:35 -0400
Subject: [PATCH 27/27] UI changes as per PR review request

---
 .../register-ui/src/components/SpecifyRoutersCheckbox.tsx    | 2 +-
 hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx     | 5 +----
 hyperdrive/src/register-ui/src/pages/MintCustom.tsx          | 2 +-
 hyperdrive/src/register-ui/src/pages/ResetName.tsx           | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx b/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
index 02ec264f2..5c9c011c9 100644
--- a/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
+++ b/hyperdrive/src/register-ui/src/components/SpecifyRoutersCheckbox.tsx
@@ -34,7 +34,7 @@ export default function SpecifyRoutersCheckbox({
                 {specifyRouters ? <FaSquareCheck /> : <FaRegSquare />}
             </button>
             <div className="flex flex-col gap-1 min-w-0 wrap-anywhere">
-                <span className="text-sm">Specify routers to register as an indirect node.</span>
+                <span className="text-sm">Register as indirect node with non-default routers.</span>
                 <span className="text-xs">{getHelpText()}</span>
             </div>
             <RouterTooltip />
diff --git a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
index 9430ea1fd..23f7c8bb3 100644
--- a/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/CommitDotOsName.tsx
@@ -224,7 +224,7 @@ function CommitDotOsName({
                                 </p>
                                 <EnterHnsName {...enterOsNameProps} />
                                 <details className="advanced-options">
-                                    <summary>Network Options</summary>
+                                    <summary>Advanced Network Options</summary>
                                     <div className="flex flex-col gap-3">
                                         <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
                                         <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
@@ -266,9 +266,6 @@ function CommitDotOsName({
                                         )}
                                     </div>
                                 </details>
-                                <p className="text-sm text-gray-500">
-                                    By registering a name, you agree to the terms of service at <a href="https://hyperwareware.xyz/tos">hyperwareware.xyz/tos</a>.
-                                </p>
                                 <button
                                     type="submit"
                                     className="button"
diff --git a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
index 661c9226e..543c01d4d 100644
--- a/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
+++ b/hyperdrive/src/register-ui/src/pages/MintCustom.tsx
@@ -213,7 +213,7 @@ function MintCustom({
                                 <input type="text" name="full-hns-name" placeholder="Enter full HNS name" />
                                 <input type="text" name="tba" placeholder="Enter TBA to mint under" />
                                 <details className="advanced-options">
-                                    <summary>Network Options</summary>
+                                    <summary>Advanced Network Options</summary>
                                     <div className="flex flex-col gap-3">
                                         <DirectNodeCheckbox direct={direct} setDirect={handleSetDirect} />
                                         <SpecifyRoutersCheckbox specifyRouters={specifyRouters} setSpecifyRouters={handleSetSpecifyRouters} />
diff --git a/hyperdrive/src/register-ui/src/pages/ResetName.tsx b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
index 26211d481..ef447ba8e 100644
--- a/hyperdrive/src/register-ui/src/pages/ResetName.tsx
+++ b/hyperdrive/src/register-ui/src/pages/ResetName.tsx
@@ -249,7 +249,7 @@ function ResetHnsName({
                                     Nodes use an onchain username in order to identify themselves to other nodes in the network.
                                 </p>
                                 <details className="advanced-options">
-                                    <summary>Network Options</summary>
+                                    <summary>Advanced Network Options</summary>
                                     <div className="flex flex-col gap-3">
                                         <DirectNodeCheckbox
                                             direct={direct}