[CI Skip] release/stable 7.0.2

skip-checks: true

.123trigger

@@ -1,5 +1,4 @@
-7
-
+8
 2.6.2
 2.12.2
 5.2.2
@@ -15,3 +14,5 @@
 6.0.3
 6.0.4
 6.0.5
+
+7.0.2

.github/workflows/lock.yml

@@ -0,0 +1,23 @@
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '30 1/2 * * *'
+
+jobs:
+  lock:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          github-token: ${{ secrets.GH_PAT_BOT }}
+          issue-lock-inactive-days: '7'
+          issue-lock-comment: >
+            This thread has been automatically locked since there has not been
+            any recent activity after it was closed. Please open a new issue
+            if you think you have a related problem or query.
+          pr-lock-inactive-days: '2'
+          pr-lock-comment: >
+            This pull request has been automatically locked since there
+            has not been any recent activity after it was closed.
+            Please open a new issue for related bugs.

.github/workflows/push-master.yml

@@ -6,11 +6,11 @@ on:
 
 jobs:
   master:
+    if: "! startsWith(github.event.head_commit.message, '[CI Skip]')"
     strategy:
       matrix:
         step: ['build:release']
     name: ${{ matrix.step }}
-    if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && github.repository == 'polkadot-js/common'"
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
@@ -25,10 +25,3 @@ jobs:
       run: |
         yarn install --immutable | grep -v 'YN0013'
         yarn ${{ matrix.step }}
-
-  dummy:
-    runs-on: ubuntu-latest
-    steps:
-    - name: dummy
-      run: |
-        echo "Dummy skip step"

.github/workflows/semgrep.yml

@@ -0,0 +1,18 @@
+name: Semgrep
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+
+jobs:
+  check:
+    if: "! startsWith(github.event.head_commit.message, '[CI Skip]') && (!github.event.pull_request || github.event.pull_request.head.repo.full_name == github.repository)"
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: returntocorp/semgrep-action@v1
+        with:
+          auditOn: push
+          publishToken: ${{ secrets.SEMGREP_APP_TOKEN }}
+          publishDeployment: 1395

.github/workflows/stale.yml

@@ -0,0 +1,17 @@
+name: 'Close stale issues and PRs'
+on:
+  schedule:
+    - cron: '30 2/2 * * *'
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/stale@v3
+        with:
+          repo-token: ${{ secrets.GH_PAT_BOT }}
+          stale-issue-message: 'This issue has been open for 21 days with no activity and is not labelled as an enhancement. It will be closed in 7 days.'
+          stale-issue-label: 'stale'
+          exempt-issue-labels: '-size-l,-size-m,-size-s,-size-xl,-size-xs,[bug],ci'
+          days-before-stale: 21
+          days-before-close: 7

.prettierignore

@@ -0,0 +1,3 @@
+build
+coverage
+packages

.prettierrc.cjs

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

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
 
-yarnPath: .yarn/releases/yarn-2.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.0.0-rc.2.cjs

CHANGELOG.md

@@ -1,5 +1,102 @@
 # CHANGELOG
 
+## 7.0.2 Jul 19, 2021
+
+Changes:
+
+- Added `isCompact` utility for check on compact-like types
+- Sync with upstream Substrate ss58 registry
+
+
+## 7.0.1 Jul 11, 2021
+
+- **Breaking change** The `@polkadot/x-rxjs` package has been removed. In `rxjs` 7.2.0 the compatibility issues at the base layer has been solved.
+- **Breaking change** The named exports in `@polkadot/networks` has been changed
+
+Contributed:
+
+- Add Ledger config for Centrifuge (Thanks to https://github.com/mikiquantum)
+
+Changes:
+
+- Adjust `@polkadot/networks` to fully-descriptive exports
+- Remove `@polkadot/x-rxjs`, direct import from `rxjs >= 7.2.0` required
+- Allow building as a completely stand-alone browser bundle (experimental)
+- Sync with upstream Substrate ss58 registry
+
+
+## 6.11.1 Jul 5, 2021
+
+Changes:
+
+- Cleanup unneeded dependencies for `@polkadot/x-global`
+- Sync with upstream Substrate ss58 registry
+- Bump Zondax dependencies (Statemine slip44 fix)
+
+
+## 6.10.1 Jun 26, 2021
+
+Contributed:
+
+- Add Karura genesisHash (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- `isHex(value)` will now check for only `string` types (No `String` classes)
+- Added `arrayShuffle(array)` to shuffle an array into a new output
+- Added Statemine Ledger app information
+- Simplify tests to use `{describe|it}.each` where applicable
+- Sync with upstream Substrate ss58 registry
+
+
+## 6.9.1 Jun 19, 2021
+
+Changes:
+
+- Added `u8aCmp(a, b)` to do sorting compares
+- Added `arrayRange(size, startAt = 0)` to create a range of numbers
+- Added extensive mnemonic compare test (optional, skipped)
+
+
+## 6.8.1 Jun 14, 2021
+
+Contributed:
+
+- Add Ledger support for Edgeware (Thanks to https://github.com/raykyri)
+- Fix `naclSeal` doc types (Thanks to https://github.com/agustinustheo)
+
+Changes:
+
+- Export `BN` in `@polkadot/util`
+- Sync with upstream Substrate ss58 registry
+
+
+## 6.7.1 Jun 6, 2021
+
+Changes:
+
+- Add WebHID transport for Ledger
+- Update to latest Ledger transport packages
+- Remove old `Gerald` key for Moonbeam
+- Cleanup testing keyring semgrep recommendations
+
+
+## 6.6.1 May 29, 2021
+
+Changes:
+
+- Adjust HD path validation & replacement
+- Sync with Substrate ss58 registry
+
+
+## 6.5.1 May 22, 2021
+
+Changes:
+
+- Allow hdLedger derivation with optional 25th word password
+- Sync with Substrate ss58 registry
+
+
 ## 6.4.1 May 15, 2021
 
 Contributed:

package.json

@@ -7,24 +7,26 @@
     "packages/*"
   ],
   "resolutions": {
-    "typescript": "^4.2.4"
+    "typescript": "^4.3.5"
   },
   "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",
     "networks:crosscheck": "polkadot-dev-run-test packages/networks/src/crosscheck",
     "networks:sync": "node packages/networks/scripts/fromSubstrate.mjs",
     "postinstall": "polkadot-dev-yarn-only",
-    "test": "polkadot-dev-run-test --coverage --runInBand --testPathIgnorePatterns crosscheck",
-    "test:one": "polkadot-dev-run-test"
+    "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.14.2",
-    "@polkadot/dev": "^0.62.14",
-    "@polkadot/ts": "^0.3.66",
-    "@types/jest": "^26.0.23"
+    "@babel/core": "^7.14.6",
+    "@polkadot/dev": "^0.62.57",
+    "@polkadot/ts": "^0.4.4",
+    "@types/jest": "^26.0.24"
   },
-  "version": "6.4.1"
+  "version": "7.0.2"
 }

packages/hw-ledger-transports/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/hw-ledger-transports",
-  "version": "6.4.1",
+  "version": "7.0.2",
   "type": "module",
   "repository": "github:polkadot-js/common",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -15,14 +15,12 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
-    "@ledgerhq/hw-transport-webusb": "^5.51.1"
-  },
-  "devDependencies": {
-    "@types/ledgerhq__hw-transport-node-hid": "^4.22.2",
-    "@types/ledgerhq__hw-transport-webusb": "^4.70.1"
+    "@babel/runtime": "^7.14.6",
+    "@ledgerhq/hw-transport": "^6.1.0",
+    "@ledgerhq/hw-transport-webhid": "^6.1.0",
+    "@ledgerhq/hw-transport-webusb": "^6.1.0"
   },
   "optionalDependencies": {
-    "@ledgerhq/hw-transport-node-hid-singleton": "^5.51.1"
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.1.0"
   }
 }

packages/hw-ledger-transports/src/browser.ts

@@ -4,7 +4,8 @@
 import type Transport from '@ledgerhq/hw-transport';
 import type { TransportDef } from './types';
 
-import LedgerWebUSB from '@ledgerhq/hw-transport-webusb';
+import LedgerWebHid from '@ledgerhq/hw-transport-webhid';
+import LedgerWebUsb from '@ledgerhq/hw-transport-webusb';
 
 export { packageInfo } from './packageInfo';
 
@@ -18,7 +19,12 @@ export const transports: TransportDef[] = [
   // },
   {
     create: (): Promise<Transport> =>
-      LedgerWebUSB.create(),
+      LedgerWebUsb.create(),
     type: 'webusb'
+  },
+  {
+    create: (): Promise<Transport> =>
+      LedgerWebHid.create(),
+    type: 'hid'
   }
 ];

packages/hw-ledger-transports/src/ledgerhq.d.ts

@@ -1,15 +0,0 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-declare module '@ledgerhq/hw-transport-node-hid-noevents' {
-  import Transport from '@ledgerhq/hw-transport';
-
-  export default class TransportNodeHidNoEvents extends Transport<string> {}
-  export function getDevices(): Array<unknown>
-}
-
-declare module '@ledgerhq/hw-transport-node-hid-singleton' {
-  import TransportNodeHidNoEvents from '@ledgerhq/hw-transport-node-hid-noevents';
-
-  export default class TransportNodeHid extends TransportNodeHidNoEvents { }
-}

packages/hw-ledger-transports/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '6.4.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '7.0.2' };

packages/hw-ledger/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/hw-ledger",
-  "version": "6.4.1",
+  "version": "7.0.2",
   "type": "module",
   "repository": "github:polkadot-js/common",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -16,9 +16,9 @@
     "node": ">=14.0.0"
   },
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
-    "@polkadot/hw-ledger-transports": "6.4.1",
-    "@polkadot/util": "^6.4.1",
-    "@zondax/ledger-polkadot": "^0.13.6"
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/hw-ledger-transports": "7.0.2",
+    "@polkadot/util": "^7.0.2",
+    "@zondax/ledger-substrate": "^0.16.2"
   }
 }

packages/hw-ledger/src/bundle.ts

