feat: update polkadot dependent

.yarnrc.yml

@@ -9,7 +9,5 @@ plugins:
     spec: "@yarnpkg/plugin-interactive-tools"
   - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
     spec: "@yarnpkg/plugin-version"
-  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
-    spec: "@yarnpkg/plugin-workspace-tools"
 
-yarnPath: .yarn/releases/yarn-2.3.3.cjs
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

package.json

@@ -1,96 +1,98 @@
 {
-  "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]>",
-  "version": "0.68.2-19",
+  "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",
+  "name": "chainx-dapp-wallet-v2",
   "private": true,
-  "homepage": ".",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/chainx-org/chainx-dapp-wallet-v2.git"
+  },
+  "sideEffects": false,
+  "version": "0.68.2-19",
   "workspaces": [
     "packages/*"
   ],
-  "resolutions": {
-    "@polkadot/api": "^2.8.2-3",
-    "@polkadot/api-contract": "^2.8.2-3",
-    "@polkadot/keyring": "^4.2.1",
-    "@polkadot/networks": "^4.2.1",
-    "@polkadot/types": "^2.8.2-3",
-    "@polkadot/util": "^4.2.1",
-    "@polkadot/util-crypto": "^4.2.1",
-    "@polkadot/wasm-crypto": "^2.0.1",
-    "@chainx-v2/api": "^0.0.50",
-    "babel-core": "^7.0.0-bridge.0",
-    "styled-components": "^5.2.0",
-    "typescript": "^4.0.3"
-  },
+  "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 node_modules/@polkadot/dev/scripts/polkadot-dev-build-ts.cjs",
+    "build:code": "NODE_ENV=production yarn polkadot-dev-build-ts",
+    "build:devElectronMain": "cd packages/apps-electron && NODE_ENV=development webpack --config webpack.main.config.js",
+    "build:devElectronRenderer": "cd packages/apps-electron && NODE_ENV=development webpack --config webpack.renderer.config.js",
+    "build:electron": "yarn clean:electronBuild && yarn build:electronMain && yarn build:electronRenderer",
+    "build:electronMain": "cd packages/apps-electron && NODE_ENV=production webpack --config webpack.main.config.js",
+    "build:electronRenderer": "cd packages/apps-electron && NODE_ENV=production webpack --config webpack.renderer.config.js",
     "build:i18n": "i18next-scanner --config i18next-scanner.config.js && node ./scripts/i18nSort.js",
     "build:release:electron": "yarn build && yarn build:electron && yarn postinstall:electron",
-    "build:release:ipfs": "node scripts/ipfsUpload.js",
     "build:release:ghpages": "yarn polkadot-ci-ghact-docs",
+    "build:release:ipfs": "node scripts/ipfsUpload.js",
     "build:release:www": "yarn polkadot-ci-ghact-build && yarn build:release:ipfs && yarn build:release:ghpages",
     "build:robohash": "node scripts/robohash.js",
     "build:www": "rm -rf packages/apps/build && mkdir -p packages/apps/build && yarn run build:i18n && cd packages/apps && NODE_ENV=production webpack --config webpack.config.js",
-    "build:electron": "yarn clean:electronBuild && yarn build:electronMain && yarn build:electronRenderer",
-    "build:devElectronRenderer": "cd packages/apps-electron && NODE_ENV=development webpack --config webpack.renderer.config.js",
-    "build:electronRenderer": "cd packages/apps-electron && NODE_ENV=production webpack --config webpack.renderer.config.js",
-    "build:devElectronMain": "cd packages/apps-electron && NODE_ENV=development webpack --config webpack.main.config.js",
-    "build:electronMain": "cd packages/apps-electron && NODE_ENV=production webpack --config webpack.main.config.js",
-    "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\"",
     "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",
+    "start": "yarn clean && cd packages/apps && webpack --config webpack.config.js",
+    "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 --selectProjects=fast-tests --silent --testPathIgnorePatterns slow --testNamePattern='^((?!--SLOW--).)*$'",
     "test:all": "polkadot-dev-run-test --selectProjects=all-tests --silent",
