Skip to content

Update from upstream #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vanruch merged 7 commits into from
Nov 18, 2019
Merged

Update from upstream #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0b6626b
Allo hex seeds (#190)
jacogr Nov 10, 2019
6692b9a
[CI Skip] 0.14.0-beta.3
actions-user Nov 10, 2019
625b3a0
Bump deps (#193)
jacogr Nov 10, 2019
9ced080
[CI Skip] 0.14.0-beta.4
actions-user Nov 10, 2019
7e71ee6
Bump deps (#194)
jacogr Nov 13, 2019
04d044e
[CI Skip] 0.14.0-beta.5
actions-user Nov 13, 2019
2682cc3
Merge remote-tracking branch 'upstream/master' into update
vanruch Nov 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
"packages": [
"packages/*"
],
"version": "0.14.0-beta.2"
"version": "0.14.0-beta.5"
}
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.14.0-beta.2",
"version": "0.14.0-beta.5",
"description": "A sample signer extension for the @polkadot/api",
"repository": "https://github.com/polkadot-js/extension",
"author": "Jaco Greeff <jacogr@gmail.com>",
Expand All @@ -12,11 +12,11 @@
"yarn": "^1.10.1"
},
"resolutions": {
"@polkadot/api": "^0.96.0-beta.34",
"@polkadot/keyring": "^1.7.0-beta.5",
"@polkadot/types": "^0.96.0-beta.34",
"@polkadot/util": "^1.7.0-beta.5",
"@polkadot/util-crypto": "^1.7.0-beta.5",
"@polkadot/api": "^0.97.0-beta.4",
"@polkadot/keyring": "^1.7.0-beta.7",
"@polkadot/types": "^0.97.0-beta.4",
"@polkadot/util": "^1.7.0-beta.7",
"@polkadot/util-crypto": "^1.7.0-beta.7",
"babel-core": "^7.0.0-bridge.0",
"typescript": "^3.7.2"
},
Expand All @@ -31,8 +31,8 @@
"watch": "cd packages/extension && webpack --config webpack.config.js --watch"
},
"devDependencies": {
"@babel/core": "^7.7.0",
"@polkadot/dev-react": "^0.32.0-beta.13",
"@polkadot/ts": "^0.1.84"
"@babel/core": "^7.7.2",
"@polkadot/dev-react": "^0.32.0-beta.14",
"@polkadot/ts": "^0.1.85"
}
}
4 changes: 2 additions & 2 deletions packages/extension-chains/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "@polkadot/extension-chains",
"description": "Definitions for all known chains as exposed by the extension.",
"version": "0.14.0-beta.2",
"version": "0.14.0-beta.5",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.7.1",
"@babel/runtime": "^7.7.2",
"edgeware-node-types": "^1.0.10"
},
"peerDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions packages/extension-dapp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "@polkadot/extension-dapp",
"description": "Provides an interfaces around the injected globals for ease of access by dapp developers.",
"version": "0.14.0-beta.2",
"version": "0.14.0-beta.5",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.7.1",
"@polkadot/extension-inject": "^0.14.0-beta.2"
"@babel/runtime": "^7.7.2",
"@polkadot/extension-inject": "^0.14.0-beta.5"
},
"peerDependencies": {
"@polkadot/api": "*"
Expand Down
4 changes: 2 additions & 2 deletions packages/extension-inject/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +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.14.0-beta.2",
"version": "0.14.0-beta.5",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.7.1"
"@babel/runtime": "^7.7.2"
},
"peerDependencies": {
"@polkadot/api": "*"
Expand Down
8 changes: 4 additions & 4 deletions packages/extension-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "@polkadot/extension-ui",
"description": "A sample signer extension for the @polkadot/api",
"version": "0.14.0-beta.2",
"version": "0.14.0-beta.5",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@babel/runtime": "^7.7.1",
"@polkadot/react-identicon": "^0.47.0-beta.3",
"@polkadot/react-qr": "^0.47.0-beta.3",
"@babel/runtime": "^7.7.2",
"@polkadot/react-identicon": "^0.47.0-beta.6",
"@polkadot/react-qr": "^0.47.0-beta.6",
"@types/react-router": "^5.1.2",
"@types/react-router-dom": "^5.1.2",
"react-router": "^5.1.2",
Expand Down
12 changes: 6 additions & 6 deletions packages/extension/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"name": "@polkadot/extension",
"description": "A sample signer extension for the @polkadot/api",
"version": "0.14.0-beta.2",
"version": "0.14.0-beta.5",
"author": "Jaco Greeff <jacogr@gmail.com>",
"license": "Apache-2",
"dependencies": {
"@polkadot/api": "^0.96.0-beta.34",
"@polkadot/extension-ui": "^0.14.0-beta.2",
"@polkadot/ui-keyring": "^0.47.0-beta.3"
"@polkadot/api": "^0.97.0-beta.4",
"@polkadot/extension-ui": "^0.14.0-beta.5",
"@polkadot/ui-keyring": "^0.47.0-beta.6"
},
"devDependencies": {
"@babel/runtime": "^7.7.1",
"@polkadot/keyring": "^1.7.0-beta.5",
"@babel/runtime": "^7.7.2",
"@polkadot/keyring": "^1.7.0-beta.7",
"@types/chrome": "^0.0.91",
"@types/firefox-webext-browser": "^70.0.1",
"extensionizer": "^1.0.1",
Expand Down
11 changes: 8 additions & 3 deletions packages/extension/src/background/handlers/Extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import extension from 'extensionizer';
import keyring from '@polkadot/ui-keyring';
import accountsObservable from '@polkadot/ui-keyring/observable/accounts';
import { createType } from '@polkadot/types';
import { assert } from '@polkadot/util';
import { assert, isHex } from '@polkadot/util';
import { keyExtractSuri, mnemonicGenerate, mnemonicValidate } from '@polkadot/util-crypto';

import State from './State';
Expand Down Expand Up @@ -130,8 +130,13 @@ export default class Extension {
private seedValidate ({ suri, type }: RequestSeedValidate): ResponseSeedValidate {
const { phrase } = keyExtractSuri(suri);

assert(SEED_LENGTHS.includes(phrase.split(' ').length), `Mnemonic needs to contain ${SEED_LENGTHS.join(', ')} words`);
assert(mnemonicValidate(phrase), 'Not a valid mnemonic seed');
if (isHex(phrase)) {
assert(isHex(phrase, 256), 'Hex seed needs to be 256-bits');
} else {
// sadly isHex detects as string, so we need a cast here
assert(SEED_LENGTHS.includes((phrase as string).split(' ').length), `Mnemonic needs to contain ${SEED_LENGTHS.join(', ')} words`);
assert(mnemonicValidate(phrase), 'Not a valid mnemonic seed');
}

return {
address: keyring.createFromUri(suri, {}, type).address,
Expand Down
Loading