From: Chris Duncan <chris@zoso.dev>
Date: Fri, 25 Jul 2025 12:14:40 +0000 (-0700)
Subject: `libnemo_` wallet prefix is unnecessary now that they have their own IndexedDB store.
X-Git-Tag: v0.10.5~50^2~21^2~5
X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=2791c90a193457a005fc89fd07a9219d9c907acc;p=libnemo.git

`libnemo_` wallet prefix is unnecessary now that they have their own IndexedDB store.
---

diff --git a/src/lib/wallets/bip44-wallet.ts b/src/lib/wallets/bip44-wallet.ts
index 02cf6a4..4141334 100644
--- a/src/lib/wallets/bip44-wallet.ts
+++ b/src/lib/wallets/bip44-wallet.ts
@@ -201,7 +201,6 @@ export class Bip44Wallet extends Wallet {
 			throw new TypeError('Wallet ID is required to restore')
 		}
 		Bip44Wallet.#isInternal = true
-		id = id.replace('libnemo_', '')
 		return new this(await Entropy.import(id))
 	}
 
diff --git a/src/lib/wallets/blake2b-wallet.ts b/src/lib/wallets/blake2b-wallet.ts
index 779dd56..3bfbe36 100644
--- a/src/lib/wallets/blake2b-wallet.ts
+++ b/src/lib/wallets/blake2b-wallet.ts
@@ -150,7 +150,6 @@ export class Blake2bWallet extends Wallet {
 			throw new TypeError('Wallet ID is required to restore')
 		}
 		Blake2bWallet.#isInternal = true
-		id = id.replace('libnemo_', '')
 		return new this(await Entropy.import(id))
 	}
 
diff --git a/src/lib/wallets/wallet.ts b/src/lib/wallets/wallet.ts
index 6ce5908..05bb028 100644
--- a/src/lib/wallets/wallet.ts
+++ b/src/lib/wallets/wallet.ts
@@ -27,7 +27,7 @@ export abstract class Wallet {
 	#m?: Bip39Mnemonic
 	#s?: Uint8Array<ArrayBuffer>
 
-	get id () { return `libnemo_${this.#id.hex}` }
+	get id () { return this.#id.hex }
 	get isLocked () { return this.#locked }
 	get isUnlocked () { return !this.#locked }
 	get mnemonic () {
@@ -299,7 +299,7 @@ export abstract class Wallet {
 			if (id == null) {
 				throw new Error('ID is null')
 			}
-			id = await Entropy.import(id.replace('libnemo_', ''))
+			id = await Entropy.import(id)
 			if (id.hex !== this.#id.hex) {
 				throw new Error('ID does not match')
 			}
diff --git a/test/test.create-wallet.mjs b/test/test.create-wallet.mjs
index 35ed16e..a138df2 100644
--- a/test/test.create-wallet.mjs
+++ b/test/test.create-wallet.mjs
@@ -40,7 +40,7 @@ await Promise.all([
 			await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
 			assert.ok('id' in wallet)
-			assert.ok(/^libnemo_[A-Fa-f0-9]{32,64}$/.test(wallet.id))
+			assert.ok(/^[A-Fa-f0-9]{32,64}$/.test(wallet.id))
 			assert.ok('mnemonic' in wallet)
 			assert.ok(/^(?:[a-z]{3,} ){11,23}[a-z]{3,}$/.test(wallet.mnemonic))
 			assert.ok('seed' in wallet)
@@ -54,7 +54,7 @@ await Promise.all([
 			await wallet.unlock(NANO_TEST_VECTORS.PASSWORD)
 
 			assert.ok('id' in wallet)
-			assert.ok(/^libnemo_[A-Fa-f0-9]{32,64}$/.test(wallet.id))
+			assert.ok(/^[A-Fa-f0-9]{32,64}$/.test(wallet.id))
 			assert.ok('mnemonic' in wallet)
 			assert.ok(/^(?:[a-z]{3,} ){11,23}[a-z]{3,}$/.test(wallet.mnemonic))
 			assert.ok('seed' in wallet)