@@ -0,0 +1,103 @@
+// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { ResponseBase, SubstrateApp } from '@zondax/ledger-substrate';
+import type { AccountOptions, LedgerAddress, LedgerSignature, LedgerTypes, LedgerVersion } from './types';
+
+import { transports } from '@polkadot/hw-ledger-transports';
+import { assert, u8aToBuffer } from '@polkadot/util';
+
+import { LEDGER_DEFAULT_ACCOUNT, LEDGER_DEFAULT_CHANGE, LEDGER_DEFAULT_INDEX, LEDGER_SUCCESS_CODE } from './constants';
+import { ledgerApps } from './defaults';
+
+export { packageInfo } from './packageInfo';
+
+type Chain = keyof typeof ledgerApps;
+
+// A very basic wrapper for a ledger app -
+//  - it connects automatically, creating an app as required
+//  - Promises return errors (instead of wrapper errors)
+export class Ledger {
+  #app: SubstrateApp | null = null;
+
+  #chain: Chain;
+
+  #transport: LedgerTypes;
+
+  constructor (transport: LedgerTypes, chain: Chain) {
+    // u2f is deprecated
+    assert(['hid', 'webusb'].includes(transport), () => `Unsupported transport ${transport}`);
+    assert(Object.keys(ledgerApps).includes(chain), () => `Unsupported chain ${chain}`);
+
+    this.#chain = chain;
+    this.#transport = transport;
+  }
+
+  public async getAddress (confirm = false, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerAddress> {
+    return this.#withApp(async (app: SubstrateApp): Promise<LedgerAddress> => {
+      const { address, pubKey } = await this.#wrapError(app.getAddress(account + accountOffset, change, addressIndex + addressOffset, confirm));
+
+      return {
+        address,
+        publicKey: `0x${pubKey}`
+      };
+    });
+  }
+
+  public async getVersion (): Promise<LedgerVersion> {
+    return this.#withApp(async (app: SubstrateApp): Promise<LedgerVersion> => {
+      const { device_locked: isLocked, major, minor, patch, test_mode: isTestMode } = await this.#wrapError(app.getVersion());
+
+      return {
+        isLocked,
+        isTestMode,
+        version: [major, minor, patch]
+      };
+    });
+  }
+
+  public async sign (message: Uint8Array, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerSignature> {
+    return this.#withApp(async (app: SubstrateApp): Promise<LedgerSignature> => {
+      const buffer = u8aToBuffer(message);
+      const { signature } = await this.#wrapError(app.sign(account + accountOffset, change, addressIndex + addressOffset, buffer));
+
+      return {
+        signature: `0x${signature.toString('hex')}`
+      };
+    });
+  }
+
+  #getApp = async (): Promise<SubstrateApp> => {
+    if (!this.#app) {
+      const def = transports.find(({ type }) => type === this.#transport);
+
+      assert(def, () => `Unable to find a transport for ${this.#transport}`);
+
+      const transport = await def.create();
+
+      this.#app = ledgerApps[this.#chain](transport);
+    }
+
+    return this.#app;
+  };
+
+  #withApp = async <T> (fn: (app: SubstrateApp) => Promise<T>): Promise<T> => {
+    try {
+      const app = await this.#getApp();
+
+      return await fn(app);
+    } catch (error) {
+      this.#app = null;
+
+      throw error;
+    }
+  };
+
+  #wrapError = async <T extends ResponseBase> (promise: Promise<T>): Promise<T> => {
+    const result = await promise;
+
+    assert(result.return_code === LEDGER_SUCCESS_CODE, () => result.error_message);
+
+    return result;
+  };
+}

packages/hw-ledger/src/defaults.ts

@@ -2,16 +2,18 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type Transport from '@ledgerhq/hw-transport';
-import type { SubstrateApp } from '@zondax/ledger-polkadot';
+import type { SubstrateApp } from '@zondax/ledger-substrate';
 
-import { newDockApp, newKusamaApp, newPolkadotApp, newPolymeshApp } from '@zondax/ledger-polkadot';
+import { newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newKusamaApp, newPolkadotApp, newPolymeshApp, newStatemineApp } from '@zondax/ledger-substrate';
 
-// These match up with the network keys in the @polkadot/networks package
-// (which is turn aligns with the substrate/ss58-registry.json as the single
-// source of truth)
+// These match up with the keys of the knownLedger object in the @polkadot/networks/defaults.ts
 export const ledgerApps: Record<string, (transport: Transport) => SubstrateApp> = {
+  centrifuge: newCentrifugeApp,
   'dock-mainnet': newDockApp,
+  edgeware: newEdgewareApp,
+  equilibrium: newEquilibriumApp,
   kusama: newKusamaApp,
   polkadot: newPolkadotApp,
-  polymesh: newPolymeshApp
+  polymesh: newPolymeshApp,
+  statemine: newStatemineApp
 };

packages/hw-ledger/src/index.ts

@@ -3,103 +3,4 @@
 
 import './detectPackage';
 
-import type { ResponseBase, SubstrateApp } from '@zondax/ledger-polkadot';
-import type { AccountOptions, LedgerAddress, LedgerSignature, LedgerTypes, LedgerVersion } from './types';
-
-import { transports } from '@polkadot/hw-ledger-transports';
-import { assert, u8aToBuffer } from '@polkadot/util';
-
-import { LEDGER_DEFAULT_ACCOUNT, LEDGER_DEFAULT_CHANGE, LEDGER_DEFAULT_INDEX, LEDGER_SUCCESS_CODE } from './constants';
-import { ledgerApps } from './defaults';
-
-export { packageInfo } from './packageInfo';
-
-type Chain = keyof typeof ledgerApps;
-
-// A very basic wrapper for a ledger app -
-//  - it connects automatically, creating an app as required
-//  - Promises return errors (instead of wrapper errors)
-export class Ledger {
-  #app: SubstrateApp | null = null;
-
-  #chain: Chain;
-
-  #transport: LedgerTypes;
-
-  constructor (transport: LedgerTypes, chain: Chain) {
-    // u2f is deprecated
-    assert(['hid', 'webusb'].includes(transport), () => `Unsupported transport ${transport}`);
-    assert(Object.keys(ledgerApps).includes(chain), () => `Unsupported chain ${chain}`);
-
-    this.#chain = chain;
-    this.#transport = transport;
-  }
-
-  public async getAddress (confirm = false, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerAddress> {
-    return this.#withApp(async (app: SubstrateApp): Promise<LedgerAddress> => {
-      const { address, pubKey } = await this.#wrapError(app.getAddress(account + accountOffset, change, addressIndex + addressOffset, confirm));
-
-      return {
-        address,
-        publicKey: `0x${pubKey}`
-      };
-    });
-  }
-
-  public async getVersion (): Promise<LedgerVersion> {
-    return this.#withApp(async (app: SubstrateApp): Promise<LedgerVersion> => {
-      const { device_locked: isLocked, major, minor, patch, test_mode: isTestMode } = await this.#wrapError(app.getVersion());
-
-      return {
-        isLocked,
-        isTestMode,
-        version: [major, minor, patch]
-      };
-    });
-  }
-
-  public async sign (message: Uint8Array, accountOffset = 0, addressOffset = 0, { account = LEDGER_DEFAULT_ACCOUNT, addressIndex = LEDGER_DEFAULT_INDEX, change = LEDGER_DEFAULT_CHANGE }: Partial<AccountOptions> = {}): Promise<LedgerSignature> {
-    return this.#withApp(async (app: SubstrateApp): Promise<LedgerSignature> => {
-      const buffer = u8aToBuffer(message);
-      const { signature } = await this.#wrapError(app.sign(account + accountOffset, change, addressIndex + addressOffset, buffer));
-
-      return {
-        signature: `0x${signature.toString('hex')}`
-      };
-    });
-  }
-
-  #getApp = async (): Promise<SubstrateApp> => {
-    if (!this.#app) {
-      const def = transports.find(({ type }) => type === this.#transport);
-
-      assert(def, () => `Unable to find a transport for ${this.#transport}`);
-
-      const transport = await def.create();
-
-      this.#app = ledgerApps[this.#chain](transport);
-    }
-
-    return this.#app;
-  };
-
-  #withApp = async <T> (fn: (app: SubstrateApp) => Promise<T>): Promise<T> => {
-    try {
-      const app = await this.#getApp();
-
-      return await fn(app);
-    } catch (error) {
-      this.#app = null;
-
-      throw error;
-    }
-  };
-
-  #wrapError = async <T extends ResponseBase> (promise: Promise<T>): Promise<T> => {
-    const result = await promise;
-
-    assert(result.return_code === LEDGER_SUCCESS_CODE, () => result.error_message);
-
-    return result;
-  };
-}
+export * from './bundle';

packages/hw-ledger/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/hw-ledger', version: '6.4.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger', version: '7.0.2' };

packages/keyring/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/keyring",
-  "version": "6.4.1",
+  "version": "7.0.2",
   "type": "module",
   "description": "Keyring management",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -19,12 +19,12 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/keyring#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
-    "@polkadot/util": "6.4.1",
-    "@polkadot/util-crypto": "6.4.1"
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/util": "7.0.2",
+    "@polkadot/util-crypto": "7.0.2"
   },
   "peerDependencies": {
-    "@polkadot/util": "6.4.1",
-    "@polkadot/util-crypto": "6.4.1"
+    "@polkadot/util": "7.0.2",
+    "@polkadot/util-crypto": "7.0.2"
   }
 }

packages/keyring/src/bundle.ts

@@ -0,0 +1,14 @@
+// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { Keyring } from './keyring';
+
+export { decodeAddress, encodeAddress, setSS58Format } from '@polkadot/util-crypto';
+
+export * from './defaults';
+export { createPair } from './pair';
+export { packageInfo } from './packageInfo';
+export { createTestKeyring } from './testing';
+export { createTestPairs } from './testingPairs';
+
+export { Keyring };

packages/keyring/src/index.ts

@@ -3,12 +3,8 @@
 
 import './detectPackage';
 
-import { Keyring } from './keyring';
+import { Keyring } from './bundle';
 
-export { decodeAddress, encodeAddress, setSS58Format } from '@polkadot/util-crypto';
-
-export { packageInfo } from './packageInfo';
+export * from './bundle';
 
 export default Keyring;
-
-export { Keyring };

packages/keyring/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/keyring', version: '6.4.1' };
+export const packageInfo = { name: '@polkadot/keyring', version: '7.0.2' };

packages/keyring/src/pair/index.spec.ts

@@ -183,11 +183,5 @@ describe('pair', (): void => {
       });
       expect(json.address).toEqual(u8aToHex(PUBLICDERIVED));
     });
-
-    it('has Gerald as test address for Ethereum type parachains', (): void => {
-      const keyringEthereum = createTestPairs({ type: 'ethereum' }, false);
-
-      expect(keyringEthereum.Gerald.address).toEqual('0x6Be02d1d3665660d22FF9624b7BE0551ee1Ac91b');
-    });
   });
 });

packages/keyring/src/pair/index.ts

