Merge branch 'main' into w3f-deploy-1.1

w3f-webops · Oct 30, 2023 · 502a7c4 · 502a7c4
2 parents e6381c7 + ac8fc06
commit 502a7c4
Show file tree

Hide file tree

Showing 14 changed files with 72 additions and 35 deletions.
diff --git a/package.json b/package.json
@@ -29,8 +29,8 @@
     "@fortawesome/react-fontawesome": "^0.2.0",
     "@ledgerhq/hw-transport-webhid": "^6.27.19",
     "@polkadot-cloud/assets": "^0.1.32",
-    "@polkadot-cloud/core": "^1.0.29",
-    "@polkadot-cloud/react": "^0.1.99",
+    "@polkadot-cloud/core": "^1.0.30",
+    "@polkadot-cloud/react": "^0.1.101",
     "@polkadot-cloud/utils": "^0.0.23",
     "@polkadot/api": "^10.10.1",
     "@polkadot/keyring": "^12.1.1",

diff --git a/src/config/networks.ts b/src/config/networks.ts
@@ -23,7 +23,7 @@ export const NetworkList: Networks = {
     name: 'polkadot',
     endpoints: {
       lightClient: WellKnownChain.polkadot,
-      defaultRpcEndpoint: 'Automata 1RPC',
+      defaultRpcEndpoint: 'Parity',
       rpcEndpoints: {
         'Automata 1RPC': 'wss://1rpc.io/dot',
         Dwellir: 'wss://polkadot-rpc.dwellir.com',
@@ -90,7 +90,7 @@ export const NetworkList: Networks = {
     name: 'kusama',
     endpoints: {
       lightClient: WellKnownChain.ksmcc3,
-      defaultRpcEndpoint: 'Automata 1RPC',
+      defaultRpcEndpoint: 'Parity',
       rpcEndpoints: {
         'Automata 1RPC': 'wss://1rpc.io/ksm',
         Dwellir: 'wss://kusama-rpc.dwellir.com',
@@ -159,7 +159,7 @@ export const NetworkList: Networks = {
     name: 'westend',
     endpoints: {
       lightClient: WellKnownChain.westend2,
-      defaultRpcEndpoint: 'OnFinality',
+      defaultRpcEndpoint: 'Parity',
       rpcEndpoints: {
         Dwellir: 'wss://westend-rpc.dwellir.com',
         'Dwellir Tunisia': 'wss://westend-rpc-tn.dwellir.com',

diff --git a/src/library/Import/Confirm.tsx b/src/library/Import/Confirm.tsx
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import { registerSaEvent } from 'Utils';

diff --git a/src/library/Import/Heading.tsx b/src/library/Import/Heading.tsx
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import {

diff --git a/src/library/Import/Remove.tsx b/src/library/Import/Remove.tsx
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import { registerSaEvent } from 'Utils';

diff --git a/src/library/Import/Wrappers.ts b/src/library/Import/Wrappers.ts
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import styled from 'styled-components';

diff --git a/src/locale/cn/modals.json b/src/locale/cn/modals.json
@@ -67,6 +67,7 @@
     "destroyIrreversible": "销毁池是不可逆转的",
     "destroyPool": "销毁提名池",
     "destroyPoolResult": "销毁提名池后，所有成员都可以无权限解除质押，提名池永远无法重新开启",
+    "developerTools": "开发者工具",
     "differentNetworkAddress": "不同的网络地址",
     "disconnect": "断开",
     "done": "完成",

diff --git a/src/locale/en/modals.json b/src/locale/en/modals.json
@@ -70,6 +70,7 @@
     "destroyIrreversible": "Destroying a Pool is Irreversible",
     "destroyPool": "Destroy Pool",
     "destroyPoolResult": " Once you Destroy the pool, all members can be permissionlessly unbonded, and the pool can never be reopened.",
+    "developerTools": "Developer Tools",
     "differentNetworkAddress": "Different Network Address",
     "disconnect": "Disconnect",
     "done": "Done",

diff --git a/src/modals/Connect/Wrappers.ts b/src/modals/Connect/Wrappers.ts
@@ -61,6 +61,9 @@ export const ExtensionInner = styled.div`
     width: 100%;
     display: flex;
   }
+  .foot {
+    padding: 0.25rem 1rem 1rem 1rem;
+  }
   .status {
     position: absolute;
     top: 0.9rem;

diff --git a/src/modals/Connect/index.tsx b/src/modals/Connect/index.tsx
@@ -35,13 +35,13 @@ export const Connect = () => {
   const { extensionsStatus } = useExtensions();
   const { replaceModal, setModalHeight, modalMaxHeight } = useOverlay().modal;
 
-  const installed = ExtensionsArray.filter((a) =>
-    Object.keys(extensionsStatus).find((key) => key === a.id)
-  );
+  const web = ExtensionsArray.filter((a) => a.id !== 'polkadot-js');
+  const pjs = ExtensionsArray.filter((a) => a.id === 'polkadot-js');
 
-  const other = ExtensionsArray.filter(
-    (a) => !installed.find((b) => b.id === a.id)
+  const installed = web.filter((a) =>
+    Object.keys(extensionsStatus).find((key) => key === a.id)
   );
+  const other = web.filter((a) => !installed.find((b) => b.id === a.id));
 
   // toggle read only management
   const [readOnlyOpen, setReadOnlyOpen] = useState(false);
@@ -160,6 +160,15 @@ export const Connect = () => {
                   ))}
                 </SelectItems>
               </ExtensionsWrapper>
+
+              <ActionItem text={t('developerTools')} />
+              <ExtensionsWrapper>
+                <SelectItems layout="two-col">
+                  {pjs.map((extension, i) => (
+                    <Extension key={`extension_item_${i}`} meta={extension} />
+                  ))}
+                </SelectItems>
+              </ExtensionsWrapper>
             </ModalPadding>
           </div>
           <div className="section">

diff --git a/src/modals/ImportLedger/Addresses.tsx b/src/modals/ImportLedger/Addresses.tsx
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import { faArrowDown } from '@fortawesome/free-solid-svg-icons';

diff --git a/src/modals/ImportLedger/Manage.tsx b/src/modals/ImportLedger/Manage.tsx
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import { HardwareStatusBar } from '@polkadot-cloud/react';

diff --git a/src/modals/ImportLedger/Reset.tsx b/src/modals/ImportLedger/Reset.tsx
@@ -1,4 +1,4 @@
-// Copyright 2023 @paritytech/polkadot-live authors & contributors
+// Copyright 2023 @paritytech/polkadot-staking-dashboard authors & contributors
 // SPDX-License-Identifier: GPL-3.0-only
 
 import { registerSaEvent } from 'Utils';

diff --git a/yarn.lock b/yarn.lock
@@ -201,6 +201,15 @@
     "@babel/helper-validator-identifier" "^7.22.20"
     to-fast-properties "^2.0.0"
 
+"@chainsafe/metamask-polkadot-adapter@^0.5.1":
+  version "0.5.1"
+  resolved "https://registry.yarnpkg.com/@chainsafe/metamask-polkadot-adapter/-/metamask-polkadot-adapter-0.5.1.tgz#04ecf78ce6cdcc63ebdc2c97f67d0c1efdb8bee8"
+  integrity sha512-t3/KoGTgayt2qQOmEWj5Gx8UVvqjhEuybMYadInWsvsDvmyhSKUxzGC8JlUSr4ww0Fa8Dzem21Hxo0FT9rxjyg==
+  dependencies:
+    "@polkadot/api" "^10.9.1"
+    "@polkadot/extension-inject" "^0.46.5"
+    "@polkadot/types-augment" "^10.9.1"
+
 "@dotlottie/player-component@^2.7.0":
   version "2.7.0"
   resolved "https://registry.yarnpkg.com/@dotlottie/player-component/-/player-component-2.7.0.tgz#b7f5edfa9a54a0d99eb5cd85b94f0aebcd9270b3"
@@ -578,28 +587,29 @@
     picocolors "^1.0.0"
     tslib "^2.6.0"
 
-"@polkadot-cloud/assets@^0.1.28", "@polkadot-cloud/assets@^0.1.32":
+"@polkadot-cloud/[email protected].32", "@polkadot-cloud/assets@^0.1.32":
   version "0.1.32"
   resolved "https://registry.yarnpkg.com/@polkadot-cloud/assets/-/assets-0.1.32.tgz#b619e24db310ac9a23e4bb20a64245f096b73072"
   integrity sha512-TC8m6RFbHtJ5omW4VuIugKp1u7YzGBIgG9vGVEXkeSMWKwgzvkrxn7qpcjcelu1XO8ujb/+64dnhIpuhdj4e9g==
 
-"@polkadot-cloud/core@^1.0.29":
-  version "1.0.29"
-  resolved "https://registry.yarnpkg.com/@polkadot-cloud/core/-/core-1.0.29.tgz#c6b5a6c739872f5e814e47a193c9c5e829dedbcc"
-  integrity sha512-HhfowiWIcR1dLZu9KtMJMm6N1ySP2bkiq6aPaCepxn/gszn8tfpEZMw2X9EX++G2ZWM1zggQXs/05i6iPNaLeA==
+"@polkadot-cloud/core@^1.0.30":
+  version "1.0.30"
+  resolved "https://registry.yarnpkg.com/@polkadot-cloud/core/-/core-1.0.30.tgz#cc1e3f3477f402b8842338ed3e2ea4bfe8b19a23"
+  integrity sha512-hn3oo/JK17W5alwXPxL5M0zmZidihjklEsYv7hXF7XqWZP9musntdn5LydzHz0J7m05OTnH+9tw/GNusvqBaSg==
 
-"@polkadot-cloud/react@^0.1.99":
-  version "0.1.99"
-  resolved "https://registry.yarnpkg.com/@polkadot-cloud/react/-/react-0.1.99.tgz#0c73dffd30da31ba8b9c5fdcbf9af0d7f5d2f690"
-  integrity sha512-Ro/pQ0Nua86CWWcJSCaviTQfBI8tgiG/ZSKlsaA54a+QR/5n7VHfiYo/UrGVNfnAraxBF4h9wk2C/8CtpXSjOw==
+"@polkadot-cloud/react@^0.1.101":
+  version "0.1.101"
+  resolved "https://registry.yarnpkg.com/@polkadot-cloud/react/-/react-0.1.101.tgz#59323a9880b5421f9980ee34ea0d2324974872c3"
+  integrity sha512-y8diS5HfHIseItbaGLeY2ez60cVGZXbJUJGOquzNhcHgZsuE9W05j4lwl+EKlxnrNr+lnhfyESz1eE1YO6j0yA==
   dependencies:
+    "@chainsafe/metamask-polkadot-adapter" "^0.5.1"
     "@fortawesome/fontawesome-svg-core" "^6.4.2"
     "@fortawesome/free-brands-svg-icons" "^6.4.2"
     "@fortawesome/free-regular-svg-icons" "^6.4.2"
     "@fortawesome/free-solid-svg-icons" "^6.4.2"
     "@fortawesome/react-fontawesome" "^0.2.0"
-    "@polkadot-cloud/assets" "^0.1.28"
-    "@polkadot-cloud/core" "^1.0.29"
+    "@polkadot-cloud/assets" "0.1.32"
+    "@polkadot-cloud/core" "^1.0.30"
     "@polkadot-cloud/utils" "^0.0.23"
     "@polkadot/keyring" "^12.5.1"
     "@polkadot/util" "^12.5.1"
@@ -656,7 +666,7 @@
     rxjs "^7.8.1"
     tslib "^2.6.2"
 
-"@polkadot/[email protected]", "@polkadot/api@^10.10.1":
+"@polkadot/[email protected]", "@polkadot/api@^10.10.1", "@polkadot/api@^10.9.1":
   version "10.10.1"
   resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-10.10.1.tgz#06fcbdcc8e17d2312d4b4093733d506f15ff62ad"
   integrity sha512-YHVkmNvjGF4Eg3thAbVhj9UX3SXx+Yxk6yVuzsEcckEudIRHzL2ikIWGCfUprfzSeFNpUCKdJIi1tsxVHtA7Tg==
@@ -679,6 +689,19 @@
     rxjs "^7.8.1"
     tslib "^2.6.2"
 
+"@polkadot/extension-inject@^0.46.5":
+  version "0.46.5"
+  resolved "https://registry.yarnpkg.com/@polkadot/extension-inject/-/extension-inject-0.46.5.tgz#6abee0eb28a73fd1a9461f257cac5875c2e9fc63"
+  integrity sha512-QcpkCMuv7iFbWjufkw14JRozpEYFyjP0H8KOJ8IsHGfPd2DPiismQ0NXr+AS7f6U+0I+Rhv9E4dnXxtJPROVMQ==
+  dependencies:
+    "@polkadot/api" "^10.9.1"
+    "@polkadot/rpc-provider" "^10.9.1"
+    "@polkadot/types" "^10.9.1"
+    "@polkadot/util" "^12.3.2"
+    "@polkadot/util-crypto" "^12.3.2"
+    "@polkadot/x-global" "^12.3.2"
+    tslib "^2.5.3"
+
 "@polkadot/keyring@^12.1.1", "@polkadot/keyring@^12.5.1":
   version "12.5.1"
   resolved "https://registry.yarnpkg.com/@polkadot/keyring/-/keyring-12.5.1.tgz#2f38504aa915f54bbd265f3793a6be55010eb1f5"
@@ -740,7 +763,7 @@
   optionalDependencies:
     "@substrate/connect" "0.7.33"
 
-"@polkadot/[email protected]":
+"@polkadot/[email protected]", "@polkadot/types-augment@^10.9.1":
   version "10.10.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types-augment/-/types-augment-10.10.1.tgz#178ce0b22681109396fc681a027f35da7d757cef"
   integrity sha512-XRHE75IocXfFE6EADYov3pqXCyBk5SWbiHoZ0+4WYWP9SwMuzsBaAy84NlhLBlkG3+ehIqi0HpAd/qrljJGZbg==
@@ -788,7 +811,7 @@
     "@polkadot/util" "^12.5.1"
     tslib "^2.6.2"
 
-"@polkadot/[email protected]":
+"@polkadot/[email protected]", "@polkadot/types@^10.9.1":
   version "10.10.1"
   resolved "https://registry.yarnpkg.com/@polkadot/types/-/types-10.10.1.tgz#4a55909ff35b0b568c0b1539ae923a259b0dba6a"
   integrity sha512-Ben62P1tjYEhKag34GBGcLX6NqcFR1VD5nNbWaxgr+t36Jl/tlHs6P9DlbFqQP7Tt9FmGrAYY0m3oTkhjG1NzA==
@@ -802,7 +825,7 @@
     rxjs "^7.8.1"
     tslib "^2.6.2"
 
-"@polkadot/[email protected]", "@polkadot/util-crypto@^12.5.1":
+"@polkadot/[email protected]", "@polkadot/util-crypto@^12.3.2", "@polkadot/util-crypto@^12.5.1":
   version "12.5.1"
   resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-12.5.1.tgz#1753b23abfb9d72db950399ef65b0cbe5bef9f2f"
   integrity sha512-Y8ORbMcsM/VOqSG3DgqutRGQ8XXK+X9M3C8oOEI2Tji65ZsXbh9Yh+ryPLM0oBp/9vqOXjkLgZJbbVuQceOw0A==
@@ -818,7 +841,7 @@
     "@scure/base" "^1.1.3"
     tslib "^2.6.2"
 
-"@polkadot/[email protected]", "@polkadot/util@^12.4.2", "@polkadot/util@^12.5.1":
+"@polkadot/[email protected]", "@polkadot/util@^12.3.2", "@polkadot/util@^12.4.2", "@polkadot/util@^12.5.1":
   version "12.5.1"
   resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-12.5.1.tgz#f4e7415600b013d3b69527aa88904acf085be3f5"
   integrity sha512-fDBZL7D4/baMG09Qowseo884m3QBzErGkRWNBId1UjWR99kyex+cIY9fOSzmuQxo6nLdJlLHw1Nz2caN3+Bq0A==
@@ -901,7 +924,7 @@
     node-fetch "^3.3.2"
     tslib "^2.6.2"
 
-"@polkadot/[email protected]", "@polkadot/x-global@^12.5.1":
+"@polkadot/[email protected]", "@polkadot/x-global@^12.3.2", "@polkadot/x-global@^12.5.1":
   version "12.5.1"
   resolved "https://registry.yarnpkg.com/@polkadot/x-global/-/x-global-12.5.1.tgz#947bb90e0c46c853ffe216dd6dcb6847d5c18a98"
   integrity sha512-6K0YtWEg0eXInDOihU5aSzeb1t9TiDdX9ZuRly+58ALSqw5kPZYmQLbzE1d8HWzyXRXK+YH65GtLzfMGqfYHmw==
@@ -4743,7 +4766,7 @@ tslib@^1.9.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00"
   integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==
 
-tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.6.0, tslib@^2.6.1, tslib@^2.6.2:
+tslib@^2.0.3, tslib@^2.1.0, tslib@^2.4.0, tslib@^2.5.0, tslib@^2.5.3, tslib@^2.6.0, tslib@^2.6.1, tslib@^2.6.2:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
   integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==