From 42d050d5451c4ff18fad9c6c63fa9c4d945f4710 Mon Sep 17 00:00:00 2001
From: Chris Duncan <chris@zoso.dev>
Date: Fri, 3 Apr 2026 14:50:19 -0700
Subject: [PATCH] Import nano25519 sync methods only which avoids worker
 conflicts in vault.

---
 src/lib/vault/vault-worker.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/lib/vault/vault-worker.ts b/src/lib/vault/vault-worker.ts
index 12be3ae..fe36a8c 100644
--- a/src/lib/vault/vault-worker.ts
+++ b/src/lib/vault/vault-worker.ts
@@ -1,7 +1,7 @@
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@codecow.com>
 //! SPDX-License-Identifier: GPL-3.0-or-later
 
-import * as nano25519 from 'nano25519'
+import { derive as nano25519_derive, sign as nano25519_sign } from 'nano25519'
 import { parentPort } from 'node:worker_threads'
 import { BIP44_COIN_NANO } from '../constants'
 import { Bip39, Bip44, Blake2b, WalletAesGcm } from '../crypto'
@@ -22,7 +22,7 @@ let _mnemonic: ArrayBuffer | undefined = undefined
 
 const listener = (event: MessageEvent<any>): void => {
 	const { url, id } = event.data
-	if (url !== location.href) return
+	BROWSER: if (url !== location.href) return
 	NODE: if (parentPort == null) setTimeout(() => listener(event), 0)
 	const data = _parseData(event.data)
 	const action = _parseAction(data)
@@ -181,7 +181,7 @@ async function derive (index?: number): Promise<Record<string, number | ArrayBuf
 				: Blake2b.ckd(_seed, index)
 		return derive.then(result => {
 			const prv = new Uint8Array(result)
-			const pub = nano25519.derive(prv)
+			const pub = nano25519_derive(prv)
 			_timer = new VaultTimer(() => lock(), _timeout)
 			return { index, publicKey: pub.buffer }
 		})
@@ -248,8 +248,8 @@ async function sign (index?: number, data?: ArrayBuffer): Promise<Record<string,
 			: Bip44.ckd(_type === 'Exodus' ? 'Bitcoin seed' : 'ed25519 seed', _seed, BIP44_COIN_NANO, index)
 		return derive.then(result => {
 			const prv = new Uint8Array(result)
-			const pub = nano25519.derive(prv)
-			const sig = nano25519.sign(new Uint8Array(data), new Uint8Array([...prv, ...pub]))
+			const pub = nano25519_derive(prv)
+			const sig = nano25519_sign(new Uint8Array(data), new Uint8Array([...prv, ...pub]))
 			_timer = new VaultTimer(() => lock(), _timeout)
 			return { signature: sig.buffer }
 		})
-- 
2.47.3