Update crypto module imports.

diff --git a/package.json b/package.json
index 649cfec0a1487e5db39b843e92ea379c0198d900..f2196c2c71df45e0981f73bad1a932b83e02fc8e 100644 (file)
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
                "test:prod": "npm run build:prod && npm run test:node"
        },
        "imports": {
+               "#crypto": "./src/lib/crypto/index.js",
                "#types": "./src/types.d.ts"
        },
        "dependencies": {

diff --git a/src/lib/account.ts b/src/lib/account.ts
index 109d6182cdc50628b9d6a4c97458e99b525bcc6b..f0b6e670f29eaa1e4d696055ac31b9428093917d 100644 (file)
--- a/src/lib/account.ts
+++ b/src/lib/account.ts
@@ -1,12 +1,11 @@
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>\r
 //! SPDX-License-Identifier: GPL-3.0-or-later\r
 \r
-import { Blake2b } from './crypto/blake2b'\r
+import { Blake2b, NanoNaCl } from '#crypto'\r
+import { Key, KeyPair } from '#types'\r
 import { ACCOUNT_KEY_BYTE_LENGTH, ACCOUNT_KEY_HEX_LENGTH, ALPHABET, PREFIX, PREFIX_LEGACY } from './constants'\r
 import { base32, bytes, hex } from './convert'\r
-import { NanoNaCl } from './crypto/nano-nacl'\r
 import { Rpc } from './rpc'\r
-import { Key, KeyPair } from '#types'\r
 \r
 /**\r
 * Represents a single Nano address and the associated public key. To include the\r

diff --git a/src/lib/block.ts b/src/lib/block.ts
index 6969891e8482a250667c87222e303c1f0b29a6fb..3261c500bcc412eee6b0c8492db0400f3ca0f1e4 100644 (file)
--- a/src/lib/block.ts
+++ b/src/lib/block.ts
@@ -2,11 +2,10 @@
 //! SPDX-License-Identifier: GPL-3.0-or-later
 
 import { NanoPow } from 'nano-pow'
+import { Blake2b, NanoNaCl } from '#crypto'
 import { Account } from './account'
-import { Blake2b } from './crypto/blake2b'
 import { BURN_PUBLIC_KEY, PREAMBLE, DIFFICULTY_RECEIVE, DIFFICULTY_SEND, UNITS } from './constants'
 import { bytes, dec, hex } from './convert'
-import { NanoNaCl } from './crypto/nano-nacl'
 import { Rpc } from './rpc'
 import { convert } from './tools'
 import { Wallet } from './wallet/wallet'

diff --git a/src/lib/crypto/index.ts b/src/lib/crypto/index.ts
new file mode 100644 (file)
index 0000000..bc47074
--- /dev/null
+++ b/src/lib/crypto/index.ts
@@ -0,0 +1,6 @@
+import { Bip39 } from "./bip39"
+import { Bip44 } from "./bip44"
+import { Blake2b } from "./blake2b"
+import { NanoNaCl } from "./nano-nacl"
+
+export { Bip39, Bip44, Blake2b, NanoNaCl }

diff --git a/src/lib/crypto/nano-nacl.ts b/src/lib/crypto/nano-nacl.ts
index 21f8c95e7d604d311ac6fadb1458e2063db418f3..c235280fa1d2dc25fc97dc84cc8b5c0b36c5390a 100644 (file)
--- a/src/lib/crypto/nano-nacl.ts
+++ b/src/lib/crypto/nano-nacl.ts
@@ -3,7 +3,7 @@
 \r
 'use strict'\r
 \r
-import { Blake2b } from './blake2b'\r
+import { Blake2b } from '#crypto'\r
 \r
 /**\r
 * Ported in 2014 by Dmitry Chestnykh and Devi Mandiri.\r

diff --git a/src/lib/rolodex.ts b/src/lib/rolodex.ts
index 8bd0e3b3796c93ab9321ff51e5c8383312e1901c..28809de0a78b6ce185f574b85583edc9fbae41a9 100644 (file)
--- a/src/lib/rolodex.ts
+++ b/src/lib/rolodex.ts
@@ -1,10 +1,10 @@
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
 
+import { NamedData } from '#types'
 import { Account } from './account'
 import { Database } from './database'
 import { verify } from './tools'
-import { NamedData } from '#types'
 
 /**
 * Represents a basic address book of Nano accounts. Multiple addresses can be

diff --git a/src/lib/tools.ts b/src/lib/tools.ts
index b8fc26796fbdf80f4b4aef0802984db602c89c4e..7deb136cdae7ae6585fef290a572d13cc07096e9 100644 (file)
--- a/src/lib/tools.ts
+++ b/src/lib/tools.ts
@@ -1,16 +1,15 @@
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
 
+import { Blake2b, NanoNaCl } from '#crypto'
+import { Key } from '#types'
 import { Account } from './account'
-import { Blake2b } from './crypto/blake2b'
 import { Block } from './block'
 import { MAX_SUPPLY, UNITS } from './constants'
 import { bytes, hex } from './convert'
 import { Ledger } from './wallet/ledger'
-import { NanoNaCl } from './crypto/nano-nacl'
 import { Rpc } from './rpc'
 import { Wallet } from './wallet/wallet'
-import { Key } from '#types'
 
 type SweepResult = {
        status: "success" | "error"

diff --git a/src/lib/wallet/safe.ts b/src/lib/wallet/safe.ts
index 4fc6b94beda494b9fcdb22fc03e0de98aac4b9c9..21c2909dfc78b7a63b4c57964dd8de85a251093b 100644 (file)
--- a/src/lib/wallet/safe.ts
+++ b/src/lib/wallet/safe.ts
@@ -4,13 +4,10 @@
 'use strict'
 
 import { parentPort } from 'node:worker_threads'
-import { Bip39 } from '../crypto/bip39'
-import { Bip44 } from '../crypto/bip44'
-import { Blake2b } from '../crypto/blake2b'
+import { Bip39, Bip44, Blake2b, NanoNaCl } from '#crypto'
+import { NamedData } from '#types'
 import { default as Constants, BIP44_COIN_NANO } from '../constants'
 import { default as Convert, bytes, hex, utf8 } from '../convert'
-import { NanoNaCl } from '../crypto/nano-nacl'
-import { NamedData } from '#types'
 
 /**
 * Cross-platform worker for managing wallet secrets.

diff --git a/src/lib/wallet/wallet.ts b/src/lib/wallet/wallet.ts
index 8d810793ff661a043ada5f266999a55ec8206b88..61aa240128605d6c70c834dd6dace134119c86e9 100644 (file)
--- a/src/lib/wallet/wallet.ts
+++ b/src/lib/wallet/wallet.ts
@@ -1,8 +1,9 @@
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>\r
 //! SPDX-License-Identifier: GPL-3.0-or-later\r
 \r
+import { Bip39 } from '#crypto'\r
+import { KeyPair, NamedData, WalletType } from '#types'\r
 import { Account, AccountList } from '../account'\r
-import { Bip39 } from '../crypto/bip39'\r
 import { Block } from '../block'\r
 import { ADDRESS_GAP } from '../constants'\r
 import { bytes, hex, utf8 } from '../convert'\r
@@ -10,7 +11,6 @@ import { Database } from '../database'
 import { Rpc } from '../rpc'\r
 import { default as SafeWorker } from './safe'\r
 import { WorkerQueue } from './worker-queue'\r
-import { KeyPair, NamedData, WalletType } from '#types'\r
 \r
 /**\r
 * Represents a wallet containing numerous Nano accounts derived from a single\r

diff --git a/src/main.ts b/src/main.ts
index 777b871627486f04c3e0e87b987d2c4e173a7224..090c562f3149741792de3505eb35d2dca5ab1cc7 100644 (file)
--- a/src/main.ts
+++ b/src/main.ts
@@ -1,8 +1,8 @@
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
 
+import { Blake2b } from '#crypto'
 import { Account } from './lib/account'
-import { Blake2b } from './lib/crypto/blake2b'
 import { Block } from './lib/block'
 import { Ledger } from './lib/wallet/ledger'
 import { Rolodex } from './lib/rolodex'
@@ -11,8 +11,8 @@ import { Tools } from './lib/tools'
 import { Wallet } from './lib/wallet/wallet'
 
 export {
-       Account,
        Blake2b,
+       Account,
        Block,
        Ledger,
        Rolodex,