[CI Skip] release/stable 1.3.1

skip-checks: true

.123trigger

@@ -0,0 +1 @@
+4

.babelrc.js

@@ -1 +1,5 @@
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
 module.exports = require('./babel.config.js');

.eslintignore

@@ -1,3 +1,7 @@
+.eslintrc.js
+.github/**
+.vscode/**
+.yarn/**
 **/binaryen/*
 **/build/*
 **/coverage/*

.eslintrc.js

@@ -1,3 +1,7 @@
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
 const base = require('@polkadot/dev/config/eslint');
 
 module.exports = {
@@ -5,7 +9,7 @@ module.exports = {
   parserOptions: {
     ...base.parserOptions,
     project: [
-      './tsconfig.eslint.json'
+      './tsconfig.json'
     ]
   }
 };

.github/workflows/pr-any.yml

@@ -0,0 +1,16 @@
+name: PR
+on: [pull_request]
+
+jobs:
+  pr:
+    strategy:
+      matrix:
+        step: ['lint', 'test', 'build']
+    name: ${{ matrix.step }}
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+    - name: ${{ matrix.step }}
+      run: |
+        yarn install --immutable | grep -v 'YN0013'
+        yarn ${{ matrix.step }}

.github/workflows/push-master.yml

@@ -0,0 +1,34 @@
+name: Master
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  master:
+    strategy:
+      matrix:
+        step: ['build:release']
+    name: ${{ matrix.step }}
+    if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && github.repository == 'polkadot-js/wasm'"
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v1
+      with:
+        token: ${{ secrets.GH_PAT }}
+    - name: build
+      env:
+        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+        GH_PAT: ${{ secrets.GH_PAT }}
+        GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+      run: |
+        yarn install --immutable | grep -v 'YN0013'
+        yarn ${{ matrix.step }}
+
+  dummy:
+    runs-on: ubuntu-latest
+    steps:
+    - name: dummy
+      run: |
+        echo "Dummy skip step"

.gitignore

@@ -1,4 +1,4 @@
-binaryen/
+binaryen*
 build/
 build-docs/
 coverage/
@@ -13,6 +13,10 @@ tmp/
 .env.test.local
 .env.production.local
 .npmrc
+.yarn/*
+!.yarn/releases
+!.yarn/plugins
+.pnp.*
 cc-test-reporter
 lerna-debug.log*
 npm-debug.log*

.travis.yml

@@ -1,36 +0,0 @@
-dist: xenial
-language: node_js
-node_js:
-  - "10"
-env:
-  global:
-    - CC_TEST_REPORTER_ID=979056b20f7c89193ed7b4cdcd6bb6252231f069171fd73b072d0da6f5dd2338
-addons:
-  apt:
-    sources: ['ubuntu-toolchain-r-test']
-    packages: ['cmake', 'g++-5']
-cache:
-  cargo: true
-  yarn: true
-  directories:
-    - node_modules
-compiler:
-  - clang
-before_install:
-  - curl -sSf https://sh.rustup.rs | sh -s -- --default-toolchain=nightly -y
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
-  - chmod +x ./cc-test-reporter
-  - export PATH=$HOME/.yarn/bin:$HOME/.cargo/bin:$(yarn global bin):$PATH
-before_script:
-  - ./cc-test-reporter before-build
-script:
-  - yarn polkadot-dev-travis-build
-after_script:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
-deploy:
-  skip_cleanup: true
-  provider: script
-  script: yarn polkadot-dev-travis-deploy
-  on:
-    branch: master

.vscode/settings.json

@@ -0,0 +1,11 @@
+{
+  "editor.tabSize": 2,
+  "files.eol": "\n",
+  "npm.packageManager": "yarn",
+  "eslint.enable": true,
+  "eslint.validate": [
+    "javascript",
+    "typescript",
+    "typescriptreact"
+  ]
+}

.yarnrc.yml

@@ -0,0 +1,11 @@
+enableImmutableInstalls: false
+
+enableProgressBars: false
+
+nodeLinker: node-modules
+
+plugins:
+  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.js
+    spec: "@yarnpkg/plugin-interactive-tools"
+
+yarnPath: .yarn/releases/yarn-2.1.1.js

CHANGELOG.md

@@ -1,63 +1,92 @@
-# 0.14.1
+# CHANGELOG
+
+## 1.3.1 Aug 9, 2020
+
+- Add `scrypt` function for KDF generation
+- Remove `bip39ToSeed`, we only use the `bip39ToMiniSecret` variant in Substrate
+- Update ed25519-dalek to 1.0.0-pre.4
+- Rework generation based on latest wasm-pack generator
+
+## 1.2.1 Feb 29, 2020
+
+- Adjust build process for smaller wasm bundle outputs (~50K dropped from base bundle)
+- Unpin nightly from nightly-2020-02-17 version
+- Swap to yarn 2 and add support for use by yarn 2 projects
+
+## 1.1.1 Feb 24, 2020
+
+- **Important** The sr25519 interface dropped the use of `verify_simple_preaudit_deprecated` for signature verification, instead it now uses `verify_simple`. Only schnorrkel 0.8+ signatures will now pass verification. This is a follow-up of the 0.1 signing support that was dropped in a previous version.
+- Rework schnorrkel signatures test vectors based on the above change (Rust, WASM and ASM.js tests)
+- Rust nightly pinned to last-known-working 2020-02-17 on CI (compiler issues, should to be reverted in a future release)
+
+## 1.0.1 Feb 15, 2020
+
+- No functionality changes from 0.20.1. The interfaces here are stable in the current iteration.
+
+## 0.20.1 Jan 30, 2020
+
+- Pull in schnorrkel 0.8.5 for full Substrate 2.x compatibility
+
+## 0.14.1 Sep 09, 2019
 
 - No functionality changes at all, everything done is "under the hood" to give the codebase better maintainability
 
-# 0.13.1
+## 0.13.1 Jul 20, 2019
 
 - Added an asm.js fallback which is active for React Native via the `"react-native"` entry in `package.json`. Ensure that you run the build step with the `NODE_OPTIONS=--max_old_space_size=8192` flags, since the asm.js bundle is large. (For RN the full command would therefore be `NODE_OPTIONS=--max_old_space_size=8192 npm start`)
 
-# 0.12.1
+## 0.12.1 Jul 17, 2019
 
 - Remove deprecated `@polkadot/wasm-schnorrkel` & `@polkadot/wasm-dalek-ed25519` source (all combined in `@polkadot/wasm-crypto`, was kept for historical purposes)
 - Security dependency bumps
 - Updated Rust `hex-literal` for recent versions of the compiler (used in tests only)
 
-# 0.11.1
+## 0.11.1 May 31, 2019
 
 - Security dependency bumps
 
-# 0.10.1
+## 0.10.1 May 09, 2019
 
 - w3f/schnorrkel updated to 0.1.1 as per substrate
 - Added known subkey signature test (Rust & JS)
 
-# 0.9.1
+## 0.9.1 Apr 29, 2019
 
 - Dependency bumps
 
-# 0.8.1
+## 0.8.1 Mar 31, 2019
 
 - Pull ed25519 & sr25519 into `@polkadot/wasm-crypto` as well (smaller final size)
 - Disable build/publish of `wasm-dalek-ed25519` & `wasm-schnorrkel`
 - Improve error messaging, instead of `__wasm_malloc of null`
 
-# 0.7.1
+## 0.7.1 Mar 30, 2019
 
 - Fix build scripts to properly attach errors in the log (dropped in 0.6.1)
 
-# 0.6.1
+## 0.6.1 Mar 27, 2019
 
 - Log init errors for both non-WebAssembly usage as well as WebAssembly errors
 
-# 0.5.1
+## 0.5.1 Mar 23, 2019
 
 - Add password argument to bip39ToSeed
 
-# 0.4.1
+## 0.4.1 Mar 23, 2019
 
 - Add bip39ToSeed
 
-# 0.3.1
+## 0.3.1 Mar 23, 2019
 
 - Add wasm-dalek-ed25519 for all used crypto there
 - Add keccak256
 - Try secp256k1 (bloating code, not used atm)
 
-# 0.2.1
+## 0.2.1 Mar 20, 2019
 
 - Add basic crypto functions, creation of wasm-crypto package
 - blake2, bip39, sha2, xxhash
 
-# 0.1.1
+## 0.1.1 Mar 18, 2019
 
 - Initial release

babel.config.js

@@ -1,3 +1,5 @@
-module.exports = {
-  extends: '@polkadot/dev/config/babel'
-};
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+module.exports = require('@polkadot/dev/config/babel');

jest.config.js

@@ -1,4 +1,7 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
 const config = require('@polkadot/dev/config/jest');
 
 module.exports = Object.assign({}, config, {
@@ -7,5 +10,6 @@ module.exports = Object.assign({}, config, {
   },
   modulePathIgnorePatterns: [
     '<rootDir>/packages/wasm-schnorrkel/build'
-  ]
+  ],
+  resolver: './jest.resolver.js'
 });

jest.resolver.js

@@ -0,0 +1,11 @@
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
+const path = require('path');
+
+module.exports = function resolver (file, config) {
+  return file.includes('package.json')
+    ? path.join(config.basedir.replace('/src', '/'), file)
+    : config.defaultResolver(file, config);
+};

lerna.json

@@ -9,5 +9,5 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.14.1"
+  "version": "1.3.1"
 }

package.json

@@ -1,28 +1,25 @@
 {
-  "version": "0.14.1",
+  "repository": "https://github.com/polkadot-js/wasm",
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "license": "Apache-2",
   "private": true,
-  "engines": {
-    "yarn": "^1.10.1"
-  },
   "workspaces": [
     "packages/*"
   ],
   "resolutions": {
-    "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^3.6.2"
+    "babel-core": "^7.0.0-bridge.0"
   },
   "scripts": {
-    "build": "./scripts/build.sh",
-    "check": "yarn lint",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx . && tsc --noEmit --pretty",
+    "build": "NIGHTLY= ./scripts/build.sh",
+    "build:release": "NIGHTLY= ./scripts/build-release.sh",
+    "lint": "polkadot-dev-run-lint",
     "clean": "./scripts/clean.sh",
     "postinstall": "polkadot-dev-yarn-only",
-    "test": "echo \"Tests included in build\""
+    "test": "./scripts/test-rust.sh"
   },
   "devDependencies": {
-    "@babel/core": "^7.5.5",
-    "@polkadot/dev": "^0.31.0-beta.7",
-    "@polkadot/util": "^1.2.0-beta.7",
-    "override-require": "^1.1.1"
-  }
+    "@babel/core": "^7.11.1",
+    "@polkadot/dev": "^0.55.35"
+  },
+  "version": "1.3.1"
 }

packages/wasm-crypto/Cargo.toml

@@ -15,23 +15,29 @@ version = "0.0.0"
 crate-type = ["cdylib", "rlib"]
 
 [dependencies]
+backtrace = "0.3.38"
 blake2-rfc = "0.2.18"
 byteorder = "1.3.1"
-ed25519-dalek = { version = "1.0.0-pre.1", features = ["nightly"] }
+ed25519-dalek = { version = "1.0.0-pre.4", features = ["nightly"] }
 hmac = "0.7.0"
 # libsecp256k1 = "0.2.2"
 pbkdf2 = { version = "0.3.0", default-features = false }
-schnorrkel = { version = "0.1.1", features = ["nightly"] }
-sha2 = "0.8.0"
-tiny-bip39 = { version = "0.6.1", default-features = false }
-tiny-keccak = "1.4.2"
-twox-hash = "1.1.2"
-wasm-bindgen = "0.2"
+schnorrkel = { version = "0.9.1", features = ["nightly", "preaudit_deprecated", "u64_backend"] }
+scrypt = { version = "0.2", default-features = false }
+sha2 = "0.8.1"
+tiny-bip39 = { version = "0.7", default-features = false }
+tiny-keccak = { version = "2.0.1", features = ["keccak"] }
+twox-hash = "1.5.0"
+wasm-bindgen = "=0.2.65"
 wee_alloc = "0.4.3"
 
 [dev-dependencies]
 hex-literal = "0.2.0"
-rand = { version = "0.6.5", features = ["wasm-bindgen"] }
+rand = { version = "0.7.3", features = ["wasm-bindgen"] }
 
 [profile.release]
 lto = true
+opt-level = "z"
+
+[package.metadata.wasm-pack.profile.release]
+wasm-opt = false

packages/wasm-crypto/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/wasm-crypto",
-  "version": "0.14.1",
+  "version": "1.3.1",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "files": [
     "crypto-polyfill.js",
@@ -19,6 +19,11 @@
   },
   "main": "index.js",
   "types": "index.d.ts",
+  "devDependencies": {
+    "@polkadot/dev": "^0.55.35",
+    "@polkadot/util": "^3.0.1",
+    "override-require": "^1.1.1"
+  },
   "peerDependencies": {
     "@polkadot/util": "*"
   }

packages/wasm-crypto/src/bip39.rs

@@ -1,8 +1,8 @@
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-use bip39::{Mnemonic, MnemonicType, Language, Seed};
+use bip39::{Mnemonic, MnemonicType, Language};
 use hmac::Hmac;
 use pbkdf2::pbkdf2;
 use sha2::Sha512;
@@ -48,20 +48,6 @@ pub fn ext_bip39_to_mini_secret(phrase: &str, password: &str) -> Vec<u8> {
 	result[..32].to_vec()
 }
 
-/// Creates a see from a bip-39 phrase
-///
-/// @phrase: mnemonic phrase
-///
-/// Returns a 32-byte seed
-#[wasm_bindgen]
-pub fn ext_bip39_to_seed(phrase: &str, password: &str) -> Vec<u8> {
-	let mnemonic = Mnemonic::from_phrase(phrase, Language::English).unwrap();
-
-	Seed::new(&mnemonic, password)
-		.as_bytes()[..32]
-		.to_vec()
-}
-
 /// Validates a bip39 phrase
 ///
 /// * phrase: mnemonic phrase
@@ -99,15 +85,6 @@ pub mod tests {
 		assert_eq!(result[..], mini[..]);
 	}
 
-	#[test]
-	fn can_bip39_seed() {
-		let phrase = "seed sock milk update focus rotate barely fade car face mechanic mercy";
-		let seed = hex!("3c121e20de068083b49c2315697fb59a2d9e8643c24e5ea7628132c58969a027");
-		let result = ext_bip39_to_seed(phrase, "");
-
-		assert_eq!(result[..], seed[..]);
-	}
-
 	#[test]
 	fn can_bip39_generate() {
 		let phrase = ext_bip39_generate(12);

packages/wasm-crypto/src/ed25519.rs

@@ -1,8 +1,9 @@
-// Copyright 2019 @polkadot/wasm-dalek-ed25519 authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
-use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature};
+use std::convert::TryFrom;
+use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature, Signer as _, Verifier as _};
 use wasm_bindgen::prelude::*;
 
 /// Keypair helper function.
@@ -14,27 +15,27 @@ fn create_from_pair(pair: &[u8]) -> Keypair {
 }
 
 /// Keypair helper function
-fn create_from_parts(public: &[u8], secret: &[u8]) -> Keypair {
+fn create_from_parts(pubkey: &[u8], seckey: &[u8]) -> Keypair {
 	let mut pair = vec![];
 
-	pair.extend_from_slice(secret);
-	pair.extend_from_slice(public);
+	pair.extend_from_slice(seckey);
+	pair.extend_from_slice(pubkey);
 
 	create_from_pair(&pair)
 }
 
 /// Keypair helper function.
 fn create_from_seed(seed: &[u8]) -> Keypair {
-	let secret = SecretKey::from_bytes(seed).unwrap();
-	let public: PublicKey = (&secret).into();
+	let seckey = SecretKey::from_bytes(seed).unwrap();
+	let pubkey: PublicKey = (&seckey).into();
 
-	create_from_parts(public.as_bytes(), seed)
+	create_from_parts(pubkey.as_bytes(), seed)
 }
 
 /// PublicKey helper
-fn create_public(public: &[u8]) -> PublicKey {
-	match PublicKey::from_bytes(public) {
-		Ok(public) => return public,
+fn create_public(pubkey: &[u8]) -> PublicKey {
+	match PublicKey::from_bytes(pubkey) {
+		Ok(pubkey) => return pubkey,
 		Err(_) => panic!("Provided public key is invalid.")
 	}
 }
@@ -57,14 +58,14 @@ pub fn ext_ed_from_seed(seed: &[u8]) -> Vec<u8> {
 /// The combination of both public and private key must be provided.
 /// This is effectively equivalent to a keypair.
 ///
-/// * public: UIntArray with 32 element
+/// * pubkey: UIntArray with 32 element
 /// * private: UIntArray with 64 element
 /// * message: Arbitrary length UIntArray
 ///
 /// * returned vector is the signature consisting of 64 bytes.
 #[wasm_bindgen]
-pub fn ext_ed_sign(public: &[u8], secret: &[u8], message: &[u8]) -> Vec<u8> {
-	create_from_parts(public, secret)
+pub fn ext_ed_sign(pubkey: &[u8], seckey: &[u8], message: &[u8]) -> Vec<u8> {
+	create_from_parts(pubkey, seckey)
 		.sign(message)
 		.to_bytes()
 		.to_vec()
@@ -76,13 +77,13 @@ pub fn ext_ed_sign(public: &[u8], secret: &[u8], message: &[u8]) -> Vec<u8> {
 /// * message: Arbitrary length UIntArray
 /// * pubkey: UIntArray with 32 element
 #[wasm_bindgen]
-pub fn ext_ed_verify(signature: &[u8], message: &[u8], public: &[u8]) -> bool {
-	let signature = match Signature::from_bytes(signature) {
+pub fn ext_ed_verify(signature: &[u8], message: &[u8], pubkey: &[u8]) -> bool {
+	let signature = match Signature::try_from(signature) {
 		Ok(signature) => signature,
 		Err(_) => return false
 	};
 
-	create_public(public)
+	create_public(pubkey)
 		.verify(message, &signature)
 		.is_ok()
 }

packages/wasm-crypto/src/hashing.rs

@@ -1,4 +1,4 @@
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -6,15 +6,16 @@ use blake2_rfc::blake2b::blake2b;
 use byteorder::{ByteOrder, LittleEndian};
 use hmac::Hmac;
 use pbkdf2::pbkdf2;
+use scrypt::{ScryptParams, scrypt};
 use sha2::{Digest, Sha512};
 // use secp256k1;
-use std::hash::Hasher;
-use tiny_keccak::keccak256;
+use tiny_keccak::{Hasher, Keccak};
 use twox_hash::XxHash;
 use wasm_bindgen::prelude::*;
 
 /// helper function for a single twox round with a seed
 fn create_twox(data: &[u8], seed: u64) -> [u8; 8] {
+	use ::std::hash::Hasher;
 	let mut hasher = XxHash::with_seed(seed);
 
 	hasher.write(data);
@@ -49,17 +50,22 @@ pub fn ext_blake2b(data: &[u8], key: &[u8], size: u32) -> Vec<u8> {
 /// Returns the hash as a vector
 #[wasm_bindgen]
 pub fn ext_keccak256(data: &[u8]) -> Vec<u8> {
-	keccak256(data)
-		.to_vec()
+	let mut keccak = Keccak::v256();
+	let mut result = [0u8; 32];
+
+	keccak.update(data);
+	keccak.finalize(&mut result);
+
+	result.to_vec()
 }
 
-/// pbkdf2 hash from an input, salt for the number of specified rounds
+/// pbkdf2 kdf from an input, salt for the number of specified rounds
 ///
 /// * data: Arbitrary data to be hashed
 /// * salt: Salt for this hash
 /// * rounds: The number of rounds to perform
 ///
-/// Returns a vecor with the hash result
+/// Returns a vector with the hashed result
 #[wasm_bindgen]
 pub fn ext_pbkdf2(data: &[u8], salt: &[u8], rounds: u32) -> Vec<u8> {
 	let mut result = [0u8; 64];
@@ -70,6 +76,26 @@ pub fn ext_pbkdf2(data: &[u8], salt: &[u8], rounds: u32) -> Vec<u8> {
 	result.to_vec()
 }
 
+/// scrypt kdf from input, salt and config
+///
+/// * password: Password to hash
+/// * salt: Salt for this hash
+/// * log2_n: log2(n)
+/// * r: r
+/// * p: p
+///
+/// Returns vector with the hashed result
+#[wasm_bindgen]
+pub fn ext_scrypt(password: &[u8], salt: &[u8], log2_n: u8, r: u32, p: u32) -> Vec<u8> {
+	let params = ScryptParams::new(log2_n, r, p).unwrap();
+	let mut result = [0u8; 64];
+
+	match scrypt(password, salt, &params, &mut result) {
+		Ok(_) => return result.to_vec(),
+		Err(_) => panic!("Invalid scrypt hash.")
+	}
+}
+
 // /// Checks for the recoverability of a signature from message
 // ///
 // /// * message: The message
@@ -210,6 +236,16 @@ pub mod tests {
 		assert_eq!(hash[..], expected[..]);
 	}
 
+	#[test]
+	fn can_scrypt() {
+		let password = b"password";
+		let salt = b"salt";
+		let expected = hex!("745731af4484f323968969eda289aeee005b5903ac561e64a5aca121797bf7734ef9fd58422e2e22183bcacba9ec87ba0c83b7a2e788f03ce0da06463433cda6");
+		let hash = ext_scrypt(password, salt, 14, 8, 1);
+
+		assert_eq!(hash[..], expected[..]);
+	}
+
 	// #[test]
 	// fn can_secp256k1_real_eth_sig() {
 	// 	let sig = hex!("7505f2880114da51b3f5d535f8687953c0ab9af4ab81e592eaebebf53b728d2b6dfd9b5bcd70fee412b1f31360e7c2774009305cb84fc50c1d0ff8034dfa5fff1c");

packages/wasm-crypto/src/js/crypto-polyfill.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-wasm authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/src/js/exports.js

@@ -1,8 +1,9 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
+/* eslint-disable sort-keys */
+
 const { assert } = require('@polkadot/util');
 
 const INIT_ERRROR = '@polkadot/wasm-crypto has not been initialized';
