[CI Skip] release/stable 0.83.1

skip-checks: true

.123trigger

@@ -1,2 +1,6 @@
-1
-0.57.20.57.3
+2
+0.57.20.57.3
+0.66.2
+0.66.3
+0.71.2
+0.71.3

.github/workflows/lock.yml

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

.github/workflows/push-master.yml

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

.github/workflows/semgrep.yml

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

.github/workflows/stale.yml

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

.nvmrc

@@ -1 +0,0 @@
-12

.prettierignore

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

.prettierrc.cjs

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

.yarnrc.yml

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

CHANGELOG.md

@@ -1,6 +1,169 @@
 # CHANGELOG
 
-## 0.66.1 Jan 17, 2020
+## 0.83.1, Jul 5, 2021
+
+Contributed:
+
+- Add support for notifications setting (Thanks to https://github.com/shawntabrizi)
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.11.1
+
+
+## 0.82.1, Jun 26, 2021
+
+Contributed:
+
+- Adjust Qr address imports (Thanks to https://github.com/joelamouche)
+- Bubble errors on Qr scanning (Thanks to https://github.com/joelamouche)
+
+Changes:
+
+- Fix `keyring.setSS58Format` to correctly set for prefix 0
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.10.1
+
+
+## 0.81.1, Jun 20, 2021
+
+Contributed:
+
+- Import `ethereum` addresses via QR (Thanks to https://github.com/joelamouche)
+- Support settings for non-RPC connectors (Thanks to https://github.com/wirednkod)
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.9.1
+- Fix webpack demo import locations
+
+
+## 0.80.1, Jun 14, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.8.1
+
+
+## 0.79.1, Jun 6, 2021
+
+Changes:
+
+- Add support for WebHID selection (as exposed by ledger packages)
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.7.1
+
+
+## 0.78.1 May 29, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.6.1
+
+
+## 0.77.1 May 25, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.5.1
+
+
+## 0.76.1 May 16, 2021
+
+Contributed:
+
+- Pass through injected account types (Thanks to https://github.com/joelamouche)
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.4.1
+
+
+## 0.75.1 Apr 25, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.3.1
+
+
+## 0.74.1 Apr 18, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.2.1
+
+
+## 0.73.1 Apr 12, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.1.1
+
+
+## 0.72.1 Mar 15, 2021
+
+Contributed:
+
+- Added support for batch import/export functionality (Thanks to https://github.com/BubbleBear)
+
+
+## 0.71.3 Mar 8, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.0.5
+
+
+## 0.71.2 Mar 6, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.0.4
+
+
+## 0.71.1 Mar 6, 2021
+
+Changes:
+
+- Build to ESM by default (with cjs versions via export map)
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 6.0.3
+
+
+## 0.70.1 Feb 28, 2021
+
+Changes:
+
+- Use `detectPackage` with `packageInfo` & check for monorepo dependencies
+- Remove `mkdirp` resolution to ensure local views work with Webpack
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 5.9.2
+
+
+## 0.69.1 Feb 7, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 5.6.1
+
+
+## 0.68.1 Feb 1, 2021
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 5.5.1
+- Added `ed25519-ledger` option for `hdLedger` from `@polkadot/util-crypto`
+
+
+## 0.67.1 Jan 24, 2021
+
+Contributed:
+
+- Store hardware accounts (Thanks to https://github.com/Tbaut)
+
+Changes:
+
+- Updated to `@polkadot/{hw-ledger, keyring, util, util-crypto}` 5.4.4
+- Cleanup dependencies to only have common (no api repo)
+
+
+## 0.66.1 Jan 17, 2021
 
 - **Important** Users of the `@polkadot/ledger` package should now import `@polkadot/hw-wallet`
 

jest.config.cjs

@@ -0,0 +1,30 @@
+// Copyright 2017-2021 @polkadot/ui authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+const config = require('@polkadot/dev/config/jest.cjs');
+
+module.exports = {
+  ...config,
+  moduleNameMapper: {
+    '@polkadot/react-(identicon|qr)(.*)$': '<rootDir>/packages/react-$1/src/$2',
+    '@polkadot/reactnative-(identicon)(.*)$': '<rootDir>/packages/reactnative-$1/src/$2',
+    '@polkadot/ui-(assets|keyring|settings|shared)(.*)$': '<rootDir>/packages/ui-$1/src/$2',
+    '\\.(css|less)$': 'empty/object',
+    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object'
+  },
+  modulePathIgnorePatterns: [
+    '<rootDir>/packages/example-react/build',
+    '<rootDir>/packages/example-vue/build',
+    '<rootDir>/packages/exampleReactNative/build',
+    '<rootDir>/packages/react-identicon/build',
+    '<rootDir>/packages/react-qr/build',
+    '<rootDir>/packages/reactnative-identicon/build',
+    '<rootDir>/packages/ui-assets/build',
+    '<rootDir>/packages/ui-keyring/build',
+    '<rootDir>/packages/ui-settings/build',
+    '<rootDir>/packages/ui-shared/build',
+    '<rootDir>/packages/vue-identicon/build'
+  ],
+  testEnvironment: 'jsdom',
+  transformIgnorePatterns: ['/node_modules/(?!@polkadot|@babel/runtime/helpers/esm/)']
+};

jest.config.js

@@ -1,15 +0,0 @@
-// Copyright 2017-2021 @polkadot/ui authors & contributors
-// SPDX-License-Identifier: Apache-2.0
-
-const config = require('@polkadot/dev/config/jest.cjs');
-
-module.exports = Object.assign({}, config, {
-  moduleNameMapper: {
-    '@polkadot/react-(identicon|qr)(.*)$': '<rootDir>/packages/react-$1/src/$2',
-    '@polkadot/reactnative-(identicon)(.*)$': '<rootDir>/packages/reactnative-$1/src/$2',
-    '@polkadot/ui-(assets|keyring|settings|shared)(.*)$': '<rootDir>/packages/ui-$1/src/$2',
-    '\\.(css|less)$': 'empty/object',
-    '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object'
-  },
-  resolver: '@polkadot/dev/config/jest-resolver.cjs'
-});

package.json

@@ -8,9 +8,7 @@
     "packages/*"
   ],
   "resolutions": {
-    "eventemitter3": "^4.0.7",
-    "mkdirp": "^1.0.4",
-    "typescript": "^4.1.3"
+    "typescript": "^4.3.5"
   },
   "scripts": {
     "build": "polkadot-dev-build-ts",
@@ -29,21 +27,21 @@
     "test:one": "polkadot-dev-run-test"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/dev": "^0.61.24",
-    "@polkadot/ts": "^0.3.59",
-    "@types/jest": "^26.0.20",
+    "@babel/core": "^7.14.6",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/dev": "^0.62.44",
+    "@polkadot/ts": "^0.4.2",
+    "@types/jest": "^26.0.23",
     "babel-plugin-transform-vue-template": "^0.4.2",
     "empty": "^0.10.1",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-is": "^17.0.1",
-    "react-native": "^0.63.4",
-    "vue-template-compiler": "^2.6.12",
-    "webpack": "^4.44.2",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-is": "^17.0.2",
+    "react-native": "^0.64.2",
+    "vue-template-compiler": "^2.6.14",
+    "webpack": "^4.46.0",
     "webpack-cli": "^3.3.12",
     "webpack-serve": "^3.2.0"
   },
-  "version": "0.66.1"
+  "version": "0.83.1"
 }

packages/example-react/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@polkadot/example-react",
-  "version": "0.66.1",
+  "version": "0.83.1",
   "description": "A very basic example with ui-* & react-* packages",
   "main": "index.js",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5"
+    "@babel/runtime": "^7.14.6"
   }
 }

packages/example-react/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/example-react authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/example-react', version: '0.83.1' };

packages/example-react/webpack.config.js

@@ -17,7 +17,7 @@ module.exports = {
         use: [
           {
             loader: 'babel-loader',
-            options: require('../../babel.config.js')
+            options: require('../../babel.config.cjs')
           }
         ]
       }

packages/example-vue/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@polkadot/example-vue",
-  "version": "0.66.1",
+  "version": "0.83.1",
   "description": "A very basic example with ui-* & vue-* packages",
   "main": "index.js",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5"
+    "@babel/runtime": "^7.14.6"
   }
 }

packages/example-vue/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/example-vue authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/example-vue', version: '0.83.1' };

packages/example-vue/webpack.config.js

@@ -18,7 +18,7 @@ module.exports = {
         use: [
           {
             loader: 'babel-loader',
-            options: require('../../babel.config.js')
+            options: require('../../babel.config.cjs')
           }
         ]
       },

packages/exampleReactNative/ios/Podfile

@@ -1,38 +1,38 @@
 platform :ios, '9.0'
-require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
+require_relative '../../../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
 target 'exampleReactNative' do
   # Pods for exampleReactNative
-  pod 'FBLazyVector', :path => "../node_modules/react-native/Libraries/FBLazyVector"
-  pod 'FBReactNativeSpec', :path => "../node_modules/react-native/Libraries/FBReactNativeSpec"
-  pod 'RCTRequired', :path => "../node_modules/react-native/Libraries/RCTRequired"
-  pod 'RCTTypeSafety', :path => "../node_modules/react-native/Libraries/TypeSafety"
-  pod 'React', :path => '../node_modules/react-native/'
-  pod 'React-Core', :path => '../node_modules/react-native/'
-  pod 'React-CoreModules', :path => '../node_modules/react-native/React/CoreModules'
-  pod 'React-Core/DevSupport', :path => '../node_modules/react-native/'
-  pod 'React-RCTActionSheet', :path => '../node_modules/react-native/Libraries/ActionSheetIOS'
-  pod 'React-RCTAnimation', :path => '../node_modules/react-native/Libraries/NativeAnimation'
-  pod 'React-RCTBlob', :path => '../node_modules/react-native/Libraries/Blob'
-  pod 'React-RCTImage', :path => '../node_modules/react-native/Libraries/Image'
-  pod 'React-RCTLinking', :path => '../node_modules/react-native/Libraries/LinkingIOS'
-  pod 'React-RCTNetwork', :path => '../node_modules/react-native/Libraries/Network'
-  pod 'React-RCTSettings', :path => '../node_modules/react-native/Libraries/Settings'
-  pod 'React-RCTText', :path => '../node_modules/react-native/Libraries/Text'
-  pod 'React-RCTVibration', :path => '../node_modules/react-native/Libraries/Vibration'
-  pod 'React-Core/RCTWebSocket', :path => '../node_modules/react-native/'
+  pod 'FBLazyVector', :path => "../../../node_modules/react-native/Libraries/FBLazyVector"
+  pod 'FBReactNativeSpec', :path => "../../../node_modules/react-native/Libraries/FBReactNativeSpec"
+  pod 'RCTRequired', :path => "../../../node_modules/react-native/Libraries/RCTRequired"
+  pod 'RCTTypeSafety', :path => "../../../node_modules/react-native/Libraries/TypeSafety"
+  pod 'React', :path => '../../../node_modules/react-native/'
+  pod 'React-Core', :path => '../../../node_modules/react-native/'
+  pod 'React-CoreModules', :path => '../../../node_modules/react-native/React/CoreModules'
+  pod 'React-Core/DevSupport', :path => '../../../node_modules/react-native/'
+  pod 'React-RCTActionSheet', :path => '../../../node_modules/react-native/Libraries/ActionSheetIOS'
+  pod 'React-RCTAnimation', :path => '../../../node_modules/react-native/Libraries/NativeAnimation'
+  pod 'React-RCTBlob', :path => '../../../node_modules/react-native/Libraries/Blob'
+  pod 'React-RCTImage', :path => '../../../node_modules/react-native/Libraries/Image'
+  pod 'React-RCTLinking', :path => '../../../node_modules/react-native/Libraries/LinkingIOS'
+  pod 'React-RCTNetwork', :path => '../../../node_modules/react-native/Libraries/Network'
+  pod 'React-RCTSettings', :path => '../../../node_modules/react-native/Libraries/Settings'
+  pod 'React-RCTText', :path => '../../../node_modules/react-native/Libraries/Text'
+  pod 'React-RCTVibration', :path => '../../../node_modules/react-native/Libraries/Vibration'
+  pod 'React-Core/RCTWebSocket', :path => '../../../node_modules/react-native/'
 
-  pod 'React-cxxreact', :path => '../node_modules/react-native/ReactCommon/cxxreact'
-  pod 'React-jsi', :path => '../node_modules/react-native/ReactCommon/jsi'
-  pod 'React-jsiexecutor', :path => '../node_modules/react-native/ReactCommon/jsiexecutor'
-  pod 'React-jsinspector', :path => '../node_modules/react-native/ReactCommon/jsinspector'
-  pod 'ReactCommon/jscallinvoker', :path => "../node_modules/react-native/ReactCommon"
-  pod 'ReactCommon/turbomodule/core', :path => "../node_modules/react-native/ReactCommon"
-  pod 'Yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
+  pod 'React-cxxreact', :path => '../../../node_modules/react-native/ReactCommon/cxxreact'
+  pod 'React-jsi', :path => '../../../node_modules/react-native/ReactCommon/jsi'
+  pod 'React-jsiexecutor', :path => '../../../node_modules/react-native/ReactCommon/jsiexecutor'
+  pod 'React-jsinspector', :path => '../../../node_modules/react-native/ReactCommon/jsinspector'
+  pod 'ReactCommon/jscallinvoker', :path => "../../../node_modules/react-native/ReactCommon"
+  pod 'ReactCommon/turbomodule/core', :path => "../../../node_modules/react-native/ReactCommon"
+  pod 'Yoga', :path => '../../../node_modules/react-native/ReactCommon/yoga'
 
-  pod 'DoubleConversion', :podspec => '../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
-  pod 'glog', :podspec => '../node_modules/react-native/third-party-podspecs/glog.podspec'
-  pod 'Folly', :podspec => '../node_modules/react-native/third-party-podspecs/Folly.podspec'
+  pod 'DoubleConversion', :podspec => '../../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec'
+  pod 'glog', :podspec => '../../../node_modules/react-native/third-party-podspecs/glog.podspec'
+  pod 'Folly', :podspec => '../../../node_modules/react-native/third-party-podspecs/Folly.podspec'
 
 
   target 'exampleReactNativeTests' do

packages/exampleReactNative/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exampleReactNative",
-  "version": "0.66.1",
+  "version": "0.83.1",
   "private": true,
   "scripts": {
     "copy-workspace-packages": "yarn copy-identicon && yarn copy-ui-shared",
@@ -12,31 +12,31 @@
     "test": "jest"
   },
   "dependencies": {
-    "@polkadot/keyring": "^5.2.4-7",
-    "@polkadot/reactnative-identicon": "0.66.1",
-    "@polkadot/ui-keyring": "0.66.1",
-    "@polkadot/ui-settings": "0.66.1",
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/util-crypto": "^5.2.4-7",
+    "@polkadot/keyring": "^6.11.1",
+    "@polkadot/reactnative-identicon": "0.83.1",
+    "@polkadot/ui-keyring": "0.83.1",
+    "@polkadot/ui-settings": "0.83.1",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/util-crypto": "^6.11.1",
     "@react-native-community/async-storage": "^1.12.1",
     "fast-text-encoding": "^1.0.3",
     "get-yarn-workspaces": "^1.0.2",
     "os-browserify": "^0.3.0",
     "process": "^0.11.10",
-    "react": "^17.0.1",
-    "react-native": "^0.63.4",
+    "react": "^17.0.2",
+    "react-native": "^0.64.2",
     "react-native-crypto": "^2.2.0",
-    "react-native-randombytes": "^3.6.0",
-    "stream-http": "^3.1.1"
+    "react-native-randombytes": "^3.6.1",
+    "stream-http": "^3.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.10",
-    "@babel/runtime": "^7.12.5",
-    "@react-native-community/cli-platform-ios": "^4.13.0",
-    "@types/react-test-renderer": "17.0.0",
-    "babel-jest": "^26.6.3",
-    "metro-react-native-babel-preset": "^0.64.0",
-    "react-test-renderer": "17.0.1"
+    "@babel/core": "^7.14.6",
+    "@babel/runtime": "^7.14.6",
+    "@react-native-community/cli-platform-ios": "^5.0.1",
+    "@types/react-test-renderer": "17.0.1",
+    "babel-jest": "^27.0.6",
+    "metro-react-native-babel-preset": "^0.66.0",
+    "react-test-renderer": "17.0.2"
   },
   "jest": {
     "preset": "react-native",

packages/react-identicon/package.json

@@ -1,25 +1,28 @@
 {
   "name": "@polkadot/react-identicon",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "description": "Renders an SVG picture representing an address",
   "main": "index.js",
-  "module": "index.mjs",
-  "sideEffects": false,
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/keyring": "^5.2.4-7",
-    "@polkadot/ui-settings": "0.66.1",
-    "@polkadot/ui-shared": "0.66.1",
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/util-crypto": "^5.2.4-7",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/keyring": "^6.11.1",
+    "@polkadot/ui-settings": "0.83.1",
+    "@polkadot/ui-shared": "0.83.1",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/util-crypto": "^6.11.1",
     "color": "^3.1.3",
     "ethereum-blockies-base64": "^1.0.2",
     "jdenticon": "3.1.0",
     "react-copy-to-clipboard": "^5.0.3",
-    "styled-components": "^5.2.1"
+    "styled-components": "^5.3.0"
   },
   "peerDependencies": {
     "@polkadot/keyring": "*",
@@ -32,9 +35,9 @@
   },
   "devDependencies": {
     "@types/react-copy-to-clipboard": "^5.0.0",
-    "@types/react-dom": "^17.0.0",
-    "@types/styled-components": "^5.1.7",
-    "styled-components": "^5.2.1",
+    "@types/react-dom": "^17.0.8",
+    "@types/styled-components": "^5.1.11",
+    "styled-components": "^5.3.0",
     "xmlserializer": "^0.6.1"
   }
 }

packages/react-identicon/src/Demo.tsx

@@ -11,7 +11,7 @@ import { Identicon } from '.';
 const THEMES = ['beachball', 'polkadot', 'substrate'];
 
 export default class Demo extends React.PureComponent {
-  public render (): React.ReactNode {
+  public override render (): React.ReactNode {
     const identities: string[] = [];
 
     while (identities.length !== 50) {

packages/react-identicon/src/Identicon.tsx

@@ -58,7 +58,7 @@ const Wrapper = styled.div`
 `;
 
 class BaseIcon extends React.PureComponent<Props, State> {
-  public state: State = {
+  public override state: State = {
     address: '',
     publicKey: '0x'
   };
@@ -98,7 +98,7 @@ class BaseIcon extends React.PureComponent<Props, State> {
     }
   }
 
-  public render (): React.ReactNode {
+  public override render (): React.ReactNode {
     const { address } = this.state;
     const wrapped = this.getWrapped(this.state, this.props);
 

packages/react-identicon/src/detectPackage.ts

@@ -0,0 +1,10 @@
+// Copyright 2017-2021 @polkadot/react-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as settingsInfo } from '@polkadot/ui-settings/packageInfo';
+import { packageInfo as sharedInfo } from '@polkadot/ui-shared/packageInfo';
+import { detectPackage } from '@polkadot/util';
+
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [settingsInfo, sharedInfo]);

packages/react-identicon/src/index.ts

@@ -1,9 +1,12 @@
 // Copyright 2017-2021 @polkadot/react-identicon authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import './detectPackage';
+
 import { Identicon } from './Identicon';
 
 export * from './icons';
+export { packageInfo } from './packageInfo';
 
 export { Identicon };
 

packages/react-identicon/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/react-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/react-identicon', version: '0.83.1' };

packages/react-qr/package.json

@@ -1,24 +1,24 @@
 {
   "name": "@polkadot/react-qr",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "description": "Generates and reads QR codes",
   "main": "index.js",
-  "module": "index.mjs",
   "sideEffects": false,
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/util-crypto": "^5.2.4-7",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/util-crypto": "^6.11.1",
     "qrcode-generator": "^1.4.4",
     "react-qr-reader": "^2.2.1",
-    "styled-components": "^5.2.1"
+    "styled-components": "^5.3.0"
   },
   "devDependencies": {
     "@types/react-qr-reader": "^2.1.3",
-    "@types/styled-components": "^5.1.7"
+    "@types/styled-components": "^5.1.11"
   },
   "peerDependencies": {
     "@polkadot/util": "*",

packages/react-qr/src/ScanAddress.tsx

@@ -22,31 +22,44 @@ interface Props {
   onScan: (scanned: ScanType) => void;
   size?: string | number;
   style?: React.CSSProperties;
+  isEthereum?: boolean
 }
 
-function ScanAddress ({ className, onError, onScan, size, style }: Props): React.ReactElement<Props> {
+function ScanAddress ({ className, isEthereum, onError, onScan, size, style }: Props): React.ReactElement<Props> {
   const _onScan = useCallback(
     (data: string | null): void => {
       if (data) {
         try {
-          const [prefix, content, genesisHash, ...name] = data.split(':');
-          const isValidPrefix = prefix === ADDRESS_PREFIX || prefix === SEED_PREFIX;
+          let prefix: string, content: string, genesisHash: string, name: string[];
 
-          assert(isValidPrefix, `Invalid prefix received, expected '${ADDRESS_PREFIX}/${SEED_PREFIX}' , found '${prefix}'`);
+          if (!isEthereum) {
+            [prefix, content, genesisHash, ...name] = data.split(':');
+          } else {
+            [prefix, content, ...name] = data.split(':');
+            genesisHash = '';
+            content = content.substring(0, 42);
+          }
 
-          const isAddress = prefix === ADDRESS_PREFIX;
+          const expectedPrefix = (isEthereum ? 'ethereum' : ADDRESS_PREFIX);
+          const isValidPrefix = (prefix === expectedPrefix) || (prefix === SEED_PREFIX);
 
-          if (isAddress) {
+          assert(isValidPrefix, `Invalid prefix received, expected '${expectedPrefix} or ${SEED_PREFIX}' , found '${prefix}'`);
+
+          const isAddress = prefix === expectedPrefix;
+
+          if (isAddress && !isEthereum) {
             decodeAddress(content);
           }
 
           onScan({ content, genesisHash, isAddress, name: name?.length ? name.join(':') : undefined });
         } catch (error) {
+          onError && onError(error as Error);
+
           console.error('@polkadot/react-qr:QrScanAddress', (error as Error).message, data);
         }
       }
     },
-    [onScan]
+    [onScan, onError, isEthereum]
   );
 
   return (

packages/react-qr/src/index.tsx

@@ -6,3 +6,4 @@ export { QrDisplayPayload } from './DisplayPayload';
 export { QrScanAddress } from './ScanAddress';
 export { QrScanSignature } from './ScanSignature';
 export { QrNetworkSpecs } from './NetworkSpecs';
+export { packageInfo } from './packageInfo';

packages/react-qr/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/react-qr authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/react-qr', version: '0.83.1' };

packages/reactnative-identicon/package.json

@@ -1,19 +1,22 @@
 {
   "name": "@polkadot/reactnative-identicon",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "description": "Renders an SVG picture representing an address",
   "main": "index.js",
-  "module": "index.mjs",
-  "sideEffects": false,
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/ui-shared": "0.66.1",
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/util-crypto": "^5.2.4-7",
-    "react-native-svg": "^12.1.0"
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/ui-shared": "0.83.1",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/util-crypto": "^6.11.1",
+    "react-native-svg": "^12.1.1"
   },
   "peerDependencies": {
     "@polkadot/util": "*",
@@ -22,6 +25,6 @@
     "react-native": "*"
   },
   "devDependencies": {
-    "@types/react-native": "^0.63.45"
+    "@types/react-native": "^0.64.10"
   }
 }

packages/reactnative-identicon/src/Identicon.tsx

@@ -33,7 +33,7 @@ const Components: Record<string, React.ComponentType<ComponentProps>> = {
 };
 
 export default class IdentityIcon extends React.PureComponent<Props, State> {
-  public state: State = {
+  public override state: State = {
     address: '',
     publicKey: '0x'
   };
@@ -62,7 +62,7 @@ export default class IdentityIcon extends React.PureComponent<Props, State> {
     }
   }
 
-  public render (): React.ReactNode {
+  public override render (): React.ReactNode {
     const { theme = DEFAULT_THEME, size = DEFAULT_SIZE } = this.props;
     const { address, publicKey } = this.state;
 

packages/reactnative-identicon/src/detectPackage.ts

@@ -0,0 +1,9 @@
+// Copyright 2017-2021 @polkadot/reactnative-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as sharedInfo } from '@polkadot/ui-shared/packageInfo';
+import { detectPackage } from '@polkadot/util';
+
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [sharedInfo]);

packages/reactnative-identicon/src/index.ts

@@ -1,8 +1,11 @@
 // Copyright 2017-2021 @polkadot/reactnative-identicon authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import './detectPackage';
+
 import Identicon from './Identicon';
 
 export * from './icons';
+export { packageInfo } from './packageInfo';
 
 export default Identicon;

packages/reactnative-identicon/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/reactnative-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/reactnative-identicon', version: '0.83.1' };

packages/ui-assets/package.json

@@ -1,13 +1,12 @@
 {
   "name": "@polkadot/ui-assets",
-  "version": "0.66.1",
+  "version": "0.83.1",
   "description": "Static assets shared accross projects",
   "main": "index.js",
-  "module": "index.mjs",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5"
+    "@babel/runtime": "^7.14.6"
   }
 }

packages/ui-assets/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/ui-assets authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/ui-assets', version: '0.83.1' };

packages/ui-keyring/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@polkadot/ui-keyring",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "main": "index.js",
-  "module": "index.mjs",
   "sideEffects": [
     "./detectPackage.js",
-    "./detectPackage.mjs"
+    "./detectPackage.cjs"
   ],
   "repository": "github:polkadot-js/apps",
   "author": "Jaco Greeff <jacogr@gmail.com>",
@@ -13,12 +13,12 @@
   "contributors": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/hw-ledger": "^5.2.4-7",
-    "@polkadot/keyring": "^5.2.4-7",
-    "@polkadot/ui-settings": "0.66.1",
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/x-rxjs": "^3.4.2-15",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/hw-ledger": "^6.11.1",
+    "@polkadot/keyring": "^6.11.1",
+    "@polkadot/ui-settings": "0.83.1",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/x-rxjs": "^6.11.1",
     "mkdirp": "^1.0.4",
     "store": "^2.0.12"
   },

packages/ui-keyring/src/Base.ts

@@ -7,7 +7,7 @@ import type { AddressSubject } from './observable/types';
 import type { KeyringOptions, KeyringStore } from './types';
 
 import { createTestKeyring } from '@polkadot/keyring/testing';
-import { isBoolean, isString } from '@polkadot/util';
+import { isBoolean, isNumber, isString } from '@polkadot/util';
 
 import { accounts } from './observable/accounts';
 import { addresses } from './observable/addresses';
@@ -93,7 +93,7 @@ export class Base {
   }
 
   public setSS58Format (ss58Format?: Prefix): void {
-    if (this.#keyring && ss58Format) {
+    if (this.#keyring && isNumber(ss58Format)) {
       this.#keyring.setSS58Format(ss58Format);
     }
   }

packages/ui-keyring/src/Keyring.ts

@@ -1,17 +1,17 @@
 // Copyright 2017-2021 @polkadot/ui-keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import type BN from 'bn.js';
 import type { KeyringPair, KeyringPair$Json, KeyringPair$Meta } from '@polkadot/keyring/types';
+import type { EncryptedJson } from '@polkadot/util-crypto/json/types';
 import type { KeypairType } from '@polkadot/util-crypto/types';
 import type { AddressSubject, SingleAddress } from './observable/types';
-import type { CreateResult, KeyringAddress, KeyringAddressType, KeyringItemType, KeyringJson, KeyringJson$Meta, KeyringOptions, KeyringStruct } from './types';
-
-import BN from 'bn.js';
+import type { CreateResult, KeyringAddress, KeyringAddressType, KeyringItemType, KeyringJson, KeyringJson$Meta, KeyringOptions, KeyringPairs$Json, KeyringStruct } from './types';
 
 import { createPair } from '@polkadot/keyring/pair';
 import { chains } from '@polkadot/ui-settings/defaults/chains';
-import { bnToBn, hexToU8a, isHex, isString, u8aSorted } from '@polkadot/util';
-import { base64Decode, createKeyMulti } from '@polkadot/util-crypto';
+import { bnToBn, hexToU8a, isHex, isString, stringToU8a, u8aSorted, u8aToString } from '@polkadot/util';
+import { base64Decode, createKeyMulti, jsonDecrypt, jsonEncrypt } from '@polkadot/util-crypto';
 
 import { env } from './observable/env';
 import { Base } from './Base';
@@ -82,6 +82,24 @@ export class Keyring extends Base implements KeyringStruct {
     return pair.toJson(password);
   }
 
+  public async backupAccounts (addresses: string[], password: string): Promise<KeyringPairs$Json> {
+    const accountPromises = addresses.map((address) => {
+      return new Promise<KeyringJson>((resolve) => {
+        this._store.get(accountKey(address), resolve);
+      });
+    });
+
+    const accounts = await Promise.all(accountPromises);
+
+    return {
+      ...jsonEncrypt(stringToU8a(JSON.stringify(accounts)), ['batch-pkcs8'], password),
+      accounts: accounts.map((account) => ({
+        address: account.address,
+        meta: account.meta
+      }))
+    };
+  }
+
   public createFromJson (json: KeyringPair$Json, meta: KeyringPair$Meta = {}): KeyringPair {
     return this.keyring.createFromJson({ ...json, meta: { ...(json.meta || {}), meta } });
   }
@@ -228,7 +246,7 @@ export class Keyring extends Base implements KeyringStruct {
     this.rewriteKey(json, key, hexAddr, contractKey);
   }
 
-  private loadInjected (address: string, meta: KeyringJson$Meta): void {
+  private loadInjected (address: string, meta: KeyringJson$Meta, type?: KeypairType): void {
     const json = {
       address,
       meta: {
@@ -236,7 +254,7 @@ export class Keyring extends Base implements KeyringStruct {
         isInjected: true
       }
     };
-    const pair = this.keyring.addFromAddress(address, json.meta);
+    const pair = this.keyring.addFromAddress(address, json.meta, null, type);
 
     this.accounts.add(this._store, pair.address, json, pair.type);
   }
@@ -257,7 +275,7 @@ export class Keyring extends Base implements KeyringStruct {
     return true;
   }
 
-  public loadAll (options: KeyringOptions, injected: { address: string; meta: KeyringJson$Meta }[] = []): void {
+  public loadAll (options: KeyringOptions, injected: { address: string; meta: KeyringJson$Meta, type?: KeypairType }[] = []): void {
     super.initKeyring(options);
 
     this._store.all((key: string, json: KeyringJson): void => {
@@ -281,7 +299,7 @@ export class Keyring extends Base implements KeyringStruct {
     injected.forEach((account): void => {
       if (this.allowGenesis(account)) {
         try {
-          this.loadInjected(account.address, account.meta);
+          this.loadInjected(account.address, account.meta, account.type);
         } catch (error) {
           // ignore
         }
@@ -295,7 +313,7 @@ export class Keyring extends Base implements KeyringStruct {
     const cryptoType = Array.isArray(json.encoding.content) ? json.encoding.content[1] : 'ed25519';
     const encType = Array.isArray(json.encoding.type) ? json.encoding.type : [json.encoding.type];
     const pair = createPair(
-      { toSS58: this.encodeAddress, type: cryptoType },
+      { toSS58: this.encodeAddress, type: cryptoType as KeypairType },
       { publicKey: this.decodeAddress(json.address, true) },
       json.meta,
       isHex(json.encoded) ? hexToU8a(json.encoded) : base64Decode(json.encoded),
@@ -310,6 +328,14 @@ export class Keyring extends Base implements KeyringStruct {
     return pair;
   }
 
+  public restoreAccounts (json: EncryptedJson, password: string): void {
+    const accounts: KeyringJson[] = JSON.parse(u8aToString(jsonDecrypt(json, password))) as KeyringJson[];
+
+    accounts.forEach((account) => {
+      this.loadAccount(account, accountKey(account.address));
+    });
+  }
+
   public saveAccount (pair: KeyringPair, password?: string): KeyringPair$Json {
     this.addTimestamp(pair);
 

packages/ui-keyring/src/detectPackage.ts

@@ -1,25 +1,9 @@
 // Copyright 2017-2021 @polkadot/ui-keyring authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-// For esm, this should be import.meta.url or to get the same behavior as __dirname, we can use
-//
-//   new URL(import.meta.url).pathname)
-//
-// The issue is the WP4 has "some" issues with import.meta.url. So because of bundlers, we can't have
-// nice things... In this case it is even worse since import.meta.url won't even make it compile, so
-// there is a complete dead end with usage thereof
-//
-// When that is fixed, a solution is to have both .js & .mjs files, with the following content -
-//
-// cjs: util.detectPackage(packageInfo, () => __dirname);
-// esm: detectPackage(packageInfo, () => import.meta.url);
-//
-// With the above we additionally need a .d.ts to just export the packageInfo
-
+import { packageInfo as settingsInfo } from '@polkadot/ui-settings/packageInfo';
 import { detectPackage } from '@polkadot/util';
 
-import packageInfo from './package-info.json';
+import { packageInfo } from './packageInfo';
 
-detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname);
-
-export { packageInfo };
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [settingsInfo]);

packages/ui-keyring/src/index.ts

@@ -6,6 +6,7 @@ import './detectPackage';
 import { Keyring } from './Keyring';
 
 export { Ledger } from '@polkadot/hw-ledger';
+export { packageInfo } from './packageInfo';
 
 const keyring = new Keyring();
 

packages/ui-keyring/src/observable/genericSubject.ts

@@ -42,8 +42,8 @@ export function genericSubject (keyCreator: (address: string) => string, withTes
         type
       };
 
-      // we do not store dev accounts, injected or hardware (the latter two are external/transient)
-      if (!json.meta.isInjected && !json.meta.isHardware && (!json.meta.isTesting || env.isDevelopment())) {
+      // we do not store dev or injected accounts (external/transient)
+      if (!json.meta.isInjected && (!json.meta.isTesting || env.isDevelopment())) {
         store.set(keyCreator(address), json);
       }
 

packages/ui-keyring/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/ui-keyring authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/ui-keyring', version: '0.83.1' };

packages/ui-keyring/src/types.ts

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import type { KeyringInstance as BaseKeyringInstance, KeyringOptions as KeyringOptionsBase, KeyringPair, KeyringPair$Json, KeyringPair$Meta } from '@polkadot/keyring/types';
+import type { EncryptedJson } from '@polkadot/util-crypto/json/types';
 import type { KeypairType } from '@polkadot/util-crypto/types';
 import type { AddressSubject, SingleAddress } from './observable/types';
 
@@ -30,6 +31,10 @@ export interface KeyringJson {
   meta: KeyringJson$Meta;
 }
 
+export interface KeyringPairs$Json extends EncryptedJson {
+  accounts: KeyringJson[];
+}
+
 export interface KeyringStore {
   all: (cb: (key: string, value: KeyringJson) => void) => void;
   get: (key: string, cb: (value: KeyringJson) => void) => void;
@@ -70,6 +75,7 @@ export interface KeyringStruct {
   addPair: (pair: KeyringPair, password: string) => CreateResult;
   addUri: (suri: string, password?: string, meta?: KeyringPair$Meta, type?: KeypairType) => CreateResult;
   backupAccount: (pair: KeyringPair, password: string) => KeyringPair$Json;
+  backupAccounts: (addresses: string[], password: string) => Promise<KeyringPairs$Json>
   createFromUri (suri: string, meta?: KeyringPair$Meta, type?: KeypairType): KeyringPair;
   decodeAddress: (key: string | Uint8Array) => Uint8Array;
   encodeAddress: (key: string | Uint8Array) => string;
@@ -89,6 +95,7 @@ export interface KeyringStruct {
   isPassValid: (password: string) => boolean;
   loadAll: (options: KeyringOptions) => void;
   restoreAccount: (json: KeyringPair$Json, password: string) => KeyringPair;
+  restoreAccounts: (json: EncryptedJson, password: string) => void;
   saveAccount: (pair: KeyringPair, password?: string) => KeyringPair$Json;
   saveAccountMeta: (pair: KeyringPair, meta: KeyringPair$Meta) => void;
   saveAddress: (address: string, meta: KeyringPair$Meta) => KeyringPair$Json;

packages/ui-settings/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@polkadot/ui-settings",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "description": "Manages app settings",
   "main": "index.js",
-  "module": "index.mjs",
   "sideEffects": false,
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/networks": "^5.2.4-7",
-    "@polkadot/util": "^5.2.4-7",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/networks": "^6.11.1",
+    "@polkadot/util": "^6.11.1",
     "eventemitter3": "^4.0.7",
     "store": "^2.0.12"
   },

packages/ui-settings/src/Settings.ts

@@ -1,14 +1,14 @@
 // Copyright 2017-2021 @polkadot/ui-settings authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import type { Option, SettingsStruct } from './types';
+import type { Endpoint, EndpointType, Option, SettingsStruct } from './types';
 
 import EventEmitter from 'eventemitter3';
 import store from 'store';
 
 import { isUndefined } from '@polkadot/util';
 
-import { CAMERA, CAMERA_DEFAULT, CRYPTOS, CRYPTOS_ETH, ENDPOINT_DEFAULT, ENDPOINTS, ICON_DEFAULT, ICONS, LANGUAGE_DEFAULT, LEDGER_CONN, LEDGER_CONN_DEFAULT, LOCKING, LOCKING_DEFAULT, PREFIX_DEFAULT, PREFIXES, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './defaults';
+import { CAMERA, CAMERA_DEFAULT, CRYPTOS, CRYPTOS_ETH, CRYPTOS_LEDGER, ENDPOINT_DEFAULT, ENDPOINTS, ICON_DEFAULT, ICONS, LANGUAGE_DEFAULT, LEDGER_CONN, LEDGER_CONN_DEFAULT, LOCKING, LOCKING_DEFAULT, NOTIFICATION_DEFAULT, PREFIX_DEFAULT, PREFIXES, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './defaults';
 
 type ChangeCallback = (settings: SettingsStruct) => void;
 type OnTypes = 'change';
@@ -24,6 +24,9 @@ function withDefault (options: Option[], option: string | undefined, fallback: s
 export class Settings implements SettingsStruct {
   readonly #emitter: EventEmitter;
 
+  #apiType: Endpoint;
+
+  // will become deprecated for supporting substrate connect light clients. apiType structure should be used instead
   #apiUrl: string;
 
   #camera: string;
@@ -42,12 +45,16 @@ export class Settings implements SettingsStruct {
 
   #uiTheme: string;
 
+  #notification: string;
+
   constructor () {
     const settings = (store.get('settings') as SettingsStruct) || {};
 
     this.#emitter = new EventEmitter();
 
+    // will become deprecated for supporting substrate connect light clients. apiType structure should be used instead
     this.#apiUrl = (typeof settings.apiUrl === 'string' && settings.apiUrl) || process.env.WS_URL || (ENDPOINT_DEFAULT.value as string);
+    this.#apiType = { param: this.#apiUrl, type: 'json-rpc' as EndpointType };
     this.#camera = withDefault(CAMERA, settings.camera, CAMERA_DEFAULT);
     this.#ledgerConn = withDefault(LEDGER_CONN, settings.ledgerConn, LEDGER_CONN_DEFAULT);
     this.#i18nLang = settings.i18nLang || LANGUAGE_DEFAULT;
@@ -56,12 +63,17 @@ export class Settings implements SettingsStruct {
     this.#prefix = isUndefined(settings.prefix) ? PREFIX_DEFAULT : settings.prefix;
     this.#uiMode = settings.uiMode || UIMODE_DEFAULT;
     this.#uiTheme = settings.uiTheme || UITHEME_DEFAULT;
+    this.#notification = settings.notification || NOTIFICATION_DEFAULT;
   }
 
   public get camera (): string {
     return this.#camera;
   }
 
+  public get apiType (): Endpoint {
+    return this.#apiType;
+  }
+
   public get apiUrl (): string {
     return this.#apiUrl;
   }
@@ -74,6 +86,10 @@ export class Settings implements SettingsStruct {
     return this.#icon;
   }
 
+  public get notification (): string {
+    return this.#notification;
+  }
+
   public get ledgerConn (): string {
     return this.#ledgerConn;
   }
@@ -106,6 +122,10 @@ export class Settings implements SettingsStruct {
     return CRYPTOS_ETH;
   }
 
+  public get availableCryptosLedger (): Option[] {
+    return CRYPTOS_LEDGER;
+  }
+
   public get availableIcons (): Option[] {
     return ICONS;
   }
@@ -136,12 +156,14 @@ export class Settings implements SettingsStruct {
 
   public get (): SettingsStruct {
     return {
+      apiType: this.#apiType,
       apiUrl: this.#apiUrl,
       camera: this.#camera,
       i18nLang: this.#i18nLang,
       icon: this.#icon,
       ledgerConn: this.#ledgerConn,
       locking: this.#locking,
+      notification: this.#notification,
       prefix: this.#prefix,
       uiMode: this.#uiMode,
       uiTheme: this.#uiTheme
@@ -149,12 +171,14 @@ export class Settings implements SettingsStruct {
   }
 
   public set (settings: Partial<SettingsStruct>): void {
+    this.#apiType = settings.apiType || this.#apiType;
     this.#apiUrl = settings.apiUrl || this.#apiUrl;
     this.#camera = settings.camera || this.#camera;
     this.#ledgerConn = settings.ledgerConn || this.#ledgerConn;
     this.#i18nLang = settings.i18nLang || this.#i18nLang;
     this.#icon = settings.icon || this.#icon;
     this.#locking = settings.locking || this.#locking;
+    this.#notification = settings.notification || this.#notification;
     this.#prefix = isUndefined(settings.prefix) ? this.#prefix : settings.prefix;
     this.#uiMode = settings.uiMode || this.#uiMode;
     this.#uiTheme = settings.uiTheme || this.#uiTheme;

packages/ui-settings/src/defaults/chains.ts

@@ -6,7 +6,7 @@ import known from '@polkadot/networks';
 type ChainDef = string[];
 
 const chains: Record <string, ChainDef> = known
-  .filter(({ genesisHash }) => genesisHash.length > 1)
+  .filter((n) => n.genesisHash.length)
   .reduce((chains, { genesisHash, network }) => ({ ...chains, [network]: genesisHash }), {});
 
 export { chains };

packages/ui-settings/src/defaults/crypto.ts

@@ -28,3 +28,12 @@ export const CRYPTOS_ETH: Option[] = [
     value: 'ethereum'
   }
 ];
+
+export const CRYPTOS_LEDGER: Option[] = [
+  ...CRYPTOS,
+  {
+    info: 'ed25519-ledger',
+    text: 'Ledger (ed25519, BIP32 derivation)',
+    value: 'ed25519-ledger'
+  }
+];

packages/ui-settings/src/defaults/index.ts

@@ -3,11 +3,11 @@
 
 import type { Option } from '../types';
 
-import { CRYPTOS, CRYPTOS_ETH } from './crypto';
+import { CRYPTOS, CRYPTOS_ETH, CRYPTOS_LEDGER } from './crypto';
 import { ENDPOINT_DEFAULT, ENDPOINTS } from './endpoints';
 import { LEDGER_CONN, LEDGER_CONN_DEFAULT } from './ledger';
 import { PREFIX_DEFAULT, PREFIXES } from './ss58';
-import { ICON_DEFAULT, ICON_DEFAULT_HOST, ICONS, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './ui';
+import { ICON_DEFAULT, ICON_DEFAULT_HOST, ICONS, NOTIFICATION_DEFAULT, UIMODE_DEFAULT, UIMODES, UITHEME_DEFAULT, UITHEMES } from './ui';
 
 const CAMERA_DEFAULT = 'off';
 
@@ -46,6 +46,7 @@ export {
   CAMERA,
   CRYPTOS,
   CRYPTOS_ETH,
+  CRYPTOS_LEDGER,
   ENDPOINT_DEFAULT,
   ENDPOINTS,
   ICON_DEFAULT,
@@ -56,6 +57,7 @@ export {
   LEDGER_CONN,
   LOCKING_DEFAULT,
   LOCKING,
+  NOTIFICATION_DEFAULT,
   PREFIX_DEFAULT,
   PREFIXES,
   UIMODE_DEFAULT,

packages/ui-settings/src/defaults/ledger.ts

@@ -19,7 +19,12 @@ export const LEDGER_CONN: Option[] = [
   // },
   {
     info: 'webusb',
-    text: 'Attach Ledger via WebUSB',
+    text: 'Attach Ledger via WebUSB (Chrome, recommended)',
     value: 'webusb'
+  },
+  {
+    info: 'hid',
+    text: 'Attach Ledger via WebHID (Chrome, experimental)',
+    value: 'hid'
   }
 ];

packages/ui-settings/src/defaults/ui.ts

@@ -70,11 +70,14 @@ const ICONS: Option[] = [
   }
 ];
 
+const NOTIFICATION_DEFAULT = 'popup';
+
 export {
   ICON_DEFAULT,
   ICON_DEFAULT_HOST,
   ICONS,
   LANGUAGE_DEFAULT,
+  NOTIFICATION_DEFAULT,
   UIMODE_DEFAULT,
   UIMODES,
   UITHEME_DEFAULT,

packages/ui-settings/src/index.ts

@@ -4,6 +4,7 @@
 import { Settings, settings } from './Settings';
 
 export { ENDPOINT_DEFAULT, ICON_DEFAULT, ICON_DEFAULT_HOST, LANGUAGE_DEFAULT, LOCKING_DEFAULT, PREFIX_DEFAULT, UIMODE_DEFAULT, UITHEME_DEFAULT } from './defaults';
+export { packageInfo } from './packageInfo';
 
 export { settings, Settings };
 

packages/ui-settings/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/ui-settings authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/ui-settings', version: '0.83.1' };

packages/ui-settings/src/types.ts

@@ -9,12 +9,14 @@ export type Option = {
 }
 
 export interface SettingsStruct {
+  apiType: Endpoint;
   apiUrl: string;
   camera: string;
   i18nLang: string;
   icon: string;
   ledgerConn: string;
   locking: string;
+  notification: string;
   prefix: number;
   uiMode: string;
   uiTheme: string;
@@ -28,3 +30,10 @@ export interface NetworkSpecsStruct {
   title: string;
   unit: string;
 }
+
+export interface Endpoint {
+  type: EndpointType;
+  param: string;
+}
+
+export type EndpointType = 'json-rpc' | 'substrate-connect';

packages/ui-shared/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@polkadot/ui-shared",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "description": "Shared logic that is usable accross all frameworks-specific areas",
   "main": "index.js",
-  "module": "index.mjs",
   "sideEffects": false,
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
+    "@babel/runtime": "^7.14.6",
     "color": "^3.1.3"
   },
   "peerDependencies": {
@@ -17,8 +17,8 @@
     "@polkadot/util-crypto": "*"
   },
   "devDependencies": {
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/util-crypto": "^5.2.4-7",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/util-crypto": "^6.11.1",
     "@types/color": "^3.0.1",
     "@types/xmlserializer": "^0.6.2"
   }

packages/ui-shared/src/index.ts

@@ -2,3 +2,4 @@
 // SPDX-License-Identifier: Apache-2.0
 
 export * from './icons';
+export { packageInfo } from './packageInfo';

packages/ui-shared/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/ui-shared authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/ui-shared', version: '0.83.1' };

packages/vue-identicon/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@polkadot/vue-identicon",
-  "version": "0.66.1",
+  "version": "0.83.1",
+  "type": "module",
   "description": "Renders an SVG picture representing an address",
   "author": "Jaco Greeff <jacogr@gmail.com>",
   "maintainers": [],
   "main": "index.js",
-  "module": "index.mjs",
-  "sideEffects": false,
+  "sideEffects": [
+    "./detectPackage.js",
+    "./detectPackage.cjs"
+  ],
   "license": "Apache-2.0",
   "dependencies": {
-    "@babel/runtime": "^7.12.5",
-    "@polkadot/ui-shared": "0.66.1",
-    "@polkadot/util": "^5.2.4-7",
-    "@polkadot/util-crypto": "^5.2.4-7",
+    "@babel/runtime": "^7.14.6",
+    "@polkadot/ui-shared": "0.83.1",
+    "@polkadot/util": "^6.11.1",
+    "@polkadot/util-crypto": "^6.11.1",
     "jdenticon": "3.1.0"
   },
   "peerDependencies": {
@@ -21,6 +24,6 @@
     "vue": "*"
   },
   "devDependencies": {
-    "vue": "^2.6.12"
+    "vue": "^2.6.14"
   }
 }

packages/vue-identicon/src/detectPackage.ts

@@ -0,0 +1,9 @@
+// Copyright 2017-2021 @polkadot/vue-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+import { packageInfo as sharedInfo } from '@polkadot/ui-shared/packageInfo';
+import { detectPackage } from '@polkadot/util';
+
+import { packageInfo } from './packageInfo';
+
+detectPackage(packageInfo, typeof __dirname !== 'undefined' && __dirname, [sharedInfo]);

packages/vue-identicon/src/index.ts

@@ -1,6 +1,10 @@
 // Copyright 2017-2021 @polkadot/vue-identicon authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
+import './detectPackage';
+
 import { Identicon } from './Identicon';
 
+export { packageInfo } from './packageInfo';
+
 export default Identicon;

packages/vue-identicon/src/packageInfo.ts

@@ -0,0 +1,6 @@
+// Copyright 2017-2021 @polkadot/vue-identicon authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// Auto-generated by @polkadot/dev, do not edit
+
+export const packageInfo = { name: '@polkadot/vue-identicon', version: '0.83.1' };