Change some names and fix NanoNaCl worker with a forced name for the Blake2b class...

diff --git a/src/lib/wallet.ts b/src/lib/wallet.ts
index d8c4693673a698fa4a3585381708d8d2e9d4a9da..e417737143401bb292848fadfcc49cad10160a6b 100644 (file)
--- a/src/lib/wallet.ts
+++ b/src/lib/wallet.ts
@@ -10,7 +10,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 { ckdBip44, NanoNaCl } from './workers.js'\r
 import type { Ledger } from './ledger.js'\r
 \r
 type KeyPair = {\r
@@ -60,7 +60,7 @@ abstract class Wallet {
                        ? new Entropy(id)\r
                        : new Entropy(16)\r
                this.#mnemonic = mnemonic ?? null\r
-               this.#pool = new Pool(`(${nanoNacl})(${Blake2b})`)\r
+               this.#pool = new Pool(`const Blake2b = ${Blake2b}\n${NanoNaCl}`)\r
                this.#safe = new Safe()\r
                this.#seed = seed ?? null\r
        }\r

diff --git a/src/lib/workers.ts b/src/lib/workers.ts
index 02bc0568de00d5f26b7dbab323329a454c4bbcac..c8e5202504e33cb55ac58932fc8dbd855e6b2bad 100644 (file)
--- a/src/lib/workers.ts
+++ b/src/lib/workers.ts
@@ -1,4 +1,4 @@
 import ckdBip44 from './workers/ckdBip44.js'
-import nanoNacl from './workers/nano-nacl.js'
+import NanoNaCl from './workers/nano-nacl.js'
 // import './workers/passkey.js'
-export { ckdBip44, nanoNacl }
+export { ckdBip44, NanoNaCl }

diff --git a/src/lib/workers/ckdBip44.ts b/src/lib/workers/ckdBip44.ts
index 1e8c0a96a6d7439b2fdebdf09c7c2dd01bdf1a98..0aa91d489eda4c8359db25c8286b6c55e7924b5d 100644 (file)
--- a/src/lib/workers/ckdBip44.ts
+++ b/src/lib/workers/ckdBip44.ts
@@ -6,7 +6,7 @@ type ExtendedKey = {
        chainCode: DataView
 }
 
-async function fn () {
+const Bip44Ckd = () => {
        const BIP44_COIN_NANO = 165
        const BIP44_PURPOSE = 44
        const HARDENED_OFFSET = 0x80000000
@@ -95,4 +95,4 @@ async function fn () {
        }
 }
 
-export default `(${fn.toString()})()`
+export default Bip44Ckd.toString().substring(Bip44Ckd.toString().indexOf('{') + 1, Bip44Ckd.toString().lastIndexOf('}'))

diff --git a/src/lib/workers/nano-nacl.ts b/src/lib/workers/nano-nacl.ts
index 0cab73d21b8f73a88588195e583b83c3af7e83de..d63cef402582415790b63575aba20286fb05d7e6 100644 (file)
--- a/src/lib/workers/nano-nacl.ts
+++ b/src/lib/workers/nano-nacl.ts
@@ -15,9 +15,7 @@
 // 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
-import type { Blake2b } from '../blake2b.js'\r
-\r
-async function NanoNaCl (Blake2b: Blake2b) {\r
+const NanoNaCl = () => {\r
        /**\r
        * Listens for messages from a calling function.\r
        */\r
@@ -27,8 +25,7 @@ async function NanoNaCl (Blake2b: Blake2b) {
                postMessage({ publicKey, privateKey, index })\r
        })\r
 \r
-\r
-       var gf = function (init?: any) {\r
+       var gf = function (init?: number[]) {\r
                var i, r = new Float64Array(16)\r
                if (init) for (i = 0; i < init.length; i++) r[i] = init[i]\r
                return r\r
@@ -858,13 +855,9 @@ async function NanoNaCl (Blake2b: Blake2b) {
        const seedLength = crypto_sign_SEEDBYTES\r
        const signatureLength = crypto_sign_BYTES\r
 \r
+       return { sign, open, detached, verify, keyPair }\r
 }\r
 \r
-export const nacl = {\r
-       sign: NanoNaCl.sign,\r
-       open: NanoNaCl.open,\r
-       detached: NanoNaCl.detached,\r
-       verify: NanoNaCl.verify,\r
-       keyPair: NanoNaCl.keyPair\r
-}\r
-export default NanoNaCl.toString()\r
+export const nacl = NanoNaCl()\r
+\r
+export default NanoNaCl.toString().substring(NanoNaCl.toString().indexOf('{') + 1, NanoNaCl.toString().lastIndexOf('return'))\r