Add PBaaS chain friendly names and identity search enhancements

vdappdev2 · vdappdev2 · commit 112cb5a9cfe8 · 2025-11-17T22:36:03.000-05:00
- Implement multichain friendly name display via RPC discovery
- Add i-address search support in identity lookup
- Restrict take offer primary addresses to R-addresses only
- Update preallocation manager text for clarity
diff --git a/src-tauri/src/rpc/chain_discovery.rs b/src-tauri/src/rpc/chain_discovery.rs
@@ -344,8 +344,8 @@ fn apply_fallback_names(chains: &mut [ChainConfig]) {
 fn get_fallback_display_name(currencyidhex: &str) -> Option<&'static str> {
     // ONLY mainnet PBaaS chains - NO testnet chains
     match currencyidhex {
-        "e9e10955b7d16031e3d6f55d9c908a038e3ae47d" => Some("VARRR"),
-        "53fe39eea8c06bba32f1a4e20db67e5524f0309d" => Some("VDEX"),
+        "e9e10955b7d16031e3d6f55d9c908a038e3ae47d" => Some("vARRR"),
+        "53fe39eea8c06bba32f1a4e20db67e5524f0309d" => Some("vDEX"),
         "f315367528394674d45277e369629605a1c3ce9f" => Some("CHIPS"),
         _ => None,
     }
diff --git a/src/lib/components/BlockHeightHeader.svelte b/src/lib/components/BlockHeightHeader.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
-  import { connectionStore, getChainParam, type ChainConfig, type ConnectionState } from "$lib/stores/connection";
+  import { connectionStore, getChainParam, getChainDisplayName, type ChainConfig, type ConnectionState } from "$lib/stores/connection";
   import { onDestroy } from "svelte";
 
   let blockHeight = $state<number | null>(null);
@@ -219,7 +219,7 @@
           >
             {#each connectionState.availableChains as chain}
               <option value={chain.name} class="bg-white dark:bg-verusidx-stone-dark">
-                {chain.name.toUpperCase()} {chain.is_active ? '🟢' : '🔴'}
+                {chain.display_name} {chain.is_active ? '🟢' : '🔴'}
               </option>
             {/each}
           </select>
@@ -231,7 +231,7 @@
         {:else}
           <!-- Static display when only one chain or loading -->
           <span class="font-medium text-verusidx-stone-dark dark:text-white">
-            {connectionState.selectedChain?.toUpperCase() || connectionState?.current?.chainName?.toUpperCase() || 'Unknown'}
+            {getChainDisplayName(connectionState, connectionState.selectedChain)}
             {#if isLoadingChains}
               <span class="text-xs text-verusidx-mountain-grey dark:text-verusidx-mountain-mist ml-1">(Loading chains...)</span>
             {/if}
diff --git a/src/lib/components/IdentityOfferForm.svelte b/src/lib/components/IdentityOfferForm.svelte
@@ -61,6 +61,7 @@
   let hasLoadedSourceAddresses = $state(false);
   let hasLoadedPrivateAddresses = $state(false);
   let addressLoadingError = $state<string | null>(null);
+  let showManualPrimaryInput = $state(false);
 
   // Load addresses when component mounts
   $effect(() => {
@@ -71,41 +72,25 @@
 
   async function loadSourceAddresses() {
     if (isLoadingSourceAddresses || hasLoadedSourceAddresses) return;
-    
+
     isLoadingSourceAddresses = true;
     hasLoadedSourceAddresses = false;
-    
+
     try {
-      const allAddresses = [];
-      
-      // Get addresses by account (default account "")
+      // Get addresses by account (default account "") - R-addresses only for primary addresses
       try {
         const addresses = await invoke('get_addresses_by_account', { account: "" });
         if (Array.isArray(addresses)) {
-          allAddresses.push(...addresses);
-          console.log('✅ Loaded addresses from default account:', addresses.length);
+          sourceAddresses = addresses;
+          console.log('✅ IdentityOfferForm: Loaded', addresses.length, 'R-addresses for primary addresses');
         }
       } catch (err) {
         console.error('Failed to load addresses by account:', err);
+        addressLoadingError = `Failed to load R-addresses: ${err}`;
       }
-      
-      // Also get private addresses from z_list_addresses
-      try {
-        const privateAddressList = await invoke('z_list_addresses');
-        if (Array.isArray(privateAddressList)) {
-          allAddresses.push(...privateAddressList);
-          console.log('✅ Loaded private addresses:', privateAddressList.length);
-        }
-      } catch (err) {
-        console.error('Failed to load private addresses:', err);
-      }
-      
-      sourceAddresses = allAddresses;
+
       hasLoadedSourceAddresses = true;
-      console.log('✅ IdentityOfferForm: Loaded', allAddresses.length, 'source addresses');
-      
-      // Do not auto-populate - let user explicitly select an address
-      
+
     } catch (err) {
       console.error('Critical error in loadSourceAddresses:', err);
       addressLoadingError = `Failed to load source addresses: ${err}`;
@@ -162,6 +147,22 @@
     }
   }
 
+  function handlePrimaryAddressDropdownChange(event: Event) {
+    const target = event.target as HTMLSelectElement;
+    if (target.value === '__MANUAL__') {
+      showManualPrimaryInput = true;
+      localIdentityData.primaryAddresses[0] = '';
+    } else {
+      showManualPrimaryInput = false;
+      localIdentityData.primaryAddresses[0] = target.value;
+    }
+  }
+
+  function switchToDropdown() {
+    showManualPrimaryInput = false;
+    localIdentityData.primaryAddresses[0] = '';
+  }
+
   function notifyChange() {
     // Pass camelCase for internal component communication (consistency with other forms)
     // The conversion to lowercase for RPC happens in the parent component
@@ -258,36 +259,58 @@
       {#each localIdentityData.primaryAddresses as _, index}
         <div class="flex space-x-2 mb-2">
           {#if index === 0}
-            <!-- First address: dropdown from loaded addresses -->
-            <select 
-              bind:value={localIdentityData.primaryAddresses[index]}
-              required
-              disabled={disabled || isLoadingSourceAddresses}
-              class="flex-1 p-3 border border-verusidx-mountain-mist dark:border-verusidx-stone-medium rounded-lg bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white disabled:opacity-50"
-            >
-              <option value="">
-                {#if isLoadingSourceAddresses}
-                  Loading addresses...
-                {:else if hasLoadedSourceAddresses && sourceAddresses.length === 0}
-                  No addresses available
-                {:else if !hasLoadedSourceAddresses}
-                  Failed to load addresses
-                {:else}
-                  Select address
-                {/if}
-              </option>
-              {#each sourceAddresses as addr}
-                <option value={addr}>{addr}{addr.startsWith('z') ? ' (Private)' : ' (Transparent)'}</option>
-              {/each}
-            </select>
+            <!-- First address: dropdown or manual input -->
+            {#if !showManualPrimaryInput}
+              <select
+                onchange={handlePrimaryAddressDropdownChange}
+                value={localIdentityData.primaryAddresses[index]}
+                required
+                disabled={disabled || isLoadingSourceAddresses}
+                class="flex-1 p-3 border border-verusidx-mountain-mist dark:border-verusidx-stone-medium rounded-lg bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white disabled:opacity-50"
+              >
+                <option value="">
+                  {#if isLoadingSourceAddresses}
+                    Loading addresses...
+                  {:else if hasLoadedSourceAddresses && sourceAddresses.length === 0}
+                    No addresses available
+                  {:else if !hasLoadedSourceAddresses}
+                    Failed to load addresses
+                  {:else}
+                    Select primary address...
+                  {/if}
+                </option>
+                <option value="__MANUAL__">Input address manually</option>
+                {#each sourceAddresses as addr}
+                  <option value={addr}>{addr}</option>
+                {/each}
+              </select>
+            {:else}
+              <div class="flex-1">
+                <input
+                  type="text"
+                  bind:value={localIdentityData.primaryAddresses[index]}
+                  required
+                  placeholder="Enter primary address (R-address)"
+                  disabled={disabled}
+                  class="w-full p-3 border border-verusidx-mountain-mist dark:border-verusidx-stone-medium rounded-lg bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white disabled:opacity-50"
+                />
+                <button
+                  type="button"
+                  onclick={switchToDropdown}
+                  class="mt-1 text-xs text-verusidx-turquoise-deep hover:text-verusidx-turquoise-bright"
+                >
+                  ← Use address dropdown
+                </button>
+              </div>
+            {/if}
           {:else}
             <!-- Additional addresses: manual text input -->
-            <input 
+            <input
               type="text"
               bind:value={localIdentityData.primaryAddresses[index]}
               required
               disabled={disabled}
-              placeholder="Enter address manually"
+              placeholder="Enter primary address (R-address)"
               class="flex-1 p-3 border border-verusidx-mountain-mist dark:border-verusidx-stone-medium rounded-lg bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white disabled:opacity-50"
             />
           {/if}
diff --git a/src/lib/components/IdentitySearchCard.svelte b/src/lib/components/IdentitySearchCard.svelte
@@ -18,14 +18,26 @@
     connectionState = state;
   });
 
+  // Detect if input is an i-address (identity address)
+  // i-addresses start with 'i' and use base58 encoding (excludes 0, O, I, l)
+  function isIAddress(input: string): boolean {
+    return /^i[a-km-zA-HJ-NP-Z1-9]{33,}$/.test(input);
+  }
+
   async function handleSearch() {
     if (!searchQuery.trim()) {
       searchError = "Please enter an identity name to search";
       return;
     }
 
-    // Format search query - ensure it has @ suffix if not already
-    const formattedQuery = searchQuery.trim().endsWith('@') ? searchQuery.trim() : `${searchQuery.trim()}@`;
+    const trimmedQuery = searchQuery.trim();
+
+    // Format search query based on input type:
+    // - i-addresses: pass as-is
+    // - Friendly names: ensure @ suffix
+    const formattedQuery = isIAddress(trimmedQuery)
+      ? trimmedQuery
+      : (trimmedQuery.endsWith('@') ? trimmedQuery : `${trimmedQuery}@`);
 
     isSearching = true;
     searchError = null;
@@ -34,16 +46,16 @@
     try {
       const chainParam = getChainParam(connectionState?.selectedChain);
       console.log("IdentitySearchCard: Searching for identity on chain:", connectionState?.selectedChain, "param:", chainParam);
-      
-      const result = await invoke("get_identity", { 
+
+      const result = await invoke("get_identity", {
         name: formattedQuery,
         chain: chainParam
       });
 
       console.log("IdentitySearchCard: get_identity result:", result);
       searchResults = result;
       hasSearched = true;
-      
+
       // Add to recent searches (avoid duplicates)
       if (!recentSearches.includes(formattedQuery)) {
         recentSearches = [formattedQuery, ...recentSearches.slice(0, 4)]; // Keep only 5 recent
diff --git a/src/lib/components/currency/PreallocationManager.svelte b/src/lib/components/currency/PreallocationManager.svelte
@@ -80,7 +80,7 @@
           <div class="flex-1">
             <label class="block text-xs text-verusidx-mountain-grey dark:text-verusidx-mountain-mist mb-1">
               {#if isIdControlToken}
-                Recipient Address (ID@ or R-address)
+                Recipient Address (ID@ or i-address)
               {:else}
                 Address {index + 1}
               {/if}
@@ -89,7 +89,7 @@
               type="text" 
               value={preallocation.address}
               oninput={(e) => updateAddress(index, e.target.value)}
-              placeholder={isIdControlToken ? "alice@ or RXXXxxxXXX..." : "alice@ or RXXXxxxXXX..."}
+              placeholder={isIdControlToken ? "alice@ or iXXXxxxXXX..." : "alice@ or iXXXxxxXXX..."}
               required={isIdControlToken}
               class="w-full p-2 text-sm border border-verusidx-mountain-mist dark:border-verusidx-stone-medium rounded-lg bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white"
             />
@@ -152,11 +152,11 @@
       {#if isIdControlToken}
         <p class="text-xs text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">
           ID Control Tokens must allocate exactly 0.00000001 (1 satoshi) to a single recipient. 
-          The holder of this token gains revoke/recover authority over the currency's root identity.
+          The holder of this token gains primary authority over the currency's namespace ID@.
         </p>
       {:else}
         <p class="text-xs text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">
-          Preallocations distribute currency directly to specified addresses at launch. 
+          Preallocations distribute currency directly to specified recipients at launch. 
           For basket currencies, this lowers the reserve ratio.
         </p>
       {/if}
diff --git a/src/lib/stores/connection.ts b/src/lib/stores/connection.ts
@@ -47,12 +47,24 @@ export function getChainParam(selectedChain: string | null): string | null {
     console.warn('getChainParam: selectedChain is null, defaulting to null (VRSC mainnet)');
     return null;
   }
-  
+
   // VRSC mainnet doesn't need -chain= parameter
   if (selectedChain.toLowerCase() === 'vrsc') {
     return null;
   }
-  
+
   // All other chains (vrsctest, varrr, vdex, etc.) need -chain=chainname
   return selectedChain.toLowerCase();
+}
+
+/**
+ * Helper function to get the display name for a chain
+ * @param state The connection state containing available chains
+ * @param chainName The chain name to look up
+ * @returns The display_name from availableChains, or fallback to uppercase chainName
+ */
+export function getChainDisplayName(state: ConnectionState, chainName: string | null): string {
+  if (!chainName) return 'Unknown';
+  const chain = state.availableChains.find(c => c.name === chainName);
+  return chain?.display_name || chainName.toUpperCase();
 }
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
-  import { connectionStore, getChainParam, type ConnectionState } from "$lib/stores/connection";
+  import { connectionStore, getChainParam, getChainDisplayName, type ConnectionState } from "$lib/stores/connection";
   import { goto } from "$app/navigation";
   import ThemeToggle from "$lib/components/ThemeToggle.svelte";
 
@@ -388,7 +388,7 @@
           <div>
             <h2 class="text-2xl font-bold text-verusidx-stone-dark dark:text-white">Connected to Verus PBaaS</h2>
             <p class="text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">
-              {connectionState.current.chainName} - {connectionState.current.host}:{connectionState.current.port}
+              {getChainDisplayName(connectionState, connectionState.selectedChain || connectionState.current.chainName)} - {connectionState.current.host}:{connectionState.current.port}
             </p>
           </div>
           <button 
diff --git a/src/routes/dashboard/+page.svelte b/src/routes/dashboard/+page.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
   import { invoke } from "@tauri-apps/api/core";
-  import { connectionStore, getChainParam, type ConnectionState } from "$lib/stores/connection";
+  import { connectionStore, getChainParam, getChainDisplayName, type ConnectionState } from "$lib/stores/connection";
   import { goto } from "$app/navigation";
   import { BlockHeightHeader, ExpandableCard } from "$lib/components";
   import { onMount, onDestroy } from "svelte";
@@ -253,7 +253,7 @@
           <div>
             <h1 class="text-3xl font-bold text-verusidx-stone-dark dark:text-white">VerusIDX Dashboard</h1>
             <p class="text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">
-              Connected to {connectionState.current?.chainName} 
+              Connected to {getChainDisplayName(connectionState, connectionState.selectedChain)}
               ({connectionState.current?.host}:{connectionState.current?.port})
             </p>
           </div>
@@ -285,7 +285,7 @@
               <div class="space-y-3">
                 <div class="flex justify-between">
                   <span class="text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">Chain:</span>
-                  <span class="font-medium text-verusidx-stone-dark dark:text-white">{systemInfo?.name || connectionState.selectedChain?.toUpperCase()}</span>
+                  <span class="font-medium text-verusidx-stone-dark dark:text-white">{systemInfo?.name || getChainDisplayName(connectionState, connectionState.selectedChain)}</span>
                 </div>
                 <div class="flex justify-between">
                   <span class="text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">Blocks:</span>
@@ -309,7 +309,7 @@
                 <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                   <div class="flex justify-between">
                     <span class="text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">Chain:</span>
-                    <span class="font-medium text-verusidx-stone-dark dark:text-white">{systemInfo?.name || connectionState.selectedChain?.toUpperCase()}</span>
+                    <span class="font-medium text-verusidx-stone-dark dark:text-white">{systemInfo?.name || getChainDisplayName(connectionState, connectionState.selectedChain)}</span>
                   </div>
                   <div class="flex justify-between">
                     <span class="text-verusidx-mountain-grey dark:text-verusidx-mountain-mist">Version:</span>
@@ -377,7 +377,7 @@
 
         <!-- Wallet Balances Card -->
         {#if walletInfo}
-          <ExpandableCard title="{systemInfo?.name || connectionState.selectedChain?.toUpperCase() || 'Wallet'} Balances" cardClass="bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white" modalSize="md">
+          <ExpandableCard title="{systemInfo?.name || getChainDisplayName(connectionState, connectionState.selectedChain) || 'Wallet'} Balances" cardClass="bg-white dark:bg-verusidx-stone-dark text-verusidx-stone-dark dark:text-white" modalSize="md">
             <div slot="preview">
               <div class="space-y-3">
                 <div class="flex justify-between">
