[CI Skip] release/stable 9.3.1

skip-checks: true

.123trigger

@@ -15,4 +15,16 @@
 6.0.4
 6.0.5
 
-7.0.2
+7.0.2
+7.0.3
+7.1.2
+7.8.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

.codeclimate.yml

@@ -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"

.eslintignore

@@ -0,0 +1,2 @@
+packages/x-noble-hashes/**/*.ts
+packages/x-noble-secp256k1/**/*.ts

.eslintrc.js

@@ -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: {

.github/ss58-check.md

@@ -1,10 +0,0 @@
----
-title: SS58 registry is outdated
-labels: ['ci', '@networks']
----
-
-cc @polkadot-js/notifications
-
-Discrepancies detected between https://github.com/paritytech/substrate/blob/master/ss58-registry.json and https://github.com/polkadot-js/common/blob/master/packages/networks/src/substrate.ts
-
-Check the nightly cron output (or via `yarn networks:crosscheck` locally) and run `yarn networks:sync` to update. The output as found from the test includes:

.github/workflows/auto-approve.yml

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

.github/workflows/auto-merge.yml

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

.github/workflows/lock.yml

@@ -2,11 +2,13 @@ name: 'Lock Threads'
 
 on:
   schedule:
-    - cron: '30 1/2 * * *'
+    - cron: '15 1/3 * * *'
 
 jobs:
   lock:
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
     steps:
       - uses: dessant/lock-threads@v2
         with:

.github/workflows/pr-any.yml

@@ -8,11 +8,12 @@ jobs:
         step: ['lint', 'test', 'build']
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
     steps:
     - uses: actions/checkout@v2
     - name: ${{ matrix.step }}
-      env:
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
       run: |
         yarn install --immutable | grep -v 'YN0013'
         yarn ${{ matrix.step }}

.github/workflows/push-master.yml

@@ -12,16 +12,18 @@ jobs:
         step: ['build:release']
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
+      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
+      GH_PAT: ${{ secrets.GH_PAT }}
+      GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}
+      NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
     steps:
     - uses: actions/checkout@v2
       with:
+        fetch-depth: 0
         token: ${{ secrets.GH_PAT }}
     - name: ${{ matrix.step }}
-      env:
-        CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-        GH_PAT: ${{ secrets.GH_PAT }}
-        GH_RELEASE_GITHUB_API_TOKEN: ${{ secrets.GH_PAT }}
-        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       run: |
         yarn install --immutable | grep -v 'YN0013'
         yarn ${{ matrix.step }}

.github/workflows/semgrep.yml

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

.github/workflows/ss58-check.yml

@@ -1,25 +0,0 @@
-name: SS58
-on:
-  schedule:
-    - cron:  '15 4/6 * * *'
-
-jobs:
-  ss58:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: check
-      env:
-        CI_LOG: 123
-      run: |
-        yarn install --immutable | grep -v 'YN0013'
-        yarn networks:crosscheck
-
-    - name: issue
-      if: ${{ failure() }}
-      uses: JasonEtco/create-an-issue@v2
-      env:
-        GITHUB_TOKEN: ${{ secrets.GH_PAT_BOT }}
-      with:
-        filename: .github/ss58-check.md
-        update_existing: true

.github/workflows/stale.yml

@@ -1,11 +1,13 @@
 name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: '30 2/2 * * *'
+    - cron: '50 1/3 * * *'
 
 jobs:
   stale:
     runs-on: ubuntu-latest
+    env:
+      YARN_ENABLE_SCRIPTS: false
     steps:
       - uses: actions/stale@v3
         with:

.gitignore

@@ -1,6 +1,8 @@
 --test-*
 _book/
 build/
+build-cjs/
+build-esm/
 build-docs/
 coverage/
 docs/.vuepress/dist/
@@ -11,7 +13,9 @@ tmp/
 .env.development.local
 .env.test.local
 .env.production.local
+.idea
 .npmrc
