Reorganize Ledger class to top lib directory instead of wallet.

diff --git a/src/lib/wallet/ledger.ts b/src/lib/ledger.ts
similarity index 99%
rename from src/lib/wallet/ledger.ts
rename to src/lib/ledger.ts
index 85cf0ff2db1950bf839eb99c83d64f611e5fb1ab..9d3b4b4cf9fad7c6af186ca18a975b5f5e75e999 100644 (file)
--- a/src/lib/wallet/ledger.ts
+++ b/src/lib/ledger.ts
@@ -6,12 +6,12 @@ import { default as TransportBLE } from '@ledgerhq/hw-transport-web-ble'
 import { default as TransportHID } from '@ledgerhq/hw-transport-webhid'
 import { default as TransportUSB } from '@ledgerhq/hw-transport-webusb'
 import { LedgerStatus, LedgerAccountResponse, LedgerResponse, LedgerSignResponse, LedgerVersionResponse } from '#types'
-import { Account } from '../account'
-import { Block } from '../block'
-import { BIP44_COIN_NANO, BIP44_PURPOSE, HARDENED_OFFSET } from '../constants'
-import { bytes, dec, hex } from '../convert'
-import { Rpc } from '../rpc'
-import { Wallet } from '../wallet'
+import { Account } from './account'
+import { Block } from './block'
+import { BIP44_COIN_NANO, BIP44_PURPOSE, HARDENED_OFFSET } from './constants'
+import { bytes, dec, hex } from './convert'
+import { Rpc } from './rpc'
+import { Wallet } from './wallet'
 
 /**
 * Ledger hardware wallet created by communicating with a Ledger device via ADPU

diff --git a/src/lib/wallet/accounts.ts b/src/lib/wallet/accounts.ts
index 1939c408f0fe4eb62f51742a0500b401a2f8f658..556e7aa153dc13e4517b8b21c0d773a367a3ecf1 100644 (file)
--- a/src/lib/wallet/accounts.ts
+++ b/src/lib/wallet/accounts.ts
@@ -27,7 +27,7 @@ export async function _accounts (type: WalletType, accounts: Map<number, Account
        if (indexes.length > 0) {
                const publicAccounts = []
                if (type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        for (const index of indexes) {
                                const { status, publicKey } = await Ledger.account(index)
                                if (status !== 'OK' || publicKey == null) {

diff --git a/src/lib/wallet/config.ts b/src/lib/wallet/config.ts
index e9b7d979a6195ad80691aa49de2bba276a97b12d..6166d0a0cbe906f949d87ab18f3c060b418606a1 100644 (file)
--- a/src/lib/wallet/config.ts
+++ b/src/lib/wallet/config.ts
@@ -12,7 +12,7 @@ export async function _config (type: WalletType, vault: Vault, settings: unknown
                }
                const { connection, timeout } = settings as { [key: string]: unknown }
                if (type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        if (connection !== undefined && connection !== 'hid' && connection !== 'ble' && connection !== 'usb') {
                                throw new Error('Ledger connection must be hid, ble, or usb', { cause: connection })
                        }

diff --git a/src/lib/wallet/create.ts b/src/lib/wallet/create.ts
index 2aec6fe944842176b1264f0c1050609d2c26f1d9..691358d467edcd082881c777a7322b02436c0212 100644 (file)
--- a/src/lib/wallet/create.ts
+++ b/src/lib/wallet/create.ts
@@ -17,7 +17,7 @@ export async function _create (wallet: Wallet, vault: Vault, password: unknown,
                        type: wallet.type
                }
                if (wallet.type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        try {
                                if (Ledger.isUnsupported) {
                                        throw new Error('Browser is unsupported')

diff --git a/src/lib/wallet/load.ts b/src/lib/wallet/load.ts
index 406c539245e9dfaaf39e485e748129d557843f48..08cb559814a16b5e79d486603ab637614639bec1 100644 (file)
--- a/src/lib/wallet/load.ts
+++ b/src/lib/wallet/load.ts
@@ -17,7 +17,7 @@ export async function _load (wallet: Wallet, vault: Vault, password: unknown, se
                }
                if (wallet.type === 'Ledger') {
 
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        if (Ledger.isUnsupported) {
                                throw new Error('Failed to initialize Ledger wallet', { cause: 'Browser is unsupported' })
                        }

diff --git a/src/lib/wallet/lock.ts b/src/lib/wallet/lock.ts
index a65773fc20aacc2fbc824e62eb0632fb17f4b959..14fc500f4a27a00fee479a417236ff05ece2344f 100644 (file)
--- a/src/lib/wallet/lock.ts
+++ b/src/lib/wallet/lock.ts
@@ -7,7 +7,7 @@ import { Wallet } from '../wallet'
 export async function _lock (wallet: Wallet, vault: Vault): Promise<void> {
        try {
                if (wallet.type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        Ledger.disconnect()
                } else {
                        await vault.request({

diff --git a/src/lib/wallet/sign.ts b/src/lib/wallet/sign.ts
index 3078172900f3c2c665327d9afc4d924403778be3..4ff689e3cb8ec8a33f762ef3a40132f7965400d6 100644 (file)
--- a/src/lib/wallet/sign.ts
+++ b/src/lib/wallet/sign.ts
@@ -44,7 +44,7 @@ export async function _signBlock (wallet: Wallet, vault: Vault, index: unknown,
                        throw new TypeError('Invalid Block', { cause: block })
                }
                if (wallet.type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        const account = await wallet.account(index)
                        if (frontier instanceof Block) {
                                try {

diff --git a/src/lib/wallet/unlock.ts b/src/lib/wallet/unlock.ts
index bf5ba375f49ae2232d202f4a3b3189a4113a60a9..d021699f8b6e98177ea4e841899fb8404368eeb3 100644 (file)
--- a/src/lib/wallet/unlock.ts
+++ b/src/lib/wallet/unlock.ts
@@ -15,7 +15,7 @@ export async function _unlock (wallet: Wallet, vault: Vault, password: unknown):
                        type: wallet.type
                }
                if (wallet.type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        const status = await Ledger.connect()
                        if (await status !== 'CONNECTED') {
                                throw new Error('Failed to unlock wallet', { cause: status })

diff --git a/src/lib/wallet/verify.ts b/src/lib/wallet/verify.ts
index 8a5d22d1d8886d67b5791a2cc39dc5ca3bee9967..47b439dc1b7b6600427165d23d3c0447fb1ea72c 100644 (file)
--- a/src/lib/wallet/verify.ts
+++ b/src/lib/wallet/verify.ts
@@ -12,7 +12,7 @@ export async function _verify (type: WalletType, vault: Vault, secret: unknown):
                        throw new TypeError('Wallet secret must be a string', { cause: typeof secret })
                }
                if (type === 'Ledger') {
-                       const { Ledger } = await import('./ledger')
+                       const { Ledger } = await import('../ledger')
                        return await Ledger.verify(secret)
                } else {
                        const data: NamedData = {