Move wallets into their own directory.

diff --git a/src/lib/tools.ts b/src/lib/tools.ts
index d1f0ce41b2d6ff95ab927c2fd8a0937648e072db..694091dc9dd5ae436814723b1341f97a6037e7f7 100644 (file)
--- a/src/lib/tools.ts
+++ b/src/lib/tools.ts
@@ -7,7 +7,7 @@ import { SendBlock } from './block'
 import { UNITS } from './constants'
 import { hex } from './convert'
 import { Rpc } from './rpc'
-import { Bip44Wallet, Blake2bWallet, LedgerWallet } from './wallet'
+import { Bip44Wallet, Blake2bWallet, LedgerWallet } from './wallets'
 import { NanoNaCl } from '#workers'
 
 type SweepResult = {

diff --git a/src/lib/wallet.ts b/src/lib/wallets/index.ts
similarity index 95%
rename from src/lib/wallet.ts
rename to src/lib/wallets/index.ts
index 1e1852b1bea626af2928d838ad6c435477a55d17..79dfc572fab69c56ae5c266ee4ebf7ac38e0454a 100644 (file)
--- a/src/lib/wallet.ts
+++ b/src/lib/wallets/index.ts
@@ -1,16 +1,16 @@
 // SPDX-FileCopyrightText: 2024 Chris Duncan <chris@zoso.dev>\r
 // SPDX-License-Identifier: GPL-3.0-or-later\r
 \r
-import { Account, AccountList } from './account'\r
-import { Bip39Mnemonic } from './bip39-mnemonic'\r
-import { Blake2b } from './blake2b'\r
-import { ADDRESS_GAP, SEED_LENGTH_BIP44, SEED_LENGTH_BLAKE2B } from './constants'\r
-import { hex } from './convert'\r
-import { Entropy } from './entropy'\r
-import { Ledger } from './ledger'\r
-import { Pool } from './pool'\r
-import { Rpc } from './rpc'\r
-import { Safe } from './safe'\r
+import { Account, AccountList } from '#src/lib/account.js'\r
+import { Bip39Mnemonic } from '#src/lib/bip39-mnemonic.js'\r
+import { Blake2b } from '#src/lib/blake2b.js'\r
+import { ADDRESS_GAP, SEED_LENGTH_BIP44, SEED_LENGTH_BLAKE2B } from '#src/lib/constants.js'\r
+import { hex } from '#src/lib/convert.js'\r
+import { Entropy } from '#src/lib/entropy.js'\r
+import { Ledger } from '#src/lib/ledger.js'\r
+import { Pool } from '#src/lib/pool.js'\r
+import { Rpc } from '#src/lib/rpc.js'\r
+import { Safe } from '#src/lib/safe.js'\r
 import { Bip44CkdWorker, NanoNaClWorker } from '#workers'\r
 \r
 type KeyPair = {\r
@@ -684,7 +684,7 @@ export class LedgerWallet extends Wallet {
        * @returns {LedgerWallet} A wallet containing accounts and a Ledger device communication object\r
        */\r
        static async create (): Promise<LedgerWallet> {\r
-               const { Ledger } = await import('./ledger')\r
+               const { Ledger } = await import('../ledger')\r
                const l = await Ledger.init()\r
                const id = await Entropy.create(16)\r
                LedgerWallet.#isInternal = true\r
@@ -701,7 +701,7 @@ export class LedgerWallet extends Wallet {
                if (typeof id !== 'string' || id === '') {\r
                        throw new TypeError('Wallet ID is required to restore')\r
                }\r
-               const { Ledger } = await import('./ledger')\r
+               const { Ledger } = await import('../ledger')\r
                const l = await Ledger.init()\r
                LedgerWallet.#isInternal = true\r
                return new this(await Entropy.import(id), l)\r

diff --git a/src/main.ts b/src/main.ts
index 0db2b25ddcf629f9bf9048976c1fa0a06f52ed41..44aa887b12b63df025315d0ab8930bfe9c9218ab 100644 (file)
--- a/src/main.ts
+++ b/src/main.ts
@@ -8,6 +8,6 @@ import { Rolodex } from './lib/rolodex'
 import { Rpc } from './lib/rpc'
 import { Safe } from './lib/safe'
 import { Tools } from './lib/tools'
-import { Bip44Wallet, Blake2bWallet, LedgerWallet } from './lib/wallet'
+import { Bip44Wallet, Blake2bWallet, LedgerWallet } from './lib/wallets'
 
 export { Account, Blake2b, SendBlock, ReceiveBlock, ChangeBlock, Rpc, Rolodex, Safe, Tools, Bip44Wallet, Blake2bWallet, LedgerWallet }