-    "test:one": "polkadot-dev-run-test",
-    "start": "yarn clean && cd packages/apps && webpack --config webpack.config.js",
-    "start:electron": "yarn clean:electronBuild && concurrently 'yarn build:devElectronMain && cd packages/apps-electron && electron ./build/electron.js' 'yarn build:devElectronRenderer'"
+    "test:one": "polkadot-dev-run-test"
+  },
+  "dependencies": {
+    "@ethersproject/providers": "^5.5.1",
+    "@web3-react/core": "^6.1.9",
+    "@web3-react/injected-connector": "^6.0.7",
+    "@web3-react/walletconnect-connector": "^6.2.8",
+    "bignumber.js": "^9.0.1",
+    "ethers": "^5.5.2",
+    "klinecharts": "^5.7.0",
+    "uniqid": "^5.2.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.12.8",
-    "@babel/register": "^7.12.1",
-    "@babel/runtime": "^7.12.5",
-    "@pinata/sdk": "^1.1.11",
-    "@polkadot/dev": "^0.60.5",
-    "@polkadot/ts": "^0.3.55",
+    "@babel/core": "^7.16.0",
+    "@babel/register": "^7.16.0",
+    "@babel/runtime": "^7.16.3",
+    "@pinata/sdk": "^1.1.23",
+    "@polkadot/dev": "0.64.19",
+    "@polkadot/ts": "^0.4.21",
     "@types/bn.js": "^4.11.6",
-    "@types/chart.js": "^2.9.28",
-    "@types/file-saver": "^2.0.1",
-    "@types/jest": "^26.0.15",
-    "@types/react-beautiful-dnd": "^13.0.0",
-    "@types/react-copy-to-clipboard": "^4.3.0",
-    "@types/react-dom": "^16.9.10",
-    "@types/react-router-dom": "^5.1.6",
+    "@types/chart.js": "^2.9.34",
+    "@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.2",
+    "@types/react-dom": "^17.0.11",
+    "@types/react-router-dom": "^5.3.2",
     "@types/store": "^2.0.2",
-    "@types/styled-components": "^5.1.4",
+    "@types/styled-components": "^5.1.17",
     "@types/styled-theming": "^2.2.5",
-    "concurrently": "^5.3.0",
+    "concurrently": "^6.4.0",
     "devtron": "^1.4.0",
     "dnslink-cloudflare": "^3.0.0",
-    "electron": "^10.1.6",
-    "electron-builder": "^22.9.1",
+    "electron": "^12.2.3",
+    "electron-builder": "^22.14.5",
     "electron-builder-notarize": "^1.2.0",
-    "i18next-scanner": "^2.11.0",
-    "react": "^17.0.1",
-    "react-dom": "^17.0.1",
-    "react-is": "^17.0.1",
-    "source-map-explorer": "^2.5.0",
-    "styled-components": "^5.2.1",
+    "i18next-scanner": "^3.1.0",
+    "k8s-deploy-cli": "^0.1.5",
+    "react": "^17.0.2",
+    "react-dom": "^17.0.2",
+    "react-is": "^17.0.2",
+    "source-map-explorer": "^2.5.2",
+    "styled-components": "^5.3.3",
     "stylelint": "^13.8.0",
     "stylelint-config-recommended": "^3.0.0",
     "stylelint-config-styled-components": "^0.1.1",
@@ -100,14 +102,23 @@
     "webpack-merge": "^5.4.0",
     "webpack-plugin-serve": "^1.2.0"
   },
