diff --git a/CHANGELOG.md b/CHANGELOG.md index 12c91489..145ce74e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 0.10.0-beta.x + +- Support for external accounts, as presented by mobile signers, e.g. the Parity Signer + # 0.9.1 - Fix an initialization error in extension-dapp diff --git a/README.md b/README.md index 1811d322..46d15c37 100644 --- a/README.md +++ b/README.md @@ -77,6 +77,8 @@ interface Injected { interface Account = { // ss-58 encoded address readonly address: string; + // the genesisHash for this account (empty if applicable to all) + readonly genesisHash?: string; // (optional) name for display readonly name?: string; }; diff --git a/copy-to-apps.sh b/copy-to-apps.sh new file mode 100755 index 00000000..5c91a6ed --- /dev/null +++ b/copy-to-apps.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +function copy_folder () { + SRC="packages/$1/build" + DST="../apps/node_modules/@polkadot/$1" + + echo "** Copying $SRC to $DST" + + rm -rf $DST + cp -r $SRC $DST +} + +yarn polkadot-dev-build-ts + +copy_folder "extension-dapp" +copy_folder "extension-inject" diff --git a/jest.config.js b/jest.config.js index 3794c4a2..2be2f728 100644 --- a/jest.config.js +++ b/jest.config.js @@ -3,7 +3,7 @@ const config = require('@polkadot/dev/config/jest'); module.exports = Object.assign({}, config, { moduleNameMapper: { - '@polkadot/extension-(ui)(.*)$': '/packages/extension-$1/src/$2', + '@polkadot/extension-(chains|dapp|inject|ui)(.*)$': '/packages/extension-$1/src/$2', '\\.(jpg|jpeg|png|gif|eot|otf|webp|svg|ttf|woff|woff2|mp4|webm|wav|mp3|m4a|aac|oga)$': 'empty/object', '\\.(css|less)$': 'empty/object' }, diff --git a/packages/extension-chains/LICENSE b/packages/extension-chains/LICENSE new file mode 100644 index 00000000..0d381b2e --- /dev/null +++ b/packages/extension-chains/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + +TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + +1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + +2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + +3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + +4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + +5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + +6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + +7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + +8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + +9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + +END OF TERMS AND CONDITIONS + +APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + +Copyright [yyyy] [name of copyright owner] + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. diff --git a/packages/extension-chains/README.md b/packages/extension-chains/README.md new file mode 100644 index 00000000..5f45688c --- /dev/null +++ b/packages/extension-chains/README.md @@ -0,0 +1,3 @@ +# @polkadot/extension-chains + +Definitions for chains that are supported by this extension. It contains the bare definitions as well as a stripped-down (call-only) metadata format. diff --git a/packages/extension-chains/package.json b/packages/extension-chains/package.json new file mode 100644 index 00000000..e4d09305 --- /dev/null +++ b/packages/extension-chains/package.json @@ -0,0 +1,13 @@ +{ + "name": "@polkadot/extension-chains", + "description": "Definitions for all known chains as exposed by the extension.", + "version": "0.10.0-beta.1", + "author": "Jaco Greeff ", + "license": "Apache-2", + "dependencies": { + "@babel/runtime": "^7.5.5" + }, + "peerDependencies": { + "@polkadot/api": "*" + } +} diff --git a/packages/extension/src/chains/alexander.ts b/packages/extension-chains/src/alexander.ts similarity index 98% rename from packages/extension/src/chains/alexander.ts rename to packages/extension-chains/src/alexander.ts index b12490e8..47c6cecc 100644 --- a/packages/extension/src/chains/alexander.ts +++ b/packages/extension-chains/src/alexander.ts @@ -1,3 +1,9 @@ +// Copyright 2019 @polkadot/extension-chains authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +// Generated via (in api) `yarn chain:info --ws wss://poc3-rpc.polkadot.io` + export default { chain: 'Alexander', genesisHash: '0xdcd1346701ca8396496e52aa2785b1748deb6db09551b72159dcb3e08991025b', diff --git a/packages/extension-chains/src/index.ts b/packages/extension-chains/src/index.ts new file mode 100644 index 00000000..9ea90e20 --- /dev/null +++ b/packages/extension-chains/src/index.ts @@ -0,0 +1,40 @@ +// Copyright 2019 @polkadot/extension-chains authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Metadata } from '@polkadot/types'; +import { Chain } from './types'; + +// imports chain details, generally metadata. For the generation of these, +// inside the api, run `yarn chain:info [--ws ]` +import alexander from './alexander'; +import kusama from './kusama'; + +const chains: Map = new Map( + [alexander, kusama].map( + ({ chain, genesisHash, metaCalls, ss58Format, tokenDecimals, tokenSymbol }): [string, Chain] => [ + genesisHash, + { + genesisHash, + meta: metaCalls + ? new Metadata(Buffer.from(metaCalls, 'base64')) + : undefined, + name: chain, + ss58Format, + tokenDecimals, + tokenSymbol + } + ] + ) +); + +const UNKNOWN_CHAIN: Chain = { + name: 'Any', + ss58Format: 42, + tokenDecimals: 0, + tokenSymbol: 'UNIT' +}; + +export default function findChain (genesisHash?: string | null): Chain { + return chains.get(genesisHash || '') || UNKNOWN_CHAIN; +} diff --git a/packages/extension/src/chains/kusama.ts b/packages/extension-chains/src/kusama.ts similarity index 99% rename from packages/extension/src/chains/kusama.ts rename to packages/extension-chains/src/kusama.ts index 627dfffb..32dac374 100644 --- a/packages/extension/src/chains/kusama.ts +++ b/packages/extension-chains/src/kusama.ts @@ -1,3 +1,9 @@ +// Copyright 2019 @polkadot/extension-chains authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +// Generated via (in api) `yarn chain:info --ws wss://kusama-rpc.polkadot.io` + export default { chain: 'Kusama CC1', genesisHash: '0x3fd7b9eb6a00376e5be61f01abb429ffb0b104be05eaff4d458da48fcd425baf', diff --git a/packages/extension-chains/src/types.ts b/packages/extension-chains/src/types.ts new file mode 100644 index 00000000..a994d4f6 --- /dev/null +++ b/packages/extension-chains/src/types.ts @@ -0,0 +1,14 @@ +// Copyright 2019 @polkadot/extension-chains authors & contributors +// This software may be modified and distributed under the terms +// of the Apache-2.0 license. See the LICENSE file for details. + +import { Metadata } from '@polkadot/types'; + +export interface Chain { + name: string; + genesisHash?: string; + meta?: Metadata; + ss58Format: number; + tokenDecimals: number; + tokenSymbol: string; +} diff --git a/packages/extension-ui/package.json b/packages/extension-ui/package.json index 745fcf8b..4877d680 100644 --- a/packages/extension-ui/package.json +++ b/packages/extension-ui/package.json @@ -7,6 +7,7 @@ "dependencies": { "@babel/runtime": "^7.5.5", "@polkadot/react-identicon": "^0.43.0-beta.11", + "@polkadot/react-qr": "^0.43.0-beta.10", "@types/react-router": "^5.0.3", "@types/react-router-dom": "^4.3.5", "react-router": "^5.0.1", diff --git a/packages/extension-ui/src/Popup/Accounts/Account.tsx b/packages/extension-ui/src/Popup/Accounts/Account.tsx index c73cc763..b8c30982 100644 --- a/packages/extension-ui/src/Popup/Accounts/Account.tsx +++ b/packages/extension-ui/src/Popup/Accounts/Account.tsx @@ -2,6 +2,8 @@ // This software may be modified and distributed under the terms // of the Apache-2.0 license. See the LICENSE file for details. +import { AccountJson } from '@polkadot/extension/background/types'; + import React, { useContext, useState } from 'react'; import styled from 'styled-components'; @@ -9,7 +11,7 @@ import { ActionBar, ActionContext, Address, Link } from '../../components'; import { editAccount } from '../../messaging'; import { Name } from '../../partials'; -interface Props { +interface Props extends AccountJson { address: string; className?: string; } @@ -19,22 +21,22 @@ function Account ({ address, className }: Props): React.ReactElement { const [isEditing, setEditing] = useState(false); const [editedName, setName] = useState(null); - const toggleEdit = (): void => - setEditing(!isEditing); - const saveChanges = (): void => { + const _toggleEdit = (): void => setEditing(!isEditing); + const _saveChanges = (): void => { if (editedName && editedName !== name) { editAccount(address, editedName) .then((): void => onAction()) .catch((error: Error) => console.error(error)); } - toggleEdit(); + _toggleEdit(); }; return (
{isEditing && ( { className='edit-name' isFocussed label={null} - onBlur={saveChanges} + onBlur={_saveChanges} onChange={setName} /> )} - Edit + Edit Forget
@@ -56,7 +58,7 @@ function Account ({ address, className }: Props): React.ReactElement { export default styled(Account)` .edit-name { - left: 4.75rem; + left: 3rem; position: absolute; right: 0.75rem; top: -0.5rem; diff --git a/packages/extension-ui/src/Popup/Accounts/index.tsx b/packages/extension-ui/src/Popup/Accounts/index.tsx index e4bf46db..ec6be671 100644 --- a/packages/extension-ui/src/Popup/Accounts/index.tsx +++ b/packages/extension-ui/src/Popup/Accounts/index.tsx @@ -4,11 +4,14 @@ import React, { useContext } from 'react'; -import { AccountContext, Button, Header, Link, Tip } from '../../components'; +import { AccountContext, Button, Header, Link, MediaContext, Tip } from '../../components'; import Account from './Account'; -export default function Accounts (): React.ReactElement<{}> { +type Props = {}; + +export default function Accounts (): React.ReactElement { const accounts = useContext(AccountContext); + const mediaAllowed = useContext(MediaContext); return (
@@ -19,10 +22,10 @@ export default function Accounts (): React.ReactElement<{}> { { (accounts.length === 0) ? You currently don't have any accounts. Either create a new account or if you have an existing account you wish to use, import it with the seed phrase - : accounts.map(({ address }): React.ReactNode => ( + : accounts.map((json, index): React.ReactNode => ( )) } @@ -32,8 +35,14 @@ export default function Accounts (): React.ReactElement<{}> { />
); } diff --git a/packages/extension-ui/src/Popup/Authorize/Request.tsx b/packages/extension-ui/src/Popup/Authorize/Request.tsx index 669d3fa4..c4339498 100644 --- a/packages/extension-ui/src/Popup/Authorize/Request.tsx +++ b/packages/extension-ui/src/Popup/Authorize/Request.tsx @@ -20,11 +20,11 @@ interface Props { function Request ({ authId, className, isFirst, request: { origin }, url }: Props): React.ReactElement { const onAction = useContext(ActionContext); - const onApprove = (): Promise => + const _onApprove = (): Promise => approveAuthRequest(authId) .then((): void => onAction()) .catch((error: Error) => console.error(error)); - const onReject = (): Promise => + const _onReject = (): Promise => rejectAuthRequest(authId) .then((): void => onAction()) .catch((error: Error) => console.error(error)); @@ -35,7 +35,7 @@ function Request ({ authId, className, isFirst, request: { origin }, url }: Prop icon={ } intro={ @@ -43,14 +43,14 @@ function Request ({ authId, className, isFirst, request: { origin }, url }: Prop } > - Reject + Reject {isFirst && ( <> Only approve this request if you trust the application. Approving gives the application access to the addresses of your accounts.