[CI Skip] release/stable 5.0.1

skip-checks: true

.123trigger

@@ -1,6 +1,8 @@
-6
+7
+
 3.2.2
 3.2.3
 3.2.4
+
 4.0.2
 4.1.2

.codeclimate.yml

@@ -1,5 +1,20 @@
+checks:
+  argument-count:
+    config:
+      threshold: 5
+  method-complexity:
+    config:
+      threshold: 7
+  method-count:
+    config:
+      threshold: 25
+  method-lines:
+    config:
+      threshold: 30
+
 exclude_patterns:
 - "**/*.spec.js"
 - "**/*.spec.ts"
 - "docs/**/*.js"
 - "**/test/**/*.js"
+- "packages/wasm-crypto-wasm/src/fflate.ts"

.eslintrc.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const base = require('@polkadot/dev/config/eslint.cjs');
@@ -6,21 +6,14 @@ const base = require('@polkadot/dev/config/eslint.cjs');
 module.exports = {
   ...base,
   ignorePatterns: [
-    '.eslintrc.js',
-    '.github/**',
-    '.vscode/**',
-    '.yarn/**',
-    '**/binaryen/*',
-    '**/build/*',
-    '**/coverage/*',
-    '**/node_modules/*',
-    '**/pkg/*',
-    '**/target/*'
+    ...base.ignorePatterns,
+    '**/target/*',
+    'packages/bytes/*'
   ],
   parserOptions: {
     ...base.parserOptions,
     project: [
-      './tsconfig.json'
+      './tsconfig.eslint.json'
     ]
   }
 };

.github/workflows/auto-approve.yml

@@ -0,0 +1,16 @@
+name: bot
+
+on:
+  pull_request:
+    types: [labeled]
+
+jobs:
+  approve:
+    if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && (!github.event.pull_request || github.event.pull_request.head.repo.full_name == github.repository)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: jacogr/action-approve@master
+        with:
+          authors: jacogr
+          labels: -auto
+          token: ${{ secrets.GH_PAT_BOT }}

.github/workflows/auto-merge.yml

@@ -0,0 +1,16 @@
+name: bot
+
+on:
+  pull_request:
+    types: [labeled]
+
+jobs:
+  merge:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: jacogr/action-merge@master
+        with:
+          checks: build,lint,test
+          labels: -auto
+          strategy: squash
+          token: ${{ secrets.GH_PAT_BOT }}

.github/workflows/lock.yml

@@ -7,6 +7,8 @@ on:
 jobs:
   lock:
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
     steps:
       - uses: dessant/lock-threads@v2
         with:

.github/workflows/pr-any.yml

@@ -8,6 +8,8 @@ jobs:
         step: ['lint', 'test', 'build']
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
     steps:
     - uses: actions/checkout@v2
     - name: ${{ matrix.step }}

.github/workflows/push-master.yml

@@ -12,16 +12,18 @@ jobs:
         step: ['build:release']
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
+      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 }}
     steps:
     - uses: actions/checkout@v2
       with:
+        fetch-depth: 0
         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'
         ./scripts/install-build-deps.sh

.github/workflows/semgrep.yml

@@ -9,6 +9,8 @@ jobs:
   check:
     if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && (!github.event.pull_request || github.event.pull_request.head.repo.full_name == github.repository)"
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
     steps:
       - uses: actions/checkout@v2
       - uses: returntocorp/semgrep-action@v1

.github/workflows/stale.yml

@@ -6,6 +6,8 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
     steps:
       - uses: actions/stale@v3
         with:

.gitignore

@@ -26,5 +26,6 @@ lerna-debug.log*
 npm-debug.log*
 package-lock.json
 report.*.json
+tsconfig.*buildinfo
 yarn-debug.log*
 yarn-error.log*

.mailmap

@@ -0,0 +1,3 @@
+Jaco <jacogr@gmail.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> <action@github.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Github Actions <action@github.com>

.prettierrc.cjs

@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/dev authors & contributors
+// Copyright 2017-2022 @polkadot/dev authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 module.exports = require('@polkadot/dev/config/prettier.cjs');

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
 
-yarnPath: .yarn/releases/yarn-3.0.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.0.cjs

CHANGELOG.md

@@ -1,5 +1,29 @@
 # CHANGELOG
 
+## 5.0.1 Mar 19, 2022
+
+- **Breaking change** For users of React Native, you are now required to add `import '@polkadot/wasm-crypto/initOnlyAsm'` at your project top-level to ensure that asm.js is initialized. (Or alternatively `import '@polkadot/wasm-crypto/initWasmAsm'` to future-proof when WASM does become available)
+- **Breaking change** For users who used to map the `data` and `empty` of the internal `wasm-crypto-{wasm, asmjs}` packages in their bundlers, swap to one of the `@polkadot/wasm-crypto/init*` top-level imports to set the type of interfaces you would prefer.
+
+Changes:
+
+- Add (optional) `@polkadot/wasm-crypto/init{OnlyAsm, OnlyWasm, WasmAsm}` to allow specific interface types
+- Add work-around for lazy secp256k1 init in asm.js environments
+- Optimize asm.js output size
+- Use latest `wasm-bindgen`, `binaryen` & `wabt` packages in build
+- Additional workaround for Vite bundling
+
+
+## 4.6.1 Mar 12, 2022
+
+Changes:
+
+- Adjust ed25519 internals, consistency in code
+- Ensure package path is available under ESM & CJS
+- JS wrapped bytes interoperability test
+- Adjust for bundlers where `import.meta.url` is undefined
+
+
 ## 4.5.1 Dec 3, 2021
 
 Changes:

CONTRIBUTORS