+.vscode
 .yarn/*
 !.yarn/releases
 !.yarn/plugins
@@ -24,5 +28,4 @@ yarn-debug.log*
 yarn-error.log*
 store.db
 store.db.compacted
-.idea
-.vscode
+tsconfig.*buildinfo

.mailmap

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

.prettierrc.cjs

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

.yarnrc.yml

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

CHANGELOG.md

@@ -1,5 +1,390 @@
 # CHANGELOG
 
+## 9.3.1 May 29, 2022
+
+Contributed:
+
+- Add Ledger support for Parallel (Thanks to https://github.com/carlosala)
+- Add Ledger support for Astar & Polkadex (Thanks to https://github.com/carlosala)
+
+Changes:
+
+- Adjust `u8aToU8a` checks with better `isU8a` shortcut
+- Adjust compact conversion with unrolled loops
+- Adjust `string{Camel, Pascal}Case` with loop (no map)
+- Add `compactFromU8aLim` variant with Uint8Array-only inputs
+- Add `u8aConcatStrict` variant with Uint8Array-only inputs
+- Internal code maintainability enhancements
+- Upgrade dependencies to latest stable versions
+
+
+## 9.2.1 May 13, 2022
+
+Contributed:
+
+- Add Ledger support for Acala (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- Optimize `u8aToHex` with direct (non-hex) conversion
+- Change all occurences of `.substr(...)` to `.substring(...)`
+- Sync with upstream Substrate ss58 registry
+- Mark deprecated function signatures (no removals)
+- Re-enable auto init of `cryptoWaitReady()`
+- Upgrade to `@polkadot/wasm-crypto` 6.1.1
+
+
+## 9.1.1 Apr 30, 2022
+
+Contributed:
+
+- Add Ledger support for Statemint (Thanks to https://github.com/carlosala)
+- Add Ledger support for xxnetwork (Thanks to https://github.com/xx-labs)
+
+Changes:
+
+- Adjust/dedupe output from `detectPackage`
+- Adjust `isHex` performance test
+- Add field-level comments to some `*Options` structures
+- Add new Rococo genesisHash (reset)
+
+
+## 9.0.1 Apr 9, 2022
+
+- **Breaking change** In this major version the commonjs outputs are moved to a sub-folder. Since the export map and main field in package.json does reflect this change, there should be no usage changes. However the packages here will all need to be on the same version for internal linkage.
+
+Changes:
+
+- Be explicit in `@polkadot/util-crypto` re-exports from `@polkadot/networks`
+- Output commonjs files under the `cjs/**` root
+- Upgrade to `@polkadot/wasm-crypto` 6.0.1
+
+
+## 8.7.1 Mar 27, 2022
+
+Changes:
+
+- Fix race-condition with wasm overrides, make `cryptoWaitReady` lazy
+- Additional tests for `BN` & `BigInt` negative conversions
+- Upgrade to `@polkadot/wasm-crypto` 5.1.1
+
+
+## 8.6.1 Mar 19, 2022
+
+**Important** This contains an upgraded version of `@polkadot/wasm-crypto`. For users of asm.js, e.g. React Native, there are some additional upgrade instructions in the release notes for this version https://github.com/polkadot-js/wasm/releases/tag/v5.0.1
+
+Contributed:
+
+- Add aditional Dock mainnet genesis (Thanks to https://github.com/lovesh)
+- Add Westend genesis (Thanks to https://github.com/Nick-1979)
+- Update README with ss58 links (Thanks to https://github.com/Nick-197)
+
+Changes:
+
+- Ensure invalid secp256k1 publicKeys are not returned
+- Cater for Expo v41+ in RN random value generation
+- Fixed for RN environment imports
+- Internal split of details in `@polkadot/networks`
+- Additional workaround for Vite bundling
+- Upgrade to `@polkadot/wasm-crypto` 5.0.1
+
+
+## 8.5.1 Mar 12, 2022
+
+Changes:
+
+- Adjust for bundlers where `import.meta.url` is undefined
+- Upgrade dependencies to latest stable versions
+
+
+## 8.4.1 Feb 14, 2022
+
+Changes:
+
+- Use upstream `@substrate/ss58-registry` (instead of duplicating here)
+- Swap `micro-base` to `@scure/base` (same package, audited)
+- Bump `bn.js` library to latest 5.2.0 (has impact on e.g. API)
+- Upgrade dependencies to latest stable versions
+
+
+## 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:
+
+- 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:
+
+- Add `u8aWrapBytes` & `u8aUnwrapBytes` (originally from `@polkadot/extension-dapp`)
+- Verify both wrapped and unwrapped signatures transparently
+- 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
+
+Contributed:
+
+- Added Bifrost genesisHash (Thanks to https://github.com/awesomepan)
+- Added Stafi genesisHash (Thanks to https://github.com/Tore19)
+- Add Ledger support for Nodle (Thanks to https://github.com/ETeissonniere)
+
+Changes:
+
+- Add support for `schnorrkelAgreement` (as exposed by new `wasm-crypto`)
+- Ensure `schnorrkel*` functions allows hex inputs
+- `@polkadot/wasm-crypto` 4.2.1
+- Sync with upstream Substrate ss58 registry
+
+
+## 7.2.1 Aug 15, 2021
+
+Contributed:
+
+- Always use `bigint` type to indicate instance (Thanks to https://github.com/ntduan)
+
+Changes:
+
+- Added `u8aEmpty` helper check, all 0 or no length
+- Cleanup additional circular dependencies detected by rollup
+
+
+## 7.1.2 Aug 11, 2021
+
+Changes:
+
+- Ensure `@polkadot/util-crypto` doesn't re-export `packageInfo` from `@polkadot/networks`
+- Minor TS style cleanups in `@polkadot/x-bundle`
+
+
+## 7.1.1 Aug 2, 2021
+
+Contributed:
+
+- Add keyring encrypt/decrypt functionality (Thanks to https://github.com/RoyTimes)
+
+Changes:
+
+- Bump Ledger libraries to latest versions
+
+
+## 7.0.3 Jul 26, 2021
+
+Changes:
+
+- Sync with upstream Substrate ss58 registry
+- Bump Ledger libraries to latest versions
+
+
 ## 7.0.2 Jul 19, 2021
 
 Changes:

CONTRIBUTORS

@@ -0,0 +1,50 @@
+    1332	Jaco                          	9.3.1 (#1507)
+       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)
+       4	Jakub Pánik                   	Add basilisk 🐍 (#1396)
+       3	Carlo Sala                    	some changes to KnownLedger (#1497)
+       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	Kami                          	Adding Westend genesis. (#1429)
+       2	Lovesh Harchandani            	Update genesis hash of Dock mainnet (#1436)
+       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	Hoon Kim                      	replace plasm genesis with astar (#1397)
+       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	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	Nantian                       	add acala ledger config (#1485)
+       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	xx network                    	Add xxnetwork genesis hash and ledger app (#1463)
+       1	Yuri                          	Extra check for process for browser bundles (#923)

babel.config.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
 
 module.exports = require('@polkadot/dev/config/babel-config-cjs.cjs');

jest.config.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,24 +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'
-  },
-  modulePathIgnorePatterns: [
-    '<rootDir>/packages/hw-ledger/build',
-    '<rootDir>/packages/hw-ledger-transports/build',
-    '<rootDir>/packages/keyring/build',
-    '<rootDir>/packages/networks/build',
-    '<rootDir>/packages/util/build',
-    '<rootDir>/packages/util-crypto/build',
-    '<rootDir>/packages/x-fetch/build',
-    '<rootDir>/packages/x-global/build',
-    '<rootDir>/packages/x-randomvalues/build',
-    '<rootDir>/packages/x-rxjs/build',
-    '<rootDir>/packages/x-textdecoder/build',
-    '<rootDir>/packages/x-textencoder/build',
-    '<rootDir>/packages/x-ws/build'
-  ],
-  transformIgnorePatterns: ['/node_modules/(?!@polkadot)']
+    '@polkadot/x-(bigint|global)(.*)$': '<rootDir>/packages/x-$1/src/$2',
+    '@polkadot/x-(fetch|randomvalues|textdecoder|textencoder|ws)(.*)$': '<rootDir>/packages/x-$1/src/node'
+  }
 });

package.json

@@ -1,32 +1,37 @@
 {
-  "repository": "https://github.com/polkadot-js/common",
   "author": "Jaco Greeff <jacogr@gmail.com>",
-  "license": "Apache-2",
+  "bugs": "https://github.com/polkadot-js/common/issues",
+  "homepage": "https://github.com/polkadot-js/common#readme",
+  "license": "Apache-2.0",
+  "packageManager": "yarn@3.2.0",
   "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/polkadot-js/common.git"
+  },
+  "sideEffects": false,
+  "version": "9.3.1",
   "workspaces": [
     "packages/*"
   ],
-  "resolutions": {
-    "typescript": "^4.3.5"
-  },
   "scripts": {
     "build": "polkadot-dev-build-ts",
     "build:release": "polkadot-ci-ghact-build",
     "build:rollup": "polkadot-exec-rollup --config",
-    "lint": "polkadot-dev-run-lint",
     "clean": "polkadot-dev-clean-build",
+    "lint": "polkadot-dev-run-lint",
     "networks:crosscheck": "polkadot-dev-run-test packages/networks/src/crosscheck",
-    "networks:sync": "node packages/networks/scripts/fromSubstrate.mjs",
     "postinstall": "polkadot-dev-yarn-only",
     "test": "polkadot-dev-run-test --coverage --runInBand --testPathIgnorePatterns crosscheck --testPathIgnorePatterns toMiniSecretCmp",
     "test:mnemonicCmp": "polkadot-dev-run-test packages/util-crypto/src/mnemonic/toMiniSecretCmp.spec.ts",
     "test:one": "polkadot-dev-run-test --runInBand"
   },
   "devDependencies": {
-    "@babel/core": "^7.14.6",
-    "@polkadot/dev": "^0.62.57",
-    "@polkadot/ts": "^0.4.4",
-    "@types/jest": "^26.0.24"
+    "@babel/core": "^7.18.2",
+    "@polkadot/dev": "^0.66.30",
+    "@types/jest": "^27.5.1"
   },
-  "version": "7.0.2"
+  "resolutions": {
+    "typescript": "^4.6.4"
+  }
 }

packages/hw-ledger-transports/package.json

@@ -1,26 +1,33 @@
 {
-  "name": "@polkadot/hw-ledger-transports",
-  "version": "7.0.2",
-  "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": "9.3.1",
+  "browser": "browser.js",
+  "main": "node.js",
+  "react-native": "react-native.js",
   "dependencies": {
-    "@babel/runtime": "^7.14.6",
-    "@ledgerhq/hw-transport": "^6.1.0",
-    "@ledgerhq/hw-transport-webhid": "^6.1.0",
-    "@ledgerhq/hw-transport-webusb": "^6.1.0"
+    "@babel/runtime": "^7.18.3",
+    "@ledgerhq/hw-transport": "^6.27.1",
+    "@ledgerhq/hw-transport-webhid": "^6.27.1",
+    "@ledgerhq/hw-transport-webusb": "^6.27.1",
+    "@polkadot/util": "9.3.1"
   },
   "optionalDependencies": {
-    "@ledgerhq/hw-transport-node-hid-singleton": "^6.1.0"
+    "@ledgerhq/hw-transport-node-hid-singleton": "^6.27.1"
   }
 }

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

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

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

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

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

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

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

@@ -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';

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

@@ -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.0.2' };
+export const packageInfo = { name: '@polkadot/hw-ledger-transports', path: 'auto', type: 'auto', version: '9.3.1' };

packages/hw-ledger-transports/src/react-native.ts

@@ -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';

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

@@ -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';

packages/hw-ledger-transports/tsconfig.build.json

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

packages/hw-ledger/package.json

@@ -1,24 +1,31 @@
 {
-  "name": "@polkadot/hw-ledger",
-  "version": "7.0.2",
-  "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": "9.3.1",
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.14.6",
-    "@polkadot/hw-ledger-transports": "7.0.2",
-    "@polkadot/util": "^7.0.2",
-    "@zondax/ledger-substrate": "^0.16.2"
+    "@babel/runtime": "^7.18.3",
+    "@ledgerhq/hw-transport": "^6.27.1",
+    "@polkadot/hw-ledger-transports": "9.3.1",
+    "@polkadot/util": "9.3.1",
+    "@zondax/ledger-substrate": "^0.29.0"
   }
 }

packages/hw-ledger/src/bundle.ts

@@ -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';

packages/hw-ledger/src/constants.ts

@@ -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;

packages/hw-ledger/src/defaults.spec.ts

@@ -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([]);
-  });
-});

packages/hw-ledger/src/defaults.ts

@@ -1,19 +1,30 @@
-// 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, newKusamaApp, newPolkadotApp, newPolymeshApp, newStatemineApp } from '@zondax/ledger-substrate';
+import { newAcalaApp, newAstarApp, newBifrostApp, newCentrifugeApp, newDockApp, newEdgewareApp, newEquilibriumApp, newGenshiroApp, newKaruraApp, newKusamaApp, newNodleApp, newParallelApp, newPolkadexApp, newPolkadotApp, newPolymeshApp, newSoraApp, newStatemineApp, newStatemintApp, newXXNetworkApp } from '@zondax/ledger-substrate';
 
-// These match up with the keys of the knownLedger object in the @polkadot/networks/defaults.ts
+// These match up with the keys of the knownLedger object in the @polkadot/networks/defaults/ledger.ts
 export const ledgerApps: Record<string, (transport: Transport) => SubstrateApp> = {
+  acala: newAcalaApp,
+  astar: newAstarApp,
+  bifrost: newBifrostApp,
   centrifuge: newCentrifugeApp,
   'dock-mainnet': newDockApp,
   edgeware: newEdgewareApp,
   equilibrium: newEquilibriumApp,
+  genshiro: newGenshiroApp,
+  karura: newKaruraApp,
   kusama: newKusamaApp,
+  'nodle-para': newNodleApp,
+  parallel: newParallelApp,
+  polkadex: newPolkadexApp,
   polkadot: newPolkadotApp,
   polymesh: newPolymeshApp,
-  statemine: newStatemineApp
+  sora: newSoraApp,
+  statemine: newStatemineApp,
+  statemint: newStatemintApp,
+  xxnetwork: newXXNetworkApp
 };

packages/hw-ledger/src/detectOther.ts

@@ -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];

packages/hw-ledger/src/detectPackage.ts

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

packages/hw-ledger/src/index.ts

@@ -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';

packages/hw-ledger/src/packageInfo.ts

@@ -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.0.2' };
+export const packageInfo = { name: '@polkadot/hw-ledger', path: 'auto', type: 'auto', version: '9.3.1' };

packages/hw-ledger/src/types.ts

@@ -1,6 +1,8 @@
-// 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';
+
 export type LedgerTypes = 'hid' | 'u2f' | 'webusb';
 
 export interface AccountOptions {
@@ -11,15 +13,18 @@ export interface AccountOptions {
 
 export interface LedgerAddress {
   address: string;
-  publicKey: string;
+  publicKey: HexString;
 }
 
 export interface LedgerSignature {
-  signature: string;
+  signature: HexString;
 }
 
 export interface LedgerVersion {
   isLocked: boolean;
   isTestMode: boolean;
+  /**
+   * @description Tuple with major, minor, patch
+   */
   version: [number, number, number];
 }

packages/hw-ledger/tsconfig.build.json

@@ -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" }
+  ]
+}

packages/keyring/package.json

@@ -1,30 +1,34 @@
 {
-  "name": "@polkadot/keyring",
-  "version": "7.0.2",
-  "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": "9.3.1",
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.14.6",
-    "@polkadot/util": "7.0.2",
-    "@polkadot/util-crypto": "7.0.2"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/util": "9.3.1",
+    "@polkadot/util-crypto": "9.3.1"
   },
   "peerDependencies": {
-    "@polkadot/util": "7.0.2",
-    "@polkadot/util-crypto": "7.0.2"
+    "@polkadot/util": "9.3.1",
+    "@polkadot/util-crypto": "9.3.1"
   }
 }

packages/keyring/src/bundle.ts

@@ -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';

packages/keyring/src/defaults.ts

@@ -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

packages/keyring/src/detectOther.ts

@@ -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];

packages/keyring/src/detectPackage.ts

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

packages/keyring/src/index.spec.ts

@@ -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';
@@ -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(
@@ -357,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');
@@ -393,7 +413,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 +430,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 +447,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 +516,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 +546,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 +565,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);
 

packages/keyring/src/index.ts

@@ -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';

packages/keyring/src/keyring.ts

