Fix import of NanoNaCl that was not executing on import.

diff --git a/src/lib/workers.ts b/src/lib/workers.ts
index 61a1b6d97f13ae6b6733d16e8c57dbab326dcd21..0d3dd2c473a70e813bfce884c74329ca103ce28a 100644 (file)
--- a/src/lib/workers.ts
+++ b/src/lib/workers.ts
@@ -82,7 +82,7 @@ const w = () => {
 }
 
 const bip44ckd = `const Bip44Ckd = ${Bip44Ckd}\n`
-const nanonacl = `const NanoNaCl = () => {\n${NanoNaClWorker}\n}\n`
+const nanonacl = `const NanoNaCl = (()=>{${NanoNaClWorker}return n()})()\n`
 const pow = `const Pow = ${Pow}\n`
 const start = w.toString().indexOf('{') + 1
 const end = w.toString().lastIndexOf('}')

diff --git a/src/lib/workers/nano-nacl.ts b/src/lib/workers/nano-nacl.ts
index e350cba8be1f98106f6abd75994e917dfe64127d..4830d9d0a8773c5ce95811c7427528d80dc359ae 100644 (file)
--- a/src/lib/workers/nano-nacl.ts
+++ b/src/lib/workers/nano-nacl.ts
@@ -840,6 +840,6 @@ const n = () => {
 export const NanoNaCl = n()\r
 \r
 const start = n.toString().indexOf('{') + 1\r
-const end = n.toString().lastIndexOf('return')\r
+const end = n.toString().lastIndexOf('}')\r
 const blake2b = `const Blake2b = ${Blake2b}\n`\r
 export const worker = `${blake2b}${n.toString().substring(start, end)}`\r