@@ -0,0 +1,5 @@
+     384	Jaco                          	5.0.1 (#312)
+       1	Evgeny                        	Fixed type (#121)
+       1	Shunfan Zhou                  	Support sr25519 agreement (#209)
+       1	Steve Degosserie              	Expose Schnorrkel's VRF capabilities (#170)
+       1	Zhongpeng Zhou                	Update package.json to include the repository (#220)

babel.config.cjs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 module.exports = require('@polkadot/dev/config/babel-config-cjs.cjs');

jest.config.cjs

@@ -1,13 +1,13 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const config = require('@polkadot/dev/config/jest.cjs');
 
-module.exports = Object.assign({}, config, {
+module.exports = {
+  ...config,
   moduleNameMapper: {
-    '@polkadot/wasm-crypto-asmjs(.*)$': '<rootDir>/packages/wasm-crypto-asmjs/build/$1',
-    '@polkadot/wasm-crypto-wasm(.*)$': '<rootDir>/packages/wasm-crypto-wasm/build/$1',
+    '@polkadot/wasm-crypto-(asmjs|wasm)(.*)$': '<rootDir>/packages/wasm-crypto-$1/build/$2',
     // eslint-disable-next-line sort-keys
     '@polkadot/wasm-crypto(.*)$': '<rootDir>/packages/wasm-crypto/src/$1'
   }
-});
+};

package.json

@@ -2,20 +2,21 @@
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "bugs": "https://github.com/polkadot-js/wasm/issues",
   "homepage": "https://github.com/polkadot-js/wasm#readme",
-  "license": "Apache-2",
-  "packageManager": "yarn@3.0.1",
+  "license": "Apache-2.0",
+  "packageManager": "yarn@3.2.0",
   "private": true,
   "repository": {
     "type": "git",
     "url": "https://github.com/polkadot-js/wasm.git"
   },
   "sideEffects": false,
-  "version": "4.5.1",
+  "version": "5.0.1",
   "workspaces": [
     "packages/*"
   ],
   "scripts": {
     "build": "yarn build:wasm",
+    "build:js": "./scripts/build-js.sh",
     "build:release": "polkadot-ci-ghact-build",
     "build:rollup": "polkadot-exec-rollup --config",
     "build:wasm": "./scripts/build.sh",
@@ -29,12 +30,12 @@
     "test:wasm:rust": "cd packages/wasm-crypto && RUST_BACKTRACE=full cargo test --release -- --nocapture"
   },
   "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@polkadot/dev": "^0.63.35",
-    "fflate": "^0.7.1",
+    "@babel/core": "^7.17.8",
+    "@polkadot/dev": "^0.65.97",
+    "fflate": "^0.7.3",
     "override-require": "^1.1.1"
   },
   "resolutions": {
-    "typescript": "^4.5.2"
+    "typescript": "^4.6.2"
   }
 }

packages/wasm-crypto-asmjs/package.json

@@ -17,11 +17,15 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "4.5.1",
-  "browser": "empty.js",
-  "main": "empty.js",
-  "react-native": "data.js",
+  "version": "5.0.1",
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.16.3"
+    "@babel/runtime": "^7.17.8"
+  },
+  "devDependencies": {
+    "@polkadot/util": "^8.5.1"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*"
   }
 }

packages/wasm-crypto-asmjs/src/bundle.ts

@@ -1,6 +1,8 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { asmJsInit as _asmJsInit } from './cjs/data.js';
 
+export { packageInfo } from './packageInfo';
+
 export const asmJsInit = _asmJsInit;

packages/wasm-crypto-asmjs/src/cjs/data.d.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export declare const asmJsInit: null;

packages/wasm-crypto-asmjs/src/cjs/data.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-asmjs authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const asmJsInit = null;

packages/wasm-crypto-asmjs/src/detectOther.ts

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default [];

packages/wasm-crypto-asmjs/src/detectPackage.ts

@@ -0,0 +1,11 @@
+// Copyright 2017-2022 @polkadot/wasm-crypto-asmjs authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, null, others);

packages/wasm-crypto-asmjs/src/empty.ts

@@ -1,4 +0,0 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-asmjs authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export const asmJsInit = null;

packages/wasm-crypto-asmjs/src/index.ts

@@ -0,0 +1,6 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-asmjs authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './detectPackage';
+
+export * from './bundle';

packages/wasm-crypto-asmjs/src/packageInfo.ts

@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/wasm-crypto-asmjs authors & contributors
+// Copyright 2017-2022 @polkadot/wasm-crypto-asmjs authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// Auto-generated by @polkadot/dev, do not edit
+// Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/wasm-crypto-asmjs', version: '4.5.1' };
+export const packageInfo = { name: '@polkadot/wasm-crypto-asmjs', path: 'auto', type: 'auto', version: '5.0.1' };

packages/wasm-crypto-asmjs/tsconfig.build.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": []
+}

packages/wasm-crypto-wasm/package.json

@@ -17,11 +17,15 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "4.5.1",
-  "browser": "data.js",
-  "main": "data.js",
-  "react-native": "data.js",
+  "version": "5.0.1",
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.16.3"
+    "@babel/runtime": "^7.17.8"
+  },
+  "devDependencies": {
+    "@polkadot/util": "^8.5.1"
+  },
+  "peerDependencies": {
+    "@polkadot/util": "*"
   }
 }

packages/wasm-crypto-wasm/src/base64.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const chars = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';

packages/wasm-crypto-wasm/src/bundle.ts

@@ -1,8 +1,10 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { base64Decode } from './base64';
 import { bytes, sizeUncompressed } from './bytes';
 import { unzlibSync } from './fflate';
 
+export { packageInfo } from './packageInfo';
+
 export const wasmBytes = unzlibSync(base64Decode(bytes), new Uint8Array(sizeUncompressed));

packages/wasm-crypto-wasm/src/bytes.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { bytes as _bytes, sizeCompressed as _sizeCompressed, sizeUncompressed as _sizeUncompressed } from './cjs/bytes';

packages/wasm-crypto-wasm/src/cjs/bytes.d.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 export declare const bytes = '';

packages/wasm-crypto-wasm/src/cjs/bytes.js

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 exports.bytes = '';

packages/wasm-crypto-wasm/src/detectOther.ts

@@ -0,0 +1,4 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default [];

packages/wasm-crypto-wasm/src/detectPackage.ts

@@ -0,0 +1,11 @@
+// Copyright 2017-2022 @polkadot/wasm-crypto-wasm authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, null, others);