@@ -1,24 +1,27 @@
-// 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/json/types';
-import type { Keypair, KeypairType } from '@polkadot/util-crypto/types';
+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 {
+  return publicKey;
+}
+
 /**
  * # @polkadot/keyring
  *
@@ -139,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)
     );
   }
 
@@ -206,25 +209,24 @@ export class Keyring implements KeyringInstance {
     if (isPhraseHex) {
       seed = hexToU8a(phrase);
     } else {
-      const str = phrase;
-      const parts = str.split(' ');
+      const parts = phrase.split(' ');
 
       if ([12, 15, 18, 21, 24].includes(parts.length)) {
         seed = type === 'ethereum'
           ? mnemonicToLegacySeed(phrase, '', false, 64)
           : mnemonicToMiniSecret(phrase, password);
       } else {
-        assert(str.length <= 32, 'specified phrase is not a valid mnemonic and is invalid as a raw seed at > 32 bytes');
+        assert(phrase.length <= 32, 'specified phrase is not a valid mnemonic and is invalid as a raw seed at > 32 bytes');
 
-        seed = stringToU8a(str.padEnd(32));
+        seed = stringToU8a(phrase.padEnd(32));
       }
     }
 
     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);
   }
@@ -237,7 +239,7 @@ export class Keyring implements KeyringInstance {
     return this.type === 'ethereum'
       ? ethereumEncode(address)
       : encodeAddress(address, isUndefined(ss58Format) ? this.#ss58 : ss58Format);
-  }
+  };
 
   /**
    * @name getPair
@@ -264,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);
   }
 
   /**

packages/keyring/src/packageInfo.ts

@@ -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.0.2' };
+export const packageInfo = { name: '@polkadot/keyring', path: 'auto', type: 'auto', version: '9.3.1' };

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

@@ -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';

packages/keyring/src/pair/decode.ts

@@ -1,7 +1,7 @@
-// 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/json/types';
+import type { EncryptedJsonEncoding } from '@polkadot/util-crypto/types';
 import type { PairInfo } from './types';
 
 import { assert, isUndefined, u8aEq } from '@polkadot/util';

packages/keyring/src/pair/defaults.ts

@@ -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]);

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

@@ -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';

packages/keyring/src/pair/encode.ts

@@ -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';

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

@@ -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';
@@ -18,6 +18,10 @@ describe('pair', (): void => {
   });
 
   const SIGNATURE = new Uint8Array([80, 191, 198, 147, 225, 207, 75, 88, 126, 39, 129, 109, 191, 38, 72, 181, 75, 254, 81, 143, 244, 79, 237, 38, 236, 141, 28, 252, 134, 26, 169, 234, 79, 33, 153, 158, 151, 34, 175, 188, 235, 20, 35, 135, 83, 120, 139, 211, 233, 130, 1, 208, 201, 215, 73, 80, 56, 98, 185, 196, 11, 8, 193, 14]);
+  const ENCRYPTED = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132, 59, 53, 85, 227, 40, 107, 48, 234, 198, 238, 157, 238, 224, 235, 179, 75, 153, 241, 142, 254]);
+
+  // the last byte is changed from 254 -> 253
+  const ENCRYPTED_CHANGED = new Uint8Array([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 132, 59, 53, 85, 227, 40, 107, 48, 234, 198, 238, 157, 238, 224, 235, 179, 75, 153, 241, 142, 253]);
 
   it('has a publicKey', (): void => {
     expect(
@@ -53,7 +57,7 @@ describe('pair', (): void => {
   it('fails a correctly signed message (signer changed)', (): void => {
     expect(
       keyring.alice.verify(
-        new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]),
+        new Uint8Array([0x61, 0x62, 0x63, 0x64]),
         SIGNATURE,
         keyring.bob.publicKey
       )
@@ -94,6 +98,93 @@ describe('pair', (): void => {
     ).toBe(false);
   });
 
+  it('allows encrypting', (): void => {
+    const message = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]);
+
+    expect(
+      keyring.alice.encryptMessage(
+        message,
+        keyring.bob.publicKey,
+        new Uint8Array(24)
+      )
+    ).toEqual(ENCRYPTED);
+  });
+
+  it('validates a correctly encrypted message', (): void => {
+    const message = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]);
+
+    expect(
+      keyring.bob.decryptMessage(
+        ENCRYPTED,
+        keyring.alice.publicKey
+      )
+    ).toEqual(message);
+  });
+
+  it('fails a correctly encrypted message (message changed)', (): void => {
+    expect(
+      keyring.bob.decryptMessage(
+        ENCRYPTED_CHANGED,
+        keyring.alice.publicKey
+      )
+    ).toEqual(null);
+  });
+
+  it('fails a correctly encrypted message (sender changed)', (): void => {
+    expect(
+      keyring.bob.decryptMessage(
+        ENCRYPTED,
+        keyring.charlie.publicKey
+      )
+    ).toEqual(null);
+  });
+
+  it('fails a correctly encrypted message (receiver changed)', (): void => {
+    expect(
+      keyring.charlie.decryptMessage(
+        ENCRYPTED,
+        keyring.alice.publicKey
+      )
+    ).toEqual(null);
+  });
+
+  it('validates encryption between ed25519 & sr25519 key pairs', (): void => {
+    const PASS = 'testing';
+    const encodedA = keyring.alice.encodePkcs8(PASS);
+    const encodedB = keyring.bob.encodePkcs8(PASS);
+
+    const pairA = createPair({ toSS58, type: 'sr25519' }, { publicKey: keyring.alice.publicKey });
+    const pairB = createPair({ toSS58, type: 'sr25519' }, { publicKey: keyring.bob.publicKey });
+
+    pairA.decodePkcs8(PASS, encodedA);
+    pairB.decodePkcs8(PASS, encodedB);
+    const message = new Uint8Array([0x61, 0x62, 0x63, 0x64, 0x65]);
+
+    // alice-sr25519 -> bob-ed25519
+    const encrypted1 = pairA.encryptMessage(message, keyring.bob.publicKey);
+
+    // alice-sr25519 -> bob-sr25519
+    const encrypted2 = pairA.encryptMessage(message, pairB.publicKey);
+
+    // alice-ed25519 -> bob-sr25519
+    const encrypted3 = keyring.alice.encryptMessage(message, pairB.publicKey);
+
+    // decrypt: Bob-ed25519 - use alice-ed25519 pubkey
+    expect(
+      keyring.bob.decryptMessage(encrypted3, keyring.alice.publicKey)
+    ).toEqual(message);
+
+    // decrypt: Bob-ed25519 - use alice-sr25519 pubkey
+    expect(
+      keyring.bob.decryptMessage(encrypted1, pairA.publicKey)
+    ).toEqual(message);
+
+    // decrypt: Bob-sr25519 - use alice-sr25519 pubkey
+    expect(
+      pairB.decryptMessage(encrypted2, pairA.publicKey)
+    ).toEqual(message);
+  });
+
   it('allows setting/getting of meta', (): void => {
     keyring.bob.setMeta({ foo: 'bar', something: 'else' });
 
@@ -183,5 +274,22 @@ describe('pair', (): void => {
       });
       expect(json.address).toEqual(u8aToHex(PUBLICDERIVED));
     });
+
+    it('denies access to encryptMessage/decryptMessage API', (): void => {
+      const PASS = 'testing';
+      const encoded = keyring.alice.encodePkcs8(PASS);
+
+      const pair = createPair({ toSS58, type: 'ethereum' }, { publicKey: keyring.alice.publicKey });
+
+      pair.decodePkcs8(PASS, encoded);
+
+      expect(
+        () => pair.encryptMessage(
+          new Uint8Array(4), // null message
+          keyring.bob.publicKey,
+          new Uint8Array(24)
+        )
+      ).toThrow('Secp256k1 not supported yet');
+    });
   });
 });

packages/keyring/src/pair/index.ts

@@ -1,13 +1,13 @@
-// 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/json/types';
-import type { Keypair, KeypairType } from '@polkadot/util-crypto/types';
+import type { HexString } from '@polkadot/util/types';
+import type { EncryptedJsonEncoding, Keypair, KeypairType } from '@polkadot/util-crypto/types';
 import type { KeyringPair, KeyringPair$Json, KeyringPair$Meta, SignOptions } from '../types';
 import type { PairInfo } from './types';
 
-import { assert, u8aConcat, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
-import { blake2AsU8a, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclKeypairFromSeed as naclFromSeed, naclSign, schnorrkelKeypairFromSeed as schnorrkelFromSeed, schnorrkelSign, schnorrkelVrfSign, schnorrkelVrfVerify, secp256k1Compress, secp256k1Expand, secp256k1KeypairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify } from '@polkadot/util-crypto';
+import { assert, objectSpread, u8aConcat, u8aEmpty, u8aEq, u8aToHex, u8aToU8a } from '@polkadot/util';
+import { blake2AsU8a, convertPublicKeyToCurve25519, convertSecretKeyToCurve25519, ed25519PairFromSeed as ed25519FromSeed, ed25519Sign, ethereumEncode, keccakAsU8a, keyExtractPath, keyFromPath, naclOpen, naclSeal, secp256k1Compress, secp256k1Expand, secp256k1PairFromSeed as secp256k1FromSeed, secp256k1Sign, signatureVerify, sr25519PairFromSeed as sr25519FromSeed, sr25519Sign, sr25519VrfSign, sr25519VrfVerify } from '@polkadot/util-crypto';
 
 import { decodePair } from './decode';
 import { encodePair } from './encode';
@@ -22,9 +22,9 @@ const SIG_TYPE_NONE = new Uint8Array();
 
 const TYPE_FROM_SEED = {
   ecdsa: secp256k1FromSeed,
-  ed25519: naclFromSeed,
+  ed25519: ed25519FromSeed,
   ethereum: secp256k1FromSeed,
-  sr25519: schnorrkelFromSeed
+  sr25519: sr25519FromSeed
 };
 
 const TYPE_PREFIX = {
@@ -36,9 +36,9 @@ const TYPE_PREFIX = {
 
 const TYPE_SIGNATURE = {
   ecdsa: (m: Uint8Array, p: Partial<Keypair>) => secp256k1Sign(m, p, 'blake2'),
-  ed25519: naclSign,
+  ed25519: ed25519Sign,
   ethereum: (m: Uint8Array, p: Partial<Keypair>) => secp256k1Sign(m, p, 'keccak'),
-  sr25519: schnorrkelSign
+  sr25519: sr25519Sign
 };
 
 const TYPE_ADDRESS = {
@@ -48,9 +48,8 @@ const TYPE_ADDRESS = {
   sr25519: (p: Uint8Array) => p
 };
 
-// Not 100% correct, since it can be a Uint8Array, but an invalid one - just say "undefined" is anything non-valid
 function isLocked (secretKey?: Uint8Array): secretKey is undefined {
-  return !secretKey || secretKey.length === 0 || secretKey.every((b) => b === 0);
+  return !secretKey || u8aEmpty(secretKey);
 }
 
 function vrfHash (proof: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array {
@@ -145,6 +144,19 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     },
     // eslint-disable-next-line sort-keys
     decodePkcs8,
+    decryptMessage: (encryptedMessageWithNonce: HexString | string | Uint8Array, senderPublicKey: HexString | string | Uint8Array): Uint8Array | null => {
+      assert(!isLocked(secretKey), 'Cannot encrypt with a locked key pair');
+      assert(!['ecdsa', 'ethereum'].includes(type), 'Secp256k1 not supported yet');
+
+      const messageU8a = u8aToU8a(encryptedMessageWithNonce);
+
+      return naclOpen(
+        messageU8a.slice(24, messageU8a.length),
+        messageU8a.slice(0, 24),
+        convertPublicKeyToCurve25519(u8aToU8a(senderPublicKey)),
+        convertSecretKeyToCurve25519(secretKey)
+      );
+    },
     derive: (suri: string, meta?: KeyringPair$Meta): KeyringPair => {
       assert(type !== 'ethereum', 'Unable to derive on this keypair');
       assert(!isLocked(secretKey), 'Cannot derive on a locked keypair');
@@ -157,13 +169,21 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     encodePkcs8: (passphrase?: string): Uint8Array => {
       return recode(passphrase);
     },
+    encryptMessage: (message: HexString | string | Uint8Array, recipientPublicKey: HexString | string | Uint8Array, nonceIn?: Uint8Array): Uint8Array => {
+      assert(!isLocked(secretKey), 'Cannot encrypt with a locked key pair');
+      assert(!['ecdsa', 'ethereum'].includes(type), 'Secp256k1 not supported yet');
+
+      const { nonce, sealed } = naclSeal(u8aToU8a(message), convertSecretKeyToCurve25519(secretKey), convertPublicKeyToCurve25519(u8aToU8a(recipientPublicKey)), nonceIn);
+
+      return u8aConcat(nonce, sealed);
+    },
     lock: (): void => {
       secretKey = new Uint8Array();
     },
     setMeta: (additional: KeyringPair$Meta): void => {
-      meta = { ...meta, ...additional };
+      meta = objectSpread({}, meta, additional);
     },
-    sign: (message: string | Uint8Array, options: SignOptions = {}): Uint8Array => {
+    sign: (message: HexString | string | Uint8Array, options: SignOptions = {}): Uint8Array => {
       assert(!isLocked(secretKey), 'Cannot sign with a locked key pair');
 
       return u8aConcat(
@@ -188,28 +208,26 @@ export function createPair ({ toSS58, type }: Setup, { publicKey, secretKey }: P
     unlock: (passphrase?: string): void => {
       return decodePkcs8(passphrase);
     },
-    verify: (message: string | Uint8Array, signature: Uint8Array, _signerPublic: string | Uint8Array): boolean => {
-      return signatureVerify(message, signature, TYPE_ADDRESS[type](u8aToU8a(_signerPublic))).isValid;
+    verify: (message: HexString | string | Uint8Array, signature: HexString | string | Uint8Array, signerPublic: HexString | string | Uint8Array): boolean => {
+      return signatureVerify(message, signature, TYPE_ADDRESS[type](u8aToU8a(signerPublic))).isValid;
     },
-    vrfSign: (message: string | Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array => {
+    vrfSign: (message: HexString | string | Uint8Array, context?: HexString | string | Uint8Array, extra?: string | Uint8Array): Uint8Array => {
       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 });
 
       return u8aConcat(vrfHash(proof, context, extra), proof);
     },
-    vrfVerify: (message: string | Uint8Array, vrfResult: Uint8Array, _signerPublic: Uint8Array | string, context?: string | Uint8Array, extra?: string | Uint8Array): boolean => {
-      const signerPublic = TYPE_ADDRESS[type](u8aToU8a(_signerPublic));
-
+    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)), signerPublic);
+      const result = signatureVerify(message, u8aConcat(TYPE_PREFIX[type], vrfResult.subarray(32)), TYPE_ADDRESS[type](u8aToU8a(signerPublic)));
 
       return result.isValid && u8aEq(vrfResult.subarray(0, 32), vrfHash(vrfResult.subarray(32), context, extra));
     }

packages/keyring/src/pair/nobody.ts

@@ -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';
@@ -7,10 +7,12 @@ import { encodeAddress } from '@polkadot/util-crypto';
 
 const publicKey = new Uint8Array(32);
 const address = encodeAddress(publicKey);
+
 const meta = {
   isTesting: true,
   name: 'nobody'
 };
+
 const json: KeyringPair$Json = {
   address,
   encoded: '',
@@ -22,48 +24,54 @@ const json: KeyringPair$Json = {
   meta
 };
 
-export function nobody (): KeyringPair {
-  const pair: KeyringPair = {
-    address,
-    addressRaw: publicKey,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    decodePkcs8: (passphrase?: string, encoded?: Uint8Array): void =>
-      undefined,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    derive: (suri: string, meta?: KeyringPair$Meta): KeyringPair =>
-      pair,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    encodePkcs8: (passphrase?: string): Uint8Array =>
-      new Uint8Array(0),
-    isLocked: true,
-    lock: (): void => {
-      // no locking, it is always locked
-    },
-    meta,
-    publicKey,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    setMeta: (meta: KeyringPair$Meta): void =>
-      undefined,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    sign: (message: Uint8Array): Uint8Array =>
-      new Uint8Array(64),
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    toJson: (passphrase?: string): KeyringPair$Json =>
-      json,
-    type: 'ed25519',
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    unlock: (passphrase?: string): void =>
-      undefined,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    verify: (message: Uint8Array, signature: Uint8Array): boolean =>
-      false,
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    vrfSign: (message: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array =>
-      new Uint8Array(96),
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    vrfVerify: (message: Uint8Array, vrfResult: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): boolean =>
-      false
-  };
+const pair: KeyringPair = {
+  address,
+  addressRaw: publicKey,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  decodePkcs8: (passphrase?: string, encoded?: Uint8Array): void =>
+    undefined,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  decryptMessage: (encryptedMessageWithNonce: string | Uint8Array, senderPublicKey: string | Uint8Array): Uint8Array | null =>
+    null,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  derive: (suri: string, meta?: KeyringPair$Meta): KeyringPair =>
+    pair,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  encodePkcs8: (passphrase?: string): Uint8Array =>
+    new Uint8Array(0),
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  encryptMessage: (message: string | Uint8Array, recipientPublicKey: string | Uint8Array, _nonce?: Uint8Array): Uint8Array =>
+    new Uint8Array(),
+  isLocked: true,
+  lock: (): void => {
+    // no locking, it is always locked
+  },
+  meta,
+  publicKey,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  setMeta: (meta: KeyringPair$Meta): void =>
+    undefined,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  sign: (message: Uint8Array): Uint8Array =>
+    new Uint8Array(64),
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  toJson: (passphrase?: string): KeyringPair$Json =>
+    json,
+  type: 'ed25519',
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  unlock: (passphrase?: string): void =>
+    undefined,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  verify: (message: Uint8Array, signature: Uint8Array): boolean =>
+    false,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  vrfSign: (message: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array =>
+    new Uint8Array(96),
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  vrfVerify: (message: Uint8Array, vrfResult: Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): boolean =>
+    false
+};
 
+export function nobody (): KeyringPair {
   return pair;
 }

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

@@ -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';

packages/keyring/src/pair/toJson.ts

@@ -1,9 +1,10 @@
-// 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';
 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
-  };
+  });
 }

packages/keyring/src/pair/types.ts

@@ -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 {

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

@@ -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 => {

packages/keyring/src/pairs.ts

@@ -1,6 +1,7 @@
-// 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';
 import type { KeyringPair, KeyringPairs } from './types';
 
 import { assert, isHex, isU8a, u8aToHex, u8aToU8a } from '@polkadot/util';
@@ -21,7 +22,7 @@ export class Pairs implements KeyringPairs {
     return Object.values(this.#map);
   }
 
-  public get (address: string | Uint8Array): KeyringPair {
+  public get (address: HexString | string | Uint8Array): KeyringPair {
     const pair = this.#map[decodeAddress(address).toString()];
 
     assert(pair, () => `Unable to retrieve keypair '${
@@ -33,7 +34,7 @@ export class Pairs implements KeyringPairs {
     return pair;
   }
 
-  public remove (address: string | Uint8Array): void {
+  public remove (address: HexString | string | Uint8Array): void {
     delete this.#map[decodeAddress(address).toString()];
   }
 }

packages/keyring/src/suri.spec.ts

@@ -1,14 +1,17 @@
-// 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
 
+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);

packages/keyring/src/testing.ts

@@ -1,18 +1,18 @@
-// 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';
 import { createPair } from './pair';
-import Keyring from '.';
 
 interface PairDef {
   name?: string;
   publicKey: Uint8Array;
-  seed: string;
+  seed?: string;
   secretKey?: Uint8Array;
   type: KeypairType
 }
@@ -77,46 +77,49 @@ 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'
   }
 ];
 
+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
@@ -125,14 +128,13 @@ 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;
 
-  pairs.forEach(({ name, publicKey, secretKey, seed, type }): void => {
-    const meta = {
-      isTesting: true,
-      name: name || seed.replace('//', '_').toLowerCase()
-    };
-    const pair = !isDerived && !name
+  for (const { name, publicKey, secretKey, seed, type } of pairs) {
+    const meta = createMeta(name, seed);
+    const pair = !isDerived && !name && seed
       ? keyring.addFromUri(seed, meta, options.type)
       : keyring.addPair(
         createPair({ toSS58: keyring.encodeAddress, type }, { publicKey, secretKey }, meta)
@@ -141,7 +143,7 @@ export function createTestKeyring (options: KeyringOptions = {}, isDerived = tru
     pair.lock = (): void => {
       // we don't have lock/unlock functionality here
     };
-  });
+  }
 
   return keyring;
 }

packages/keyring/src/testingPairs.spec.ts

@@ -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';
@@ -65,7 +65,9 @@ describe('testingPairs', (): void => {
     delete ring.nobody;
 
     Object.keys(ring).forEach((testKeyring, i) => {
-      if (i < 6) { expect(u8aToHex(ring[testKeyring].publicKey)).toEqual(u8aToHex(keyring.createFromUri(privKeys[i]).publicKey)); }
+      if (i < 6) {
+        expect(u8aToHex(ring[testKeyring].publicKey)).toEqual(u8aToHex(keyring.createFromUri(privKeys[i]).publicKey));
+      }
     });
   });
 });

packages/keyring/src/testingPairs.ts

@@ -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';
@@ -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;
 }

packages/keyring/src/types.ts

@@ -1,23 +1,31 @@
-// Copyright 2017-2021 @polkadot/keyring authors & contributors
+// Copyright 2017-2022 @polkadot/keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Prefix } from '@polkadot/util-crypto/address/types';
-import type { EncryptedJson } from '@polkadot/util-crypto/json/types';
-import type { Keypair, KeypairType } from '@polkadot/util-crypto/types';
+import type { HexString } from '@polkadot/util/types';
+import type { EncryptedJson, Keypair, KeypairType, Prefix } from '@polkadot/util-crypto/types';
 
 export interface KeyringOptions {
+  /**
+   * @description The ss58Format to use for address encoding (defaults to 42)
+   */
   ss58Format?: Prefix;
