[CI Skip] release/stable 8.0.2

skip-checks: true
Explicit inclusion (patch-package + bundled is problematic) (#1250 )
2021-11-26 09:58:36 +00:00 · 2021-11-26 11:53:45 +02:00 · 2021-11-26 09:32:49 +00:00 · 2021-11-26 11:29:09 +02:00 · 2021-11-26 08:51:49 +00:00 · 2021-11-26 10:47:29 +02:00
371 changed files with 11496 additions and 3412 deletions
@@ -17,4 +17,7 @@

 7.0.2
 7.0.3
-7.1.2
+7.1.2
+7.8.2
+7.9.2
+8.0.2
@@ -0,0 +1 @@
+packages/util-crypto/src/noble-hashes/lib/*.ts
@@ -2,7 +2,7 @@ name: 'Lock Threads'

 on:
  schedule:
-    - cron: '30 1/2 * * *'
+    - cron: '15 1 * * *'

 jobs:
  lock:
@@ -13,6 +13,7 @@ jobs:
        CI_LOG: 123
      run: |
        yarn install --immutable | grep -v 'YN0013'
+        yarn build
        yarn networks:crosscheck

    - name: issue
@@ -1,7 +1,7 @@
 name: 'Close stale issues and PRs'
 on:
  schedule:
-    - cron: '30 2/2 * * *'
+    - cron: '50 1 * * *'

 jobs:
  stale:
@@ -1,5 +1,108 @@
 # CHANGELOG

+## 8.0.2
+
+Changes:
+
+- Explicitly include BigInt patched versions
+
+
+## 8.0.1 Nov 26, 2021
+
+**Important** In the 8.0 version the hashing utilities have been consolidated around an optimized and audited version from `@noble/hashes`. As in the past the WASM hashing will be used by default if the environment is initialized.
+
+**Breaking change** The `schnorrkel*` functions have been renamed to `sr25519*`. Likewise the `ed25519` operations have been renamed from `nacl*` to `ed25519*`. Additionally the `{ed, sr, secp256k1}25519KeyPairFrom*` functions have been renamed to `{ed, sr, secp256k1}25519PairFrom*`.
+
+Changes:
+
+- Introduce `ed25519*` & `sr25519*` functions
+- Replace camelcase dep with simplified/optimized version
+- Replace (most) hashing operations with `@noble/hashes`
+- Replace JS fallback for `xxhash`
+- Adjust `BigInt` utility exports (with capability detection)
+- Previously added `bi*` functions renamed to `n*`
+- Extend performance tests with implementation compares
+- Remove non-significant Node Buffer concat fill
+
+
+## 7.9.2 Nov 22, 2021
+
+Changes:
+
+- Fix TS compiled definitions for `base*` types
+- Provide JS/Wasm interfaces for `hmacShaAsU8a`
+
+
+## 7.9.1 Nov 21, 2021
+
+Contributed:
+
+- Updated Polymesh genesisHash (Thanks to https://github.com/adamdossa)
+
+Changes:
+
+- Add strongly typed `object{Entries, Keys, Values}` utilities
+- Add `{hex, u8a}ToBigInt` utilities
+- Add `bi*` utilities for `bigint` operations (mirror of `bn*`)
+- Add `stringPascalCase` utility
+- Add `isCodec` to check for Codec-like structures
+- Add `has*` detection shortcuts (e.g. `hasWasm` or `hasBuffer`)
+- Add `sha256AsU8a` util (& replace use internally)
+- Optimize for `hexToU8a` and `u8aToHex` functions
+- Optimize `u8aEq` to use `DataView` for compares
+- Align `base{32, 58, 64}*` around (audited) `micro-base`
+- Space optimization for bip39 wordlists
+- Sync with upstream Substrate ss58 registry
+- Expand tests for uncovered functions
+
+
+## 7.8.2 Nov 7, 2021
+
+Changes:
+
+- Expose internal `isArray` check
+- Move `object{Property, Properties}` from api repo
+
+
+## 7.8.1 Nov 6, 2021
+
+Contributed:
+
+- Added Acala genesisHash (Thanks to https://github.com/qwer951123)
+
+Changes:
+
+- Add `objectClear` and `objectSpread` utility functions
+- Add `lazyMethod` & `lazyMethods` utility functions
+- Sync with upstream Substrate ss58 registry
+
+
+## 7.7.1 Oct 31, 2021
+
+Contributed:
+
+- Add Genshiro support (Thanks to https://github.com/Overseven)
+
+Changes:
+
+- Add `arrayZip` to combine a key + value array into entries-like
+- Assert `chainCode` inputs to `derive*`, protecting against misuse
+- Adjust testnet detection in `@polkadot/networks`
+- Adjust base library usage of `for` vs `reduce/map`
+- Bump Ledger libraries to latest versions
+
+
+## 7.6.1 Oct 23, 2021
+
+Changes:
+
+- Update `xxhash*` to only use `Uint8Array` internally, no `Buffer`
+- Adjust `isAscii` to check against original string codepoints (when provided)
+- Adjust networks to sync with `paritytech/ss58-registry`
+- Dedupe internal sr25519/ed25519 derivation functions
+- Bump Ledger libraries to latest versions
+
+
 ## 7.5.1 Oct 16, 2021

 Contributed:
@@ -23,6 +126,7 @@ Changes:
 - Adjust `isHex` return to `0x${string}` under TypeScript
 - Adjust shared repo Jest config
 - Sync with upstream Substrate ss58 registry
+- Cleanup rollup build where `x-global` yields undefined


 ## 7.3.1 Aug 28, 2021
@@ -1,34 +1,39 @@
 {
-  "repository": "https://github.com/polkadot-js/common",
  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/common/issues",
+  "homepage": "https://github.com/polkadot-js/common#readme",
  "license": "Apache-2",
+  "packageManager": "yarn@3.0.1",
  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
+  "sideEffects": false,
+  "version": "8.0.2",
  "workspaces": [
    "packages/*"
  ],
-  "resolutions": {
-    "typescript": "^4.4.4"
-  },
  "scripts": {
    "build": "polkadot-dev-build-ts",
    "build:release": "polkadot-ci-ghact-build",
    "build:rollup": "polkadot-exec-rollup --config",
-    "lint": "polkadot-dev-run-lint",
    "clean": "polkadot-dev-clean-build",
+    "lint": "polkadot-dev-run-lint",
    "networks:crosscheck": "polkadot-dev-run-test packages/networks/src/crosscheck",
-    "networks:sync": "node packages/networks/scripts/fromSubstrate.mjs",
+    "networks:sync": "yarn build && node packages/networks/scripts/fromSubstrate.mjs",
    "postinstall": "polkadot-dev-yarn-only",
    "test": "polkadot-dev-run-test --coverage --runInBand --testPathIgnorePatterns crosscheck --testPathIgnorePatterns toMiniSecretCmp",
    "test:mnemonicCmp": "polkadot-dev-run-test packages/util-crypto/src/mnemonic/toMiniSecretCmp.spec.ts",
    "test:one": "polkadot-dev-run-test --runInBand"
  },
  "devDependencies": {
-    "@babel/core": "^7.15.8",
-    "@polkadot/dev": "^0.62.71",
-    "@polkadot/ts": "^0.4.9",
-    "@types/ed2curve": "^0.2.2",
-    "@types/jest": "^27.0.2"
+    "@babel/core": "^7.16.0",
+    "@polkadot/dev": "^0.63.33",
+    "@polkadot/ts": "^0.4.15",
+    "@types/jest": "^27.0.3"
  },
-  "version": "7.5.1",
-  "packageManager": "yarn@3.0.1"
+  "resolutions": {
+    "typescript": "^4.5.2"
+  }
 }
@@ -1,26 +1,32 @@
 {
-  "name": "@polkadot/hw-ledger-transports",
-  "version": "7.5.1",
-  "type": "module",
-  "repository": "github:polkadot-js/common",
  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [],
+  "bugs": "https://github.com/polkadot-js/common/issues",
  "contributors": [],
-  "license": "Apache-2.0",
-  "main": "node.js",
-  "browser": "browser.js",
-  "react-native": "react-native.js",
-  "sideEffects": false,
  "engines": {
    "node": ">=14.0.0"
  },
+  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/hw-ledger-transports#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
+  "name": "@polkadot/hw-ledger-transports",
+  "repository": {
+    "directory": "packages/hw-ledger-transports",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
+  "sideEffects": false,
+  "type": "module",
+  "version": "8.0.2",
+  "browser": "browser.js",
+  "main": "node.js",
+  "react-native": "react-native.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@ledgerhq/hw-transport": "^6.7.0",
-    "@ledgerhq/hw-transport-webhid": "^6.7.0",
-    "@ledgerhq/hw-transport-webusb": "^6.7.0"
+    "@babel/runtime": "^7.16.3",
+    "@ledgerhq/hw-transport": "^6.11.2",
+    "@ledgerhq/hw-transport-webhid": "^6.11.2",
+    "@ledgerhq/hw-transport-webusb": "^6.11.2"
  },
  "optionalDependencies": {
-    "@ledgerhq/hw-transport-node-hid-singleton": "^6.7.0"
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.11.2"
  }
 }
@@ -10,13 +10,6 @@ import LedgerWebUsb from '@ledgerhq/hw-transport-webusb';
 export { packageInfo } from './packageInfo';

 export const transports: TransportDef[] = [
-  // deprecated
-  // import LedgerU2F from '@ledgerhq/hw-transport-u2f';
-  // {
-  //   create: (): Promise<Transport> =>
-  //     LedgerU2F.create(),
-  //   type: 'u2f'
-  // },
  {
    create: (): Promise<Transport> =>
      LedgerWebUsb.create(),
@@ -3,4 +3,4 @@

 // Auto-generated by @polkadot/dev, do not edit

-export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '7.5.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '8.0.2' };
@@ -1,24 +1,30 @@
 {
-  "name": "@polkadot/hw-ledger",
-  "version": "7.5.1",
-  "type": "module",
-  "repository": "github:polkadot-js/common",
  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [],
+  "bugs": "https://github.com/polkadot-js/common/issues",
  "contributors": [],
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/hw-ledger#readme",
  "license": "Apache-2.0",
-  "main": "index.js",
+  "maintainers": [],
+  "name": "@polkadot/hw-ledger",
+  "repository": {
+    "directory": "packages/hw-ledger",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
  "sideEffects": [
    "./detectPackage.js",
    "./detectPackage.cjs"
  ],
-  "engines": {
-    "node": ">=14.0.0"
-  },
+  "type": "module",
+  "version": "8.0.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/hw-ledger-transports": "7.5.1",
-    "@polkadot/util": "7.5.1",
+    "@babel/runtime": "^7.16.3",
+    "@polkadot/hw-ledger-transports": "8.0.2",
+    "@polkadot/util": "8.0.2",
    "@zondax/ledger-substrate": "^0.18.0"
  }
 }
@@ -4,7 +4,7 @@
 import type Transport from '@ledgerhq/hw-transport';
 import type { SubstrateApp } from '@zondax/ledger-substrate';

-import { newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newKusamaApp, newNodleApp, newPolkadotApp, newPolymeshApp, newStatemineApp } from '@zondax/ledger-substrate';
+import { newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newGenshiroApp, newKusamaApp, newNodleApp, newPolkadotApp, newPolymeshApp, newStatemineApp } from '@zondax/ledger-substrate';

 // These match up with the keys of the knownLedger object in the @polkadot/networks/defaults.ts
 export const ledgerApps: Record<string, (transport: Transport) => SubstrateApp> = {
@@ -12,6 +12,7 @@ export const ledgerApps: Record<string, (transport: Transport) => SubstrateApp>
  'dock-mainnet': newDockApp,
  edgeware: newEdgewareApp,
  equilibrium: newEquilibriumApp,
+  genshiro: newGenshiroApp,
  kusama: newKusamaApp,
  'nodle-chain': newNodleApp,
  polkadot: newPolkadotApp,
@@ -3,4 +3,4 @@

 // Auto-generated by @polkadot/dev, do not edit

-export const packageInfo = { name: '@polkadot/hw-ledger', version: '7.5.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger', version: '8.0.2' };
@@ -1,6 +1,8 @@
 // Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { HexString } from '@polkadot/util/types';
+
 export type LedgerTypes = 'hid' | 'u2f' | 'webusb';

 export interface AccountOptions {
@@ -15,7 +17,7 @@ export interface LedgerAddress {
 }

 export interface LedgerSignature {
-  signature: string;
+  signature: HexString;
 }

 export interface LedgerVersion {
@@ -1,30 +1,34 @@
 {
-  "name": "@polkadot/keyring",
-  "version": "7.5.1",
-  "type": "module",
-  "description": "Keyring management",
  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [],
+  "bugs": "https://github.com/polkadot-js/common/issues",
  "contributors": [],
+  "description": "Keyring management",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/keyring#readme",
  "license": "Apache-2.0",
-  "main": "index.js",
+  "maintainers": [],
+  "name": "@polkadot/keyring",
+  "repository": {
+    "directory": "packages/keyring",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
  "sideEffects": [
    "./detectPackage.js",
    "./detectPackage.cjs"
  ],
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "repository": "github:polkadot-js/common",
-  "bugs": "https://github.com/polkadot-js/common/issues",
-  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/keyring#readme",
+  "type": "module",
+  "version": "8.0.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/util": "7.5.1",
-    "@polkadot/util-crypto": "7.5.1"
+    "@babel/runtime": "^7.16.3",
+    "@polkadot/util": "8.0.2",
+    "@polkadot/util-crypto": "8.0.2"
  },
  "peerDependencies": {
-    "@polkadot/util": "7.5.1",
-    "@polkadot/util-crypto": "7.5.1"
+    "@polkadot/util": "8.0.2",
+    "@polkadot/util-crypto": "8.0.2"
  }
 }
@@ -74,7 +74,7 @@ describe('keypair', (): void => {
    it('allows adding from JSON', (): void => {
      expect(
        keyring.addFromJson(
-          JSON.parse('{"address":"5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaQua","encoded":"0xb4a14995d25ab609f3686e9fa45f1fb237cd833f33f00d4b12c51858ca070d96972e47d73aae5eeb0fc06f923826cf0943fdb02c2c2ee30ef52a7912663053940d1da4da66b3a3f520ae07422c1c94b2d95690fca9d1f4a997623bb2923a8833280e19e7f72c3c5cfa343974e60e2b3dc53b404fdaf330756daad5e4e3","encoding":{"content":"pkcs8","type":"xsalsa20-poly1305","version":"0"},"meta":{"isTesting":true,"name":"alice"}}')
+          JSON.parse('{"address":"5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaQua","encoded":"0xb4a14995d25ab609f3686e9fa45f1fb237cd833f33f00d4b12c51858ca070d96972e47d73aae5eeb0fc06f923826cf0943fdb02c2c2ee30ef52a7912663053940d1da4da66b3a3f520ae07422c1c94b2d95690fca9d1f4a997623bb2923a8833280e19e7f72c3c5cfa343974e60e2b3dc53b404fdaf330756daad5e4e3","encoding":{"content":"pkcs8","type":"xsalsa20-poly1305","version":"0"},"meta":{"isTesting":true,"name":"alice"}}') as KeyringPair$Json
        ).publicKey
      ).toEqual(
        new Uint8Array([209, 114, 167, 76, 218, 76, 134, 89, 18, 195, 43, 160, 168, 10, 87, 174, 105, 171, 174, 65, 14, 92, 203, 89, 222, 232, 78, 47, 68, 50, 219, 79])
@@ -172,7 +172,7 @@ describe('keypair', (): void => {
    it('allows adding from JSON', (): void => {
      expect(
        keyring.addFromJson(
-          JSON.parse('{"address":"5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaQua","encoded":"0xb4a14995d25ab609f3686e9fa45f1fb237cd833f33f00d4b12c51858ca070d96972e47d73aae5eeb0fc06f923826cf0943fdb02c2c2ee30ef52a7912663053940d1da4da66b3a3f520ae07422c1c94b2d95690fca9d1f4a997623bb2923a8833280e19e7f72c3c5cfa343974e60e2b3dc53b404fdaf330756daad5e4e3","encoding":{"content":"pkcs8","type":"xsalsa20-poly1305","version":"0"},"meta":{"isTesting":true,"name":"alice"}}')
+          JSON.parse('{"address":"5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaQua","encoded":"0xb4a14995d25ab609f3686e9fa45f1fb237cd833f33f00d4b12c51858ca070d96972e47d73aae5eeb0fc06f923826cf0943fdb02c2c2ee30ef52a7912663053940d1da4da66b3a3f520ae07422c1c94b2d95690fca9d1f4a997623bb2923a8833280e19e7f72c3c5cfa343974e60e2b3dc53b404fdaf330756daad5e4e3","encoding":{"content":"pkcs8","type":"xsalsa20-poly1305","version":"0"},"meta":{"isTesting":true,"name":"alice"}}') as KeyringPair$Json
        ).publicKey
      ).toEqual(
        new Uint8Array([209, 114, 167, 76, 218, 76, 134, 89, 18, 195, 43, 160, 168, 10, 87, 174, 105, 171, 174, 65, 14, 92, 203, 89, 222, 232, 78, 47, 68, 50, 219, 79])
@@ -251,7 +251,7 @@ describe('keypair', (): void => {
    it('allows adding from JSON', (): void => {
      expect(
        keyring.addFromJson(
-          JSON.parse('{"address":"5DzMsaYFhmpRdErWrP6K6PD7UXzYoeETToSBUrZSvxasqWRz","encoded":"0xa192d39b42bc1601bf61df31039a554228593fadf870bc837b658a5114627aca199fff596260c95fe8994c66a47636cf0270aa08f402ba5541038753960d00e6c3af5e239ec58fb1eef3db7d6bc266f4853bdfe4ed17122d9092d879014d53980d2ee57f6f55a88c38836447d8645008e8815379626addc8f81f80cd49a2","encoding":{"content":"pkcs8","type":"xsalsa20-poly1305","version":"2"},"meta":{}}')
+          JSON.parse('{"address":"5DzMsaYFhmpRdErWrP6K6PD7UXzYoeETToSBUrZSvxasqWRz","encoded":"0xa192d39b42bc1601bf61df31039a554228593fadf870bc837b658a5114627aca199fff596260c95fe8994c66a47636cf0270aa08f402ba5541038753960d00e6c3af5e239ec58fb1eef3db7d6bc266f4853bdfe4ed17122d9092d879014d53980d2ee57f6f55a88c38836447d8645008e8815379626addc8f81f80cd49a2","encoding":{"content":"pkcs8","type":"xsalsa20-poly1305","version":"2"},"meta":{}}') as KeyringPair$Json
        ).address
      ).toEqual('5DzMsaYFhmpRdErWrP6K6PD7UXzYoeETToSBUrZSvxasqWRz');
    });
@@ -259,7 +259,7 @@ describe('keypair', (): void => {
    it('allows creation from JSON', (): void => {
      keyring.setSS58Format(2);
      const pair = keyring.createFromJson(
-        JSON.parse('{"address":"0x02fde629668eb2bcc7d748f40a7e597f7c7b363498ff3db31f03ce4854937883ad","encoded":"qIhAhKqtf2iyEoWEr8nmBdksSI8EHHCpgJHToqd6Pl8AgAAAAQAAAAgAAADDZ//fj/BRRj+0+bl1KAlYgoPJp6nEUwiw0fVqO2BW4mjEgQ+iWwJEgDf1JUtecbzOlfhTXBzqX/dIYzLgUADrF4EFEPpboCWiU1iN7W/3DM1cOTRVvTGcbdIqW//z3axhz961qzeJVUIFgllwGe/euLUPIlKbIkiN/CsRYdQ=","encoding":{"content":["pkcs8","ecdsa"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{"genesisHash":"0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe","name":"ecdsa","tags":[],"whenCreated":1600925898271}}')
+        JSON.parse('{"address":"0x02fde629668eb2bcc7d748f40a7e597f7c7b363498ff3db31f03ce4854937883ad","encoded":"qIhAhKqtf2iyEoWEr8nmBdksSI8EHHCpgJHToqd6Pl8AgAAAAQAAAAgAAADDZ//fj/BRRj+0+bl1KAlYgoPJp6nEUwiw0fVqO2BW4mjEgQ+iWwJEgDf1JUtecbzOlfhTXBzqX/dIYzLgUADrF4EFEPpboCWiU1iN7W/3DM1cOTRVvTGcbdIqW//z3axhz961qzeJVUIFgllwGe/euLUPIlKbIkiN/CsRYdQ=","encoding":{"content":["pkcs8","ecdsa"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{"genesisHash":"0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe","name":"ecdsa","tags":[],"whenCreated":1600925898271}}') as KeyringPair$Json
      );

      expect(pair.address).toEqual('DHL8HKFuTTR55JzzLmkJRCAfPBbuevKaT9cXikxbEV97Ko8');
@@ -268,7 +268,7 @@ describe('keypair', (): void => {

    it('fails toJson() when password is incorrect', (): void => {
      const pair = keyring.createFromJson(
-        JSON.parse('{"address":"0x02fde629668eb2bcc7d748f40a7e597f7c7b363498ff3db31f03ce4854937883ad","encoded":"qIhAhKqtf2iyEoWEr8nmBdksSI8EHHCpgJHToqd6Pl8AgAAAAQAAAAgAAADDZ//fj/BRRj+0+bl1KAlYgoPJp6nEUwiw0fVqO2BW4mjEgQ+iWwJEgDf1JUtecbzOlfhTXBzqX/dIYzLgUADrF4EFEPpboCWiU1iN7W/3DM1cOTRVvTGcbdIqW//z3axhz961qzeJVUIFgllwGe/euLUPIlKbIkiN/CsRYdQ=","encoding":{"content":["pkcs8","ecdsa"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{"genesisHash":"0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe","name":"ecdsa","tags":[],"whenCreated":1600925898271}}')
+        JSON.parse('{"address":"0x02fde629668eb2bcc7d748f40a7e597f7c7b363498ff3db31f03ce4854937883ad","encoded":"qIhAhKqtf2iyEoWEr8nmBdksSI8EHHCpgJHToqd6Pl8AgAAAAQAAAAgAAADDZ//fj/BRRj+0+bl1KAlYgoPJp6nEUwiw0fVqO2BW4mjEgQ+iWwJEgDf1JUtecbzOlfhTXBzqX/dIYzLgUADrF4EFEPpboCWiU1iN7W/3DM1cOTRVvTGcbdIqW//z3axhz961qzeJVUIFgllwGe/euLUPIlKbIkiN/CsRYdQ=","encoding":{"content":["pkcs8","ecdsa"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{"genesisHash":"0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe","name":"ecdsa","tags":[],"whenCreated":1600925898271}}') as KeyringPair$Json
      );

      expect(
@@ -278,7 +278,7 @@ describe('keypair', (): void => {

    it('pass toJson() when password is correct', (): void => {
      const pair = keyring.createFromJson(
-        JSON.parse('{"address":"0x02fde629668eb2bcc7d748f40a7e597f7c7b363498ff3db31f03ce4854937883ad","encoded":"qIhAhKqtf2iyEoWEr8nmBdksSI8EHHCpgJHToqd6Pl8AgAAAAQAAAAgAAADDZ//fj/BRRj+0+bl1KAlYgoPJp6nEUwiw0fVqO2BW4mjEgQ+iWwJEgDf1JUtecbzOlfhTXBzqX/dIYzLgUADrF4EFEPpboCWiU1iN7W/3DM1cOTRVvTGcbdIqW//z3axhz961qzeJVUIFgllwGe/euLUPIlKbIkiN/CsRYdQ=","encoding":{"content":["pkcs8","ecdsa"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{"genesisHash":"0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe","name":"ecdsa","tags":[],"whenCreated":1600925898271}}')
+        JSON.parse('{"address":"0x02fde629668eb2bcc7d748f40a7e597f7c7b363498ff3db31f03ce4854937883ad","encoded":"qIhAhKqtf2iyEoWEr8nmBdksSI8EHHCpgJHToqd6Pl8AgAAAAQAAAAgAAADDZ//fj/BRRj+0+bl1KAlYgoPJp6nEUwiw0fVqO2BW4mjEgQ+iWwJEgDf1JUtecbzOlfhTXBzqX/dIYzLgUADrF4EFEPpboCWiU1iN7W/3DM1cOTRVvTGcbdIqW//z3axhz961qzeJVUIFgllwGe/euLUPIlKbIkiN/CsRYdQ=","encoding":{"content":["pkcs8","ecdsa"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{"genesisHash":"0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe","name":"ecdsa","tags":[],"whenCreated":1600925898271}}') as KeyringPair$Json
      );

      expect(
@@ -405,7 +405,7 @@ describe('keypair', (): void => {

    it('allows adding from JSON', (): void => {
      const pair = keyring.addFromJson(
-        JSON.parse('{"address":"KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou","encoded":"U8qFEaghhmNV2PgFhjqzmhyUy37Ok7abfFU2MNsBd0sAgAAAAQAAAAgAAAA3+NniKogzNphiMNueB1X0sGA07B6CaXWfpXPx45iSXoTTprwzU5mOoSqUWO0GKHROI72LN+uJ8Yfv6Ll6JOOV3VPKfoVoFmYm+zDrrMPa0gk5E5kUuSijxADcE6zUrliPVr0Ix/qaghu5SJ7RtWDQLBf4Hp86SJ8Gg6gTSSk=","encoding":{"content":["pkcs8","ethereum"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{}}')
+        JSON.parse('{"address":"KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou","encoded":"U8qFEaghhmNV2PgFhjqzmhyUy37Ok7abfFU2MNsBd0sAgAAAAQAAAAgAAAA3+NniKogzNphiMNueB1X0sGA07B6CaXWfpXPx45iSXoTTprwzU5mOoSqUWO0GKHROI72LN+uJ8Yfv6Ll6JOOV3VPKfoVoFmYm+zDrrMPa0gk5E5kUuSijxADcE6zUrliPVr0Ix/qaghu5SJ7RtWDQLBf4Hp86SJ8Gg6gTSSk=","encoding":{"content":["pkcs8","ethereum"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{}}') as KeyringPair$Json
      );

      expect(pair.publicKey).toEqual(hexToU8a('0x03b9dc646dd71118e5f7fda681ad9eca36eb3ee96f344f582fbe7b5bcdebb13077'));
@@ -422,7 +422,7 @@ describe('keypair', (): void => {
      const MESSAGE = stringToU8a('just some test message');
      const signer = keyring.createFromUri(PHRASE);
      const verifier = keyring.addFromJson(
-        JSON.parse('{"address":"KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou","encoded":"U8qFEaghhmNV2PgFhjqzmhyUy37Ok7abfFU2MNsBd0sAgAAAAQAAAAgAAAA3+NniKogzNphiMNueB1X0sGA07B6CaXWfpXPx45iSXoTTprwzU5mOoSqUWO0GKHROI72LN+uJ8Yfv6Ll6JOOV3VPKfoVoFmYm+zDrrMPa0gk5E5kUuSijxADcE6zUrliPVr0Ix/qaghu5SJ7RtWDQLBf4Hp86SJ8Gg6gTSSk=","encoding":{"content":["pkcs8","ethereum"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{}}')
+        JSON.parse('{"address":"KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou","encoded":"U8qFEaghhmNV2PgFhjqzmhyUy37Ok7abfFU2MNsBd0sAgAAAAQAAAAgAAAA3+NniKogzNphiMNueB1X0sGA07B6CaXWfpXPx45iSXoTTprwzU5mOoSqUWO0GKHROI72LN+uJ8Yfv6Ll6JOOV3VPKfoVoFmYm+zDrrMPa0gk5E5kUuSijxADcE6zUrliPVr0Ix/qaghu5SJ7RtWDQLBf4Hp86SJ8Gg6gTSSk=","encoding":{"content":["pkcs8","ethereum"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{}}') as KeyringPair$Json
      );

      const signature = signer.sign(MESSAGE);
@@ -439,7 +439,7 @@ describe('keypair', (): void => {
      const MESSAGE = stringToU8a('just some test message');
      const signer = keyring.createFromUri(PHRASE);
      const verifier = keyring.addFromJson(
-        JSON.parse('{"address":"KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou","encoded":"U8qFEaghhmNV2PgFhjqzmhyUy37Ok7abfFU2MNsBd0sAgAAAAQAAAAgAAAA3+NniKogzNphiMNueB1X0sGA07B6CaXWfpXPx45iSXoTTprwzU5mOoSqUWO0GKHROI72LN+uJ8Yfv6Ll6JOOV3VPKfoVoFmYm+zDrrMPa0gk5E5kUuSijxADcE6zUrliPVr0Ix/qaghu5SJ7RtWDQLBf4Hp86SJ8Gg6gTSSk=","encoding":{"content":["pkcs8","ethereum"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{}}')
+        JSON.parse('{"address":"KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou","encoded":"U8qFEaghhmNV2PgFhjqzmhyUy37Ok7abfFU2MNsBd0sAgAAAAQAAAAgAAAA3+NniKogzNphiMNueB1X0sGA07B6CaXWfpXPx45iSXoTTprwzU5mOoSqUWO0GKHROI72LN+uJ8Yfv6Ll6JOOV3VPKfoVoFmYm+zDrrMPa0gk5E5kUuSijxADcE6zUrliPVr0Ix/qaghu5SJ7RtWDQLBf4Hp86SJ8Gg6gTSSk=","encoding":{"content":["pkcs8","ethereum"],"type":["scrypt","xsalsa20-poly1305"],"version":"3"},"meta":{}}') as KeyringPair$Json
      );

      const signature = signer.sign(MESSAGE, { withType: true });
@@ -508,7 +508,7 @@ describe('keypair', (): void => {
    });

    it('can decode from a version 2 JSON file', (): void => {
-      const pair = keyring.addFromJson(JSON.parse(PAIR));
+      const pair = keyring.addFromJson(JSON.parse(PAIR) as KeyringPair$Json);

      pair.decodePkcs8(PASS2);

@@ -538,7 +538,7 @@ describe('keypair', (): void => {
    });

    it('can decode from a version 3 JSON file', (): void => {
-      const pair = keyring.addFromJson(JSON.parse(PAIR));
+      const pair = keyring.addFromJson(JSON.parse(PAIR) as KeyringPair$Json);

      pair.decodePkcs8(PASS3);

@@ -557,7 +557,7 @@ describe('keypair', (): void => {
    });

    it('can decode from a version 3 JSON file', (): void => {
-      const pair = keyring.addFromJson(JSON.parse(PAIR));
+      const pair = keyring.addFromJson(JSON.parse(PAIR) as KeyringPair$Json);

      pair.decodePkcs8(PASS3);

@@ -5,19 +5,23 @@ import type { EncryptedJsonEncoding, Keypair, KeypairType } from '@polkadot/util
 import type { KeyringInstance, KeyringOptions, KeyringPair, KeyringPair$Json, KeyringPair$Meta } from './types';

 import { assert, hexToU8a, isHex, isUndefined, stringToU8a } from '@polkadot/util';
-import { base64Decode, decodeAddress, encodeAddress, ethereumEncode, hdEthereum, keyExtractSuri, keyFromPath, mnemonicToLegacySeed, mnemonicToMiniSecret, naclKeypairFromSeed as naclFromSeed, schnorrkelKeypairFromSeed as schnorrkelFromSeed, secp256k1KeypairFromSeed as secp256k1FromSeed } from '@polkadot/util-crypto';
+import { base64Decode, decodeAddress, ed25519PairFromSeed as ed25519FromSeed, encodeAddress, ethereumEncode, hdEthereum, keyExtractSuri, keyFromPath, mnemonicToLegacySeed, mnemonicToMiniSecret, secp256k1PairFromSeed as secp256k1FromSeed, sr25519PairFromSeed as sr25519FromSeed } from '@polkadot/util-crypto';

 import { DEV_PHRASE } from './defaults';
 import { createPair } from './pair';
 import { Pairs } from './pairs';

-const keypairFromSeed = {
+const PairFromSeed = {
  ecdsa: (seed: Uint8Array): Keypair => secp256k1FromSeed(seed),
-  ed25519: (seed: Uint8Array): Keypair => naclFromSeed(seed),
+  ed25519: (seed: Uint8Array): Keypair => ed25519FromSeed(seed),
  ethereum: (seed: Uint8Array): Keypair => secp256k1FromSeed(seed),
-  sr25519: (seed: Uint8Array): Keypair => schnorrkelFromSeed(seed)
+  sr25519: (seed: Uint8Array): Keypair => sr25519FromSeed(seed)
 };

+function pairToPublic ({ publicKey }: KeyringPair): Uint8Array {
+  return publicKey;
+}
+
 /**
 * # @polkadot/keyring
 *
@@ -138,7 +142,7 @@ export class Keyring implements KeyringInstance {
   */
  public addFromSeed (seed: Uint8Array, meta: KeyringPair$Meta = {}, type: KeypairType = this.type): KeyringPair {
    return this.addPair(
-      createPair({ toSS58: this.encodeAddress, type }, keypairFromSeed[type](seed), meta, null)
+      createPair({ toSS58: this.encodeAddress, type }, PairFromSeed[type](seed), meta, null)
    );
  }

@@ -220,9 +224,9 @@ export class Keyring implements KeyringInstance {

    const derived = type === 'ethereum'
      ? isPhraseHex
-        ? keypairFromSeed[type](seed) // for eth, if the private key is provided as suri, it must be derived only once
+        ? PairFromSeed[type](seed) // for eth, if the private key is provided as suri, it must be derived only once
        : hdEthereum(seed, derivePath.substring(1))
-      : keyFromPath(keypairFromSeed[type](seed), path, type);
+      : keyFromPath(PairFromSeed[type](seed), path, type);

    return createPair({ toSS58: this.encodeAddress, type }, derived, meta, null);
  }
@@ -235,7 +239,7 @@ export class Keyring implements KeyringInstance {
    return this.type === 'ethereum'
      ? ethereumEncode(address)
      : encodeAddress(address, isUndefined(ss58Format) ? this.#ss58 : ss58Format);
-  }
+  };

  /**
   * @name getPair
@@ -262,11 +266,7 @@ export class Keyring implements KeyringInstance {
   * @description Returns an array list of all the public keys associated with each of the keyring pair values that are stored in the keyring pair dictionary.
   */
  public getPublicKeys (): Uint8Array[] {
-    return this.#pairs
-      .all()
-      .map(({ publicKey }): Uint8Array =>
-        publicKey
-      );
+    return this.#pairs.all().map(pairToPublic);
  }

  /**
@@ -3,4 +3,4 @@

 // Auto-generated by @polkadot/dev, do not edit

-export const packageInfo = { name: '@polkadot/keyring', version: '7.5.1' };
+export const packageInfo = { name: '@polkadot/keyring', version: '8.0.2' };
@@ -6,8 +6,8 @@ import type { EncryptedJsonEncoding, Keypair, KeypairType } from '@polkadot/util
 import type { KeyringPair, KeyringPair$Json, KeyringPair$Meta, SignOptions } from '../types';
 import type { PairInfo } from './types';

-import { assert, u8aConcat, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
-import { blake2AsU8a, convertPublicKeyToCurve25519, convertSecretKeyToCurve25519, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclKeypairFromSeed as naclFromSeed, naclOpen, naclSeal, naclSign, schnorrkelKeypairFromSeed as schnorrkelFromSeed, schnorrkelSign, schnorrkelVrfSign, schnorrkelVrfVerify, secp256k1Compress, secp256k1Expand, secp256k1KeypairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify } from '@polkadot/util-crypto';
+import { assert, objectSpread, u8aConcat, u8aEmpty, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { blake2AsU8a, convertPublicKeyToCurve25519, convertSecretKeyToCurve25519, ed25519PairFromSeed as ed25519FromSeed, ed25519Sign, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclOpen, naclSeal, secp256k1Compress, secp256k1Expand, secp256k1PairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify, sr25519PairFromSeed as sr25519FromSeed, sr25519Sign, sr25519VrfSign, sr25519VrfVerify } from '@polkadot/util-crypto';

 import { decodePair } from './decode';
 import { encodePair } from './encode';
@@ -22,9 +22,9 @@ const SIG_TYPE_NONE = new Uint8Array();

 const TYPE_FROM_SEED = {
  ecdsa: secp256k1FromSeed,
-  ed25519: naclFromSeed,
+  ed25519: ed25519FromSeed,
  ethereum: secp256k1FromSeed,
-  sr25519: schnorrkelFromSeed
+  sr25519: sr25519FromSeed
 };

 const TYPE_PREFIX = {
@@ -36,9 +36,9 @@ const TYPE_PREFIX = {

 const TYPE_SIGNATURE = {
  ecdsa: (m: Uint8Array, p: Partial<Keypair>) => secp256k1Sign(m, p, 'blake2'),
-  ed25519: naclSign,
+  ed25519: ed25519Sign,
  ethereum: (m: Uint8Array, p: Partial<Keypair>) => secp256k1Sign(m, p, 'keccak'),
-  sr25519: schnorrkelSign
+  sr25519: sr25519Sign
 };

 const TYPE_ADDRESS = {
@@ -48,9 +48,8 @@ const TYPE_ADDRESS = {
  sr25519: (p: Uint8Array) => p
 };

-// Not 100% correct, since it can be a Uint8Array, but an invalid one - just say "undefined" is anything non-valid
 function isLocked (secretKey?: Uint8Array): secretKey is undefined {
-  return !secretKey || secretKey.length === 0 || secretKey.every((b) => b === 0);
+  return !secretKey || u8aEmpty(secretKey);
 }

 function vrfHash (proof: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array {
@@ -182,7 +181,7 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
      secretKey = new Uint8Array();
    },
    setMeta: (additional: KeyringPair$Meta): void => {
-      meta = { ...meta, ...additional };
+      meta = objectSpread({}, meta, additional);
    },
    sign: (message: HexString | string | Uint8Array, options: SignOptions = {}): Uint8Array => {
      assert(!isLocked(secretKey), 'Cannot sign with a locked key pair');
@@ -216,7 +215,7 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
      assert(!isLocked(secretKey), 'Cannot sign with a locked key pair');

      if (type === 'sr25519') {
-        return schnorrkelVrfSign(message, { secretKey }, context, extra);
+        return sr25519VrfSign(message, { secretKey }, context, extra);
      }

      const proof = TYPE_SIGNATURE[type](u8aToU8a(message), { publicKey, secretKey });
@@ -225,7 +224,7 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
    },
    vrfVerify: (message: HexString | string | Uint8Array, vrfResult: Uint8Array, signerPublic: HexString | Uint8Array | string, context?: HexString | string | Uint8Array, extra?: HexString | string | Uint8Array): boolean => {
      if (type === 'sr25519') {
-        return schnorrkelVrfVerify(message, vrfResult, publicKey, context, extra);
+        return sr25519VrfVerify(message, vrfResult, publicKey, context, extra);
      }

      const result = signatureVerify(message, u8aConcat(TYPE_PREFIX[type], vrfResult.subarray(32)), TYPE_ADDRESS[type](u8aToU8a(signerPublic)));
@@ -4,6 +4,7 @@
 import type { KeypairType } from '@polkadot/util-crypto/types';
 import type { KeyringPair$Json, KeyringPair$Meta } from '../types';

+import { objectSpread } from '@polkadot/util';
 import { jsonEncryptFormat } from '@polkadot/util-crypto';

 interface PairStateJson {
@@ -12,9 +13,8 @@ interface PairStateJson {
 }

 export function pairToJson (type: KeypairType, { address, meta }: PairStateJson, encoded: Uint8Array, isEncrypted: boolean): KeyringPair$Json {
-  return {
-    ...jsonEncryptFormat(encoded, ['pkcs8', type], isEncrypted),
+  return objectSpread(jsonEncryptFormat(encoded, ['pkcs8', type], isEncrypted), {
    address,
    meta
-  };
+  });
 }
@@ -4,7 +4,7 @@
 import type { KeyringPair } from '../types';

 import { u8aToHex } from '@polkadot/util';
-import { cryptoWaitReady, encodeAddress as toSS58, naclKeypairFromSeed, randomAsU8a, schnorrkelKeypairFromSeed, secp256k1KeypairFromSeed } from '@polkadot/util-crypto';
+import { cryptoWaitReady, ed25519PairFromSeed, encodeAddress as toSS58, randomAsU8a, secp256k1PairFromSeed, sr25519PairFromSeed } from '@polkadot/util-crypto';

 import { createPair } from '.';

@@ -19,9 +19,9 @@ describe('vrf', (): void => {
  beforeAll(async (): Promise<void> => {
    await cryptoWaitReady();

-    ecdsa = createPair({ toSS58, type: 'ecdsa' }, secp256k1KeypairFromSeed(randomAsU8a()));
-    ed25519 = createPair({ toSS58, type: 'ed25519' }, naclKeypairFromSeed(randomAsU8a()));
-    sr25519 = createPair({ toSS58, type: 'sr25519' }, schnorrkelKeypairFromSeed(randomAsU8a()));
+    ecdsa = createPair({ toSS58, type: 'ecdsa' }, secp256k1PairFromSeed(randomAsU8a()));
+    ed25519 = createPair({ toSS58, type: 'ed25519' }, ed25519PairFromSeed(randomAsU8a()));
+    sr25519 = createPair({ toSS58, type: 'sr25519' }, sr25519PairFromSeed(randomAsU8a()));
  });

  it('has deterministic signature values for ecdsa', (): void => {
@@ -121,7 +121,7 @@ export function createTestKeyring (options: KeyringOptions = {}, isDerived = tru
  const keyring = new Keyring(options);
  const pairs: PairDef[] = (options.type && options.type === 'ethereum') ? PAIRSETHEREUM : PAIRSSR25519;

-  pairs.forEach(({ name, publicKey, secretKey, seed, type }): void => {
+  for (const { name, publicKey, secretKey, seed, type } of pairs) {
    if (!name && !seed) {
      throw new Error('Testing pair should have either a name or a seed');
    }
@@ -139,7 +139,7 @@ export function createTestKeyring (options: KeyringOptions = {}, isDerived = tru
    pair.lock = (): void => {
      // we don't have lock/unlock functionality here
    };
-  });
+  }

  return keyring;
 }
@@ -15,11 +15,9 @@ export function createTestPairs (options?: KeyringOptions, isDerived = true): Te
  const pairs = keyring.getPairs();
  const map: TestKeyringMap = { nobody: nobody() };

-  return pairs.reduce((result, pair): TestKeyringMap => {
-    const { name } = pair.meta;
+  for (const p of pairs) {
+    map[p.meta.name as string] = p;
+  }

-    result[name as string] = pair;
-
-    return result;
-  }, map);
+  return map;
 }
@@ -1,25 +1,29 @@
 {
-  "name": "@polkadot/networks",
-  "version": "7.5.1",
-  "type": "module",
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/common/issues",
+  "contributors": [],
  "description": "A list of all available Substrate networks and their applicable prefixes",
-  "main": "index.js",
-  "sideEffects": false,
  "engines": {
    "node": ">=14.0.0"
  },
-  "repository": "github:polkadot-js/common",
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [],
-  "contributors": [],
-  "license": "Apache-2.0",
-  "bugs": "https://github.com/polkadot-js/common/issues",
  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/networks#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
+  "name": "@polkadot/networks",
+  "repository": {
+    "directory": "packages/networks",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
+  "sideEffects": false,
+  "type": "module",
+  "version": "8.0.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4"
+    "@babel/runtime": "^7.16.3"
  },
  "devDependencies": {
-    "@polkadot/util": "7.5.1",
-    "@polkadot/x-fetch": "7.5.1"
+    "@polkadot/util": "8.0.2",
+    "@polkadot/x-fetch": "8.0.2"
  }
 }
@@ -4,7 +4,11 @@
 import fs from 'fs';
 import fetch from 'node-fetch';

-const SUBSTRATE_REGISTRY = 'https://raw.githubusercontent.com/paritytech/substrate/master/ss58-registry.json';
+import { substrateRegistry } from '../build/defaults.js';
+
+const substrateRegistryRepo = substrateRegistry
+  .replace('raw.githubusercontent.com', 'github.com')
+  .split('main')[0];

 function outputField (k, v) {
  if (typeof v === 'string') {
@@ -20,7 +24,7 @@ function outputField (k, v) {
 }

 async function getSubstrateRegistry () {
-  const original = await fetch(SUBSTRATE_REGISTRY);
+  const original = await fetch(substrateRegistry);
  const json = await original.json();

  return json.registry
@@ -39,11 +43,17 @@ getSubstrateRegistry()
    fs.writeFileSync('packages/networks/src/substrate.ts', `// Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+//
 // Auto-generated by yarn networks:sync (via scripts/fromSubstrate.mjs)
 //
-// Do not edit, rather
-//   - make a PR to the upstream registry as per ${SUBSTRATE_REGISTRY}
-//   - yarn networks:sync
+// This file should never be edited manually. Rather the process is as follow -
+//
+//   - make a PR to the upstream registry found at ${substrateRegistryRepo}
+//   - ensure the PR gets merged
+//   - yarn networks:sync in this repo to sync
+//
+// Any manual changes to this file will make CI cron checks fail and will be
+// lost when the registry is updated alongside the above sync.
 //

 import type { KnownSubstrate } from './types';
@@ -1,17 +1,17 @@
 // Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { KnownSubstrate, Ss58Registry } from './types';
+import type { Ss58Registry } from './types';

 import fs from 'fs';

-import { stringify } from '@polkadot/util';
+import { objectKeys, stringify } from '@polkadot/util';
 import { fetch } from '@polkadot/x-fetch';

+import { substrateRegistry } from './defaults';
 import { allNetworks } from './';

 const OUTPUT = './.github/ss58-check.md';
-const SUBSTRATE_REGISTRY = 'https://raw.githubusercontent.com/paritytech/substrate/master/ss58-registry.json';

 function assertAndLog (check: boolean, error: string): void {
  if (!check) {
@@ -28,7 +28,7 @@ describe('check latest Substrate ss58 registry', (): void => {
  let original: Ss58Registry;

  beforeAll(async (): Promise<void> => {
-    original = (await (await fetch(SUBSTRATE_REGISTRY)).json()) as Ss58Registry;
+    original = (await (await fetch(substrateRegistry)).json()) as Ss58Registry;
  });

  it('has the same number as the original', (): void => {
@@ -52,7 +52,7 @@ describe('check latest Substrate ss58 registry', (): void => {
  });

  it('has the same values as the original', (): void => {
-    const fields = Object.keys(original.schema) as (keyof KnownSubstrate)[];
+    const fields = objectKeys(original.schema);
    const errors = original.registry
      .map((n): [string, string[]] => {
        const other = allNetworks.find(({ prefix }) => prefix === n.prefix);
@@ -3,11 +3,16 @@

 import type { KnownGenesis, KnownIcon, KnownLedger, KnownTestnet } from './types';

+export const substrateRegistry = 'https://raw.githubusercontent.com/paritytech/ss58-registry/main/ss58-registry.json';
+
 // NOTE: In the case where the network was hard-spooned and multiple genesisHashes
 // are provided, it needs to be in reverse order, i.e. most-recent first, oldest
 // last. This make lookups for the current a simple genesisHash[0]
 // (See Kusama as an example)
 export const knownGenesis: KnownGenesis = {
+  acala: [
+    '0xfc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c'
+  ],
  bifrost: [
    '0x9f28c6a68e0fc9646eff64935684f6eeeece527e37bbe1f213d22caa1d9d6bed'
  ],
@@ -23,6 +28,9 @@ export const knownGenesis: KnownGenesis = {
  equilibrium: [
    '0x6f1a800de3daff7f5e037ddf66ab22ce03ab91874debeddb1086f5f7dbd48925'
  ],
+  genshiro: [
+    '0x9b8cefc0eb5c568b527998bdd76c184e2b76ae561be76e4667072230217ea243'
+  ],
  hydradx: [
    '0xd2a620c27ec5cbc5621ff9a522689895074f7cca0d08e7134a7804e1a3ba86fc', // Snakenet Gen3-1
    '0x10af6e84234477d84dc572bac0789813b254aa490767ed06fb9591191d1073f9', // Snakenet Gen3
@@ -50,7 +58,7 @@ export const knownGenesis: KnownGenesis = {
    '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'
  ],
  polymesh: [
-    '0x9deeb940c92ae02111c3bd5baca89970384f4c9849f02a1b2e53e66414d30f9f'
+    '0x6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063'
  ],
  stafi: [
    '0x290a4149f09ea0e402c74c1c7e96ae4239588577fe78932f94f5404c68243d80'
@@ -81,6 +89,7 @@ export const knownLedger: KnownLedger = {
  'dock-mainnet': 0x00000252,
  edgeware: 0x0000020b,
  equilibrium: 0x05f5e0fd,
+  genshiro: 0x05f5e0fc,
  kusama: 0x000001b2,
  'nodle-chain': 0x000003eb,
  polkadot: 0x00000162,
@@ -90,8 +99,11 @@ export const knownLedger: KnownLedger = {

 // testnets should not allow selection
 export const knownTestnet: KnownTestnet = {
+  '': true, // this is the default non-network entry
+  'cess-testnet': true,
  'dock-testnet': true,
  jupiter: true,
  'mathchain-testnet': true,
+  subspace_testnet: true,
  'zero-alphaville': true
 };
@@ -1,43 +1,64 @@
 // Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { Network, SubstrateNetwork } from './types';
+import type { KnownSubstrate, Network, SubstrateNetwork } from './types';

 import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
 import { knownSubstrate } from './substrate';

 // These are known prefixes that are not sorted
 const UNSORTED = [0, 2, 42];
+const TESTNETS = ['testnet'];

-export const allNetworks = knownSubstrate.map((o): SubstrateNetwork => {
+function toExpanded (o: KnownSubstrate): SubstrateNetwork {
  const network = o.network || '';
+  const nameParts = network.replace(/_/g, '-').split('-');
  const n = o as SubstrateNetwork;

+  // ledger additions
  n.slip44 = knownLedger[network];
  n.hasLedgerSupport = !!n.slip44;

+  // general items
  n.genesisHash = knownGenesis[network] || [];
  n.icon = knownIcon[network] || 'substrate';
-  n.isIgnored = !network || !!knownTestnet[network] || !o.standardAccount;
+
+  // filtering
+  n.isTestnet = !!knownTestnet[network] || TESTNETS.includes(nameParts[nameParts.length - 1]);
+  n.isIgnored = n.isTestnet || (!(o.standardAccount && o.decimals && o.symbols) && o.prefix !== 42);

  return n;
-});
+}
+
+function filterSelectable ({ genesisHash, prefix }: Network): boolean {
+  return !!genesisHash.length || prefix === 42;
+}
+
+function filterAvailable (n: SubstrateNetwork): n is Network {
+  return !n.isIgnored && !!n.network;
+}
+
+function sortNetworks (a: Network, b: Network): number {
+  const isUnSortedA = UNSORTED.includes(a.prefix);
+  const isUnSortedB = UNSORTED.includes(b.prefix);
+
+  return isUnSortedA === isUnSortedB
+    ? 0
+    : isUnSortedA
+      ? -1
+      : isUnSortedB
+        ? 1
+        : a.displayName.localeCompare(b.displayName);
+}
+
+// This is all the Substrate networks with our additional information
+export const allNetworks = knownSubstrate.map(toExpanded);

 // The list of available/claimed prefixes
 //   - no testnets
 //   - we only include those where we have a standardAccount
 //   - sort by name, however we keep 0, 2, 42 first in the list
-export const availableNetworks = allNetworks
-  .filter((n): n is Network => !n.isIgnored && !!n.network)
-  .sort((a, b) =>
-    UNSORTED.includes(a.prefix) === UNSORTED.includes(b.prefix)
-      ? 0
-      : UNSORTED.includes(a.prefix)
-        ? -1
-        : UNSORTED.includes(b.prefix)
-          ? 1
-          : a.displayName.localeCompare(b.displayName)
-  );
+export const availableNetworks = allNetworks.filter(filterAvailable).sort(sortNetworks);

 // A filtered list of those chains we have details about (genesisHashes)
-export const selectableNetworks = availableNetworks.filter((n) => n.genesisHash.length || n.prefix === 42);
+export const selectableNetworks = availableNetworks.filter(filterSelectable);
@@ -3,4 +3,4 @@

 // Auto-generated by @polkadot/dev, do not edit

-export const packageInfo = { name: '@polkadot/networks', version: '7.5.1' };
+export const packageInfo = { name: '@polkadot/networks', version: '8.0.2' };
@@ -1,11 +1,17 @@
 // Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+//
 // Auto-generated by yarn networks:sync (via scripts/fromSubstrate.mjs)
 //
-// Do not edit, rather
-//   - make a PR to the upstream registry as per https://raw.githubusercontent.com/paritytech/substrate/master/ss58-registry.json
-//   - yarn networks:sync
+// This file should never be edited manually. Rather the process is as follow -
+//
+//   - make a PR to the upstream registry found at https://github.com/paritytech/ss58-registry/
+//   - ensure the PR gets merged
+//   - yarn networks:sync in this repo to sync
+//
+// Any manual changes to this file will make CI cron checks fail and will be
+// lost when the registry is updated alongside the above sync.
 //

 import type { KnownSubstrate } from './types';
@@ -23,9 +29,9 @@ export const knownSubstrate: KnownSubstrate[] = [
  {
    decimals: null,
    displayName: 'Bare 32-bit Schnorr/Ristretto (S/R 25519) public key.',
-    network: null,
+    network: 'BareSr25519',
    prefix: 1,
-    standardAccount: null,
+    standardAccount: 'Sr25519',
    symbols: null,
    website: null
  },
@@ -41,9 +47,9 @@ export const knownSubstrate: KnownSubstrate[] = [
  {
    decimals: null,
    displayName: 'Bare 32-bit Ed25519 public key.',
-    network: null,
+    network: 'BareEd25519',
    prefix: 3,
-    standardAccount: null,
+    standardAccount: 'Ed25519',
    symbols: null,
    website: null
  },
@@ -143,7 +149,7 @@ export const knownSubstrate: KnownSubstrate[] = [
    network: 'totem',
    prefix: 14,
    standardAccount: '*25519',
-    symbols: ['XTX'],
+    symbols: ['TOTEM'],
    website: 'https://totemaccounting.com'
  },
  {
@@ -264,13 +270,13 @@ export const knownSubstrate: KnownSubstrate[] = [
    website: null
  },
  {
-    decimals: [18],
-    displayName: 'Dhiway CORD Network',
+    decimals: [12, 12],
+    displayName: 'CORD Network',
    network: 'cord',
    prefix: 29,
    standardAccount: '*25519',
-    symbols: ['DCU'],
-    website: 'https://dhiway.com/'
+    symbols: ['DHI', 'WAY'],
+    website: 'https://cord.network/'
  },
  {
    decimals: [12],
@@ -387,14 +393,14 @@ export const knownSubstrate: KnownSubstrate[] = [
    prefix: 42,
    standardAccount: '*25519',
    symbols: null,
-    website: 'https://docs.substrate.io/'
+    website: 'https://substrate.io/'
  },
  {
    decimals: null,
    displayName: 'Bare 32-bit ECDSA SECP-256k1 public key.',
-    network: null,
+    network: 'BareSecp256k1',
    prefix: 43,
-    standardAccount: null,
+    standardAccount: 'secp256k1',
    symbols: null,
    website: null
  },
@@ -461,6 +467,15 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['LAYR'],
    website: 'https://composable.finance'
  },
+  {
+    decimals: [9],
+    displayName: 'xx network',
+    network: 'xxnetwork',
+    prefix: 55,
+    standardAccount: '*25519',
+    symbols: ['XX'],
+    website: 'https://xx.network'
+  },
  {
    decimals: [12],
    displayName: 'HydraDX',
@@ -569,6 +584,15 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['TRAC'],
    website: 'https://origintrail.io'
  },
+  {
+    decimals: [10],
+    displayName: 'Pontem Network',
+    network: 'pontem-network',
+    prefix: 105,
+    standardAccount: '*25519',
+    symbols: ['PONT'],
+    website: 'https://pontem.network'
+  },
  {
    decimals: [12],
    displayName: 'Heiko',
@@ -623,6 +647,24 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['NET'],
    website: 'https://social.network'
  },
+  {
+    decimals: [15],
+    displayName: 'QUARTZ by UNIQUE',
+    network: 'quartz_mainnet',
+    prefix: 255,
+    standardAccount: '*25519',
+    symbols: ['QTZ'],
+    website: 'https://unique.network'
+  },
+  {
+    decimals: [18],
+    displayName: 'Pioneer Network by Bit.Country',
+    network: 'pioneer_network',
+    prefix: 268,
+    standardAccount: '*25519',
+    symbols: ['NEER'],
+    website: 'https://bit.country'
+  },
  {
    decimals: [18],
    displayName: 'Moonbeam',
@@ -642,13 +684,31 @@ export const knownSubstrate: KnownSubstrate[] = [
    website: 'https://moonbeam.network'
  },
  {
-    decimals: [18],
-    displayName: 'Automata Mainnet',
-    network: 'automata',
-    prefix: 2349,
+    decimals: [12],
+    displayName: 'Kapex',
+    network: 'kapex',
+    prefix: 2007,
    standardAccount: '*25519',
-    symbols: ['ATA'],
-    website: 'https://ata.network'
+    symbols: ['KAPEX'],
+    website: 'https://totemaccounting.com'
+  },
+  {
+    decimals: [18],
+    displayName: 'Subspace testnet',
+    network: 'subspace_testnet',
+    prefix: 2254,
+    standardAccount: '*25519',
+    symbols: ['tSSC'],
+    website: 'https://subspace.network'
+  },
+  {
+    decimals: [18],
+    displayName: 'Subspace',
+    network: 'subspace',
+    prefix: 6094,
+    standardAccount: '*25519',
+    symbols: ['SSC'],
+    website: 'https://subspace.network'
  },
  {
    decimals: [12],
@@ -659,6 +719,24 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['BSX'],
    website: 'https://bsx.fi'
  },
+  {
+    decimals: [12],
+    displayName: 'CESS Testnet',
+    network: 'cess-testnet',
+    prefix: 10042,
+    standardAccount: '*25519',
+    symbols: ['TCESS'],
+    website: 'https://cess.cloud'
+  },
+  {
+    decimals: [12],
+    displayName: 'CESS',
+    network: 'cess',
+    prefix: 10043,
+    standardAccount: '*25519',
+    symbols: ['CESS'],
+    website: 'https://cess.cloud'
+  },
  {
    decimals: [18],
    displayName: 'Automata ContextFree',
@@ -8,7 +8,7 @@ export interface KnownSubstrate {
  displayName: string;
  network: string | null;
  prefix: number;
-  standardAccount: '*25519' | 'secp256k1' | null;
+  standardAccount: '*25519' | 'Ed25519' | 'Sr25519' | 'secp256k1' | null;
  symbols: string[] | null;
  website: string | null;
 }
@@ -26,6 +26,7 @@ export interface SubstrateNetwork extends KnownSubstrate {
  hasLedgerSupport: boolean;
  icon: Icon;
  isIgnored: boolean;
+  isTestnet: boolean;
  slip44?: number | null;
 }

@@ -36,5 +37,5 @@ export interface Network extends SubstrateNetwork {
 export interface Ss58Registry {
  registry: KnownSubstrate[];
  specification: string;
-  schema: Record<string, string>;
+  schema: Record<keyof KnownSubstrate, string>;
 }
@@ -1,52 +1,51 @@
 {
-  "name": "@polkadot/util-crypto",
-  "version": "7.5.1",
-  "type": "module",
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/common/issues",
+  "bundledDependencies": [
+    "@noble/hashes"
+  ],
+  "contributors": [],
  "description": "A collection of useful crypto utilities for @polkadot",
-  "main": "index.js",
+  "engines": {
+    "node": ">=14.0.0"
+  },
+  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme",
+  "license": "Apache-2.0",
+  "maintainers": [],
+  "name": "@polkadot/util-crypto",
+  "repository": {
+    "directory": "packages/util-crypto",
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
  "sideEffects": [
    "./cryptoInit.js",
    "./cryptoInit.cjs",
    "./detectPackage.js",
    "./detectPackage.cjs"
  ],
-  "engines": {
-    "node": ">=14.0.0"
-  },
-  "author": "Jaco Greeff <jacogr@gmail.com>",
-  "maintainers": [],
-  "contributors": [],
-  "license": "Apache-2.0",
-  "repository": "github:polkadot-js/common",
-  "bugs": "https://github.com/polkadot-js/common/issues",
-  "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme",
+  "type": "module",
+  "version": "8.0.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/networks": "7.5.1",
-    "@polkadot/util": "7.5.1",
-    "@polkadot/wasm-crypto": "^4.2.1",
-    "@polkadot/x-randomvalues": "7.5.1",
-    "base-x": "^3.0.8",
-    "base64-js": "^1.5.1",
-    "blakejs": "^1.1.1",
+    "@babel/runtime": "^7.16.3",
+    "@noble/hashes": "0.4.1",
+    "@polkadot/networks": "8.0.2",
+    "@polkadot/util": "8.0.2",
+    "@polkadot/wasm-crypto": "^4.4.1",
+    "@polkadot/x-randomvalues": "8.0.2",
    "bn.js": "^4.12.0",
-    "create-hash": "^1.2.0",
    "ed2curve": "^0.3.0",
    "elliptic": "^6.5.4",
-    "hash.js": "^1.1.7",
-    "js-sha3": "^0.8.0",
-    "scryptsy": "^2.1.0",
-    "tweetnacl": "^1.0.3",
-    "xxhashjs": "^0.2.2"
+    "micro-base": "^0.9.0",
+    "tweetnacl": "^1.0.3"
  },
  "devDependencies": {
    "@types/bn.js": "^4.11.6",
-    "@types/create-hash": "^1.2.2",
-    "@types/elliptic": "^6.4.13",
-    "@types/scryptsy": "^2.0.0",
-    "@types/xxhashjs": "^0.2.2"
+    "@types/ed2curve": "^0.2.2",
+    "@types/elliptic": "^6.4.14"
  },
  "peerDependencies": {
-    "@polkadot/util": "7.5.1"
+    "@polkadot/util": "8.0.2"
  }
 }
@@ -4,7 +4,7 @@
 import type { HexString } from '@polkadot/util/types';
 import type { Prefix } from './types';

-import { base58Decode } from '../base58/decode';
+import { base58Decode } from '../base58';
 import { checkAddressChecksum } from './checksum';
 import { defaults } from './defaults';

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { base58Decode } from '../base58/decode';
+import { base58Decode } from '../base58';
 import { checkAddressChecksum } from './checksum';

 describe('checkAddressChecksum', (): void => {
@@ -7,7 +7,7 @@ import type { Prefix } from './types';
 // Original implementation: https://github.com/paritytech/polka-ui/blob/4858c094684769080f5811f32b081dd7780b0880/src/polkadot.js#L6
 import { assert, isHex, isU8a, u8aToU8a } from '@polkadot/util';

-import { base58Decode } from '../base58/decode';
+import { base58Decode } from '../base58';
 import { checkAddressChecksum } from './checksum';
 import { defaults } from './defaults';

@@ -1,12 +1,18 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+import type { Network } from '@polkadot/networks/types';
+
 import { availableNetworks } from '../networks';

+function networkToPrefix ({ prefix }: Network): number {
+  return prefix;
+}
+
 export const defaults = {
  allowedDecodedLengths: [1, 2, 4, 8, 32, 33],
  // publicKey has prefix + 2 checksum bytes, short only prefix + 1 checksum byte
  allowedEncodedLengths: [3, 4, 6, 10, 35, 36, 37, 38],
-  allowedPrefix: availableNetworks.map(({ prefix }) => prefix),
+  allowedPrefix: availableNetworks.map(networkToPrefix),
  prefix: 42
 };
@@ -2,16 +2,20 @@
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
+import type { DeriveJunction } from '../key/DeriveJunction';
 import type { Prefix } from './types';

 import { assert } from '@polkadot/util';

 import { keyExtractPath } from '../key';
-import { DeriveJunction } from '../key/DeriveJunction';
-import { schnorrkelDerivePublic } from '../schnorrkel';
+import { sr25519DerivePublic } from '../sr25519';
 import { decodeAddress } from './decode';
 import { encodeAddress } from './encode';

+function filterHard ({ isHard }: DeriveJunction): boolean {
+  return isHard;
+}
+
 /**
 * @name deriveAddress
 * @summary Creates a sr25519 derived address from the supplied and path.
@@ -21,9 +25,13 @@ import { encodeAddress } from './encode';
 export function deriveAddress (who: HexString | Uint8Array | string, suri: string, ss58Format?: Prefix): string {
  const { path } = keyExtractPath(suri);

-  assert(path.length && !path.some((path) => path.isHard), 'Expected suri to contain a combination of non-hard paths');
+  assert(path.length && !path.every(filterHard), 'Expected suri to contain a combination of non-hard paths');

-  return encodeAddress(path.reduce((publicKey: Uint8Array, path: DeriveJunction): Uint8Array => {
-    return schnorrkelDerivePublic(publicKey, path.chainCode);
-  }, decodeAddress(who)), ss58Format);
+  let publicKey = decodeAddress(who);
+
+  for (const { chainCode } of path) {
+    publicKey = sr25519DerivePublic(publicKey, chainCode);
+  }
+
+  return encodeAddress(publicKey, ss58Format);
 }
@@ -7,7 +7,7 @@ import type { Prefix } from './types';
 // Original implementation: https://github.com/paritytech/polka-ui/blob/4858c094684769080f5811f32b081dd7780b0880/src/polkadot.js#L34
 import { assert, u8aConcat } from '@polkadot/util';

-import { base58Encode } from '../base58/encode';
+import { base58Encode } from '../base58';
 import { decodeAddress } from './decode';
 import { defaults } from './defaults';
 import { sshash } from './sshash';
@@ -0,0 +1,111 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { isAddress } from '.';
+
+describe('isAddress', (): void => {
+  it('decodes an address', (): void => {
+    expect(
+      isAddress('5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY')
+    ).toEqual(true);
+  });
+
+  it('decodes the council address', (): void => {
+    expect(
+      isAddress('F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29')
+    ).toEqual(true);
+  });
+
+  it('converts a publicKey (hex) as-is', (): void => {
+    expect(
+      isAddress('0x01020304')
+    ).toEqual(true);
+  });
+
+  it('decodes a short address', (): void => {
+    expect(
+      isAddress('F7NZ')
+    ).toEqual(true);
+  });
+
+  it('decodes a 1-byte accountId (with prefix)', (): void => {
+    expect(
+      isAddress('g4b', false, 2)
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte accountId', (): void => {
+    expect(
+      isAddress('3xygo', false, 2)
+    ).toEqual(true);
+  });
+
+  it('encodes a 4-byte address', (): void => {
+    expect(
+      isAddress('zswfoZa', false, 2)
+    ).toEqual(true);
+  });
+
+  it('decodes a 8-byte address', (): void => {
+    expect(
+      isAddress('848Gh2GcGaZia', false, 2)
+    ).toEqual(true);
+  });
+
+  it('decodes a 33-byte address', (): void => {
+    expect(
+      isAddress('KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (65)', (): void => {
+    expect(
+      isAddress('cLtA6nCDyvwKcEHH4QkZDSHMhS9s78BvUJUsKUbUAn1Jc2SCF')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (69)', (): void => {
+    expect(
+      isAddress('cnUaoo5wodnTVA4bnr4woSweto8hWZADUvLFXkR9Q6U7BRsbF')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (252)', (): void => {
+    expect(
+      isAddress('xw9Hca4RJTmBRgzJT4ieJBh7XCK9gE3NXBDSEmgGHd4TCrbnG')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (255)', (): void => {
+    expect(
+      isAddress('yGHU8YKprxHbHdEv7oUK4rzMZXtsdhcXVG2CAMyC9WhzhjH2k')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (ecdsa, from Substrate)', (): void => {
+    expect(
+      isAddress('4pbsSkWcBaYoFHrKJZp5fDVUKbqSYD9dhZZGvpp3vQ5ysVs5ybV')
+    ).toEqual(true);
+  });
+
+  it('fails when length is invalid', (): void => {
+    expect(
+      isAddress('y9EMHt34JJo4rWLSaxoLGdYXvjgSXEd4zHUnQgfNzwES8b')
+    ).toEqual(false);
+  });
+
+  it('fails when the checksum does not match', (): void => {
+    expect(
+      isAddress('5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMa9cj')
+    ).toEqual(false);
+    expect(
+      isAddress('5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDwU')
+    ).toEqual(false);
+  });
+
+  it('fails when invalid base58 encoded address is found', (): void => {
+    expect(
+      isAddress('F3opIRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29')
+    ).toEqual(false);
+  });
+});
@@ -7,6 +7,7 @@ import type { HexString } from '@polkadot/util/types';
 import { bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';

 import { blake2AsU8a } from '../blake2/asU8a';
+import { BN_LE_16_OPTS } from '../bn';
 import { decodeAddress } from './decode';

 const PREFIX = stringToU8a('modlpy/utilisuba');
@@ -16,7 +17,7 @@ export function createKeyDerived (who: HexString | Uint8Array | string, index: b
    u8aConcat(
      PREFIX,
      decodeAddress(who),
-      bnToU8a(index, { bitLength: 16, isLe: true })
+      bnToU8a(index, BN_LE_16_OPTS)
    )
  );
 }
@@ -7,7 +7,8 @@ import type { HexString } from '@polkadot/util/types';
 import { bnToU8a, compactToU8a, stringToU8a, u8aConcat, u8aSorted } from '@polkadot/util';

 import { blake2AsU8a } from '../blake2/asU8a';
-import { decodeAddress } from './decode';
+import { BN_LE_16_OPTS } from '../bn';
+import { addressToU8a } from './util';

 const PREFIX = stringToU8a('modlpy/utilisuba');

@@ -16,8 +17,8 @@ export function createKeyMulti (who: (HexString | Uint8Array | string)[], thresh
    u8aConcat(
      PREFIX,
      compactToU8a(who.length),
-      ...u8aSorted(who.map((who) => decodeAddress(who))),
-      bnToU8a(threshold, { bitLength: 16, isLe: true })
+      ...u8aSorted(who.map(addressToU8a)),
+      bnToU8a(threshold, BN_LE_16_OPTS)
    )
  );
 }
@@ -6,11 +6,13 @@ import type { Prefix } from './types';

 import { u8aSorted } from '@polkadot/util';

-import { decodeAddress } from './decode';
 import { encodeAddress } from './encode';
+import { addressToU8a } from './util';

 export function sortAddresses (addresses: (HexString | Uint8Array | string)[], ss58Format?: Prefix): string[] {
+  const u8aToAddress = (u8a: Uint8Array) => encodeAddress(u8a, ss58Format);
+
  return u8aSorted(
-    addresses.map((who) => decodeAddress(who))
-  ).map((u8a) => encodeAddress(u8a, ss58Format));
+    addresses.map(addressToU8a)
+  ).map(u8aToAddress);
 }
@@ -0,0 +1,8 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { decodeAddress } from './decode';
+
+export function addressToU8a (who: string | Uint8Array): Uint8Array {
+  return decodeAddress(who);
+}
@@ -0,0 +1,111 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { validateAddress } from '.';
+
+describe('validateAddress', (): void => {
+  it('decodes an address', (): void => {
+    expect(
+      validateAddress('5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY')
+    ).toEqual(true);
+  });
+
+  it('decodes the council address', (): void => {
+    expect(
+      validateAddress('F3opxRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29')
+    ).toEqual(true);
+  });
+
+  it('converts a publicKey (hex) as-is', (): void => {
+    expect(
+      validateAddress('0x01020304')
+    ).toEqual(true);
+  });
+
+  it('decodes a short address', (): void => {
+    expect(
+      validateAddress('F7NZ')
+    ).toEqual(true);
+  });
+
+  it('decodes a 1-byte accountId (with prefix)', (): void => {
+    expect(
+      validateAddress('g4b', false, 2)
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte accountId', (): void => {
+    expect(
+      validateAddress('3xygo', false, 2)
+    ).toEqual(true);
+  });
+
+  it('encodes a 4-byte address', (): void => {
+    expect(
+      validateAddress('zswfoZa', false, 2)
+    ).toEqual(true);
+  });
+
+  it('decodes a 8-byte address', (): void => {
+    expect(
+      validateAddress('848Gh2GcGaZia', false, 2)
+    ).toEqual(true);
+  });
+
+  it('decodes a 33-byte address', (): void => {
+    expect(
+      validateAddress('KWCv1L3QX9LDPwY4VzvLmarEmXjVJidUzZcinvVnmxAJJCBou')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (65)', (): void => {
+    expect(
+      validateAddress('cLtA6nCDyvwKcEHH4QkZDSHMhS9s78BvUJUsKUbUAn1Jc2SCF')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (69)', (): void => {
+    expect(
+      validateAddress('cnUaoo5wodnTVA4bnr4woSweto8hWZADUvLFXkR9Q6U7BRsbF')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (252)', (): void => {
+    expect(
+      validateAddress('xw9Hca4RJTmBRgzJT4ieJBh7XCK9gE3NXBDSEmgGHd4TCrbnG')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (255)', (): void => {
+    expect(
+      validateAddress('yGHU8YKprxHbHdEv7oUK4rzMZXtsdhcXVG2CAMyC9WhzhjH2k')
+    ).toEqual(true);
+  });
+
+  it('decodes a 2-byte prefix (ecdsa, from Substrate)', (): void => {
+    expect(
+      validateAddress('4pbsSkWcBaYoFHrKJZp5fDVUKbqSYD9dhZZGvpp3vQ5ysVs5ybV')
+    ).toEqual(true);
+  });
+
+  it('fails when length is invalid', (): void => {
+    expect(
+      () => validateAddress('y9EMHt34JJo4rWLSaxoLGdYXvjgSXEd4zHUnQgfNzwES8b')
+    ).toThrow(/address length/);
+  });
+
+  it('fails when the checksum does not match', (): void => {
+    expect(
+      () => validateAddress('5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMa9cj')
+    ).toThrow(/address checksum/);
+    expect(
+      () => validateAddress('5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDwU')
+    ).toThrow(/address checksum/);
+  });
+
+  it('fails when invalid base58 encoded address is found', (): void => {
+    expect(
+      () => validateAddress('F3opIRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29')
+    ).toThrow(/Decoding F3opIRbN5ZbjJNU511Kj2TLuzFcDq9BGduA9TgiECafpg29: Invalid base58 character "I" \(0x49\) at index 4/);
+  });
+});
@@ -1,6 +1,53 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-// https://github.com/multiformats/js-multibase/blob/master/src/constants.js
-export const BASE32_ALPHABET = 'abcdefghijklmnopqrstuvwxyz234567';
-export const BITS_PER_CHAR = 5;
+import { utils } from 'micro-base';
+
+import { createDecode, createEncode, createIs, createValidate } from './helpers';
+
+const BASE32_ALPHABET = 'abcdefghijklmnopqrstuvwxyz234567';
+
+const BASE32_CONFIG = {
+  alphabet: BASE32_ALPHABET,
+  coder: utils.chain(
+    // We define our own chain, the default base32 has padding
+    utils.radix2(5),
+    utils.alphabet(BASE32_ALPHABET),
+    {
+      decode: (input: string) => input.split(''),
+      encode: (input: string[]) => input.join('')
+    }
+  ),
+  ipfsChar: 'b',
+  type: 'base32'
+};
+
+/**
+ * @name base32Validate
+ * @summary Validates a base32 value.
+ * @description
+ * Validates that the supplied value is valid base32, throwing exceptions if not
+ */
+export const base32Validate = createValidate(BASE32_CONFIG);
+
+/**
+* @name isBase32
+* @description Checks if the input is in base32, returning true/false
+*/
+export const isBase32 = createIs(base32Validate);
+
+/**
+ * @name base32Decode
+ * @summary Delookup a base32 value.
+ * @description
+ * From the provided input, decode the base32 and return the result as an `Uint8Array`.
+ */
+export const base32Decode = createDecode(BASE32_CONFIG, base32Validate);
+
+/**
+* @name base32Encode
+* @summary Creates a base32 value.
+* @description
+* From the provided input, create the base32 and return the result as a string.
+*/
+export const base32Encode = createEncode(BASE32_CONFIG);
@@ -3,7 +3,7 @@

 import { u8aToString } from '@polkadot/util';

-import { base32Decode } from './';
+import { base32Decode } from '.';

 describe('base32Decode', (): void => {
  it('decodes a base32', (): void => {
@@ -1,58 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// adapted from https://github.com/multiformats/js-multibase/blob/424709195b46ffb1d6f2f69a7707598ebe751e5e/src/rfc4648.js
-
-import { assert } from '@polkadot/util';
-
-import { BASE32_ALPHABET, BITS_PER_CHAR } from './bs32';
-import { base32Validate } from './validate';
-
-// Build the character lookup table:
-const LOOKUP = BASE32_ALPHABET
-  .split('')
-  .reduce((lookup: Record<string, number>, char: string, index: number): Record<string, number> => {
-    lookup[char] = index;
-
-    return lookup;
-  }, {});
-
-/** @internal */
-function decode (output: Uint8Array, input: string, offset: number): [Uint8Array, number, number] {
-  let bits = 0;
-  let buffer = 0;
-  let written = 0;
-
-  for (let i = offset; i < input.length; i++) {
-    buffer = (buffer << BITS_PER_CHAR) | LOOKUP[input[i]];
-    bits += BITS_PER_CHAR;
-
-    if (bits >= 8) {
-      bits -= 8;
-      output[written++] = 0xff & (buffer >> bits);
-    }
-  }
-
-  return [output, bits, buffer];
-}
-
-/**
- * @name base32Decode
- * @summary Delookup a base32 value.
- * @description
- * From the provided input, decode the base32 and return the result as an `Uint8Array`.
- */
-export function base32Decode (value: string, ipfsCompat = false): Uint8Array {
-  base32Validate(value, ipfsCompat);
-
-  const offset = (ipfsCompat ? 1 : 0);
-  const [output, bits, buffer] = decode(
-    new Uint8Array(((value.length - offset) * BITS_PER_CHAR / 8) | 0),
-    value,
-    offset
-  );
-
-  assert(!(bits >= BITS_PER_CHAR || 0xff & (buffer << (8 - bits))), 'Unexpected end of data');
-
-  return output;
-}
@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0

 import { base58Decode } from '../base58';
-import { base32Encode } from './';
+import { base32Encode } from '.';

 describe('base32Encode', (): void => {
  it('encodes to a base32', (): void => {
@@ -11,6 +11,12 @@ describe('base32Encode', (): void => {
    ).toEqual('irswgzloorzgc3djpjssazlwmvzhs5dinfxgoijb');
  });

+  it('encodes to a base32 (ipfs-compat)', (): void => {
+    expect(
+      base32Encode('Decentralize everything!!', true)
+    ).toEqual('birswgzloorzgc3djpjssazlwmvzhs5dinfxgoijb');
+  });
+
  it('encodes a base58 to a base32', (): void => {
    expect(
      base32Encode(
@@ -1,43 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-// adapted from https://github.com/multiformats/js-multibase/blob/424709195b46ffb1d6f2f69a7707598ebe751e5e/src/rfc4648.js
-
-import type { U8aLike } from '@polkadot/util/types';
-
-import { u8aToU8a } from '@polkadot/util';
-
-import { BASE32_ALPHABET, BITS_PER_CHAR } from './bs32';
-
-const MASK = (1 << BITS_PER_CHAR) - 1;
-
-/**
- * @name base32Encode
- * @summary Creates a base32 value.
- * @description
- * From the provided input, create the base32 and return the result as a string.
- */
-export function base32Encode (value: U8aLike, ipfsCompat = false): string {
-  const u8a = u8aToU8a(value);
-  let out = '';
-  let bits = 0;
-  let buffer = 0;
-
-  for (let i = 0; i < u8a.length; ++i) {
-    buffer = (buffer << 8) | u8a[i];
-    bits += 8;
-
-    while (bits > BITS_PER_CHAR) {
-      bits -= BITS_PER_CHAR;
-      out += BASE32_ALPHABET[MASK & (buffer >> bits)];
-    }
-  }
-
-  if (bits) {
-    out += BASE32_ALPHABET[MASK & (buffer << (BITS_PER_CHAR - bits))];
-  }
-
-  return ipfsCompat
-    ? `b${out}`
-    : out;
-}
@@ -0,0 +1,87 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { assert, u8aToU8a } from '@polkadot/util';
+
+// NOTE: Work around a TS issue. These are re-defined like in @polkadot/util/types
+// since without it the import
+//
+//   import type { U8aLike } from '@polkadot/util/types';
+//
+// ends up in the build-generated code as
+//
+//   impor("../../../util/src/types").U8aLike
+//
+// eslint-disable-next-line @typescript-eslint/ban-types
+type U8aLike = number[] | Buffer | Uint8Array | string | String;
+
+interface Coder {
+  decode: (value: string) => Uint8Array;
+  encode: (value: Uint8Array) => string;
+}
+
+interface Config {
+  alphabet: string;
+  coder: Coder;
+  ipfsChar?: string;
+  regex?: RegExp;
+  type: string;
+}
+
+type DecodeFn = (value: string, ipfsCompat?: boolean) => Uint8Array;
+
+type EncodeFn = (value: U8aLike, ipfsCompat?: boolean) => string;
+
+type ValidateFn = (value?: unknown, ipfsCompat?: boolean) => value is string;
+
+export function createDecode ({ coder, ipfsChar }: Config, validate: ValidateFn): DecodeFn {
+  return (value: string, ipfsCompat?: boolean): Uint8Array => {
+    validate(value, ipfsCompat);
+
+    return coder.decode(
+      ipfsChar && ipfsCompat
+        ? value.substr(1)
+        : value
+    );
+  };
+}
+
+export function createEncode ({ coder, ipfsChar }: Config): EncodeFn {
+  return (value: U8aLike, ipfsCompat?: boolean): string => {
+    const out = coder.encode(u8aToU8a(value));
+
+    return ipfsChar && ipfsCompat
+      ? `${ipfsChar}${out}`
+      : out;
+  };
+}
+
+export function createIs (validate: ValidateFn): ValidateFn {
+  return (value?: unknown, ipfsCompat?: boolean): value is string => {
+    try {
+      return validate(value, ipfsCompat);
+    } catch (error) {
+      return false;
+    }
+  };
+}
+
+export function createValidate ({ alphabet, ipfsChar, regex, type }: Config): ValidateFn {
+  return (value?: unknown, ipfsCompat?: boolean): value is string => {
+    assert(value && typeof value === 'string', () => `Expected non-null, non-empty ${type} string input`);
+
+    if (ipfsChar && ipfsCompat) {
+      assert(value[0] === ipfsChar, () => `Expected ipfs-compatible ${type} to start with '${ipfsChar}'`);
+    }
+
+    if (regex) {
+      assert(regex.test(value), `Invalid ${type} encoding`);
+    } else {
+      for (let i = (ipfsCompat ? 1 : 0); i < value.length; i++) {
+        assert(alphabet.includes(value[i]), () => `Invalid ${type} character "${value[i]}" (0x${value.charCodeAt(i).toString(16)}) at index ${i}`);
+      }
+    }
+
+    return true;
+  };
+}
@@ -5,7 +5,4 @@
 * @summary Encode and decode base32 values
 */

-export { base32Decode } from './decode';
-export { base32Encode } from './encode';
-export { base32Validate } from './validate';
-export { isBase32 } from './is';
+export { base32Decode, base32Encode, base32Validate, isBase32 } from './bs32';
@@ -0,0 +1,30 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { isBase32 } from '.';
+
+describe('isBase32', (): void => {
+  it('validates encoded', (): void => {
+    expect(
+      isBase32('afkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', false)
+    ).toEqual(true);
+  });
+
+  it('validates ipfs-compat encoded', (): void => {
+    expect(
+      isBase32('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', false)
+    ).toEqual(true);
+  });
+
+  it('fails on invalid', (): void => {
+    expect(
+      isBase32('not in base32')
+    ).toEqual(false);
+  });
+
+  it('fails on non-ipfs', (): void => {
+    expect(
+      isBase32('afkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+    ).toEqual(false);
+  });
+});
@@ -1,16 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { base32Validate } from './validate';
-
-export function testValidator (validate: (value?: string | null, ipfsCompat?: boolean) => boolean, value?: string | null, ipfsCompat?: boolean): boolean {
-  try {
-    return validate(value, ipfsCompat);
-  } catch (error) {
-    return false;
-  }
-}
-
-export function isBase32 (value?: string | null, ipfsCompat?: boolean): value is string {
-  return testValidator(base32Validate, value, ipfsCompat);
-}
@@ -4,9 +4,39 @@
 import { base32Validate } from '.';

 describe('base32Validate', (): void => {
+  it('validates encoded', (): void => {
+    expect(
+      base32Validate('afkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', false)
+    ).toEqual(true);
+  });
+
  it('validates ipfs-compat encoded', (): void => {
    expect(
-      () => base32Validate('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
-    ).not.toThrow();
+      base32Validate('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+    ).toEqual(true);
+  });
+
+  it('fails on empty', (): void => {
+    expect(
+      () => base32Validate('')
+    ).toThrow(/Expected/);
+  });
+
+  it('fails on non-string', (): void => {
+    expect(
+      () => base32Validate(true)
+    ).toThrow(/Expected/);
+  });
+
+  it('fails on invalid', (): void => {
+    expect(
+      () => base32Validate('not in base32')
+    ).toThrow(/Invalid/);
+  });
+
+  it('fails on non-ipfs', (): void => {
+    expect(
+      () => base32Validate('afkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+    ).toThrow(/Expected/);
  });
 });
@@ -1,17 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { validateChars } from '../base58/validate';
-import { BASE32_ALPHABET } from './bs32';
-
-const BASE_CONFIG = { alphabet: BASE32_ALPHABET, ipfsChar: 'b', type: 'base32' };
-
-/**
- * @name base32Validate
- * @summary Validates a base32 value.
- * @description
- * Validates that the supplied value is valid base32
- */
-export function base32Validate (value?: string | null, ipfsCompat?: boolean): value is string {
-  return validateChars(BASE_CONFIG, value, ipfsCompat);
-}
@@ -1,9 +1,43 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import baseX from 'base-x';
+import { base58 } from 'micro-base';

-// https://github.com/cryptocoinjs/base-x#alphabets
-export const BASE58_ALPHABET = '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz';
+import { createDecode, createEncode, createIs, createValidate } from '../base32/helpers';

-export const bs58 = baseX(BASE58_ALPHABET);
+const BASE58_CONFIG = {
+  alphabet: '123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz',
+  coder: base58,
+  ipfsChar: 'z',
+  type: 'base58'
+};
+
+/**
+ * @name base58Validate
+ * @summary Validates a base58 value.
+ * @description
+ * Validates that the supplied value is valid base58, throwing exceptions if not
+ */
+export const base58Validate = createValidate(BASE58_CONFIG);
+
+/**
+ * @name base58Decode
+ * @summary Decodes a base58 value.
+ * @description
+ * From the provided input, decode the base58 and return the result as an `Uint8Array`.
+ */
+export const base58Decode = createDecode(BASE58_CONFIG, base58Validate);
+
+/**
+* @name base58Encode
+* @summary Creates a base58 value.
+* @description
+* From the provided input, create the base58 and return the result as a string.
+*/
+export const base58Encode = createEncode(BASE58_CONFIG);
+
+/**
+* @name isBase58
+* @description Checks if the input is in base58, returning true/false
+*/
+export const isBase58 = createIs(base58Validate);
@@ -0,0 +1,23 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { base32Decode } from '../base32';
+import { base58Decode } from './';
+
+describe('base58Encode', (): void => {
+  it('encodes a base58 to a base32', (): void => {
+    expect(
+      base58Decode('b2rhk6GMPQF3hfzwXTaNYFLKomMeC6UXdUt6jZKPpeVirLtV')
+    ).toEqual(
+      base32Decode('afkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy')
+    );
+  });
+
+  it('encodes a base58 to a base32 (ipfs-compat)', (): void => {
+    expect(
+      base58Decode('zb2rhk6GMPQF3hfzwXTaNYFLKomMeC6UXdUt6jZKPpeVirLtV', true)
+    ).toEqual(
+      base32Decode('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+    );
+  });
+});
@@ -1,19 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { bufferToU8a } from '@polkadot/util';
-
-import { bs58 } from './bs58';
-import { base58Validate } from './validate';
-
-/**
- * @name base58Decode
- * @summary Decodes a base58 value.
- * @description
- * From the provided input, decode the base58 and return the result as an `Uint8Array`.
- */
-export function base58Decode (value: string, ipfsCompat?: boolean): Uint8Array {
-  base58Validate(value, ipfsCompat);
-
-  return bufferToU8a(bs58.decode(value.substr(ipfsCompat ? 1 : 0)));
-}
@@ -5,7 +5,15 @@ import { base32Decode } from '../base32';
 import { base58Encode } from './';

 describe('base58Encode', (): void => {
-  it('encodes a base32 to a base38', (): void => {
+  it('encodes a base32 to a base58', (): void => {
+    expect(
+      base58Encode(
+        base32Decode('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true)
+      )
+    ).toEqual('b2rhk6GMPQF3hfzwXTaNYFLKomMeC6UXdUt6jZKPpeVirLtV');
+  });
+
+  it('encodes a base32 to a base58 (ipfs-compat)', (): void => {
    expect(
      base58Encode(
        base32Decode('bafkreigh2akiscaildcqabsyg3dfr6chu3fgpregiymsck7e7aqa4s52zy', true),
@@ -1,22 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { U8aLike } from '@polkadot/util/types';
-
-import { u8aToU8a } from '@polkadot/util';
-
-import { bs58 } from './bs58';
-
-/**
- * @name base58Encode
- * @summary Creates a base58 value.
- * @description
- * From the provided input, create the base58 and return the result as a string.
- */
-export function base58Encode (value: U8aLike, ipfsCompat?: boolean): string {
-  const out = bs58.encode(u8aToU8a(value));
-
-  return ipfsCompat
-    ? `z${out}`
-    : out;
-}
@@ -5,7 +5,4 @@
 * @summary Encode and decode base58 values
 */

-export { base58Decode } from './decode';
-export { base58Encode } from './encode';
-export { base58Validate } from './validate';
-export { isBase58 } from './is';
+export { base58Decode, base58Encode, base58Validate, isBase58 } from './bs58';
@@ -1,9 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { testValidator } from '../base32/is';
-import { base58Validate } from './validate';
-
-export function isBase58 (value?: string | null, ipfsCompat?: boolean): value is string {
-  return testValidator(base58Validate, value, ipfsCompat);
-}
@@ -1,35 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { assert } from '@polkadot/util';
-
-import { BASE58_ALPHABET } from './bs58';
-
-interface CheckConfig {
-  alphabet: string;
-  ipfsChar: string;
-  type: string;
-}
-
-const BASE_CONFIG = { alphabet: BASE58_ALPHABET, ipfsChar: 'z', type: 'base58' };
-
-export function validateChars ({ alphabet, ipfsChar, type }: CheckConfig, value?: unknown, ipfsCompat?: boolean): true {
-  assert(value && typeof value === 'string', () => `Expected non-null, non-empty ${type} string input`);
-  assert(!ipfsCompat || value[0] === ipfsChar, () => `Expected ${type} to start with '${ipfsChar}'`);
-
-  for (let i = (ipfsCompat ? 1 : 0); i < value.length; i++) {
-    assert(alphabet.includes(value[i]), () => `Invalid ${type} character "${value[i]}" (0x${value.charCodeAt(i).toString(16)}) at index ${i}`);
-  }
-
-  return true;
-}
-
-/**
- * @name base58Validate
- * @summary Validates a base58 value.
- * @description
- * Validates that the supplied value is valid base58
- */
-export function base58Validate (value?: string | null, ipfsCompat?: boolean): value is string {
-  return validateChars(BASE_CONFIG, value, ipfsCompat);
-}
@@ -0,0 +1,43 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { base64 } from 'micro-base';
+
+import { createDecode, createEncode, createIs, createValidate } from '../base32/helpers';
+
+const BASE64_CONFIG = {
+  alphabet: 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
+  coder: base64,
+  regex: /^(?:[A-Za-z0-9+/]{2}[A-Za-z0-9+/]{2})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/,
+  type: 'base64'
+};
+
+/**
+ * @name base64Validate
+ * @summary Validates a base64 value.
+ * @description
+ * Validates that the supplied value is valid base64
+ */
+export const base64Validate = createValidate(BASE64_CONFIG);
+
+/**
+ * @name isBase64
+ * @description Checks if the input is in base64, returning true/false
+ */
+export const isBase64 = createIs(base64Validate);
+
+/**
+ * @name base64Decode
+ * @summary Decodes a base64 value.
+ * @description
+ * From the provided input, decode the base64 and return the result as an `Uint8Array`.
+ */
+export const base64Decode = createDecode(BASE64_CONFIG, base64Validate);
+
+/**
+ * @name base64Encode
+ * @summary Creates a base64 value.
+ * @description
+ * From the provided input, create the base64 and return the result as a string.
+ */
+export const base64Encode = createEncode(BASE64_CONFIG);
@@ -1,18 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import base64 from 'base64-js';
-
-import { base64Validate } from './validate';
-
-/**
- * @name base64Decode
- * @summary Decodes a base64 value.
- * @description
- * From the provided input, decode the base64 and return the result as an `Uint8Array`.
- */
-export function base64Decode (value: string): Uint8Array {
-  base64Validate(value);
-
-  return base64.toByteArray(value);
-}
@@ -1,18 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { U8aLike } from '@polkadot/util/types';
-
-import base64 from 'base64-js';
-
-import { u8aToU8a } from '@polkadot/util';
-
-/**
- * @name base64Encode
- * @summary Creates a base64 value.
- * @description
- * From the provided input, create the base64 and return the result as a string.
- */
-export function base64Encode (value: U8aLike): string {
-  return base64.fromByteArray(u8aToU8a(value));
-}
@@ -5,9 +5,6 @@
 * @summary Encode and decode base64 values
 */

-export { base64Decode } from './decode';
-export { base64Encode } from './encode';
+export { base64Decode, base64Encode, base64Validate, isBase64 } from './bs64';
 export { base64Pad } from './pad';
 export { base64Trim } from './trim';
-export { base64Validate } from './validate';
-export { isBase64 } from './is';
@@ -1,12 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { base64Validate } from './validate';
-
-export function isBase64 (value?: string | null): value is string {
-  try {
-    return base64Validate(value);
-  } catch (error) {
-    return false;
-  }
-}
@@ -1,6 +1,10 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+/**
+ * @name base64Pad
+ * @description Adds padding characters for correct length
+ */
 export function base64Pad (value: string): string {
  return value.padEnd(value.length + (value.length % 4), '=');
 }
@@ -1,6 +1,10 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

+/**
+ * @name base64Trim
+ * @description Trims padding characters
+ */
 export function base64Trim (value: string): string {
  while (value.length && value[value.length - 1] === '=') {
    value = value.slice(0, -1);
@@ -1,17 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { assert } from '@polkadot/util';
-
-/**
- * @name base64Validate
- * @summary Validates a base64 value.
- * @description
- * Validates that the supplied value is valid base64
- */
-export function base64Validate (value?: string | null): value is string {
-  assert(value && typeof value === 'string', 'Expected non-null, non-empty base64 string input');
-  assert(/^(?:[A-Za-z0-9+/]{2}[A-Za-z0-9+/]{2})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$/.test(value), 'Invalid base64 encoding');
-
-  return true;
-}
@@ -1,28 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { HexString } from '@polkadot/util/types';
-
-import { u8aToHex } from '@polkadot/util';
-
-import { blake2AsU8a } from './asU8a';
-
-/**
- * @name blake2AsHex
- * @summary Creates a blake2b hex from the input.
- * @description
- * From a `Uint8Array` input, create the blake2b and return the result as a hex string with the specified `bitLength`.
- * @example
- * <BR>
- *
- * ```javascript
- * import { blake2AsHex } from '@polkadot/util-crypto';
- *
- * blake2AsHex('abc'); // => 0xba80a53f981c4d0d
- * ```
- */
-export function blake2AsHex (data: HexString | Uint8Array | string, bitLength = 256, key?: Uint8Array | null, onlyJs = false): HexString {
-  return u8aToHex(
-    blake2AsU8a(data, bitLength, key, onlyJs)
-  );
-}
@@ -4,6 +4,7 @@
 import { hexToU8a } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';

+import { performanceWasm } from '../../test/performance';
 import { blake2AsU8a } from '.';

 describe('blake2AsU8a', (): void => {
@@ -58,4 +59,10 @@ describe('blake2AsU8a', (): void => {

    expect(a).toEqual(b);
  });
+
+  describe.each([256, 512] as (256 | 512)[])('bitLength=$p', (bitLength): void => {
+    performanceWasm(`blake2AsU8a, bitLength=${bitLength}`, 64000, (input, onlyJs) =>
+      blake2AsU8a(input, bitLength, null, onlyJs)
+    );
+  });
 });
@@ -3,11 +3,14 @@

 import type { HexString } from '@polkadot/util/types';

-import js from 'blakejs';
-
-import { u8aToU8a } from '@polkadot/util';
+import { hasBigInt, u8aToU8a } from '@polkadot/util';
 import { blake2b, isReady } from '@polkadot/wasm-crypto';

+import { createAsHex } from '../helpers';
+import { blake2b as blake2bJs } from '../noble-hashes/lib/blake2b';
+
+type BitLength = 64 | 128 | 256 | 384 | 512;
+
 /**
 * @name blake2AsU8a
 * @summary Creates a blake2b u8a from the input.
@@ -22,10 +25,17 @@ import { blake2b, isReady } from '@polkadot/wasm-crypto';
 * blake2AsU8a('abc'); // => [0xba, 0x80, 0xa5, 0x3f, 0x98, 0x1c, 0x4d, 0x0d]
 * ```
 */
-export function blake2AsU8a (data: HexString | Uint8Array | string, bitLength = 256, key?: Uint8Array | null, onlyJs = false): Uint8Array {
+export function blake2AsU8a (data: HexString | Uint8Array | string, bitLength: BitLength = 256, key?: Uint8Array | null, onlyJs?: boolean): Uint8Array {
  const byteLength = Math.ceil(bitLength / 8);
+  const u8a = u8aToU8a(data);

-  return isReady() && !onlyJs
-    ? blake2b(u8aToU8a(data), u8aToU8a(key), byteLength)
-    : js.blake2b(u8aToU8a(data), key || undefined, byteLength);
+  return !hasBigInt || (!onlyJs && isReady())
+    ? blake2b(u8a, u8aToU8a(key), byteLength)
+    : blake2bJs(u8a, { dkLen: byteLength, key: key || undefined });
 }
+
+/**
+ * @name blake2AsHex
+ * @description Creates a blake2b hex from the input.
+ */
+export const blake2AsHex = createAsHex(blake2AsU8a);
@@ -5,5 +5,4 @@
 * @summary Create blake2b values with specified bitlengths
 */

-export { blake2AsHex } from './asHex';
-export { blake2AsU8a } from './asU8a';
+export { blake2AsHex, blake2AsU8a } from './asU8a';
@@ -0,0 +1,14 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export const BN_LE_OPTS = { isLe: true };
+
+export const BN_LE_16_OPTS = { bitLength: 16, isLe: true };
+
+export const BN_BE_32_OPTS = { bitLength: 32, isLe: false };
+export const BN_LE_32_OPTS = { bitLength: 32, isLe: true };
+
+export const BN_BE_256_OPTS = { bitLength: 256, isLe: false };
+export const BN_LE_256_OPTS = { bitLength: 256, isLe: true };
+
+export const BN_LE_512_OPTS = { bitLength: 512, isLe: true };
@@ -12,6 +12,7 @@ export * from './base58';
 export * from './base64';
 export * from './blake2';
 export * from './crypto';
+export * from './ed25519';
 export * from './ethereum';
 export * from './hd';
 export * from './hmac';
@@ -23,9 +24,9 @@ export * from './networks';
 export * from './nacl';
 export * from './pbkdf2';
 export * from './random';
-export * from './schnorrkel';
 export * from './scrypt';
 export * from './secp256k1';
-export * from './sha512';
+export * from './sha';
 export * from './signature';
+export * from './sr25519';
 export * from './xxhash';
@@ -3,9 +3,7 @@

 import { isReady, waitReady } from '@polkadot/wasm-crypto';

-export function cryptoIsReady (): boolean {
-  return isReady();
-}
+export const cryptoIsReady = isReady;

 export function cryptoWaitReady (): Promise<boolean> {
  return waitReady()
@@ -0,0 +1,36 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { u8aToHex } from '@polkadot/util';
+
+import { convertPublicKeyToCurve25519, convertSecretKeyToCurve25519 } from '.';
+
+describe('convertPublicKeyToCurve25519', (): void => {
+  it('converts a known key correctly', (): void => {
+    expect(
+      u8aToHex(convertPublicKeyToCurve25519(
+        new Uint8Array([
+          180, 114, 93, 155, 165, 255, 217, 82,
+          16, 250, 209, 11, 193, 10, 88, 218,
+          190, 190, 41, 193, 236, 252, 1, 152,
+          216, 214, 0, 41, 45, 138, 13, 53
+        ])
+      ))
+    ).toEqual('0x5e05848ceeef4f306d6e285a26faf1a8070cf0c89f8d28ab966002fe4ad17746');
+  });
+});
+
+describe('convertSecretKeyToCurve25519', (): void => {
+  it('converts a known key correctly', (): void => {
+    expect(
+      u8aToHex(convertSecretKeyToCurve25519(
+        new Uint8Array([
+          1, 2, 3, 4, 5, 6, 7, 8,
+          1, 2, 3, 4, 5, 6, 7, 8,
+          1, 2, 3, 4, 5, 6, 7, 8,
+          1, 2, 3, 4, 5, 6, 7, 8
+        ])
+      ))
+    ).toEqual('0xd875a82940b9174dabb1c0c895485810cc2870f5808565b59d4ef708bdcf526c');
+  });
+});
@@ -3,10 +3,12 @@

 import ed2curve from 'ed2curve';

+import { assertReturn } from '@polkadot/util';
+
 export function convertSecretKeyToCurve25519 (secretKey: Uint8Array): Uint8Array {
  return ed2curve.convertSecretKey(secretKey);
 }

 export function convertPublicKeyToCurve25519 (publicKey: Uint8Array): Uint8Array {
-  return ed2curve.convertPublicKey(publicKey) as Uint8Array;
+  return assertReturn(ed2curve.convertPublicKey(publicKey), 'Unable to convert publicKey to ed25519');
 }
@@ -1,13 +1,15 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { compactAddLength, stringToU8a, u8aConcat } from '@polkadot/util';
+import { assert, compactAddLength, isU8a, stringToU8a, u8aConcat } from '@polkadot/util';

 import { blake2AsU8a } from '../blake2/asU8a';

 const HDKD = compactAddLength(stringToU8a('Ed25519HDKD'));

-export function naclDeriveHard (seed: Uint8Array, chainCode: Uint8Array): Uint8Array {
+export function ed25519DeriveHard (seed: Uint8Array, chainCode: Uint8Array): Uint8Array {
+  assert(isU8a(chainCode) && chainCode.length === 32, 'Invalid chainCode passed to derive');
+
  return blake2AsU8a(
    u8aConcat(HDKD, seed, chainCode)
  );
@@ -0,0 +1,14 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+/**
+ * @summary Implements ed25519 operations
+ */
+export { convertPublicKeyToCurve25519, convertSecretKeyToCurve25519 } from './convertKey';
+export { ed25519DeriveHard } from './deriveHard';
+export { ed25519PairFromRandom } from './pair/fromRandom';
+export { ed25519PairFromSecret } from './pair/fromSecret';
+export { ed25519PairFromSeed } from './pair/fromSeed';
+export { ed25519PairFromString } from './pair/fromString';
+export { ed25519Sign } from './sign';
+export { ed25519Verify } from './verify';
@@ -3,13 +3,13 @@

 import type { Keypair } from '../../types';

-import { naclKeypairFromRandom } from '..';
+import { ed25519PairFromRandom } from '..';

-describe('naclKeypairFromRandom', (): void => {
+describe('ed25519PairFromRandom', (): void => {
  let keypair: Keypair;

  beforeEach((): void => {
-    keypair = naclKeypairFromRandom();
+    keypair = ed25519PairFromRandom();
  });

  it('generates a valid publicKey', (): void => {
@@ -6,7 +6,7 @@ import type { Keypair } from '../../types';
 import nacl from 'tweetnacl';

 /**
- * @name naclKeypairFromRandom
+ * @name ed25519PairFromRandom
 * @summary Creates a new public/secret keypair.
 * @description
 * Returns a new generate object containing a `publicKey` & `secretKey`.
@@ -14,11 +14,11 @@ import nacl from 'tweetnacl';
 * <BR>
 *
 * ```javascript
- * import { naclKeypairFromRandom } from '@polkadot/util-crypto';
+ * import { ed25519PairFromRandom } from '@polkadot/util-crypto';
 *
- * naclKeypairFromRandom(); // => { secretKey: [...], publicKey: [...] }
+ * ed25519PairFromRandom(); // => { secretKey: [...], publicKey: [...] }
 * ```
 */
-export function naclKeypairFromRandom (): Keypair {
+export function ed25519PairFromRandom (): Keypair {
  return nacl.sign.keyPair();
 }
@@ -1,9 +1,9 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { naclKeypairFromSecret } from '..';
+import { ed25519PairFromSecret } from '..';

-describe('naclKeypairFromSecret', (): void => {
+describe('ed25519PairFromSecret', (): void => {
  const secretKey = new Uint8Array([
    18, 52, 86, 120, 144, 18, 52, 86,
    120, 144, 18, 52, 86, 120, 144, 18,
@@ -17,7 +17,7 @@ describe('naclKeypairFromSecret', (): void => {

  it('generates a valid publicKey/secretKey pair', (): void => {
    expect(
-      naclKeypairFromSecret(secretKey)
+      ed25519PairFromSecret(secretKey)
    ).toEqual({
      publicKey: new Uint8Array([
        180, 114, 93, 155, 165, 255, 217, 82,
@@ -6,7 +6,7 @@ import type { Keypair } from '../../types';
 import nacl from 'tweetnacl';

 /**
- * @name naclKeypairFromSecret
+ * @name ed25519PairFromSecret
 * @summary Creates a new public/secret keypair from a secret.
 * @description
 * Returns a object containing a `publicKey` & `secretKey` generated from the supplied secret.
@@ -14,11 +14,11 @@ import nacl from 'tweetnacl';
 * <BR>
 *
 * ```javascript
- * import { naclKeypairFromSecret } from '@polkadot/util-crypto';
+ * import { ed25519PairFromSecret } from '@polkadot/util-crypto';
 *
- * naclKeypairFromSecret(...); // => { secretKey: [...], publicKey: [...] }
+ * ed25519PairFromSecret(...); // => { secretKey: [...], publicKey: [...] }
 * ```
 */
-export function naclKeypairFromSecret (secret: Uint8Array): Keypair {
+export function ed25519PairFromSecret (secret: Uint8Array): Keypair {
  return nacl.sign.keyPair.fromSecretKey(secret);
 }
@@ -4,9 +4,9 @@
 import { stringToU8a } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';

-import { naclKeypairFromSeed } from '..';
+import { ed25519PairFromSeed } from '..';

-describe('naclKeypairFromSeed', (): void => {
+describe('ed25519PairFromSeed', (): void => {
  // NOTE: Aligned with Rust test, b"12345678901234567890123456789012"
  const TEST = stringToU8a('12345678901234567890123456789012');
  const RESULT = {
@@ -33,7 +33,7 @@ describe('naclKeypairFromSeed', (): void => {
  it('generates a valid publicKey/secretKey pair (u8a)', (): void => {
    [true, false].forEach((onlyJs): void => {
      expect(
-        naclKeypairFromSeed(TEST, onlyJs)
+        ed25519PairFromSeed(TEST, onlyJs)
      ).toEqual(RESULT);
    });
  });
@@ -8,7 +8,7 @@ import nacl from 'tweetnacl';
 import { ed25519KeypairFromSeed, isReady } from '@polkadot/wasm-crypto';

 /**
- * @name naclKeypairFromSeed
+ * @name ed25519PairFromSeed
 * @summary Creates a new public/secret keypair from a seed.
 * @description
 * Returns a object containing a `publicKey` & `secretKey` generated from the supplied seed.
@@ -16,12 +16,12 @@ import { ed25519KeypairFromSeed, isReady } from '@polkadot/wasm-crypto';
 * <BR>
 *
 * ```javascript
- * import { naclKeypairFromSeed } from '@polkadot/util-crypto';
+ * import { ed25519PairFromSeed } from '@polkadot/util-crypto';
 *
- * naclKeypairFromSeed(...); // => { secretKey: [...], publicKey: [...] }
+ * ed25519PairFromSeed(...); // => { secretKey: [...], publicKey: [...] }
 * ```
 */
-export function naclKeypairFromSeed (seed: Uint8Array, onlyJs = false): Keypair {
+export function ed25519PairFromSeed (seed: Uint8Array, onlyJs?: boolean): Keypair {
  if (!onlyJs && isReady()) {
    const full = ed25519KeypairFromSeed(seed);

@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { naclKeypairFromString } from '..';
+import { ed25519PairFromString } from '..';

-describe('naclKeypairFromSeed', (): void => {
+describe('ed25519PairFromSeed', (): void => {
  it('generates a valid publicKey/secretKey pair', (): void => {
    expect(
-      naclKeypairFromString('test')
+      ed25519PairFromString('test')
    ).toEqual({
      publicKey: new Uint8Array([188, 108, 179, 142, 36, 142, 76, 87, 77, 193, 147, 139, 254, 110, 196, 217, 117, 233, 167, 165, 250, 150, 247, 237, 198, 68, 129, 4, 211, 209, 136, 48]),
      secretKey: new Uint8Array([146, 139, 32, 54, 105, 67, 226, 175, 209, 30, 188, 14, 174, 46, 83, 169, 59, 241, 119, 164, 252, 243, 91, 204, 100, 213, 3, 112, 78, 101, 226, 2, 188, 108, 179, 142, 36, 142, 76, 87, 77, 193, 147, 139, 254, 110, 196, 217, 117, 233, 167, 165, 250, 150, 247, 237, 198, 68, 129, 4, 211, 209, 136, 48])
@@ -6,10 +6,10 @@ import type { Keypair } from '../../types';
 import { stringToU8a } from '@polkadot/util';

 import { blake2AsU8a } from '../../blake2/asU8a';
-import { naclKeypairFromSeed } from './fromSeed';
+import { ed25519PairFromSeed } from './fromSeed';

 /**
- * @name naclKeypairFromString
+ * @name ed25519PairFromString
 * @summary Creates a new public/secret keypair from a string.
 * @description
 * Returns a object containing a `publicKey` & `secretKey` generated from the supplied string. The string is hashed and the value used as the input seed.
@@ -17,13 +17,13 @@ import { naclKeypairFromSeed } from './fromSeed';
 * <BR>
 *
 * ```javascript
- * import { naclKeypairFromString } from '@polkadot/util-crypto';
+ * import { ed25519PairFromString } from '@polkadot/util-crypto';
 *
- * naclKeypairFromString('test'); // => { secretKey: [...], publicKey: [...] }
+ * ed25519PairFromString('test'); // => { secretKey: [...], publicKey: [...] }
 * ```
 */
-export function naclKeypairFromString (value: string): Keypair {
-  return naclKeypairFromSeed(
+export function ed25519PairFromString (value: string): Keypair {
+  return ed25519PairFromSeed(
    blake2AsU8a(
      stringToU8a(value),
      256
@@ -4,9 +4,14 @@
 import { stringToU8a } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';

-import { naclKeypairFromSeed, naclSign } from '.';
+import { performanceWasm } from '../../test/performance';
+import { ed25519PairFromSeed, ed25519Sign } from '.';

-describe('naclSign', (): void => {
+const PAIR = ed25519PairFromSeed(
+  stringToU8a('12345678901234567890123456789012')
+);
+
+describe('ed25519Sign', (): void => {
  beforeEach(async (): Promise<void> => {
    await waitReady();
  });
@@ -14,11 +19,9 @@ describe('naclSign', (): void => {
  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
    it('returns a valid signature for the message', (): void => {
      expect(
-        naclSign(
+        ed25519Sign(
          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-          naclKeypairFromSeed(
-            stringToU8a('12345678901234567890123456789012')
-          ),
+          PAIR,
          onlyJs
        )
      ).toEqual(
@@ -26,4 +29,8 @@ describe('naclSign', (): void => {
      );
    });
  });
+
+  performanceWasm('ed25519Sign', 250, (input, onlyJs) =>
+    ed25519Sign(input, PAIR, onlyJs)
+  );
 });
@@ -7,10 +7,10 @@ import type { Keypair } from '../types';
 import nacl from 'tweetnacl';

 import { assert, u8aToU8a } from '@polkadot/util';
-import { ed25519Sign, isReady } from '@polkadot/wasm-crypto';
+import { ed25519Sign as wasmSign, isReady } from '@polkadot/wasm-crypto';

 /**
- * @name naclSign
+ * @name ed25519Sign
 * @summary Signs a message using the supplied secretKey
 * @description
 * Returns message signature of `message`, using the `secretKey`.
@@ -18,17 +18,17 @@ import { ed25519Sign, isReady } from '@polkadot/wasm-crypto';
 * <BR>
 *
 * ```javascript
- * import { naclSign } from '@polkadot/util-crypto';
+ * import { ed25519Sign } from '@polkadot/util-crypto';
 *
- * naclSign([...], [...]); // => [...]
+ * ed25519Sign([...], [...]); // => [...]
 * ```
 */
-export function naclSign (message: HexString | Uint8Array | string, { publicKey, secretKey }: Partial<Keypair>, onlyJs = false): Uint8Array {
+export function ed25519Sign (message: HexString | Uint8Array | string, { publicKey, secretKey }: Partial<Keypair>, onlyJs?: boolean): Uint8Array {
  assert(secretKey, 'Expected a valid secretKey');

  const messageU8a = u8aToU8a(message);

-  return isReady() && !onlyJs
-    ? ed25519Sign(publicKey as Uint8Array, secretKey.subarray(0, 32), messageU8a)
+  return !onlyJs && isReady()
+    ? wasmSign(publicKey as Uint8Array, secretKey.subarray(0, 32), messageU8a)
    : nacl.sign.detached(messageU8a, secretKey);
 }
@@ -4,16 +4,16 @@
 import { stringToU8a } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';

-import { naclKeypairFromSeed, naclVerify } from '.';
+import { ed25519PairFromSeed, ed25519Verify } from '.';

-describe('naclVerify', (): void => {
+describe('ed25519Verify', (): void => {
  let publicKey: Uint8Array;
  let signature: Uint8Array;

  beforeEach(async (): Promise<void> => {
    await waitReady();

-    publicKey = naclKeypairFromSeed(
+    publicKey = ed25519PairFromSeed(
      stringToU8a('12345678901234567890123456789012')
    ).publicKey;
    signature = new Uint8Array([28, 58, 206, 239, 249, 70, 59, 191, 166, 40, 219, 218, 235, 170, 25, 79, 10, 94, 9, 197, 34, 126, 1, 150, 246, 68, 28, 238, 36, 26, 172, 163, 168, 90, 202, 211, 126, 246, 57, 212, 43, 24, 88, 197, 240, 113, 118, 76, 37, 81, 91, 110, 236, 50, 144, 134, 100, 223, 220, 238, 34, 185, 211, 7]);
@@ -22,7 +22,7 @@ describe('naclVerify', (): void => {
  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
    it('validates a correctly signed message', (): void => {
      expect(
-        naclVerify(
+        ed25519Verify(
          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
          signature,
          publicKey,
@@ -33,7 +33,7 @@ describe('naclVerify', (): void => {

    it('fails a correctly signed message (message changed)', (): void => {
      expect(
-        naclVerify(
+        ed25519Verify(
          new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
          signature,
          publicKey,
@@ -46,7 +46,7 @@ describe('naclVerify', (): void => {
      signature[0] = 0xff;

      expect(
-        naclVerify(
+        ed25519Verify(
          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
          signature,
          publicKey,
@@ -57,7 +57,7 @@ describe('naclVerify', (): void => {

    it('throws error when publicKey lengths do not match', (): void => {
      expect(
-        () => naclVerify(
+        () => ed25519Verify(
          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
          signature,
          new Uint8Array([1, 2]),
@@ -68,7 +68,7 @@ describe('naclVerify', (): void => {

    it('throws error when signature lengths do not match', (): void => {
      expect(
-        () => naclVerify(
+        () => ed25519Verify(
          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
          new Uint8Array([1, 2]),
          publicKey,
@@ -6,10 +6,10 @@ import type { HexString } from '@polkadot/util/types';
 import nacl from 'tweetnacl';

 import { assert, u8aToU8a } from '@polkadot/util';
-import { ed25519Verify, isReady } from '@polkadot/wasm-crypto';
+import { ed25519Verify as wasmVerify, isReady } from '@polkadot/wasm-crypto';

 /**
- * @name naclSign
+ * @name ed25519Sign
 * @summary Verifies the signature on the supplied message.
 * @description
 * Verifies the `signature` on `message` with the supplied `publicKey`. Returns `true` on sucess, `false` otherwise.
@@ -17,12 +17,12 @@ import { ed25519Verify, isReady } from '@polkadot/wasm-crypto';
 * <BR>
 *
 * ```javascript
- * import { naclVerify } from '@polkadot/util-crypto';
+ * import { ed25519Verify } from '@polkadot/util-crypto';
 *
- * naclVerify([...], [...], [...]); // => true/false
+ * ed25519Verify([...], [...], [...]); // => true/false
 * ```
 */
-export function naclVerify (message: HexString | Uint8Array | string, signature: HexString | Uint8Array | string, publicKey: HexString | Uint8Array | string, onlyJs = false): boolean {
+export function ed25519Verify (message: HexString | Uint8Array | string, signature: HexString | Uint8Array | string, publicKey: HexString | Uint8Array | string, onlyJs?: boolean): boolean {
  const messageU8a = u8aToU8a(message);
  const publicKeyU8a = u8aToU8a(publicKey);
  const signatureU8a = u8aToU8a(signature);
@@ -30,7 +30,7 @@ export function naclVerify (message: HexString | Uint8Array | string, signature:
  assert(publicKeyU8a.length === 32, () => `Invalid publicKey, received ${publicKeyU8a.length}, expected 32`);
  assert(signatureU8a.length === 64, () => `Invalid signature, received ${signatureU8a.length} bytes, expected 64`);

-  return isReady() && !onlyJs
-    ? ed25519Verify(signatureU8a, messageU8a, publicKeyU8a)
+  return !onlyJs && isReady()
+    ? wasmVerify(signatureU8a, messageU8a, publicKeyU8a)
    : nacl.sign.detached.verify(messageU8a, signatureU8a, publicKeyU8a);
 }
@@ -29,8 +29,8 @@ export function ethereumEncode (addressOrPublic?: HexString | string | Uint8Arra
  const hash = u8aToHex(keccakAsU8a(address), -1, false);
  let result = '';

-  for (let index = 0; index < 40; index++) {
-    result = `${result}${parseInt(hash[index], 16) > 7 ? address[index].toUpperCase() : address[index]}`;
+  for (let i = 0; i < 40; i++) {
+    result = `${result}${parseInt(hash[i], 16) > 7 ? address[i].toUpperCase() : address[i]}`;
  }

  return `0x${result}`;
@@ -17,8 +17,8 @@ export function isEthereumChecksum (_address: string): boolean {
  const address = _address.replace('0x', '');
  const hash = u8aToHex(keccakAsU8a(address.toLowerCase()), -1, false);

-  for (let index = 0; index < 40; index++) {
-    if (isInvalidChar(address[index], parseInt(hash[index], 16))) {
+  for (let i = 0; i < 40; i++) {
+    if (isInvalidChar(address[i], parseInt(hash[i], 16))) {
      return false;
    }
  }
@@ -5,8 +5,9 @@ import type { Keypair } from '../../types';

 import { assert, bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';

-import { hmacSha512 } from '../../hmac';
-import { secp256k1KeypairFromSeed, secp256k1PrivateKeyTweakAdd } from '../../secp256k1';
+import { BN_BE_32_OPTS } from '../../bn';
+import { hmacShaAsU8a } from '../../hmac';
+import { secp256k1PairFromSeed, secp256k1PrivateKeyTweakAdd } from '../../secp256k1';
 import { HARDENED, hdValidatePath } from '../validatePath';

 interface CodedKeypair extends Keypair {
@@ -18,19 +19,19 @@ const MASTER_SECRET = stringToU8a('Bitcoin seed');
 function createCoded (secretKey: Uint8Array, chainCode: Uint8Array): CodedKeypair {
  return {
    chainCode,
-    publicKey: secp256k1KeypairFromSeed(secretKey).publicKey,
+    publicKey: secp256k1PairFromSeed(secretKey).publicKey,
    secretKey
  };
 }

 function deriveChild (hd: CodedKeypair, index: number): CodedKeypair {
-  const indexBuffer = bnToU8a(index, { bitLength: 32, isLe: false });
+  const indexBuffer = bnToU8a(index, BN_BE_32_OPTS);
  const data = index >= HARDENED
    ? u8aConcat(new Uint8Array(1), hd.secretKey, indexBuffer)
    : u8aConcat(hd.publicKey, indexBuffer);

  try {
-    const I = hmacSha512(hd.chainCode, data);
+    const I = hmacShaAsU8a(hd.chainCode, data, 512);

    return createCoded(
      secp256k1PrivateKeyTweakAdd(hd.secretKey, I.slice(0, 32)),
@@ -43,8 +44,8 @@ function deriveChild (hd: CodedKeypair, index: number): CodedKeypair {
 }

 export function hdEthereum (seed: Uint8Array, path = ''): Keypair {
-  const I = hmacSha512(MASTER_SECRET, seed);
-  const hd = createCoded(I.slice(0, 32), I.slice(32));
+  const I = hmacShaAsU8a(MASTER_SECRET, seed, 512);
+  let hd = createCoded(I.slice(0, 32), I.slice(32));

  if (!path || path === 'm' || path === 'M' || path === "m'" || path === "M'") {
    return hd;
@@ -52,16 +53,15 @@ export function hdEthereum (seed: Uint8Array, path = ''): Keypair {

  assert(hdValidatePath(path), 'Invalid derivation path');

-  return path
-    .split('/')
-    .slice(1)
-    .reduce((hd: CodedKeypair, c): CodedKeypair =>
-      deriveChild(
-        hd, parseInt(c, 10) + (
-          (c.length > 1) && c.endsWith("'")
-            ? HARDENED
-            : 0
-        )
-      ), hd
-    );
+  const parts = path.split('/').slice(1);
+
+  for (const p of parts) {
+    hd = deriveChild(hd, parseInt(p, 10) + (
+      (p.length > 1) && p.endsWith("'")
+        ? HARDENED
+        : 0
+    ));
+  }
+
+  return hd;
 }
@@ -3,27 +3,32 @@

 import { BN_EIGHT, bnToU8a, u8aConcat, u8aToBn } from '@polkadot/util';

-import { hmacSha512 } from '../../hmac';
+import { BN_LE_32_OPTS, BN_LE_512_OPTS, BN_LE_OPTS } from '../../bn';
+import { hmacShaAsU8a } from '../../hmac';

 // performs hard-only derivation on the xprv
 export function ledgerDerivePrivate (xprv: Uint8Array, index: number): Uint8Array {
  const kl = xprv.subarray(0, 32);
  const kr = xprv.subarray(32, 64);
  const cc = xprv.subarray(64, 96);
-  const data = u8aConcat([0], kl, kr, bnToU8a(index, { bitLength: 32, isLe: true }));
-  const z = hmacSha512(cc, data);
+  const data = u8aConcat([0], kl, kr, bnToU8a(index, BN_LE_32_OPTS));
+  const z = hmacShaAsU8a(cc, data, 512);

  data[0] = 0x01;

  return u8aConcat(
    bnToU8a(
-      u8aToBn(kl, { isLe: true }).iadd(u8aToBn(z.subarray(0, 28), { isLe: true }).imul(BN_EIGHT)),
-      { bitLength: 512, isLe: true }
+      u8aToBn(kl, BN_LE_OPTS).iadd(
+        u8aToBn(z.subarray(0, 28), BN_LE_OPTS).imul(BN_EIGHT)
+      ),
+      BN_LE_512_OPTS
    ).subarray(0, 32),
    bnToU8a(
-      u8aToBn(kr, { isLe: true }).iadd(u8aToBn(z.subarray(32, 64), { isLe: true })),
-      { bitLength: 512, isLe: true }
+      u8aToBn(kr, BN_LE_OPTS).iadd(
+        u8aToBn(z.subarray(32, 64), BN_LE_OPTS)
+      ),
+      BN_LE_512_OPTS
    ).subarray(0, 32),
-    hmacSha512(cc, data).subarray(32, 64)
+    hmacShaAsU8a(cc, data, 512).subarray(32, 64)
  );
 }
@@ -5,34 +5,35 @@ import type { Keypair } from '../../types';

 import { assert } from '@polkadot/util';

+import { ed25519PairFromSeed } from '../../ed25519';
 import { mnemonicValidate } from '../../mnemonic';
-import { naclKeypairFromSeed } from '../../nacl';
 import { HARDENED, hdValidatePath } from '../validatePath';
 import { ledgerDerivePrivate } from './derivePrivate';
 import { ledgerMaster } from './master';

 export function hdLedger (_mnemonic: string, path: string): Keypair {
-  const parts = _mnemonic
+  const words = _mnemonic
    .split(' ')
    .map((s) => s.trim())
    .filter((s) => s);

-  assert([12, 24, 25].includes(parts.length), 'Expected a mnemonic with 24 words (or 25 including a password)');
+  assert([12, 24, 25].includes(words.length), 'Expected a mnemonic with 24 words (or 25 including a password)');

-  const [mnemonic, password] = parts.length === 25
-    ? [parts.slice(0, 24).join(' '), parts[24]]
-    : [parts.join(' '), ''];
+  const [mnemonic, password] = words.length === 25
+    ? [words.slice(0, 24).join(' '), words[24]]
+    : [words.join(' '), ''];

  assert(mnemonicValidate(mnemonic), 'Invalid mnemonic passed to ledger derivation');
  assert(hdValidatePath(path), 'Invalid derivation path');

-  return naclKeypairFromSeed(
-    path
-      .split('/')
-      .slice(1)
-      .map((n) => parseInt(n.replace(/'$/, ''), 10))
-      .map((n) => (n < HARDENED) ? (n + HARDENED) : n)
-      .reduce((x, n) => ledgerDerivePrivate(x, n), ledgerMaster(mnemonic, password))
-      .slice(0, 32)
-  );
+  const parts = path.split('/').slice(1);
+  let seed = ledgerMaster(mnemonic, password);
+
+  for (const p of parts) {
+    const n = parseInt(p.replace(/'$/, ''), 10);
+
+    seed = ledgerDerivePrivate(seed, (n < HARDENED) ? (n + HARDENED) : n);
+  }
+
+  return ed25519PairFromSeed(seed.slice(0, 32));
 }
@@ -3,7 +3,7 @@

 import { u8aConcat } from '@polkadot/util';

-import { hmacSha256, hmacSha512 } from '../../hmac';
+import { hmacShaAsU8a } from '../../hmac';
 import { mnemonicToSeedSync } from '../../mnemonic/bip39';

 const ED25519_CRYPTO = 'ed25519 seed';
@@ -11,11 +11,11 @@ const ED25519_CRYPTO = 'ed25519 seed';
 // gets an xprv from a mnemonic
 export function ledgerMaster (mnemonic: string, password?: string): Uint8Array {
  const seed = mnemonicToSeedSync(mnemonic, password);
-  const chainCode = hmacSha256(ED25519_CRYPTO, new Uint8Array([1, ...seed]));
+  const chainCode = hmacShaAsU8a(ED25519_CRYPTO, new Uint8Array([1, ...seed]), 256);
  let priv;

  while (!priv || (priv[31] & 0b0010_0000)) {
-    priv = hmacSha512(ED25519_CRYPTO, priv || seed);
+    priv = hmacShaAsU8a(ED25519_CRYPTO, priv || seed, 512);
  }

  priv[0] &= 0b1111_1000;
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`packages/util-crypto/src/noble-hashes/lib/*.ts`