@@ -176,8 +176,11 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     toJson: (passphrase?: string): KeyringPair$Json => {
       // NOTE: For ecdsa and ethereum, the publicKey cannot be extracted from the address. For these
       // pass the hex-encoded publicKey through to the address portion of the JSON (before decoding)
+      // unless the publicKey is already an address
       const address = ['ecdsa', 'ethereum'].includes(type)
-        ? u8aToHex(secp256k1Compress(publicKey))
+        ? publicKey.length === 20
+          ? u8aToHex(publicKey)
+          : u8aToHex(secp256k1Compress(publicKey))
         : encodeAddress();
 
       return pairToJson(type, { address, meta }, recode(passphrase), !!passphrase);

packages/keyring/src/testing.ts

@@ -24,49 +24,49 @@ interface PairDef {
 export const PAIRSSR25519: PairDef[] = [
   {
     publicKey: hexToU8a('0xd43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d'),
-    secretKey: hexToU8a('0x98319d4ff8a9508c4bb0cf0b5a78d760a0b2082c02775e6e82370816fedfff48925a225d97aa00682d6a59b95b18780c10d7032336e88f3442b42361f4a66011'),
+    secretKey: hexToU8a('0x98319d4ff8a9508c4bb0cf0b5a78d760a0b2082c02775e6e82370816fedfff48925a225d97aa00682d6a59b95b18780c10d7032336e88f3442b42361f4a66011'), // nosemgrep
     seed: 'Alice',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0xbe5ddb1579b72e84524fc29e78609e3caf42e85aa118ebfe0b0ad404b5bdd25f'),
-    secretKey: hexToU8a('0xe8da6c9d810e020f5e3c7f5af2dea314cbeaa0d72bc6421e92c0808a0c584a6046ab28e97c3ffc77fe12b5a4d37e8cd4afbfebbf2391ffc7cb07c0f38c023efd'),
+    secretKey: hexToU8a('0xe8da6c9d810e020f5e3c7f5af2dea314cbeaa0d72bc6421e92c0808a0c584a6046ab28e97c3ffc77fe12b5a4d37e8cd4afbfebbf2391ffc7cb07c0f38c023efd'), // nosemgrep
     seed: 'Alice//stash',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48'),
-    secretKey: hexToU8a('0x081ff694633e255136bdb456c20a5fc8fed21f8b964c11bb17ff534ce80ebd5941ae88f85d0c1bfc37be41c904e1dfc01de8c8067b0d6d5df25dd1ac0894a325'),
+    secretKey: hexToU8a('0x081ff694633e255136bdb456c20a5fc8fed21f8b964c11bb17ff534ce80ebd5941ae88f85d0c1bfc37be41c904e1dfc01de8c8067b0d6d5df25dd1ac0894a325'), // nosemgrep
     seed: 'Bob',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0xfe65717dad0447d715f660a0a58411de509b42e6efb8375f562f58a554d5860e'),
-    secretKey: hexToU8a('0xc006507cdfc267a21532394c49ca9b754ca71de21e15a1cdf807c7ceab6d0b6c3ed408d9d35311540dcd54931933e67cf1ea10d46f75408f82b789d9bd212fde'),
+    secretKey: hexToU8a('0xc006507cdfc267a21532394c49ca9b754ca71de21e15a1cdf807c7ceab6d0b6c3ed408d9d35311540dcd54931933e67cf1ea10d46f75408f82b789d9bd212fde'), // nosemgrep
     seed: 'Bob//stash',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0x90b5ab205c6974c9ea841be688864633dc9ca8a357843eeacf2314649965fe22'),
-    secretKey: hexToU8a('0xa8f2d83016052e5d6d77b2f6fd5d59418922a09024cda701b3c34369ec43a7668faf12ff39cd4e5d92bb773972f41a7a5279ebc2ed92264bed8f47d344f8f18c'),
+    secretKey: hexToU8a('0xa8f2d83016052e5d6d77b2f6fd5d59418922a09024cda701b3c34369ec43a7668faf12ff39cd4e5d92bb773972f41a7a5279ebc2ed92264bed8f47d344f8f18c'), // nosemgrep
     seed: 'Charlie',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0x306721211d5404bd9da88e0204360a1a9ab8b87c66c1bc2fcdd37f3c2222cc20'),
-    secretKey: hexToU8a('0x20e05482ca4677e0edbc58ae9a3a59f6ed3b1a9484ba17e64d6fe8688b2b7b5d108c4487b9323b98b11fe36cb301b084e920f7b7895536809a6d62a451b25568'),
+    secretKey: hexToU8a('0x20e05482ca4677e0edbc58ae9a3a59f6ed3b1a9484ba17e64d6fe8688b2b7b5d108c4487b9323b98b11fe36cb301b084e920f7b7895536809a6d62a451b25568'), // nosemgrep
     seed: 'Dave',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0xe659a7a1628cdd93febc04a4e0646ea20e9f5f0ce097d9a05290d4a9e054df4e'),
-    secretKey: hexToU8a('0x683576abfd5dc35273e4264c23095a1bf21c14517bece57c7f0cc5c0ed4ce06a3dbf386b7828f348abe15d76973a72009e6ef86a5c91db2990cb36bb657c6587'),
+    secretKey: hexToU8a('0x683576abfd5dc35273e4264c23095a1bf21c14517bece57c7f0cc5c0ed4ce06a3dbf386b7828f348abe15d76973a72009e6ef86a5c91db2990cb36bb657c6587'), // nosemgrep
     seed: 'Eve',
     type: 'sr25519'
   },
   {
     publicKey: hexToU8a('0x1cbd2d43530a44705ad088af313e18f80b53ef16b36177cd4b77b846f2a5f07c'),
-    secretKey: hexToU8a('0xb835c20f450079cf4f513900ae9faf8df06ad86c681884122c752a4b2bf74d4303e4f21bc6cc62bb4eeed5a9cce642c25e2d2ac1464093b50f6196d78e3a7426'),
+    secretKey: hexToU8a('0xb835c20f450079cf4f513900ae9faf8df06ad86c681884122c752a4b2bf74d4303e4f21bc6cc62bb4eeed5a9cce642c25e2d2ac1464093b50f6196d78e3a7426'), // nosemgrep
     seed: 'Ferdie',
     type: 'sr25519'
   }
@@ -76,54 +76,42 @@ export const PAIRSETHEREUM: PairDef[] = [
   {
     name: 'Alith',
     publicKey: hexToU8a('0x02509540919faacf9ab52146c9aa40db68172d83777250b28e4679176e49ccdd9f'),
-    secretKey: hexToU8a('0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133'),
+    secretKey: hexToU8a('0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133'), // nosemgrep
     seed: "m/44'/40'/0'/0",
     type: 'ethereum'
   },
   {
     name: 'Baltathar',
     publicKey: hexToU8a('0x033bc19e36ff1673910575b6727a974a9abd80c9a875d41ab3e2648dbfb9e4b518'),
-    secretKey: hexToU8a('0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b'),
+    secretKey: hexToU8a('0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b'), // nosemgrep
     seed: "m/44'/40'/0'/0",
     type: 'ethereum'
   },
   {
     name: 'Charleth',
     publicKey: hexToU8a('0x0234637bdc0e89b5d46543bcbf8edff329d2702bc995e27e9af4b1ba009a3c2a5e'),
-    secretKey: hexToU8a('0x0b6e18cafb6ed99687ec547bd28139cafdd2bffe70e6b688025de6b445aa5c5b'),
+    secretKey: hexToU8a('0x0b6e18cafb6ed99687ec547bd28139cafdd2bffe70e6b688025de6b445aa5c5b'), // nosemgrep
     seed: "m/44'/40'/0'/0",
     type: 'ethereum'
   },
   {
     name: 'Dorothy',
     publicKey: hexToU8a('0x02a00d60b2b408c2a14c5d70cdd2c205db8985ef737a7e55ad20ea32cc9e7c417c'),
-    secretKey: hexToU8a('0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68'),
+    secretKey: hexToU8a('0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68'), // nosemgrep
     seed: "m/44'/40'/0'/0",
     type: 'ethereum'
   },
   {
     name: 'Ethan',
     publicKey: hexToU8a('0x025cdc005b752651cd3f728fb9192182acb3a9c89e19072cbd5b03f3ee1f1b3ffa'),
-    secretKey: hexToU8a('0x7dce9bc8babb68fec1409be38c8e1a52650206a7ed90ff956ae8a6d15eeaaef4'),
+    secretKey: hexToU8a('0x7dce9bc8babb68fec1409be38c8e1a52650206a7ed90ff956ae8a6d15eeaaef4'), // nosemgrep
     seed: "m/44'/40'/0'/0",
     type: 'ethereum'
   },
   {
     name: 'Faith',
     publicKey: hexToU8a('0x037964b6c9d546da4646ada28a99e34acaa1d14e7aba861a9055f9bd200c8abf74'),
-    secretKey: hexToU8a('0xb9d2ea9a615f3165812e8d44de0d24da9bbd164b65c4f0573e1ce2c8dbd9c8df'),
-    seed: "m/44'/40'/0'/0",
-    type: 'ethereum'
-  },
-  // Gerald will be removed when moonbeam is done changing dev addresses (should def be done by end of march 21)
-  {
-    name: 'Gerald',
-    publicKey: new Uint8Array([3, 98, 79, 114, 14, 174, 103, 106,
-      4, 17, 22, 49, 201, 202, 51, 140,
-      17, 208, 245, 168, 14, 228, 34, 16,
-      198, 190, 114, 152, 60, 235, 98, 15,
-      191]),
-    secretKey: hexToU8a('0x99b3c12287537e38c90a9219d4cb074a89a16e9cdb20bf85728ebd97c343e342'),
+    secretKey: hexToU8a('0xb9d2ea9a615f3165812e8d44de0d24da9bbd164b65c4f0573e1ce2c8dbd9c8df'), // nosemgrep
     seed: "m/44'/40'/0'/0",
     type: 'ethereum'
   }

packages/networks/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/networks",
-  "version": "6.4.1",
+  "version": "7.0.2",
   "type": "module",
   "description": "A list of all available Substrate networks and their applicable prefixes",
   "main": "index.js",
@@ -16,10 +16,10 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/networks#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.0"
+    "@babel/runtime": "^7.14.6"
   },
   "devDependencies": {
-    "@polkadot/util": "6.4.1",
-    "@polkadot/x-fetch": "6.4.1"
+    "@polkadot/util": "7.0.2",
+    "@polkadot/x-fetch": "7.0.2"
   }
 }

packages/networks/src/crosscheck.spec.ts

@@ -1,13 +1,14 @@
 // Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Ss58Registry } from './types';
+import type { KnownSubstrate, Ss58Registry } from './types';
 
 import fs from 'fs';
 
+import { stringify } from '@polkadot/util';
 import { fetch } from '@polkadot/x-fetch';
 
-import { all } from './';
+import { allNetworks } from './';
 
 const OUTPUT = './.github/ss58-check.md';
 const SUBSTRATE_REGISTRY = 'https://raw.githubusercontent.com/paritytech/substrate/master/ss58-registry.json';
@@ -31,42 +32,40 @@ describe('check latest Substrate ss58 registry', (): void => {
   });
 
   it('has the same number as the original', (): void => {
-    assertAndLog(all.length === original.registry.length, `Number of entries mismatched:: Expected ${original.registry.length} found ${all.length}`);
+    assertAndLog(allNetworks.length === original.registry.length, `Number of entries mismatched:: Expected ${original.registry.length} found ${allNetworks.length}`);
   });
 
   it('has no missing any entries', (): void => {
     const missing = original.registry
-      .filter(({ prefix }) => !all.some((n) => n.prefix === prefix))
+      .filter(({ prefix }) => !allNetworks.some((n) => n.prefix === prefix))
       .map(({ displayName, prefix }) => `${displayName} (${prefix})`);
 
-    assertAndLog(!missing.length, `Missing entries found: ${JSON.stringify(missing, null, 2)}`);
+    assertAndLog(!missing.length, `Missing entries found: ${stringify(missing, 2)}`);
   });
 
   it('has no extra entries', (): void => {
-    const missing = all
+    const missing = allNetworks
       .filter(({ prefix }) => !original.registry.some((n) => n.prefix === prefix))
       .map(({ displayName, prefix }) => `${displayName} (${prefix})`);
 
-    assertAndLog(!missing.length, `Extra entries found: ${JSON.stringify(missing, null, 2)}`);
+    assertAndLog(!missing.length, `Extra entries found: ${stringify(missing, 2)}`);
   });
 
   it('has the same values as the original', (): void => {
-    const fields = Object.keys(original.schema);
+    const fields = Object.keys(original.schema) as (keyof KnownSubstrate)[];
     const errors = original.registry
       .map((n): [string, string[]] => {
-        const other = all.find(({ prefix }) => prefix === n.prefix);
+        const other = allNetworks.find(({ prefix }) => prefix === n.prefix);
 
         return [
           `${n.displayName} (${n.prefix})`,
           other
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
-            ? fields.filter((f) => JSON.stringify(n[f]) !== JSON.stringify(other[f]))
+            ? fields.filter((f) => stringify(n[f]) !== stringify(other[f]))
             : []
         ];
       })
       .filter(([, fields]) => fields.length);
 
-    assertAndLog(!errors.length, `Mismatches found: ${JSON.stringify(errors.map(([name, m]) => `${name}:: ${m.join(', ')}`), null, 2)}`);
+    assertAndLog(!errors.length, `Mismatches found: ${stringify(errors.map(([n, m]) => `${n}:: ${m.join(', ')}`), 2)}`);
   });
 });