+  /**
+   * @description The type of keyring to create (defaults to ed25519)
+   */
   type?: KeypairType;
 }
 
 export type KeyringPair$Meta = Record<string, unknown>;
 
 export interface KeyringPair$Json extends EncryptedJson {
-  address: string;
+  address: string | HexString;
   meta: KeyringPair$Meta;
 }
 
 export interface SignOptions {
+  /**
+   * @description Create a MultiSignature-compatible output with an indicator type
+   **/
   withType?: boolean;
 }
 
@@ -34,12 +42,14 @@ export interface KeyringPair {
   encodePkcs8 (passphrase?: string): Uint8Array;
   lock (): void;
   setMeta (meta: KeyringPair$Meta): void;
-  sign (message: string | Uint8Array, options?: SignOptions): Uint8Array;
+  sign (message: HexString | string | Uint8Array, options?: SignOptions): Uint8Array;
   toJson (passphrase?: string): KeyringPair$Json;
   unlock (passphrase?: string): void;
-  verify (message: string | Uint8Array, signature: Uint8Array, signerPublic: string | Uint8Array): boolean;
-  vrfSign (message: string | Uint8Array, context?: string | Uint8Array, extra?: string | Uint8Array): Uint8Array;
-  vrfVerify (message: string | Uint8Array, vrfResult: Uint8Array, signerPublic: Uint8Array | string, context?: string | Uint8Array, extra?: string | Uint8Array): boolean;
+  encryptMessage (message: HexString | string | Uint8Array, recipientPublicKey: HexString | string | Uint8Array, nonce?: Uint8Array): Uint8Array;
+  decryptMessage (encryptedMessageWithNonce: HexString | string | Uint8Array, senderPublicKey: HexString | string | Uint8Array): Uint8Array | null;
+  verify (message: HexString | string | Uint8Array, signature: Uint8Array, signerPublic: HexString | string | Uint8Array): boolean;
+  vrfSign (message: HexString | string | Uint8Array, context?: HexString | string | Uint8Array, extra?: HexString | string | Uint8Array): Uint8Array;
+  vrfVerify (message: HexString | string | Uint8Array, vrfResult: Uint8Array, signerPublic: HexString | Uint8Array | string, context?: HexString | string | Uint8Array, extra?: HexString | string | Uint8Array): boolean;
 }
 
 export interface KeyringPairs {

packages/keyring/tsconfig.build.json

@@ -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" }
+  ]
+}