-  "dependencies": {
-    "@ethersproject/providers": "^5.5.2",
-    "@web3-react/core": "^6.1.9",
-    "@web3-react/injected-connector": "^6.0.7",
-    "@web3-react/walletconnect-connector": "^6.2.8",
-    "bignumber.js": "^9.0.1",
-    "ethers": "^5.5.3",
-    "klinecharts": "^5.7.0",
-    "uniqid": "^5.2.0"
+  "resolutions": {
+    "@chainx-v2/api": "^0.0.50",
+    "@polkadot/api": "^6.11.1",
+    "@polkadot/api-contract": "^6.11.1",
+    "@polkadot/hw-ledger": "^8.1.2",
+    "@polkadot/keyring": "^8.1.2",
+    "@polkadot/networks": "^8.1.2",
+    "@polkadot/phishing": "^0.6.512",
+    "@polkadot/rpc-provider": "^6.11.1",
+    "@polkadot/types": "^6.11.1",
+    "@polkadot/types-known": "^6.11.1",
+    "@polkadot/types-support": "^6.11.1",
+    "@polkadot/util": "^8.1.2",
+    "@polkadot/util-crypto": "^8.1.2",
+    "@polkadot/wasm-crypto": "^4.5.1",
+    "babel-core": "^7.0.0-bridge.0",
+    "styled-components": "^5.3.1",
+    "typescript": "^4.5.4"
   }
 }

packages/apps-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/apps-config",
-  "version": "0.68.2-19",
+  "version": "0.98.2-142",
   "main": "index.js",
   "sideEffects": true,
   "repository": "github:polkadot-js/apps",
@@ -9,15 +9,41 @@
   "contributors": [],
   "license": "Apache-2.0",
   "dependencies": {
-    "@acala-network/type-definitions": "^0.4.0-beta.33",
-    "@babel/runtime": "^7.12.5",
-    "@edgeware/node-types": "^3.0.10",
-    "@laminar/type-definitions": "^0.2.0-beta.141",
-    "@polkadot/networks": "^4.2.1",
-    "@sora-substrate/type-definitions": "^0.1.4",
-    "@subsocial/types": "^0.4.23"
+    "@acala-network/type-definitions": "^3.0.2-4",
+    "@babel/runtime": "^7.16.3",
+    "@bifrost-finance/type-definitions": "1.3.15",
+    "@crustio/type-definitions": "1.2.0",
+    "@darwinia/types": "2.6.100-1",
+    "@digitalnative/type-definitions": "1.1.26",
+    "@docknetwork/node-types": "0.6.0",
+    "@edgeware/node-types": "^3.6.2-wako",
+    "@equilab/definitions": "1.4.6",
+    "@interlay/interbtc-types": "1.3.0",
+    "@kiltprotocol/type-definitions": "0.1.23",
+    "@laminar/type-definitions": "^0.3.1",
+    "@metaverse-network-sdk/type-definitions": "^0.0.1-6",
+    "@parallel-finance/type-definitions": "1.4.4",
+    "@phala/typedefs": "0.2.29",
+    "@polkadot/api": "^6.11.1",
+    "@polkadot/api-derive": "^6.12.1",
+    "@polkadot/networks": "^8.1.2",
+    "@polkadot/types": "^6.11.1",
+    "@polkadot/util": "^8.2.2",
+    "@polymathnetwork/polymesh-types": "0.0.2",
+    "@snowfork/snowbridge-types": "0.2.6",
+    "@sora-substrate/type-definitions": "^1.6.30",
+    "@subsocial/types": "^0.6.5-dev.6",
+    "@unique-nft/types": "0.2.0",
+    "@zeitgeistpm/type-defs": "0.3.7",
+    "@zeroio/type-definitions": "0.0.14",
+    "bn.js": "^4.12.0",
+    "i18next": "^21.6.0",
+    "lodash": "^4.17.21",
+    "moonbeam-types-bundle": "2.0.2",
+    "pontem-types-bundle": "1.0.15",
+    "rxjs": "^7.4.0"
   },
   "devDependencies": {
-    "i18next": "^19.8.4"
+    "i18next": "^21.6.0"
   }
 }

packages/apps-config/src/api/chain/beresheet.ts

@@ -4,10 +4,10 @@
 // structs need to be in order
 /* eslint-disable sort-keys */
 
-import { Beresheet } from '@edgeware/node-types';
+import { spec } from '@edgeware/node-types';
 
 export default {
-  ...Beresheet.types,
+  ...spec.typesBundle,
   // Substrate overrides
   RefCount: 'u32'
 };

packages/apps-config/src/api/chain/crust-maxwell.ts

