From: Chris Duncan Date: Mon, 21 Jul 2025 20:04:39 +0000 (-0700) Subject: Return wallet derived accounts private keys as bytes instead of strings. Remove unuse... X-Git-Tag: v0.10.5~55^2~43 X-Git-Url: https://git.codecow.com/?a=commitdiff_plain;h=d51fd0e57c8486cb49624f7e0947b829f7ecd5c2;p=libnemo.git Return wallet derived accounts private keys as bytes instead of strings. Remove unused imports. Remove extraneous logging. --- diff --git a/src/lib/wallets/bip44-wallet.ts b/src/lib/wallets/bip44-wallet.ts index 1a1e368..5cd1c41 100644 --- a/src/lib/wallets/bip44-wallet.ts +++ b/src/lib/wallets/bip44-wallet.ts @@ -221,8 +221,8 @@ export class Bip44Wallet extends Wallet { if (results[i] == null || !(results[i] instanceof ArrayBuffer)) { throw new Error('Failed to derive private keys') } - const keyBytes = new Uint8Array(results[i]) - privateKeys.push({ index: +i, privateKey: bytes.toHex(keyBytes) }) + const privateKey = new Uint8Array(results[i]) + privateKeys.push({ index: +i, privateKey }) } return privateKeys } diff --git a/src/lib/wallets/blake2b-wallet.ts b/src/lib/wallets/blake2b-wallet.ts index 2b9264f..d416eaf 100644 --- a/src/lib/wallets/blake2b-wallet.ts +++ b/src/lib/wallets/blake2b-wallet.ts @@ -166,8 +166,8 @@ export class Blake2bWallet extends Wallet { const indexHex = index.toString(16).padStart(8, '0').toUpperCase() const inputHex = `${this.seed}${indexHex}`.padStart(72, '0') const inputBytes = hex.toBytes(inputHex) - const privateKey: string = new Blake2b(32).update(inputBytes).digest('hex') - results.push({ privateKey, index }) + const privateKey = new Blake2b(32).update(inputBytes).digest() + results.push({ index, privateKey }) } return results } diff --git a/src/lib/workers/bip44-ckd.ts b/src/lib/workers/bip44-ckd.ts index da67264..946ea88 100644 --- a/src/lib/workers/bip44-ckd.ts +++ b/src/lib/workers/bip44-ckd.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later import { WorkerInterface } from './worker-interface' -import { Data, NamedData } from '#types' +import { NamedData } from '#types' type ExtendedKey = { privateKey: DataView diff --git a/src/lib/workers/safe.ts b/src/lib/workers/safe.ts index 12f05bd..2cc38b9 100644 --- a/src/lib/workers/safe.ts +++ b/src/lib/workers/safe.ts @@ -173,7 +173,6 @@ export class Safe extends WorkerInterface { const requests = names.map(name => { const request = db.delete(name) request.onsuccess = (event) => { - console.log('delete request successful but not yet committed') } request.onerror = (event) => { console.error('getAll request error before transaction committed') @@ -181,7 +180,6 @@ export class Safe extends WorkerInterface { return request }) transaction.oncomplete = (event) => { - console.log('delete transaction committed') for (const request of requests) { if (request?.error != null) { reject(request.error) @@ -206,7 +204,6 @@ export class Safe extends WorkerInterface { const requests = names.map(name => { const request = db.get(name) request.onsuccess = (event) => { - console.log('get request successful but not yet committed') } request.onerror = (event) => { console.error('get request error before transaction committed') @@ -214,7 +211,6 @@ export class Safe extends WorkerInterface { return request }) transaction.oncomplete = (event) => { - console.log('get transaction committed') const results = [] for (const request of requests) { if (request?.error == null && request.result != null) { @@ -236,13 +232,11 @@ export class Safe extends WorkerInterface { return new Promise((resolve, reject) => { const request = db.getAll() request.onsuccess = (event) => { - console.log('getAll request successful but transaction not yet committed') } request.onerror = (event) => { console.error('getAll request error before transaction committed') } transaction.oncomplete = (event) => { - console.log('getAll transaction committed') if (request?.error != null) { reject(request.error) } else if (request.result == null) { @@ -295,7 +289,6 @@ export class Safe extends WorkerInterface { const requests = records.map(record => { const request = db.put(record, record.label) request.onsuccess = (event) => { - console.log('put request successful but not yet committed') } request.onerror = (event) => { console.error('put request error before transaction committed') @@ -303,7 +296,6 @@ export class Safe extends WorkerInterface { return request }) transaction.oncomplete = (event) => { - console.log('put transaction committed') const results = [] for (const request of requests) { if (request?.error == null && request.result != null) { diff --git a/src/lib/workers/worker-interface.ts b/src/lib/workers/worker-interface.ts index d11da4e..33bb46d 100644 --- a/src/lib/workers/worker-interface.ts +++ b/src/lib/workers/worker-interface.ts @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-3.0-or-later import { parentPort } from 'node:worker_threads' -import { Data, NamedData } from '#types' +import { NamedData } from '#types' /** * Provides basic worker event messaging to extending classes.