bump version to 0.0.7

apps/desktop/electrobun.config.ts

@@ -4,7 +4,7 @@ export default {
 	app: {
 		name: 'koins',
 		identifier: 'koins.tzgyn.com',
-		version: '0.0.5',
+		version: '0.0.7',
 	},
 	build: {
 		// Vite builds to dist/, we copy from there

apps/desktop/src/bun/lib/monero/wallet.ts

@@ -41,13 +41,40 @@ function rpcConnection(
 	})
 }
 
+function withTimeout<T>(
+	promise: Promise<T>,
+	ms: number,
+	label: string,
+): Promise<T> {
+	return new Promise<T>((resolve, reject) => {
+		const timer = setTimeout(
+			() => reject(new Error(`${label} timed out after ${ms}ms`)),
+			ms,
+		)
+		promise.then(
+			(v) => {
+				clearTimeout(timer)
+				resolve(v)
+			},
+			(e) => {
+				clearTimeout(timer)
+				reject(e)
+			},
+		)
+	})
+}
+
 async function rawRpc(
 	state: MoneroWalletState,
 	method: string,
 	params: Record<string, any> = {},
 ): Promise<any> {
 	const conn = rpcConnection(state)
-	const res = await conn.sendJsonRequest(method, params)
+	const res = await withTimeout(
+		conn.sendJsonRequest(method, params),
+		30000,
+		`wallet-rpc ${method}`,
+	)
 	if (res?.error)
 		throw new Error(res.error.message || JSON.stringify(res.error))
 	return res?.result
@@ -62,7 +89,11 @@ async function waitForRpc(
 	while (Date.now() - start < timeoutMs) {
 		try {
 			const conn = rpcConnection(state)
-			const res = await conn.sendJsonRequest('get_version', {})
+			const res = await withTimeout(
+				conn.sendJsonRequest('get_version', {}),
+				5000,
+				'wallet-rpc probe',
+			)
 			if (res?.result?.version) {
 				console.log(`[monero] RPC ready after ${Date.now() - start}ms`)
 				return
@@ -290,7 +321,11 @@ export async function createWallet(
 		language: 'English',
 	})
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const address = await state.wallet.getAddress(0, 0)
+	const address = (await withTimeout(
+		state.wallet.getAddress(0, 0),
+		30000,
+		'wallet get_address',
+	)) as string
 	console.log(`[monero] wallet created: ${name} -> ${address}`)
 	return { mnemonic: result.mnemonic, address }
 }
@@ -329,7 +364,7 @@ export async function openWallet(
 		state.wallet = await connectClient(state)
 	}
 	try {
-		await state.wallet.openWallet(name, password)
+		await withTimeout(state.wallet.openWallet(name, password), 30000, `open_wallet ${name}`)
 		log(`[monero] wallet opened: ${name}`)
 	} catch (e) {
 		logError(`[monero] wallet open failed (${name})`, e)
@@ -348,8 +383,16 @@ export async function getBalance(
 	state: MoneroWalletState,
 ): Promise<{ balance: bigint; unlocked: bigint }> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const balance = (await state.wallet.getBalance()) as bigint
+	const balance = (await withTimeout(
-	const unlocked = (await state.wallet.getUnlockedBalance()) as bigint
+		state.wallet.getBalance(),
+		30000,
+		'wallet get_balance',
+	)) as bigint
+	const unlocked = (await withTimeout(
+		state.wallet.getUnlockedBalance(),
+		30000,
+		'wallet get_unlocked_balance',
+	)) as bigint
 	console.log(`[monero] balance: ${balance} (unlocked: ${unlocked})`)
 	return { balance, unlocked }
 }
@@ -360,9 +403,10 @@ export async function getAddress(
 	subIdx = 0,
 ): Promise<string> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const address = (await state.wallet.getAddress(
+	const address = (await withTimeout(
-		accountIdx,
+		state.wallet.getAddress(accountIdx, subIdx),
-		subIdx,
+		30000,
+		'wallet get_address',
 	)) as string
 	console.log(`[monero] address: ${address}`)
 	return address
@@ -398,7 +442,11 @@ export async function getAccounts(
 	state: MoneroWalletState,
 ): Promise<any[]> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const accounts = (await state.wallet.getAccounts(true)) as any[]
+	const accounts = (await withTimeout(
+		state.wallet.getAccounts(true),
+		30000,
+		'wallet get_accounts',
+	)) as any[]
 	console.log(`[monero] accounts: ${accounts?.length ?? 0} returned`)
 	if (accounts?.length) {
 		for (const acct of accounts) {
@@ -543,7 +591,11 @@ export async function getHeight(
 	state: MoneroWalletState,
 ): Promise<number> {
 	if (!state.wallet) throw new Error('Wallet RPC not started')
-	const height = (await state.wallet.getHeight()) as number
+	const height = (await withTimeout(
+		state.wallet.getHeight(),
+		30000,
+		'wallet get_height',
+	)) as number
 	console.log(`[monero] wallet height: ${height}`)
 	return height
 }
@@ -587,7 +639,11 @@ export async function getDaemonHeight(
 		const daemon = await connectToDaemonRpc(
 			`http://${state.daemonAddress}`,
 		)
-		const height = (await daemon.getHeight()) as number
+		const height = (await withTimeout(
+			daemon.getHeight(),
+		15000,
+			'daemon get_height',
+		)) as number
 		console.log(`[monero] daemon height: ${height}`)
 		return height
 	} catch (e) {
@@ -665,9 +721,13 @@ export async function isWalletOpen(
 ): Promise<boolean> {
 	if (!state.wallet) return false
 	try {
-		await state.wallet.getHeight()
+		await withTimeout(state.wallet.getHeight(), 8000, 'wallet get_height')
 		return true
-	} catch {
+	} catch (e) {
+		// A timeout usually means the wallet-rpc is busy syncing, not that
+		// the wallet is closed. Assume still-open so the UI doesn't flip to
+		// "closed" and try to re-open an already-open wallet.
+		if (e instanceof Error && e.message.includes('timed out')) return true
 		return false
 	}
 }
@@ -677,10 +737,12 @@ export async function isConnected(
 ): Promise<boolean> {
 	if (!state.wallet) return false
 	try {
-		const daemon = await connectToDaemonRpc(
+		const daemon = await withTimeout(
-			`http://${state.daemonAddress}`,
+			connectToDaemonRpc(`http://${state.daemonAddress}`),
+			8000,
+			'daemon connect',
 		)
-		await daemon.getHeight()
+		await withTimeout(daemon.getHeight(), 8000, 'daemon get_height')
 		return true
 	} catch (e) {
 		console.log(`[monero] connection check failed:`, e)

apps/desktop/src/bun/rpc/monero/index.ts

@@ -108,12 +108,19 @@ export function createMoneroHandlers(state: {
 			console.log('[rpc] moneroRestoreWallet:', name)
 			if (!state.manager)
 				throw new Error('Monero wallet RPC not started')
+			// Default to ~2 days of history instead of a full genesis scan
+			// (which can take hours against a remote daemon).
+			let height = restoreHeight
+			if (!height || height === 0) {
+				const tip = await walletGetDaemonHeight(state.manager)
+				if (tip > 1440) height = tip - 1440
+			}
 			await walletRestore(
 				state.manager,
 				name,
 				password,
 				mnemonic,
-				restoreHeight,
+				height,
 			)
 			const address = await walletGetAddress(state.manager)
 			console.log(

apps/desktop/src/lib/states/monero-wallet.svelte.ts

@@ -51,6 +51,27 @@ export const MoneroWallet = () => {
 	let passwordRequired = $state(false)
 	let startInFlight: Promise<{ running: boolean; connected: boolean }> | null = null
 	let loginInFlight: Promise<void> | null = null
+	let refreshInFlight: Promise<void> | null = null
+	let syncing = $state(false)
+	let syncRetryTimer: ReturnType<typeof setTimeout> | null = null
+
+	const rpcTimeout = <T>(promise: Promise<T>, ms: number, label: string): Promise<T> =>
+		new Promise<T>((resolve, reject) => {
+			const timer = setTimeout(
+				() => reject(new Error(`${label} timed out after ${ms}ms`)),
+				ms,
+			)
+			promise.then(
+				(v) => {
+					clearTimeout(timer)
+					resolve(v)
+				},
+				(e) => {
+					clearTimeout(timer)
+					reject(e)
+				},
+			)
+		})
 
 	const beginOpening = () => {
 		openingDepth += 1
@@ -101,6 +122,11 @@ export const MoneroWallet = () => {
 				if (installed && !running) {
 					await start()
 					await checkStatus()
+				} else if (startInFlight) {
+					// a start is already in flight (e.g. triggered by init);
+					// wait for it so we don't call open before the server is up
+					await startInFlight.catch(() => {})
+					await checkStatus()
 				}
 				if (!running) {
 					error = 'Wallet server failed to start. Please try again.'
@@ -198,14 +224,22 @@ export const MoneroWallet = () => {
 	const checkStatus = async () => {
 		if (!electrobun.rpc) return
 		const [binStatus] = await tryCatch(
-			electrobun.rpc.request.moneroBinaryStatus({}),
+			rpcTimeout(
+				electrobun.rpc.request.moneroBinaryStatus({}),
+				15000,
+				'moneroBinaryStatus',
+			),
 		)
 		if (binStatus) {
 			installed = binStatus.installed
 			downloading = binStatus.downloading
 		}
 		const [status] = await tryCatch(
-			electrobun.rpc.request.moneroWalletStatus({}),
+			rpcTimeout(
+				electrobun.rpc.request.moneroWalletStatus({}),
+				30000,
+				'moneroWalletStatus',
+			),
 		)
 		if (status) {
 			running = status.running
@@ -357,32 +391,67 @@ export const MoneroWallet = () => {
 		if (remember) await moneroStorePassword(target, password)
 	}
 
+	const scheduleSyncRetry = () => {
+		if (syncRetryTimer) clearTimeout(syncRetryTimer)
+		syncRetryTimer = setTimeout(async () => {
+			syncRetryTimer = null
+			if (walletOpen && !loading) await refresh()
+		}, 15000)
+	}
+
 	const refresh = async () => {
-		if (!electrobun.rpc) return
+		const rpc = electrobun.rpc
-		loading = true
+		if (!rpc) return
-		try {
+		if (refreshInFlight) return refreshInFlight
-			const [bal] = await tryCatch(
+		refreshInFlight = (async () => {
-				electrobun.rpc.request.moneroGetBalance({}),
+			loading = true
-			)
+			let failed = false
-			if (bal) {
+			try {
-				balAtomic = bal.balance
+				const [bal, balErr] = await tryCatch(
-				unlockedAtomic = bal.unlocked
+					rpcTimeout(
-				address = bal.address
+						rpc.request.moneroGetBalance({}),
-				height = bal.height
+						20000,
-				daemonHeight = bal.daemonHeight
+						'moneroGetBalance',
+					),
+				)
+				if (balErr) failed = true
+				if (bal) {
+					balAtomic = bal.balance
+					unlockedAtomic = bal.unlocked
+					address = bal.address
+					height = bal.height
+					daemonHeight = bal.daemonHeight
+				}
+				const [result, txErr] = await tryCatch(
+					rpcTimeout(
+						rpc.request.moneroGetTransactions({
+							accountIndex: selectedAccountIndex,
+						}),
+						20000,
+						'moneroGetTransactions',
+					),
+				)
+				if (txErr) failed = true
+				txs = result ?? []
+				const ok = await fetchAccounts()
+				if (!ok) failed = true
+				if (failed) {
+					// The wallet-rpc is likely busy syncing; keep the stale
+					// balance and retry shortly instead of showing an error.
+					syncing = true
+					scheduleSyncRetry()
+				} else {
+					syncing = false
+				}
+			} catch (e) {
+				syncing = true
+				scheduleSyncRetry()
+			} finally {
+				loading = false
+				refreshInFlight = null
 			}
-			const [result] = await tryCatch(
+		})()
-				electrobun.rpc.request.moneroGetTransactions({
+		return refreshInFlight
-					accountIndex: selectedAccountIndex,
-				}),
-			)
-			txs = result ?? []
-			await fetchAccounts()
-		} catch (e) {
-			error = e instanceof Error ? e.message : 'Monero refresh failed'
-		} finally {
-			loading = false
-		}
 	}
 
 	const send = async (
@@ -501,6 +570,9 @@ export const MoneroWallet = () => {
 		get passwordRequired() {
 			return passwordRequired
 		},
+		get syncing() {
+			return syncing
+		},
 		get error() {
 			return error
 		},

apps/desktop/src/routes/index.svelte

@@ -127,20 +127,6 @@
 		}
 	})
 
-	// Self-heal: if the monero wallet list never got loaded (e.g. the server
-	// was starting while the dashboard rendered), retry login once.
-	$effect(() => {
-		if (
-			moneroWallet.ready &&
-			!moneroWallet.walletOpen &&
-			!moneroWallet.opening &&
-			moneroWallet.wallets.length === 0 &&
-			!moneroWallet.error
-		) {
-			void moneroWallet.login()
-		}
-	})
-
 	$effect(() => {
 		if (moneroWallet.walletOpen) {
 			fetchXmr()
@@ -264,16 +250,20 @@
 						</CardDescription>
 					</CardHeader>
 					<CardContent class="flex flex-1 flex-col justify-center">
-						{#if moneroWallet.walletOpen}
+					{#if moneroWallet.walletOpen}
-							<p class="font-mono text-xl tabular-nums">{fmtBal(xmrBalance, 4)}</p>
+						<p class="font-mono text-xl tabular-nums">{fmtBal(xmrBalance, 4)}</p>
-							{#if xmrPrice}
+						{#if moneroWallet.syncing}
-								<p class="mt-0.5 text-sm text-muted-foreground tabular-nums">
+							<p class="mt-0.5 text-xs text-muted-foreground">Syncing…</p>
-									${fmtUsd(xmrTotalUsd)}
+						{:else if xmrPrice}
-								</p>
+							<p class="mt-0.5 text-sm text-muted-foreground tabular-nums">
-								<p class="mt-2 text-xs text-muted-foreground">
+								${fmtUsd(xmrTotalUsd)}
-									${fmtUsd(parseFloat(xmrPrice) )} / XMR
+							</p>
-								</p>
+						{/if}
-							{/if}
+						{#if xmrPrice}
+							<p class="mt-2 text-xs text-muted-foreground">
+								${fmtUsd(parseFloat(xmrPrice) )} / XMR
+							</p>
+						{/if}
 						{:else if moneroWallet.passwordRequired && moneroWallet.wallets.length > 0}
 							<p class="text-sm text-muted-foreground py-3">Wallet locked — unlock to view balance</p>
 						{:else if moneroWallet.opening}

apps/desktop/src/routes/monero/wallet/[name].svelte

@@ -203,7 +203,7 @@
 {:else}
 <div class="space-y-6">
 	<div class="flex flex-col items-center py-2">
-		{#if w.loading}
+		{#if w.loading && !w.syncing}
 			<div class="h-12 w-40 rounded-lg bg-muted animate-pulse"></div>
 		{:else}
 			<p class="text-sm text-muted-foreground">Balance</p>
@@ -223,6 +223,14 @@
 					Unlocked: {w.unlocked} XMR
 				</p>
 			{/if}
+			{#if w.syncing}
+				<div class="mt-2 flex items-center gap-2">
+					<Loader />
+					<p class="text-xs text-muted-foreground">
+						Syncing wallet — balance updates when the scan completes
+					</p>
+				</div>
+			{/if}
 			<div class="mt-2 flex items-center gap-1.5">
 				<div class="size-2 rounded-full {w.connected ? 'bg-green-500' : 'bg-red-500'}"></div>
 				<span class="text-xs text-muted-foreground">