@@ -0,0 +1,103 @@
+// Copyright 2017-2022 @polkadot/apps-config authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
+// structs need to be in order
+/* eslint-disable sort-keys */
+
+export default {
+  AccountInfo: 'AccountInfoWithProviders',
+  Address: 'AccountId',
+  AddressInfo: 'Vec<u8>',
+  LookupSource: 'AccountId',
+  EraBenefits: {
+    total_benefits: 'Balance',
+    total_funds: 'Balance',
+    used_benefits: 'Balance',
+    active_era: 'EraIndex'
+  },
+  FeeReductionBenefit: {
+    funds: 'Balance',
+    total_fee_reduction_count: 'u32',
+    used_fee_reduction_quota: 'Balance',
+    used_fee_reduction_count: 'u32',
+    refreshed_at: 'EraIndex'
+  },
+  CsmBalance: 'Balance',
+  CsmBalanceOf: 'Balance',
+  ETHAddress: 'Vec<u8>',
+  EthereumTxHash: 'H256',
+  CSMLedger: {
+    total: 'Compact<Balance>',
+    active: 'Compact<Balance>',
+    unlocking: 'Vec<CSMUnlockChunk<Balance>>'
+  },
+  CSMUnlockChunk: {
+    value: 'Compact<Balance>',
+    bn: 'Compact<BlockNumber>'
+  },
+  FileInfo: {
+    file_size: 'u64',
+    expired_on: 'BlockNumber',
+    calculated_at: 'BlockNumber',
+    amount: 'Balance',
+    prepaid: 'Balance',
+    reported_replica_count: 'u32',
+    replicas: 'Vec<Replica<AccountId>>'
+  },
+  MerchantLedger: {
+    reward: 'Balance',
+    collateral: 'Balance'
+  },
+  Releases: {
+    _enum: ['V1_0_0', 'V2_0_0']
+  },
+  Replica: {
+    who: 'AccountId',
+    valid_at: 'BlockNumber',
+    anchor: 'SworkerAnchor',
+    is_reported: 'bool'
+  },
+  Status: {
+    _enum: ['Free', 'Reserved']
+  },
+  UsedInfo: {
+    used_size: 'u64',
+    reported_group_count: 'u32',
+    groups: 'BTreeMap<SworkerAnchor, bool>'
+  },
+  Guarantee: {
+    targets: 'Vec<IndividualExposure<AccountId, Balance>>',
+    total: 'Compact<Balance>',
+    submitted_in: 'EraIndex',
+    suppressed: 'bool'
+  },
+  ValidatorPrefs: {
+    guarantee_fee: 'Compact<Perbill>'
+  },
+  IASSig: 'Vec<u8>',
+  Identity: {
+    anchor: 'SworkerAnchor',
+    punishment_deadline: 'u64',
+    group: 'Option<AccountId>'
+  },
+  ISVBody: 'Vec<u8>',
+  MerkleRoot: 'Vec<u8>',
+  ReportSlot: 'u64',
+  PKInfo: {
+    code: 'SworkerCode',
+    anchor: 'Option<SworkerAnchor>'
+  },
+  SworkerAnchor: 'Vec<u8>',
+  SworkerCert: 'Vec<u8>',
+  SworkerCode: 'Vec<u8>',
+  SworkerPubKey: 'Vec<u8>',
+  SworkerSignature: 'Vec<u8>',
+  WorkReport: {
+    report_slot: 'u64',
+    used: 'u64',
+    free: 'u64',
+    reported_files_size: 'u64',
+    reported_srd_root: 'MerkleRoot',
+    reported_files_root: 'MerkleRoot'
+  }
+};

packages/apps-config/src/api/chain/index.ts

@@ -1,11 +1,13 @@
 // Copyright 2017-2020 @polkadot/apps-config authors & contributors
 // SPDX-License-Identifier: Apache-2.0
 
-import Beresheet from './beresheet';
-import Phala from './phala';
+import { typesChain } from '@phala/typedefs';
+// import Beresheet from './beresheet';
+import CrustMaxwell from './crust-maxwell';
 
 // alphabetical, based on the actual displayed name
 export default {
-  Beresheet,
-  'Phala PoC-2': Phala
+  ...typesChain,
+  'Crust Maxwell': CrustMaxwell
+  // 'Phala PoC-2': Phala
 };