[CI Skip] release/stable 8.3.3

skip-checks: true
8.3.3 (#1390 )
2022-01-23 06:34:58 +00:00 · 2022-01-23 08:30:08 +02:00 · 2022-01-22 12:01:57 +00:00 · 2022-01-22 13:56:45 +02:00 · 2022-01-21 14:05:47 +00:00 · 2022-01-21 16:01:38 +02:00
645 changed files with 6654 additions and 6652 deletions
@@ -19,4 +19,12 @@
 7.0.3
 7.1.2
 7.8.2
-7.9.2
+7.9.2
+8.0.2
+8.0.3
+8.0.4
+8.0.5
+8.1.2
+8.2.2
+8.3.2
+8.3.3
@@ -1,5 +1,21 @@
+checks:
+  argument-count:
+    config:
+      threshold: 5
+  method-complexity:
+    config:
+      threshold: 7
+  method-count:
+    config:
+      threshold: 25
+  method-lines:
+    config:
+      threshold: 30
+
 exclude_patterns:
 - "**/*.spec.js"
 - "**/*.spec.ts"
 - "packages/networks/src/substrate.ts"
 - "packages/util/src/is/utf8.ts"
+- "packages/x-noble-hashes/src/**.ts"
+- "packages/x-noble-secp256k1/src/**.ts"
@@ -0,0 +1,2 @@
+packages/x-noble-hashes/**/*.ts
+packages/x-noble-secp256k1/**/*.ts
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util authors & contributors
+// Copyright 2017-2022 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 const base = require('@polkadot/dev/config/eslint.cjs');
@@ -6,18 +6,12 @@ const base = require('@polkadot/dev/config/eslint.cjs');
 module.exports = {
  ...base,
  ignorePatterns: [
-    '.eslintrc.js',
-    '.github/**',
-    '.vscode/**',
-    '.yarn/**',
-    '**/build/*',
-    '**/coverage/*',
-    '**/node_modules/*'
+    ...base.ignorePatterns
  ],
  parserOptions: {
    ...base.parserOptions,
    project: [
-      './tsconfig.json'
+      './tsconfig.eslint.json'
    ]
  },
  rules: {
@@ -2,7 +2,7 @@ name: 'Lock Threads'

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

 jobs:
  lock:
@@ -15,6 +15,7 @@ jobs:
    steps:
    - uses: actions/checkout@v2
      with:
+        fetch-depth: 0
        token: ${{ secrets.GH_PAT }}
    - name: ${{ matrix.step }}
      env:
@@ -1,7 +1,7 @@
 name: 'Close stale issues and PRs'
 on:
  schedule:
-    - cron: '30 2/2 * * *'
+    - cron: '50 1/3 * * *'

 jobs:
  stale:
@@ -11,7 +11,9 @@ tmp/
 .env.development.local
 .env.test.local
 .env.production.local
+.idea
 .npmrc
+.vscode
 .yarn/*
 !.yarn/releases
 !.yarn/plugins
@@ -24,5 +26,4 @@ yarn-debug.log*
 yarn-error.log*
 store.db
 store.db.compacted
-.idea
-.vscode
+tsconfig.*buildinfo
@@ -0,0 +1,3 @@
+Jaco <jacogr@gmail.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> <action@github.com>
+github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Github Actions <action@github.com>
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/dev authors & contributors
+// Copyright 2017-2022 @polkadot/dev authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 module.exports = require('@polkadot/dev/config/prettier.cjs');
@@ -10,4 +10,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
    spec: "@yarnpkg/plugin-version"

-yarnPath: .yarn/releases/yarn-3.0.1.cjs
+yarnPath: .yarn/releases/yarn-3.1.1.cjs
@@ -1,5 +1,124 @@
 # CHANGELOG

+## 8.3.3 Jan 23, 2022
+
+Changes:
+
+- Sync with upstream Substrate ss58 registry
+
+
+## 8.3.2 Jan 15, 2022
+
+Changes:
+
+- Correct network sorting (primary by prefix, secondary by name)
+- Sync with upstream Substrate ss58 registry
+
+
+## 8.3.1 Jan 9, 2022
+
+Changes:
+
+- Fix `util-crypto` bundle generation (adjust `x-randomvalues`)
+- Add all known Rococo genesis hashes
+- `detectPackage` now uses optional `path` & `type` (`esm` or `cjs`) info
+- Ensure package paths are available via ESM and CJS
+- Upgrade 3rd party dependencies to latest
+- Pin `@noble/*` to latest known tested integrated versions
+
+
+## 8.2.2 Dec 19, 2021
+
+Contributed:
+
+- Add Bifrost Ledger capabilities (Thanks to https://github.com/awesomepan)
+- Add Sora genesisHash & Ledger capabilities (Thanks to https://github.com/NoodleSploder)
+
+Changes:
+
+- Add `isPromise` check utility function
+- Add `assertUnreachable` for codepaths that should not be followed
+- Preserve all-caps word splits in `stringCamelCase`
+- Adjust `x-*` fallbacks via `x-global/extractGlobal`
+- Sync with upstream Substrate ss58 registry
+- Additional tests for `bip39` wordlists
+- Maintainability cleanups
+- Update to latest Ledger dependencies
+- Swap to upstream `@noble` packages
+- Adjust tsconfig with references
+- 8.2.2 (8.2.1 failed CI due to incorrect CHANGELOG)
+
+
+## 8.1.2 Dec 5, 2021
+
+Changes:
+
+- Adjustment to non-full-word consecutive uppercase via `string{Camel, Pascal}Case`
+
+
+## 8.1.1 Dec 5, 2021
+
+Contributed:
+
+- Add Picasso genesisHash (Thanks to https://github.com/hussein-aitlahcen)
+
+Changes:
+
+- Allow for use of `secp256k1` from `@polkadot/wasm-crypto`
+- Adjust `isBigInt` to not do `instanceof` check
+- Ensure consequtive capitals in `stringCamelCase` are lowercased
+- Use `@polkadot/x-bigint` for `BigInt` constructor
+- Split `@noble/hashes` fork into `x-noble-hashes`
+- Add `@noble/secp256k1` fork into `x-noble-secp256k1`, replaces `elliptic`
+
+
+## 8.0.5 Dec 1, 2021
+
+Changes:
+
+- Adjust sha3 expectation of `BigInt` availability
+
+
+## 8.0.4 Nov 30, 2021
+
+Changes:
+
+- Adjust `stringCamelCase` with leading `_`
+
+
+## 8.0.3 Nov 30, 2021
+
+Changes:
+
+- Remove `Buffer` usage in `x-randomvalues`
+- Adjust `stringCamelCase` for all-caps parts
+
+
+## 8.0.2 Nov 26, 2021
+
+Changes:
+
+- Explicitly include BigInt patched versions
+
+
+## 8.0.1 Nov 26, 2021
+
+**Important** In the 8.0 version the hashing utilities have been consolidated around an optimized and audited version from `@noble/hashes`. As in the past the WASM hashing will be used by default if the environment is initialized.
+
+**Breaking change** The `schnorrkel*` functions have been renamed to `sr25519*`. Likewise the `ed25519` operations have been renamed from `nacl*` to `ed25519*`. Additionally the `{ed, sr, secp256k1}25519KeyPairFrom*` functions have been renamed to `{ed, sr, secp256k1}25519PairFrom*`.
+
+Changes:
+
+- Introduce `ed25519*` & `sr25519*` functions
+- Replace camelcase dep with simplified/optimized version
+- Replace (most) hashing operations with `@noble/hashes`
+- Replace JS fallback for `xxhash`
+- Adjust `BigInt` utility exports (with capability detection)
+- Previously added `bi*` functions renamed to `n*`
+- Extend performance tests with implementation compares
+- Remove non-significant Node Buffer concat fill
+
+
 ## 7.9.2 Nov 22, 2021

 Changes:
@@ -0,0 +1,45 @@
+    1246	Jaco                          	8.3.3 (#1390)
+       9	Antoine Estienne              	Add eth uri keyring test (#1291)
+       6	Amaury Martiny                	Add tests from Rust (#283)
+       5	kwingram25                    	Add BN consts and timeToString (#610)
+       4	Adam Dossa                    	Update Polymesh Genesis Hash (#1193)
+       3	Jakub Pánik                   	HydraDX Snakenet Gen3-1 (#977)
+       3	Luke Schoen                   	docs: Fix example in readme since we use default imports (#243)
+       2	AndreasGassmann               	feat(dependencies): remove moment.js (#530)
+       2	Gav Wood                      	Fix stake:unstake (#182)
+       2	Hyungsuk Kang                 	Add cross client Encryption/Decryption (#496)
+       2	Jared Norris                  	Add Sora network (#1306)
+       2	Nantian                       	fix bigint type (#1079)
+       2	pan                           	add bifrost (#1296)
+       2	Stefanie Doll                 	Add missing dependencies to util-crypto (#424)
+       1	Agustinus Theodorus           	docs: fix typo in naclSeal docs. (#1005)
+       1	Alexander Krupenkin           	Added ECDSA keypair support (#589)
+       1	alexdniep                     	added equilibrium slip44; added equilibrium genesis hash (#984)
+       1	amphineko                     	chore: fix typo in versionDetect messages (#941)
+       1	Axel Chalon                   	Simplify @polkadot/keyring KeyringPair (#419)
+       1	Brad Larson                   	[FIX] Adjust error message (#646)
+       1	Eliott Teissonniere           	add nodle ledger specs (#1089)
+       1	h4x3rotab                     	Throws an error when signing with a locked keypair (#578)
+       1	Harry Liu                     	Update README.md (#446)
+       1	Hussein Ait-Lahcen            	Add Picasso Genesis Hash (#1261)
+       1	Igor                          	Support genshiro network (#1148)
+       1	Jake Naviasky                 	Add evmToAddress and addressToEvm crypto utils. (#705)
+       1	JesseAbram                    	added check if valid address to docs (#440)
+       1	joe petrowski                 	Add example for multisig address creation (#590)
+       1	Lezek123                      	logger - wildcard include/exclude with DEBUG env (#932)
+       1	Lovesh Harchandani            	Add Dock network id for address generation (#640)
+       1	Mario Neises                  	remove redudant export (#257)
+       1	Miguel Hervas                 	Add CFG Ledger Support (#1057)
+       1	nahuseyoum                    	Reserving 65 for Aventus based on the new extended range (#871)
+       1	qwer951123                    	Add acala genesis (#1161)
+       1	Raoul Millais                 	Fix yarn add instructions in x-global README (#873)
+       1	Raymond Zhong                 	Add Edgeware ledger app (#1006)
+       1	Reto Trinkler                 	Adding 4 as address type of ss58 for Katal Chain (#639)
+       1	Rocco Musolino                	remove doc broken link (#697)
+       1	Song Zhou                     	Add in ability to encrypt/decrypt msg with keyring (#1070)
+       1	Thibaut Sardan                	add hasLedgerSupport prop to networks (#835)
+       1	Tomokazu Kozuma               	fix comment (#1119)
+       1	Tore19                        	Add stafi genesis hash (#1096)
+       1	Wei Tang                      	ss58: add Kulupu prefix to the list (#595)
+       1	WoeOm                         	Handing high precision scenes (#450)
+       1	Yuri                          	Extra check for process for browser bundles (#923)
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util authors & contributors
+// Copyright 2017-2022 @polkadot/util authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

 const config = require('@polkadot/dev/config/jest.cjs');
@@ -13,8 +13,7 @@ module.exports = Object.assign({}, config, {
    '@polkadot/util-(crypto)(.*)$': '<rootDir>/packages/util-$1/src/$2',
    // eslint-disable-next-line sort-keys
    '@polkadot/util(.*)$': '<rootDir>/packages/util/src/$1',
-    '@polkadot/x-(fetch|randomvalues|textdecoder|textencoder|ws)(.*)$': '<rootDir>/packages/x-$1/src/node',
-    '@polkadot/x-global(.*)$': '<rootDir>/packages/x-global/src/$1',
-    '@polkadot/x-rxjs(.*)$': '<rootDir>/packages/x-rxjs/src/$1'
+    '@polkadot/x-(bigint|global)(.*)$': '<rootDir>/packages/x-$1/src/$2',
+    '@polkadot/x-(fetch|randomvalues|textdecoder|textencoder|ws)(.*)$': '<rootDir>/packages/x-$1/src/node'
  }
 });
@@ -10,7 +10,7 @@
    "url": "https://github.com/polkadot-js/common.git"
  },
  "sideEffects": false,
-  "version": "7.9.2",
+  "version": "8.3.3",
  "workspaces": [
    "packages/*"
  ],
@@ -28,12 +28,11 @@
    "test:one": "polkadot-dev-run-test --runInBand"
  },
  "devDependencies": {
-    "@babel/core": "^7.16.0",
-    "@polkadot/dev": "^0.63.29",
-    "@polkadot/ts": "^0.4.14",
-    "@types/jest": "^27.0.3"
+    "@babel/core": "^7.16.12",
+    "@polkadot/dev": "^0.65.43",
+    "@types/jest": "^27.4.0"
  },
  "resolutions": {
-    "typescript": "^4.5.2"
+    "typescript": "^4.5.5"
  }
 }
@@ -16,17 +16,18 @@
  },
  "sideEffects": false,
  "type": "module",
-  "version": "7.9.2",
+  "version": "8.3.3",
  "browser": "browser.js",
  "main": "node.js",
  "react-native": "react-native.js",
  "dependencies": {
-    "@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"
+    "@babel/runtime": "^7.16.7",
+    "@ledgerhq/hw-transport": "^6.20.0",
+    "@ledgerhq/hw-transport-webhid": "^6.20.0",
+    "@ledgerhq/hw-transport-webusb": "^6.20.0",
+    "@polkadot/util": "8.3.3"
  },
  "optionalDependencies": {
-    "@ledgerhq/hw-transport-node-hid-singleton": "^6.11.2"
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.23.1"
  }
 }
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type Transport from '@ledgerhq/hw-transport';
@@ -0,0 +1,4 @@
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default [];
@@ -0,0 +1,11 @@
+// Copyright 2017-2022 @polkadot/hw-ledger-transports authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, null, others);
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type Transport from '@ledgerhq/hw-transport';
@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/hw-ledger-transports authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger-transports authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

-export const packageInfo = { name: '@polkadot/hw-ledger-transports', version: '7.9.2' };
+export const packageInfo = { name: '@polkadot/hw-ledger-transports', path: 'auto', type: 'auto', version: '8.3.3' };
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { TransportDef } from './types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import Transport from '@ledgerhq/hw-transport';
@@ -0,0 +1,11 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": [
+    { "path": "../util/tsconfig.build.json" }
+  ]
+}
@@ -19,12 +19,13 @@
    "./detectPackage.cjs"
  ],
  "type": "module",
-  "version": "7.9.2",
+  "version": "8.3.3",
  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.16.3",
-    "@polkadot/hw-ledger-transports": "7.9.2",
-    "@polkadot/util": "7.9.2",
-    "@zondax/ledger-substrate": "^0.18.0"
+    "@babel/runtime": "^7.16.7",
+    "@ledgerhq/hw-transport": "^6.20.0",
+    "@polkadot/hw-ledger-transports": "8.3.3",
+    "@polkadot/util": "8.3.3",
+    "@zondax/ledger-substrate": "^0.24.0"
  }
 }
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { ResponseBase, SubstrateApp } from '@zondax/ledger-substrate';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 export const LEDGER_DEFAULT_ACCOUNT = 0x80000000;
@@ -1,24 +0,0 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import { knownLedger } from '@polkadot/networks/defaults';
-
-import { ledgerApps } from './defaults';
-
-describe('defaults', (): void => {
-  it('has entries for each of the apps (hwledger -> networks)', (): void => {
-    expect(
-      Object.keys(knownLedger).filter((network) =>
-        !ledgerApps[network]
-      )
-    ).toEqual([]);
-  });
-
-  it('has entries for each of the apps (networks -> hwledger)', (): void => {
-    expect(
-      Object.keys(ledgerApps).filter((network) =>
-        !knownLedger[network]
-      )
-    ).toEqual([]);
-  });
-});
@@ -1,13 +1,14 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type Transport from '@ledgerhq/hw-transport';
 import type { SubstrateApp } from '@zondax/ledger-substrate';

-import { newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newGenshiroApp, newKusamaApp, newNodleApp, newPolkadotApp, newPolymeshApp, newStatemineApp } from '@zondax/ledger-substrate';
+import { newBifrostApp, newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newGenshiroApp, newKusamaApp, newNodleApp, newPolkadotApp, newPolymeshApp, newSoraApp, 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> = {
+  bifrost: newBifrostApp,
  centrifuge: newCentrifugeApp,
  'dock-mainnet': newDockApp,
  edgeware: newEdgewareApp,
@@ -17,5 +18,6 @@ export const ledgerApps: Record<string, (transport: Transport) => SubstrateApp>
  'nodle-chain': newNodleApp,
  polkadot: newPolkadotApp,
  polymesh: newPolymeshApp,
+  sora: newSoraApp,
  statemine: newStatemineApp
 };
@@ -0,0 +1,7 @@
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as transportInfo } from '@polkadot/hw-ledger-transports/packageInfo';
+import { packageInfo as utilInfo } from '@polkadot/util/packageInfo';
+
+export default [transportInfo, utilInfo];
@@ -1,9 +1,11 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { packageInfo as transportInfo } from '@polkadot/hw-ledger-transports/packageInfo';
-import { detectPackage, packageInfo as utilInfo } from '@polkadot/util';
+// Do not edit, auto-generated by @polkadot/dev

+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
 import { packageInfo } from './packageInfo';

-detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [transportInfo, utilInfo]);
+detectPackage(packageInfo, null, others);
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import './detectPackage';
@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

-export const packageInfo = { name: '@polkadot/hw-ledger', version: '7.9.2' };
+export const packageInfo = { name: '@polkadot/hw-ledger', path: 'auto', type: 'auto', version: '8.3.3' };
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/hw-ledger authors & contributors
+// Copyright 2017-2022 @polkadot/hw-ledger authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": [
+    { "path": "../hw-ledger-transports/tsconfig.build.json" },
+    { "path": "../util/tsconfig.build.json" }
+  ]
+}
@@ -20,15 +20,15 @@
    "./detectPackage.cjs"
  ],
  "type": "module",
-  "version": "7.9.2",
+  "version": "8.3.3",
  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.16.3",
-    "@polkadot/util": "7.9.2",
-    "@polkadot/util-crypto": "7.9.2"
+    "@babel/runtime": "^7.16.7",
+    "@polkadot/util": "8.3.3",
+    "@polkadot/util-crypto": "8.3.3"
  },
  "peerDependencies": {
-    "@polkadot/util": "7.9.2",
-    "@polkadot/util-crypto": "7.9.2"
+    "@polkadot/util": "8.3.3",
+    "@polkadot/util-crypto": "8.3.3"
  }
 }
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { Keyring } from './keyring';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 // default substrate dev phrase
@@ -0,0 +1,7 @@
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as utilInfo } from '@polkadot/util/packageInfo';
+import { packageInfo as cryptoInfo } from '@polkadot/util-crypto/packageInfo';
+
+export default [utilInfo, cryptoInfo];
@@ -1,9 +1,11 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { detectPackage, packageInfo as utilInfo } from '@polkadot/util';
-import { packageInfo as cryptoInfo } from '@polkadot/util-crypto/packageInfo';
+// Do not edit, auto-generated by @polkadot/dev

+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
 import { packageInfo } from './packageInfo';

-detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [utilInfo, cryptoInfo]);
+detectPackage(packageInfo, null, others);
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { KeyringPair$Json } from './types';
@@ -369,6 +369,14 @@ describe('keypair', (): void => {
      ).toEqual(ETH_ADDRESS_ONE);
    });

+    it('creates with dev phrase with derivation path specified - addFromUri with type', (): void => {
+      const keyringUntyped = new Keyring();
+
+      expect(
+        keyringUntyped.addFromUri(PHRASE, {}, 'ethereum').address
+      ).toEqual(ETH_ADDRESS_ONE);
+    });
+
    it('encodes a pair toJSON (and decodes)', (): void => {
      const pair = keyring.createFromUri(PHRASE);
      const json = pair.toJson('password');
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import './detectPackage';
@@ -1,21 +1,21 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

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

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

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

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

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

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

    return createPair({ toSS58: this.encodeAddress, type }, derived, meta, null);
  }
@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

-export const packageInfo = { name: '@polkadot/keyring', version: '7.9.2' };
+export const packageInfo = { name: '@polkadot/keyring', path: 'auto', type: 'auto', version: '8.3.3' };
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { createTestPairs } from '../testingPairs';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { EncryptedJsonEncoding } from '@polkadot/util-crypto/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 export const PKCS8_DIVIDER = new Uint8Array([161, 35, 3, 33, 0]);
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { NONCE_LENGTH, SCRYPT_LENGTH } from '@polkadot/util-crypto/json/constants';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

 import { hexToU8a, u8aToHex } from '@polkadot/util';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -7,7 +7,7 @@ import type { KeyringPair, KeyringPair$Json, KeyringPair$Meta, SignOptions } fro
 import type { PairInfo } from './types';

 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 { blake2AsU8a, convertPublicKeyToCurve25519, convertSecretKeyToCurve25519, ed25519PairFromSeed as ed25519FromSeed, ed25519Sign, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclOpen, naclSeal, secp256k1Compress, secp256k1Expand, secp256k1PairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify, sr25519PairFromSeed as sr25519FromSeed, sr25519Sign, sr25519VrfSign, sr25519VrfVerify } from '@polkadot/util-crypto';

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

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

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

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

 const TYPE_ADDRESS = {
@@ -215,7 +215,7 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
      assert(!isLocked(secretKey), 'Cannot sign with a locked key pair');

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

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

      const result = signatureVerify(message, u8aConcat(TYPE_PREFIX[type], vrfResult.subarray(32)), TYPE_ADDRESS[type](u8aToU8a(signerPublic)));
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { KeyringPair, KeyringPair$Json, KeyringPair$Meta } from '../types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { createTestPairs } from '../testingPairs';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { KeypairType } from '@polkadot/util-crypto/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 export interface PairInfo {
@@ -1,10 +1,10 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

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

 import { createPair } from '.';

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

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

  it('has deterministic signature values for ecdsa', (): void => {
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 // From https://github.com/paritytech/substrate/wiki/Secret-URI-Test-Vectors
@@ -1,9 +1,9 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { KeyringInstance, KeyringOptions } from './types';

-import { hexToU8a } from '@polkadot/util';
+import { assert, hexToU8a } from '@polkadot/util';
 import { KeypairType } from '@polkadot/util-crypto/types';

 import { Keyring } from './keyring';
@@ -111,6 +111,15 @@ export const PAIRSETHEREUM: PairDef[] = [
  }
 ];

+function createMeta (name?: string, seed?: string) {
+  assert(name || seed, 'Testing pair should have either a name or a seed');
+
+  return {
+    isTesting: true,
+    name: name || (seed && seed.replace('//', '_').toLowerCase())
+  };
+}
+
 /**
 * @name testKeyring
 * @summary Create an instance of Keyring pre-populated with locked test accounts
@@ -119,17 +128,12 @@ export const PAIRSETHEREUM: PairDef[] = [
 */
 export function createTestKeyring (options: KeyringOptions = {}, isDerived = true): KeyringInstance {
  const keyring = new Keyring(options);
-  const pairs: PairDef[] = (options.type && options.type === 'ethereum') ? PAIRSETHEREUM : PAIRSSR25519;
+  const pairs = (options.type && options.type === 'ethereum')
+    ? PAIRSETHEREUM
+    : PAIRSSR25519;

  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 && seed.replace('//', '_').toLowerCase())
-    };
+    const meta = createMeta(name, seed);
    const pair = !isDerived && !name && seed
      ? keyring.addFromUri(seed, meta, options.type)
      : keyring.addPair(
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { u8aToHex } from '@polkadot/util';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { KeyringOptions, KeyringPair } from './types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": [
+    { "path": "../util/tsconfig.build.json" },
+    { "path": "../util-crypto/tsconfig.build.json" }
+  ]
+}
@@ -17,13 +17,14 @@
  },
  "sideEffects": false,
  "type": "module",
