From d6d5662ab9f42472c21ba6133e66aee37ff35b1f Mon Sep 17 00:00:00 2001 From: Chris Duncan Date: Sat, 9 Aug 2025 23:17:32 -0700 Subject: [PATCH] Rename safe to vault. --- src/lib/wallet/create.ts | 2 +- src/lib/wallet/ledger.ts | 4 ++-- src/lib/wallet/load.ts | 2 +- src/lib/wallet/{safe.ts => vault.ts} | 8 ++++---- src/lib/wallet/wallet.ts | 24 ++++++++++++------------ src/types.d.ts | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) rename src/lib/wallet/{safe.ts => vault.ts} (98%) diff --git a/src/lib/wallet/create.ts b/src/lib/wallet/create.ts index 59fa4b2..b9a38c8 100644 --- a/src/lib/wallet/create.ts +++ b/src/lib/wallet/create.ts @@ -15,7 +15,7 @@ import { Wallet } from './wallet' */ export async function _create (wallet: Wallet, password: ArrayBuffer, mnemonicSalt?: string) { try { - const { iv, salt, encrypted, seed, mnemonic } = await wallet.safe.request({ + const { iv, salt, encrypted, seed, mnemonic } = await wallet.vault.request({ action: 'create', type: wallet.type, password, diff --git a/src/lib/wallet/ledger.ts b/src/lib/wallet/ledger.ts index 024aac8..5d3c2fa 100644 --- a/src/lib/wallet/ledger.ts +++ b/src/lib/wallet/ledger.ts @@ -80,7 +80,7 @@ export class Ledger extends Wallet { } #accounts: AccountList - #safe: undefined + #vault: undefined #status: DeviceStatus = 'DISCONNECTED' get status (): DeviceStatus { return this.#status } @@ -91,7 +91,7 @@ export class Ledger extends Wallet { Ledger.#isInternal = false super('Ledger') this.#accounts = new AccountList() - this.#safe = undefined + this.#vault = undefined } /** diff --git a/src/lib/wallet/load.ts b/src/lib/wallet/load.ts index 7a01d8c..a31e3b3 100644 --- a/src/lib/wallet/load.ts +++ b/src/lib/wallet/load.ts @@ -30,7 +30,7 @@ export async function _load (wallet: Wallet, password: ArrayBuffer, secret: stri } else { throw new TypeError('Invalid wallet data') } - const result = wallet.safe.request(data) + const result = wallet.vault.request(data) const { iv, salt, encrypted } = await result const record = { id: wallet.id, diff --git a/src/lib/wallet/safe.ts b/src/lib/wallet/vault.ts similarity index 98% rename from src/lib/wallet/safe.ts rename to src/lib/wallet/vault.ts index ca19ba1..5d299ff 100644 --- a/src/lib/wallet/safe.ts +++ b/src/lib/wallet/vault.ts @@ -10,7 +10,7 @@ import { default as Convert, utf8 } from '../convert' /** * Cross-platform worker for managing wallet secrets. */ -export class Safe { +export class Vault { static #locked: boolean = true static #type?: 'BIP-44' | 'BLAKE2b' static #seed?: ArrayBuffer @@ -97,8 +97,8 @@ export class Safe { } message.data[key] = undefined } - BROWSER: postMessage({ error: 'Failed to process Safe request', cause: err }) - NODE: parentPort?.postMessage({ error: 'Failed to process Safe request', cause: err }) + BROWSER: postMessage({ error: 'Failed to process Vault request', cause: err }) + NODE: parentPort?.postMessage({ error: 'Failed to process Vault request', cause: err }) } } BROWSER: addEventListener('message', listener) @@ -581,5 +581,5 @@ export default ` const Bip44 = ${Bip44} const Blake2b = ${Blake2b} const NanoNaCl = ${NanoNaCl} - const Safe = ${Safe} + const Vault = ${Vault} ` diff --git a/src/lib/wallet/wallet.ts b/src/lib/wallet/wallet.ts index 49d02af..510a715 100644 --- a/src/lib/wallet/wallet.ts +++ b/src/lib/wallet/wallet.ts @@ -10,7 +10,7 @@ import { _create } from './create' import { Database } from '../database' import { _load } from './load' import { Rpc } from '../rpc' -import { default as SafeWorker } from './safe' +import { default as VaultWorker } from './vault' import { WorkerQueue } from './worker-queue' /** @@ -148,12 +148,12 @@ export class Wallet { #lockTimer?: any #id: string #mnemonic?: ArrayBuffer - #safe: WorkerQueue + #vault: WorkerQueue #seed?: ArrayBuffer #type: WalletType get id () { return this.#id } - get safe () { return this.#safe } + get vault () { return this.#vault } get type () { return this.#type } /** Set when calling `create()` and self-destructs after the first read. */ @@ -192,7 +192,7 @@ export class Wallet { Wallet.#isInternal = false this.#accounts = new AccountList() this.#id = id ?? crypto.randomUUID() - this.#safe = new WorkerQueue(SafeWorker) + this.#vault = new WorkerQueue(VaultWorker) this.#type = type } @@ -253,7 +253,7 @@ export class Wallet { if (indexes.length > 0) { const promises = [] for (const index of indexes) { - promises.push(this.#safe.request({ + promises.push(this.#vault.request({ action: 'derive', index })) @@ -282,7 +282,7 @@ export class Wallet { if (!isDeleted) { throw new Error('Failed to delete wallet from database') } - this.#safe.terminate() + this.#vault.terminate() clearTimeout(this.#lockTimer) } catch (err) { console.error(err) @@ -298,11 +298,11 @@ export class Wallet { */ async lock (): Promise { try { - const { isLocked } = await this.#safe.request({ + const { isLocked } = await this.#vault.request({ action: 'lock' }) if (!isLocked) { - throw new Error('Lock request to Safe failed') + throw new Error('Lock request to Vault failed') } clearTimeout(this.#lockTimer) return isLocked @@ -360,7 +360,7 @@ export class Wallet { async sign (index: number, block: Block, format: 'hex'): Promise async sign (index: number, block: Block, format?: 'hex'): Promise> { try { - const { signature } = await this.#safe.request({ + const { signature } = await this.#vault.request({ action: 'sign', index, data: hex.toBuffer(block.hash) @@ -384,7 +384,7 @@ export class Wallet { async unlock (password: string): Promise { try { const { iv, salt, encrypted } = await Wallet.#get(this.#id) - const { isUnlocked } = await this.#safe.request({ + const { isUnlocked } = await this.#vault.request({ action: 'unlock', type: this.#type, password: utf8.toBuffer(password), @@ -393,7 +393,7 @@ export class Wallet { encrypted }) if (!isUnlocked) { - throw new Error('Unlock request to Safe failed') + throw new Error('Unlock request to Vault failed') } clearTimeout(this.#lockTimer) this.#lockTimer = setTimeout(() => this.lock(), 300000) @@ -464,7 +464,7 @@ export class Wallet { } else { throw new TypeError('Invalid format') } - const result = await this.#safe.request(data) + const result = await this.#vault.request(data) const { isVerified } = result return isVerified } catch (err) { diff --git a/src/types.d.ts b/src/types.d.ts index 3acec79..a7a3767 100644 --- a/src/types.d.ts +++ b/src/types.d.ts @@ -613,7 +613,7 @@ export declare class Wallet { */ static restore (id: string): Promise get id (): string - get safe (): WorkerQueue + get vault (): WorkerQueue get type (): WalletType /** Set when calling `create()` and self-destructs after the first read. */ get mnemonic (): string | undefined -- 2.47.3