Update with scripted schnorrkel-js (#313)

packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js.d.ts

@@ -3,5 +3,7 @@ export function sign(arg0: Uint8Array, arg1: Uint8Array, arg2: Uint8Array): Uint
 export function verify(arg0: Uint8Array, arg1: Uint8Array, arg2: Uint8Array): boolean;
 export function secret_from_seed(arg0: Uint8Array): Uint8Array;
 export function keypair_from_seed(arg0: Uint8Array): Uint8Array;
+
 export function isReady(): boolean;
 export function waitReady(): Promise<boolean>;
+

packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js.js

@@ -1,6 +1,5 @@
 /* tslint:disable */
-const schnorrkelWasm = require('./schnorrkel_js_bg');
-var wasm;
+let wasm; const wasmImports = {};
 
 let cachegetUint8Memory = null;
 function getUint8Memory() {
@@ -175,12 +174,12 @@ module.exports.keypair_from_seed = function(arg0) {
 
 };
 
-// const TextDecoder = require('util').TextDecoder;
+const { u8aToString } = require('@polkadot/util');
 
-let cachedTextDecoder = new TextDecoder('utf-8');
+// let cachedTextDecoder = new TextDecoder('utf-8');
 
 function getStringFromWasm(ptr, len) {
-    return cachedTextDecoder.decode(getUint8Memory().subarray(ptr, ptr + len));
+    return u8aToString(getUint8Memory().subarray(ptr, ptr + len));
 }
 
 const heap = new Array(32);
@@ -200,8 +199,6 @@ function addHeapObject(obj) {
     return idx;
 }
 
-const wasmImports = {};
-
 wasmImports.__wbg_new_886f15c1b20b061b = function(arg0, arg1) {
     let varg0 = getStringFromWasm(arg0, arg1);
     return addHeapObject(new Function(varg0));
@@ -232,7 +229,6 @@ wasmImports.__wbg_getRandomValues_95cef5eed1acafda = function(arg0, arg1, arg2)
 
 wasmImports.__wbg_require_86edd37cfda5f13d = function(arg0, arg1) {
     let varg0 = getStringFromWasm(arg0, arg1);
-    // return addHeapObject(require(varg0));
     throw new Error(`Invalid require from WASM for ${varg0}`);
 };
 
@@ -257,20 +253,12 @@ wasmImports.__wbindgen_jsval_eq = function(a, b) {
     return getObject(a) === getObject(b) ? 1 : 0;
 };
 
-module.exports.isReady = function () {
-    return !!wasm;
-}
+const createPromise = require('./schnorrkel_js_bg');
 
-const wasmPromise = schnorrkelWasm(wasmImports);
+const wasmPromise = createPromise(wasmImports);
 
-module.exports.waitReady = function () {
-    return wasmPromise.then(() => true);
-}
+module.exports.isReady = function () { return !!wasm; }
+module.exports.waitReady = function () { return wasmPromise.then(() => true); }
 
-wasmPromise.then((_wasm) => {
-    wasm = _wasm
-}).catch((error) => {
-    console.error('Error creating schnorrkel_js WASM');
+wasmPromise.then((_wasm) => { wasm = _wasm });
 
-    throw error;
-});

packages/util-crypto/src/schnorrkel/schnorrkel-js/schnorrkel_js_bg.js

@@ -1,11 +1,12 @@
+
 const bytes = require('./schnorrkel_js_wasm');
 
-module.exports = function init (schnorrkel_js) {
+module.exports = function createExportPromise (wasmImports) {
   const imports = {
-    './schnorrkel_js': schnorrkel_js
+    './schnorrkel_js': wasmImports
   };
 
   return WebAssembly
     .instantiate(bytes, imports)
     .then((wasm) => wasm.instance.exports);
-};
+}