-  "version": "7.9.2",
+  "version": "8.3.3",
  "main": "index.js",
  "dependencies": {
-    "@babel/runtime": "^7.16.3"
+    "@babel/runtime": "^7.16.7",
+    "@polkadot/util": "8.3.3"
  },
  "devDependencies": {
-    "@polkadot/util": "7.9.2",
-    "@polkadot/x-fetch": "7.9.2"
+    "@polkadot/hw-ledger": "8.3.3",
+    "@polkadot/x-fetch": "8.3.3"
  }
 }
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import fs from 'fs';
@@ -40,7 +40,7 @@ async function getSubstrateRegistry () {

 getSubstrateRegistry()
  .then((entries) => {
-    fs.writeFileSync('packages/networks/src/substrate.ts', `// Copyright 2017-2021 @polkadot/networks authors & contributors
+    fs.writeFileSync('packages/networks/src/substrate.ts', `// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 //
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

+import { ledgerApps } from '@polkadot/hw-ledger/defaults';
 import { isHex } from '@polkadot/util';

 import { knownGenesis, knownLedger } from './defaults';

 describe('defaults', (): void => {
-  it('has hex values for all genesis chains', (): void => {
-    expect(
-      Object.keys(knownGenesis).filter((network) =>
-        !knownGenesis[network].length ||
-        knownGenesis[network].some((g) => !isHex(g, 256))
-      )
-    ).toEqual([]);
+  describe('genesis', (): void => {
+    it('has hex values for all genesis chains', (): void => {
+      expect(
+        Object.keys(knownGenesis).filter((network) =>
+          !knownGenesis[network].length ||
+          knownGenesis[network].some((g) => !isHex(g, 256))
+        )
+      ).toEqual([]);
+    });
+
+    it('has genesis for all Ledger chains', (): void => {
+      expect(
+        Object.keys(knownLedger).filter((network) =>
+          !knownGenesis[network]
+        )
+      ).toEqual([]);
+    });
  });

-  it('has genesis for all Ledger chains', (): void => {
-    expect(
-      Object.keys(knownLedger).filter((network) =>
-        !knownGenesis[network]
-      )
-    ).toEqual([]);
+  describe('Ledger', (): void => {
+    it('has entries for each of the apps (hwledger -> networks)', (): void => {
+      expect(
+        Object.keys(knownLedger).filter((network) =>
+          !ledgerApps[network]
+        )
+      ).toEqual([]);
+    });
+
+    it('has entries for each of the apps (networks -> hwledger)', (): void => {
+      expect(
+        Object.keys(ledgerApps).filter((network) =>
+          !knownLedger[network]
+        )
+      ).toEqual([]);
+    });
  });
 });
@@ -1,81 +1,18 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import type { KnownGenesis, KnownIcon, KnownLedger, KnownTestnet } from './types';
+import type { KnownIcon, KnownLedger, KnownTestnet } from './types';
+
+export { knownGenesis } from './genesis';

 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'
-  ],
-  centrifuge: [
-    '0x67dddf2673b69e5f875f6f25277495834398eafd67f492e09f3f3345e003d1b5'
-  ],
-  'dock-mainnet': [
-    '0xf73467c6544aa68df2ee546b135f955c46b90fa627e9b5d7935f41061bb8a5a9'
-  ],
-  edgeware: [
-    '0x742a2ca70c2fda6cee4f8df98d64c4c670a052d9568058982dad9d5a7a135c5b'
-  ],
-  equilibrium: [
-    '0x6f1a800de3daff7f5e037ddf66ab22ce03ab91874debeddb1086f5f7dbd48925'
-  ],
-  genshiro: [
-    '0x9b8cefc0eb5c568b527998bdd76c184e2b76ae561be76e4667072230217ea243'
-  ],
-  hydradx: [
-    '0xd2a620c27ec5cbc5621ff9a522689895074f7cca0d08e7134a7804e1a3ba86fc', // Snakenet Gen3-1
-    '0x10af6e84234477d84dc572bac0789813b254aa490767ed06fb9591191d1073f9', // Snakenet Gen3
-    '0x3d75507dd46301767e601265791da1d9cb47b6ebc94e87347b635e5bf58bd047', // Snakenet Gen2
-    '0x0ed32bfcab4a83517fac88f2aa7cbc2f88d3ab93be9a12b6188a036bf8a943c2' // Snakenet Gen1
-  ],
-  karura: [
-    '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b'
-  ],
-  kulupu: [
-    '0xf7a99d3cb92853d00d5275c971c132c074636256583fee53b3bbe60d7b8769ba'
-  ],
-  kusama: [
-    '0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe', // Kusama CC3,
-    '0xe3777fa922cafbff200cadeaea1a76bd7898ad5b89f7848999058b50e715f636', // Kusama CC2
-    '0x3fd7b9eb6a00376e5be61f01abb429ffb0b104be05eaff4d458da48fcd425baf' // Kusama CC1
-  ],
-  'nodle-chain': [
-    '0xa3d114c2b8d0627c1aa9b134eafcf7d05ca561fdc19fb388bb9457f81809fb23'
-  ],
-  plasm: [
-    '0x3e86364d4b4894021cb2a0390bcf2feb5517d5292f2de2bb9404227e908b0b8b'
-  ],
-  polkadot: [
-    '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'
-  ],
-  polymesh: [
-    '0x6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063'
-  ],
-  stafi: [
-    '0x290a4149f09ea0e402c74c1c7e96ae4239588577fe78932f94f5404c68243d80'
-  ],
-  statemine: [
-    '0x48239ef607d7928874027a43a67689209727dfb3d3dc5e5b03a39bdc2eda771a'
-  ],
-  subsocial: [
-    '0x0bd72c1c305172e1275278aaeb3f161e02eccb7a819e63f62d47bd53a28189f8'
-  ]
-};
-
 // these are icon overrides
 export const knownIcon: KnownIcon = {
  centrifuge: 'polkadot',
  kusama: 'polkadot',
  polkadot: 'polkadot',
+  sora: 'polkadot',
  statemine: 'polkadot',
  statemint: 'polkadot',
  westmint: 'polkadot'
@@ -85,6 +22,7 @@ export const knownIcon: KnownIcon = {
 // and maps to the known slip44 (minus the `0x8` hard derivation flag)
 // NOTE: Any network here needs to have a genesisHash attached in the config above
 export const knownLedger: KnownLedger = {
+  bifrost: 0x00000314,
  centrifuge: 0x000002eb,
  'dock-mainnet': 0x00000252,
  edgeware: 0x0000020b,
@@ -94,6 +32,7 @@ export const knownLedger: KnownLedger = {
  'nodle-chain': 0x000003eb,
  polkadot: 0x00000162,
  polymesh: 0x00000253,
+  sora: 0x00000269,
  statemine: 0x000001b2 // common-good on Kusama, shares derivation
 };

@@ -0,0 +1,4 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export default [];
@@ -0,0 +1,11 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Do not edit, auto-generated by @polkadot/dev
+
+import { detectPackage } from '@polkadot/util';
+
+import others from './detectOther';
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, null, others);
@@ -0,0 +1,89 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { KnownGenesis } from './types';
+
+// 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'
+  ],
+  centrifuge: [
+    '0x67dddf2673b69e5f875f6f25277495834398eafd67f492e09f3f3345e003d1b5'
+  ],
+  'dock-mainnet': [
+    '0xf73467c6544aa68df2ee546b135f955c46b90fa627e9b5d7935f41061bb8a5a9'
+  ],
+  edgeware: [
+    '0x742a2ca70c2fda6cee4f8df98d64c4c670a052d9568058982dad9d5a7a135c5b'
+  ],
+  equilibrium: [
+    '0x6f1a800de3daff7f5e037ddf66ab22ce03ab91874debeddb1086f5f7dbd48925'
+  ],
+  genshiro: [
+    '0x9b8cefc0eb5c568b527998bdd76c184e2b76ae561be76e4667072230217ea243'
+  ],
+  hydradx: [
+    '0xd2a620c27ec5cbc5621ff9a522689895074f7cca0d08e7134a7804e1a3ba86fc', // Snakenet Gen3-1
+    '0x10af6e84234477d84dc572bac0789813b254aa490767ed06fb9591191d1073f9', // Snakenet Gen3
+    '0x3d75507dd46301767e601265791da1d9cb47b6ebc94e87347b635e5bf58bd047', // Snakenet Gen2
+    '0x0ed32bfcab4a83517fac88f2aa7cbc2f88d3ab93be9a12b6188a036bf8a943c2' // Snakenet Gen1
+  ],
+  karura: [
+    '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b'
+  ],
+  kulupu: [
+    '0xf7a99d3cb92853d00d5275c971c132c074636256583fee53b3bbe60d7b8769ba'
+  ],
+  kusama: [
+    '0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe', // Kusama CC3,
+    '0xe3777fa922cafbff200cadeaea1a76bd7898ad5b89f7848999058b50e715f636', // Kusama CC2
+    '0x3fd7b9eb6a00376e5be61f01abb429ffb0b104be05eaff4d458da48fcd425baf' // Kusama CC1
+  ],
+  'nodle-chain': [
+    '0xa3d114c2b8d0627c1aa9b134eafcf7d05ca561fdc19fb388bb9457f81809fb23'
+  ],
+  picasso: [
+    '0xe8e7f0f4c4f5a00720b4821dbfddefea7490bcf0b19009961cc46957984e2c1c'
+  ],
+  plasm: [
+    '0x3e86364d4b4894021cb2a0390bcf2feb5517d5292f2de2bb9404227e908b0b8b'
+  ],
+  polkadot: [
+    '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'
+  ],
+  polymesh: [
+    '0x6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063'
+  ],
+  rococo: [
+    '0xaaf2cd1b74b5f726895921259421b534124726263982522174147046b8827897',
+    '0x037f5f3c8e67b314062025fc886fcd6238ea25a4a9b45dce8d246815c9ebe770',
+    '0xc196f81260cf1686172b47a79cf002120735d7cb0eb1474e8adce56618456fff',
+    '0xf6e9983c37baf68846fedafe21e56718790e39fb1c582abc408b81bc7b208f9a',
+    '0x5fce687da39305dfe682b117f0820b319348e8bb37eb16cf34acbf6a202de9d9',
+    '0xe7c3d5edde7db964317cd9b51a3a059d7cd99f81bdbce14990047354334c9779',
+    '0x1611e1dbf0405379b861e2e27daa90f480b2e6d3682414a80835a52e8cb8a215',
+    '0x343442f12fa715489a8714e79a7b264ea88c0d5b8c66b684a7788a516032f6b9',
+    '0x78bcd530c6b3a068bc17473cf5d2aff9c287102bed9af3ae3c41c33b9d6c6147',
+    '0x47381ee0697153d64404fc578392c8fd5cba9073391908f46c888498415647bd',
+    '0x19c0e4fa8ab75f5ac7865e0b8f74ff91eb9a100d336f423cd013a8befba40299'
+  ],
+  sora: [
+    '0x7e4e32d0feafd4f9c9414b0be86373f9a1efa904809b683453a9af6856d38ad5'
+  ],
+  stafi: [
+    '0x290a4149f09ea0e402c74c1c7e96ae4239588577fe78932f94f5404c68243d80'
+  ],
+  statemine: [
+    '0x48239ef607d7928874027a43a67689209727dfb3d3dc5e5b03a39bdc2eda771a'
+  ],
+  subsocial: [
+    '0x0bd72c1c305172e1275278aaeb3f161e02eccb7a819e63f62d47bd53a28189f8'
+  ]
+};
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { SubstrateNetwork } from './types';
@@ -6,9 +6,14 @@ import type { SubstrateNetwork } from './types';
 import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
 import { allNetworks, availableNetworks, selectableNetworks } from '.';

-describe('selectableNetworks', (): void => {
+describe('availableNetworks', (): void => {
  it('has the correct starting order', (): void => {
-    expect(selectableNetworks.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
+    expect(availableNetworks.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
+  });
+
+  it('has a sorted list (first external, last external)', (): void => {
+    expect(availableNetworks[3].displayName).toEqual('Acala');
+    expect(availableNetworks[availableNetworks.length - 1].displayName).toEqual('ZERO');
  });

  it('has no ignored networks', (): void => {
@@ -62,7 +67,9 @@ describe('selectableNetworks', (): void => {
      )
    ).toEqual([]);
  });
+});

+describe('allNetworks', (): void => {
  it('has no ss58 duplicates', (): void => {
    const dupes: SubstrateNetwork[] = [];
    const uniques: SubstrateNetwork[] = [];
@@ -78,3 +85,14 @@ describe('selectableNetworks', (): void => {
    expect(dupes).toEqual([]);
  });
 });
+
+describe('selectableNetworks', (): void => {
+  it('has the correct starting order', (): void => {
+    expect(selectableNetworks.slice(0, 3).map(({ prefix }) => prefix)).toEqual([0, 2, 42]);
+  });
+
+  it('has a sorted list (first external, last external)', (): void => {
+    expect(selectableNetworks[3].displayName).toEqual('Acala');
+    expect(selectableNetworks[selectableNetworks.length - 1].displayName).toEqual('Stafi');
+  });
+});
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

 import type { KnownSubstrate, Network, SubstrateNetwork } from './types';
@@ -43,12 +43,12 @@ function sortNetworks (a: Network, b: Network): number {
  const isUnSortedB = UNSORTED.includes(b.prefix);

  return isUnSortedA === isUnSortedB
-    ? 0
+    ? isUnSortedA
+      ? 0
+      : a.displayName.localeCompare(b.displayName)
    : isUnSortedA
      ? -1
-      : isUnSortedB
-        ? 1
-        : a.displayName.localeCompare(b.displayName);
+      : 1;
 }

 // This is all the Substrate networks with our additional information
@@ -1,6 +1,6 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

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

-export const packageInfo = { name: '@polkadot/networks', version: '7.9.2' };
+export const packageInfo = { name: '@polkadot/networks', path: 'auto', type: 'auto', version: '8.3.3' };
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 //
@@ -63,13 +63,13 @@ export const knownSubstrate: KnownSubstrate[] = [
    website: null
  },
  {
-    decimals: [15],
-    displayName: 'Plasm Network',
-    network: 'plasm',
+    decimals: [18],
+    displayName: 'Astar Network',
+    network: 'astar',
    prefix: 5,
    standardAccount: '*25519',
-    symbols: ['PLM'],
-    website: 'https://plasmnet.io'
+    symbols: ['ASTR'],
+    website: 'https://astar.network'
  },
  {
    decimals: [12],
@@ -504,12 +504,21 @@ export const knownSubstrate: KnownSubstrate[] = [
    website: 'https://crust.network'
  },
  {
-    decimals: [0, 9, 9, 9, 9, 9, 9, 9],
-    displayName: 'Equilibrium Network',
-    network: 'equilibrium',
+    decimals: [9, 9, 9],
+    displayName: 'Genshiro Network',
+    network: 'genshiro',
    prefix: 67,
    standardAccount: '*25519',
-    symbols: ['Unknown', 'USD', 'EQ', 'ETH', 'BTC', 'EOS', 'DOT', 'CRV'],
+    symbols: ['GENS', 'EQD', 'LPT0'],
+    website: 'https://genshiro.equilibrium.io'
+  },
+  {
+    decimals: [9],
+    displayName: 'Equilibrium Network',
+    network: 'equilibrium',
+    prefix: 68,
+    standardAccount: '*25519',
+    symbols: ['EQ'],
    website: 'https://equilibrium.io'
  },
  {
@@ -531,12 +540,12 @@ export const knownSubstrate: KnownSubstrate[] = [
    website: 'https://zeitgeist.pm'
  },
  {
-    decimals: [12],
+    decimals: [18],
    displayName: 'Manta network',
    network: 'manta',
    prefix: 77,
    standardAccount: '*25519',
-    symbols: ['MA'],
+    symbols: ['MANTA'],
    website: 'https://manta.network'
  },
  {
@@ -620,6 +629,15 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['CLV'],
    website: 'https://clover.finance'
  },
+  {
+    decimals: [12],
+    displayName: 'Litmus Network',
+    network: 'litmus',
+    prefix: 131,
+    standardAccount: '*25519',
+    symbols: ['LIT'],
+    website: 'https://litentry.com/'
+  },
  {
    decimals: [18],
    displayName: 'Altair',
@@ -665,6 +683,24 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['NEER'],
    website: 'https://bit.country'
  },
+  {
+    decimals: [18],
+    displayName: 'SORA Kusama Parachain',
+    network: 'sora_kusama_para',
+    prefix: 420,
+    standardAccount: '*25519',
+    symbols: ['XOR'],
+    website: 'https://sora.org'
+  },
+  {
+    decimals: [18],
+    displayName: 'Efinity',
+    network: 'efinity',
+    prefix: 1110,
+    standardAccount: 'Sr25519',
+    symbols: ['EFI'],
+    website: 'https://efinity.io/'
+  },
  {
    decimals: [18],
    displayName: 'Moonbeam',
@@ -683,6 +719,15 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['MOVR'],
    website: 'https://moonbeam.network'
  },
+  {
+    decimals: [12],
+    displayName: 'Ajuna Network',
+    network: 'ajuna',
+    prefix: 1337,
+    standardAccount: 'Sr25519',
+    symbols: ['AJUN'],
+    website: 'https://ajuna.io'
+  },
  {
    decimals: [12],
    displayName: 'Kapex',
@@ -692,6 +737,24 @@ export const knownSubstrate: KnownSubstrate[] = [
    symbols: ['KAPEX'],
    website: 'https://totemaccounting.com'
  },
+  {
+    decimals: [10],
+    displayName: 'Interlay',
+    network: 'interlay',
+    prefix: 2032,
+    standardAccount: '*25519',
+    symbols: ['INTR'],
+    website: 'https://interlay.io/'
+  },
+  {
+    decimals: [12],
+    displayName: 'Kintsugi',
+    network: 'kintsugi',
+    prefix: 2092,
+    standardAccount: '*25519',
+    symbols: ['KINT'],
+    website: 'https://interlay.io/'
+  },
  {
    decimals: [18],
    displayName: 'Subspace testnet',
@@ -723,7 +786,7 @@ export const knownSubstrate: KnownSubstrate[] = [
    decimals: [12],
    displayName: 'CESS Testnet',
    network: 'cess-testnet',
-    prefix: 10042,
+    prefix: 11330,
    standardAccount: '*25519',
    symbols: ['TCESS'],
    website: 'https://cess.cloud'
@@ -732,7 +795,7 @@ export const knownSubstrate: KnownSubstrate[] = [
    decimals: [12],
    displayName: 'CESS',
    network: 'cess',
-    prefix: 10043,
+    prefix: 11331,
    standardAccount: '*25519',
    symbols: ['CESS'],
    website: 'https://cess.cloud'
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 export type Icon = 'beachball' | 'empty' | 'jdenticon' | 'polkadot' | 'substrate';
@@ -0,0 +1,13 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "rootDir": "./src"
+  },
+  "references": [
+    { "path": "../hw-ledger/tsconfig.build.json" },
+    { "path": "../util/tsconfig.build.json" },
+    { "path": "../x-fetch/tsconfig.build.json" }
+  ]
+}
@@ -22,35 +22,29 @@
    "./detectPackage.cjs"
  ],
  "type": "module",
-  "version": "7.9.2",
+  "version": "8.3.3",
+  "browser": {
+    "crypto": false,
+    "stream": false
+  },
  "main": "index.js",
  "dependencies": {
-    "@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",
+    "@babel/runtime": "^7.16.7",
+    "@noble/hashes": "0.5.7",
+    "@noble/secp256k1": "1.3.4",
+    "@polkadot/networks": "8.3.3",
+    "@polkadot/util": "8.3.3",
+    "@polkadot/wasm-crypto": "^4.5.1",
+    "@polkadot/x-bigint": "8.3.3",
+    "@polkadot/x-randomvalues": "8.3.3",
    "ed2curve": "^0.3.0",
-    "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"
+    "micro-base": "^0.10.2",
+    "tweetnacl": "^1.0.3"
  },
  "devDependencies": {
-    "@types/bn.js": "^4.11.6",
-    "@types/create-hash": "^1.2.2",
-    "@types/ed2curve": "^0.2.2",
-    "@types/elliptic": "^6.4.14",
-    "@types/scryptsy": "^2.0.0",
-    "@types/xxhashjs": "^0.2.2"
+    "@types/ed2curve": "^0.2.2"
  },
  "peerDependencies": {
-    "@polkadot/util": "7.9.2"
+    "@polkadot/util": "8.3.3"
  }
 }
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { hexToU8a } from '@polkadot/util';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { checkAddress } from '.';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { base58Decode } from '../base58';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { sshash } from './sshash';
@@ -1,23 +1,17 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { hexToU8a, stringToU8a, u8aToHex } from '@polkadot/util';

-import { createTestPairs, TestKeyringMap } from '../../../keyring/src/testingPairs';
+import { ALICE_PUBLIC_SR } from './encode.spec';
 import { decodeAddress } from '.';

 describe('decodeAddress', (): void => {
-  let keyring: TestKeyringMap;
-
-  beforeAll((): void => {
-    keyring = createTestPairs({ type: 'sr25519' });
-  });
-
  it('decodes an address', (): void => {
    expect(
      decodeAddress('5GrwvaEF5zXb26Fz9rcQpDWS57CtERHpNehXCPcNoHGKutQY')
    ).toEqual(
-      keyring.alice.publicKey
+      ALICE_PUBLIC_SR
    );
  });

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

 import type { HexString } from '@polkadot/util/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { Network } from '@polkadot/networks/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { waitReady } from '@polkadot/wasm-crypto';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -8,7 +8,7 @@ import type { Prefix } from './types';
 import { assert } from '@polkadot/util';

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

@@ -30,7 +30,7 @@ export function deriveAddress (who: HexString | Uint8Array | string, suri: strin
  let publicKey = decodeAddress(who);

  for (const { chainCode } of path) {
-    publicKey = schnorrkelDerivePublic(publicKey, chainCode);
+    publicKey = sr25519DerivePublic(publicKey, chainCode);
  }

  return encodeAddress(publicKey, ss58Format);
@@ -1,11 +1,11 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

-import { createTestPairs } from '@polkadot/keyring/testingPairs';
-
 import { encodeAddress } from '.';

-const keyring = createTestPairs({ type: 'ed25519' }, false);
+export const ALICE_PUBLIC_SR = new Uint8Array([212, 53, 147, 199, 21, 253, 211, 28, 97, 20, 26, 189, 4, 169, 159, 214, 130, 44, 133, 88, 133, 76, 205, 227, 154, 86, 132, 231, 165, 109, 162, 125]);
+
+export const ALICE_PUBLIC_ED = 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]);

 const SUBKEY = [
  {
@@ -69,7 +69,7 @@ const SUBKEY = [
 describe('encode', (): void => {
  it('encodes an address to a valid value', (): void => {
    expect(
-      keyring.alice.address
+      encodeAddress(ALICE_PUBLIC_ED)
    ).toEqual('5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaQua');
  });

@@ -88,7 +88,7 @@ describe('encode', (): void => {
  it('fails when non-valid publicKey provided', (): void => {
    expect(
      (): string => encodeAddress(
-        keyring.alice.publicKey.slice(0, 30)
+        ALICE_PUBLIC_ED.slice(0, 30)
      )
    ).toThrow(/Expected a valid key/);
  });
@@ -141,7 +141,7 @@ describe('encode', (): void => {

  it('encodes with 2 byte prefix', (): void => {
    expect(
-      encodeAddress(keyring.alice.publicKey, 255)
+      encodeAddress(ALICE_PUBLIC_ED, 255)
    ).toEqual('yGHU8YKprxHbHdEv7oUK4rzMZXtsdhcXVG2CAMyC9WhzhjH2k');
  });

@@ -155,19 +155,19 @@ describe('encode', (): void => {

  it('does not encode for > 16,383, < 0', (): void => {
    expect(
-      () => encodeAddress(keyring.alice.publicKey, -1)
+      () => encodeAddress(ALICE_PUBLIC_ED, -1)
    ).toThrow(/range ss58Format specified/);
    expect(
-      () => encodeAddress(keyring.alice.publicKey, 16384)
+      () => encodeAddress(ALICE_PUBLIC_ED, 16384)
    ).toThrow(/range ss58Format specified/);
  });

  it('does not encode reserved', (): void => {
    expect(
-      () => encodeAddress(keyring.alice.publicKey, 46)
+      () => encodeAddress(ALICE_PUBLIC_ED, 46)
    ).toThrow(/range ss58Format specified/);
    expect(
-      () => encodeAddress(keyring.alice.publicKey, 47)
+      () => encodeAddress(ALICE_PUBLIC_ED, 47)
    ).toThrow(/range ss58Format specified/);
  });
 });
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { HexString } from '@polkadot/util/types';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { encodeDerivedAddress } from '.';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import type { BN } from '@polkadot/util';
@@ -1,4 +1,4 @@
-// Copyright 2017-2021 @polkadot/util-crypto authors & contributors
+// Copyright 2017-2022 @polkadot/util-crypto authors & contributors
 // SPDX-License-Identifier: Apache-2.0

 import { encodeMultiAddress } from '.';
--- a/Show More
+++ b/Show More