From 2b2d428868e2c47a4d3218557e3e6fbed8638916 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Mon, 8 Jun 2020 09:48:13 +0200 Subject: [PATCH] Sort injected based on creation timestamp (#368) * Sort injected based on creation timestamp * Adjust shadow --- CHANGELOG.md | 4 +- package.json | 12 +- packages/extension-base/package.json | 6 +- .../src/background/handlers/Tabs.ts | 1 + packages/extension-dapp/package.json | 4 +- packages/extension-ui/package.json | 10 +- .../src/Popup/Accounts/Account.tsx | 1 + .../extension-ui/src/assets/arrow-down.svg | 4 +- .../extension-ui/src/assets/arrowLeft.svg | 5 +- .../src/assets/arrowParentLabel.svg | 4 +- .../extension-ui/src/assets/checkmark.svg | 4 +- packages/extension-ui/src/assets/copy.svg | 4 +- packages/extension-ui/src/assets/details.svg | 6 +- .../extension-ui/src/assets/fullscreen.svg | 4 +- packages/extension-ui/src/assets/gear.svg | 4 +- packages/extension-ui/src/assets/hidden.svg | 1 + packages/extension-ui/src/assets/lock.svg | 4 +- packages/extension-ui/src/assets/pjs.svg | 5 +- packages/extension-ui/src/assets/plus.svg | 2 +- packages/extension-ui/src/assets/qr.svg | 4 +- packages/extension-ui/src/assets/secret.svg | 1 - packages/extension-ui/src/assets/unlock.svg | 4 +- packages/extension-ui/src/assets/warning.svg | 4 +- .../extension-ui/src/components/Address.tsx | 61 +++--- packages/extension-ui/src/components/Menu.tsx | 3 +- .../extension-ui/src/components/themes.ts | 2 +- yarn.lock | 178 +++++++++--------- 27 files changed, 166 insertions(+), 176 deletions(-) create mode 100644 packages/extension-ui/src/assets/hidden.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 9182ddbe..5362409d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # CHANGELOG -## 0.26.0-beta.x +## 0.26.0-beta.x Jun 8, 2020 - Add the ability to import JSON keystore files (Thanks to https://github.com/shawntabrizi) - Updated to derivation documentation (Thanks to https://github.com/EthWorks) +- Rework account creation with top-level menu - Allow accounts to be hidden, i.e. not injected (per account setting) - Adjust allowed mnemonic seed strengths, 12, 15, 18, 21 & 24 all allowed - Allow accounts to be tied to a specific network genesis (along with display) @@ -12,6 +13,7 @@ - Display child accounts when no parent has been found (orphans) - Display derived suri alongside parent account names - Remove all bundled metadata, update is available for dapps to keep current +- Sorting of injected accounts based on created timestamp ## 0.25.1 May 14, 2020 diff --git a/package.json b/package.json index 1aca306b..7a558947 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,11 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^1.18.0-beta.2", - "@polkadot/keyring": "^2.12.2", - "@polkadot/types": "^1.18.0-beta.2", - "@polkadot/util": "^2.12.2", - "@polkadot/util-crypto": "^2.12.2", + "@polkadot/api": "^1.18.0-beta.7", + "@polkadot/keyring": "^2.13.0-beta.3", + "@polkadot/types": "^1.18.0-beta.7", + "@polkadot/util": "^2.13.0-beta.3", + "@polkadot/util-crypto": "^2.13.0-beta.3", "babel-core": "^7.0.0-bridge.0" }, "scripts": { @@ -33,7 +33,7 @@ "devDependencies": { "@babel/core": "^7.10.2", "@polkadot/dev": "^0.55.8", - "@polkadot/typegen": "^1.18.0-beta.2", + "@polkadot/typegen": "^1.18.0-beta.7", "@types/jest": "^25.2.3", "copy-webpack-plugin": "^6.0.2", "sinon-chrome": "^3.0.1", diff --git a/packages/extension-base/package.json b/packages/extension-base/package.json index 158e39cd..f672e3b1 100644 --- a/packages/extension-base/package.json +++ b/packages/extension-base/package.json @@ -6,9 +6,9 @@ "license": "Apache-2", "dependencies": { "@babel/runtime": "^7.10.2", - "@polkadot/api": "^1.18.0-beta.2", + "@polkadot/api": "^1.18.0-beta.7", "@polkadot/extension-inject": "0.26.0-beta.26", - "@polkadot/keyring": "^2.12.2", - "@polkadot/ui-keyring": "^0.54.0-beta.4" + "@polkadot/keyring": "^2.13.0-beta.3", + "@polkadot/ui-keyring": "^0.54.0-beta.6" } } diff --git a/packages/extension-base/src/background/handlers/Tabs.ts b/packages/extension-base/src/background/handlers/Tabs.ts index 1d0af43b..b337ba0e 100644 --- a/packages/extension-base/src/background/handlers/Tabs.ts +++ b/packages/extension-base/src/background/handlers/Tabs.ts @@ -22,6 +22,7 @@ function transformAccounts (accounts: SubjectInfo): InjectedAccount[] { return Object .values(accounts) .filter(({ json: { meta: { isHidden } } }) => !isHidden) + .sort((a, b) => (a.json.meta.whenCreated || 0) - (b.json.meta.whenCreated || 0)) .map(({ json: { address, meta: { genesisHash, name } } }): InjectedAccount => ({ address, genesisHash, name })); diff --git a/packages/extension-dapp/package.json b/packages/extension-dapp/package.json index ea68b080..34f86058 100644 --- a/packages/extension-dapp/package.json +++ b/packages/extension-dapp/package.json @@ -7,8 +7,8 @@ "dependencies": { "@babel/runtime": "^7.10.2", "@polkadot/extension-inject": "0.26.0-beta.26", - "@polkadot/util": "^2.12.2", - "@polkadot/util-crypto": "^2.12.2" + "@polkadot/util": "^2.13.0-beta.3", + "@polkadot/util-crypto": "^2.13.0-beta.3" }, "peerDependencies": { "@polkadot/api": "*" diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json index 9206f96b..eb452b31 100644 --- a/packages/extension-ui/package.json +++ b/packages/extension-ui/package.json @@ -8,11 +8,11 @@ "@babel/runtime": "^7.10.2", "@polkadot/extension-base": "0.26.0-beta.26", "@polkadot/extension-inject": "0.26.0-beta.26", - "@polkadot/keyring": "^2.12.2", - "@polkadot/react-identicon": "^0.54.0-beta.4", - "@polkadot/react-qr": "^0.54.0-beta.4", - "@polkadot/util": "^2.12.2", - "@polkadot/util-crypto": "^2.12.2", + "@polkadot/keyring": "^2.13.0-beta.3", + "@polkadot/react-identicon": "^0.54.0-beta.6", + "@polkadot/react-qr": "^0.54.0-beta.6", + "@polkadot/util": "^2.13.0-beta.3", + "@polkadot/util-crypto": "^2.13.0-beta.3", "react": "^16.13.1", "react-dom": "^16.13.1", "react-dropzone": "^11.0.1", diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx index 006e45e1..a09870b8 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx @@ -122,6 +122,7 @@ function Account ({ address, className, genesisHash, isExternal, isHidden, paren address={address} className='address' genesisHash={genesisHash} + isHidden={isHidden} name={editedName} parentName={parentName} suri={suri} diff --git a/packages/extension-ui/src/assets/arrow-down.svg b/packages/extension-ui/src/assets/arrow-down.svg index 965e3c8a..494dd408 100644 --- a/packages/extension-ui/src/assets/arrow-down.svg +++ b/packages/extension-ui/src/assets/arrow-down.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/arrowLeft.svg b/packages/extension-ui/src/assets/arrowLeft.svg index 36c32eeb..23eef33b 100644 --- a/packages/extension-ui/src/assets/arrowLeft.svg +++ b/packages/extension-ui/src/assets/arrowLeft.svg @@ -1,4 +1 @@ - - - - + diff --git a/packages/extension-ui/src/assets/arrowParentLabel.svg b/packages/extension-ui/src/assets/arrowParentLabel.svg index 1c36ab3d..5a1eb932 100644 --- a/packages/extension-ui/src/assets/arrowParentLabel.svg +++ b/packages/extension-ui/src/assets/arrowParentLabel.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/checkmark.svg b/packages/extension-ui/src/assets/checkmark.svg index 0b8aae47..3996dc0b 100644 --- a/packages/extension-ui/src/assets/checkmark.svg +++ b/packages/extension-ui/src/assets/checkmark.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/copy.svg b/packages/extension-ui/src/assets/copy.svg index 55640424..6cecf47c 100644 --- a/packages/extension-ui/src/assets/copy.svg +++ b/packages/extension-ui/src/assets/copy.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/details.svg b/packages/extension-ui/src/assets/details.svg index b9f26c99..fa1bbe6f 100644 --- a/packages/extension-ui/src/assets/details.svg +++ b/packages/extension-ui/src/assets/details.svg @@ -1,5 +1 @@ - - - - - + diff --git a/packages/extension-ui/src/assets/fullscreen.svg b/packages/extension-ui/src/assets/fullscreen.svg index 7c3e67c6..26886852 100644 --- a/packages/extension-ui/src/assets/fullscreen.svg +++ b/packages/extension-ui/src/assets/fullscreen.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/gear.svg b/packages/extension-ui/src/assets/gear.svg index c3146085..88aeb61c 100644 --- a/packages/extension-ui/src/assets/gear.svg +++ b/packages/extension-ui/src/assets/gear.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/hidden.svg b/packages/extension-ui/src/assets/hidden.svg new file mode 100644 index 00000000..40e1f663 --- /dev/null +++ b/packages/extension-ui/src/assets/hidden.svg @@ -0,0 +1 @@ + diff --git a/packages/extension-ui/src/assets/lock.svg b/packages/extension-ui/src/assets/lock.svg index 0bb675f5..35d6ebab 100644 --- a/packages/extension-ui/src/assets/lock.svg +++ b/packages/extension-ui/src/assets/lock.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/pjs.svg b/packages/extension-ui/src/assets/pjs.svg index 595779f2..aa816d69 100644 --- a/packages/extension-ui/src/assets/pjs.svg +++ b/packages/extension-ui/src/assets/pjs.svg @@ -1,4 +1 @@ - \ No newline at end of file + diff --git a/packages/extension-ui/src/assets/plus.svg b/packages/extension-ui/src/assets/plus.svg index 24f418b7..985806a0 100644 --- a/packages/extension-ui/src/assets/plus.svg +++ b/packages/extension-ui/src/assets/plus.svg @@ -1,3 +1,3 @@ - diff --git a/packages/extension-ui/src/assets/qr.svg b/packages/extension-ui/src/assets/qr.svg index 7b03f1b4..e4be3a12 100644 --- a/packages/extension-ui/src/assets/qr.svg +++ b/packages/extension-ui/src/assets/qr.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/secret.svg b/packages/extension-ui/src/assets/secret.svg index 27627f46..5c3e0fb2 100644 --- a/packages/extension-ui/src/assets/secret.svg +++ b/packages/extension-ui/src/assets/secret.svg @@ -1,2 +1 @@ - diff --git a/packages/extension-ui/src/assets/unlock.svg b/packages/extension-ui/src/assets/unlock.svg index 89b8fa2b..91e7e742 100644 --- a/packages/extension-ui/src/assets/unlock.svg +++ b/packages/extension-ui/src/assets/unlock.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/assets/warning.svg b/packages/extension-ui/src/assets/warning.svg index ff10af18..c1e9de32 100644 --- a/packages/extension-ui/src/assets/warning.svg +++ b/packages/extension-ui/src/assets/warning.svg @@ -1,3 +1 @@ - - - + diff --git a/packages/extension-ui/src/components/Address.tsx b/packages/extension-ui/src/components/Address.tsx index 962070e9..bb37e160 100644 --- a/packages/extension-ui/src/components/Address.tsx +++ b/packages/extension-ui/src/components/Address.tsx @@ -12,7 +12,8 @@ import CopyToClipboard from 'react-copy-to-clipboard'; import styled from 'styled-components'; import { decodeAddress, encodeAddress } from '@polkadot/util-crypto'; -import copy from '../assets/copy.svg'; +import copyIcon from '../assets/copy.svg'; +import hiddenIcon from '../assets/hidden.svg'; import details from '../assets/details.svg'; import parentArrow from '../assets/arrowParentLabel.svg'; import { AccountContext, SettingsContext } from './contexts'; @@ -24,12 +25,13 @@ import Menu from './Menu'; import Svg from './Svg'; interface Props { - address?: string | null; - className?: string; - name?: React.ReactNode | null; - children?: React.ReactNode; - genesisHash?: string | null; actions?: React.ReactNode; + address?: string | null; + children?: React.ReactNode; + className?: string; + genesisHash?: string | null; + isHidden?: boolean; + name?: React.ReactNode | null; parentName?: string | null; suri?: string; toggleActions?: number; @@ -69,7 +71,7 @@ function recodeAddress (address: string, accounts: AccountWithChildren[], chain: const ACCOUNTS_SCREEN_HEIGHT = 550; -function Address ({ actions, address, children, className, genesisHash, name, parentName, suri, toggleActions }: Props): React.ReactElement { +function Address ({ actions, address, children, className, genesisHash, isHidden, name, parentName, suri, toggleActions }: Props): React.ReactElement { const { accounts } = useContext(AccountContext); const settings = useContext(SettingsContext); const chain = useMetadata(genesisHash, true); @@ -144,27 +146,33 @@ function Address ({ actions, address, children, className, genesisHash, name, pa ) } -
+ {chain?.genesisHash && ( +
+ {chain.name} +
+ )} +
{formatted || ''} - {chain?.genesisHash && ( -
- {chain.name} -
- )} + {isHidden && ( + + )}
{actions && ( @@ -278,9 +286,10 @@ export default styled(Address)(({ theme }: ThemeProps) => ` } } - .copyAddress { + .addressDisplay { display: flex; justify-content: space-between; + position: relative; & ${Svg} { width: 14px; @@ -292,6 +301,12 @@ export default styled(Address)(({ theme }: ThemeProps) => ` cursor: pointer; } } + + .hiddenIcon { + position: absolute; + right: 2px; + top: -18px; + } } .identityIcon { diff --git a/packages/extension-ui/src/components/Menu.tsx b/packages/extension-ui/src/components/Menu.tsx index fe7d3fde..c0067e9d 100644 --- a/packages/extension-ui/src/components/Menu.tsx +++ b/packages/extension-ui/src/components/Menu.tsx @@ -29,7 +29,8 @@ export default styled(Menu)(({ theme }: ThemeProps) => ` border-radius: 4px; border: 1px solid ${theme.boxBorderColor}; box-sizing: border-box; - box-shadow: 0 0 32px ${theme.boxShadow}; + // box-shadow: 0 0 32px ${theme.boxShadow}; + box-shadow: 0 0 10px ${theme.boxShadow}; margin-top: 90px; padding: 16px 0; position: absolute; diff --git a/packages/extension-ui/src/components/themes.ts b/packages/extension-ui/src/components/themes.ts index 1bceca6e..c7286e10 100644 --- a/packages/extension-ui/src/components/themes.ts +++ b/packages/extension-ui/src/components/themes.ts @@ -54,7 +54,7 @@ const lightTheme: Theme = { background: '#FAFAFA', bodyColor: '#FFFFFF', boxBorderColor: '#DADFEA', - boxShadow: 'rgba(0, 0, 0, 0.06)', + boxShadow: 'rgba(0, 0, 0, 0.3)', buttonBackgroundDanger: '#DC2222', errorBorderColor: '#E42F2F', highlightedAreaBackground: '#EFEFEF', diff --git a/yarn.lock b/yarn.lock index 2d016e2e..943b39f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2843,42 +2843,42 @@ __metadata: languageName: node linkType: hard -"@polkadot/api-derive@npm:1.18.0-beta.5": - version: 1.18.0-beta.5 - resolution: "@polkadot/api-derive@npm:1.18.0-beta.5" +"@polkadot/api-derive@npm:1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/api-derive@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/api": 1.18.0-beta.5 - "@polkadot/rpc-core": 1.18.0-beta.5 - "@polkadot/rpc-provider": 1.18.0-beta.5 - "@polkadot/types": 1.18.0-beta.5 + "@polkadot/api": 1.18.0-beta.7 + "@polkadot/rpc-core": 1.18.0-beta.7 + "@polkadot/rpc-provider": 1.18.0-beta.7 + "@polkadot/types": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 "@polkadot/util-crypto": ^2.12.2 bn.js: ^5.1.2 memoizee: ^0.4.14 rxjs: ^6.5.5 - checksum: 3/060207d576270a9a91118c211bf7b07c5b962adba8a1625559e52622ca46a83ed39bc6eb2831918fa16fdd4a76de7378b0060b49e2d34d8630d1820d6024ca8c + checksum: 3/bb4e5f6b08fdf0d5d029522f2f8eba685973d57c733cf99d869422f8e94eba0c7335af8fce79cc331909a5d94be25fcfab8c51ebb0777538bb74141f421f229d languageName: node linkType: hard -"@polkadot/api@npm:^1.18.0-beta.2": - version: 1.18.0-beta.5 - resolution: "@polkadot/api@npm:1.18.0-beta.5" +"@polkadot/api@npm:^1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/api@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/api-derive": 1.18.0-beta.5 + "@polkadot/api-derive": 1.18.0-beta.7 "@polkadot/keyring": ^2.12.2 - "@polkadot/metadata": 1.18.0-beta.5 - "@polkadot/rpc-core": 1.18.0-beta.5 - "@polkadot/rpc-provider": 1.18.0-beta.5 - "@polkadot/types": 1.18.0-beta.5 - "@polkadot/types-known": 1.18.0-beta.5 + "@polkadot/metadata": 1.18.0-beta.7 + "@polkadot/rpc-core": 1.18.0-beta.7 + "@polkadot/rpc-provider": 1.18.0-beta.7 + "@polkadot/types": 1.18.0-beta.7 + "@polkadot/types-known": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 "@polkadot/util-crypto": ^2.12.2 bn.js: ^5.1.2 eventemitter3: ^4.0.4 rxjs: ^6.5.5 - checksum: 3/b8a91249bacd3f33dad3eff71ba4a47fb2973a1f9ae82563193b3bd4580f97e0a5d557809ba7712a6ca5f6cba5557decbeb3369981a9dfba49a56d5d229f4c62 + checksum: 3/03c1eadd7a158efce8d65906425c654bc4093df0e81b4496683b786c7870c544691beae6b468603269e12a40e914ce03d73cc4ec93aa844bca0c75f992f50155 languageName: node linkType: hard @@ -2976,10 +2976,10 @@ __metadata: resolution: "@polkadot/extension-base@workspace:packages/extension-base" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/api": ^1.18.0-beta.2 + "@polkadot/api": ^1.18.0-beta.7 "@polkadot/extension-inject": 0.26.0-beta.26 - "@polkadot/keyring": ^2.12.2 - "@polkadot/ui-keyring": ^0.54.0-beta.4 + "@polkadot/keyring": ^2.13.0-beta.3 + "@polkadot/ui-keyring": ^0.54.0-beta.6 languageName: unknown linkType: soft @@ -2999,8 +2999,8 @@ __metadata: dependencies: "@babel/runtime": ^7.10.2 "@polkadot/extension-inject": 0.26.0-beta.26 - "@polkadot/util": ^2.12.2 - "@polkadot/util-crypto": ^2.12.2 + "@polkadot/util": ^2.13.0-beta.3 + "@polkadot/util-crypto": ^2.13.0-beta.3 peerDependencies: "@polkadot/api": "*" languageName: unknown @@ -3025,11 +3025,11 @@ __metadata: "@babel/runtime": ^7.10.2 "@polkadot/extension-base": 0.26.0-beta.26 "@polkadot/extension-inject": 0.26.0-beta.26 - "@polkadot/keyring": ^2.12.2 - "@polkadot/react-identicon": ^0.54.0-beta.4 - "@polkadot/react-qr": ^0.54.0-beta.4 - "@polkadot/util": ^2.12.2 - "@polkadot/util-crypto": ^2.12.2 + "@polkadot/keyring": ^2.13.0-beta.3 + "@polkadot/react-identicon": ^0.54.0-beta.6 + "@polkadot/react-qr": ^0.54.0-beta.6 + "@polkadot/util": ^2.13.0-beta.3 + "@polkadot/util-crypto": ^2.13.0-beta.3 "@types/bn.js": ^4.11.6 "@types/enzyme": ^3.10.5 "@types/enzyme-adapter-react-16": ^1.0.6 @@ -3073,32 +3073,32 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/keyring@npm:^2.12.2": - version: 2.12.2 - resolution: "@polkadot/keyring@npm:2.12.2" +"@polkadot/keyring@npm:^2.13.0-beta.3": + version: 2.13.0-beta.3 + resolution: "@polkadot/keyring@npm:2.13.0-beta.3" dependencies: - "@babel/runtime": ^7.9.6 - "@polkadot/util": 2.12.2 - "@polkadot/util-crypto": 2.12.2 - checksum: 3/392100b1f0b1939f65aefa34a9b532d989fa585a1c04b72088ed382ef0c5d853622bb4138924fb477230a157a443c0ad1ed29910e65ee063bc54d9e37fe3438d + "@babel/runtime": ^7.10.2 + "@polkadot/util": 2.13.0-beta.3 + "@polkadot/util-crypto": 2.13.0-beta.3 + checksum: 3/a80b23764e8ea8d1b1761b3bdc27c0b4d1b4eef4c71bdc145447d1eda1a43fe81a39dbc881b0c617a385c6d796c2f5619ea71f7c3158b483ec1186a22d91560a languageName: node linkType: hard -"@polkadot/metadata@npm:1.18.0-beta.5": - version: 1.18.0-beta.5 - resolution: "@polkadot/metadata@npm:1.18.0-beta.5" +"@polkadot/metadata@npm:1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/metadata@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/types": 1.18.0-beta.5 - "@polkadot/types-known": 1.18.0-beta.5 + "@polkadot/types": 1.18.0-beta.7 + "@polkadot/types-known": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 "@polkadot/util-crypto": ^2.12.2 bn.js: ^5.1.2 - checksum: 3/e1acba2e247d9c48202022c77bdeb7a4d381fc152ac98b6fa706eacd2e3670e4a0c4a47258b0cfe556b2ffaa164a8ac4cd794093359d4c73e0147b621a6b5223 + checksum: 3/7d6143fb7a30f2b0824fcee77925fb80df96edc95a6440f2cdb0bea112f1358fa23504c64560d6a9848fdec65b22f5ee11498c4aa066ec302227d0bf0e7eb13f languageName: node linkType: hard -"@polkadot/react-identicon@npm:^0.54.0-beta.4": +"@polkadot/react-identicon@npm:^0.54.0-beta.6": version: 0.54.0-beta.6 resolution: "@polkadot/react-identicon@npm:0.54.0-beta.6" dependencies: @@ -3120,7 +3120,7 @@ __metadata: languageName: node linkType: hard -"@polkadot/react-qr@npm:^0.54.0-beta.4": +"@polkadot/react-qr@npm:^0.54.0-beta.6": version: 0.54.0-beta.6 resolution: "@polkadot/react-qr@npm:0.54.0-beta.6" dependencies: @@ -3137,49 +3137,49 @@ __metadata: languageName: node linkType: hard -"@polkadot/rpc-core@npm:1.18.0-beta.5": - version: 1.18.0-beta.5 - resolution: "@polkadot/rpc-core@npm:1.18.0-beta.5" +"@polkadot/rpc-core@npm:1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/rpc-core@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/metadata": 1.18.0-beta.5 - "@polkadot/rpc-provider": 1.18.0-beta.5 - "@polkadot/types": 1.18.0-beta.5 + "@polkadot/metadata": 1.18.0-beta.7 + "@polkadot/rpc-provider": 1.18.0-beta.7 + "@polkadot/types": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 memoizee: ^0.4.14 rxjs: ^6.5.5 - checksum: 3/2eba2ddcf3f8d81e33fd1351a0ecf486b4c1cdce1759198ada914ba4f7acfab2454bdb5d78f06cf32b77fc7beb466882ad55e9a611bb2fae3f29d2a0468023dc + checksum: 3/6847b2ea2a9f936d94b96bc64fe121c5d73f520eee3abeae3ded1abd0d985b220f47ad770f9bc408770f733d71ac86922c6cab5982624b061bdb30d896fb4bda languageName: node linkType: hard -"@polkadot/rpc-provider@npm:1.18.0-beta.5": - version: 1.18.0-beta.5 - resolution: "@polkadot/rpc-provider@npm:1.18.0-beta.5" +"@polkadot/rpc-provider@npm:1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/rpc-provider@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/metadata": 1.18.0-beta.5 - "@polkadot/types": 1.18.0-beta.5 + "@polkadot/metadata": 1.18.0-beta.7 + "@polkadot/types": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 "@polkadot/util-crypto": ^2.12.2 bn.js: ^5.1.2 eventemitter3: ^4.0.4 isomorphic-fetch: ^2.2.1 websocket: ^1.0.31 - checksum: 3/aca08fa0ecf0d71dab73f4a55bbbddd258d1717ccd9e5b9838f33db980b023593794961a9a434b8fcd4c5b95385279dff8069f061c12f89988d26bb35194f614 + checksum: 3/04843536af2d92dfd98b31e85de790f6448e921f66041e3f70a22053b1c8ae66dac7e7b00d3c80a3466e424cd9d05030448ef62c81d7ac5c27e0bea20190cf8f languageName: node linkType: hard -"@polkadot/typegen@npm:^1.18.0-beta.2": - version: 1.18.0-beta.5 - resolution: "@polkadot/typegen@npm:1.18.0-beta.5" +"@polkadot/typegen@npm:^1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/typegen@npm:1.18.0-beta.7" dependencies: "@babel/core": ^7.10.2 "@babel/register": ^7.10.1 "@babel/runtime": ^7.10.2 - "@polkadot/api": 1.18.0-beta.5 - "@polkadot/metadata": 1.18.0-beta.5 - "@polkadot/rpc-provider": 1.18.0-beta.5 - "@polkadot/types": 1.18.0-beta.5 + "@polkadot/api": 1.18.0-beta.7 + "@polkadot/metadata": 1.18.0-beta.7 + "@polkadot/rpc-provider": 1.18.0-beta.7 + "@polkadot/types": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 handlebars: ^4.7.6 websocket: ^1.0.31 @@ -3190,39 +3190,39 @@ __metadata: polkadot-types-from-defs: scripts/polkadot-types-from-defs.js polkadot-types-internal-interfaces: scripts/polkadot-types-internal-interfaces.js polkadot-types-internal-metadata: scripts/polkadot-types-internal-metadata.js - checksum: 3/eac98fa72f017c4fff6a2c3bd575aabd672b5bcaaed57c200130c77576d48d93642f758f5217b91db74dda00c5d5b25c8f2fd97ce1f7a405dcf186a0172c832b + checksum: 3/97296b2d1e23de3c6b0679f12031963c5177e8d3bcb13b97e08d81604e20cbd4751871db2a349fa64ae7cdb3158e103456cdc9793d8855c6eb2d73f9771306b7 languageName: node linkType: hard -"@polkadot/types-known@npm:1.18.0-beta.5": - version: 1.18.0-beta.5 - resolution: "@polkadot/types-known@npm:1.18.0-beta.5" +"@polkadot/types-known@npm:1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/types-known@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/types": 1.18.0-beta.5 + "@polkadot/types": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 bn.js: ^5.1.2 - checksum: 3/25e26acefa6c264ca482341597e39457c5ea1c39c265859de88ad8128dda4f2007d893fb9fddd581bf4e28bb56cf12068d1c32ddc4d3e0a3b8b05c4352610cb0 + checksum: 3/d14ab22919c08c854595081e73b4885f9783a33c34ce208f1b83f9606186aa891fd5b38f55d5ca932156447d2453038803aea13b634eee8dfc060cb132e0134c languageName: node linkType: hard -"@polkadot/types@npm:^1.18.0-beta.2": - version: 1.18.0-beta.5 - resolution: "@polkadot/types@npm:1.18.0-beta.5" +"@polkadot/types@npm:^1.18.0-beta.7": + version: 1.18.0-beta.7 + resolution: "@polkadot/types@npm:1.18.0-beta.7" dependencies: "@babel/runtime": ^7.10.2 - "@polkadot/metadata": 1.18.0-beta.5 + "@polkadot/metadata": 1.18.0-beta.7 "@polkadot/util": ^2.12.2 "@polkadot/util-crypto": ^2.12.2 "@types/bn.js": ^4.11.6 bn.js: ^5.1.2 memoizee: ^0.4.14 rxjs: ^6.5.5 - checksum: 3/63ac556cf60f4adda08cb2e88a7cb1058a92554c8f2b887b44527de3020ce517093aa8efc90dd98d5b9390e9c361d152a615cc3905176cadc7cb47d1935dd95a + checksum: 3/d333c656b39d46151c844114b1281ac6def75339e8643a7b99ace18e8dad0337d2ed32b8433bd3576ec8cc9093979069f729eb2ce1db84c564bfe2dcda0a3de8 languageName: node linkType: hard -"@polkadot/ui-keyring@npm:^0.54.0-beta.4": +"@polkadot/ui-keyring@npm:^0.54.0-beta.6": version: 0.54.0-beta.6 resolution: "@polkadot/ui-keyring@npm:0.54.0-beta.6" dependencies: @@ -3270,12 +3270,12 @@ __metadata: languageName: node linkType: hard -"@polkadot/util-crypto@npm:^2.12.2": - version: 2.12.2 - resolution: "@polkadot/util-crypto@npm:2.12.2" +"@polkadot/util-crypto@npm:^2.13.0-beta.3": + version: 2.13.0-beta.3 + resolution: "@polkadot/util-crypto@npm:2.13.0-beta.3" dependencies: - "@babel/runtime": ^7.9.6 - "@polkadot/util": 2.12.2 + "@babel/runtime": ^7.10.2 + "@polkadot/util": 2.13.0-beta.3 "@polkadot/wasm-crypto": ^1.2.1 base-x: ^3.0.8 bip39: ^3.0.2 @@ -3284,24 +3284,24 @@ __metadata: bs58: ^4.0.1 elliptic: ^6.5.2 js-sha3: ^0.8.0 - pbkdf2: ^3.0.17 + pbkdf2: ^3.1.1 tweetnacl: ^1.0.3 xxhashjs: ^0.2.2 - checksum: 3/f945da48556bf2af32c0eb5e67c2c5a0b5737cdbfa00c0c08a1bbce34770ec68e2736d9bdc35e68dc2f4617c906db6472efaedf9b3ceaaf2a59d1558a400ba34 + checksum: 3/78e06ca7f53e1d4676ae3f8205979e773eb173c04d7c13e4e8d37b8e0928b324892168cd7080a3d1a2a251ddf0c70ad12e1ec0fd0f758215d7537f80f88f3ab4 languageName: node linkType: hard -"@polkadot/util@npm:^2.12.2": - version: 2.12.2 - resolution: "@polkadot/util@npm:2.12.2" +"@polkadot/util@npm:^2.13.0-beta.3": + version: 2.13.0-beta.3 + resolution: "@polkadot/util@npm:2.13.0-beta.3" dependencies: - "@babel/runtime": ^7.9.6 + "@babel/runtime": ^7.10.2 "@types/bn.js": ^4.11.6 bn.js: ^5.1.2 camelcase: ^5.3.1 chalk: ^4.0.0 ip-regex: ^4.1.0 - checksum: 3/23c93c4a1ba611012d4d301f6c32cfbd891a1c1dcfea06c5f83273bab6587e5b2a091b6acf91d18a4806bd50a5e05e1c7b003642011573d14324a1da0454a300 + checksum: 3/4a75dbec1ee6ba4c046139e39ef0bb432b4427be3656c07e66afd9a65e9037fb717c2b6185b0e18b66216ca9def26387684502959b7a196ae11a6b9d717cf0e9 languageName: node linkType: hard @@ -16556,7 +16556,7 @@ __metadata: languageName: node linkType: hard -"pbkdf2@npm:^3.0.17, pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.0.9": +"pbkdf2@npm:^3.0.3, pbkdf2@npm:^3.0.9, pbkdf2@npm:^3.1.1": version: 3.1.1 resolution: "pbkdf2@npm:3.1.1" dependencies: @@ -18789,7 +18789,7 @@ __metadata: dependencies: "@babel/core": ^7.10.2 "@polkadot/dev": ^0.55.8 - "@polkadot/typegen": ^1.18.0-beta.2 + "@polkadot/typegen": ^1.18.0-beta.7 "@types/jest": ^25.2.3 copy-webpack-plugin: ^6.0.2 sinon-chrome: ^3.0.1