packages/wasm-crypto-wasm/src/empty.ts

@@ -1,8 +0,0 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto-wasm authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-export const bytes = null;
-
-export const sizeCompressed = 0;
-
-export const sizeUncompressed = 0;

packages/wasm-crypto-wasm/src/fflate.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // MIT License

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

@@ -0,0 +1,6 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto-wasm authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './detectPackage';
+
+export * from './bundle';

packages/wasm-crypto-wasm/src/packageInfo.ts

@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/wasm-crypto-wasm authors & contributors
+// Copyright 2017-2022 @polkadot/wasm-crypto-wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// Auto-generated by @polkadot/dev, do not edit
+// Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/wasm-crypto-wasm', version: '4.5.1' };
+export const packageInfo = { name: '@polkadot/wasm-crypto-wasm', path: 'auto', type: 'auto', version: '5.0.1' };

packages/wasm-crypto-wasm/tsconfig.build.json

@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": []
+}

packages/wasm-crypto/Cargo.lock

@@ -568,9 +568,9 @@ checksum = "99c605b9a0adc77b7211c6b1f722dcb613d68d66859a44f3d485a6da332b0598"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.19"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
 dependencies = [
  "unicode-xid",
 ]
@@ -781,9 +781,9 @@ checksum = "502d53007c02d7605a05df1c1a73ee436952781653da5d0bf57ad608f66932c1"
 
 [[package]]
 name = "syn"
