Adjust default exports used in Safe worker to allow easier import.

diff --git a/src/lib/bip39-wordlist.ts b/src/lib/bip39-wordlist.ts
index 7c78594af449665469b76fdc453e317136d986cc..c57e5b0be75d68bd38d6a73d71a58b03f2f0d880 100644 (file)
--- a/src/lib/bip39-wordlist.ts
+++ b/src/lib/bip39-wordlist.ts
@@ -2054,3 +2054,5 @@ export const Bip39Words: readonly string[] = Object.freeze([
        'zone',
        'zoo'
 ])
+
+export default JSON.stringify(Bip39Words)

diff --git a/src/lib/constants.ts b/src/lib/constants.ts
index be56b4a7c9cc2358bc0f503505d6eed7b9b2b264..d1b0b58b8c5d7259c94c844530076d7f0735c844 100644 (file)
--- a/src/lib/constants.ts
+++ b/src/lib/constants.ts
@@ -58,3 +58,29 @@ export const UNITS: { [key: string]: number } = Object.freeze({
        KNANO: 33,
        MNANO: 36
 })
+
+export default `
+       const ACCOUNT_KEY_BYTE_LENGTH = ${ACCOUNT_KEY_BYTE_LENGTH}
+       const ACCOUNT_KEY_HEX_LENGTH = ${ACCOUNT_KEY_HEX_LENGTH}
+       const ADDRESS_GAP = ${ADDRESS_GAP}
+       const ALPHABET = '${ALPHABET}'
+       const BIP39_ITERATIONS = ${BIP39_ITERATIONS}
+       const BIP44_PURPOSE = ${BIP44_PURPOSE}
+       const BIP44_COIN_NANO = ${BIP44_COIN_NANO}
+       const BURN_ADDRESS = '${BURN_ADDRESS}'
+       const HARDENED_OFFSET = ${HARDENED_OFFSET}
+       const NONCE_LENGTH = ${NONCE_LENGTH}
+       const PBKDF2_ITERATIONS = ${PBKDF2_ITERATIONS}
+       const PREAMBLE = '${PREAMBLE}'
+       const PREFIX = '${PREFIX}'
+       const PREFIX_LEGACY = '${PREFIX_LEGACY}'
+       const SEED_LENGTH_BIP44 = ${SEED_LENGTH_BIP44}
+       const SEED_LENGTH_BLAKE2B = ${SEED_LENGTH_BLAKE2B}
+       const SLIP10_ED25519 = '${SLIP10_ED25519}'
+       const DIFFICULTY_RECEIVE = ${DIFFICULTY_RECEIVE}
+       const DIFFICULTY_SEND = ${DIFFICULTY_SEND}
+       const XNO = '${XNO}'
+       const LEDGER_STATUS_CODES = ${JSON.stringify(LEDGER_STATUS_CODES)}
+       const LEDGER_ADPU_CODES = ${JSON.stringify(LEDGER_ADPU_CODES)}
+       const UNITS = ${JSON.stringify(UNITS)}
+`

diff --git a/src/lib/convert.ts b/src/lib/convert.ts
index fdcf29188bffb42568018247a909d53dd76a448d..38dd256dd1c0ea7faab148698882460e7e92b9a5 100644 (file)
--- a/src/lib/convert.ts
+++ b/src/lib/convert.ts
@@ -341,7 +341,6 @@ export class utf8 {
 }\r
 \r
 export default `\r
-       const ALPHABET = '${ALPHABET}'\r
        const base32 = ${base32}\r
        const bin = ${bin}\r
        const bytes = ${bytes}\r

diff --git a/src/lib/safe.ts b/src/lib/safe.ts
index 2c3c041603316afb0dfe9cfa103b0bcb9b170896..9838fc9340ce828d69125e15e73dd71e3eabc0da 100644 (file)
--- a/src/lib/safe.ts
+++ b/src/lib/safe.ts
@@ -5,11 +5,11 @@
 
 import { parentPort } from 'node:worker_threads'
 import { Bip39Mnemonic } from './bip39-mnemonic.js'
-import { Bip39Words } from './bip39-wordlist'
+import { default as Bip39Words } from './bip39-wordlist'
 import { Bip44Ckd } from './bip44-ckd'
 import { Blake2b } from './blake2b'
 import { Blake2bCkd } from './blake2b-ckd'
-import { BIP39_ITERATIONS } from './constants'
+import { default as Constants, BIP44_COIN_NANO } from './constants'
 import { default as Convert, bytes, hex, utf8 } from './convert.js'
 import { Entropy } from './entropy'
 import { NanoNaCl } from './nano-nacl'
@@ -510,9 +510,9 @@ NODE: importWorkerThreads = `import { parentPort } from 'node:worker_threads'`
 export default `
        ${importWorkerThreads}
        ${Convert}
-       const BIP39_ITERATIONS = ${BIP39_ITERATIONS}
+       ${Constants}
        const Bip39Mnemonic = ${Bip39Mnemonic}
-       const Bip39Words = ["${Bip39Words.join('","')}"]
+       const Bip39Words = ${Bip39Words}
        const Bip44Ckd = ${Bip44Ckd}
        const Blake2b = ${Blake2b}
        const Blake2bCkd = ${Blake2bCkd}