From be8f9a5d92f2831892b895bfc8894504a307bb42 Mon Sep 17 00:00:00 2001
From: keraliss <keraliss@keraliss-2.local>
Date: Thu, 23 Apr 2026 16:15:51 +0530
Subject: [PATCH] switch block explorer to the signet one and fix confirmation
 count

---
 .gitignore                                |   3 +-
 src/components/market/Market.js           |  35 +++---
 src/components/send/Send.js               |   2 +-
 src/components/swap/Swap.js               |   2 +-
 src/components/wallet/TransactionsList.js |   2 +-
 src/components/wallet/UtxoList.js         |   2 +-
 src/components/wallet/Wallet.js           | 136 +++++++++++-----------
 src/styles/output.css                     |   3 +
 8 files changed, 91 insertions(+), 94 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1c91bc0..3c0be7b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ node_modules/
 package-lock.json
 coinswap-ffi
 dist/
-squashfs-root/
\ No newline at end of file
+squashfs-root/
+.DS_Store
\ No newline at end of file
diff --git a/src/components/market/Market.js b/src/components/market/Market.js
index d624611..30e93ec 100644
--- a/src/components/market/Market.js
+++ b/src/components/market/Market.js
@@ -38,20 +38,20 @@ export function Market(container) {
     }
   }
 
