switch block explorer to the signet one and fix confirmation count #89
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,4 +2,5 @@ node_modules/ | |
| package-lock.json | ||
| coinswap-ffi | ||
| dist/ | ||
| squashfs-root/ | ||
| .DS_Store | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -446,7 +446,7 @@ export function TransactionsListComponent(container) { | |
|
|
||
| // Global function for opening transactions on mempool.space | ||
| window.openTxOnMempool = (txid) => { | ||
| const url = `http://170.75.166.88:8080/tx/${txid}`; | ||
| if (typeof require !== 'undefined') { | ||
| try { | ||
| const { shell } = require('electron'); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -566,7 +566,7 @@ export function UtxoListComponent(container) { | |
|
|
||
| // Global function for opening transactions on mempool.space | ||
| window.openTxOnMempool = (txid) => { | ||
| const url = `http://170.75.166.88:8080/tx/${txid}`; | ||
| if (typeof require !== 'undefined') { | ||
| try { | ||
| const { shell } = require('electron'); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -44,12 +44,6 @@ function saveWalletToCache(balance, transactions, utxos) { | |
| export async function WalletComponent(container) { | ||
| console.log('🔍 WalletComponent called at', new Date().toISOString()); | ||
|
|
||
| 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() { | ||
| try { | ||
| const balance = await fetchBalance(); | ||
| console.log('💳 Wallet balance used by UI:', balance); | ||
|
|
||
|
|
@@ -211,7 +191,7 @@ export async function WalletComponent(container) { | |
| } | ||
| } | ||
|
|
||
| async function updateTransactions() { | ||
| const transactionsContainer = content.querySelector( | ||
| '#transactions-container' | ||
| ); | ||
|
|
@@ -265,16 +245,6 @@ export async function WalletComponent(container) { | |
| }; | ||
|
|
||
| try { | ||
| 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() { | ||
| 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 { | ||
| 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, | ||
| }))); | ||
|
|
||
| utxoTableBody.innerHTML = renderUtxos(utxos); | ||
| return utxos; | ||
| } catch (error) { | ||
| console.error('❌ UTXO update failed:', error); | ||
|
|
@@ -353,23 +347,32 @@ export async function WalletComponent(container) { | |
| refreshBtn.disabled = true; | ||
|
|
||
| try { | ||
| 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(), | ||
| 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); | ||
| } 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 = `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) { | |
| }); | ||
| } | ||
|
|
||
| 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); | ||
| } | ||
|
Comment on lines
+517
to
522
There was a problem hiding this comment. Check the initial sync result before caching refreshed data.
Proposed fix console.log('🔄 Syncing and fetching fresh data...');
try {
- await window.api.taker.sync();
+ await syncWalletState();
} catch (syncErr) {
console.warn('⚠️ Initial wallet sync failed, proceeding anyway:', syncErr.message);
}🤖 Prompt for AI Agents |
||
| const [balance, transactions, utxos] = await Promise.all([ | ||
| updateBalance(), | ||
| updateTransactions(), | ||
| updateUtxos(), | ||
| ]); | ||
| if (balance) saveWalletToCache(balance, transactions, utxos); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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)); | ||
| } | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Harden the external transaction link.
Add
rel="noopener noreferrer"and encode the txid path segment before opening a new tab/window.Proposed fix
📝 Committable suggestion
🤖 Prompt for AI Agents