packages/networks/src/defaults.spec.ts

@@ -1,9 +1,20 @@
 // Copyright 2017-2021 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import { isHex } from '@polkadot/util';
+
 import { knownGenesis, knownLedger } from './defaults';
 
 describe('defaults', (): void => {
+  it('has hex values for all genesis chains', (): void => {
+    expect(
+      Object.keys(knownGenesis).filter((network) =>
+        !knownGenesis[network].length ||
+        knownGenesis[network].some((g) => !isHex(g, 256))
+      )
+    ).toEqual([]);
+  });
+
   it('has genesis for all Ledger chains', (): void => {
     expect(
       Object.keys(knownLedger).filter((network) =>

packages/networks/src/defaults.ts

@@ -8,18 +8,27 @@ import type { KnownGenesis, KnownIcon, KnownLedger, KnownTestnet } from './types
 // last. This make lookups for the current a simple genesisHash[0]
 // (See Kusama as an example)
 export const knownGenesis: KnownGenesis = {
+  centrifuge: [
+    '0x67dddf2673b69e5f875f6f25277495834398eafd67f492e09f3f3345e003d1b5'
+  ],
   'dock-mainnet': [
     '0xf73467c6544aa68df2ee546b135f955c46b90fa627e9b5d7935f41061bb8a5a9'
   ],
   edgeware: [
     '0x742a2ca70c2fda6cee4f8df98d64c4c670a052d9568058982dad9d5a7a135c5b'
   ],
+  equilibrium: [
+    '0x6f1a800de3daff7f5e037ddf66ab22ce03ab91874debeddb1086f5f7dbd48925'
+  ],
   hydradx: [
     '0xd2a620c27ec5cbc5621ff9a522689895074f7cca0d08e7134a7804e1a3ba86fc', // Snakenet Gen3-1
     '0x10af6e84234477d84dc572bac0789813b254aa490767ed06fb9591191d1073f9', // Snakenet Gen3
     '0x3d75507dd46301767e601265791da1d9cb47b6ebc94e87347b635e5bf58bd047', // Snakenet Gen2
     '0x0ed32bfcab4a83517fac88f2aa7cbc2f88d3ab93be9a12b6188a036bf8a943c2' // Snakenet Gen1
   ],
+  karura: [
+    '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b'
+  ],
   kulupu: [
     '0xf7a99d3cb92853d00d5275c971c132c074636256583fee53b3bbe60d7b8769ba'
   ],
@@ -37,6 +46,9 @@ export const knownGenesis: KnownGenesis = {
   polymesh: [
     '0x9deeb940c92ae02111c3bd5baca89970384f4c9849f02a1b2e53e66414d30f9f'
   ],
+  statemine: [
+    '0x48239ef607d7928874027a43a67689209727dfb3d3dc5e5b03a39bdc2eda771a'
+  ],
   subsocial: [
     '0x0bd72c1c305172e1275278aaeb3f161e02eccb7a819e63f62d47bd53a28189f8'
   ]
@@ -44,16 +56,26 @@ export const knownGenesis: KnownGenesis = {
 
 // these are icon overrides
 export const knownIcon: KnownIcon = {
+  centrifuge: 'polkadot',
   kusama: 'polkadot',
-  polkadot: 'polkadot'
+  polkadot: 'polkadot',
+  statemine: 'polkadot',
+  statemint: 'polkadot',
+  westmint: 'polkadot'
 };
 
-// support for ledger
+// These match up with the keys of the ledgerApps object in the @polkadot/hw-ledger/defaults.ts
+// and maps to the known slip44 (minus the `0x8` hard derivation flag)
+// NOTE: Any network here needs to have a genesisHash attached in the config above
 export const knownLedger: KnownLedger = {
+  centrifuge: 0x000002eb,
   'dock-mainnet': 0x00000252,
+  edgeware: 0x0000020b,
+  equilibrium: 0x05f5e0fd,
   kusama: 0x000001b2,
   polkadot: 0x00000162,
-  polymesh: 0x00000253
+  polymesh: 0x00000253,
+  statemine: 0x000001b2 // common-good on Kusama, shares derivation
 };
 
 // testnets should not allow selection

packages/networks/src/index.spec.ts

@@ -4,25 +4,25 @@
 import type { SubstrateNetwork } from './types';
 
 import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
-import filtered, { all, available } from '.';
+import { allNetworks, availableNetworks, selectableNetworks } from '.';
 
-describe('filtered', (): void => {
+describe('selectableNetworks', (): void => {
   it('has the correct starting order', (): void => {
-    expect(filtered.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
+    expect(selectableNetworks.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
   });
 
   it('has no ignored networks', (): void => {
-    expect(available.some(({ isIgnored }) => isIgnored)).toEqual(false);
+    expect(availableNetworks.some(({ isIgnored }) => isIgnored)).toEqual(false);
   });
 
   it('has no reserved networks', (): void => {
-    expect(available.some(({ prefix }) => prefix === 47)).toEqual(false);
+    expect(availableNetworks.some(({ prefix }) => prefix === 47)).toEqual(false);
   });
 
-  it('has all genesis information', (): void => {
+  it('has allNetworks genesis information', (): void => {
     expect(
       Object.entries(knownGenesis).filter(([network, genesisHash]) =>
-        available.some((a) =>
+        availableNetworks.some((a) =>
           a.network === network &&
           genesisHash.some((g, index) => a.genesisHash[index] !== g)
         )
@@ -30,10 +30,10 @@ describe('filtered', (): void => {
     ).toEqual([]);
   });
 
-  it('has all ledger details', (): void => {
+  it('has allNetworks ledger details', (): void => {
     expect(
       Object.entries(knownLedger).filter(([network, slip44]) =>
-        available.some((a) =>
+        availableNetworks.some((a) =>
           a.network === network && (
             a.slip44 !== slip44 ||
             !a.hasLedgerSupport ||
@@ -47,16 +47,16 @@ describe('filtered', (): void => {
   it('has no testnets exposed', (): void => {
     expect(
       Object.keys(knownTestnet).filter((network) =>
-        available.some((a) =>
+        availableNetworks.some((a) =>
           a.network === network
         )
       )
     ).toEqual([]);
   });
 
-  it('has all icons, except for overrides', (): void => {
+  it('has allNetworks icons, except for overrides', (): void => {
     expect(
-      available.filter(({ icon, network }) =>
+      availableNetworks.filter(({ icon, network }) =>
         icon !== 'substrate' &&
         knownIcon[network] !== icon
       )
@@ -67,7 +67,7 @@ describe('filtered', (): void => {
     const dupes: SubstrateNetwork[] = [];
     const uniques: SubstrateNetwork[] = [];
 
-    all.forEach((a): void => {
+    allNetworks.forEach((a): void => {
       if (uniques.some((u) => u.prefix === a.prefix)) {
         dupes.push(a);
       } else {

packages/networks/src/index.ts

@@ -11,7 +11,7 @@ export { packageInfo } from './packageInfo';
 // These are known prefixes that are not sorted
 const UNSORTED = [0, 2, 42];
 
-export const all = knownSubstrate.map((o): SubstrateNetwork => {
+export const allNetworks = knownSubstrate.map((o): SubstrateNetwork => {
   const network = o.network || '';
   const n = o as SubstrateNetwork;
 
@@ -30,7 +30,7 @@ export const all = knownSubstrate.map((o): SubstrateNetwork => {
 //   - we only include those where we have a standardAccount
 //   - when no icon has been specified, default to substrate
 //   - sort by name, however we keep 0, 2, 42 first in the list
-export const available = all
+export const availableNetworks = allNetworks
   .filter((n): n is Network => !n.isIgnored && !!n.network)
   .sort((a, b) =>
     UNSORTED.includes(a.prefix) === UNSORTED.includes(b.prefix)
@@ -43,4 +43,4 @@ export const available = all
   );
 
 // A filtered list of those chains we have details about (genesisHashes)
-export default available.filter((n) => n.genesisHash.length || n.prefix === 42);
+export const selectableNetworks = availableNetworks.filter((n) => n.genesisHash.length || n.prefix === 42);

packages/networks/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/networks', version: '6.4.1' };
+export const packageInfo = { name: '@polkadot/networks', version: '7.0.2' };

packages/networks/src/substrate.ts

@@ -84,13 +84,13 @@ export const knownSubstrate: KnownSubstrate[] = [
     website: 'https://edgewa.re'
   },
   {
-    decimals: [18],
-    displayName: 'Acala Karura Canary',
+    decimals: [12],
+    displayName: 'Karura',
     network: 'karura',
     prefix: 8,
     standardAccount: '*25519',
     symbols: ['KAR'],
-    website: 'https://acala.network/'
+    website: 'https://karura.network/'
   },
   {
     decimals: [18],
@@ -102,7 +102,7 @@ export const knownSubstrate: KnownSubstrate[] = [
     website: 'http://laminar.network/'
   },
   {
-    decimals: [18],
+    decimals: [12],
     displayName: 'Acala',
     network: 'acala',
     prefix: 10,
@@ -332,7 +332,7 @@ export const knownSubstrate: KnownSubstrate[] = [
     network: 'centrifuge',
     prefix: 36,
     standardAccount: '*25519',
-    symbols: ['RAD'],
+    symbols: ['CFG'],
     website: 'https://centrifuge.io/'
   },
   {
@@ -488,6 +488,78 @@ export const knownSubstrate: KnownSubstrate[] = [
     symbols: ['XOR'],
     website: 'https://sora.org'
   },
+  {
+    decimals: [12],
+    displayName: 'Manta network',
+    network: 'manta',
+    prefix: 77,
+    standardAccount: '*25519',
+    symbols: ['MA'],
+    website: 'https://manta.network'
+  },
+  {
+    decimals: [12],
+    displayName: 'Calamari: Manta Canary Network',
+    network: 'calamari',
+    prefix: 78,
+    standardAccount: '*25519',
+    symbols: ['KMA'],
+    website: 'https://manta.network'
+  },
+  {
+    decimals: [18],
+    displayName: 'PolkaSmith Canary Network',
+    network: 'polkasmith',
+    prefix: 98,
+    standardAccount: '*25519',
+    symbols: ['PKS'],
+    website: 'https://polkafoundry.com'
+  },
+  {
+    decimals: [18],
+    displayName: 'PolkaFoundry Network',
+    network: 'polkafoundry',
+    prefix: 99,
+    standardAccount: '*25519',
+    symbols: ['PKF'],
+    website: 'https://polkafoundry.com'
+  },
+  {
+    decimals: [18],
+    displayName: 'OriginTrail Parachain',
+    network: 'origintrail-parachain',
+    prefix: 101,
+    standardAccount: 'secp256k1',
+    symbols: ['TRAC'],
+    website: 'https://origintrail.io'
+  },
+  {
+    decimals: [12],
+    displayName: 'Heiko',
+    network: 'heiko',
+    prefix: 110,
+    standardAccount: '*25519',
+    symbols: ['HKO'],
+    website: 'https://parallel.fi/'
+  },
+  {
+    decimals: [18],
+    displayName: 'Altair',
+    network: 'altair',
+    prefix: 136,
+    standardAccount: '*25519',
+    symbols: ['AIR'],
+    website: 'https://centrifuge.io/'
+  },
+  {
+    decimals: [12],
+    displayName: 'Parallel',
+    network: 'parallel',
+    prefix: 172,
+    standardAccount: '*25519',
+    symbols: ['PARA'],
+    website: 'https://parallel.fi/'
+  },
   {
     decimals: [18],
     displayName: 'Social Network',
@@ -496,5 +568,32 @@ export const knownSubstrate: KnownSubstrate[] = [
     standardAccount: '*25519',
     symbols: ['NET'],
     website: 'https://social.network'
+  },
+  {
+    decimals: [18],
+    displayName: 'Moonbeam',
+    network: 'moonbeam',
+    prefix: 1284,
+    standardAccount: 'secp256k1',
+    symbols: ['GLMR'],
+    website: 'https://moonbeam.network'
+  },
+  {
+    decimals: [18],
+    displayName: 'Moonriver',
+    network: 'moonriver',
+    prefix: 1285,
+    standardAccount: 'secp256k1',
+    symbols: ['MOVR'],
+    website: 'https://moonbeam.network'
+  },
+  {
+    decimals: [12],
+    displayName: 'Basilisk',
+    network: 'basilisk',
+    prefix: 10041,
+    standardAccount: '*25519',
+    symbols: ['BSX'],
+    website: 'https://bsx.fi'
   }
 ];

packages/networks/src/types.ts

@@ -8,7 +8,7 @@ export interface KnownSubstrate {
   displayName: string;
   network: string | null;
   prefix: number;
-  standardAccount: '*25519' | null;
+  standardAccount: '*25519' | 'secp256k1' | null;
   symbols: string[] | null;
   website: string | null;
 }

packages/util-crypto/package.json

@@ -1,10 +1,12 @@
 {
   "name": "@polkadot/util-crypto",
-  "version": "6.4.1",
+  "version": "7.0.2",
   "type": "module",
   "description": "A collection of useful crypto utilities for @polkadot",
   "main": "index.js",
   "sideEffects": [
+    "./cryptoInit.js",
+    "./cryptoInit.cjs",
     "./detectPackage.js",
     "./detectPackage.cjs"
   ],
@@ -19,14 +21,14 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util-crypto#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
-    "@polkadot/networks": "6.4.1",
-    "@polkadot/util": "6.4.1",
-    "@polkadot/wasm-crypto": "^4.0.2",
-    "@polkadot/x-randomvalues": "6.4.1",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/networks": "7.0.2",
+    "@polkadot/util": "7.0.2",
+    "@polkadot/wasm-crypto": "^4.1.2",
+    "@polkadot/x-randomvalues": "7.0.2",
     "base-x": "^3.0.8",
     "base64-js": "^1.5.1",
-    "blakejs": "^1.1.0",
+    "blakejs": "^1.1.1",
     "bn.js": "^4.11.9",
     "create-hash": "^1.2.0",
     "elliptic": "^6.5.4",
@@ -39,11 +41,11 @@
   "devDependencies": {
     "@types/bn.js": "^4.11.6",
     "@types/create-hash": "^1.2.2",
-    "@types/elliptic": "^6.4.12",
+    "@types/elliptic": "^6.4.13",
     "@types/scryptsy": "^2.0.0",
     "@types/xxhashjs": "^0.2.2"
   },
   "peerDependencies": {
-    "@polkadot/util": "6.4.1"
+    "@polkadot/util": "7.0.2"
   }
 }

packages/util-crypto/src/address/defaults.ts

@@ -1,12 +1,12 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { available } from '@polkadot/networks';
+import { availableNetworks } from '../networks';
 
 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: available.map(({ prefix }) => prefix),
+  allowedPrefix: availableNetworks.map(({ prefix }) => prefix),
   prefix: 42
 };

packages/util-crypto/src/address/encodeDerived.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
+import type { BN } from '@polkadot/util';
 import type { Prefix } from './types';
 
 import { decodeAddress } from './decode';

packages/util-crypto/src/address/encodeMulti.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
+import type { BN } from '@polkadot/util';
 import type { Prefix } from './types';
 
 import { encodeAddress } from './encode';

packages/util-crypto/src/address/keyDerived.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
+import type { BN } from '@polkadot/util';
 
 import { bnToU8a, stringToU8a, u8aConcat } from '@polkadot/util';
 

packages/util-crypto/src/address/keyMulti.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
+import type { BN } from '@polkadot/util';
 
 import { bnToU8a, compactToU8a, stringToU8a, u8aConcat, u8aSorted } from '@polkadot/util';
 

packages/util-crypto/src/base58/validate.ts

@@ -13,8 +13,8 @@ interface CheckConfig {
 
 const BASE_CONFIG = { alphabet: BASE58_ALPHABET, ipfsChar: 'z', type: 'base58' };
 
-export function validateChars ({ alphabet, ipfsChar, type }: CheckConfig, value?: string | null, ipfsCompat?: boolean): true {
-  assert(value, () => `Expected non-null, non-empty ${type} input`);
+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++) {

packages/util-crypto/src/base64/validate.ts

@@ -10,7 +10,7 @@ import { assert } from '@polkadot/util';
  * Validates that the supplied value is valid base64
  */
 export function base64Validate (value?: string | null): value is string {
-  assert(value, 'Expected non-null, non-empty base64 input');
+  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;

packages/util-crypto/src/blake2/asHex.spec.ts

@@ -11,35 +11,43 @@ describe('blake2AsHex', (): void => {
     await waitReady();
   });
 
-  it('returns a 64-bit value (specified)', (): void => {
-    expect(
-      blake2AsHex('abc', 64)
-    ).toEqual('0xd8bb14d833d59559');
-  });
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a 64-bit value (specified)', (): void => {
+      expect(
+        blake2AsHex('abc', 64, null, onlyJs)
+      ).toEqual('0xd8bb14d833d59559');
+    });
 
-  it('returns a 128-bit value (as specified)', (): void => {
-    expect(
-      blake2AsHex('abc', 128)
-    ).toEqual('0xcf4ab791c62b8d2b2109c90275287816');
-  });
+    it('returns a 128-bit value (as specified)', (): void => {
+      expect(
+        blake2AsHex('abc', 128, null, onlyJs)
+      ).toEqual('0xcf4ab791c62b8d2b2109c90275287816');
+    });
 
-  it('returns a 256-bit value (default)', (): void => {
-    expect(
-      blake2AsHex('abc')
-    ).toEqual('0xbddd813c634239723171ef3fee98579b94964e3bb1cb3e427262c8c068d52319');
-  });
+    it('returns a 128-bit value (as specified, with key)', (): void => {
+      expect(
+        blake2AsHex('abc', 128, new Uint8Array([1, 2]), onlyJs)
+      ).toEqual('0x36f3d08cda72a00ddf2be103eb5770d9');
+    });
 
-  it('returns a 512-bit value (as specified)', (): void => {
-    expect(
-      blake2AsHex('abc', 512)
-    ).toEqual('0xba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923');
-  });
+    it('returns a 256-bit value (default)', (): void => {
+      expect(
+        blake2AsHex('abc', undefined, null, onlyJs)
+      ).toEqual('0xbddd813c634239723171ef3fee98579b94964e3bb1cb3e427262c8c068d52319');
+    });
 
-  it('matches with the Rust implementation', (): void => {
-    expect(
-      blake2AsHex(
-        hexToU8a('0x454545454545454545454545454545454545454545454545454545454545454501000000000000002481853da20b9f4322f34650fea5f240dcbfb266d02db94bfa0153c31f4a29dbdbf025dd4a69a6f4ee6e1577b251b655097e298b692cb34c18d3182cac3de0dc00000000'), 256
-      )
-    ).toEqual('0x1025e5db74fdaf4d2818822dccf0e1604ae9ccc62f26cecfde23448ff0248abf');
+    it('returns a 512-bit value (as specified)', (): void => {
+      expect(
+        blake2AsHex('abc', 512, null, onlyJs)
+      ).toEqual('0xba80a53f981c4d0d6a2797b69f12f6e94c212f14685ac4b74b12bb6fdbffa2d17d87c5392aab792dc252d5de4533cc9518d38aa8dbf1925ab92386edd4009923');
+    });
+
+    it('matches with the Rust implementation', (): void => {
+      expect(
+        blake2AsHex(
+          hexToU8a('0x454545454545454545454545454545454545454545454545454545454545454501000000000000002481853da20b9f4322f34650fea5f240dcbfb266d02db94bfa0153c31f4a29dbdbf025dd4a69a6f4ee6e1577b251b655097e298b692cb34c18d3182cac3de0dc00000000'), 256, undefined, onlyJs
+        )
+      ).toEqual('0x1025e5db74fdaf4d2818822dccf0e1604ae9ccc62f26cecfde23448ff0248abf');
+    });
   });
 });

packages/util-crypto/src/blake2/asHex.ts

@@ -19,8 +19,8 @@ import { blake2AsU8a } from './asU8a';
  * blake2AsHex('abc'); // => 0xba80a53f981c4d0d
  * ```
  */
-export function blake2AsHex (data: Uint8Array | string, bitLength = 256): string {
+export function blake2AsHex (data: Uint8Array | string, bitLength = 256, key?: Uint8Array | null, onlyJs = false): string {
   return u8aToHex(
-    blake2AsU8a(data, bitLength)
+    blake2AsU8a(data, bitLength, key, onlyJs)
   );
 }

packages/util-crypto/src/blake2/asU8a.spec.ts

@@ -11,38 +11,32 @@ describe('blake2AsU8a', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 64-bit value by default (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a 64-bit value by default', (): void => {
       expect(
         blake2AsU8a('abc', undefined, undefined, onlyJs)
       ).toEqual(
         new Uint8Array([189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25])
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 128-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 128-bit value (as specified,)', (): void => {
       expect(
         blake2AsU8a('abc', 128, undefined, onlyJs)
       ).toEqual(
         new Uint8Array([207, 74, 183, 145, 198, 43, 141, 43, 33, 9, 201, 2, 117, 40, 120, 22])
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 256-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 256-bit value (as specified)', (): void => {
       expect(
         blake2AsU8a('abc', 256, undefined, onlyJs)
       ).toEqual(
         new Uint8Array([189, 221, 129, 60, 99, 66, 57, 114, 49, 113, 239, 63, 238, 152, 87, 155, 148, 150, 78, 59, 177, 203, 62, 66, 114, 98, 200, 192, 104, 213, 35, 25])
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 512-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 512-bit value (as specified)', (): void => {
       expect(
         blake2AsU8a('abc', 512, undefined, onlyJs)
       ).toEqual(

packages/util-crypto/src/blake2/asU8a.ts

@@ -20,10 +20,10 @@ import { blake2b, isReady } from '@polkadot/wasm-crypto';
  * blake2AsU8a('abc'); // => [0xba, 0x80, 0xa53, 0xf98, 0x1c, 0x4d, 0x0d]
  * ```
  */
-export function blake2AsU8a (data: Uint8Array | string, bitLength = 256, key: Uint8Array | null = null, onlyJs = false): Uint8Array {
+export function blake2AsU8a (data: Uint8Array | string, bitLength = 256, key?: Uint8Array | null, onlyJs = false): Uint8Array {
   const byteLength = Math.ceil(bitLength / 8);
 
   return isReady() && !onlyJs
     ? blake2b(u8aToU8a(data), u8aToU8a(key), byteLength)
-    : js.blake2b(u8aToU8a(data), key, byteLength);
+    : js.blake2b(u8aToU8a(data), key || undefined, byteLength);
 }

packages/util-crypto/src/bundle.ts

@@ -0,0 +1,31 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import './cryptoInit';
+
+export { packageInfo } from './packageInfo';
+
+// all internal exports
+export * from './address';
+export * from './base32';
+export * from './base58';
+export * from './base64';
+export * from './blake2';
+export * from './crypto';
+export * from './ethereum';
+export * from './hd';
+export * from './hmac';
+export * from './json';
+export * from './keccak';
+export * from './key';
+export * from './mnemonic';
+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 './signature';
+export * from './xxhash';

packages/util-crypto/src/ethereum/isAddress.ts

@@ -8,9 +8,7 @@ import { isEthereumChecksum } from './isChecksum';
 export function isEthereumAddress (address?: string): boolean {
   if (!address || address.length !== 42 || !isHex(address)) {
     return false;
-  }
-
-  if (/^(0x)?[0-9a-f]{40}$/.test(address) || /^(0x)?[0-9A-F]{40}$/.test(address)) {
+  } else if (/^(0x)?[0-9a-f]{40}$/.test(address) || /^(0x)?[0-9A-F]{40}$/.test(address)) {
     return true;
   }
 

packages/util-crypto/src/ethereum/isChecksum.ts

@@ -6,7 +6,11 @@ import { u8aToHex } from '@polkadot/util';
 import { keccakAsU8a } from '../keccak';
 
 function isInvalidChar (char: string, byte: number): boolean {
-  return (byte > 7 && char !== char.toUpperCase()) || (byte <= 7 && char !== char.toLowerCase());
+  return char !== (
+    byte > 7
+      ? char.toUpperCase()
+      : char.toLowerCase()
+  );
 }
 
 export function isEthereumChecksum (_address: string): boolean {

packages/util-crypto/src/hd/ledger/index.spec.ts

@@ -7,6 +7,7 @@ import { hdLedger } from '..';
 
 const MNE_0 = 'abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about';
 const MNE_1 = 'open jelly jeans corn ketchup supreme brief element armed lens vault weather original scissors rug priority vicious lesson raven spot gossip powder person volcano';
+const MNE_P = `${MNE_1} testing`;
 
 const TESTS = {
   Kusama: {
@@ -36,6 +37,11 @@ const TESTS = {
         ed25519: '0xe8c68348586d53e4e8d1a864b0e4e17c75e4eb06e0c63c1432bef2ba29e69d41',
         index: [0, 0],
         mnemonic: MNE_0
+      },
+      {
+        ed25519: '0x3890e8db837eba3f8f25215c753e1091062298ce671a51441e7ef89a7adc4f48',
+        index: [0, 0],
+        mnemonic: MNE_P
       }
     ]
   }

packages/util-crypto/src/hd/ledger/index.ts

@@ -11,7 +11,18 @@ import { HARDENED, hdValidatePath } from '../validatePath';
 import { ledgerDerivePrivate } from './derivePrivate';
 import { ledgerMaster } from './master';
 
-export function hdLedger (mnemonic: string, path: string): Keypair {
+export function hdLedger (_mnemonic: string, path: string): Keypair {
+  const parts = _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)');
+
+  const [mnemonic, password] = parts.length === 25
+    ? [parts.slice(0, 24).join(' '), parts[24]]
+    : [parts.join(' '), ''];
+
   assert(mnemonicValidate(mnemonic), 'Invalid mnemonic passed to ledger derivation');
   assert(hdValidatePath(path), 'Invalid derivation path');
 
@@ -19,9 +30,9 @@ export function hdLedger (mnemonic: string, path: string): Keypair {
     path
       .split('/')
       .slice(1)
-      .map((n) => parseInt(n.replace("'", ''), 10))
+      .map((n) => parseInt(n.replace(/'$/, ''), 10))
       .map((n) => (n < HARDENED) ? (n + HARDENED) : n)
-      .reduce((x, n) => ledgerDerivePrivate(x, n), ledgerMaster(mnemonic))
+      .reduce((x, n) => ledgerDerivePrivate(x, n), ledgerMaster(mnemonic, password))
       .slice(0, 32)
   );
 }

packages/util-crypto/src/hd/ledger/master.ts

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

packages/util-crypto/src/hd/validatePath.ts

@@ -12,7 +12,7 @@ export function hdValidatePath (path: string): boolean {
 
   return parts.every((n) => /^\d+'?$/.test(n)) && (
     !parts
-      .map((n) => parseInt(n.replace("'", ''), 10))
+      .map((n) => parseInt(n.replace(/'$/, ''), 10))
       .some((n) => isNaN(n) || (n >= HARDENED) || (n < 0))
   );
 }

packages/util-crypto/src/index.ts

@@ -1,31 +1,6 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import './cryptoInit';
 import './detectPackage';
 
-export { packageInfo } from './packageInfo';
-
-// all internal exports
-export * from './address';
-export * from './base32';
-export * from './base58';
-export * from './base64';
-export * from './blake2';
-export * from './crypto';
-export * from './ethereum';
-export * from './hd';
-export * from './hmac';
-export * from './json';
-export * from './keccak';
-export * from './key';
-export * from './mnemonic';
-export * from './nacl';
-export * from './pbkdf2';
-export * from './random';
-export * from './schnorrkel';
-export * from './scrypt';
-export * from './secp256k1';
-export * from './sha512';
-export * from './signature';
-export * from './xxhash';
+export * from './bundle';

packages/util-crypto/src/keccak/asU8a.spec.ts

@@ -6,8 +6,6 @@ import { waitReady } from '@polkadot/wasm-crypto';
 
 import { keccakAsU8a } from '.';
 
-const BITS: (256 | 512)[] = [256, 512];
-
 describe('keccakAsU8a', (): void => {
   beforeEach(async (): Promise<void> => {
     await waitReady();
@@ -23,29 +21,21 @@ describe('keccakAsU8a', (): void => {
     )
   };
 
-  BITS.forEach((bitLength): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`returns an hex representation (string, bitLength=${bitLength}, onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    describe.each([256, 512] as (256 | 512)[])('bitLength=$p', (bitLength): void => {
+      it('returns an hex representation (string)', (): void => {
         expect(
           keccakAsU8a(input, bitLength, onlyJs)
         ).toEqual(output[bitLength]);
       });
-    });
-  });
 
-  BITS.forEach((bitLength): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`returns an hex representation (Buffer, bitLength=${bitLength}, onlyJs=${onlyJs.toString()})`, (): void => {
+      it('returns an hex representation (Buffer)', (): void => {
         expect(
           keccakAsU8a(Buffer.from(input), bitLength, onlyJs)
         ).toEqual(output[bitLength]);
       });
-    });
-  });
 
-  BITS.forEach((bitLength): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`returns an hex representation (Uint8Array, bitLength=${bitLength}, onlyJs=${onlyJs.toString()})`, (): void => {
+      it('returns an hex representation (Uint8Array)', (): void => {
         expect(
           keccakAsU8a(stringToU8a(input), bitLength, onlyJs)
         ).toEqual(output[bitLength]);

packages/util-crypto/src/key/DeriveJunction.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
-
-import { bnToHex, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util';
+import { BN, bnToHex, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util';
 
 import { blake2AsU8a } from '../blake2/asU8a';
 
@@ -62,13 +60,11 @@ export class DeriveJunction {
   public soft (value: number | string | BigInt | BN | Uint8Array): DeriveJunction {
     if (isNumber(value) || isBn(value) || isBigInt(value)) {
       return this.soft(bnToHex(value, BN_OPTIONS));
+    } else if (isHex(value)) {
+      return this.soft(hexToU8a(value));
     } else if (isString(value)) {
-      return isHex(value)
-        ? this.soft(hexToU8a(value))
-        : this.soft(compactAddLength(stringToU8a(value)));
-    }
-
-    if (value.length > JUNCTION_ID_LEN) {
+      return this.soft(compactAddLength(stringToU8a(value)));
+    } else if (value.length > JUNCTION_ID_LEN) {
       return this.soft(blake2AsU8a(value));
     }
 

packages/util-crypto/src/mnemonic/generate.spec.ts

@@ -16,20 +16,16 @@ describe('mnemonicGenerate', (): void => {
     ).toEqual(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    ([12, 15, 18, 21, 24] as WordCount[]).forEach((num: WordCount): void => {
-      it(`generates a valid mnemonic (${num} words, onlyJs=${onlyJs.toString()})`, (): void => {
-        const mnemonic = mnemonicGenerate(num, onlyJs);
-        const isValid = mnemonicValidate(mnemonic);
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it.each([12, 15, 18, 21, 24] as WordCount[])('generates a valid mnemonic (%p words)', (num): void => {
+      const mnemonic = mnemonicGenerate(num, onlyJs);
+      const isValid = mnemonicValidate(mnemonic);
 
-        expect(mnemonic.split(' ')).toHaveLength(num);
-        expect(isValid).toEqual(true);
-      });
+      expect(mnemonic.split(' ')).toHaveLength(num);
+      expect(isValid).toEqual(true);
     });
-  });
 
-  [true, false].forEach((onlyJs): void => {
-    it(`generates not deterministic (onlyJs=${onlyJs.toString()})`, (): void => {
+    it('generates not deterministic', (): void => {
       const m1 = mnemonicGenerate(24, onlyJs);
       const m2 = mnemonicGenerate(24, onlyJs);
 

packages/util-crypto/src/mnemonic/toEntropy.spec.ts

@@ -12,9 +12,9 @@ describe('mnemonicToEntropy', (): void => {
     await cryptoWaitReady();
   });
 
-  tests.forEach(([mnemonic, entropy], index): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`Created correct entropy for ${index} (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    tests.forEach(([mnemonic, entropy], index): void => {
+      it(`Created correct entropy for ${index}`, (): void => {
         expect(u8aToHex(mnemonicToEntropy(mnemonic, onlyJs))).toEqual(entropy);
       });
     });

packages/util-crypto/src/mnemonic/toLegacySeed.spec.ts

@@ -15,35 +15,29 @@ describe('mnemonicToLegacySeed', (): void => {
     await waitReady();
   });
 
-  [undefined, 'foo', 'bar'].forEach((password): void => {
-    it(`generates Wasm & Js equivalents (password = ${password || 'undefined'})`, (): void => {
-      expect(
-        u8aEq(
-          mnemonicToLegacySeed(MNEMONIC, password, true),
-          mnemonicToLegacySeed(MNEMONIC, password, false)
-        )
-      ).toEqual(true);
-    });
+  it.each([undefined, 'foo', 'bar'])('generates Wasm & Js equivalents (password = %p', (password): void => {
+    expect(
+      u8aEq(
+        mnemonicToLegacySeed(MNEMONIC, password, true),
+        mnemonicToLegacySeed(MNEMONIC, password, false)
+      )
+    ).toEqual(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`generates a valid 64bytes seed (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('generates a valid 64bytes seed', (): void => {
       expect(
         u8aToHex(mnemonicToLegacySeed(MNEMONIC, undefined, onlyJs, 64))
       ).toEqual(SEED_64);
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`generates a valid 32bytes seed (onlyJs = ${onlyJs.toString()})`, (): void => {
+    it('generates a valid 32bytes seed', (): void => {
       expect(
         u8aToHex(mnemonicToLegacySeed(MNEMONIC, undefined, onlyJs))
       ).toEqual(SEED_32);
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`fails with non-mnemonics (onlyJs = ${onlyJs.toString()})`, (): void => {
+    it('fails with non-mnemonics', (): void => {
       expect(
         () => mnemonicToLegacySeed('foo bar baz', undefined, onlyJs)
       ).toThrow(/mnemonic specified/);

packages/util-crypto/src/mnemonic/toLegacySeed.ts

@@ -14,13 +14,13 @@ import { mnemonicValidate } from './validate';
  * <BR>
  *
  * ```javascript
- * import { mnemonicGenerate, mnemonicToBip39, mnemonicValidate } from '@polkadot/util-crypto';
+ * import { mnemonicGenerate, mnemonicToLegacySeed, mnemonicValidate } from '@polkadot/util-crypto';
  *
  * const mnemonic = mnemonicGenerate(); // => string
  * const isValidMnemonic = mnemonicValidate(mnemonic); // => boolean
  *
  * if (isValidMnemonic) {
- *   console.log(`Seed generated from mnemonic: ${mnemonicToBip39(mnemonic)}`); => u8a
+ *   console.log(`Seed generated from mnemonic: ${mnemonicToLegacySeed(mnemonic)}`); => u8a
  * }
  * ```
  */

packages/util-crypto/src/mnemonic/toMiniSecret.spec.ts

@@ -15,28 +15,30 @@ describe('mnemonicToMiniSecret', (): void => {
     await cryptoWaitReady();
   });
 
-  [undefined, 'foo', 'bar'].forEach((password): void => {
-    it(`generates Wasm & Js equivalents (password = ${password || 'undefined'})`, (): void => {
-      expect(
-        u8aEq(
-          mnemonicToMiniSecret(MNEMONIC, password, true),
-          mnemonicToMiniSecret(MNEMONIC, password, false)
-        )
-      ).toEqual(true);
-    });
+  it.each([undefined, 'foo', 'bar'])('generates Wasm & Js equivalents for password = %p', (password): void => {
+    expect(
+      u8aEq(
+        mnemonicToMiniSecret(MNEMONIC, password, true),
+        mnemonicToMiniSecret(MNEMONIC, password, false)
+      )
+    ).toEqual(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`generates a valid seed (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('generates a valid seed', (): void => {
       expect(
         u8aToHex(mnemonicToMiniSecret(MNEMONIC, undefined, onlyJs))
       ).toEqual(SEED);
     });
-  });
 
-  tests.forEach(([mnemonic, , seed], index): void => {
-    [false, true].forEach((onlyJs): void => {
-      it(`Created correct seed for ${index} (onlyJs = ${onlyJs.toString()})`, (): void => {
+    it('fails with non-mnemonics', (): void => {
+      expect(
+        () => mnemonicToMiniSecret('foo bar baz', undefined, onlyJs)
+      ).toThrow(/mnemonic specified/);
+    });
+
+    tests.forEach(([mnemonic, , seed], index): void => {
+      it(`Created correct seed for ${index}`, (): void => {
         expect(
           u8aToHex(mnemonicToMiniSecret(mnemonic, 'Substrate', onlyJs))
         ).toEqual(
@@ -46,12 +48,4 @@ describe('mnemonicToMiniSecret', (): void => {
       });
     });
   });
-
-  [false, true].forEach((onlyJs): void => {
-    it(`fails with non-mnemonics (onlyJs = ${onlyJs.toString()})`, (): void => {
-      expect(
-        () => mnemonicToMiniSecret('foo bar baz', undefined, onlyJs)
-      ).toThrow(/mnemonic specified/);
-    });
-  });
 });

packages/util-crypto/src/mnemonic/toMiniSecretCmp.spec.ts

@@ -0,0 +1,57 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { arrayRange, u8aEq } from '@polkadot/util';
+
+import { cryptoWaitReady, mnemonicGenerate, mnemonicToMiniSecret, naclKeypairFromSeed, schnorrkelKeypairFromSeed } from '..';
+
+// NOTE: This basically controls how long stuff runs for, YMMV
+//
+// - 100 runs with 5 checks, takes 2mins on _my_ machine
+// - 10_000 runs with 5 checks should be ~3hrs
+const NUM_RUNS = 100;
+const NUM_CHECKS = 5;
+
+// generate either a JS or WASM mnemonic
+describe.each([true, false])('mnemonicToMiniSecret (compare), onlyJsMnemonic=%p', (onlyJsMnemonic): void => {
+  beforeAll(async (): Promise<void> => {
+    await cryptoWaitReady();
+  });
+
+  // loop through lots of mnemonics
+  describe.each(arrayRange(NUM_RUNS))('run=%p', (): void => {
+    // compare both JS and WASM outputs against original
+    describe.each([true, false])('onlyJsMini=%p', (onlyJsMini): void => {
+      // NOTE we cannot actually use the onlyJsMnemonic flag here
+      const mnemonic = mnemonicGenerate(12);
+
+      describe(mnemonic, (): void => {
+        // do iterations to check and re-check that all matches
+        it.concurrent.each(arrayRange(NUM_CHECKS))('check=%p', (count): void => {
+          const minisecret = mnemonicToMiniSecret(mnemonic, count ? `${count}` : '', onlyJsMnemonic);
+          const edpub = naclKeypairFromSeed(minisecret).publicKey;
+          const srpub = schnorrkelKeypairFromSeed(minisecret).publicKey;
+
+          const testmini = mnemonicToMiniSecret(mnemonic, count ? `${count}` : '', onlyJsMini);
+
+          // explicit minisecret compare
+          expect(
+            u8aEq(minisecret, testmini)
+          ).toEqual(true);
+
+          // compare the sr25519 keypair generated
+          expect(
+            u8aEq(srpub, schnorrkelKeypairFromSeed(testmini).publicKey)
+          ).toEqual(true);
+
+          // compare ed both in WASM and JS
+          [true, false].forEach((onlyJsEd): void => {
+            expect(
+              u8aEq(edpub, naclKeypairFromSeed(testmini, onlyJsEd).publicKey)
+            ).toEqual(true);
+          });
+        });
+      });
+    });
+  });
+});

packages/util-crypto/src/nacl/keypair/fromSeed.spec.ts

@@ -31,8 +31,10 @@ describe('naclKeypairFromSeed', (): void => {
   });
 
   it('generates a valid publicKey/secretKey pair (u8a)', (): void => {
-    expect(
-      naclKeypairFromSeed(TEST)
-    ).toEqual(RESULT);
+    [true, false].forEach((onlyJs): void => {
+      expect(
+        naclKeypairFromSeed(TEST, onlyJs)
+      ).toEqual(RESULT);
+    });
   });
 });

packages/util-crypto/src/nacl/keypair/fromSeed.ts

@@ -21,8 +21,8 @@ import { ed25519KeypairFromSeed, isReady } from '@polkadot/wasm-crypto';
  * naclKeypairFromSeed(...); // => { secretKey: [...], publicKey: [...] }
  * ```
  */
-export function naclKeypairFromSeed (seed: Uint8Array): Keypair {
-  if (isReady()) {
+export function naclKeypairFromSeed (seed: Uint8Array, onlyJs = false): Keypair {
+  if (!onlyJs && isReady()) {
     const full = ed25519KeypairFromSeed(seed);
 
     return {

packages/util-crypto/src/nacl/seal.ts

@@ -19,7 +19,7 @@ interface Sealed {
  * <BR>
  *
  * ```javascript
- * import { naclEncrypt } from '@polkadot/util-crypto';
+ * import { naclSeal } from '@polkadot/util-crypto';
  *
  * naclSeal([...], [...], [...], [...]); // => [...]
  * ```

packages/util-crypto/src/nacl/sign.spec.ts

@@ -11,8 +11,8 @@ describe('naclSign', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a valid signature for the message (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a valid signature for the message', (): void => {
       expect(
         naclSign(
           new Uint8Array([0x61, 0x62, 0x63, 0x64]),

packages/util-crypto/src/nacl/verify.spec.ts

@@ -19,8 +19,8 @@ describe('naclVerify', (): void => {
     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]);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`validates a correctly signed message (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('validates a correctly signed message', (): void => {
       expect(
         naclVerify(
           new Uint8Array([0x61, 0x62, 0x63, 0x64]),
@@ -30,47 +30,51 @@ describe('naclVerify', (): void => {
         )
       ).toEqual(true);
     });
-  });
 
-  it('fails a correctly signed message (message changed)', (): void => {
-    expect(
-      naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
-        signature,
-        publicKey
-      )
-    ).toEqual(false);
-  });
+    it('fails a correctly signed message (message changed)', (): void => {
+      expect(
+        naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
+          signature,
+          publicKey,
+          onlyJs
+        )
+      ).toEqual(false);
+    });
 
-  it('fails a correctly signed message (signature changed)', (): void => {
-    signature[0] = 0xff;
+    it('fails a correctly signed message (signature changed)', (): void => {
+      signature[0] = 0xff;
 
-    expect(
-      naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-        signature,
-        publicKey
-      )
-    ).toEqual(false);
-  });
+      expect(
+        naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
+          signature,
+          publicKey,
+          onlyJs
+        )
+      ).toEqual(false);
+    });
 
-  it('throws error when publicKey lengths do not match', (): void => {
-    expect(
-      () => naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-        signature,
-        new Uint8Array([1, 2])
-      )
-    ).toThrow(/Invalid publicKey/);
-  });
+    it('throws error when publicKey lengths do not match', (): void => {
+      expect(
+        () => naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
+          signature,
+          new Uint8Array([1, 2]),
+          onlyJs
+        )
+      ).toThrow(/Invalid publicKey/);
+    });
 
-  it('throws error when signature lengths do not match', (): void => {
-    expect(
-      () => naclVerify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
-        new Uint8Array([1, 2]),
-        publicKey
-      )
-    ).toThrow(/Invalid signature/);
+    it('throws error when signature lengths do not match', (): void => {
+      expect(
+        () => naclVerify(
+          new Uint8Array([0x61, 0x62, 0x63, 0x64]),
+          new Uint8Array([1, 2]),
+          publicKey,
+          onlyJs
+        )
+      ).toThrow(/Invalid signature/);
+    });
   });
 });

packages/util-crypto/src/networks.ts

@@ -0,0 +1,4 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export * from '@polkadot/networks';

packages/util-crypto/src/packageInfo.ts

@@ -3,4 +3,4 @@
 
 // Auto-generated by @polkadot/dev, do not edit
 
-export const packageInfo = { name: '@polkadot/util-crypto', version: '6.4.1' };
+export const packageInfo = { name: '@polkadot/util-crypto', version: '7.0.2' };

packages/util-crypto/src/pbkdf2/encode.spec.ts

@@ -15,21 +15,19 @@ describe('pbkdf2Encode', (): void => {
     await waitReady();
   });
 
-  [256, 1024, 2048].forEach((rounds): void => {
-    it(`has equivalent Wasm & JS results (${rounds} rounds)`, (): void => {
-      const salt = randomAsU8a();
+  it.each([256, 1024, 2048])('has equivalent Wasm & JS results (%p rounds)', (rounds): void => {
+    const salt = randomAsU8a();
 
-      expect(
-        u8aEq(
-          pbkdf2Encode(TEST_PASSWORD, salt, rounds, false).password,
-          pbkdf2Encode(TEST_PASSWORD, salt, rounds, true).password
-        )
-      ).toBe(true);
-    });
+    expect(
+      u8aEq(
+        pbkdf2Encode(TEST_PASSWORD, salt, rounds, false).password,
+        pbkdf2Encode(TEST_PASSWORD, salt, rounds, true).password
+      )
+    ).toBe(true);
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`creates known iterations (onlyJs = ${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('creates known iterations', (): void => {
       expect(
         u8aToHex(pbkdf2Encode(TEST_PASSWORD, KNOWN_SALT, 2048, onlyJs).password)
       ).toEqual(

packages/util-crypto/src/random/asNumber.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { hexToBn } from '@polkadot/util';
+import { BN, hexToBn } from '@polkadot/util';
 
 import { randomAsHex } from './asHex';
 

packages/util-crypto/src/secp256k1/tweakAdd.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { assert, bnToU8a, isU8a } from '@polkadot/util';
+import { assert, BN, bnToU8a, isU8a } from '@polkadot/util';
 
 import { secp256k1 } from './secp256k1';
 

packages/util-crypto/src/sha512/asU8a.spec.ts

@@ -10,8 +10,8 @@ describe('sha512AsU8a', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`creates a sha-512 hash (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('creates a sha-512 hash', (): void => {
       expect(
         sha512AsU8a(Uint8Array.from([0x61, 0x62, 0x63, 0x64]), onlyJs)
       ).toEqual(

packages/util-crypto/src/xxhash/asU8a.spec.ts

@@ -11,28 +11,24 @@ describe('xxhashAsU8a', (): void => {
     await waitReady();
   });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 64-bit value by default (onlyJs=${onlyJs.toString()})`, (): void => {
+  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+    it('returns a 64-bit value by default', (): void => {
       expect(
         xxhashAsU8a('abc', undefined, onlyJs)
       ).toEqual(
         hexToU8a('0x990977adf52cbc44')
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 128-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 128-bit value (as specified', (): void => {
       expect(
         xxhashAsU8a('abc', 128, onlyJs)
       ).toEqual(
         hexToU8a('0x990977adf52cbc440889329981caa9be')
       );
     });
-  });
 
-  [false, true].forEach((onlyJs): void => {
-    it(`returns a 256-bit value (as specified, onlyJs=${onlyJs.toString()})`, (): void => {
+    it('returns a 256-bit value (as specified)', (): void => {
       expect(
         xxhashAsU8a('abc', 256, onlyJs)
       ).toEqual(

packages/util-crypto/src/xxhash/xxhash64/asBn.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
+import { BN } from '@polkadot/util';
 
 import xxhash64AsRaw from './asRaw';
 

packages/util/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/util",
-  "version": "6.4.1",
+  "version": "7.0.2",
   "type": "module",
   "description": "A collection of useful utilities for @polkadot",
   "main": "index.js",
@@ -19,9 +19,9 @@
   "bugs": "https://github.com/polkadot-js/common/issues",
   "homepage": "https://github.com/polkadot-js/common/tree/master/packages/util#readme",
   "dependencies": {
-    "@babel/runtime": "^7.14.0",
-    "@polkadot/x-textdecoder": "6.4.1",
-    "@polkadot/x-textencoder": "6.4.1",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/x-textdecoder": "7.0.2",
+    "@polkadot/x-textencoder": "7.0.2",
     "@types/bn.js": "^4.11.6",
     "bn.js": "^4.11.9",
     "camelcase": "^5.3.1",

packages/util/src/array/index.ts

@@ -8,3 +8,5 @@
 export { arrayChunk } from './chunk';
 export { arrayFilter } from './filter';
 export { arrayFlatten } from './flatten';
+export { arrayRange } from './range';
+export { arrayShuffle } from './shuffle';

packages/util/src/array/range.spec.ts

@@ -0,0 +1,24 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { arrayRange } from '.';
+
+describe('arrayRange', (): void => {
+  it('does not allow 0 values', (): void => {
+    expect(
+      () => arrayRange(0)
+    ).toThrow(/Expected non-zero, positive number as a range size/);
+  });
+
+  it('it creates a range of the specified length', (): void => {
+    expect(
+      arrayRange(10)
+    ).toEqual([0, 1, 2, 3, 4, 5, 6, 7, 8, 9]);
+  });
+
+  it('it creates a range of the specified length, with offset', (): void => {
+    expect(
+      arrayRange(7, 3)
+    ).toEqual([3, 4, 5, 6, 7, 8, 9]);
+  });
+});

packages/util/src/array/range.ts

@@ -0,0 +1,25 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { assert } from '../assert';
+
+/**
+ * @name arrayRange
+ * @summary Returns a range of numbers ith the size and the specified offset
+ * @description
+ * Returns a new array of numbers with the specific size. Optionally, when `startAt`, is provided, it generates the range to start at a specific value.
+ * @example
+ * <BR>
+ *
+ * ```javascript
+ * import { arrayRange } from '@polkadot/util';
+ *
+ * arrayRange(5); // [0, 1, 2, 3, 4]
+ * arrayRange(3, 5); // [5, 6, 7]
+ * ```
+ */
+export function arrayRange (size: number, startAt = 0): number[] {
+  assert(size > 0, 'Expected non-zero, positive number as a range size');
+
+  return new Array(size).fill(0).map((_, i) => i + startAt);
+}

packages/util/src/array/shuffle.spec.ts

@@ -0,0 +1,31 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { arrayRange, arrayShuffle } from '.';
+
+describe('arrayShuffle', (): void => {
+  it('returns an empty array as-is', (): void => {
+    expect(
+      arrayShuffle([])
+    ).toEqual([]);
+  });
+
+  it('returns a single array as-is', (): void => {
+    expect(
+      arrayShuffle([100])
+    ).toEqual([100]);
+  });
+
+  it('shuffles an array', (): void => {
+    const inp = arrayRange(100);
+    const out = arrayShuffle(inp);
+
+    expect(inp).toHaveLength(out.length);
+    expect(
+      inp.filter((v) => !out.includes(v))
+    ).toEqual([]);
+    expect(
+      JSON.stringify(inp)
+    ).not.toEqual(JSON.stringify(out));
+  });
+});

packages/util/src/array/shuffle.ts

@@ -0,0 +1,21 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export function arrayShuffle <T> (input: T[]): T[] {
+  const result = [...input];
+  let curr = result.length;
+
+  if (curr === 1) {
+    return result;
+  }
+
+  while (curr !== 0) {
+    const rand = Math.floor(Math.random() * curr);
+
+    curr--;
+
+    [result[curr], result[rand]] = [result[rand], result[curr]];
+  }
+
+  return result;
+}

packages/util/src/bn/bn.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/util authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import BN from 'bn.js';
+
+export { BN };

packages/util/src/bn/consts.spec.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { BN_HUNDRED, BN_ONE, BN_TEN, BN_THOUSAND, BN_ZERO } from '.';
+import { BN, BN_HUNDRED, BN_ONE, BN_TEN, BN_THOUSAND, BN_ZERO } from '.';
 
 describe('consts', (): void => {
   it('BN_ZERO equals 0', (): void => {

packages/util/src/bn/consts.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
+import { BN } from './bn';
 
 /**
  * @name BN_ZERO

packages/util/src/bn/index.ts

@@ -7,6 +7,7 @@
 
 export * from './consts';
 
+export { BN } from './bn';
 export { bnFromHex } from './fromHex';
 export { bnMax } from './max';
 export { bnMin } from './min';

packages/util/src/bn/max.spec.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { bnMax } from '.';
+import { BN, bnMax } from '.';
 
 describe('bnMax', (): void => {
   it('finds BN maximum', (): void => {

packages/util/src/bn/max.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
+import type { BN } from './bn';
 
 import { checkMaxMin } from './util';
 

packages/util/src/bn/min.spec.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { bnMin } from '.';
+import { BN, bnMin } from '.';
 
 describe('bnMin', (): void => {
   it('finds BN minimum', (): void => {

packages/util/src/bn/min.ts

@@ -1,7 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
+import type { BN } from './bn';
 
 import { checkMaxMin } from './util';
 

packages/util/src/bn/sqrt.spec.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { bnSqrt } from '.';
+import { BN, bnSqrt } from '.';
 
 const TESTS: [string | number | BN | BigInt, string | number][] = [
   [0, 0],

packages/util/src/bn/sqrt.ts

@@ -3,10 +3,9 @@
 
 import type { ToBn } from '../types';
 
-import BN from 'bn.js';
-
 import { assert } from '../assert';
-import { BN_MAX_INTEGER, BN_ONE, BN_ZERO } from '../bn';
+import { BN } from './bn';
+import { BN_MAX_INTEGER, BN_ONE, BN_ZERO } from './consts';
 import { bnToBn } from './toBn';
 
 const SQRT_MAX_SAFE_INTEGER = new BN(94906265);

packages/util/src/bn/toBn.spec.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { bnToBn } from '.';
+import { BN, bnToBn } from '.';
 
 describe('bnToBn', (): void => {
   it('converts null values to 0x00', (): void => {

packages/util/src/bn/toBn.ts

@@ -3,12 +3,11 @@
 
 import type { ToBn } from '../types';
 
-import BN from 'bn.js';
-
 import { hexToBn } from '../hex/toBn';
 import { isBigInt } from '../is/bigInt';
 import { isHex } from '../is/hex';
 import { isToBn } from '../is/toBn';
+import { BN } from './bn';
 
 /**
  * @name bnToBn

packages/util/src/bn/toHex.spec.ts

@@ -1,9 +1,7 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import BN from 'bn.js';
-
-import { bnToHex } from '.';
+import { BN, bnToHex } from '.';
 
 describe('bnToHex', (): void => {
   it('converts null values to 0x00', (): void => {

packages/util/src/bn/toHex.ts

@@ -1,8 +1,8 @@
 // Copyright 2017-2021 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type BN from 'bn.js';
 import type { ToBn, ToBnOptions } from '../types';
+import type { BN } from './bn';
 
 import { isNumber } from '../is/number';
 import { u8aToHex } from '../u8a';