diff --git a/package.json b/package.json index 6ad0ad252174..f46d51080d49 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.35", - "@polkadot/api-contract": "^0.97.0-beta.35", + "@polkadot/api": "^0.97.0-beta.38", + "@polkadot/api-contract": "^0.97.0-beta.38", "@polkadot/keyring": "^1.7.1", - "@polkadot/types": "^0.97.0-beta.35", + "@polkadot/types": "^0.97.0-beta.38", "@polkadot/util": "^1.7.1", "@polkadot/util-crypto": "^1.7.1", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index ab933f8c235a..843d924a83d2 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api-contract": "^0.97.0-beta.35", + "@polkadot/api-contract": "^0.97.0-beta.38", "@polkadot/react-components": "^0.37.0-beta.131" } } diff --git a/packages/app-staking/src/Targets/index.tsx b/packages/app-staking/src/Targets/index.tsx index 04a280e6a15b..b3c3309cdd66 100644 --- a/packages/app-staking/src/Targets/index.tsx +++ b/packages/app-staking/src/Targets/index.tsx @@ -196,10 +196,18 @@ export default translate( margin: 1.5rem auto; tr { + border: 0px solid #f2f2f2; + border-left-width: 1px; + border-right-width: 1px; + &:nth-child(even) { background: #f2f2f2; } + &:nth-child(odd) { + background: white; + } + td, th { text-align: left; } diff --git a/packages/app-staking/src/unsafeChains.ts b/packages/app-staking/src/unsafeChains.ts index 05b7c38f399c..d45389e691be 100644 --- a/packages/app-staking/src/unsafeChains.ts +++ b/packages/app-staking/src/unsafeChains.ts @@ -2,7 +2,7 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. -export const UNSAFE_CHAINS = ['Development', 'Kusama CC1', 'Kusama CC2', 'Kusama']; +export const UNSAFE_CHAINS = ['Development', 'Kusama CC1', 'Kusama CC2', 'Kusama CC3', 'Kusama']; export default function detectUnsafe (chain: Text | string): boolean { return UNSAFE_CHAINS.includes(chain.toString()); diff --git a/packages/react-api/package.json b/packages/react-api/package.json index e2de5c327430..1cd23c1ba2a0 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.4", - "@polkadot/api": "^0.97.0-beta.35", + "@polkadot/api": "^0.97.0-beta.38", "@polkadot/extension-dapp": "^0.14.0-beta.6", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-api/src/overrides/spec/edgeware.ts b/packages/react-api/src/overrides/spec/edgeware.ts index 2801c602d0cc..d87131362b67 100644 --- a/packages/react-api/src/overrides/spec/edgeware.ts +++ b/packages/react-api/src/overrides/spec/edgeware.ts @@ -11,5 +11,6 @@ export default { ...IdentityTypes, ...SignalingTypes, ...TreasuryRewardTypes, - ...VotingTypes + ...VotingTypes, + Keys: 'SessionKeys3' }; diff --git a/packages/react-components/src/ChainImg.tsx b/packages/react-components/src/ChainImg.tsx index 89d7cff085c9..d5910d767914 100644 --- a/packages/react-components/src/ChainImg.tsx +++ b/packages/react-components/src/ChainImg.tsx @@ -25,7 +25,8 @@ import substrate from '@polkadot/ui-assets/substrate-hexagon.svg'; const CHAINS: Record = { Kusama: chainKusama, // old name, the W3F nodes still has these 'Kusama CC1': chainKusama, - 'Kusama CC2': chainKusama + 'Kusama CC2': chainKusama, + 'Kusama CC3': chainKusama }; // overrides based on the actual software node type diff --git a/packages/react-components/src/LinkPolkascan.tsx b/packages/react-components/src/LinkPolkascan.tsx index 6582ff772592..3188a36d2937 100644 --- a/packages/react-components/src/LinkPolkascan.tsx +++ b/packages/react-components/src/LinkPolkascan.tsx @@ -24,7 +24,8 @@ const CHAINS: Record = { Alexander: 'alexander', Kusama: 'kusama-cc1', // old name via W3F nodes 'Kusama CC1': 'kusama-cc1', - 'Kusama CC2': 'kusama-cc2' + 'Kusama CC2': 'kusama-cc2', + 'Kusama CC3': 'kusama-cc3' }; const TYPES: Record = { diff --git a/yarn.lock b/yarn.lock index 19e8bab938ca..6ef10644b11b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2029,36 +2029,36 @@ dependencies: "@types/node" ">= 8" -"@polkadot/api-contract@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.35.tgz#ece83c5aad5482c1ec4f29ee2d57218e7f29e435" - integrity sha512-WKWKtLmxZtJYoMg3hf+4i+Rf9OK6nQsis9/sXeLfD8v2RQ6gHxbxdtpcuy9+BUlJpe6YoH342JE3xgdqAp8sKQ== +"@polkadot/api-contract@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/api-contract/-/api-contract-0.97.0-beta.38.tgz#3637dcbeb07f10ee85873a1a3571a75f8a034834" + integrity sha512-+QbzyQHa3AV0Lzf2YDFSNAa+p1rBOO+yihuh7ENVfwUj5WEc9JiJjS5evhtUg7E22sXbyA0K1cAJw2+H/goVxQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.35" + "@polkadot/types" "^0.97.0-beta.38" -"@polkadot/api-derive@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.35.tgz#453421688d36ff2be104699909f050c648583f50" - integrity sha512-QkLZc8m0xD9Yje8H+jY4uHoDP4r/w8P07SVvptQZ5ktBsaJ+uA+kmGjaKjOHDKsBvlXGnEQ+B5VSo7Mj9hlBNA== +"@polkadot/api-derive@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/api-derive/-/api-derive-0.97.0-beta.38.tgz#2d603586b1cebaf1d8c36cb58f65b16c2fda504d" + integrity sha512-+ugr8P24YQrLfcjqbbRXQY5ZVlL/XcoWV1DvQ0QBv02h8UBIcjS2YXzgXUhOI6kdkXIWfcJBfasujMwEXyfiVg== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api" "^0.97.0-beta.35" - "@polkadot/types" "^0.97.0-beta.35" + "@polkadot/api" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.38" -"@polkadot/api@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.35.tgz#8772c4addb2a00ebb07d5700928b1e3094928c59" - integrity sha512-+Ct2MOhxTA9yPQJhgP360jeqFi1Cd/MSQcsppsDPCVigcYJzQ/NscY8hElE/FW6mnse9nVGhigewKp1VZgeAuA== +"@polkadot/api@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.97.0-beta.38.tgz#fb33c75ee1f46b5f3e7597e403c41b953e273aa5" + integrity sha512-3yd0b1pPznHU65XE1TyNFtfwoR4vSnVzbv3h8X2hiCxWX+4cfw+yDEPGAC+wvfy5DIE7W0X3aqM2RHffQdmt3w== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/api-derive" "^0.97.0-beta.35" - "@polkadot/keyring" "^1.7.0-beta.8" - "@polkadot/metadata" "^0.97.0-beta.35" - "@polkadot/rpc-core" "^0.97.0-beta.35" - "@polkadot/rpc-provider" "^0.97.0-beta.35" - "@polkadot/types" "^0.97.0-beta.35" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/api-derive" "^0.97.0-beta.38" + "@polkadot/keyring" "^1.7.1" + "@polkadot/metadata" "^0.97.0-beta.38" + "@polkadot/rpc-core" "^0.97.0-beta.38" + "@polkadot/rpc-provider" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/util-crypto" "^1.7.1" "@polkadot/dev-react@^0.32.0-beta.15": version "0.32.0-beta.15" @@ -2161,14 +2161,14 @@ dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/jsonrpc@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.35.tgz#21bc1016751e5690337e16e3324142eca139cfdc" - integrity sha512-9YTkYqLsLlE2dOF67SDH4AWaWqfTDF1k8gbA4T1EoMUzmjuEDd1OGolIhd2IgMSWrkFvulTcWO3ndRREGy9V2A== +"@polkadot/jsonrpc@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.97.0-beta.38.tgz#ecee28fbc096586a5cdfdcb896c87a97381b95ba" + integrity sha512-NeF7wEUjKY3Tfyic7Sm0zdMQHwVQAlFS+sCKFr3max73Xctr5SxsjbHkZtQSwVaHkuMBcV9Ub+4u6KEL8J0Tzw== dependencies: "@babel/runtime" "^7.7.4" -"@polkadot/keyring@^1.7.0-beta.8", "@polkadot/keyring@^1.7.1": +"@polkadot/keyring@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-1.7.1.tgz#53a3dd87e547aaee0a877e4fc5fdfc4757e60a0d" integrity sha512-CWCnU0zsaot0QvEiasKfhCiVlZCIVKOQGPzXiVE9JSjoqTQQJ0BEdaEfM4x0/bFFvvsn/8RcjLPpxBPSfe2eOg== @@ -2177,15 +2177,15 @@ "@polkadot/util" "^1.7.1" "@polkadot/util-crypto" "^1.7.1" -"@polkadot/metadata@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.35.tgz#ce73220c974a14040072e40c493975b592dcba8c" - integrity sha512-yzdeog4Pjs3ba2cEe0tgvh53jGtB71OyuSgLZiKIV/VXaBXJKJ112u2voe//cfps1oU4vpnbPN9n956d04sebg== +"@polkadot/metadata@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/metadata/-/metadata-0.97.0-beta.38.tgz#ad41b8c7b3b354e6dd656763625c5138699a7c54" + integrity sha512-IfT7gzZjdLgYyojvi0U9mSGGM/IKBDNEOmYU09tYibsspfIHdRKT4qxwedZivD52EcuyW5cME0FNALQoFYcBbQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/types" "^0.97.0-beta.35" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" "@polkadot/react-identicon@^0.47.0-beta.11": version "0.47.0-beta.11" @@ -2212,27 +2212,27 @@ qrcode-generator "^1.4.4" react-qr-reader "^2.2.1" -"@polkadot/rpc-core@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.35.tgz#9c2af17af054b0146ed6873f0a43ef0e6d1883b1" - integrity sha512-ByKhRL8wMR7m90qaAZ6kz1hIHuagBn+xfM0vge9vrq9lIpvESIv+ZOWLIlShw3sZXFUkjiI5mGb+OGZym1/hFA== +"@polkadot/rpc-core@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-core/-/rpc-core-0.97.0-beta.38.tgz#ac2e87e38ff59141ef3707fae7c0ca0ac7c4adf5" + integrity sha512-11+3olWF+z6jftjY0fu7OhZNh1ZSf8gHk93vpTggykJoJWGJ+/o9QR5/B6wcEpjzYtCJBfBtAoVCHoyHiL/c2A== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/jsonrpc" "^0.97.0-beta.35" - "@polkadot/rpc-provider" "^0.97.0-beta.35" - "@polkadot/types" "^0.97.0-beta.35" - "@polkadot/util" "^1.7.0-beta.8" + "@polkadot/jsonrpc" "^0.97.0-beta.38" + "@polkadot/rpc-provider" "^0.97.0-beta.38" + "@polkadot/types" "^0.97.0-beta.38" + "@polkadot/util" "^1.7.1" rxjs "^6.5.3" -"@polkadot/rpc-provider@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.35.tgz#420a00d08bb7944b410b03b78d517ac0a1cc4d12" - integrity sha512-BXEeo93ElXkBuNQLwXU+lmpV/FLfkgHjcy/kVd6E5Xaz/LsqxJOU7VbY4LdVlTbE8XJgRPZi+5RDY0YS+yBGfw== +"@polkadot/rpc-provider@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/rpc-provider/-/rpc-provider-0.97.0-beta.38.tgz#d58d0dd179b4e8cb698a62bfd301d92e05ff2113" + integrity sha512-WL4bW4rBL6YZl3cc9jh4H5wIpiYloE1ISMgc/DrJWQdHVs/QJJtgTC2yrBdgigeYjUUP9+/zTTbmpX1/n4omSQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/metadata" "^0.97.0-beta.35" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/metadata" "^0.97.0-beta.38" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" eventemitter3 "^4.0.0" isomorphic-fetch "^2.2.1" websocket "^1.0.30" @@ -2244,14 +2244,14 @@ dependencies: "@types/chrome" "^0.0.91" -"@polkadot/types@^0.97.0-beta.35": - version "0.97.0-beta.35" - resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.35.tgz#66d1da5cc81a1d1ed5e5b0f8740398029b5a0377" - integrity sha512-x5imP6jM0N1eTsx9uHtYNEmjCX3md9dXcZgj65EdJpRphMfukE8vSJar/ZmwDu53Fm+oS8lTxSkcwQtptmTE6Q== +"@polkadot/types@^0.97.0-beta.38": + version "0.97.0-beta.38" + resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-0.97.0-beta.38.tgz#ce361b11a73d5e1a448430f45e99f21370d367ce" + integrity sha512-ZERKcVot+ZueKAxLwtbXHHEDSEQ8NHww2kNEJ9AN0k/2gBx9+QUFEeaWBrohyHzlhiSPPZzlNKZC3MYrwhg8KQ== dependencies: "@babel/runtime" "^7.7.4" - "@polkadot/util" "^1.7.0-beta.8" - "@polkadot/util-crypto" "^1.7.0-beta.8" + "@polkadot/util" "^1.7.1" + "@polkadot/util-crypto" "^1.7.1" "@types/memoizee" "^0.4.3" memoizee "^0.4.14" @@ -2299,7 +2299,7 @@ "@types/color" "^3.0.0" color "^3.1.2" -"@polkadot/util-crypto@^1.7.0-beta.8", "@polkadot/util-crypto@^1.7.1": +"@polkadot/util-crypto@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-1.7.1.tgz#6cb1ed1f7ecbea3b41100231830817e7fd116dc6" integrity sha512-g0JCciJLJXbkc/Q+2QuJgCgS0Xfl7tO97ALdsI00bgSDA7zlh2zhjpx03Ve47hMndmn7K8ClIGrj4nxHx/95Tw== @@ -2321,7 +2321,7 @@ tweetnacl "^1.0.1" xxhashjs "^0.2.2" -"@polkadot/util@^1.7.0-beta.8", "@polkadot/util@^1.7.1": +"@polkadot/util@^1.7.1": version "1.7.1" resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-1.7.1.tgz#cb262fa5a441097c0c093532f70d0b7e0503fbb1" integrity sha512-tWvh+vYDIiXDIWgAGd9zyJWlDKxQ5KYTKZ9uTlLxfuy1qXEdVOjlX9Qz5+FACU2742e8tTvtvM9KfK05VK5X/A==