[CI Skip] release/stable 7.9.2

skip-checks: true
7.9.2 (#1227 )
2021-11-22 05:16:31 +00:00 · 2021-11-22 07:12:03 +02:00 · 2021-11-22 04:56:09 +00:00 · 2021-11-22 06:51:49 +02:00 · 2021-11-21 18:25:15 +00:00 · 2021-11-21 20:21:20 +02:00
300 changed files with 8292 additions and 4029 deletions
@@ -17,4 +17,6 @@

 7.0.2
 7.0.3
-7.1.2
+7.1.2
+7.8.2
+7.9.2
@@ -13,6 +13,7 @@ jobs:
        CI_LOG: 123
      run: |
        yarn install --immutable | grep -v 'YN0013'
+        yarn build
        yarn networks:crosscheck

    - name: issue
@@ -1,5 +1,97 @@
 # CHANGELOG

+## 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:
+
+- Fix comment on `blake2AsU8a` (Thanks to https://github.com/tomokazukozuma)
+- Update Ethereum derivation process (Thanks to https://github.com/joelamouche)
+
+Changes:
+
+- Derivation paths now caters for > `MAX_SAFE_INTEGER` unsigned values
+- Sync with upstream Substrate ss58 registry
+- Update ss58 registry handling (both previous and current versions)
+
+
 ## 7.4.1 Sep 17, 2021

 Changes:
@@ -9,6 +101,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": "7.9.2",
  "workspaces": [
    "packages/*"
  ],
-  "resolutions": {
-    "typescript": "^4.4.3"
-  },
  "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.5",
-    "@polkadot/dev": "^0.62.67",
-    "@polkadot/ts": "^0.4.8",
-    "@types/ed2curve": "^0.2.2",
-    "@types/jest": "^27.0.1"
+    "@babel/core": "^7.16.0",
+    "@polkadot/dev": "^0.63.29",
+    "@polkadot/ts": "^0.4.14",
+    "@types/jest": "^27.0.3"
  },
-  "version": "7.4.1",
-  "packageManager": "yarn@3.0.1"
+  "resolutions": {
+    "typescript": "^4.5.2"
+  }
 }
@@ -1,26 +1,32 @@
 {
-  "name": "@polkadot/hw-ledger-transports",
-  "version": "7.4.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": "7.9.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.4.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '7.9.2' };
@@ -1,24 +1,30 @@
 {
-  "name": "@polkadot/hw-ledger",
-  "version": "7.4.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": "7.9.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/hw-ledger-transports": "7.4.1",
-    "@polkadot/util": "7.4.1",
+    "@babel/runtime": "^7.16.3",
+    "@polkadot/hw-ledger-transports": "7.9.2",
+    "@polkadot/util": "7.9.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.4.1' };
+export const packageInfo = { name: '@polkadot/hw-ledger', version: '7.9.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.4.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": "7.9.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/util": "7.4.1",
-    "@polkadot/util-crypto": "7.4.1"
+    "@babel/runtime": "^7.16.3",
+    "@polkadot/util": "7.9.2",
+    "@polkadot/util-crypto": "7.9.2"
  },
  "peerDependencies": {
-    "@polkadot/util": "7.4.1",
-    "@polkadot/util-crypto": "7.4.1"
+    "@polkadot/util": "7.9.2",
+    "@polkadot/util-crypto": "7.9.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])
@@ -121,6 +121,18 @@ describe('keypair', (): void => {
      ).toEqual('5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY');
    });

+    it('creates with integer derivations', (): void => {
+      // MAX_SAFE_INTEGER
+      expect(
+        keyring.createFromUri('//9007199254740991').address
+      ).toEqual('5CDsyNZyqxLpHnTvknr68anUcYoBFjZbFKiEJJf4prB75Uog');
+
+      // MAX_SAFE_INTEGER + extra digits
+      expect(
+        keyring.createFromUri('//900719925474099999').address
+      ).toEqual('5GHj2D7RG2m2DXYwGSDpXwuuxn53G987i7p2EQVDqP4NYu4q');
+    });
+
    it('creates via dev seed (2-byte encoding)', (): void => {
      keyring.setSS58Format(252);

@@ -160,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])
@@ -239,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');
    });
@@ -247,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');
@@ -256,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(
@@ -266,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(
@@ -393,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'));
@@ -410,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);
@@ -427,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 });
@@ -496,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);

@@ -526,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);

@@ -545,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);

@@ -18,6 +18,10 @@ const keypairFromSeed = {
  sr25519: (seed: Uint8Array): Keypair => schnorrkelFromSeed(seed)
 };