-version = "1.0.38"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69abc24912995b3038597a7a593be5053eb0fb44f3cc5beec0deb421790c1f4"
+checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -908,19 +908,19 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.65"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edbcc9536ab7eababcc6d2374a0b7bfe13a2b6d562c5e07f370456b1a8f33d"
+checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06"
 dependencies = [
- "cfg-if 0.1.10",
+ "cfg-if 1.0.0",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.65"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ed2fb8c84bfad20ea66b26a3743f3e7ba8735a69fe7d95118c33ec8fc1244d"
+checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca"
 dependencies = [
  "bumpalo",
  "lazy_static",
@@ -933,9 +933,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.65"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb071268b031a64d92fc6cf691715ca5a40950694d8f683c5bb43db7c730929e"
+checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -943,9 +943,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.65"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf592c807080719d1ff2f245a687cbadb3ed28b2077ed7084b47aba8b691f2c6"
+checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -956,9 +956,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.65"
+version = "0.2.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b6c0220ded549d63860c78c38f3bcc558d1ca3f4efa74942c536ddbbb55e87"
+checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2"
 
 [[package]]
 name = "wee_alloc"

packages/wasm-crypto/Cargo.toml

@@ -32,7 +32,7 @@ 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"
+wasm-bindgen = "=0.2.79"
 wee_alloc = "0.4.3"
 
 [dev-dependencies]

packages/wasm-crypto/package.json

@@ -17,19 +17,25 @@
   },
   "sideEffects": [
     "./detectPackage.js",
-    "./detectPackage.cjs"
+    "./detectPackage.cjs",
+    "./initOnlyAsm.js",
+    "./initOnlyAsm.cjs",
+    "./initOnlyWasm.js",
+    "./initOnlyWasm.cjs",
+    "./initWasmAsm.js",
+    "./initWasmAsm.cjs"
   ],
   "type": "module",
-  "version": "4.5.1",
+  "version": "5.0.1",
   "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.16.3",
-    "@polkadot/wasm-crypto-asmjs": "^4.5.1",
-    "@polkadot/wasm-crypto-wasm": "^4.5.1"
+    "@babel/runtime": "^7.17.8",
+    "@polkadot/wasm-crypto-asmjs": "^5.0.1",
+    "@polkadot/wasm-crypto-wasm": "^5.0.1"
   },
   "devDependencies": {
-    "@polkadot/util": "^8.0.5",
-    "@polkadot/x-randomvalues": "^8.0.5"
+    "@polkadot/util": "^8.5.1",
+    "@polkadot/x-randomvalues": "^8.5.1"
   },
   "peerDependencies": {
     "@polkadot/util": "*",

packages/wasm-crypto/src/bridge.ts

@@ -1,9 +1,9 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 
-import type { AsmCreator, WasmCryptoInstance } from './types';
+import type { WasmCryptoInstance } from './types';
 
 import { assert, stringToU8a, u8aToString } from '@polkadot/util';
 
@@ -12,56 +12,48 @@ type PopFirst<T extends unknown[]> =
     ? N
     : [];
 
-let wasm: WasmCryptoInstance | null = null;
-let cachegetInt32: Int32Array | null = null;
-let cachegetUint8: Uint8Array | null = null;
-
-export async function initWasm (wasmBytes: Uint8Array | null, asmFn: AsmCreator | null, wbg: Record<string, WebAssembly.ImportValue>): Promise<void> {
-  try {
-    assert(typeof WebAssembly !== 'undefined' && wasmBytes && wasmBytes.length, 'WebAssembly is not available in your environment');
-
-    const source = await WebAssembly.instantiate(wasmBytes, { wbg });
-
-    wasm = source.instance.exports as unknown as WasmCryptoInstance;
-  } catch (error) {
-    // if we have a valid supplied asm.js, return that
-    if (asmFn) {
-      wasm = asmFn(wbg);
-    } else {
-      console.error('FATAL: Unable to initialize @polkadot/wasm-crypto');
-      console.error(error);
-
-      wasm = null;
-    }
-  }
+interface Bridge {
+  cachegetInt32: Int32Array | null;
+  cachegetUint8: Uint8Array | null;
+  type: 'wasm' | 'asm';
+  wasm: WasmCryptoInstance | null;
+  wasmPromise: Promise<void> | null;
 }
 
+export const __bridge: Bridge = {
+  cachegetInt32: null,
+  cachegetUint8: null,
+  type: 'wasm',
+  wasm: null,
+  wasmPromise: null
+};
+
 export function withWasm <T, F extends (wasm: WasmCryptoInstance, ...params: never[]) => T> (fn: F): (...params: PopFirst<Parameters<F>>) => ReturnType<F> {
   return (...params: PopFirst<Parameters<F>>): ReturnType<F> => {
-    assert(wasm, 'The WASM interface has not been initialized. Ensure that you wait for the initialization Promise with waitReady() from @polkadot/wasm-crypto (or cryptoWaitReady() from @polkadot/util-crypto) before attempting to use WASM-only interfaces.');
+    assert(__bridge.wasm, 'The WASM interface has not been initialized. Ensure that you wait for the initialization Promise with waitReady() from @polkadot/wasm-crypto (or cryptoWaitReady() from @polkadot/util-crypto) before attempting to use WASM-only interfaces.');
 
-    return fn(wasm, ...params) as ReturnType<F>;
+    return fn(__bridge.wasm, ...params) as ReturnType<F>;
   };
 }
 
 export function getWasm (): WasmCryptoInstance {
-  return wasm!;
+  return __bridge.wasm!;
 }
 
 export function getInt32 (): Int32Array {
-  if (cachegetInt32 === null || cachegetInt32.buffer !== wasm!.memory.buffer) {
-    cachegetInt32 = new Int32Array(wasm!.memory.buffer);
+  if (__bridge.cachegetInt32 === null || __bridge.cachegetInt32.buffer !== __bridge.wasm!.memory.buffer) {
+    __bridge.cachegetInt32 = new Int32Array(__bridge.wasm!.memory.buffer);
   }
 
-  return cachegetInt32;
+  return __bridge.cachegetInt32;
 }
 
 export function getUint8 (): Uint8Array {
-  if (cachegetUint8 === null || cachegetUint8.buffer !== wasm!.memory.buffer) {
-    cachegetUint8 = new Uint8Array(wasm!.memory.buffer);
+  if (__bridge.cachegetUint8 === null || __bridge.cachegetUint8.buffer !== __bridge.wasm!.memory.buffer) {
+    __bridge.cachegetUint8 = new Uint8Array(__bridge.wasm!.memory.buffer);
   }
 
-  return cachegetUint8;
+  return __bridge.cachegetUint8;
 }
 
 export function getU8a (ptr: number, len: number): Uint8Array {
@@ -73,7 +65,7 @@ export function getString (ptr: number, len: number): string {
 }
 
 export function allocU8a (arg: Uint8Array): [number, number] {
-  const ptr = wasm!.__wbindgen_malloc(arg.length * 1);
+  const ptr = __bridge.wasm!.__wbindgen_malloc(arg.length * 1);
 
   getUint8().set(arg, ptr / 1);
 
@@ -89,7 +81,7 @@ export function resultU8a (): Uint8Array {
   const r1 = getInt32()[8 / 4 + 1];
   const ret = getU8a(r0, r1).slice();
 
-  wasm!.__wbindgen_free(r0, r1 * 1);
+  __bridge.wasm!.__wbindgen_free(r0, r1 * 1);
 
   return ret;
 }

packages/wasm-crypto/src/bundle.ts

@@ -1,16 +1,11 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { asmJsInit } from '@polkadot/wasm-crypto-asmjs';
-import { wasmBytes } from '@polkadot/wasm-crypto-wasm';
-
-import { allocString, allocU8a, getWasm, initWasm, resultString, resultU8a, withWasm } from './bridge';
-import * as imports from './imports';
+import { __bridge, allocString, allocU8a, getWasm, resultString, resultU8a, withWasm } from './bridge';
+import { setWasmOnlyPromise } from './init';
 
 export { packageInfo } from './packageInfo';
 
-const wasmPromise = initWasm(wasmBytes, asmJsInit, imports).catch(() => null);
-
 export const bip39Generate = withWasm((wasm, words: 12 | 15 | 18 | 21 | 24): string => {
   wasm.ext_bip39_generate(8, words);
 
@@ -59,7 +54,18 @@ export const ed25519Verify = withWasm((wasm, signature: Uint8Array, message: Uin
   return ret !== 0;
 });
 
+let secpLazyInit = false;
+
 export const secp256k1FromSeed = withWasm((wasm, seckey: Uint8Array): Uint8Array => {
+  // HACK In an asm.js environment, the static initialization seems to trip up the
+  // first usage of the keypair generation
+  // https://github.com/polkadot-js/wasm/issues/307
+  if (!secpLazyInit && __bridge.type === 'asm') {
+    wasm.ext_secp_from_seed(8, ...allocU8a(seckey));
+    resultU8a();
+  }
+
+  secpLazyInit = true;
   wasm.ext_secp_from_seed(8, ...allocU8a(seckey));
 
   return resultU8a();
@@ -208,5 +214,9 @@ export function isReady (): boolean {
 }
 
 export function waitReady (): Promise<boolean> {
-  return wasmPromise.then(() => isReady());
+  return (
+    __bridge.wasmPromise || setWasmOnlyPromise()
+  )
+    .then(() => isReady())
+    .catch(() => false);
 }

packages/wasm-crypto/src/detectOther.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2022 @polkadot/wasm-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as asmInfo } from '@polkadot/wasm-crypto-asmjs/packageInfo';
+import { packageInfo as wasmInfo } from '@polkadot/wasm-crypto-wasm/packageInfo';
+
+export default [asmInfo, wasmInfo];

packages/wasm-crypto/src/detectPackage.ts

@@ -1,10 +1,11 @@
-// Copyright 2017-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { detectPackage } from '@polkadot/util';
-import { packageInfo as asmInfo } from '@polkadot/wasm-crypto-asmjs/packageInfo';
-import { packageInfo as wasmInfo } from '@polkadot/wasm-crypto-wasm/packageInfo';
+// Do not edit, auto-generated by @polkadot/dev
 
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
 import { packageInfo } from './packageInfo';
 
-detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [asmInfo, wasmInfo]);
+detectPackage(packageInfo, null, others);

packages/wasm-crypto/src/imports.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 /* eslint-disable camelcase */

packages/wasm-crypto/src/index.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import './detectPackage';

packages/wasm-crypto/src/init.ts

@@ -0,0 +1,41 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { AsmCreator, WasmCryptoInstance } from './types';
+
+import { assert } from '@polkadot/util';
+import { wasmBytes } from '@polkadot/wasm-crypto-wasm';
+
+import { __bridge } from './bridge';
+import * as imports from './imports';
+
+async function createPromise (wasmBytes: Uint8Array | null, asmFn: AsmCreator | null): Promise<void> {
+  try {
+    assert(typeof WebAssembly !== 'undefined' && wasmBytes && wasmBytes.length, 'WebAssembly is not available in your environment');
+
+    const source = await WebAssembly.instantiate(wasmBytes, { wbg: imports });
+
+    __bridge.wasm = source.instance.exports as unknown as WasmCryptoInstance;
+  } catch (error) {
+    // if we have a valid supplied asm.js, return that
+    if (asmFn) {
+      __bridge.type = 'asm';
+      __bridge.wasm = asmFn(imports);
+    } else {
+      console.error('FATAL: Unable to initialize @polkadot/wasm-crypto');
+      console.error(error);
+
+      __bridge.wasm = null;
+    }
+  }
+}
+
+export function setPromise (wasmBytes: Uint8Array | null, asmFn: AsmCreator | null): Promise<void> {
+  __bridge.wasmPromise = createPromise(wasmBytes, asmFn);
+
+  return __bridge.wasmPromise;
+}
+
+export function setWasmOnlyPromise (): Promise<void> {
+  return setPromise(wasmBytes, null);
+}

packages/wasm-crypto/src/initOnlyAsm.ts

@@ -0,0 +1,8 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { asmJsInit } from '@polkadot/wasm-crypto-asmjs';
+
+import { setPromise } from './init';
+
+setPromise(null, asmJsInit).catch(() => undefined);

packages/wasm-crypto/src/initOnlyWasm.ts

@@ -0,0 +1,6 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { setWasmOnlyPromise } from './init';
+
+setWasmOnlyPromise().catch(() => undefined);

packages/wasm-crypto/src/initWasmAsm.ts

@@ -0,0 +1,9 @@
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { asmJsInit } from '@polkadot/wasm-crypto-asmjs';
+import { wasmBytes } from '@polkadot/wasm-crypto-wasm';
+
+import { setPromise } from './init';
+
+setPromise(wasmBytes, asmJsInit).catch(() => undefined);

packages/wasm-crypto/src/json.d.ts

@@ -1,11 +0,0 @@
-// Copyright 2017-2021 @polkadot/wasm-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// Be able to import json in TS
-// https://stackoverflow.com/questions/49996456/importing-json-file-in-typescript
-declare module '*.json' {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const value: any;
-
-  export default value;
-}

packages/wasm-crypto/src/lib.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Use `wee_alloc` as the global allocator.

packages/wasm-crypto/src/packageInfo.ts

@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// Auto-generated by @polkadot/dev, do not edit
+// Do not edit, auto-generated by @polkadot/dev
 
-export const packageInfo = { name: '@polkadot/wasm-crypto', version: '4.5.1' };
+export const packageInfo = { name: '@polkadot/wasm-crypto', path: 'auto', type: 'auto', version: '5.0.1' };

packages/wasm-crypto/src/rs/bip39.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use bip39::{Mnemonic, MnemonicType, Language, Seed};

packages/wasm-crypto/src/rs/ed25519.rs

@@ -1,18 +1,10 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use std::convert::TryFrom;
 use ed25519_dalek::{Keypair, PublicKey, SecretKey, Signature, Signer as _, Verifier as _};
 use wasm_bindgen::prelude::*;
 
-/// Keypair helper function.
-fn new_from_pair(pair: &[u8]) -> Keypair {
-	match Keypair::from_bytes(pair) {
-		Ok(p) => p,
-		_ => panic!("Provided pair is invalid.")
-	}
-}
-
 /// Keypair helper function
 fn new_from_parts(pubkey: &[u8], seckey: &[u8]) -> Keypair {
 	let mut pair = vec![];
@@ -20,26 +12,9 @@ fn new_from_parts(pubkey: &[u8], seckey: &[u8]) -> Keypair {
 	pair.extend_from_slice(seckey);
 	pair.extend_from_slice(pubkey);
 
-	new_from_pair(&pair)
-}
-
-/// Keypair helper function.
-fn new_from_seed(seed: &[u8]) -> Keypair {
-	match &SecretKey::from_bytes(seed) {
-		Ok(s) => {
-			let pubkey: PublicKey = s.into();
-
-			new_from_parts(pubkey.as_bytes(), seed)
-		},
-		_ => panic!("Invalid seed provided.")
-	}
-}
-
-/// PublicKey helper
-fn new_public(pubkey: &[u8]) -> PublicKey {
-	match PublicKey::from_bytes(pubkey) {
+	match Keypair::from_bytes(&pair) {
 		Ok(p) => p,
-		_ => panic!("Provided public key is invalid.")
+		_ => panic!("Provided pair is invalid.")
 	}
 }
 
@@ -51,9 +26,16 @@ fn new_public(pubkey: &[u8]) -> PublicKey {
 /// followed by the public key (32) bytes.
 #[wasm_bindgen]
 pub fn ext_ed_from_seed(seed: &[u8]) -> Vec<u8> {
-	new_from_seed(seed)
-		.to_bytes()
-		.to_vec()
+	match &SecretKey::from_bytes(seed) {
+		Ok(s) => {
+			let pubkey: PublicKey = s.into();
+
+			new_from_parts(pubkey.as_bytes(), seed)
+				.to_bytes()
+				.to_vec()
+		},
+		_ => panic!("Invalid seed provided.")
+	}
 }
 
 /// Sign a message
@@ -81,8 +63,8 @@ pub fn ext_ed_sign(pubkey: &[u8], seckey: &[u8], message: &[u8]) -> Vec<u8> {
 /// * pubkey: UIntArray with 32 element
 #[wasm_bindgen]
 pub fn ext_ed_verify(signature: &[u8], message: &[u8], pubkey: &[u8]) -> bool {
-	match Signature::try_from(signature) {
-		Ok(s) => new_public(pubkey)
+	match (Signature::try_from(signature), PublicKey::from_bytes(pubkey)) {
+		(Ok(s), Ok(k)) => k
 			.verify(message, &s)
 			.is_ok(),
 		_ => false

packages/wasm-crypto/src/rs/hashing.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use blake2_rfc::blake2b::blake2b;

packages/wasm-crypto/src/rs/secp256k1.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 use libsecp256k1::{Message, PublicKey, RecoveryId, SecretKey, Signature, recover, sign};
@@ -36,7 +36,7 @@ pub fn ext_secp_from_seed(seed: &[u8]) -> Vec<u8> {
 
 			res
 		},
-		_ => panic!("Incalid seed provided.")
+		_ => panic!("Invalid seed provided.")
 	}
 }
 
@@ -114,7 +114,7 @@ pub mod tests {
 
 	#[test]
 	fn can_sign() {
-		// JS expectiation - doesn't match?
+		// JS expectation - doesn't match?
 		// let expected = hex!("df92f73d9f060cefacf187b5414491cb992998ace017fa48839b5cda3e264ba8c4efa521361678d9b8582744d77aa4b8d886d7380b7808a683174afad9c4700300");
 		let expected = hex!("df92f73d9f060cefacf187b5414491cb992998ace017fa48839b5cda3e264ba83b105adec9e9872647a7d8bb28855b45e22805aea3d097953cbb1391f671d13e01");
 		let seckey = hex!("4380de832af797688026ce24f85204d508243f201650c1a134929e5458b7fbae");

packages/wasm-crypto/src/rs/sr25519.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Copyright 2019 Paritytech via https://github.com/paritytech/schnorrkel-js/
@@ -248,6 +248,26 @@ pub mod tests {
 		assert!(is_valid);
 	}
 
+	#[test]
+	fn can_verify_known_wrapped_message() {
+		let message = b"<Bytes>message to sign</Bytes>";
+		let public = hex!("f84d048da2ddae2d9d8fd6763f469566e8817a26114f39408de15547f6d47805");
+		let signature = hex!("48ce2c90e08651adfc8ecef84e916f6d1bb51ebebd16150ee12df247841a5437951ea0f9d632ca165e6ab391532e75e701be6a1caa88c8a6bcca3511f55b4183");
+		let is_valid = ext_sr_verify(&signature, message, &public);
+
+		assert!(is_valid);
+	}
+
+	#[test]
+	fn can_verify_known_wrapped_message_fail() {
+		let message = b"message to sign";
+		let public = hex!("f84d048da2ddae2d9d8fd6763f469566e8817a26114f39408de15547f6d47805");
+		let signature = hex!("48ce2c90e08651adfc8ecef84e916f6d1bb51ebebd16150ee12df247841a5437951ea0f9d632ca165e6ab391532e75e701be6a1caa88c8a6bcca3511f55b4183");
+		let is_valid = ext_sr_verify(&signature, message, &public);
+
+		assert!(!is_valid);
+	}
+
 	#[test]
 	fn soft_derives_pair() {
 		let cc = hex!("0c666f6f00000000000000000000000000000000000000000000000000000000"); // foo

packages/wasm-crypto/src/rs/vrf.rs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Copyright 2019 Paritytech via https://github.com/paritytech/schnorrkel-js/

packages/wasm-crypto/src/types.ts

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 /* eslint-disable camelcase */

packages/wasm-crypto/test/alias-imports.cjs

@@ -1,8 +1,12 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-const rootIncl = ['@polkadot/wasm-crypto-asmjs', '@polkadot/wasm-crypto-wasm'];
-const detcIncl = rootIncl.map((p) => `${p}/packageInfo`);
+const rootIncl = ['@polkadot/wasm-crypto', '@polkadot/wasm-crypto-asmjs', '@polkadot/wasm-crypto-wasm'];
+const detcIncl = [
+  ...rootIncl.map((p) => `${p}/initOnlyAsm.cjs`),
+  ...rootIncl.map((p) => `${p}/initOnlyWasm.cjs`),
+  ...rootIncl.map((p) => `${p}/packageInfo.cjs`)
+];
 
 require('override-require')(
   (request) =>
@@ -10,6 +14,10 @@ require('override-require')(
     detcIncl.some((p) => request.endsWith(p)),
   (request) =>
     rootIncl.some((p) => request.endsWith(p))
-      ? require(`${rootIncl.find((p) => request.endsWith(p))}/build/data.cjs`)
-      : require(`${detcIncl.find((p) => request.endsWith(p)).replace('packageInfo', 'build/packageInfo.cjs')}`)
+      ? require(`${rootIncl.find((p) => request.endsWith(p))}/build/index.cjs`)
+      : require(`${detcIncl.find((p) => request.endsWith(p))
+        .replace('initOnlyAsm.cjs', 'build/initOnlyAsm.cjs')
+        .replace('initOnlyWasm.cjs', 'build/initOnlyWasm.cjs')
+        .replace('packageInfo.cjs', 'build/packageInfo.cjs')
+      }`)
 );

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

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const { assert, u8aToHex } = require('@polkadot/util');

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

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const crypto = require('crypto');

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

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const { assert, stringToU8a, u8aToHex } = require('@polkadot/util');

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

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const wasm = require('../../build/index.cjs');
@@ -10,19 +10,22 @@ const sr25519 = require('./sr25519.cjs');
 const vrf = require('./vrf.cjs');
 
 const tests = {
-  ...bip39,
-  ...ed25519,
-  ...hashing,
+  // We place secp256k1 first, this allows the interaction with it in the
+  // hashing (specifically scrypt) test not be an issue (ASM.js only)
+  // https://github.com/polkadot-js/wasm/issues/307
   ...secp256k1,
+  ...ed25519,
   ...sr25519,
-  ...vrf
+  ...vrf,
+  ...bip39,
+  ...hashing
 };
 
 function beforeAll () {
   return wasm.waitReady();
 }
 
-function runAll () {
+function runAll (name) {
   const failed = [];
   let count = 0;
 
@@ -38,23 +41,29 @@ function runAll () {
 
       console.timeEnd(name);
     } catch (error) {
+      console.error();
       console.error(error);
+
       failed.push(name);
     }
   });
 
   if (failed.length) {
-    throw new Error(`Failed: ${failed.length} of ${count}: ${failed.concat(', ')}`);
+    throw new Error(`\n*** ${name}: FAILED: ${failed.length} of ${count}: ${failed.join(', ')}`);
   }
 }
 
-function runUnassisted () {
-  beforeAll()
-    .then(() => runAll())
-    .then(() => process.exit(0))
-    .catch((error) => {
-      console.error(error);
+function runUnassisted (name) {
+  console.log(`\n*** ${name}: Running tests`);
 
+  beforeAll()
+    .then(() => runAll(name))
+    .then(() => {
+      console.log(`\n*** ${name}: All passed`);
+      process.exit(0);
+    })
+    .catch((error) => {
+      console.error(error.message, '\n');
       process.exit(-1);
     });
 }

packages/wasm-crypto/test/all/secp256k1.cjs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const { assert, hexToU8a, u8aToHex } = require('@polkadot/util');
@@ -21,7 +21,7 @@ function secp256k1Expand (wasm) {
   assert(result === '0x04b9dc646dd71118e5f7fda681ad9eca36eb3ee96f344f582fbe7b5bcdebb1307763fe926c273235fd979a134076d00fd1683cbd35868cb485d4a3a640e52184af', 'ERROR: secp256k1Expand does not match');
 }
 
-function secp256k1FromSeed (wasm) {
+function secp256k1FromSeed1 (wasm) {
   const seckey = '0x4380de832af797688026ce24f85204d508243f201650c1a134929e5458b7fbae';
   const result = u8aToHex(wasm.secp256k1FromSeed(hexToU8a(seckey)));
 
@@ -30,6 +30,28 @@ function secp256k1FromSeed (wasm) {
   assert(result === '0x4380de832af797688026ce24f85204d508243f201650c1a134929e5458b7fbae03fd8c74f795ced92064b86191cb2772b1e3a0947740aa0a5a6e379592471fd85b', 'ERROR: secp256k1FromSeed does not match');
 }
 
+function secp256k1FromSeed2 (wasm) {
+  // https://github.com/polkadot-js/wasm/issues/307
+  const seckey = new Uint8Array([
+    203, 109, 249, 222, 30, 252, 167, 163, 153, 138, 142,
+    173, 78, 2, 21, 157, 95, 169, 156, 62, 13, 79,
+    214, 67, 38, 103, 57, 11, 180, 114, 104, 84
+  ]);
+  const expected = u8aToHex(new Uint8Array([
+    203, 109, 249, 222, 30, 252, 167, 163, 153, 138, 142,
+    173, 78, 2, 21, 157, 95, 169, 156, 62, 13, 79,
+    214, 67, 38, 103, 57, 11, 180, 114, 104, 84, 2,
+    10, 16, 145, 52, 31, 229, 102, 75, 250, 23, 130,
+    213, 224, 71, 121, 104, 144, 104, 201, 22, 176, 76,
+    179, 101, 236, 49, 83, 117, 86, 132, 217, 161
+  ]));
+  const result = u8aToHex(wasm.secp256k1FromSeed(seckey));
+
+  console.log('\tRES', result);
+
+  assert(result === expected, 'ERROR: secp256k1FromSeed does not match');
+}
+
 function secp256k1Recover (wasm) {
   const sig = '0x7505f2880114da51b3f5d535f8687953c0ab9af4ab81e592eaebebf53b728d2b6dfd9b5bcd70fee412b1f31360e7c2774009305cb84fc50c1d0ff8034dfa5fff';
   const msg = '0xa30b64ce1eedf409c8afb801d72c05234e64849ea538c15dd3c8cf4ffcf166c9';
@@ -53,7 +75,8 @@ function secp256k1Sign (wasm) {
 module.exports = {
   secp256k1Compress,
   secp256k1Expand,
-  secp256k1FromSeed,
+  secp256k1FromSeed1,
+  secp256k1FromSeed2,
   secp256k1Recover,
   secp256k1Sign
 };

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

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const crypto = require('crypto');

packages/wasm-crypto/test/all/vrf.cjs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const crypto = require('crypto');

packages/wasm-crypto/test/asm.cjs

@@ -1,10 +1,9 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-global.WebAssembly = null;
-
 require('./alias-imports.cjs');
+require('@polkadot/wasm-crypto/initOnlyAsm.cjs');
 
 const { runUnassisted } = require('./all/index.cjs');
 
-runUnassisted();
+runUnassisted('ASM');

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

@@ -1,12 +1,10 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 /**
  * @jest-environment jsdom
  */
 
-// override-require in jest.config.js
-
 import { beforeAll, tests, wasm } from './all/index.cjs';
 
 describe('wasm-crypto', () => {

packages/wasm-crypto/test/wasm.cjs

@@ -1,8 +1,8 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 require('./alias-imports.cjs');
 
 const { runUnassisted } = require('./all/index.cjs');
 
-runUnassisted();
+runUnassisted('WASM');

packages/wasm-crypto/tsconfig.build.json

@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": [
+    { "path": "../wasm-crypto-asmjs/tsconfig.build.json" },
+    { "path": "../wasm-crypto-wasm/tsconfig.build.json" }
+  ]
+}

rollup.config.mjs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm-crypto authors & contributors
+// Copyright 2019-2022 @polkadot/wasm-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 import { createBundle } from '@polkadot/dev/config/rollup';

scripts/build-js.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 

scripts/build-wasm.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 
@@ -26,7 +26,7 @@ echo "*** Converting to WASM"
 
 # optimise
 echo "*** Optimising WASM output"
-../binaryen/bin/wasm-opt $WSM -Os -o $OPT
+../binaryen/bin/wasm-opt $WSM -Oz -o $OPT
 
 # convert wasm to base64 structure
 echo "*** Packing WASM into baseX"
@@ -34,14 +34,12 @@ node ../scripts/pack-wasm-base.cjs
 
 # build asmjs version from the input (optimised) WASM
 echo "*** Building asm.js version"
-../binaryen/bin/wasm2js --output $ASM $OPT
+../binaryen/bin/wasm2js -Oz --output $ASM $OPT
 
 # cleanup the generated asm, converting to cjs
 sed -i -e '/import {/d' $ASM
-sed -i -e '/export var /d' $ASM
-sed -i -e 's/{abort.*},memasmFunc/wbg, memasmFunc/g' $ASM
-sed -i -e 's/var retasmFunc = /const asmJsInit = (wbg) => /' $ASM
-echo "module.exports = { asmJsInit };" >> $ASM
+sed -i -e '1,/var retasmFunc = /!d' $ASM
+sed -i -e 's/var retasmFunc = .*/const asmJsInit = (wbg) => asmFunc(wbg);\n\nmodule.exports = { asmJsInit };/g' $ASM
 
 # cleanups
 rm -rf wasm-crypto-asmjs/build/cjs/*-e

scripts/build.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 

scripts/clean-js.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 
@@ -7,4 +7,4 @@ set -e
 
 # cleanup old
 echo "*** Cleaning old builds"
-rm -rf packages/*/build packages/bytes
+rm -rf build packages/*/build packages/bytes

scripts/clean.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 

scripts/install-build-deps.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 
@@ -7,16 +7,17 @@ set -e
 
 source ./scripts/rust-version.sh
 
-BINARYEN_REPO=https://github.com/WebAssembly/binaryen
-BINARYEN_VER=version_97
-BINARYEN_ZIP=
-
+# NOTE If this is bumped, bump the version in Cargo.toml as well
 BINDGEN_REPO=https://github.com/rustwasm/wasm-bindgen
-BINDGEN_VER=0.2.65
+BINDGEN_VER=0.2.79
 BINDGEN_ZIP=
 
+BINARYEN_REPO=https://github.com/WebAssembly/binaryen
+BINARYEN_VER=version_105
+BINARYEN_ZIP=
+
 WABT_REPO=https://github.com/WebAssembly/wabt
-WABT_VER=1.0.19
+WABT_VER=1.0.27
 WABT_ZIP=
 
 unamestr=`uname`

scripts/pack-wasm-base.cjs

@@ -1,4 +1,4 @@
-// Copyright 2019-2021 @polkadot/wasm authors & contributors
+// Copyright 2019-2022 @polkadot/wasm authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 const fflate = require('fflate/node');
@@ -12,7 +12,7 @@ const compressed = Buffer.from(fflate.zlibSync(data, { level: 9 }));
 
 console.log(`*** Compressed WASM: ${formatNumber(data.length)} -> ${formatNumber(compressed.length)} (${(100 * compressed.length / data.length).toFixed(2)}%)`);
 
-fs.writeFileSync(`./${W_NAME}/build/cjs/bytes.js`, `// Copyright 2019-2021 @polkadot/${W_NAME} authors & contributors
+fs.writeFileSync(`./${W_NAME}/build/cjs/bytes.js`, `// Copyright 2019-2022 @polkadot/${W_NAME} authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
 // Generated as part of the build, do not edit

scripts/rust-version.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-# Copyright 2019-2021 @polkadot/wasm authors & contributors
+# Copyright 2019-2022 @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.
 

tsconfig.base.json

@@ -0,0 +1,14 @@
+{
+  "extends": "@polkadot/dev/config/tsconfig.json",
+  "compilerOptions": {
+    "composite": true,
+    "paths": {
+      "@polkadot/wasm-crypto-asmjs/packageInfo": ["wasm-crypto-asmjs/src/packageInfo"],
+      "@polkadot/wasm-crypto-asmjs": ["wasm-crypto-asmjs/src"],
+      "@polkadot/wasm-crypto-wasm/packageInfo": ["wasm-crypto-wasm/src/packageInfo"],
+      "@polkadot/wasm-crypto-wasm": ["wasm-crypto-wasm/src"],
+      "@polkadot/wasm-crypto": ["wasm-crypto/src"]
+    },
+    "skipLibCheck": true
+  }
+ }

tsconfig.build.json

@@ -0,0 +1,11 @@
+{
+  "compilerOptions": {
+    "composite": true
+  },
+  "files": [],
+  "references": [
+    { "path": "./packages/wasm-crypto/tsconfig.build.json" },
+    { "path": "./packages/wasm-crypto-asmjs/tsconfig.build.json" },
+    { "path": "./packages/wasm-crypto-wasm/tsconfig.build.json" }
+  ]
+}

tsconfig.eslint.json

@@ -0,0 +1,15 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "./packages",
+    "composite": false
+  },
+  "include": [
+    "packages/**/src/**/*",
+    "packages/**/test/**/*",
+    "scripts/**/*"
+  ],
+  "exclude": [
+    "**/node_modules/**/*"
+  ]
+}

tsconfig.json

@@ -1,22 +1,13 @@
 {
-  "extends": "@polkadot/dev/config/tsconfig.json",
-  "exclude": [
-    "build/**/*",
-    "**/build/**/*"
-  ],
+  "extends": "./tsconfig.base.json",
   "compilerOptions": {
-    "baseUrl": ".",
-    "paths": {
-      "@polkadot/wasm-crypto-asmjs/packageInfo": [ "packages/wasm-crypto-asmjs/src/packageInfo" ],
-      "@polkadot/wasm-crypto-asmjs": [ "packages/wasm-crypto-asmjs/src/data" ],
-      "@polkadot/wasm-crypto-wasm/packageInfo": [ "packages/wasm-crypto-wasm/src/packageInfo" ],
-      "@polkadot/wasm-crypto-wasm": [ "packages/wasm-crypto-wasm/src/data" ],
-      "@polkadot/wasm-crypto": [ "packages/wasm-crypto/src" ]
-    },
-    "skipLibCheck": true,
-    "typeRoots": [
-      "./node_modules/@polkadot/ts",
-      "./node_modules/@types"
-    ]
-  }
+    "baseUrl": "./packages",
+    "composite": false
+  },
+  "include": [
+    "packages/**/src/**/*"
+  ],
+  "exclude": [
+    "**/node_modules/**/*"
+  ]
 }