packages/networks/README.md

@@ -2,4 +2,4 @@
 
 A list of all available Substrate networks and their applicable prefixes.
 
-This list is periodically checked against the master list available at https://github.com/paritytech/substrate/blob/master/ss58-registry.json
+This list is periodically checked against the master list available at https://github.com/paritytech/ss58-registry/blob/main/ss58-registry.json

packages/networks/package.json

@@ -1,25 +1,31 @@
 {
-  "name": "@polkadot/networks",
-  "version": "7.0.2",
-  "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": "9.3.1",
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.14.6"
+    "@babel/runtime": "^7.18.3",
+    "@polkadot/util": "9.3.1",
+    "@substrate/ss58-registry": "^1.20.0"
   },
   "devDependencies": {
-    "@polkadot/util": "7.0.2",
-    "@polkadot/x-fetch": "7.0.2"
+    "@polkadot/hw-ledger": "9.3.1",
+    "@polkadot/x-fetch": "9.3.1"
   }
 }

packages/networks/scripts/fromSubstrate.mjs

@@ -1,59 +0,0 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import fs from 'fs';
-import fetch from 'node-fetch';
-
-const SUBSTRATE_REGISTRY = 'https://raw.githubusercontent.com/paritytech/substrate/master/ss58-registry.json';
-
-function outputField (v) {
-  if (typeof v === 'string') {
-    return `'${v}'`;
-  } else if (Array.isArray(v)) {
-    return `[${v.map((v) => outputField(v)).join(', ')}]`;
-  }
-
-  return v;
-}
-
-async function getSubstrateRegistry () {
-  const original = await fetch(SUBSTRATE_REGISTRY);
-  const json = await original.json();
-
-  return json.registry
-    .map((e) =>
-      `  {\n${Object
-        .entries(e)
-        .sort(([a], [b]) => a.localeCompare(b))
-        .map(([k, v]) => `    ${k}: ${outputField(v)}`)
-        .join(',\n')}\n  }`
-    )
-    .join(',\n');
-}
-
-getSubstrateRegistry()
-  .then((entries) => {
-    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
-//
-
-import type { KnownSubstrate } from './types';
-
-export const knownSubstrate: KnownSubstrate[] = [\n${entries}\n];
-`);
-
-    console.log('Completed.');
-
-    process.exit(0);
-  })
-  .catch((error) => {
-    console.error('Error:', error.message);
-
-    process.exit(-1);
-  });

packages/networks/src/crosscheck.spec.ts

@@ -1,17 +1,17 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @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 { allNetworks } from './';
 
+const REGISTRY = 'https://raw.githubusercontent.com/paritytech/ss58-registry/main/ss58-registry.json';
 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(REGISTRY)).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])
+            )
             : []
         ];
       })

packages/networks/src/defaults.spec.ts

@@ -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([]);
+    });
   });
 });

packages/networks/src/defaults.ts

@@ -1,87 +0,0 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-import type { KnownGenesis, KnownIcon, KnownLedger, KnownTestnet } 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 = {
-  centrifuge: [
-    '0x67dddf2673b69e5f875f6f25277495834398eafd67f492e09f3f3345e003d1b5'
-  ],
-  'dock-mainnet': [
-    '0xf73467c6544aa68df2ee546b135f955c46b90fa627e9b5d7935f41061bb8a5a9'
-  ],
-  edgeware: [
-    '0x742a2ca70c2fda6cee4f8df98d64c4c670a052d9568058982dad9d5a7a135c5b'
-  ],
-  equilibrium: [
-    '0x6f1a800de3daff7f5e037ddf66ab22ce03ab91874debeddb1086f5f7dbd48925'
-  ],
-  hydradx: [
-    '0xd2a620c27ec5cbc5621ff9a522689895074f7cca0d08e7134a7804e1a3ba86fc', // Snakenet Gen3-1
-    '0x10af6e84234477d84dc572bac0789813b254aa490767ed06fb9591191d1073f9', // Snakenet Gen3
-    '0x3d75507dd46301767e601265791da1d9cb47b6ebc94e87347b635e5bf58bd047', // Snakenet Gen2
-    '0x0ed32bfcab4a83517fac88f2aa7cbc2f88d3ab93be9a12b6188a036bf8a943c2' // Snakenet Gen1
-  ],
-  karura: [
-    '0xbaf5aabe40646d11f0ee8abbdc64f4a4b7674925cba08e4a05ff9ebed6e2126b'
-  ],
-  kulupu: [
-    '0xf7a99d3cb92853d00d5275c971c132c074636256583fee53b3bbe60d7b8769ba'
-  ],
-  kusama: [
-    '0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe', // Kusama CC3,
-    '0xe3777fa922cafbff200cadeaea1a76bd7898ad5b89f7848999058b50e715f636', // Kusama CC2
-    '0x3fd7b9eb6a00376e5be61f01abb429ffb0b104be05eaff4d458da48fcd425baf' // Kusama CC1
-  ],
-  plasm: [
-    '0x3e86364d4b4894021cb2a0390bcf2feb5517d5292f2de2bb9404227e908b0b8b'
-  ],
-  polkadot: [
-    '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'
-  ],
-  polymesh: [
-    '0x9deeb940c92ae02111c3bd5baca89970384f4c9849f02a1b2e53e66414d30f9f'
-  ],
-  statemine: [
-    '0x48239ef607d7928874027a43a67689209727dfb3d3dc5e5b03a39bdc2eda771a'
-  ],
-  subsocial: [
-    '0x0bd72c1c305172e1275278aaeb3f161e02eccb7a819e63f62d47bd53a28189f8'
-  ]
-};
-
-// these are icon overrides
-export const knownIcon: KnownIcon = {
-  centrifuge: 'polkadot',
-  kusama: 'polkadot',
-  polkadot: 'polkadot',
-  statemine: 'polkadot',
-  statemint: 'polkadot',
-  westmint: 'polkadot'
-};
-
-// These match up with the keys of the ledgerApps object in the @polkadot/hw-ledger/defaults.ts
-// and maps to the known slip44 (minus the `0x8` hard derivation flag)
-// NOTE: Any network here needs to have a genesisHash attached in the config above
-export const knownLedger: KnownLedger = {
-  centrifuge: 0x000002eb,
-  'dock-mainnet': 0x00000252,
-  edgeware: 0x0000020b,
-  equilibrium: 0x05f5e0fd,
-  kusama: 0x000001b2,
-  polkadot: 0x00000162,
-  polymesh: 0x00000253,
-  statemine: 0x000001b2 // common-good on Kusama, shares derivation
-};
-
-// testnets should not allow selection
-export const knownTestnet: KnownTestnet = {
-  'dock-testnet': true,
-  jupiter: true,
-  'mathchain-testnet': true,
-  'zero-alphaville': true
-};

packages/networks/src/defaults/genesis.ts

@@ -0,0 +1,109 @@
+// 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'
+  ],
+  astar: [
+    '0x9eb76c5184c4ab8679d2d5d819fdf90b9c001403e9e17da2e14b6d8aec4029c6'
+  ],
+  basilisk: [
+    '0xa85cfb9b9fd4d622a5b28289a02347af987d8f73fa3108450e2b4a11c1ce5755'
+  ],
+  bifrost: [
+    '0x9f28c6a68e0fc9646eff64935684f6eeeece527e37bbe1f213d22caa1d9d6bed'
+  ],
+  centrifuge: [
+    '0x67dddf2673b69e5f875f6f25277495834398eafd67f492e09f3f3345e003d1b5'
+  ],
+  'dock-mainnet': [
+    '0x6bfe24dca2a3be10f22212678ac13a6446ec764103c0f3471c71609eac384aae',
+    '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-para': [
+    '0x97da7ede98d7bad4e36b4d734b6055425a3be036da2a332ea5a7037656427a21'
+  ],
+  parallel: [
+    '0xe61a41c53f5dcd0beb09df93b34402aada44cb05117b71059cce40a2723a4e97'
+  ],
+  picasso: [
+    '0xe8e7f0f4c4f5a00720b4821dbfddefea7490bcf0b19009961cc46957984e2c1c'
+  ],
+  polkadex: [
+    '0x3920bcb4960a1eef5580cd5367ff3f430eef052774f78468852f7b9cb39f8a3c'
+  ],
+  polkadot: [
+    '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'
+  ],
+  polymesh: [
+    '0x6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063'
+  ],
+  rococo: [
+    '0x6408de7737c59c238890533af25896a2c20608d8b380bb01029acb392781063e',
+    '0xaaf2cd1b74b5f726895921259421b534124726263982522174147046b8827897',
+    '0x037f5f3c8e67b314062025fc886fcd6238ea25a4a9b45dce8d246815c9ebe770',
+    '0xc196f81260cf1686172b47a79cf002120735d7cb0eb1474e8adce56618456fff',
+    '0xf6e9983c37baf68846fedafe21e56718790e39fb1c582abc408b81bc7b208f9a',
+    '0x5fce687da39305dfe682b117f0820b319348e8bb37eb16cf34acbf6a202de9d9',
+    '0xe7c3d5edde7db964317cd9b51a3a059d7cd99f81bdbce14990047354334c9779',
+    '0x1611e1dbf0405379b861e2e27daa90f480b2e6d3682414a80835a52e8cb8a215',
+    '0x343442f12fa715489a8714e79a7b264ea88c0d5b8c66b684a7788a516032f6b9',
+    '0x78bcd530c6b3a068bc17473cf5d2aff9c287102bed9af3ae3c41c33b9d6c6147',
+    '0x47381ee0697153d64404fc578392c8fd5cba9073391908f46c888498415647bd',
+    '0x19c0e4fa8ab75f5ac7865e0b8f74ff91eb9a100d336f423cd013a8befba40299'
+  ],
+  sora: [
+    '0x7e4e32d0feafd4f9c9414b0be86373f9a1efa904809b683453a9af6856d38ad5'
+  ],
+  stafi: [
+    '0x290a4149f09ea0e402c74c1c7e96ae4239588577fe78932f94f5404c68243d80'
+  ],
+  statemine: [
+    '0x48239ef607d7928874027a43a67689209727dfb3d3dc5e5b03a39bdc2eda771a'
+  ],
+  statemint: [
+    '0x68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f'
+  ],
+  subsocial: [
+    '0x0bd72c1c305172e1275278aaeb3f161e02eccb7a819e63f62d47bd53a28189f8'
+  ],
+  westend: [
+    '0xe143f23803ac50e8f6f8e62695d1ce9e4e1d68aa36c1cd2cfd15340213f3423e'
+  ],
+  xxnetwork: [
+    '0x50dd5d206917bf10502c68fb4d18a59fc8aa31586f4e8856b493e43544aa82aa'
+  ]
+};

packages/networks/src/defaults/icons.ts

@@ -0,0 +1,15 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { KnownIcon } from '../types';
+
+// these are icon overrides
+export const knownIcon: KnownIcon = {
+  centrifuge: 'polkadot',
+  kusama: 'polkadot',
+  polkadot: 'polkadot',
+  sora: 'polkadot',
+  statemine: 'polkadot',
+  statemint: 'polkadot',
+  westmint: 'polkadot'
+};

packages/networks/src/defaults/index.ts

@@ -0,0 +1,7 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+export { knownGenesis } from './genesis';
+export { knownIcon } from './icons';
+export { knownLedger } from './ledger';
+export { knownTestnet } from './testnets';

packages/networks/src/defaults/ledger.ts

@@ -0,0 +1,30 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { KnownLedger } from '../types';
+
+// These match up with the keys of the ledgerApps object in the @polkadot/hw-ledger/defaults.ts
+// and maps to the known slip44 (minus the `0x8` hard derivation flag)
+//
+// NOTE: Any network here needs to have a genesisHash attached in the ./genesis.ts config
+export const knownLedger: KnownLedger = {
+  acala: 0x00000313,
+  astar: 0x0000032a,
+  bifrost: 0x00000314,
+  centrifuge: 0x000002eb,
+  'dock-mainnet': 0x00000252,
+  edgeware: 0x0000020b,
+  equilibrium: 0x05f5e0fd,
+  genshiro: 0x05f5e0fc,
+  karura: 0x000002ae,
+  kusama: 0x000001b2,
+  'nodle-para': 0x000003eb,
+  parallel: 0x00000162,
+  polkadex: 0x0000031f,
+  polkadot: 0x00000162,
+  polymesh: 0x00000253,
+  sora: 0x00000269,
+  statemine: 0x000001b2, // common-good on Kusama, shares derivation
+  statemint: 0x00000162, // common-good on Polkadot, shares derivation
+  xxnetwork: 0x000007a3
+};

packages/networks/src/defaults/testnets.ts

@@ -0,0 +1,15 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { KnownTestnet } from '../types';
+
+// 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
+};

packages/networks/src/detectOther.ts

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

packages/networks/src/detectPackage.ts

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

packages/networks/src/index.spec.ts

@@ -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 => {
@@ -63,6 +68,28 @@ describe('selectableNetworks', (): void => {
     ).toEqual([]);
   });
 
+  it('has all the correct fields', (): void => {
+    expect(availableNetworks[0]).toEqual({
+      decimals: [10],
+      displayName: 'Polkadot Relay Chain',
+      genesisHash: [
+        '0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3'
+      ],
+      hasLedgerSupport: true,
+      icon: 'polkadot',
+      isIgnored: false,
+      isTestnet: false,
+      network: 'polkadot',
+      prefix: 0,
+      slip44: 354,
+      standardAccount: '*25519',
+      symbols: ['DOT'],
+      website: 'https://polkadot.network'
+    });
+  });
+});
+
+describe('allNetworks', (): void => {
   it('has no ss58 duplicates', (): void => {
     const dupes: SubstrateNetwork[] = [];
     const uniques: SubstrateNetwork[] = [];
@@ -78,3 +105,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('xx network');
+  });
+});

packages/networks/src/index.ts

@@ -1,46 +1,9 @@
-// Copyright 2017-2021 @polkadot/networks authors & contributors
+// Copyright 2017-2022 @polkadot/networks authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Network, SubstrateNetwork } from './types';
-
-import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
-import { knownSubstrate } from './substrate';
+// TODO: This was removed, really cannot recall the reason...
+// ... put it back, but keep it removed
+// import './detectPackage';
 
+export * from './interfaces';
 export { packageInfo } from './packageInfo';
-
-// These are known prefixes that are not sorted
-const UNSORTED = [0, 2, 42];
-
-export const allNetworks = knownSubstrate.map((o): SubstrateNetwork => {
-  const network = o.network || '';
-  const n = o as SubstrateNetwork;
-
-  n.slip44 = knownLedger[network];
-  n.hasLedgerSupport = !!n.slip44;
-
-  n.genesisHash = knownGenesis[network] || [];
-  n.icon = knownIcon[network] || 'substrate';
-  n.isIgnored = !network || !!knownTestnet[network] || network.startsWith('reserved');
-
-  return n;
-});
-
-// The list of available/claimed prefixes
-//   - no testnets
-//   - we only include those where we have a standardAccount
-//   - when no icon has been specified, default to substrate
-//   - sort by name, however we keep 0, 2, 42 first in the list
-export const 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)
-  );
-
-// A filtered list of those chains we have details about (genesisHashes)
-export const selectableNetworks = availableNetworks.filter((n) => n.genesisHash.length || n.prefix === 42);

packages/networks/src/interfaces.ts

@@ -0,0 +1,72 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import type { KnownSubstrate, Network, SubstrateNetwork } from './types';
+
+import knownSubstrate from '@substrate/ss58-registry';
+
+import { knownGenesis, knownIcon, knownLedger, knownTestnet } from './defaults';
+
+// These are known prefixes that are not sorted
+const UNSORTED = [0, 2, 42];
+const TESTNETS = ['testnet'];
+
+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';
+
+  // filtering
+  n.isTestnet = !!knownTestnet[network] || TESTNETS.includes(nameParts[nameParts.length - 1]);
+  n.isIgnored = n.isTestnet || (
+    !(
+      o.standardAccount &&
+      o.decimals && o.decimals.length &&
+      o.symbols && o.symbols.length
+    ) &&
+    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
+    ? isUnSortedA
+      ? 0
+      : a.displayName.localeCompare(b.displayName)
+    : isUnSortedA
+      ? -1
+      : 1;
+}
+
+// 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(filterAvailable).sort(sortNetworks);
+
+// A filtered list of those chains we have details about (genesisHashes)
+export const selectableNetworks = availableNetworks.filter(filterSelectable);

packages/networks/src/packageInfo.ts

@@ -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.0.2' };
+export const packageInfo = { name: '@polkadot/networks', path: 'auto', type: 'auto', version: '9.3.1' };

packages/networks/src/ss58registry.spec.ts

@@ -0,0 +1,26 @@
+// Copyright 2017-2022 @polkadot/networks authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import known from '@substrate/ss58-registry';
+import fs from 'fs';
+import path from 'path';
+
+import other from './test/ss58registry.test.json';
+
+describe('@substrate/ss58-registry', (): void => {
+  it('has known values', (): void => {
+    const json = JSON.stringify(known, null, 2);
+
+    try {
+      expect(JSON.parse(json)).toEqual(other);
+    } catch (error) {
+      if (process.env.GITHUB_REPOSITORY) {
+        console.error(json);
+
+        throw error;
+      }
+
+      fs.writeFileSync(path.join(__dirname, './test/ss58registry.test.json'), json, { flag: 'w' });
+    }
+  });
+});

packages/networks/src/substrate.ts

@@ -1,599 +0,0 @@
-// 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
-//
-
-import type { KnownSubstrate } from './types';
-
-export const knownSubstrate: KnownSubstrate[] = [
-  {
-    decimals: [10],
-    displayName: 'Polkadot Relay Chain',
-    network: 'polkadot',
-    prefix: 0,
-    standardAccount: '*25519',
-    symbols: ['DOT'],
-    website: 'https://polkadot.network'
-  },
-  {
-    decimals: null,
-    displayName: 'Bare 32-bit Schnorr/Ristretto (S/R 25519) public key.',
-    network: null,
-    prefix: 1,
-    standardAccount: null,
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [12],
-    displayName: 'Kusama Relay Chain',
-    network: 'kusama',
-    prefix: 2,
-    standardAccount: '*25519',
-    symbols: ['KSM'],
-    website: 'https://kusama.network'
-  },
-  {
-    decimals: null,
-    displayName: 'Bare 32-bit Ed25519 public key.',
-    network: null,
-    prefix: 3,
-    standardAccount: null,
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: null,
-    displayName: 'Katal Chain',
-    network: 'katalchain',
-    prefix: 4,
-    standardAccount: '*25519',
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [15],
-    displayName: 'Plasm Network',
-    network: 'plasm',
-    prefix: 5,
-    standardAccount: '*25519',
-    symbols: ['PLM'],
-    website: 'https://plasmnet.io'
-  },
-  {
-    decimals: [12],
-    displayName: 'Bifrost',
-    network: 'bifrost',
-    prefix: 6,
-    standardAccount: '*25519',
-    symbols: ['BNC'],
-    website: 'https://bifrost.finance/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Edgeware',
-    network: 'edgeware',
-    prefix: 7,
-    standardAccount: '*25519',
-    symbols: ['EDG'],
-    website: 'https://edgewa.re'
-  },
-  {
-    decimals: [12],
-    displayName: 'Karura',
-    network: 'karura',
-    prefix: 8,
-    standardAccount: '*25519',
-    symbols: ['KAR'],
-    website: 'https://karura.network/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Laminar Reynolds Canary',
-    network: 'reynolds',
-    prefix: 9,
-    standardAccount: '*25519',
-    symbols: ['REY'],
-    website: 'http://laminar.network/'
-  },
-  {
-    decimals: [12],
-    displayName: 'Acala',
-    network: 'acala',
-    prefix: 10,
-    standardAccount: '*25519',
-    symbols: ['ACA'],
-    website: 'https://acala.network/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Laminar',
-    network: 'laminar',
-    prefix: 11,
-    standardAccount: '*25519',
-    symbols: ['LAMI'],
-    website: 'http://laminar.network/'
-  },
-  {
-    decimals: [6],
-    displayName: 'Polymesh',
-    network: 'polymesh',
-    prefix: 12,
-    standardAccount: '*25519',
-    symbols: ['POLYX'],
-    website: 'https://polymath.network/'
-  },
-  {
-    decimals: null,
-    displayName: 'SubstraTEE',
-    network: 'substratee',
-    prefix: 13,
-    standardAccount: '*25519',
-    symbols: null,
-    website: 'https://www.substratee.com'
-  },
-  {
-    decimals: [0],
-    displayName: 'Totem',
-    network: 'totem',
-    prefix: 14,
-    standardAccount: '*25519',
-    symbols: ['XTX'],
-    website: 'https://totemaccounting.com'
-  },
-  {
-    decimals: [12],
-    displayName: 'Synesthesia',
-    network: 'synesthesia',
-    prefix: 15,
-    standardAccount: '*25519',
-    symbols: ['SYN'],
-    website: 'https://synesthesia.network/'
-  },
-  {
-    decimals: [12],
-    displayName: 'Kulupu',
-    network: 'kulupu',
-    prefix: 16,
-    standardAccount: '*25519',
-    symbols: ['KLP'],
-    website: 'https://kulupu.network/'
-  },
-  {
-    decimals: null,
-    displayName: 'Dark Mainnet',
-    network: 'dark',
-    prefix: 17,
-    standardAccount: '*25519',
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [9, 9],
-    displayName: 'Darwinia Network',
-    network: 'darwinia',
-    prefix: 18,
-    standardAccount: '*25519',
-    symbols: ['RING', 'KTON'],
-    website: 'https://darwinia.network/'
-  },
-  {
-    decimals: [12],
-    displayName: 'GeekCash',
-    network: 'geek',
-    prefix: 19,
-    standardAccount: '*25519',
-    symbols: ['GEEK'],
-    website: 'https://geekcash.org'
-  },
-  {
-    decimals: [12],
-    displayName: 'Stafi',
-    network: 'stafi',
-    prefix: 20,
-    standardAccount: '*25519',
-    symbols: ['FIS'],
-    website: 'https://stafi.io'
-  },
-  {
-    decimals: [6],
-    displayName: 'Dock Testnet',
-    network: 'dock-testnet',
-    prefix: 21,
-    standardAccount: '*25519',
-    symbols: ['DCK'],
-    website: 'https://dock.io'
-  },
-  {
-    decimals: [6],
-    displayName: 'Dock Mainnet',
-    network: 'dock-mainnet',
-    prefix: 22,
-    standardAccount: '*25519',
-    symbols: ['DCK'],
-    website: 'https://dock.io'
-  },
-  {
-    decimals: null,
-    displayName: 'ShiftNrg',
-    network: 'shift',
-    prefix: 23,
-    standardAccount: '*25519',
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [18],
-    displayName: 'ZERO',
-    network: 'zero',
-    prefix: 24,
-    standardAccount: '*25519',
-    symbols: ['PLAY'],
-    website: 'https://zero.io'
-  },
-  {
-    decimals: [18],
-    displayName: 'ZERO Alphaville',
-    network: 'zero-alphaville',
-    prefix: 25,
-    standardAccount: '*25519',
-    symbols: ['PLAY'],
-    website: 'https://zero.io'
-  },
-  {
-    decimals: [10],
-    displayName: 'Jupiter',
-    network: 'jupiter',
-    prefix: 26,
-    standardAccount: '*25519',
-    symbols: ['jDOT'],
-    website: 'https://jupiter.patract.io'
-  },
-  {
-    decimals: null,
-    displayName: 'Subsocial',
-    network: 'subsocial',
-    prefix: 28,
-    standardAccount: '*25519',
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [18],
-    displayName: 'Dhiway CORD Network',
-    network: 'cord',
-    prefix: 29,
-    standardAccount: '*25519',
-    symbols: ['DCU'],
-    website: 'https://dhiway.com/'
-  },
-  {
-    decimals: [12],
-    displayName: 'Phala Network',
-    network: 'phala',
-    prefix: 30,
-    standardAccount: '*25519',
-    symbols: ['PHA'],
-    website: 'https://phala.network'
-  },
-  {
-    decimals: [12],
-    displayName: 'Litentry Network',
-    network: 'litentry',
-    prefix: 31,
-    standardAccount: '*25519',
-    symbols: ['LIT'],
-    website: 'https://litentry.com/'
-  },
-  {
-    decimals: [9],
-    displayName: 'Robonomics',
-    network: 'robonomics',
-    prefix: 32,
-    standardAccount: '*25519',
-    symbols: ['XRT'],
-    website: 'https://robonomics.network'
-  },
-  {
-    decimals: null,
-    displayName: 'DataHighway',
-    network: 'datahighway',
-    prefix: 33,
-    standardAccount: '*25519',
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [12],
-    displayName: 'Ares Protocol',
-    network: 'ares',
-    prefix: 34,
-    standardAccount: '*25519',
-    symbols: ['ARES'],
-    website: 'https://www.aresprotocol.com/'
-  },
-  {
-    decimals: [15],
-    displayName: 'Valiu Liquidity Network',
-    network: 'vln',
-    prefix: 35,
-    standardAccount: '*25519',
-    symbols: ['USDv'],
-    website: 'https://valiu.com/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Centrifuge Chain',
-    network: 'centrifuge',
-    prefix: 36,
-    standardAccount: '*25519',
-    symbols: ['CFG'],
-    website: 'https://centrifuge.io/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Nodle Chain',
-    network: 'nodle',
-    prefix: 37,
-    standardAccount: '*25519',
-    symbols: ['NODL'],
-    website: 'https://nodle.io/'
-  },
-  {
-    decimals: [18],
-    displayName: 'KILT Chain',
-    network: 'kilt',
-    prefix: 38,
-    standardAccount: '*25519',
-    symbols: ['KILT'],
-    website: 'https://kilt.io/'
-  },
-  {
-    decimals: [18],
-    displayName: 'MathChain mainnet',
-    network: 'mathchain',
-    prefix: 39,
-    standardAccount: '*25519',
-    symbols: ['MATH'],
-    website: 'https://mathwallet.org'
-  },
-  {
-    decimals: [18],
-    displayName: 'MathChain testnet',
-    network: 'mathchain-testnet',
-    prefix: 40,
-    standardAccount: '*25519',
-    symbols: ['MATH'],
-    website: 'https://mathwallet.org'
-  },
-  {
-    decimals: null,
-    displayName: 'Polimec Chain',
-    network: 'poli',
-    prefix: 41,
-    standardAccount: '*25519',
-    symbols: null,
-    website: 'https://polimec.io/'
-  },
-  {
-    decimals: null,
-    displayName: 'Substrate',
-    network: 'substrate',
-    prefix: 42,
-    standardAccount: '*25519',
-    symbols: null,
-    website: 'https://substrate.dev/'
-  },
-  {
-    decimals: null,
-    displayName: 'Bare 32-bit ECDSA SECP-256k1 public key.',
-    network: null,
-    prefix: 43,
-    standardAccount: null,
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [8],
-    displayName: 'ChainX',
-    network: 'chainx',
-    prefix: 44,
-    standardAccount: '*25519',
-    symbols: ['PCX'],
-    website: 'https://chainx.org/'
-  },
-  {
-    decimals: [12, 12],
-    displayName: 'UniArts Network',
-    network: 'uniarts',
-    prefix: 45,
-    standardAccount: '*25519',
-    symbols: ['UART', 'UINK'],
-    website: 'https://uniarts.me'
-  },
-  {
-    decimals: null,
-    displayName: 'This prefix is reserved.',
-    network: 'reserved46',
-    prefix: 46,
-    standardAccount: null,
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: null,
-    displayName: 'This prefix is reserved.',
-    network: 'reserved47',
-    prefix: 47,
-    standardAccount: null,
-    symbols: null,
-    website: null
-  },
-  {
-    decimals: [12],
-    displayName: 'Neatcoin Mainnet',
-    network: 'neatcoin',
-    prefix: 48,
-    standardAccount: '*25519',
-    symbols: ['NEAT'],
-    website: 'https://neatcoin.org'
-  },
-  {
-    decimals: [12],
-    displayName: 'HydraDX',
-    network: 'hydradx',
-    prefix: 63,
-    standardAccount: '*25519',
-    symbols: ['HDX'],
-    website: 'https://hydradx.io'
-  },
-  {
-    decimals: [18],
-    displayName: 'AvN Mainnet',
-    network: 'aventus',
-    prefix: 65,
-    standardAccount: '*25519',
-    symbols: ['AVT'],
-    website: 'https://aventus.io'
-  },
-  {
-    decimals: [12],
-    displayName: 'Crust Network',
-    network: 'crust',
-    prefix: 66,
-    standardAccount: '*25519',
-    symbols: ['CRU'],
-    website: 'https://crust.network'
-  },
-  {
-    decimals: [0, 9, 9, 9, 9, 9, 9, 9],
-    displayName: 'Equilibrium Network',
-    network: 'equilibrium',
-    prefix: 67,
-    standardAccount: '*25519',
-    symbols: ['Unknown', 'USD', 'EQ', 'ETH', 'BTC', 'EOS', 'DOT', 'CRV'],
-    website: 'https://equilibrium.io'
-  },
-  {
-    decimals: [18],
-    displayName: 'SORA Network',
-    network: 'sora',
-    prefix: 69,
-    standardAccount: '*25519',
-    symbols: ['XOR'],
-    website: 'https://sora.org'
-  },
-  {
-    decimals: [12],
-    displayName: 'Manta network',
-    network: 'manta',
-    prefix: 77,
-    standardAccount: '*25519',
-    symbols: ['MA'],
-    website: 'https://manta.network'
-  },
-  {
-    decimals: [12],
-    displayName: 'Calamari: Manta Canary Network',
-    network: 'calamari',
-    prefix: 78,
-    standardAccount: '*25519',
-    symbols: ['KMA'],
-    website: 'https://manta.network'
-  },
-  {
-    decimals: [18],
-    displayName: 'PolkaSmith Canary Network',
-    network: 'polkasmith',
-    prefix: 98,
-    standardAccount: '*25519',
-    symbols: ['PKS'],
-    website: 'https://polkafoundry.com'
-  },
-  {
-    decimals: [18],
-    displayName: 'PolkaFoundry Network',
-    network: 'polkafoundry',
-    prefix: 99,
-    standardAccount: '*25519',
-    symbols: ['PKF'],
-    website: 'https://polkafoundry.com'
-  },
-  {
-    decimals: [18],
-    displayName: 'OriginTrail Parachain',
-    network: 'origintrail-parachain',
-    prefix: 101,
-    standardAccount: 'secp256k1',
-    symbols: ['TRAC'],
-    website: 'https://origintrail.io'
-  },
-  {
-    decimals: [12],
-    displayName: 'Heiko',
-    network: 'heiko',
-    prefix: 110,
-    standardAccount: '*25519',
-    symbols: ['HKO'],
-    website: 'https://parallel.fi/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Altair',
-    network: 'altair',
-    prefix: 136,
-    standardAccount: '*25519',
-    symbols: ['AIR'],
-    website: 'https://centrifuge.io/'
-  },
-  {
-    decimals: [12],
-    displayName: 'Parallel',
-    network: 'parallel',
-    prefix: 172,
-    standardAccount: '*25519',
-    symbols: ['PARA'],
-    website: 'https://parallel.fi/'
-  },
-  {
-    decimals: [18],
-    displayName: 'Social Network',
-    network: 'social-network',
-    prefix: 252,
-    standardAccount: '*25519',
-    symbols: ['NET'],
-    website: 'https://social.network'
-  },
-  {
-    decimals: [18],
-    displayName: 'Moonbeam',
-    network: 'moonbeam',
-    prefix: 1284,
-    standardAccount: 'secp256k1',
-    symbols: ['GLMR'],
-    website: 'https://moonbeam.network'
-  },
-  {
-    decimals: [18],
-    displayName: 'Moonriver',
-    network: 'moonriver',
-    prefix: 1285,
-    standardAccount: 'secp256k1',
-    symbols: ['MOVR'],
-    website: 'https://moonbeam.network'
-  },
-  {
-    decimals: [12],
-    displayName: 'Basilisk',
-    network: 'basilisk',
-    prefix: 10041,
-    standardAccount: '*25519',
-    symbols: ['BSX'],
-    website: 'https://bsx.fi'
-  }
-];

packages/networks/src/types.ts

@@ -1,17 +1,9 @@
-// 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';
+import type { RegistryEntry } from '@substrate/ss58-registry';
 
-export interface KnownSubstrate {
-  decimals: number[] | null,
-  displayName: string;
-  network: string | null;
-  prefix: number;
-  standardAccount: '*25519' | 'secp256k1' | null;
-  symbols: string[] | null;
-  website: string | null;
-}
+export type Icon = 'beachball' | 'empty' | 'jdenticon' | 'polkadot' | 'substrate';
 
 export type KnownIcon = Record<string, Icon>;
 
@@ -19,6 +11,8 @@ export type KnownLedger = Record<string, number>;
 
 export type KnownGenesis = Record<string, string[]>;
 
+export type KnownSubstrate = RegistryEntry;
+
 export type KnownTestnet = Record<string, true>;
 
 export interface SubstrateNetwork extends KnownSubstrate {
@@ -26,6 +20,7 @@ export interface SubstrateNetwork extends KnownSubstrate {
   hasLedgerSupport: boolean;
   icon: Icon;
   isIgnored: boolean;
+  isTestnet: boolean;
   slip44?: number | null;
 }
 
@@ -36,5 +31,5 @@ export interface Network extends SubstrateNetwork {
 export interface Ss58Registry {
   registry: KnownSubstrate[];
   specification: string;
-  schema: Record<string, string>;
+  schema: Record<keyof KnownSubstrate, string>;
 }

packages/networks/tsconfig.build.json

@@ -0,0 +1,18 @@
+{
+  "extends": "../../tsconfig.base.json",
+  "compilerOptions": {
+    "baseUrl": "..",
+    "outDir": "./build",
+    "resolveJsonModule": true,
+    "rootDir": "./src"
+  },
+  "include": [
+    "**/src/**/*.ts",
+    "**/test/*.json"
+  ],
+  "references": [
+    { "path": "../hw-ledger/tsconfig.build.json" },
+    { "path": "../util/tsconfig.build.json" },
+    { "path": "../x-fetch/tsconfig.build.json" }
+  ]
+}

packages/util-crypto/package.json

@@ -1,51 +1,50 @@
 {
-  "name": "@polkadot/util-crypto",
-  "version": "7.0.2",
-  "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",
-  "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",
+  "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": [
+    "./bundleInit.js",
+    "./bundleInit.cjs",
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
+  "type": "module",
+  "version": "9.3.1",
+  "browser": {
+    "crypto": false,
+    "stream": false
+  },
+  "main": "index.js",
   "dependencies": {
-    "@babel/runtime": "^7.14.6",
-    "@polkadot/networks": "7.0.2",
-    "@polkadot/util": "7.0.2",
-    "@polkadot/wasm-crypto": "^4.1.2",
-    "@polkadot/x-randomvalues": "7.0.2",
-    "base-x": "^3.0.8",
-    "base64-js": "^1.5.1",
-    "blakejs": "^1.1.1",
-    "bn.js": "^4.11.9",
-    "create-hash": "^1.2.0",
-    "elliptic": "^6.5.4",
-    "hash.js": "^1.1.7",
-    "js-sha3": "^0.8.0",
-    "scryptsy": "^2.1.0",
-    "tweetnacl": "^1.0.3",
-    "xxhashjs": "^0.2.2"
+    "@babel/runtime": "^7.18.3",
+    "@noble/hashes": "1.0.0",
+    "@noble/secp256k1": "1.5.5",
+    "@polkadot/networks": "9.3.1",
+    "@polkadot/util": "9.3.1",
+    "@polkadot/wasm-crypto": "^6.1.1",
+    "@polkadot/x-bigint": "9.3.1",
+    "@polkadot/x-randomvalues": "9.3.1",
+    "@scure/base": "1.0.0",
+    "ed2curve": "^0.3.0",
+    "tweetnacl": "^1.0.3"
   },
   "devDependencies": {
-    "@types/bn.js": "^4.11.6",
-    "@types/create-hash": "^1.2.2",
-    "@types/elliptic": "^6.4.13",
-    "@types/scryptsy": "^2.0.0",
-    "@types/xxhashjs": "^0.2.2"
+    "@types/ed2curve": "^0.2.2"
   },
   "peerDependencies": {
-    "@polkadot/util": "7.0.2"
+    "@polkadot/util": "9.3.1"
   }
 }

packages/util-crypto/src/address/addressToEvm.spec.ts

@@ -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';

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

@@ -1,14 +1,14 @@
-// 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';
+
 import { decodeAddress } from './decode';
 
 /**
  * @name addressToEvm
  * @summary Converts an SS58 address to its corresponding EVM address.
  */
-export function addressToEvm (address: string | Uint8Array, ignoreChecksum?: boolean): Uint8Array {
-  const decoded = decodeAddress(address, ignoreChecksum);
-
-  return decoded.subarray(0, 20);
+export function addressToEvm (address: HexString | string | Uint8Array, ignoreChecksum?: boolean): Uint8Array {
+  return decodeAddress(address, ignoreChecksum).subarray(0, 20);
 }

packages/util-crypto/src/address/check.spec.ts

@@ -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 '.';