+function pairToPublic ({ publicKey }: KeyringPair): Uint8Array {
+  return publicKey;
+}
+
 /**
 * # @polkadot/keyring
 *
@@ -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.4.1' };
+export const packageInfo = { name: '@polkadot/keyring', version: '7.9.2' };
@@ -6,7 +6,7 @@ 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 { assert, objectSpread, u8aConcat, u8aEmpty, 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 { decodePair } from './decode';
@@ -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');
@@ -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
-  };
+  });
 }
@@ -3,12 +3,15 @@

 // From https://github.com/paritytech/substrate/wiki/Secret-URI-Test-Vectors

+import type { KeypairType } from '@polkadot/util-crypto/types';
+
 import { u8aToHex } from '@polkadot/util';
 import { cryptoWaitReady } from '@polkadot/util-crypto';

 import Keyring from '.';

 const PHRASE = 'bottom drive obey lake curtain smoke basket hold race lonely fit walk';
+const ETHEREUM_PHRASE = 'seed sock milk update focus rotate barely fade car face mechanic mercy';

 const TESTS = {
  ecdsa: [
@@ -22,7 +25,17 @@ const TESTS = {
    {
      pk: '0x0381351b1b46d2602b0992bb5d5531f9c1696b0812feb2534b6884adc47e2e1d8b',
      ss: '0x31ea8795EE32D782C8ff41a5C68Dcbf0F5B27f6d',
-      uri: "seed sock milk update focus rotate barely fade car face mechanic mercy/m/44'/60'/0'/0/0"
+      uri: `${ETHEREUM_PHRASE}/m/44'/60'/0'/0/0`
+    },
+    {
+      pk: '0x02509540919faacf9ab52146c9aa40db68172d83777250b28e4679176e49ccdd9f',
+      ss: '0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac',
+      uri: `${PHRASE}/m/44'/60'/0'/0/0`
+    },
+    {
+      pk: '0x033bc19e36ff1673910575b6727a974a9abd80c9a875d41ab3e2648dbfb9e4b518',
+      ss: '0x3Cd0A705a2DC65e5b1E1205896BaA2be8A07c6e0',
+      uri: `${PHRASE}/m/44'/60'/0'/0/1`
    }
  ],
  sr25519: [
@@ -75,17 +88,17 @@ const TESTS = {
 };

 describe('keyring.addFromUri', (): void => {
-  const keyring = new Keyring({ type: 'sr25519' });
-
-  beforeEach(async (): Promise<void> => {
-    await cryptoWaitReady();
-  });
-
  Object.entries(TESTS).forEach(([type, tests]): void => {
+    const keyring = new Keyring({ type: type as KeypairType });
+
+    beforeEach(async (): Promise<void> => {
+      await cryptoWaitReady();
+    });
+
    describe(type, (): void => {
      tests.forEach(({ pk, ss, uri }): void => {
        it(`creates ${uri}`, (): void => {
-          const pair = keyring.addFromUri(uri, {}, type as 'sr25519');
+          const pair = keyring.addFromUri(uri, {}, type as KeypairType);

          expect(u8aToHex(pair.publicKey)).toEqual(pk);
          expect(pair.address).toEqual(ss);
@@ -12,7 +12,7 @@ import { createPair } from './pair';
 interface PairDef {
  name?: string;
  publicKey: Uint8Array;
-  seed: string;
+  seed?: string;
  secretKey?: Uint8Array;
  type: KeypairType
 }
@@ -77,42 +77,36 @@ export const PAIRSETHEREUM: PairDef[] = [
    name: 'Alith',
    publicKey: hexToU8a('0x02509540919faacf9ab52146c9aa40db68172d83777250b28e4679176e49ccdd9f'),
    secretKey: hexToU8a('0x5fb92d6e98884f76de468fa3f6278f8807c48bebc13595d45af5bdc4da702133'), // nosemgrep
-    seed: "m/44'/40'/0'/0",
    type: 'ethereum'
  },
  {
    name: 'Baltathar',
    publicKey: hexToU8a('0x033bc19e36ff1673910575b6727a974a9abd80c9a875d41ab3e2648dbfb9e4b518'),
    secretKey: hexToU8a('0x8075991ce870b93a8870eca0c0f91913d12f47948ca0fd25b49c6fa7cdbeee8b'), // nosemgrep
-    seed: "m/44'/40'/0'/0",
    type: 'ethereum'
  },
  {
    name: 'Charleth',
    publicKey: hexToU8a('0x0234637bdc0e89b5d46543bcbf8edff329d2702bc995e27e9af4b1ba009a3c2a5e'),
    secretKey: hexToU8a('0x0b6e18cafb6ed99687ec547bd28139cafdd2bffe70e6b688025de6b445aa5c5b'), // nosemgrep
-    seed: "m/44'/40'/0'/0",
    type: 'ethereum'
  },
  {
    name: 'Dorothy',
    publicKey: hexToU8a('0x02a00d60b2b408c2a14c5d70cdd2c205db8985ef737a7e55ad20ea32cc9e7c417c'),
    secretKey: hexToU8a('0x39539ab1876910bbf3a223d84a29e28f1cb4e2e456503e7e91ed39b2e7223d68'), // nosemgrep
-    seed: "m/44'/40'/0'/0",
    type: 'ethereum'
  },
  {
    name: 'Ethan',
    publicKey: hexToU8a('0x025cdc005b752651cd3f728fb9192182acb3a9c89e19072cbd5b03f3ee1f1b3ffa'),
    secretKey: hexToU8a('0x7dce9bc8babb68fec1409be38c8e1a52650206a7ed90ff956ae8a6d15eeaaef4'), // nosemgrep
-    seed: "m/44'/40'/0'/0",
    type: 'ethereum'
  },
  {
    name: 'Faith',
    publicKey: hexToU8a('0x037964b6c9d546da4646ada28a99e34acaa1d14e7aba861a9055f9bd200c8abf74'),
    secretKey: hexToU8a('0xb9d2ea9a615f3165812e8d44de0d24da9bbd164b65c4f0573e1ce2c8dbd9c8df'), // nosemgrep
-    seed: "m/44'/40'/0'/0",
    type: 'ethereum'
  }
 ];
@@ -127,12 +121,16 @@ 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');
+    }
+
    const meta = {
      isTesting: true,
-      name: name || seed.replace('//', '_').toLowerCase()
+      name: name || (seed && seed.replace('//', '_').toLowerCase())
    };
-    const pair = !isDerived && !name
+    const pair = !isDerived && !name && seed
      ? keyring.addFromUri(seed, meta, options.type)
      : keyring.addPair(
        createPair({ toSS58: keyring.encodeAddress, type }, { publicKey, secretKey }, meta)
@@ -141,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.4.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": "7.9.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4"
+    "@babel/runtime": "^7.16.3"
  },
  "devDependencies": {
-    "@polkadot/util": "7.4.1",
-    "@polkadot/x-fetch": "7.4.1"
+    "@polkadot/util": "7.9.2",
+    "@polkadot/x-fetch": "7.9.2"
  }
 }
@@ -4,20 +4,27 @@
 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';

-function outputField (v) {
+const substrateRegistryRepo = substrateRegistry
+  .replace('raw.githubusercontent.com', 'github.com')
+  .split('main')[0];
+
+function outputField (k, v) {
  if (typeof v === 'string') {
    return `'${v}'`;
  } else if (Array.isArray(v)) {
-    return `[${v.map((v) => outputField(v)).join(', ')}]`;
+    // new format is [] to indicate optionality
+    return (['decimals', 'symbols'].includes(k) && !v.length)
+      ? null
+      : `[${v.map((v) => outputField(k, v)).join(', ')}]`;
  }

  return v;
 }

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

  return json.registry
@@ -25,7 +32,7 @@ async function getSubstrateRegistry () {
      `  {\n${Object
        .entries(e)
        .sort(([a], [b]) => a.localeCompare(b))
-        .map(([k, v]) => `    ${k}: ${outputField(v)}`)
+        .map(([k, v]) => `    ${k}: ${outputField(k, v)}`)
        .join(',\n')}\n  }`
    )
    .join(',\n');
@@ -36,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);
@@ -60,7 +60,11 @@ describe('check latest Substrate ss58 registry', (): void => {
        return [
          `${n.displayName} (${n.prefix})`,
          other
-            ? fields.filter((f) => stringify(n[f]) !== stringify(other[f]))
+            ? fields.filter((f) =>
+              ['decimals', 'symbols'].includes(f)
+                ? stringify(n[f] || []) !== stringify(other[f] || [])
+                : stringify(n[f]) !== stringify(other[f])
+            )
            : []
        ];
      })
@@ -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] || network.startsWith('reserved');
+
+  // 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.4.1' };
+export const packageInfo = { name: '@polkadot/networks', version: '7.9.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://substrate.dev/'
+    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',
@@ -533,6 +548,15 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['KMA'],
    website: 'https://manta.network'
  },
+  {
+    decimals: [12],
+    displayName: 'Polkadex Mainnet',
+    network: 'polkadex',
+    prefix: 88,
+    standardAccount: '*25519',
+    symbols: ['PDEX'],
+    website: 'https://polkadex.trade'
+  },
  {
    decimals: [18],
    displayName: 'PolkaSmith Canary Network',
@@ -560,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',
@@ -614,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',
@@ -632,6 +683,33 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['MOVR'],
    website: 'https://moonbeam.network'
  },
+  {
+    decimals: [12],
+    displayName: 'Kapex',
+    network: 'kapex',
+    prefix: 2007,
+    standardAccount: '*25519',
+    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],
    displayName: 'Basilisk',
@@ -640,5 +718,32 @@ export const knownSubstrate: KnownSubstrate[] = [
    standardAccount: '*25519',
    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',
+    network: 'contextfree',
+    prefix: 11820,
+    standardAccount: '*25519',
+    symbols: ['CTX'],
+    website: 'https://ata.network'
  }
 ];
@@ -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,33 +1,35 @@
 {
-  "name": "@polkadot/util-crypto",
-  "version": "7.4.1",
-  "type": "module",
+  "author": "Jaco Greeff <jacogr@gmail.com>",
+  "bugs": "https://github.com/polkadot-js/common/issues",
+  "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": "7.9.2",
+  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.15.4",
-    "@polkadot/networks": "7.4.1",
-    "@polkadot/util": "7.4.1",
-    "@polkadot/wasm-crypto": "^4.2.1",
-    "@polkadot/x-randomvalues": "7.4.1",
-    "base-x": "^3.0.8",
-    "base64-js": "^1.5.1",
+    "@babel/runtime": "^7.16.3",
+    "@polkadot/networks": "7.9.2",
+    "@polkadot/util": "7.9.2",
+    "@polkadot/wasm-crypto": "^4.4.1",
+    "@polkadot/x-randomvalues": "7.9.2",
    "blakejs": "^1.1.1",
    "bn.js": "^4.12.0",
    "create-hash": "^1.2.0",
@@ -35,6 +37,7 @@
    "elliptic": "^6.5.4",
    "hash.js": "^1.1.7",
    "js-sha3": "^0.8.0",
+    "micro-base": "^0.9.0",
    "scryptsy": "^2.1.0",
    "tweetnacl": "^1.0.3",
    "xxhashjs": "^0.2.2"
@@ -42,11 +45,12 @@
  "devDependencies": {
    "@types/bn.js": "^4.11.6",
    "@types/create-hash": "^1.2.2",
-    "@types/elliptic": "^6.4.13",
+    "@types/ed2curve": "^0.2.2",
+    "@types/elliptic": "^6.4.14",
    "@types/scryptsy": "^2.0.0",
    "@types/xxhashjs": "^0.2.2"
  },
  "peerDependencies": {
-    "@polkadot/util": "7.4.1"
+    "@polkadot/util": "7.9.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 { 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 = schnorrkelDerivePublic(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
+//
+//   import("../../../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 { performanceTest } 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 => {
+    performanceTest(`blake2AsU8a, bitLength=${bitLength}`, 64000, (input, onlyJs) =>
+      blake2AsU8a(input, bitLength, null, onlyJs)
+    );
+  });
 });
@@ -6,7 +6,9 @@ import type { HexString } from '@polkadot/util/types';
 import js from 'blakejs';

 import { u8aToU8a } from '@polkadot/util';
-import { blake2b, isReady } from '@polkadot/wasm-crypto';
+import { blake2b } from '@polkadot/wasm-crypto';
+
+import { createAsHex, isWasmOnly } from '../helpers';

 /**
 * @name blake2AsU8a
@@ -19,13 +21,20 @@ import { blake2b, isReady } from '@polkadot/wasm-crypto';
 * ```javascript
 * import { blake2AsU8a } from '@polkadot/util-crypto';
 *
- * blake2AsU8a('abc'); // => [0xba, 0x80, 0xa53, 0xf98, 0x1c, 0x4d, 0x0d]
+ * 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 = 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 isWasmOnly(onlyJs)
+    ? blake2b(u8a, u8aToU8a(key), byteLength)
+    : js.blake2b(u8a, key || undefined, byteLength);
 }
+
+/**
+ * @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 };
@@ -26,6 +26,6 @@ export * from './random';
 export * from './schnorrkel';
 export * from './scrypt';
 export * from './secp256k1';
-export * from './sha512';
+export * from './sha';
 export * from './signature';
 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()
@@ -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,7 +5,8 @@ import type { Keypair } from '../../types';

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

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

@@ -24,13 +25,13 @@ function createCoded (secretKey: Uint8Array, chainCode: Uint8Array): CodedKeypai
 }

 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)
  );
 }
@@ -12,27 +12,28 @@ 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 naclKeypairFromSeed(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;
@@ -10,9 +10,15 @@ export function hdValidatePath (path: string): boolean {

  const parts = path.split('/').slice(1);

-  return parts.every((n) => /^\d+'?$/.test(n)) && (
-    !parts
-      .map((n) => parseInt(n.replace(/'$/, ''), 10))
-      .some((n) => isNaN(n) || (n >= HARDENED) || (n < 0))
-  );
+  for (const p of parts) {
+    const n = /^\d+'?$/.test(p)
+      ? parseInt(p.replace(/'$/, ''), 10)
+      : Number.NaN;
+
+    if (isNaN(n) || (n >= HARDENED) || (n < 0)) {
+      return false;
+    }
+  }
+
+  return true;
 }
@@ -0,0 +1,22 @@
+// 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 { isReady } from '@polkadot/wasm-crypto';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createAsHex <T extends (...args: any[]) => Uint8Array> (fn: T): (...args: Parameters<T>) => HexString {
+  return (...args: Parameters<T>): HexString =>
+    u8aToHex(fn(...args));
+}
+
+export function createBitHasher <T> (bitLength: T, fn: (data: HexString | Buffer | Uint8Array | string, bitLength: T, onlyJs?: boolean) => Uint8Array): (data: HexString | Buffer | Uint8Array | string, onlyJs?: boolean) => Uint8Array {
+  return (data: HexString | Buffer | Uint8Array | string, onlyJs?: boolean): Uint8Array =>
+    fn(data, bitLength, onlyJs);
+}
+
+export function isWasmOnly (onlyJs?: boolean): boolean {
+  return isReady() && !onlyJs;
+}
@@ -1,5 +1,4 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-export { hmacSha256 } from './sha256';
-export { hmacSha512 } from './sha512';
+export { hmacShaAsU8a, hmacSha256AsU8a, hmacSha512AsU8a } from './shaAsU8a';
@@ -1,14 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import hash from 'hash.js';
-
-export function hmacSha (key: Uint8Array | string, data: Uint8Array, is512: boolean): Uint8Array {
-  return Uint8Array.from(
-    hash
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      .hmac(is512 ? hash.sha512 : hash.sha256, key)
-      .update(data)
-      .digest());
-}
@@ -1,8 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { hmacSha } from './sha';
-
-export function hmacSha256 (key: Uint8Array | string, data: Uint8Array): Uint8Array {
-  return hmacSha(key, data, false);
-}
@@ -1,8 +0,0 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { hmacSha } from './sha';
-
-export function hmacSha512 (key: Uint8Array | string, data: Uint8Array): Uint8Array {
-  return hmacSha(key, data, true);
-}
@@ -0,0 +1,39 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { hexToU8a, stringToU8a } from '@polkadot/util';
+import { waitReady } from '@polkadot/wasm-crypto';
+
+import { performanceTest } from '../../test/performance';
+import { hmacShaAsU8a } from '.';
+
+describe('hmacShaAsU8a', (): void => {
+  beforeEach(async (): Promise<void> => {
+    await waitReady();
+  });
+
+  const key = stringToU8a('secret');
+  const data = stringToU8a('some message');
+  const output = {
+    256: hexToU8a(
+      '0xf28a70b41263840e5c059a0a733336e0957efba87902aa8cca11441d4b0c96d7'
+    ),
+    512: hexToU8a(
+      '0x295832e97ed77be75a9fa98029497e4a722c4b9a2f21b39d34f1befa931a39ec520fd24711d6f5c03501384ea66b83066a01a82c57a0460f8cd1f471fcce5841'
+    )
+  };
+
+  describe.each([256, 512] as (256 | 512)[])('bitLength=$p', (bitLength): void => {
+    describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
+      it('returns an hex representation (string)', (): void => {
+        expect(
+          hmacShaAsU8a(key, data, bitLength, onlyJs)
+        ).toEqual(output[bitLength]);
+      });
+    });
+
+    performanceTest(`hmacShaAsU8a, bitLength=${bitLength}`, 16000, (input, onlyJs) =>
+      hmacShaAsU8a(input, input, bitLength, onlyJs)
+    );
+  });
+});
@@ -0,0 +1,38 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import hash from 'hash.js';
+
+import { u8aToU8a } from '@polkadot/util';
+import { hmacSha256, hmacSha512 } from '@polkadot/wasm-crypto';
+
+import { isWasmOnly } from '../helpers';
+
+type HashFn = (key: Uint8Array | string, data: Uint8Array, onlyJs?: boolean) => Uint8Array;
+
+function createSha (bitLength: 256 | 512 = 256): HashFn {
+  return (key: Uint8Array | string, data: Uint8Array, onlyJs?: boolean): Uint8Array =>
+    hmacShaAsU8a(key, data, bitLength, onlyJs);
+}
+
+export function hmacShaAsU8a (key: Uint8Array | string, data: Uint8Array, bitLength: 256 | 512 = 256, onlyJs?: boolean): Uint8Array {
+  const is256 = bitLength === 256;
+  const u8aKey = u8aToU8a(key);
+
+  return isWasmOnly(onlyJs)
+    ? is256
+      ? hmacSha256(u8aKey, data)
+      : hmacSha512(u8aKey, data)
+    : new Uint8Array(
+      is256
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        ? hash.hmac(hash.sha256, u8aKey).update(data).digest()
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
+        : hash.hmac(hash.sha512, u8aKey).update(data).digest()
+    );
+}
+
+export const hmacSha256AsU8a = createSha(256);
+export const hmacSha512AsU8a = createSha(512);
@@ -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 { keccakAsU8a } from './asU8a';
-
-/**
- * @name keccakAsHex
- * @summary Creates a keccak hex string from the input.
- * @description
- * From either a `string` or a `Buffer` input, create the keccak and return the result as a `0x` prefixed hex string.
- * @example
- * <BR>
- *
- * ```javascript
- * import { keccakAsHex } from '@polkadot/util-crypto';
- *
- * keccakAsHex('123'); // => 0x...
- * ```
- */
-export function keccakAsHex (value: HexString | Buffer | Uint8Array | string, bitLength?: 256 | 512): HexString {
-  return u8aToHex(
-    keccakAsU8a(value, bitLength)
-  );
-}
@@ -4,6 +4,7 @@
 import { hexToU8a, stringToU8a } from '@polkadot/util';
 import { waitReady } from '@polkadot/wasm-crypto';

