Update Bip44Ckd exports and imports.

diff --git a/src/lib/wallet.ts b/src/lib/wallet.ts
index 49d74e6aa83d0b5a1a6a0aa03c02a140c0dc146c..5b97b215711dc9ced78dccd6fd6617b38325fd69 100644 (file)
--- a/src/lib/wallet.ts
+++ b/src/lib/wallet.ts
@@ -9,7 +9,7 @@ import { Entropy } from './entropy.js'
 import { Pool } from './pool.js'\r
 import { Rpc } from './rpc.js'\r
 import { Safe } from './safe.js'\r
-import { ckdBip44, NanoNaCl } from './workers.js'\r
+import { Bip44Ckd, NanoNaCl } from './workers.js'\r
 import type { Ledger } from './ledger.js'\r
 \r
 type KeyPair = {\r
@@ -276,7 +276,7 @@ export class Bip44Wallet extends Wallet {
                        throw new Error(`Bip44Wallet cannot be instantiated directly. Use 'await Bip44Wallet.create()' instead.`)\r
                }\r
                super(seed, mnemonic, id)\r
-               this.#pool = new Pool(ckdBip44)\r
+               this.#pool = new Pool(Bip44Ckd)\r
                Bip44Wallet.#isInternal = false\r
        }\r
 \r

diff --git a/src/lib/workers.ts b/src/lib/workers.ts
index 436798001f802028d608cae1b62ffa9ffb807c6c..6861f7c2f1cffdb26d7411e2e1f3338dc23c7a5d 100644 (file)
--- a/src/lib/workers.ts
+++ b/src/lib/workers.ts
@@ -1,8 +1,8 @@
-import ckdBip44 from './workers/ckdBip44.js'
+import { worker as Bip44Ckd } from './workers/ckdBip44.js'
 import { worker as NanoNaCl } from './nano-nacl.js'
 // import './workers/passkey.js'
 import pow from './workers/pow.js'
 
 
 
-export { ckdBip44, NanoNaCl }
+export { Bip44Ckd, NanoNaCl }

diff --git a/src/lib/workers/ckdBip44.ts b/src/lib/workers/ckdBip44.ts
index c1f1294cce893ed18efa20cb8337c637127a7c7e..772f78e443784baa0934806f0a0703d5fb60291a 100644 (file)
--- a/src/lib/workers/ckdBip44.ts
+++ b/src/lib/workers/ckdBip44.ts
@@ -6,7 +6,7 @@ type ExtendedKey = {
        chainCode: DataView
 }
 
-const Bip44Ckd = () => {
+const b = () => {
        const BIP44_COIN_NANO = 165
        const BIP44_PURPOSE = 44
        const HARDENED_OFFSET = 0x80000000
@@ -107,6 +107,12 @@ const Bip44Ckd = () => {
                const signature = await subtle.sign('HMAC', pk, data)
                return new Uint8Array(signature)
        }
+
+       return { nanoCKD }
 }
 
-export default Bip44Ckd.toString().substring(Bip44Ckd.toString().indexOf('{') + 1, Bip44Ckd.toString().lastIndexOf('}'))
+export const Bip44Ckd = b()
+
+const start = b.toString().indexOf('{') + 1
+const end = b.toString().lastIndexOf('return')
+export const worker = b.toString().substring(start, end)