-  function formatTorEndpoint(address, start = 14, end = 16) {
+  function formatTorEndpoint(address, start = 6, end = 0) {
     if (!address || typeof address !== 'string') return 'unknown';
 
     const separatorIndex = address.lastIndexOf(':');
     if (separatorIndex === -1) return address;
 
-    const host = address.slice(0, separatorIndex);
+    const host = address.slice(0, separatorIndex).replace(/\.onion$/i, '');
     const port = address.slice(separatorIndex + 1);
 
     if (host.length <= start + end + 3) {
       return `${host}:${port}`;
     }
 
-    return `${host.slice(0, start)}...${host.slice(-end)}:${port}`;
+    return end > 0 ? `${host.slice(0, start)}..${host.slice(-end)}:${port}` : `${host.slice(0, start)}..:${port}`;
   }
 
   // Check sync state every second
@@ -89,10 +89,16 @@ export function Market(container) {
 
   function transformMaker(item, index) {
     const offer = item.offer;
-    const addressObj = item.address || {};
-    const onionAddr = addressObj.onion_addr || '';
-    const port = addressObj.port || '6102';
-    const fullAddress = `${onionAddr}:${port}`;
+    const addr = item.address;
+    let fullAddress;
+    if (typeof addr === 'string') {
+      fullAddress = addr.includes(':') ? addr : `${addr}:6102`;
+    } else {
+      const addressObj = addr || {};
+      const onionAddr = addressObj.onion_addr || '';
+      const port = addressObj.port || '6102';
+      fullAddress = `${onionAddr}:${port}`;
+    }
 
     // Handle null offers (unresponsive makers)
     if (!offer) {
@@ -584,7 +590,7 @@ export function Market(container) {
           <div class="bg-[#0f1419] p-4 rounded-lg">
             <p class="text-sm text-gray-400 mb-1">Bond Txid</p>
             <button
-              onclick="window.open('https://mempool.space/tx/${maker.bondTxid}', '_blank')"
+              onclick="window.open('http://170.75.166.88:8080/tx/${maker.bondTxid}', '_blank')"
               class="text-cyan-400 hover:text-cyan-300 underline font-mono text-sm break-all text-left w-full"
             >
               ${maker.bondTxid}
@@ -763,15 +769,9 @@ export function Market(container) {
           tableBody.innerHTML = displayedMakers
             .map(
               (maker) => {
-                const protocolBadge = getProtocolPresentation(maker.protocol);
                 return `
-          <div class="grid grid-cols-8 gap-4 p-4 hover:bg-[#242d3d] transition-colors">
-            
-            <div class="text-sm">
-              <span class="px-2 py-1 ${protocolBadge.classes} rounded text-xs font-semibold text-lg">
-                ${protocolBadge.icon} ${protocolBadge.label}
-              </span>
-            </div>
+          <div class="grid grid-cols-7 gap-4 p-4 hover:bg-[#242d3d] transition-colors">
+
             <div class="text-gray-300 font-mono text-sm truncate" title="${maker.address}">${formatTorEndpoint(maker.address)}</div>
             <div class="text-green-400">${maker.baseFee}</div>
             <div class="text-blue-400">${maker.volumeFee}%</div>
@@ -871,8 +871,7 @@ export function Market(container) {
 
       
 
-      <div class="grid grid-cols-8 gap-4 bg-[#FF6B35] p-4 text-xs">
-        <div class="font-semibold">Protocol</div>
+      <div class="grid grid-cols-7 gap-4 bg-[#FF6B35] p-4 text-xs">
         <div class="font-semibold">Tor Address</div>
         <div class="font-semibold">Base Fee</div>
         <div class="font-semibold">% Fee Rate</div>
diff --git a/src/components/send/Send.js b/src/components/send/Send.js
index fad7ef4..d11a5b6 100644
--- a/src/components/send/Send.js
+++ b/src/components/send/Send.js
@@ -781,7 +781,7 @@ export function SendComponent(container, preSelectedUtxos = null) {
               <p class="text-xs text-gray-400 mb-2">Recipient: ${address}</p>
               <div class="flex items-center gap-2">
                 <span class="text-xs text-gray-400">TXID:</span>
-                <a href="https://mempool.space/testnet/tx/${txid}" target="_blank" 
+                <a href="http://170.75.166.88:8080/tx/${txid}" target="_blank"
                    class="text-sm font-mono text-blue-400 hover:text-blue-300 underline flex-1 truncate">
                   ${txid}
                 </a>
diff --git a/src/components/swap/Swap.js b/src/components/swap/Swap.js
index e8128a2..8c7cc1c 100644
--- a/src/components/swap/Swap.js
+++ b/src/components/swap/Swap.js
@@ -518,7 +518,7 @@ export async function SwapComponent(container) {
   async function fetchNetworkFees() {
     try {
       const response = await fetch(
-        'https://mempool.space/api/v1/fees/recommended'
+        'http://170.75.166.88:8080/api/v1/fees/recommended'
       );
       const data = await response.json();
       networkFeeRate = data.halfHourFee;
diff --git a/src/components/wallet/TransactionsList.js b/src/components/wallet/TransactionsList.js
index 7392eea..d90b1d3 100644
--- a/src/components/wallet/TransactionsList.js
+++ b/src/components/wallet/TransactionsList.js
@@ -446,7 +446,7 @@ export function TransactionsListComponent(container) {
 
   // Global function for opening transactions on mempool.space
   window.openTxOnMempool = (txid) => {
-    const url = `https://mutinynet.com/tx/${txid}`;
+    const url = `http://170.75.166.88:8080/tx/${txid}`;
     if (typeof require !== 'undefined') {
       try {
         const { shell } = require('electron');
diff --git a/src/components/wallet/UtxoList.js b/src/components/wallet/UtxoList.js
index 3e1208f..2a532d0 100644
--- a/src/components/wallet/UtxoList.js
+++ b/src/components/wallet/UtxoList.js
@@ -566,7 +566,7 @@ export function UtxoListComponent(container) {
 
   // Global function for opening transactions on mempool.space
   window.openTxOnMempool = (txid) => {
-    const url = `https://mutinynet.com/tx/${txid}`;
+    const url = `http://170.75.166.88:8080/tx/${txid}`;
     if (typeof require !== 'undefined') {
       try {
         const { shell } = require('electron');
diff --git a/src/components/wallet/Wallet.js b/src/components/wallet/Wallet.js
index 08fb4a0..9a4e81a 100644
--- a/src/components/wallet/Wallet.js
+++ b/src/components/wallet/Wallet.js
@@ -44,12 +44,6 @@ function saveWalletToCache(balance, transactions, utxos) {
 export async function WalletComponent(container) {
   console.log('🔍 WalletComponent called at', new Date().toISOString());
 
-  // ✅ LOAD FROM CACHE FIRST
-  const cached = loadWalletFromCache();
-  let shouldFetchFresh = !cached || cached.isStale;
-
-  console.log(`🎯 Should fetch fresh: ${shouldFetchFresh}`);
-
   async function fetchBalance() {
     try {
       const data = await window.api.taker.getBalance();
@@ -69,6 +63,7 @@ export async function WalletComponent(container) {
   async function fetchTransactions() {
     try {
       const data = await window.api.taker.getTransactions(5, 0);
+      console.log('[REFRESH] raw getTransactions response:', JSON.stringify(data, null, 2));
 
       if (data.success) {
         return data.transactions || [];
@@ -84,6 +79,7 @@ export async function WalletComponent(container) {
   async function fetchUtxos() {
     try {
       const data = await window.api.taker.getUtxos();
+      console.log('[REFRESH] raw getUtxos response:', JSON.stringify(data, null, 2));
 
       if (data.success) {
         return data.utxos || [];
@@ -174,24 +170,8 @@ export async function WalletComponent(container) {
   }
 
   // UI Update Functions
-  async function updateBalance(useCache = false) {
+  async function updateBalance() {
     try {
-      // Use cached data if requested
-      if (useCache && cached && cached.balance) {
-        console.log('💳 Wallet balance from cache:', cached.balance);
-        content.querySelector('#regular-balance').textContent =
-          satsToBtc(cached.balance.regular) + ' BTC';
-        content.querySelector('#swap-balance').textContent =
-          satsToBtc(cached.balance.swap) + ' BTC';
-        content.querySelector('#contract-balance').textContent =
-          satsToBtc(cached.balance.contract) + ' BTC';
-        content.querySelector('#spendable-balance').textContent =
-          satsToBtc(cached.balance.spendable) + ' BTC';
-        console.log('✅ Balance loaded from cache');
-        return;
-      }
-
-      // Fetch fresh data
       const balance = await fetchBalance();
       console.log('💳 Wallet balance used by UI:', balance);
 
@@ -211,7 +191,7 @@ export async function WalletComponent(container) {
     }
   }
 
-  async function updateTransactions(useCache = false) {
+  async function updateTransactions() {
     const transactionsContainer = content.querySelector(
       '#transactions-container'
     );
@@ -265,16 +245,6 @@ export async function WalletComponent(container) {
     };
 
     try {
-      // Use cached data if requested
-      if (useCache && cached && cached.transactions) {
-        transactionsContainer.innerHTML = renderTransactions(
-          cached.transactions
-        );
-        console.log('✅ Transactions loaded from cache');
-        return;
-      }
-
-      // Fetch fresh data
       const transactions = await fetchTransactions();
       transactionsContainer.innerHTML = renderTransactions(transactions);
       console.log('✅ Transactions updated from API:', transactions.length);
@@ -286,9 +256,25 @@ export async function WalletComponent(container) {
     }
   }
 
-  async function updateUtxos(useCache = false) {
+  async function updateUtxos() {
     const utxoTableBody = content.querySelector('#utxo-table-body');
 
+    // Build a txid→confirmations map from Bitcoin Core's listtransactions
+    // (getUtxos uses in-memory wallet state which stores stale confirmation counts)
+    const txConfMap = new Map();
+    try {
+      const txData = await window.api.taker.getTransactions(200, 0);
+      if (txData.success) {
+        for (const tx of txData.transactions || []) {
+          const txid = typeof tx.info.txid === 'object' ? tx.info.txid.value : tx.info.txid;
+          txConfMap.set(txid, tx.info.confirmations);
+        }
+      }
+      console.log('[UTXO] built tx confirmation map:', Object.fromEntries(txConfMap));
+    } catch (e) {
+      console.warn('[UTXO] could not build tx confirmation map, using raw values:', e.message);
+    }
+
     // Helper to render UTXOs
     const renderUtxos = (utxos) => {
       if (utxos.length === 0) {
@@ -320,17 +306,25 @@ export async function WalletComponent(container) {
     };
 
     try {
-      // Use cached data if requested
-      if (useCache && cached && cached.utxos) {
-        utxoTableBody.innerHTML = renderUtxos(cached.utxos);
-        console.log('✅ UTXOs loaded from cache');
-        return;
-      }
+      const rawUtxos = await fetchUtxos();
+
+      // Enrich confirmation counts using the live tx data
+      const utxos = rawUtxos.map(u => {
+        const txid = typeof u.utxo.txid === 'object' ? u.utxo.txid.value : u.utxo.txid;
+        const liveConfs = txConfMap.get(txid);
+        if (liveConfs !== undefined && liveConfs !== u.utxo.confirmations) {
+          console.log(`[UTXO] enriching ${txid.slice(0, 8)}: ${u.utxo.confirmations} → ${liveConfs}`);
+          return { ...u, utxo: { ...u.utxo, confirmations: liveConfs } };
+        }
+        return u;
+      });
+
+      console.log('[REFRESH] UTXOs after enrichment:', utxos.map(u => ({
+        txid: typeof u.utxo.txid === 'object' ? u.utxo.txid.value : u.utxo.txid,
+        confirmations: u.utxo.confirmations,
+      })));
 
-      // Fetch fresh data
-      const utxos = await fetchUtxos();
       utxoTableBody.innerHTML = renderUtxos(utxos);
-      console.log('✅ UTXOs updated from API:', utxos.length);
       return utxos;
     } catch (error) {
       console.error('❌ UTXO update failed:', error);
@@ -353,23 +347,32 @@ export async function WalletComponent(container) {
     refreshBtn.disabled = true;
 
     try {
-      await syncWalletState();
+      localStorage.removeItem(WALLET_CACHE_KEY);
+
+      try {
+        await syncWalletState();
+      } catch (syncErr) {
+        console.warn('⚠️ Wallet sync failed, refreshing data anyway:', syncErr.message);
+      }
 
       const [balance, transactions, utxos] = await Promise.all([
-        updateBalance(false),
-        updateTransactions(false),
-        updateUtxos(false),
+        updateBalance(),
+        updateTransactions(),
+        updateUtxos(),
       ]);
 
       if (balance) saveWalletToCache(balance, transactions, utxos);
 
+      console.log('[REFRESH] Complete summary:');
+      console.log('  balance:', balance);
+      console.log('  transactions confirmations:', transactions?.map(t => ({ txid: typeof t.info.txid === 'object' ? t.info.txid.value : t.info.txid, confirmations: t.info.confirmations })));
+      console.log('  utxo confirmations:', utxos?.map(u => ({ txid: typeof u.utxo.txid === 'object' ? u.utxo.txid.value : u.utxo.txid, confirmations: u.utxo.confirmations })));
+
       refreshBtn.textContent = 'Refreshed!';
       setTimeout(() => {
         refreshBtn.textContent = originalText;
         refreshBtn.disabled = false;
       }, 2000);
-
-      console.log('✅ All data refreshed');
     } catch (error) {
       refreshBtn.textContent = 'Refresh Failed';
       setTimeout(() => {
@@ -471,7 +474,7 @@ export async function WalletComponent(container) {
 
   // Global function for opening transactions on mempool.space
   window.openTxOnMempool = (txid) => {
-    const url = `https://mutinynet.com/tx/${txid}`;
+    const url = `http://170.75.166.88:8080/tx/${txid}`;
     if (typeof require !== 'undefined') {
       try {
         const { shell } = require('electron');
@@ -511,25 +514,16 @@ export async function WalletComponent(container) {
     });
   }
 
-  if (shouldFetchFresh) {
-    console.log('🔄 Syncing and fetching fresh data...');
-    try {
-      await window.api.taker.sync();
-    } catch (syncErr) {
-      console.warn('⚠️ Initial wallet sync failed, proceeding anyway:', syncErr.message);
-    }
-    const [balance, transactions, utxos] = await Promise.all([
-      updateBalance(false),
-      updateTransactions(false),
-      updateUtxos(false),
-    ]);
-    if (balance) saveWalletToCache(balance, transactions, utxos);
-  } else {
-    console.log('⚡ Using cached data (still fresh)');
-    await Promise.all([
-      updateBalance(true),
-      updateTransactions(true),
-      updateUtxos(true),
-    ]);
+  console.log('🔄 Syncing and fetching fresh data...');
+  try {
+    await window.api.taker.sync();
+  } catch (syncErr) {
+    console.warn('⚠️ Initial wallet sync failed, proceeding anyway:', syncErr.message);
   }
+  const [balance, transactions, utxos] = await Promise.all([
+    updateBalance(),
+    updateTransactions(),
+    updateUtxos(),
+  ]);
+  if (balance) saveWalletToCache(balance, transactions, utxos);
 }
diff --git a/src/styles/output.css b/src/styles/output.css
index 65c3e2d..cc7042a 100644
--- a/src/styles/output.css
+++ b/src/styles/output.css
@@ -585,6 +585,9 @@
   .grid-cols-5 {
     grid-template-columns: repeat(5, minmax(0, 1fr));
   }
+  .grid-cols-7 {
+    grid-template-columns: repeat(7, minmax(0, 1fr));
+  }
   .grid-cols-8 {
     grid-template-columns: repeat(8, minmax(0, 1fr));
   }