+import { performanceTest } from '../../test/performance';
 import { keccakAsU8a } from '.';

 describe('keccakAsU8a', (): void => {
@@ -21,8 +22,8 @@ describe('keccakAsU8a', (): void => {
    )
  };

-  describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
-    describe.each([256, 512] as (256 | 512)[])('bitLength=$p', (bitLength): void => {
+  describe.each([256, 512] as (256 | 512)[])('bitLength=$p', (bitLength): void => {
+    describe.each([false, true])('onlyJs=%p', (onlyJs): void => {
      it('returns an hex representation (string)', (): void => {
        expect(
          keccakAsU8a(input, bitLength, onlyJs)
@@ -41,5 +42,9 @@ describe('keccakAsU8a', (): void => {
        ).toEqual(output[bitLength]);
      });
    });
+
+    performanceTest(`keccakAsU8a, bitLength=${bitLength}`, 128000, (input, onlyJs) =>
+      keccakAsU8a(input, bitLength, onlyJs)
+    );
  });
 });
@@ -6,7 +6,9 @@ import type { HexString } from '@polkadot/util/types';
 import js from 'js-sha3';

 import { u8aToU8a } from '@polkadot/util';
-import { isReady, keccak256 } from '@polkadot/wasm-crypto';
+import { keccak256, keccak512 } from '@polkadot/wasm-crypto';
+
+import { createAsHex, createBitHasher, isWasmOnly } from '../helpers';

 /**
 * @name keccakAsU8a
@@ -22,12 +24,35 @@ import { isReady, keccak256 } from '@polkadot/wasm-crypto';
 * keccakAsU8a('123'); // => Uint8Array
 * ```
 */
-export function keccakAsU8a (value: HexString | Buffer | Uint8Array | string, bitLength: 256 | 512 = 256, onlyJs = false): Uint8Array {
+export function keccakAsU8a (value: HexString | Buffer | Uint8Array | string, bitLength: 256 | 512 = 256, onlyJs?: boolean): Uint8Array {
  const is256 = bitLength === 256;
+  const u8a = u8aToU8a(value);

-  return isReady() && is256 && !onlyJs
-    ? keccak256(u8aToU8a(value))
+  return isWasmOnly(onlyJs)
+    ? is256
+      ? keccak256(u8a)
+      : keccak512(u8a)
    : new Uint8Array(
-      (is256 ? js.keccak256 : js.keccak512).update(u8aToU8a(value)).arrayBuffer()
+      is256
+        ? js.keccak256.update(u8a).arrayBuffer()
+        : js.keccak512.update(u8a).arrayBuffer()
    );
 }
+
+/**
+ * @name keccak256AsU8a
+ * @description Creates a keccak256 Uint8Array from the input.
+ */
+export const keccak256AsU8a = createBitHasher(256, keccakAsU8a);
+
+/**
+ * @name keccak512AsU8a
+ * @description Creates a keccak512 Uint8Array from the input.
+ */
+export const keccak512AsU8a = createBitHasher(512, keccakAsU8a);
+
+/**
+ * @name keccakAsHex
+ * @description Creates a keccak hex string from the input.
+ */
+export const keccakAsHex = createAsHex(keccakAsU8a);
@@ -5,5 +5,4 @@
 * @summary Create Keccak256/512 values as hex & Uint8Array output
 */

-export { keccakAsHex } from './asHex';
-export { keccakAsU8a } from './asU8a';
+export { keccakAsHex, keccakAsU8a, keccak256AsU8a, keccak512AsU8a } from './asU8a';
@@ -3,17 +3,14 @@

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

-import { BN, bnToHex, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util';
+import { BN, bnToU8a, compactAddLength, hexToU8a, isBigInt, isBn, isHex, isNumber, isString, stringToU8a } from '@polkadot/util';

 import { blake2AsU8a } from '../blake2/asU8a';
+import { BN_LE_256_OPTS } from '../bn';

 const RE_NUMBER = /^\d+$/;

 const JUNCTION_ID_LEN = 32;
-const BN_OPTIONS = {
-  bitLength: 256,
-  isLe: true
-};

 export class DeriveJunction {
  readonly #chainCode: Uint8Array = new Uint8Array(32);
@@ -28,7 +25,7 @@ export class DeriveJunction {

    result.soft(
      RE_NUMBER.test(code)
-        ? parseInt(code, 10)
+        ? new BN(code, 10)
        : code
    );

@@ -61,7 +58,7 @@ export class DeriveJunction {

  public soft (value: HexString | number | string | bigint | BN | Uint8Array): DeriveJunction {
    if (isNumber(value) || isBn(value) || isBigInt(value)) {
-      return this.soft(bnToHex(value, BN_OPTIONS));
+      return this.soft(bnToU8a(value, BN_LE_256_OPTS));
    } else if (isHex(value)) {
      return this.soft(hexToU8a(value));
    } else if (isString(value)) {
@@ -23,9 +23,9 @@ export function keyExtractPath (derivePath: string): ExtractResult {
  if (parts) {
    constructed = parts.join('');

-    parts.forEach((value: string): void => {
-      path.push(DeriveJunction.from(value.substr(1)));
-    });
+    for (const p of parts) {
+      path.push(DeriveJunction.from(p.substr(1)));
+    }
  }

  assert(constructed === derivePath, () => `Re-constructed path "${constructed}" does not match input`);
@@ -18,8 +18,11 @@ const generators = {

 export function keyFromPath (pair: Keypair, path: DeriveJunction[], type: KeypairType): Keypair {
  const keyHdkd = generators[type];
+  let result = pair;

-  return path.reduce((pair, junction): Keypair => {
-    return keyHdkd(pair, junction);
-  }, pair);
+  for (const junction of path) {
+    result = keyHdkd(result, junction);
+  }
+
+  return result;
 }
@@ -0,0 +1,18 @@
+// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { Keypair } from '../types';
+
+import { assert } from '@polkadot/util';
+
+import { DeriveJunction } from './DeriveJunction';
+
+export function createSeedDeriveFn (fromSeed: (seed: Uint8Array) => Keypair, derive: (seed: Uint8Array, chainCode: Uint8Array) => Uint8Array): (keypair: Keypair, junction: DeriveJunction) => Keypair {
+  return (keypair: Keypair, { chainCode, isHard }: DeriveJunction): Keypair => {
+    assert(isHard, 'A soft key was found in the path and is not supported');
+
+    return fromSeed(
+      derive(keypair.secretKey.subarray(0, 32), chainCode)
+    );
+  };
+}
@@ -1,18 +1,8 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { Keypair } from '../types';
-
-import { assert } from '@polkadot/util';
-
 import { secp256k1DeriveHard } from '../secp256k1/deriveHard';
 import { secp256k1KeypairFromSeed } from '../secp256k1/keypair/fromSeed';
-import { DeriveJunction } from './DeriveJunction';
+import { createSeedDeriveFn } from './hdkdDerive';

-export function keyHdkdEcdsa (keypair: Keypair, { chainCode, isHard }: DeriveJunction): Keypair {
-  assert(isHard, 'A soft key was found in the path (and is unsupported)');
-
-  return secp256k1KeypairFromSeed(
-    secp256k1DeriveHard(keypair.secretKey.subarray(0, 32), chainCode)
-  );
-}
+export const keyHdkdEcdsa = createSeedDeriveFn(secp256k1KeypairFromSeed, secp256k1DeriveHard);
@@ -1,18 +1,8 @@
 // Copyright 2017-2021 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { Keypair } from '../types';
-
-import { assert } from '@polkadot/util';
-
 import { naclDeriveHard } from '../nacl/deriveHard';
 import { naclKeypairFromSeed } from '../nacl/keypair/fromSeed';
-import { DeriveJunction } from './DeriveJunction';
+import { createSeedDeriveFn } from './hdkdDerive';

-export function keyHdkdEd25519 (keypair: Keypair, { chainCode, isHard }: DeriveJunction): Keypair {
-  assert(isHard, 'A soft key was found in the path (and is unsupported)');
-
-  return naclKeypairFromSeed(
-    naclDeriveHard(keypair.secretKey.subarray(0, 32), chainCode)
-  );
-}
+export const keyHdkdEd25519 = createSeedDeriveFn(naclKeypairFromSeed, naclDeriveHard);
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Github Actions	39937bed29	[CI Skip] release/stable 7.9.2 skip-checks: true	2021-11-22 05:16:31 +00:00
Jaco	3519d21d8e	7.9.2 (#1227 )	2021-11-22 07:12:03 +02:00
Github Actions	8b4dc01ae4	[CI Skip] release/beta 7.9.2-2 skip-checks: true	2021-11-22 04:56:09 +00:00
Jaco	bb73f7ae41	Fix TS import generation (#1226 ) * Fix TS import generation * Flatten	2021-11-22 06:51:49 +02:00
Github Actions	e6a0f1e2fd	[CI Skip] release/beta 7.9.2-1 skip-checks: true	2021-11-21 18:25:15 +00:00
Jaco	e8af9b5a1e	Add a helper for de-dupe of AsHex (#1224 ) Add a helper for de-dupe of AsHex Update packages/util-crypto/src/random/asU8a.ts * lint * isWasmOnly helper * bit hasher	2021-11-21 20:21:20 +02:00
Github Actions	1606dfd9ca	[CI Skip] release/beta 7.9.2-0 skip-checks: true	2021-11-21 06:58:47 +00:00
Jaco	2fcf59eeb0	Provide JS/Wasm interfaces for hmacShaAsU8a (#1223 ) * Provide JS/Wasm interfaces for hmacShaAsU8a * Adjust * Re-add helpers * Alignments	2021-11-21 08:54:54 +02:00
Github Actions	a7606b6514	[CI Skip] release/stable 7.9.1 skip-checks: true	2021-11-21 05:26:30 +00:00
Jaco	871b20c90a	7.9.1 (#1222 )	2021-11-21 07:22:56 +02:00
Github Actions	5d93642093	[CI Skip] release/beta 7.8.3-41 skip-checks: true	2021-11-20 16:30:44 +00:00
Jaco	2b2fefb2bb	Basic rountrip tests for mmacSha (#1221 )	2021-11-20 18:27:06 +02:00
Github Actions	1ede65db38	[CI Skip] release/beta 7.8.3-40 skip-checks: true	2021-11-20 07:33:41 +00:00
Jaco	7090c3daec	Re-use cleanups (#1219 ) * Re-use cleanups * linting * Adjust * Adjust * ipfsCompat into if * Adjust	2021-11-20 09:29:13 +02:00
Github Actions	c03f53e097	[CI Skip] release/beta 7.8.3-39 skip-checks: true	2021-11-19 15:50:17 +00:00
Jaco	2ec02e2580	Combine sha256/512 into single top-level folder (#1218 ) * Combine sha256/512 into single top-level folder * linting * imports	2021-11-19 17:46:49 +02:00
Github Actions	6b4f9b3d2f	[CI Skip] release/beta 7.8.3-38 skip-checks: true	2021-11-19 14:21:02 +00:00
Jaco	d20c37ddd0	Extract performance test loop (& bump wasm) (#1217 ) * Extract performance test loop (& bump wasm) * bitLength for blake preformance * sha512 naming * ops/s display	2021-11-19 16:16:39 +02:00
Github Actions	23d46b063c	[CI Skip] release/beta 7.8.3-37 skip-checks: true	2021-11-19 13:03:22 +00:00
Jaco	085862ce79	Wasm-compat for keccak512 & sha256 (#1216 ) * Wasm-compa for keccak512 & sha256 * wasm/non-wasm tests * linting * Bump wasm * formatting	2021-11-19 14:59:59 +02:00
Github Actions	88580b98a6	[CI Skip] release/beta 7.8.3-36 skip-checks: true	2021-11-19 12:05:22 +00:00
Jaco	fb8b80afd7	Add/use sha256 export (#1215 )	2021-11-19 14:01:19 +02:00
Github Actions	d3b5b4ad38	[CI Skip] release/beta 7.8.3-35 skip-checks: true	2021-11-19 11:41:37 +00:00
Jaco	049e8dfde8	Curve conversion tests (#1214 )	2021-11-19 13:37:43 +02:00
Github Actions	8230e3ceac	[CI Skip] release/beta 7.8.3-34 skip-checks: true	2021-11-19 11:27:04 +00:00
Jaco	37358d4d05	Correct location for @types/ed2curve (#1213 )	2021-11-19 13:22:59 +02:00
Github Actions	2cf6ffa3b1	[CI Skip] release/beta 7.8.3-33 skip-checks: true	2021-11-19 10:59:25 +00:00
Jaco	d7f2a70071	networks:sync (#1212 )	2021-11-19 12:54:59 +02:00
Github Actions	eb96e2a7aa	[CI Skip] release/beta 7.8.3-32 skip-checks: true	2021-11-19 09:38:49 +00:00
Jaco	6965709351	Drop unused BigInt class extension (#1210 )	2021-11-19 11:35:05 +02:00
Github Actions	1677d3eace	[CI Skip] release/beta 7.8.3-31 skip-checks: true	2021-11-19 09:31:53 +00:00
Jaco	4d77bf3c5b	Use micro-base for base{32, 58, 64} (#1209 )	2021-11-19 11:27:47 +02:00
Github Actions	222bb74a81	[CI Skip] release/beta 7.8.3-30 skip-checks: true	2021-11-19 07:59:15 +00:00
Jaco	90b4b61852	Add has* env detection (#1207 )	2021-11-19 09:55:17 +02:00
Github Actions	b1e209dfeb	[CI Skip] release/beta 7.8.3-29 skip-checks: true	2021-11-19 04:27:06 +00:00
Jaco	88beb4d81c	Adjust isHex length check (#1205 )	2021-11-19 06:23:01 +02:00
Github Actions	3b2ecb87e9	[CI Skip] release/beta 7.8.3-28 skip-checks: true	2021-11-18 16:18:37 +00:00
Adam Dossa	79a2cd0e8f	Update Polymesh Genesis Hash (#1193 )	2021-11-18 18:14:35 +02:00
Github Actions	0c2d105f9d	[CI Skip] release/beta 7.8.3-27 skip-checks: true	2021-11-18 08:26:04 +00:00
Jaco	944d77c5f2	Bump deps (#1202 )	2021-11-18 10:21:54 +02:00
Github Actions	0fdf83effe	[CI Skip] release/beta 7.8.3-26 skip-checks: true	2021-11-18 08:01:33 +00:00
Jaco	66866e1a8e	isCodec (#1201 )	2021-11-18 09:57:26 +02:00
Github Actions	9abcc72143	[CI Skip] release/beta 7.8.3-25 skip-checks: true	2021-11-18 06:52:13 +00:00
Jaco	6f0aa35098	Flatten calls (#1200 )	2021-11-18 08:48:15 +02:00
Github Actions	93fb633ea6	[CI Skip] release/beta 7.8.3-24 skip-checks: true	2021-11-17 12:11:04 +00:00
Jaco	5524e50baf	stripPrefix adjustment	2021-11-17 14:07:43 +02:00
Jaco	e1354746b1	Fix hexStripPrefix	2021-11-17 14:01:04 +02:00
Github Actions	309722f285	[CI Skip] release/beta 7.8.3-23 skip-checks: true	2021-11-17 11:52:13 +00:00
Jaco	4efd88869d	Re-add ignoreLength (#1199 ) * Re-add ignoreLength * Actual ignore	2021-11-17 13:48:07 +02:00
Github Actions	ee0436a612	[CI Skip] release/beta 7.8.3-22 skip-checks: true	2021-11-17 08:37:01 +00:00
Jaco	b4ca8219d9	Sync ss58 registry (#1198 )	2021-11-17 10:33:28 +02:00
Github Actions	d30a3ddedb	[CI Skip] release/beta 7.8.3-21 skip-checks: true	2021-11-16 18:31:05 +00:00
Jaco	fa5b5bca7e	Additional bigint utilities (#1194 ) * Additional bigint utilities * Adjust tests * biTo{Hex, U8a} * Adjust * Ordering * biSqrt * Fix toU8a * Extensible BigInt * Class TS issues.... * Move type def to types * Update packages/util/src/bi/sqrt.spec.ts * max/min * min/max tests	2021-11-16 20:27:19 +02:00
Github Actions	87afdb1d86	[CI Skip] release/beta 7.8.3-20 skip-checks: true	2021-11-16 04:38:40 +00:00
Jaco	23f68c63f4	Constant for secp256k1 curve.n (#1192 ) * Constant for secp256k1 curve.n * Link to constant definition * global space replace	2021-11-16 06:35:25 +02:00
Github Actions	184dbccf39	[CI Skip] release/beta 7.8.3-19 skip-checks: true	2021-11-15 18:50:53 +00:00
Jaco	06c06a8b73	toBigInt utilities (#1191 ) * toBigInt utilities * Handle negatives? * two's complement adjustments * Adjust * Compliment util extract * dedupe * Ensure > u32 tests	2021-11-15 20:46:48 +02:00
Github Actions	82f5fec822	[CI Skip] release/beta 7.8.3-18 skip-checks: true	2021-11-15 14:36:07 +00:00
Jaco	a953b3a78a	Optimize bip39 list for size (#1190 )	2021-11-15 16:32:48 +02:00
Github Actions	19283b3c28	[CI Skip] release/beta 7.8.3-17 skip-checks: true	2021-11-15 12:34:06 +00:00
Jaco	ac06f38118	Bump deps (#1187 )	2021-11-15 14:30:31 +02:00
Github Actions	f9e5c033ab	[CI Skip] release/beta 7.8.3-16 skip-checks: true	2021-11-15 11:05:50 +00:00
Jaco	de7817e6b5	Use DataView as applicable (#1186 ) * Use DataView as applicable * .skip * Fix hexToU8a length calc * hello world	2021-11-15 13:01:47 +02:00
Github Actions	5972551313	[CI Skip] release/beta 7.8.3-15 skip-checks: true	2021-11-15 05:19:33 +00:00
Jaco	cf0aab479a	Small utility adjustments (#1185 )	2021-11-15 07:16:21 +02:00
Github Actions	5ab0b173b6	[CI Skip] release/beta 7.8.3-14 skip-checks: true	2021-11-14 19:07:34 +00:00
Jaco	cf990dd4ec	Aligh u8aToHex optimization (#1184 ) * Aligh u8aToHex optimization * Adjust * Fix failing tests, empty value * Adjust * numberToHex fix * Fix hexFixLength tests	2021-11-14 21:03:41 +02:00
Github Actions	8a6fd0812a	[CI Skip] release/beta 7.8.3-13 skip-checks: true	2021-11-14 17:26:15 +00:00
Jaco	e93f8d7418	for look index namings (consistency) (#1183 )	2021-11-14 19:22:06 +02:00
Github Actions	36f6407796	[CI Skip] release/beta 7.8.3-12 skip-checks: true	2021-11-14 15:39:05 +00:00
Jaco	8ede488aec	u8aEq w/ U32 and lower only (#1182 ) * u8aEq w/ U32 and lower only * Adjust mod * Adjust signatures	2021-11-14 17:35:56 +02:00
Github Actions	eb9d5b9585	[CI Skip] release/beta 7.8.3-11 skip-checks: true	2021-11-14 15:25:32 +00:00
Jaco	20821aad40	Performance optimizations (#1181 ) * Performance optimizations * Use slice internally to u8aEq * Adjust * formatting * subarray * Fixes * Use DataView * With alignment * Use Float64Array when available * Skip performance * Renames * Alignment comment * Constants * Use BYTES_PER_ELEMENT * Adjust	2021-11-14 17:21:07 +02:00
Github Actions	23fa2b90a8	[CI Skip] release/beta 7.8.3-10 skip-checks: true	2021-11-13 17:37:15 +00:00
Jaco	f94a1ea730	ss58 sync (#1180 )	2021-11-13 19:34:08 +02:00
Github Actions	fc98cd9b45	[CI Skip] release/beta 7.8.3-9 skip-checks: true	2021-11-13 15:43:42 +00:00
Jaco	5fdd967666	Small consistency cleanups (#1178 ) * Small consistency cleanups * Adjust * Adjust	2021-11-13 17:39:52 +02:00
Github Actions	9043f335d4	[CI Skip] release/beta 7.8.3-8 skip-checks: true	2021-11-13 09:42:20 +00:00
Jaco	d9231d26aa	Additional Node-specific u8a utils (#1177 ) * Additional Node-specific u8a utils * toHexBuffer	2021-11-13 11:38:07 +02:00
Github Actions	445e0f7ea6	[CI Skip] release/beta 7.8.3-7 skip-checks: true	2021-11-12 07:23:46 +00:00
Jaco	ba0a183bd9	Re-use pre-define BN_{BE, LE}_* constants (#1175 ) * Re-use pre-define BN_{BE, LE}_* constants * ordering update * bnMax/bnMin opt * u8aToHex flatten	2021-11-12 09:19:49 +02:00
Github Actions	46beaa1151	[CI Skip] release/beta 7.8.3-6 skip-checks: true	2021-11-12 06:47:36 +00:00
Jaco	31d55b218a	Additional tests (w/ lazy) (#1174 )	2021-11-12 08:44:00 +02:00
Github Actions	9b30b4b09e	[CI Skip] release/beta 7.8.3-5 skip-checks: true	2021-11-11 13:45:03 +00:00
Jaco	cc0dd2a2b5	Address validation tests (#1173 )	2021-11-11 15:41:54 +02:00
Github Actions	31a0a9b9d1	[CI Skip] release/beta 7.8.3-4 skip-checks: true	2021-11-11 13:23:30 +00:00
Jaco	9e1e49a1b8	Additional tests (need to expand more...) (#1172 ) * Additional utility tests * Args on constructor	2021-11-11 15:20:01 +02:00
Github Actions	313b44388a	[CI Skip] release/beta 7.8.3-3 skip-checks: true	2021-11-11 12:42:42 +00:00
Jaco	30dd8169bc	Add tests missing for object* methods (#1171 ) * Add tests missing for object* methods * Extend objectProperty comments * Additional test * objectProperties this test * Adjust	2021-11-11 14:38:58 +02:00
Github Actions	67450bc225	[CI Skip] release/beta 7.8.3-2 skip-checks: true	2021-11-11 12:06:01 +00:00
Jaco	e9285e9ccd	Bump deps (#1170 )	2021-11-11 14:02:11 +02:00
Github Actions	2a45652ce0	[CI Skip] release/beta 7.8.3-1 skip-checks: true	2021-11-08 08:16:48 +00:00
Jaco	6d923da266	object{Entries, Keys, Values} (#1169 ) * object{Entries, Keys, Values} * Use objectKeys as applicable * tighten schema defs * Linting issue snuck in	2021-11-08 10:09:26 +02:00
Github Actions	d55b48566b	[CI Skip] release/beta 7.8.3-0 skip-checks: true	2021-11-08 06:11:13 +00:00
Jaco	3ac567e1c4	stringPascalCase (#1168 )	2021-11-08 08:03:04 +02:00
Jaco	d19713f548	hexToU8aBuffer	2021-11-08 08:02:36 +02:00
Github Actions	53249f51b8	[CI Skip] release/stable 7.8.2 skip-checks: true	2021-11-07 07:33:32 +00:00
Jaco	4883106c3d	7.8.2 (#1167 )	2021-11-07 09:25:15 +02:00
Github Actions	b3f60da550	[CI Skip] release/beta 7.8.2-0 skip-checks: true	2021-11-06 14:03:57 +00:00
Jaco	644f32dfaa	Additional isArray (w/ is* opts) (#1166 )	2021-11-06 15:56:51 +02:00
Github Actions	bf4c6b497f	[CI Skip] release/stable 7.8.1 skip-checks: true	2021-11-06 11:26:10 +00:00
Jaco	a74ac0a0f9	7.8.1 (#1165 )	2021-11-06 13:19:01 +02:00
Github Actions	6701f7420f	[CI Skip] release/beta 7.7.2-8 skip-checks: true	2021-11-06 10:56:11 +00:00
Jaco	8e43a2d105	Sync ss58registry (#1164 )	2021-11-06 12:48:48 +02:00
Github Actions	9560301883	[CI Skip] release/beta 7.7.2-7 skip-checks: true	2021-11-05 14:36:05 +00:00
qwer951123	889bd36432	Add acala genesis (#1161 )	2021-11-05 16:27:33 +02:00
Github Actions	e310a63059	[CI Skip] release/beta 7.7.2-6 skip-checks: true	2021-11-04 15:11:31 +00:00
Jaco	98082774f7	Add objectCopy (#1160 )	2021-11-04 17:02:45 +02:00
Github Actions	4d680f4b0c	[CI Skip] release/beta 7.7.2-5 skip-checks: true	2021-11-04 12:24:30 +00:00
Jaco	ff7c086b5b	Import lazy* from api repo (#1159 )	2021-11-04 14:16:58 +02:00
Github Actions	63b38c56ff	[CI Skip] release/beta 7.7.2-4 skip-checks: true	2021-11-04 08:10:38 +00:00
Jaco	8be38e40a1	Bump dev deps (#1158 )	2021-11-04 10:01:35 +02:00
Github Actions	9eb2f14dee	[CI Skip] release/beta 7.7.2-3 skip-checks: true	2021-11-04 06:24:05 +00:00
Jaco	733d7c1948	Add objectClear & objectSpread (#1157 ) * Add objectClear & objectSpread * Allow null/undefined as a source	2021-11-04 08:16:55 +02:00
Github Actions	08ac55d7cd	[CI Skip] release/beta 7.7.2-2 skip-checks: true	2021-11-03 16:21:23 +00:00
Jaco	e2f5a85d14	Correct types for Ledger signature (#1156 )	2021-11-03 18:13:00 +02:00
Github Actions	77289d0ec0	[CI Skip] release/beta 7.7.2-1 skip-checks: true	2021-11-03 12:49:11 +00:00
Jaco	29406a0010	Bump dev (#1155 )	2021-11-03 14:46:44 +02:00
Github Actions	006d55f5c1	[CI Skip] release/beta 7.7.2-0 skip-checks: true	2021-11-03 06:55:22 +00:00
Jaco	650a3ca4a8	Sync ss58 (#1154 )	2021-11-03 08:46:52 +02:00
Github Actions	d3c8112f66	[CI Skip] release/stable 7.7.1 skip-checks: true	2021-10-31 14:51:24 +00:00
Jaco	8880e8fa8c	7.7.1 (#1152 ) * 7.7.1 * Extract stringify replacer * formatting * linting * isUnSorted{A, B} * Adjust * Complexity? * Cleanups * Update packages/util-crypto/src/address/derive.ts * formatBalance * Revert formatBalance	2021-10-31 16:44:17 +02:00
Github Actions	481f7f6ee0	[CI Skip] release/beta 7.6.2-8 skip-checks: true	2021-10-31 06:34:35 +00:00
Jaco	a4cefa4bfc	Adjust base library usage of `for` vs `reduce/map` (#1151 ) * Adjust base library usage of `for` vs `reduce/map` * Additional * Adjust	2021-10-31 08:27:14 +02:00
Github Actions	7ef169585f	[CI Skip] release/beta 7.6.2-7 skip-checks: true	2021-10-30 15:52:24 +00:00
Jaco	134b8c3b9f	arrayZip (#1150 ) * arrayZip * Update packages/util/src/array/zip.spec.ts * Update packages/util/src/array/zip.ts	2021-10-30 18:45:20 +03:00
Github Actions	1158551b9e	[CI Skip] release/beta 7.6.2-6 skip-checks: true	2021-10-29 07:41:53 +00:00
Jaco	4c2521bc21	Bump deps, update CHANGELOG (#1149 )	2021-10-29 10:33:07 +03:00
Github Actions	993e45d148	[CI Skip] release/beta 7.6.2-5 skip-checks: true	2021-10-27 13:46:16 +00:00
Igor	14a0c3f18b	Support genshiro network (#1148 ) * support genshiro network * remove registry	2021-10-27 16:39:08 +03:00
Github Actions	9fa71647c1	[CI Skip] release/beta 7.6.2-4 skip-checks: true	2021-10-26 07:17:00 +00:00
Jaco	cac98aac03	Adjust testnet detection in @polkadot/networks (#1147 )	2021-10-26 10:08:52 +03:00
Github Actions	48158927e1	[CI Skip] release/beta 7.6.2-3 skip-checks: true	2021-10-25 13:33:33 +00:00
Jaco	51082373e6	Bump dev deps (#1145 )	2021-10-25 16:26:18 +03:00
Github Actions	bf80f76173	[CI Skip] release/beta 7.6.2-2 skip-checks: true	2021-10-25 11:41:59 +00:00
Jaco	474e98b6d1	Bump dev (#1144 )	2021-10-25 14:34:55 +03:00
Github Actions	07317b8840	[CI Skip] release/beta 7.6.2-1 skip-checks: true	2021-10-25 09:23:22 +00:00
Jaco	2e46b688cf	Update repository location (#1143 ) * Update repository location * Adjust	2021-10-25 12:15:22 +03:00
Github Actions	c87cf8c655	[CI Skip] release/beta 7.6.2-0 skip-checks: true	2021-10-25 05:13:27 +00:00
Jaco	9eabf95fc0	Assert chainCode inputs to derive* (#1142 ) * Assert chainCode inputs to derive* * Adjust	2021-10-25 08:04:37 +03:00
Github Actions	11ab3a4f6b	[CI Skip] release/stable 7.6.1 skip-checks: true	2021-10-23 10:54:38 +00:00
Jaco	0ba57b26d1	7.6.1 (#1140 ) * 7.6.1 * Adjust GlobalThis * Adjust	2021-10-23 13:47:23 +03:00
Github Actions	36c2389985	[CI Skip] release/beta 7.5.2-4 skip-checks: true	2021-10-23 10:20:12 +00:00
Jaco	93d5041e8f	Adjust base* validation function (#1139 ) * Adjust base* validation function * Adjust sr25519 derive functions * More dedupe * Rename * Adjust	2021-10-23 13:11:58 +03:00
Github Actions	f4d933936e	[CI Skip] release/beta 7.5.2-3 skip-checks: true	2021-10-23 09:42:50 +00:00
Jaco	2cdaf71c4b	Sync with paritytech/ss58-registry (#1138 ) * Sync with paritytech/ss58-registry * Since registry location * Adjust defaults with json location * Adjust * Adjust comments * prefix 42	2021-10-23 12:34:53 +03:00
Github Actions	6982380aff	[CI Skip] release/beta 7.5.2-2 skip-checks: true	2021-10-23 09:00:25 +00:00
Jaco	2cc2c4d415	isAscii adjustments (#1137 ) * isAscii adjustments * Adjust negation	2021-10-23 11:52:41 +03:00
Github Actions	da38e0f890	[CI Skip] release/beta 7.5.2-1 skip-checks: true	2021-10-23 08:39:18 +00:00
Jaco	c7c1723914	User ArrayBuffer internally to xxhash (#1133 )	2021-10-23 11:30:23 +03:00
Github Actions	15e85bf4b9	[CI Skip] release/beta 7.5.2-0 skip-checks: true	2021-10-17 09:39:09 +00:00
Jaco	e7771b02a4	Bump dev (#1132 ) * Bump dev * eslint 8 fixes * Bump	2021-10-17 12:32:45 +03:00
Github Actions	9a5d2e00be	[CI Skip] release/stable 7.5.1 skip-checks: true	2021-10-16 06:32:07 +00:00
Jaco	5f36b23dfc	7.5.1 (#1131 ) * 7.5.1 * CHANGELOG	2021-10-16 09:24:45 +03:00
Github Actions	921659981d	[CI Skip] release/beta 7.4.2-8 skip-checks: true	2021-10-14 06:43:02 +00:00
Jaco	1bcafead57	Parse derivation paths via BN (#1130 ) * Parse derivation paths via BN * Direct to u8a for numbers * CHANGELOG	2021-10-14 09:34:13 +03:00
Github Actions	9b29d33d87	[CI Skip] release/beta 7.4.2-7 skip-checks: true	2021-10-14 05:59:53 +00:00
Jaco	ecce4a22f7	networks:sync (#1129 )	2021-10-14 08:51:13 +03:00
Github Actions	22d471d5fc	[CI Skip] release/beta 7.4.2-6 skip-checks: true	2021-10-08 06:04:20 +00:00
Jaco	4df1a67be4	Bump deps (#1126 )	2021-10-08 08:55:29 +03:00
Github Actions	497b97ad4e	[CI Skip] release/beta 7.4.2-5 skip-checks: true	2021-10-02 05:58:25 +00:00
Jaco	9177b24d5b	Sync ss58 (#1122 )	2021-10-02 08:49:40 +03:00
Github Actions	88556d6a75	[CI Skip] release/beta 7.4.2-4 skip-checks: true	2021-09-29 12:59:41 +00:00
Jaco	c8dfeaad5b	Update ss58 JSON format handling (#1120 ) * Update JSON handling * Fix output	2021-09-29 14:51:19 +02:00
Github Actions	69190b0395	[CI Skip] release/beta 7.4.2-3 skip-checks: true	2021-09-29 08:29:52 +00:00
Tomokazu Kozumaandadmin	e61cd53e08	fix comment (#1119 ) Co-authored-by: admin <admin@adminnoMacBook-Air.local>	2021-09-29 10:20:59 +02:00
Github Actions	26b0630cd3	[CI Skip] release/beta 7.4.2-2 skip-checks: true	2021-09-28 12:08:54 +00:00
Jaco	e09c604c26	ss58 sync (#1117 )	2021-09-28 14:00:12 +02:00
Github Actions	7983a12121	[CI Skip] release/beta 7.4.2-1 skip-checks: true	2021-09-27 05:46:53 +00:00
Jaco	0e070c6142	Bump deps (#1115 )	2021-09-27 07:39:56 +02:00
Github Actions	e30a10a4b5	[CI Skip] release/beta 7.4.2-0 skip-checks: true	2021-09-24 17:46:51 +00:00
Antoine EstienneandJaco	c3a073a952	Improve ethereum tests (#1114 ) * added gerald test address * improve ethereum tests * lint * Update packages/keyring/src/suri.spec.ts Co-authored-by: Jaco <jacogr@gmail.com> * remove seed for ethereum testing pairs * lint Co-authored-by: Jaco <jacogr@gmail.com>	2021-09-24 20:40:31 +03:00