Rename safe to vault.

diff --git a/src/lib/wallet/create.ts b/src/lib/wallet/create.ts
index 59fa4b21d3d32f165cbd07b4a5013e6026a1b13e..b9a38c87a49f898298c444a37329a8adf666b9fe 100644 (file)
--- 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<ArrayBuffer>({
+               const { iv, salt, encrypted, seed, mnemonic } = await wallet.vault.request<ArrayBuffer>({
                        action: 'create',
                        type: wallet.type,
                        password,

diff --git a/src/lib/wallet/ledger.ts b/src/lib/wallet/ledger.ts
index 024aac8bbd14c17471338dea36332fee68e8def2..5d3c2fa965f7cb5144262d6c72940d8a79aae8db 100644 (file)
--- a/src/lib/wallet/ledger.ts
+++ b/src/lib/wallet/ledger.ts
@@ -80,7 +80,7 @@ export class Ledger extends Wallet {
        }\r
 \r
        #accounts: AccountList\r
-       #safe: undefined\r
+       #vault: undefined\r
        #status: DeviceStatus = 'DISCONNECTED'\r
        get status (): DeviceStatus { return this.#status }\r
 \r
@@ -91,7 +91,7 @@ export class Ledger extends Wallet {
                Ledger.#isInternal = false\r
                super('Ledger')\r
                this.#accounts = new AccountList()\r
-               this.#safe = undefined\r
+               this.#vault = undefined\r
        }\r
 \r
        /**\r

diff --git a/src/lib/wallet/load.ts b/src/lib/wallet/load.ts
index 7a01d8c972b285a1b503ab0ccae9443318d64001..a31e3b36eb2a1f99ebd65fe8f7f9876b4086eb8b 100644 (file)
--- 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<ArrayBuffer>(data)
+               const result = wallet.vault.request<ArrayBuffer>(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 ca19ba10794e6cb1f61ab23d78b2e61599ded8ec..5d299ff31ff1dfba63a6c810244cb862409d016f 100644 (file)
--- 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 49d02af30e492a8028fdc5b9424cdcc72437d5a5..510a71547c8febc0457a172ab2a6dd71a021073c 100644 (file)
--- a/src/lib/wallet/wallet.ts
+++ b/src/lib/wallet/wallet.ts
@@ -10,7 +10,7 @@ import { _create } from './create'
 import { Database } from '../database'\r
 import { _load } from './load'\r
 import { Rpc } from '../rpc'\r
-import { default as SafeWorker } from './safe'\r
+import { default as VaultWorker } from './vault'\r
 import { WorkerQueue } from './worker-queue'\r
 \r
 /**\r
@@ -148,12 +148,12 @@ export class Wallet {
        #lockTimer?: any\r
        #id: string\r
        #mnemonic?: ArrayBuffer\r
-       #safe: WorkerQueue\r
+       #vault: WorkerQueue\r
        #seed?: ArrayBuffer\r
        #type: WalletType\r
 \r
        get id () { return this.#id }\r
-       get safe () { return this.#safe }\r
+       get vault () { return this.#vault }\r
        get type () { return this.#type }\r
 \r
        /** Set when calling `create()` and self-destructs after the first read. */\r
@@ -192,7 +192,7 @@ export class Wallet {
                Wallet.#isInternal = false\r
                this.#accounts = new AccountList()\r
                this.#id = id ?? crypto.randomUUID()\r
-               this.#safe = new WorkerQueue(SafeWorker)\r
+               this.#vault = new WorkerQueue(VaultWorker)\r
                this.#type = type\r
        }\r
 \r
@@ -253,7 +253,7 @@ export class Wallet {
                if (indexes.length > 0) {\r
                        const promises = []\r
                        for (const index of indexes) {\r
-                               promises.push(this.#safe.request<ArrayBuffer>({\r
+                               promises.push(this.#vault.request<ArrayBuffer>({\r
                                        action: 'derive',\r
                                        index\r
                                }))\r
@@ -282,7 +282,7 @@ export class Wallet {
                        if (!isDeleted) {\r
                                throw new Error('Failed to delete wallet from database')\r
                        }\r
-                       this.#safe.terminate()\r
+                       this.#vault.terminate()\r
                        clearTimeout(this.#lockTimer)\r
                } catch (err) {\r
                        console.error(err)\r
@@ -298,11 +298,11 @@ export class Wallet {
        */\r
        async lock (): Promise<boolean> {\r
                try {\r
-                       const { isLocked } = await this.#safe.request<boolean>({\r
+                       const { isLocked } = await this.#vault.request<boolean>({\r
                                action: 'lock'\r
                        })\r
                        if (!isLocked) {\r
-                               throw new Error('Lock request to Safe failed')\r
+                               throw new Error('Lock request to Vault failed')\r
                        }\r
                        clearTimeout(this.#lockTimer)\r
                        return isLocked\r
@@ -360,7 +360,7 @@ export class Wallet {
        async sign (index: number, block: Block, format: 'hex'): Promise<string>\r
        async sign (index: number, block: Block, format?: 'hex'): Promise<string | Uint8Array<ArrayBuffer>> {\r
                try {\r
-                       const { signature } = await this.#safe.request<ArrayBuffer>({\r
+                       const { signature } = await this.#vault.request<ArrayBuffer>({\r
                                action: 'sign',\r
                                index,\r
                                data: hex.toBuffer(block.hash)\r
@@ -384,7 +384,7 @@ export class Wallet {
        async unlock (password: string): Promise<boolean> {\r
                try {\r
                        const { iv, salt, encrypted } = await Wallet.#get(this.#id)\r
-                       const { isUnlocked } = await this.#safe.request<boolean>({\r
+                       const { isUnlocked } = await this.#vault.request<boolean>({\r
                                action: 'unlock',\r
                                type: this.#type,\r
                                password: utf8.toBuffer(password),\r
@@ -393,7 +393,7 @@ export class Wallet {
                                encrypted\r
                        })\r
                        if (!isUnlocked) {\r
-                               throw new Error('Unlock request to Safe failed')\r
+                               throw new Error('Unlock request to Vault failed')\r
                        }\r
                        clearTimeout(this.#lockTimer)\r
                        this.#lockTimer = setTimeout(() => this.lock(), 300000)\r
@@ -464,7 +464,7 @@ export class Wallet {
                        } else {\r
                                throw new TypeError('Invalid format')\r
                        }\r
-                       const result = await this.#safe.request<boolean>(data)\r
+                       const result = await this.#vault.request<boolean>(data)\r
                        const { isVerified } = result\r
                        return isVerified\r
                } catch (err) {\r

diff --git a/src/types.d.ts b/src/types.d.ts
index 3acec79fe212fb3d0ec4a86787a2414a4796ddae..a7a3767a43e7a66128a10e965e1a187fe9fe72eb 100644 (file)
--- a/src/types.d.ts
+++ b/src/types.d.ts
@@ -613,7 +613,7 @@ export declare class Wallet {
        */
        static restore (id: string): Promise<Wallet>
        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