sync with master

.123trigger

@@ -1,8 +1,11 @@
-21
+26
+
 0.45.2
+
 0.71.2
 
 0.86.2
+
 0.91.2
 0.92.2
 0.92.3

.codeclimate.yml

@@ -1,3 +1,18 @@
+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/apps-config/src/api/**/*.ts"

.eslintrc.cjs

@@ -7,13 +7,10 @@ const base = require('@polkadot/dev/config/eslint.cjs');
 module.exports = {
   ...base,
   ignorePatterns: [
-    '.eslintrc.cjs',
-    '.github/**',
-    '.vscode/**',
-    '.yarn/**',
-    '**/build/*',
-    '**/coverage/*',
-    '**/node_modules/*'
+    ...base.ignorePatterns,
+    'jest/**/*',
+    'scripts/**/*',
+    '*.cjs'
   ],
   parserOptions: {
     ...base.parserOptions,

.github/workflows/lock.yml

@@ -2,7 +2,7 @@ name: 'Lock Threads'
 
 on:
   schedule:
-    - cron: '30 1/2 * * *'
+    - cron: '15 2/3 * * *'
 
 jobs:
   lock:

.github/workflows/pr-any.yml

@@ -5,7 +5,7 @@ jobs:
   pr:
     strategy:
       matrix:
-        step: ['lint', 'lint:css', 'test', 'build:code', 'build:i18n', 'build:electron']
+        step: ['lint', 'test', 'build:code', 'build:i18n', 'build:electron']
     name: ${{ matrix.step }}
     runs-on: ubuntu-latest
     steps:

.github/workflows/stale.yml

@@ -1,7 +1,7 @@
 name: 'Close stale issues and PRs'
 on:
   schedule:
-    - cron: '30 2/2 * * *'
+    - cron: '50 2/3 * * *'
 
 jobs:
   stale:

.gitignore

@@ -15,6 +15,7 @@ tmp/
 cc-test-reporter
 package-lock.json
 npm-debug.log*
+tsconfig.*buildinfo
 yarn-debug.log*
 yarn-error.log*
 .idea/

.yarnrc.yml

@@ -10,4 +10,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
 
-yarnPath: .yarn/releases/yarn-3.0.1.cjs
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

jest-slow.config.cjs

@@ -6,6 +6,6 @@ const config = require('./jest.config.cjs');
 module.exports = {
   ...config,
   displayName: 'all-tests',
-  globalSetup: './jest/globalSetup.ts',
-  globalTeardown: './jest/globalTeardown.ts'
+  globalSetup: './jest/globalSetup.cjs',
+  globalTeardown: './jest/globalTeardown.cjs'
 };

jest/globalSetup.ts → jest/globalSetup.cjs

@@ -1,11 +1,7 @@
 // Copyright 2017-2021 @polkadot/apps authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { AlwaysPullPolicy, GenericContainer, Wait } from 'testcontainers';
-
-import { SubstrateTestsGlobal } from './substrateTestsGlobal';
-
-declare const global: SubstrateTestsGlobal;
+const { AlwaysPullPolicy, GenericContainer, Wait } = require('testcontainers');
 
 const startSubstrate = async () => {
   console.log('Substrate container starting...');
@@ -24,6 +20,6 @@ const startSubstrate = async () => {
   global.__SUBSTRATE__ = startedTestContainer;
 };
 
-export default async (): Promise<void> => {
+module.exports = async () => {
   await startSubstrate();
 };

jest/globalTeardown.ts → jest/globalTeardown.cjs

@@ -1,11 +1,7 @@
 // Copyright 2017-2021 @polkadot/apps authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import { SubstrateTestsGlobal } from './substrateTestsGlobal';
-
-declare const global: SubstrateTestsGlobal;
-
-export default async (): Promise<void> => {
+module.exports = async () => {
   console.log('Shutting down Substrate container...');
 
   await global.__SUBSTRATE__.stop();

jest/jest-setup.ts

@@ -3,9 +3,13 @@
 
 import '@testing-library/jest-dom';
 
+import { configure } from '@testing-library/dom';
+
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 // eslint-disable-next-line no-global-assign
 CSS = { supports (): boolean {
   return false;
 } };
+
+configure({ asyncUtilTimeout: 10000 });

package.json

@@ -1,117 +1,109 @@
 {
-  "name": "polkadot-apps",
-  "repository": "https://github.com/polkadot-js/apps",
-  "main": "packages/apps-electron/build/electron.js",
-  "description": "An Apps portal into the Polkadot network",
   "author": "Jaco Greeff <[email protected]>",
-  "private": true,
-  "version": "0.95.2-101",
+  "bugs": "https://github.com/polkadot-js/apps/issues",
+  "description": "An Apps portal into the Polkadot network",
+  "homepage": "https://github.com/polkadot-js/apps#readme",
   "license": "Apache-2",
-  "homepage": ".",
+  "name": "polkadot-apps",
+  "packageManager": "[email protected]",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/polkadot-js/apps.git"
+  },
+  "sideEffects": false,
+  "version": "0.100.2-0",
   "workspaces": [
     "packages/*"
   ],
-  "resolutions": {
-    "@polkadot/api": "^5.8.4-1",
-    "@polkadot/api-contract": "^5.8.4-1",
-    "@polkadot/hw-ledger": "^7.3.1",
-    "@polkadot/keyring": "^7.3.1",
-    "@polkadot/networks": "^7.3.1",
-    "@polkadot/phishing": "^0.6.283",
-    "@polkadot/types": "^5.8.4-1",
-    "@polkadot/types-known": "^5.8.4-1",
-    "@polkadot/types-support": "^5.8.4-1",
-    "@polkadot/util": "^7.3.1",
-    "@polkadot/util-crypto": "^7.3.1",
-    "@polkadot/wasm-crypto": "^4.2.1",
-    "babel-core": "^7.0.0-bridge.0",
-    "styled-components": "^5.2.0",
-    "typescript": "^4.4.2"
-  },
+  "main": "packages/apps-electron/build/electron.js",
   "scripts": {
     "analyze": "yarn clean && BUILD_ANALYZE=1 yarn run build:code && yarn source-map-explorer packages/apps/build/main.*.js",
     "build": "yarn run build:i18n && yarn run build:code",
     "build:code": "NODE_ENV=production yarn polkadot-dev-build-ts",
+    "build:devElectronMain": "cd packages/apps-electron && yarn webpack --config webpack.main.cjs",
+    "build:devElectronRenderer": "cd packages/apps-electron && yarn webpack --config webpack.renderer.cjs",
+    "build:electron": "yarn clean:electronBuild && yarn build:electronMain && yarn build:electronRenderer",
+    "build:electronMain": "cd packages/apps-electron && NODE_ENV=production yarn webpack --config webpack.main.cjs",
+    "build:electronRenderer": "cd packages/apps-electron && NODE_ENV=production yarn webpack --config webpack.renderer.cjs",
     "build:i18n": "i18next-scanner --config i18next-scanner.config.cjs && node ./scripts/i18nSort.cjs",
     "build:release:electron": "yarn build && yarn build:electron && yarn postinstall:electron",
-    "build:release:ipfs": "node scripts/ipfsUpload.cjs",
     "build:release:ghpages": "yarn polkadot-ci-ghact-docs",
-    "build:release:www": "yarn polkadot-ci-ghact-build && yarn build:release:ipfs && yarn build:release:ghpages",
+    "build:release:ipfs": "node scripts/ipfsUpload.mjs",
+    "build:release:www": "yarn polkadot-ci-ghact-build && yarn build:release:ghpages && yarn build:release:ipfs",
     "build:robohash": "node scripts/robohash.cjs",
     "build:www": "rm -rf packages/apps/build && mkdir -p packages/apps/build && yarn run build:i18n && cd packages/apps && yarn webpack --config webpack.config.cjs",
-    "build:electron": "yarn clean:electronBuild && yarn build:electronMain && yarn build:electronRenderer",
-    "build:devElectronRenderer": "cd packages/apps-electron && yarn webpack --config webpack.renderer.cjs",
-    "build:electronRenderer": "cd packages/apps-electron && NODE_ENV=production yarn webpack --config webpack.renderer.cjs",
-    "build:devElectronMain": "cd packages/apps-electron && yarn webpack --config webpack.main.cjs",
-    "build:electronMain": "cd packages/apps-electron && NODE_ENV=production yarn webpack --config webpack.main.cjs",
-    "packElectron:test": "yarn build:release:electron && electron-builder --dir",
-    "packElectron:mac": "yarn build:release:electron && electron-builder build --mac",
-    "packElectron:win": "yarn build:release:electron && electron-builder build --win",
-    "packElectron:linux": "yarn build:release:electron && electron-builder build --linux",
-    "packElectron": "yarn build:release:electron && yarn clean:electronRelease && electron-builder build -mwl",
-    "docs": "echo \"skipping docs\"",
-    "ci:chainEndpoints": "polkadot-dev-run-test --silent packages/apps-config/src/ci/chainEndpoints",
-    "ci:chainTypes": "polkadot-dev-run-test --silent packages/apps-config/src/ci/chainTypes",
+    "ci:chainEndpoints": "polkadot-dev-run-test packages/apps-config/src/ci/chainEndpoints",
+    "ci:chainTypes": "polkadot-dev-run-test packages/apps-config/src/ci/chainTypes",
     "clean": "polkadot-dev-clean-build",
     "clean:electronBuild": "cd packages/apps-electron && polkadot-dev-clean-build",
     "clean:electronRelease": "cd packages/apps-electron && rm -rf release",
     "clean:i18n": "rm -rf packages/apps/public/locales/en && mkdir -p packages/apps/public/locales/en",
+    "docs": "echo \"skipping docs\"",
     "lint": "polkadot-dev-run-lint",
-    "lint:css": "stylelint './packages/**/src/**/*.tsx'",
+    "packElectron": "yarn build:release:electron && yarn clean:electronRelease && electron-builder build -mwl",
+    "packElectron:linux": "yarn build:release:electron && electron-builder build --linux",
+    "packElectron:mac": "yarn build:release:electron && electron-builder build --mac",
+    "packElectron:test": "yarn build:release:electron && electron-builder --dir",
+    "packElectron:win": "yarn build:release:electron && electron-builder build --win",
     "postinstall": "polkadot-dev-yarn-only",
     "postinstall:electron": "electron-builder install-app-deps",
-    "test:skipped": "echo 'tests skipped'",
+    "start": "yarn clean && cd packages/apps && yarn webpack-cli serve --config webpack.serve.cjs --port 3000",
+    "start:electron": "yarn clean:electronBuild && concurrently 'yarn build:devElectronMain && cd packages/apps-electron && electron ./build/electron.js' 'yarn build:devElectronRenderer'",
     "test": "polkadot-dev-run-test --runInBand --testPathIgnorePatterns slow --testNamePattern='^((?!--SLOW--).)*$'",
     "test:all": "polkadot-dev-run-test --runInBand --config ./jest-slow.config.cjs",
     "test:one": "polkadot-dev-run-test",
-    "start": "yarn clean && cd packages/apps && yarn webpack-cli serve --config webpack.serve.cjs --port 3000",
-    "start:electron": "yarn clean:electronBuild && concurrently 'yarn build:devElectronMain && cd packages/apps-electron && electron ./build/electron.js' 'yarn build:devElectronRenderer'"
+    "test:skipped": "echo 'tests skipped'"
   },
   "devDependencies": {
-    "@babel/core": "^7.15.5",
-    "@babel/register": "^7.15.3",
-    "@babel/runtime": "^7.15.4",
+    "@babel/core": "^7.16.5",
+    "@babel/register": "^7.16.5",
+    "@babel/runtime": "^7.16.5",
     "@crustio/crust-pin": "^1.0.0",
     "@pinata/sdk": "^1.1.23",
-    "@polkadot/dev": "^0.62.66",
-    "@polkadot/ts": "^0.4.7",
+    "@polkadot/dev": "^0.64.22",
     "@types/bn.js": "^4.11.6",
-    "@types/chart.js": "^2.9.34",
-    "@types/file-saver": "^2.0.3",
-    "@types/jest": "^27.0.1",
-    "@types/node": "15.12.2",
+    "@types/chart.js": "^2.9.35",
+    "@types/file-saver": "^2.0.4",
+    "@types/jest": "^27.0.3",
     "@types/react-beautiful-dnd": "^13.1.2",
-    "@types/react-copy-to-clipboard": "^5.0.1",
-    "@types/react-dom": "^17.0.9",
-    "@types/react-router-dom": "^5.1.8",
+    "@types/react-copy-to-clipboard": "^5.0.2",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-router-dom": "^5.3.2",
     "@types/store": "^2.0.2",
-    "@types/styled-components": "^5.1.14",
+    "@types/styled-components": "^5.1.19",
     "@types/styled-theming": "^2.2.5",
-    "concurrently": "^6.2.1",
+    "concurrently": "^6.5.1",
     "devtron": "^1.4.0",
     "dnslink-cloudflare": "^3.0.0",
-    "electron": "^12.0.12",
-    "electron-builder": "22.11.7",
+    "electron": "^12.2.3",
+    "electron-builder": "22.14.11",
     "electron-builder-notarize": "^1.2.0",
-    "i18next-scanner": "^3.0.0",
+    "i18next-scanner": "^3.1.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-is": "^17.0.2",
     "source-map-explorer": "^2.5.2",
-    "styled-components": "^5.3.1",
-    "stylelint": "^13.13.1",
-    "stylelint-config-recommended": "^5.0.0",
-    "stylelint-config-styled-components": "^0.1.1",
-    "webpack": "^5.52.0",
-    "webpack-cli": "^4.8.0"
+    "styled-components": "^5.3.3",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1"
   },
-  "packageManager": "[email protected]",
-  "dependencies": {
-    "@metamask/detect-provider": "^1.2.0",
-    "assert": "^2.0.0",
-    "https-browserify": "^1.0.0",
-    "os-browserify": "^0.3.0",
-    "stream-http": "^3.2.0",
-    "web3": "^1.3.5"
+  "resolutions": {
+    "@polkadot/api": "^7.1.1",
+    "@polkadot/api-contract": "^7.1.1",
+    "@polkadot/hw-ledger": "^8.2.2",
+    "@polkadot/keyring": "^8.2.2",
+    "@polkadot/networks": "^8.2.2",
+    "@polkadot/phishing": "^0.6.582",
+    "@polkadot/rpc-provider": "^7.1.1",
+    "@polkadot/types": "^7.1.1",
+    "@polkadot/types-known": "^7.1.1",
+    "@polkadot/types-support": "^7.1.1",
+    "@polkadot/util": "^8.2.2",
+    "@polkadot/util-crypto": "^8.2.2",
+    "@polkadot/wasm-crypto": "^4.5.1",
+    "babel-core": "^7.0.0-bridge.0",
+    "styled-components": "^5.3.1",
+    "typescript": "^4.5.4"
   }
 }