extension-inject (no direct globals for extension/dapp) (#75)
* extension-inject (no direct globals for extension/dapp) * Update tsconfig.json * Update index.ts
This commit is contained in:
@@ -33,6 +33,7 @@ The repo is split into a number of packages -
|
||||
- [extension](packages/extension/) - All the injection and background processing logic (the main entry)
|
||||
- [extension-ui](packages/extension-ui/) - The UI components for the extension, do build up the popup
|
||||
- [extension-dapp](packages/extension-dapp/) - A convenience wrapper to work with the injected objects, simplifying data extraction for any dapp that wishes to integrate the extension (or any extension that supports the interface)
|
||||
- [extension-inject](packages/extension-inject/) - A convience wrapper that allows extension developers to inject their extension for use by dapp developers
|
||||
|
||||
## Dapp developers
|
||||
|
||||
@@ -43,23 +44,11 @@ This approach is used to support multiple external signers in for instance [apps
|
||||
|
||||
## Technical
|
||||
|
||||
The extension injects `injectedWeb3` into the global `window` object, exposing the following: (This is meant to be generic accross extensions, allowing any dapp to utilize multiple signers, as they are available)
|
||||
The extension injection interfaces are generic, i.e. it is designed to allow any extension developer to easily inject extensions (that conforms to a specific interface) and at the same time it allows for any dapp developer to easily enable the interfaces from multiple extensions at the same time. It is not an all-or-nothing approch, but rather it is an ecosystem where the user can choose which extensions fit his style best.
|
||||
|
||||
```js
|
||||
window.injectedWeb3 = {
|
||||
// this is the name for this extension, there could be multiples injected,
|
||||
// each with their own keys, here `polkadot-js` is for this extension
|
||||
'polkadot-js': {
|
||||
// semver for the package
|
||||
version: '0.1.0',
|
||||
From a dapp developer perspective, the only work needed is to include the [@polkadot/extension-dapp](packages/extension-dapp/) package and call the appropriate enabling function to retrieve all the extensions and their associated interfaces.
|
||||
|
||||
// this is called to enable the injection, and returns an injected
|
||||
// object containing the accounts, signer and provider interfaces
|
||||
// (or it will reject if not authorized)
|
||||
enable (originName: string): Promise<Injected>
|
||||
}
|
||||
}
|
||||
```
|
||||
From an extension developer perspective, the only work required is to enable the extension via the razor-thin [@polkadot/extension-inject](packages/extension-inject/) wrapper. Any dapp using the above interfaces will have access.
|
||||
|
||||
When there is more than one extension, each will populate an entry above, so from an extension implementation perspective, the structure should not be overridded. The `Injected` interface, as returned via `enable`, contains the following and is what any compliant extension supplies -
|
||||
|
||||
@@ -96,6 +85,28 @@ interface Signer extends SignerInterface {
|
||||
}
|
||||
```
|
||||
|
||||
# Technical information
|
||||
|
||||
This information may change and evolve. It is therefore recommended that all access is done via the `-dapp` and `-inject` packages, which removes the need to work with the lower-level targets.
|
||||
|
||||
The extension injects `injectedWeb3` into the global `window` object, exposing the following: (This is meant to be generic accross extensions, allowing any dapp to utilize multiple signers, as they are available)
|
||||
|
||||
```js
|
||||
window.injectedWeb3 = {
|
||||
// this is the name for this extension, there could be multiples injected,
|
||||
// each with their own keys, here `polkadot-js` is for this extension
|
||||
'polkadot-js': {
|
||||
// semver for the package
|
||||
version: '0.1.0',
|
||||
|
||||
// this is called to enable the injection, and returns an injected
|
||||
// object containing the accounts, signer and provider interfaces
|
||||
// (or it will reject if not authorized)
|
||||
enable (originName: string): Promise<Injected>
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
The app can use all or any of these, depending on needs. To instantiate the `@polkadot/api` signer (allowing the extension to sign messages) can be done via (assuming a known, single extension) -
|
||||
|
||||
```js
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
{
|
||||
"name": "@polkadot/extension-dapp",
|
||||
"description": "An injector dapps that manages the injected environment",
|
||||
"description": "Provides an interfaces around the injected globals for ease of access by dapp developers.",
|
||||
"version": "0.3.0-beta.1",
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"dependencies": {
|
||||
"@polkadot/extension-inject": "0.3.0-beta.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@babel/runtime": "^7.5.4",
|
||||
"@polkadot/api": "*"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import { Signer } from '@polkadot/api/types';
|
||||
import { Injected, InjectedAccount, InjectedWindow } from '../types';
|
||||
import { Injected, InjectedAccount, InjectedWindow } from '@polkadot/extension-inject/types';
|
||||
|
||||
// RxJs interface, only the bare-bones of what we need here
|
||||
interface Subscriber<T> {
|
||||
|
||||
@@ -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.
|
||||
|
||||
import { Injected, InjectedAccount, InjectedAccountWithMeta, InjectedExtension, InjectedExtensionInfo, InjectedWindow, Unsubcall } from './types';
|
||||
import { Injected, InjectedAccount, InjectedAccountWithMeta, InjectedExtension, InjectedExtensionInfo, InjectedWindow, Unsubcall } from '@polkadot/extension-inject/types';
|
||||
|
||||
// our extension adaptor for other kinds of extensions
|
||||
import compatInjector from './compat';
|
||||
|
||||
@@ -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.
|
||||
@@ -0,0 +1,19 @@
|
||||
# @polkadot/extension-inject
|
||||
|
||||
This is a basic extension injector that manages access to the global objects available. As an extension developer, you don't need to manage access to the windo object manually, by just calling enable here, the global object is setup and managed properly. From here any dapp can access it with the `@polkadot/extension-dapp` package;
|
||||
|
||||
## Usage
|
||||
|
||||
```js
|
||||
import { injectExtension } from '@polkadot/extension-inject';
|
||||
|
||||
// this a the function that will be exposed to be callable by the dapp. It resolves a promise
|
||||
// with the injected interface, (see `Injected`) when the dapp at `originName` (url) is allowed
|
||||
// to access functionality
|
||||
function enableFn (originName: string): Promise<Injected> {
|
||||
...
|
||||
}
|
||||
|
||||
// injects the extension into the page
|
||||
injectExtension(enableFn, { name: 'myExtension', version: '1.0.1' });
|
||||
```
|
||||
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"name": "@polkadot/extension-inject",
|
||||
"description": "A generic injector (usable to any extension), that populates the base exposed interfaces to be used by dapps.",
|
||||
"version": "0.3.0-beta.0",
|
||||
"author": "Jaco Greeff <jacogr@gmail.com>",
|
||||
"license": "Apache-2",
|
||||
"peerDependencies": {
|
||||
"@babel/runtime": "^7.5.4",
|
||||
"@polkadot/api": "*"
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
// Copyright 2019 @polkadot/extension-dapp 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 { Injected, InjectedWindow, InjectOptions } from './types';
|
||||
|
||||
// It is recomemender to always use the function below to shield the extension and dapp from
|
||||
// any future changes. The exposed interface will manage access between the 2 environments,
|
||||
// be it via window (current), postMessage (under consideration) or any other mechanism
|
||||
export function injectExtension (enable: (origin: string) => Promise<Injected>, { name, version }: InjectOptions): void {
|
||||
// small helper with the typescript types, just cast window
|
||||
const windowInject = window as InjectedWindow;
|
||||
|
||||
// don't clobber the existing object, we will add it it (or create as needed)
|
||||
windowInject.injectedWeb3 = windowInject.injectedWeb3 || {};
|
||||
|
||||
// add our enable function
|
||||
windowInject.injectedWeb3[name] = {
|
||||
enable: (origin: string): Promise<Injected> =>
|
||||
enable(origin),
|
||||
version
|
||||
};
|
||||
}
|
||||
@@ -47,3 +47,5 @@ export interface InjectedWindow extends Window {
|
||||
}
|
||||
|
||||
export type InjectedExtension = InjectedExtensionInfo & Injected;
|
||||
|
||||
export type InjectOptions = InjectedExtensionInfo;
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"author": "polkadot.{js}",
|
||||
"description": "Manage your Polkadot & Substrate keys independent for the dapps. Injects the accounts into dapps and allows the dapp to request transactions to be signed.",
|
||||
"description": "Manage your Polkadot accounts outside of dapps. Injects the accounts and allows signing transactions for a specific account.",
|
||||
"homepage_url": "https://github.com/polkadot-js/extension",
|
||||
"name": "polkadot{.js} extension",
|
||||
"manifest_version": 2,
|
||||
|
||||
@@ -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.
|
||||
|
||||
import { InjectedAccounts, InjectedAccount, Unsubcall } from '@polkadot/extension-dapp/types';
|
||||
import { InjectedAccounts, InjectedAccount, Unsubcall } from '@polkadot/extension-inject/types';
|
||||
import { SendRequest } from './types';
|
||||
|
||||
let sendRequest: SendRequest;
|
||||
|
||||
@@ -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.
|
||||
|
||||
import { Injected as InjectedInjected } from '@polkadot/extension-dapp/types';
|
||||
import { Injected as InjectedInjected } from '@polkadot/extension-inject/types';
|
||||
import { SendRequest } from './types';
|
||||
|
||||
import Accounts from './Accounts';
|
||||
|
||||
@@ -3,12 +3,12 @@
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import { SignerOptions } from '@polkadot/api/types';
|
||||
import { InjectedSigner } from '@polkadot/extension-dapp/types';
|
||||
import { InjectedSigner } from '@polkadot/extension-inject/types';
|
||||
import { IExtrinsic } from '@polkadot/types/types';
|
||||
import { SendRequest } from './types';
|
||||
|
||||
import { Hash } from '@polkadot/types';
|
||||
import { SubmittableResult } from '@polkadot/api/SubmittableExtrinsic';
|
||||
import { Hash } from '@polkadot/types';
|
||||
|
||||
let sendRequest: SendRequest;
|
||||
|
||||
|
||||
@@ -2,9 +2,10 @@
|
||||
// This software may be modified and distributed under the terms
|
||||
// of the Apache-2.0 license. See the LICENSE file for details.
|
||||
|
||||
import { InjectedWindow } from '@polkadot/extension-dapp/types';
|
||||
import { MessageTypes } from '../background/types';
|
||||
|
||||
import { injectExtension } from '@polkadot/extension-inject';
|
||||
|
||||
import Injected from './Injected';
|
||||
|
||||
// when sending a message from the injector to the extension, we
|
||||
@@ -24,8 +25,6 @@ interface Handler {
|
||||
|
||||
type Handlers = Record<string, Handler>;
|
||||
|
||||
// small helper with the typescript types, just cast window
|
||||
const windowInject = window as InjectedWindow;
|
||||
const handlers: Handlers = {};
|
||||
let idCounter = 0;
|
||||
|
||||
@@ -76,11 +75,7 @@ window.addEventListener('message', ({ data, source }): void => {
|
||||
}
|
||||
});
|
||||
|
||||
// don't clobber the existing object, we will add it it (or create as needed)
|
||||
windowInject.injectedWeb3 = windowInject.injectedWeb3 || {};
|
||||
|
||||
// add our enable function
|
||||
windowInject.injectedWeb3['polkadot-js'] = {
|
||||
enable,
|
||||
injectExtension(enable, {
|
||||
name: 'polkadot-js',
|
||||
version: process.env.PKG_VERSION as string
|
||||
};
|
||||
});
|
||||
|
||||
@@ -14,6 +14,7 @@ const manifest = require('./manifest.json');
|
||||
|
||||
const packages = [
|
||||
'extension',
|
||||
'extension-inject',
|
||||
'extension-ui'
|
||||
];
|
||||
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
"@polkadot/extension/*": ["packages/extension/src/*"],
|
||||
"@polkadot/extension-dapp": ["packages/extension-dapp/src"],
|
||||
"@polkadot/extension-dapp/*": ["packages/extension-dapp/src/*"],
|
||||
"@polkadot/extension-inject": ["packages/extension-inject/src"],
|
||||
"@polkadot/extension-inject/*": ["packages/extension-inject/src/*"],
|
||||
"@polkadot/extension-ui": ["packages/extension-ui/src"],
|
||||
"@polkadot/extension-ui/*": ["packages/extension-ui/src/*"]
|
||||
},
|
||||
|
||||
@@ -1,9 +0,0 @@
|
||||
{
|
||||
"extends": "@polkadot/dev/config/tslint",
|
||||
"linterOptions": {
|
||||
"exclude": "src/**/*.json"
|
||||
},
|
||||
"rules": {
|
||||
"completed-docs": false
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user