Remove worker capabilities from ckd class.

diff --git a/src/lib/safe/nano-nacl.ts b/src/lib/safe/nano-nacl.ts
index 7773fa3592dd98ac8f76c13b4bdf89b4097e391d..0e8c8c2de65043a280b63f011b192df59f378b86 100644 (file)
--- a/src/lib/safe/nano-nacl.ts
+++ b/src/lib/safe/nano-nacl.ts
@@ -3,7 +3,6 @@
 \r
 'use strict'\r
 \r
-import { WorkerInterface } from './worker-interface'\r
 import { Blake2b } from '#src/lib/blake2b.js'\r
 import { default as Convert, hex } from '#src/lib/convert.js'\r
 import { Key, NamedData } from '#types'\r
@@ -21,11 +20,7 @@ import { Key, NamedData } from '#types'
 * See for details: https://docs.nano.org/integration-guides/the-basics/\r
 * Original source commit: https://github.com/dchest/tweetnacl-js/blob/71df1d6a1d78236ca3e9f6c788786e21f5a651a6/nacl-fast.js\r
 */\r
-export class NanoNaCl extends WorkerInterface {\r
-       static {\r
-               this.listen()\r
-       }\r
-\r
+export class NanoNaCl {\r
        static async work (data: NamedData<string | ArrayBuffer>): Promise<NamedData> {\r
                if (typeof data.method !== 'string'\r
                        || !(data.msg == null || data.msg instanceof ArrayBuffer)\r
@@ -601,13 +596,3 @@ export class NanoNaCl extends WorkerInterface {
                return pk\r
        }\r
 }\r
-\r
-let importWorkerThreads = ''\r
-NODE: importWorkerThreads = `import { parentPort } from 'node:worker_threads'`\r
-export default `\r
-       ${importWorkerThreads}\r
-       ${Convert}\r
-       const Blake2b = ${Blake2b}\r
-       const WorkerInterface = ${WorkerInterface}\r
-       const NanoNaCl = ${NanoNaCl}\r
-`\r

diff --git a/src/lib/safe/safe.ts b/src/lib/safe/safe.ts
index df0064c75f76809eece1d0801a6f4b3d0ee6f082..3e0fb07961806a9bb3fe7ae630518d4b09e6e17c 100644 (file)
--- a/src/lib/safe/safe.ts
+++ b/src/lib/safe/safe.ts
@@ -4,6 +4,7 @@
 'use strict'
 
 import { Bip44Ckd } from './bip44-ckd'
+import { Blake2b } from './blake2b
 import { WorkerInterface } from './worker-interface'
 import { PBKDF2_ITERATIONS } from '#src/lib/constants.js'
 import { default as Convert, bytes } from '#src/lib/convert.js'
@@ -361,6 +362,7 @@ export default `
        ${Convert}
        const PBKDF2_ITERATIONS = ${PBKDF2_ITERATIONS}
        const Entropy = ${Entropy}
+       const Blake2b = ${Blake2b}
        const Bip44Ckd = ${Bip44Ckd}
        const WorkerInterface = ${WorkerInterface}
        const Safe = ${Safe}