@@ -36,6 +37,7 @@ module.exports = function (stubbed) {
     blake2b: wrapReady(stubbed.ext_blake2b),
     keccak256: wrapReady(stubbed.ext_keccak256),
     pbkdf2: wrapReady(stubbed.ext_pbkdf2),
+    scrypt: wrapReady(stubbed.ext_scrypt),
 
     // secp256k1IsRecoverable: wrapReady(stubbed.ext_secp256k1_is_recoverable);
     // secp256k1Recover: wrapReady(stubbed.ext_secp256k1_recover);

packages/wasm-crypto/src/js/index.d.ts

@@ -1,11 +1,10 @@
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
 export function bip39Generate (words: 12 | 15 | 18 | 21 | 24): string;
 export function bip39ToEntropy (phrase: string): Uint8Array;
 export function bip39ToMiniSecret (phrase: string, password: string): Uint8Array;
-export function bip39ToSeed (phrase: string, password: string): Uint8Array;
 export function bip39Validate (phrase: string): boolean;
 
 export function ed25519KeypairFromSeed (seed: Uint8Array): Uint8Array;
@@ -22,6 +21,7 @@ export function sr25519Verify (signature: Uint8Array, message: Uint8Array, publi
 export function blake2b (data: Uint8Array, key: Uint8Array, byteSize: number): Uint8Array;
 export function keccak256 (data: Uint8Array): Uint8Array;
 export function pbkdf2 (data: Uint8Array, salt: Uint8Array, rounds: number): Uint8Array;
+export function scrypt (password: Uint8Array, salt: Uint8Array, log2N: number, r: number, p: number): Uint8Array;
 // export function secp256k1IsRecoverable (message: Uint8Array, signature: Uint8Array): number;
 // export function secp256k1Recover (message: Uint8Array, signature: Uint8Array): Uint8Array;
 export function sha512 (data: Uint8Array): Uint8Array;

packages/wasm-crypto/src/js/index.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/src/js/wasm_asm_stub.js

@@ -1,4 +1,4 @@
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/src/js/wasm_promise.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -10,7 +9,7 @@ const imports = require('./wasm');
 
 module.exports = async function createExportPromise () {
   try {
-    const { instance } = await WebAssembly.instantiate(bytes, { './wasm': imports });
+    const { instance } = await WebAssembly.instantiate(bytes, { __wbindgen_placeholder__: imports });
 
     return instance.exports;
   } catch (error) {

packages/wasm-crypto/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/src/sr25519.rs

@@ -1,5 +1,5 @@
 // Copyright 2019 Paritytech via https://github.com/paritytech/schnorrkel-js/
-// Copyright 2019 @polkadot/wasm-schnorrkel authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 
@@ -8,7 +8,7 @@
 // forked at commit eff430ddc3090f56317c80654208b8298ef7ab3f
 
 use schnorrkel::{
-	Keypair, MiniSecretKey, PublicKey, SecretKey, Signature,
+	ExpansionMode, Keypair, MiniSecretKey, PublicKey, SecretKey, Signature,
 	derive::{Derivation, ChainCode, CHAIN_CODE_LENGTH},
 };
 use wasm_bindgen::prelude::*;
@@ -25,38 +25,6 @@ fn create_cc(data: &[u8]) -> ChainCode {
 	ChainCode(cc)
 }
 
-/// Keypair helper function.
-fn create_from_seed(seed: &[u8]) -> Keypair {
-	match MiniSecretKey::from_bytes(seed) {
-		Ok(mini) => return mini.expand_to_keypair(),
-		Err(_) => panic!("Provided seed is invalid.")
-	}
-}
-
-/// Keypair helper function.
-fn create_from_pair(pair: &[u8]) -> Keypair {
-	match Keypair::from_bytes(pair) {
-		Ok(pair) => return pair,
-		Err(_) => panic!("Provided pair is invalid.")
-	}
-}
-
-/// PublicKey helper
-fn create_public(public: &[u8]) -> PublicKey {
-	match PublicKey::from_bytes(public) {
-		Ok(public) => return public,
-		Err(_) => panic!("Provided public key is invalid.")
-	}
-}
-
-/// SecretKey helper
-fn create_secret(secret: &[u8]) -> SecretKey {
-	match SecretKey::from_bytes(secret) {
-		Ok(secret) => return secret,
-		Err(_) => panic!("Provided private key is invalid.")
-	}
-}
-
 /// Perform a derivation on a secret
 ///
 /// * secret: UIntArray with 64 bytes
@@ -65,10 +33,12 @@ fn create_secret(secret: &[u8]) -> SecretKey {
 /// returned vector the derived keypair as a array of 96 bytes
 #[wasm_bindgen]
 pub fn ext_sr_derive_keypair_hard(pair: &[u8], cc: &[u8]) -> Vec<u8> {
-	create_from_pair(pair).secret
+	Keypair::from_half_ed25519_bytes(pair)
+		.unwrap()
+		.secret
 		.hard_derive_mini_secret_key(Some(create_cc(cc)), &[]).0
-		.expand_to_keypair()
-		.to_bytes()
+		.expand_to_keypair(ExpansionMode::Ed25519)
+		.to_half_ed25519_bytes()
 		.to_vec()
 }
 
@@ -80,9 +50,10 @@ pub fn ext_sr_derive_keypair_hard(pair: &[u8], cc: &[u8]) -> Vec<u8> {
 /// returned vector the derived keypair as a array of 96 bytes
 #[wasm_bindgen]
 pub fn ext_sr_derive_keypair_soft(pair: &[u8], cc: &[u8]) -> Vec<u8> {
-	create_from_pair(pair)
+	Keypair::from_half_ed25519_bytes(pair)
+		.unwrap()
 		.derived_key_simple(create_cc(cc), &[]).0
-		.to_bytes()
+		.to_half_ed25519_bytes()
 		.to_vec()
 }
 
@@ -93,10 +64,12 @@ pub fn ext_sr_derive_keypair_soft(pair: &[u8], cc: &[u8]) -> Vec<u8> {
 ///
 /// returned vector is the derived publicKey as a array of 32 bytes
 #[wasm_bindgen]
-pub fn ext_sr_derive_public_soft(public: &[u8], cc: &[u8]) -> Vec<u8> {
-	create_public(public)
+pub fn ext_sr_derive_public_soft(pubkey: &[u8], cc: &[u8]) -> Vec<u8> {
+	PublicKey::from_bytes(pubkey)
+		.unwrap()
 		.derived_key_simple(create_cc(cc), &[]).0
-		.to_bytes().to_vec()
+		.to_bytes()
+		.to_vec()
 }
 
 /// Generate a key pair.
@@ -107,8 +80,23 @@ pub fn ext_sr_derive_public_soft(public: &[u8], cc: &[u8]) -> Vec<u8> {
 /// followed by the public key (32) bytes.
 #[wasm_bindgen]
 pub fn ext_sr_from_seed(seed: &[u8]) -> Vec<u8> {
-	create_from_seed(seed)
-		.to_bytes()
+	MiniSecretKey::from_bytes(seed)
+		.unwrap()
+		.expand_to_keypair(ExpansionMode::Ed25519)
+		.to_half_ed25519_bytes()
+		.to_vec()
+}
+
+/// Generate a key pair from a known pair. (This is not exposed via WASM)
+///
+/// * seed: UIntArray with 96 element
+///
+/// returned vector is the concatenation of first the private key (64 bytes)
+/// followed by the public key (32) bytes.
+pub fn ext_sr_from_pair(pair: &[u8]) -> Vec<u8> {
+	Keypair::from_half_ed25519_bytes(pair)
+		.unwrap()
+		.to_half_ed25519_bytes()
 		.to_vec()
 }
 
@@ -117,15 +105,16 @@ pub fn ext_sr_from_seed(seed: &[u8]) -> Vec<u8> {
 /// The combination of both public and private key must be provided.
 /// This is effectively equivalent to a keypair.
 ///
-/// * public: UIntArray with 32 element
+/// * pubkey: UIntArray with 32 element
 /// * private: UIntArray with 64 element
 /// * message: Arbitrary length UIntArray
 ///
 /// * returned vector is the signature consisting of 64 bytes.
 #[wasm_bindgen]
-pub fn ext_sr_sign(public: &[u8], secret: &[u8], message: &[u8]) -> Vec<u8> {
-	create_secret(secret)
-		.sign_simple(SIGNING_CTX, message, &create_public(public))
+pub fn ext_sr_sign(pubkey: &[u8], secret: &[u8], message: &[u8]) -> Vec<u8> {
+	SecretKey::from_ed25519_bytes(secret)
+		.unwrap()
+		.sign_simple(SIGNING_CTX, message, &PublicKey::from_bytes(pubkey).unwrap())
 		.to_bytes()
 		.to_vec()
 }
@@ -136,14 +125,13 @@ pub fn ext_sr_sign(public: &[u8], secret: &[u8], message: &[u8]) -> Vec<u8> {
 /// * message: Arbitrary length UIntArray
 /// * pubkey: UIntArray with 32 element
 #[wasm_bindgen]
-pub fn ext_sr_verify(signature: &[u8], message: &[u8], public: &[u8]) -> bool {
-	let signature = match Signature::from_bytes(signature) {
-		Ok(signature) => signature,
-		Err(_) => return false
-	};
-
-	create_public(public)
-		.verify_simple(SIGNING_CTX, message, &signature)
+pub fn ext_sr_verify(signature: &[u8], message: &[u8], pubkey: &[u8]) -> bool {
+	match Signature::from_bytes(signature) {
+		Ok(signature) => PublicKey::from_bytes(pubkey).unwrap()
+			.verify_simple(SIGNING_CTX, message, &signature)
+			.is_ok(),
+		Err(_) => false
+	}
 }
 
 #[cfg(test)]
@@ -168,7 +156,7 @@ pub mod tests {
 	}
 
 	#[test]
-	fn creates_pair_from_known() {
+	fn creates_pair_from_known_seed() {
 		let seed = hex!("fac7959dbfe72f052e5a0c3c8d6530f202b02fd8f9f5ca3580ec8deb7797479e");
 		let expected = hex!("46ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a");
 		let keypair = ext_sr_from_seed(&seed);
@@ -177,6 +165,16 @@ pub mod tests {
 		assert_eq!(public, expected);
 	}
 
+	#[test]
+	fn create_pair_from_known_pair() {
+		let input = hex!("28b0ae221c6bb06856b287f60d7ea0d98552ea5a16db16956849aa371db3eb51fd190cce74df356432b410bd64682309d6dedb27c76845daf388557cbac3ca3446ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a");
+		let keypair = ext_sr_from_pair(&input);
+		let expected = hex!("46ebddef8cd9bb167dc30878d7113b7e168e6f0646beffd77d69d39bad76b47a");
+		let public = &keypair[SECRET_KEY_LENGTH..KEYPAIR_LENGTH];
+
+		assert_eq!(public, expected);
+	}
+
 	#[test]
 	fn can_sign_message() {
 		let seed = generate_random_seed();
@@ -204,9 +202,9 @@ pub mod tests {
 
 	#[test]
 	fn can_verify_known_message() {
-		let message = b"Verifying that I am the owner of 5G9hQLdsKQswNPgB499DeA5PkFBbgkLPJWkkS6FAM6xGQ8xD. Hash: 221455a3\n";
-		let public = hex!("b4bfa1f7a5166695eb75299fd1c4c03ea212871c342f2c5dfea0902b2c246918");
-		let signature = hex!("5a9755f069939f45d96aaf125cf5ce7ba1db998686f87f2fb3cbdea922078741a73891ba265f70c31436e18a9acd14d189d73c12317ab6c313285cd938453202");
+		let message = b"I hereby verify that I control 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY";
+		let public = hex!("d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d");
+		let signature = hex!("1037eb7e51613d0dcf5930ae518819c87d655056605764840d9280984e1b7063c4566b55bf292fcab07b369d01095879b50517beca4d26e6a65866e25fec0d83");
 		let is_valid = ext_sr_verify(&signature, message, &public);
 
 		assert!(is_valid);

packages/wasm-crypto/test/all/bip39.js

@@ -1,10 +1,10 @@
-/* eslint-disable @typescript-eslint/camelcase */
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 // @ts-check
 
+/* eslint-disable camelcase */
+
 const { assert, u8aToHex } = require('@polkadot/util');
 
 function bip39_generate (wasm) {
@@ -39,18 +39,9 @@ function bip39_toMiniSecret (wasm) {
   assert(RESULT === '0x4313249608fe8ac10fd5886c92c4579007272cb77c21551ee5b8d60b78041685', 'ERROR: Invalid bip39 mini secret');
 }
 
-function bip39_toSeed (wasm) {
-  const RESULT = u8aToHex(wasm.bip39ToSeed('seed sock milk update focus rotate barely fade car face mechanic mercy', ''));
-
-  console.log('\tSEE', RESULT);
-
-  assert(RESULT === '0x3c121e20de068083b49c2315697fb59a2d9e8643c24e5ea7628132c58969a027', 'ERROR: Invalid bip39 mini secret');
-}
-
 module.exports = {
   bip39_generate,
-  bip39_validate,
   bip39_toEntropy,
   bip39_toMiniSecret,
-  bip39_toSeed
+  bip39_validate
 };

packages/wasm-crypto/test/all/ed25519.js

@@ -1,9 +1,8 @@
-/* eslint-disable @typescript-eslint/camelcase */
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
-// @ts-check
+
+/* eslint-disable camelcase */
 
 const crypto = require('crypto');
 const { assert, hexToU8a, stringToU8a, u8aToHex } = require('@polkadot/util');
@@ -55,8 +54,8 @@ function ed25519_benchmark (wasm) {
 }
 
 module.exports = {
+  ed25519_benchmark,
   ed25519_pairFromSeed,
   ed25519_signAndVerify,
-  ed25519_verifyExisting,
-  ed25519_benchmark
+  ed25519_verifyExisting
 };

packages/wasm-crypto/test/all/hashing.js

@@ -1,9 +1,8 @@
-/* eslint-disable @typescript-eslint/camelcase */
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
-// @ts-check
+
+/* eslint-disable camelcase */
 
 const { assert, stringToU8a, u8aToHex } = require('@polkadot/util');
 
@@ -42,6 +41,14 @@ function pbkdf2Hash (wasm) {
 //   assert(pk === '0x91d366769d44a7c7690428bfdf67ec7eae23d2459694685257b6fc59d1baa1fe', 'ERROR: secp256k1Recover does not match');
 // }
 
+function scryptHash (wasm) {
+  const hash = u8aToHex(wasm.scrypt(stringToU8a('password'), stringToU8a('salt'), 14, 8, 1));
+
+  console.log('\tRES', hash);
+
+  assert(hash === '0x745731af4484f323968969eda289aeee005b5903ac561e64a5aca121797bf7734ef9fd58422e2e22183bcacba9ec87ba0c83b7a2e788f03ce0da06463433cda6', 'ERROR: scryptHash does not match');
+}
+
 function sha512Hash (wasm) {
   const hash = u8aToHex(wasm.sha512(stringToU8a('hello world')));
 
@@ -64,6 +71,7 @@ module.exports = {
   blake2bHash,
   keccak256,
   pbkdf2Hash,
+  scryptHash,
   // secp256k1Recover,
   sha512Hash,
   twoxHash

packages/wasm-crypto/test/all/index.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/test/all/sr25519.js

@@ -1,9 +1,8 @@
-/* eslint-disable @typescript-eslint/camelcase */
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
-// @ts-check
+
+/* eslint-disable camelcase */
 
 const crypto = require('crypto');
 const { assert, hexToU8a, stringToU8a, u8aToHex } = require('@polkadot/util');
@@ -35,9 +34,9 @@ function sr25519_devFromSeed (wasm) {
 }
 
 function sr25519_verifyExisting (wasm) {
-  const PK = hexToU8a('0xb4bfa1f7a5166695eb75299fd1c4c03ea212871c342f2c5dfea0902b2c246918');
-  const MESSAGE = stringToU8a('Verifying that I am the owner of 5G9hQLdsKQswNPgB499DeA5PkFBbgkLPJWkkS6FAM6xGQ8xD. Hash: 221455a3\n');
-  const SIGNATURE = hexToU8a('0x5a9755f069939f45d96aaf125cf5ce7ba1db998686f87f2fb3cbdea922078741a73891ba265f70c31436e18a9acd14d189d73c12317ab6c313285cd938453202');
+  const PK = hexToU8a('0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d');
+  const MESSAGE = stringToU8a('I hereby verify that I control 5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY');
+  const SIGNATURE = hexToU8a('0xb83881d3bd7302981ee1c504fe5b7b394682927131fc0846fd616bb40fa14d02640fd2aca785b4cb57904765c2e4e75f59a7dd30154c209964369912091f6981');
 
   const isValid = wasm.sr25519Verify(SIGNATURE, MESSAGE, PK);
 
@@ -112,14 +111,14 @@ function sr25519_benchmark (wasm) {
 }
 
 module.exports = {
-  sr25519_pairFromSeed,
-  sr25519_devFromSeed,
+  sr25519_benchmark,
   sr25519_deriveHard,
   sr25519_deriveHardKnown,
   sr25519_deriveSoft,
   sr25519_deriveSoftKnown,
   sr25519_deriveSoftPubkey,
+  sr25519_devFromSeed,
+  sr25519_pairFromSeed,
   sr25519_signAndVerify,
-  sr25519_verifyExisting,
-  sr25519_benchmark
+  sr25519_verifyExisting
 };

packages/wasm-crypto/test/asm.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/test/jest.spec.js

@@ -1,5 +1,4 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
 

packages/wasm-crypto/test/wasm.js

@@ -1,8 +1,6 @@
-/* eslint-disable @typescript-eslint/no-var-requires */
-// Copyright 2019 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
 // This software may be modified and distributed under the terms
 // of the Apache-2.0 license. See the LICENSE file for details.
-// @ts-check
 
 const { runUnassisted } = require('./all');
 

scripts/build-package.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
 
 set -e
 
@@ -17,7 +20,7 @@ rm -rf ./build ./pkg
 
 # build new via nightly & wasm-pack
 echo "*** Building WASM output"
-rustup run nightly wasm-pack build --release --scope polkadot --target nodejs
+rustup run nightly$NIGHTLY wasm-pack build --release --scope polkadot --target nodejs
 mv pkg build
 
 # optimise
@@ -32,36 +35,55 @@ node ../../scripts/pack-wasm-base64.js
 echo "*** Building asm.js version"
 ../../binaryen/bin/wasm2js --output $ASM $OPT
 
-# cleanup the generated output, sadly there are no node-js outputs above
-sed -i -e 's/import {/\/\/ import {/g' $ASM
-sed -i -e 's/function asmFunc/var schnorrkel = require('\''\.\/wasm'\''); function asmFunc/g' $ASM
-sed -i -e 's/{abort.*},memasmFunc/schnorrkel, memasmFunc/g' $ASM
+# cleanup the generated asm, converting to cjs
+sed -i -e '/import {/d' $ASM
+echo "const imported = require('./wasm');
+$(cat $ASM)" > $ASM
+sed -i -e 's/{abort.*},memasmFunc/imported, memasmFunc/g' $ASM
 sed -i -e 's/export var /module\.exports\./g' $ASM
 
 # copy our package interfaces
 echo "*** Copying package sources"
 cp src/js/* build/
 
+echo "const crypto = require('crypto');
+const { stringToU8a, u8aToString } = require('@polkadot/util');
+
+const requires = { crypto };
+
+$(cat $SRC_WASM)
+" > $SRC_WASM
+
+# whack comments
+sed -i -e '/^\/\*\*/d' $SRC_WASM
+sed -i -e '/^\*/d' $SRC_WASM
+sed -i -e '/^\*\//d' $SRC_WASM
+
 # we are swapping to a async interface for webpack support (wasm limits)
-sed -i -e 's/wasm = require/\/\/ wasm = require/g' $SRC_WASM
+sed -i -e '/^wasm = require/d' $SRC_WASM
 
 # We don't want inline requires
-sed -i -e 's/var wasm;/const crypto = require('\''crypto'\''); let wasm; const requires = { crypto };/g' $SRC_WASM
-sed -i -e 's/return addHeapObject(require(varg0));/return addHeapObject(requires[varg0]);/g' $SRC_WASM
+sed -i -e 's/ret = require(getStringFromWasm0(arg0, arg1));/ret = requires[getStringFromWasm0(arg0, arg1)];/g' $SRC_WASM
 
 # this creates issues in both the browser and RN (@polkadot/util has a polyfill)
-sed -i -e 's/const TextEncoder = require('\''util'\'')\.TextEncoder;/const { stringToU8a } = require('\''@polkadot\/util'\'');/g' $SRC_WASM
-sed -i -e 's/let cachedTextEncoder = new /\/\/ let cachedTextEncoder = new /g' $SRC_WASM
+sed -i -e '/^const { TextEncoder } = require/d' $SRC_WASM
+sed -i -e '/^let cachedTextEncoder = new /d' $SRC_WASM
 sed -i -e 's/cachedTextEncoder\.encode/stringToU8a/g' $SRC_WASM
 
 # this creates issues in both the browser and RN (@polkadot/util has a polyfill)
-sed -i -e 's/const TextDecoder = require('\''util'\'')\.TextDecoder;/const { u8aToString } = require('\''@polkadot\/util'\'');/g' $SRC_WASM
-sed -i -e 's/let cachedTextDecoder = new /\/\/ let cachedTextDecoder = new /g' $SRC_WASM
+sed -i -e '/^const { TextDecoder } = require/d' $SRC_WASM
+sed -i -e '/^let cachedTextDecoder = new/d' $SRC_WASM
 sed -i -e 's/cachedTextDecoder\.decode/u8aToString/g' $SRC_WASM
 
+# this is where we get the actual bg file
+sed -i -e '/^const path = require/d' $SRC_WASM
+sed -i -e '/^const bytes = require/d' $SRC_WASM
+sed -i -e '/^const wasmModule =/d' $SRC_WASM
+sed -i -e '/^const wasmInstance =/d' $SRC_WASM
+sed -i -e '/^wasm = wasmInstance/d' $SRC_WASM
+
 # construct our promise and add ready helpers (WASM)
-echo "
-module.exports.abort = function () { throw new Error('abort'); };
+echo "module.exports.abort = function () { throw new Error('abort'); };
 
 const createPromise = require('./wasm_promise');
 const wasmPromise = createPromise().catch(() => null);

scripts/build-release.sh

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
+
+set -e
+
+rustup toolchain install nightly$NIGHTLY
+yarn polkadot-ci-ghact-build

scripts/build.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
 
 set -e
 
+rustup toolchain install nightly$NIGHTLY
 ./scripts/install-build-deps.sh
 
 echo "*** Building packages"

scripts/clean.sh

@@ -1,4 +1,7 @@
 #!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
 
 set -e
 

scripts/install-build-deps.sh

@@ -1,28 +1,47 @@
 #!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
 
 set -e
 
 # wasm2js for wasm -> asm.js
 BINARYEN=( "wasm-opt" "wasm2js" )
 
+unamestr=`uname`
+
 # install wasm-pack as required
 if ! [ -x "$(command -v wasm-pack)" ]; then
   echo "*** Installing wasm-pack"
   curl https://rustwasm.github.io/wasm-pack/installer/init.sh -sSf | sh
 fi
 
-# install binaryen as required
-if [ ! -d "binaryen" ]; then
-  echo "*** Installing binaryen"
-  git clone --recursive https://github.com/WebAssembly/binaryen.git
-  rm -rf binaryen/test
+# CI, Linux
+if [[ "$unamestr" == 'Linux' ]]; then
+  if [ ! -d "binaryen" ]; then
+    echo "*** Downloading binaryen"
+    curl -L https://github.com/WebAssembly/binaryen/releases/download/version_91/binaryen-version_91-x86-linux.tar.gz | tar xz
+    mkdir -p binaryen/bin
+
+    for BIN in "${BINARYEN[@]}"; do
+      mv binaryen-version_91/$BIN binaryen/bin
+    done
+  fi
+else
+  # install binaryen as required
+  if [ ! -d "binaryen" ]; then
+    echo "*** Cloning binaryen"
+    git clone --recursive https://github.com/WebAssembly/binaryen.git
+    rm -rf binaryen/test
+  fi
+
+  for BIN in "${BINARYEN[@]}"; do
+    if [ ! -f "binaryen/bin/$BIN" ]; then
+      echo "*** Building $BIN"
+      cd binaryen
+      cmake . && make $BIN
+      cd ..
+    fi
+  done
 fi
 
-for BIN in "${BINARYEN[@]}"; do
-  if [ ! -f "binaryen/bin/$BIN" ]; then
-    echo "*** Building $BIN"
-    cd binaryen
-    cmake . && make $BIN
-    cd ..
-  fi
-done

scripts/pack-wasm-base64.js

@@ -1,3 +1,7 @@
+// Copyright 2019-2020 @polkadot/wasm authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
 /* eslint-disable @typescript-eslint/no-var-requires */
 const fs = require('fs');
 const buffer = fs.readFileSync('./build/wasm_opt.wasm');

scripts/test-package.sh

@@ -1,12 +1,10 @@
 #!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
 
 set -e
 
-echo "*** Testing package"
-
-echo "*** Testing Rust"
-RUST_BACKTRACE=full rustup run nightly cargo test --release -- --nocapture
-
 echo "*** Testing WASM"
 node ./test/wasm.js
 
@@ -14,4 +12,4 @@ echo "*** Testing ASM.js"
 node ./test/asm.js
 
 echo "*** Testing via Jest"
-yarn jest ./test/jest.spec.js
+yarn polkadot-dev-run-test ./test/jest.spec.js

scripts/test-rust.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+# Copyright 2019-2020 @polkadot/wasm authors & contributors
+# This software may be modified and distributed under the terms
+# of the Apache-2.0 license. See the LICENSE file for details.
+
+set -e
+
+rustup toolchain install nightly$NIGHTLY
+
+cd packages
+
+PACKAGES=( $(ls -1d *) )
+
+for PKG in "${PACKAGES[@]}"; do
+  if [ -f "$PKG/package.json" ]; then
+    cd $PKG
+    echo "*** Testing Rust $PKG"
+
+    RUST_BACKTRACE=full rustup run nightly$NIGHTLY cargo test --release -- --nocapture
+
+    cd ..
+  fi
+done
+
+cd ..

tsconfig.eslint.json

@@ -1,11 +0,0 @@
-{
-  "extends": "./tsconfig.json",
-  "exclude": [
-    "build",
-    "packages/*/build"
-  ],
-  "compilerOptions": {
-    "allowJs": true,
-    "checkJs": true
-  }
-}

tsconfig.json

@@ -1,10 +1,15 @@
 {
-  "extends": "./node_modules/@polkadot/dev/config/tsconfig",
+  "extends": "@polkadot/dev/config/tsconfig",
+  "exclude": [
+    "build/**/*",
+    "**/build/**/*"
+  ],
   "compilerOptions": {
     "baseUrl": ".",
     "paths": {
       "@polkadot/wasm-schnorrkel": [ "packages/wasm-schnorrkel/src" ]
     },
+    "skipLibCheck": true,
     "typeRoots": [
       "./node_modules/@polkadot/ts",
       "./node_modules/@types"

tslint.json

@@ -1,3 +0,0 @@
-{
-  "extends": "@polkadot/dev/config/tslint"
-}

typedoc.js

@@ -1,16 +1,20 @@
+// Copyright 2019-2020 @polkadot/wasm-crypto authors & contributors
+// This software may be modified and distributed under the terms
+// of the Apache-2.0 license. See the LICENSE file for details.
+
 module.exports = {
-  name: 'Polkadot JS WASM',
   exclude: '**/*+(index|e2e|spec).ts',
   excludeExternals: true,
   excludeNotExported: true,
-  excludeProtected: true,
   excludePrivate: true,
+  excludeProtected: true,
   hideGenerator: true,
   includeDeclarations: false,
-  out: 'docs',
+  mdEngine: 'gitbook',
   module: 'commonjs',
   moduleResolution: 'node',
-  mdEngine: 'gitbook',
+  name: 'Polkadot JS WASM',
+  out: 'docs',
   stripInternal: 'true',
   theme: 'markdown'
 };