neptune/ghost-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update util-keyring, pair.hasSecretKey -> pair.isLocked (#200)

Browse Source 
* Update util-keyring, pair.hasSecretKey -> pair.isLocked

* Fix decrementing versions manually

* Update deps
This commit is contained in:
Jaco Greeff 2018-08-06 21:48:05 +02:00 committed by GitHub
parent 21c9979ed8
commit 278ca13812
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 123 additions and 111 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/app-example/package.json
View File

@ -11,9 +11,9 @@
"license": "ISC",
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/storage": "^0.26.36",
"@polkadot/storage": "^0.27.9",
"@polkadot/ui-react": "^0.19.18",
"@polkadot/ui-react-rx": "^0.19.18",
"@polkadot/util-keyring": "^0.26.36"
"@polkadot/util-keyring": "^0.27.9"
}
}

4
packages/app-explorer/package.json
View File

@ -16,8 +16,8 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/primitives": "^0.26.36",
"@polkadot/primitives": "^0.27.9",
"@polkadot/ui-app": "^0.19.18",
"@polkadot/util-crypto": "^0.26.36"
"@polkadot/util-crypto": "^0.27.9"
}
}

2
packages/app-extrinsics/package.json
View File

@ -16,7 +16,7 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/extrinsics": "^0.26.36",
"@polkadot/extrinsics": "^0.27.9",
"@polkadot/ui-app": "^0.19.18",
"@polkadot/ui-signer": "^0.19.18",
"react-dropzone": "^4.2.9"

4
packages/app-staking/package.json
View File

@ -12,11 +12,11 @@
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/app-extrinsics": "^0.19.18",
"@polkadot/storage": "^0.26.36",
"@polkadot/storage": "^0.27.9",
"@polkadot/ui-app": "^0.19.18",
"@polkadot/ui-keyring": "^0.19.18",
"@polkadot/ui-react": "^0.19.18",
"@polkadot/ui-react-rx": "^0.19.18",
"@polkadot/util-keyring": "^0.26.36"
"@polkadot/util-keyring": "^0.27.9"
}
}

16
packages/app-staking/src/Account.tsx
View File

@ -70,13 +70,15 @@ class Account extends React.PureComponent<Props, State> {
name={name}
value={address}
>
<Icon
className={classes('staking--Account-validating', isValidator ? 'isValidator' : '')}
name='certificate'
size='large'
/>
{this.renderButtons()}
<AddressMini value={nominating} />
<div className='staking--Account-expand'>
<Icon
className={classes('staking--Account-validating', isValidator ? 'isValidator' : '')}
name='certificate'
size='large'
/>
{this.renderButtons()}
<AddressMini value={nominating} />
</div>
</AddressSummary>
</div>
);

10
packages/app-staking/src/index.css
View File

@ -16,7 +16,9 @@
border-radius: 0.25rem;
display: inline-block;
margin: 1rem;
padding: 1rem;
padding: 1rem 0;
/* FIXME: HACK: We need flexbox layout */
min-width: 528px;
}
.staking--Account .ui--Button-Group {
@ -26,7 +28,11 @@
}
.staking--Account .ui--Button-Group {
text-align: left;
text-align: right;
}
.staking--Account-expand {
padding-left: 1em;
}
.staking--Account-buttons,

4
packages/app-toolbox/src/Sign.tsx
View File

@ -49,7 +49,7 @@ class Sign extends React.PureComponent<Props, State> {
data: '',
isHexData: false,
isLocked: currentPair
? !currentPair.hasSecretKey()
? currentPair.isLocked()
: false,
isUnlockVisible: false,
signature: ''
@ -185,7 +185,7 @@ class Sign extends React.PureComponent<Props, State> {
this.setState(
(prevState: State): State => {
const { currentPair = prevState.currentPair, data = prevState.data, isHexData = prevState.isHexData, isUnlockVisible = prevState.isUnlockVisible } = newState;
const isLocked = !currentPair || !currentPair.hasSecretKey();
const isLocked = !currentPair || currentPair.isLocked();
let signature = '';
if (!isLocked && currentPair) {

2
packages/app-toolbox/src/Unlock.tsx
View File

@ -133,7 +133,7 @@ class Unlock extends React.PureComponent<Props, State> {
unlockAccount (password?: string): UnlockI18n | null {
const { pair } = this.props;
if (!pair || pair.hasSecretKey()) {
if (!pair || !pair.isLocked()) {
return null;
}

4
packages/ui-app/package.json
View File

@ -16,8 +16,8 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/extrinsics": "^0.26.36",
"@polkadot/storage": "^0.26.36",
"@polkadot/extrinsics": "^0.27.9",
"@polkadot/storage": "^0.27.9",
"@polkadot/ui-keyring": "^0.19.18",
"@polkadot/ui-react": "^0.19.18",
"@polkadot/ui-react-rx": "^0.19.18",

10
packages/ui-app/src/styles/components.css
View File

@ -33,12 +33,16 @@
.ui--AddressSummary {
padding: 0 2em;
text-align: center;
text-align: left;
white-space: nowrap
}
.ui--AddressSummary .ui--AddressSummary-base,
.ui--AddressSummary .ui--AddressSummary-children {
.ui--AddressSummary-base {
text-align: center;
}
.ui--AddressSummary-base,
.ui--AddressSummary-children {
display: inline-block;
vertical-align: top;
}

2
packages/ui-identicon/package.json
View File

@ -22,7 +22,7 @@
"color": "^3.0.0"
},
"devDependencies": {
"@polkadot/util-crypto": "^0.26.36",
"@polkadot/util-crypto": "^0.27.9",
"xmlserializer": "^0.6.1"
}
}

2
packages/ui-keyring/package.json
View File

@ -17,7 +17,7 @@
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/ui-react": "^0.19.18",
"@polkadot/util-keyring": "^0.26.36",
"@polkadot/util-keyring": "^0.27.9",
"store": "^2.0.12"
},
"peerDependencies": {

6
packages/ui-react-rx/package.json
View File

@ -36,9 +36,9 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/api-rx": "^0.14.27",
"@polkadot/extrinsics": "^0.26.36",
"@polkadot/storage": "^0.26.36"
"@polkadot/api-rx": "^0.14.29",
"@polkadot/extrinsics": "^0.27.9",
"@polkadot/storage": "^0.27.9"
},
"devDependencies": {
"babel-loader": "^8.0.0-beta.2",

2
packages/ui-react/package.json
View File

@ -19,7 +19,7 @@
"@polkadot/ui-identicon": "^0.19.18"
},
"devDependencies": {
"@polkadot/util-keyring": "^0.26.36",
"@polkadot/util-keyring": "^0.27.9",
"babel-loader": "^8.0.0-beta.2",
"css-loader": "0.28.9",
"empty": "^0.10.1",

2
packages/ui-signer/package.json
View File

@ -16,7 +16,7 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.51",
"@polkadot/extrinsics": "^0.26.36",
"@polkadot/extrinsics": "^0.27.9",
"@polkadot/ui-app": "^0.19.18",
"@polkadot/ui-keyring": "^0.19.18"
},

2
packages/ui-signer/src/Modal.tsx
View File

@ -169,7 +169,7 @@ class Signer extends React.PureComponent<Props, State> {
unlockAccount (publicKey: Uint8Array, password?: string): UnlockI18n | null {
const pair = keyring.getPair(publicKey);
if (pair.hasSecretKey()) {
if (!pair.isLocked()) {
return null;
}

2
packages/ui-signer/src/Unlock.tsx
View File

@ -31,7 +31,7 @@ class Unlock extends React.PureComponent<Props, State> {
static getDerivedStateFromProps ({ error, password, value }: Props): State {
const pair = keyring.getPair(value as Uint8Array);
const isLocked = !pair.hasSecretKey();
const isLocked = pair.isLocked();
return {
isError: !!error,

156
yarn.lock
View File

@ -765,50 +765,50 @@
version "1.1.0"
resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.0.tgz#50c1e2260ac0ed9439a181de3725a0168d59c48a"
"@polkadot/api-format@^0.14.27":
version "0.14.27"
resolved "https://registry.yarnpkg.com/@polkadot/api-format/-/api-format-0.14.27.tgz#9f5c241d856c06ea6eb05321579882fd95b0195d"
"@polkadot/api-format@^0.14.29":
version "0.14.29"
resolved "https://registry.yarnpkg.com/@polkadot/api-format/-/api-format-0.14.29.tgz#02b1cc84d19219909d4dc82ab9ecd57f07aa888c"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/jsonrpc" "^0.26.36"
"@polkadot/primitives" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/util-keyring" "^0.26.36"
"@polkadot/jsonrpc" "^0.27.9"
"@polkadot/primitives" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/util-keyring" "^0.27.9"
"@polkadot/api-provider@^0.14.27":
version "0.14.27"
resolved "https://registry.yarnpkg.com/@polkadot/api-provider/-/api-provider-0.14.27.tgz#81de1bd8013814b47e88979bd3edff7e682d8956"
"@polkadot/api-provider@^0.14.29":
version "0.14.29"
resolved "https://registry.yarnpkg.com/@polkadot/api-provider/-/api-provider-0.14.29.tgz#d1bb7e8e879e62f868e0149e25a55995e600536e"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/storage" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/util-crypto" "^0.26.36"
"@polkadot/util-keyring" "^0.26.36"
"@polkadot/storage" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/util-crypto" "^0.27.9"
"@polkadot/util-keyring" "^0.27.9"
"@types/nock" "^9.1.3"
eventemitter3 "^2.0.3"
isomorphic-fetch "^2.2.1"
websocket "^1.0.25"
"@polkadot/api-rx@^0.14.27":
version "0.14.27"
resolved "https://registry.yarnpkg.com/@polkadot/api-rx/-/api-rx-0.14.27.tgz#0598a457a92a93cd73f47556fdfc82d8a5aa6cc6"
"@polkadot/api-rx@^0.14.29":
version "0.14.29"
resolved "https://registry.yarnpkg.com/@polkadot/api-rx/-/api-rx-0.14.29.tgz#e71c3b2dec8dd0e7cbc391024bd17b9616c8b453"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/api" "^0.14.27"
"@polkadot/api-provider" "^0.14.27"
"@polkadot/api" "^0.14.29"
"@polkadot/api-provider" "^0.14.29"
"@types/rx" "^4.1.1"
rxjs "^5.5.10"
"@polkadot/api@^0.14.27":
version "0.14.27"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.14.27.tgz#d83cbcc8788f67fddc796b232c136786fe81655f"
"@polkadot/api@^0.14.29":
version "0.14.29"
resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.14.29.tgz#6a3f08ee1bd98e5ee96d85361f195496ebab65b7"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/api-format" "^0.14.27"
"@polkadot/api-provider" "^0.14.27"
"@polkadot/jsonrpc" "^0.26.36"
"@polkadot/params" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/api-format" "^0.14.29"
"@polkadot/api-provider" "^0.14.29"
"@polkadot/jsonrpc" "^0.27.9"
"@polkadot/params" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/dev-react@^0.20.12":
version "0.20.12"
@ -877,94 +877,94 @@
typedoc "^0.11.1"
typescript "^2.9.2"
"@polkadot/extrinsics@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.26.36.tgz#c718d111266389e7f5d73c7c4ba7c500685152e7"
"@polkadot/extrinsics@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.27.9.tgz#85e1070fcaa0e8d801b10bb71d19bd6ecfd69520"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/params" "^0.26.36"
"@polkadot/primitives" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/params" "^0.27.9"
"@polkadot/primitives" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/jsonrpc@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.26.36.tgz#55c132cdb51e9d2525de47ab7504b1286529a6af"
"@polkadot/jsonrpc@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.27.9.tgz#d40a18df93e5a1970bb879c4aa3f35beb9858686"
dependencies:
"@polkadot/params" "^0.26.36"
"@polkadot/params" "^0.27.9"
babel-runtime "^6.26.0"
"@polkadot/params@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.26.36.tgz#ea6d4d02caa144d6752f7704a1f07512efb69fb7"
"@polkadot/params@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.27.9.tgz#b18dedd1dd6b33539045d9414e966c607fc0bd94"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/extrinsics" "^0.26.36"
"@polkadot/primitives" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/extrinsics" "^0.27.9"
"@polkadot/primitives" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/primitives@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.26.36.tgz#96effffa76a70329d64f82c5f735e96632aa7cc9"
"@polkadot/primitives@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.27.9.tgz#74006cce2b1198f2b7a56285aecb2582decbff58"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/trie-hash" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/trie-hash" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/storage@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.26.36.tgz#030a086037abaefa66185a5de8b3c70f232a83e4"
"@polkadot/storage@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.27.9.tgz#2edb322e81296ebe738af933938fb096b05825a4"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/params" "^0.26.36"
"@polkadot/primitives" "^0.26.36"
"@polkadot/util" "^0.26.36"
"@polkadot/util-crypto" "^0.26.36"
"@polkadot/util-keyring" "^0.26.36"
"@polkadot/params" "^0.27.9"
"@polkadot/primitives" "^0.27.9"
"@polkadot/util" "^0.27.9"
"@polkadot/util-crypto" "^0.27.9"
"@polkadot/util-keyring" "^0.27.9"
"@polkadot/trie-hash@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/trie-hash/-/trie-hash-0.26.36.tgz#0e7e2a31e61cbceb4081df33bac87c1d25471e1a"
"@polkadot/trie-hash@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/trie-hash/-/trie-hash-0.27.9.tgz#25aa08e9df39b5ad6ce0507d1deac14b06066660"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/util" "^0.26.36"
"@polkadot/util-crypto" "^0.26.36"
"@polkadot/util-rlp" "^0.26.36"
"@polkadot/util" "^0.27.9"
"@polkadot/util-crypto" "^0.27.9"
"@polkadot/util-rlp" "^0.27.9"
"@polkadot/ts@^0.1.10":
version "0.1.10"
resolved "https://registry.yarnpkg.com/@polkadot/ts/-/ts-0.1.10.tgz#784d460cf4b2e9b38bb1c77f9366dd01425f220d"
"@polkadot/util-crypto@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.26.36.tgz#1f6d7faa49df96a23109fa3e03faa4191d9ef281"
"@polkadot/util-crypto@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/util-crypto/-/util-crypto-0.27.9.tgz#d01f641a17755ab979c0c16dfb83259cb734f638"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/util" "^0.26.36"
"@polkadot/util" "^0.27.9"
blakejs "^1.1.0"
js-sha3 "^0.7.0"
tweetnacl "^1.0.0"
xxhashjs "^0.2.2"
"@polkadot/util-keyring@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.26.36.tgz#6e69c8310abfd9aac350039e649702ace2a21e39"
"@polkadot/util-keyring@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/util-keyring/-/util-keyring-0.27.9.tgz#9dc109588f87a2d8b0c01165dca8b14316486788"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/util" "^0.26.36"
"@polkadot/util-crypto" "^0.26.36"
"@polkadot/util" "^0.27.9"
"@polkadot/util-crypto" "^0.27.9"
"@types/bs58" "^3.0.30"
bs58 "^4.0.1"
"@polkadot/util-rlp@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.26.36.tgz#d27004a10324f7cc97ff1c1103e3f578e3b3f249"
"@polkadot/util-rlp@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/util-rlp/-/util-rlp-0.27.9.tgz#596737519b630aeaf0c6b50738d729211b8ee934"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@polkadot/util" "^0.26.36"
"@polkadot/util" "^0.27.9"
"@polkadot/util@^0.26.36":
version "0.26.36"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.26.36.tgz#5b736588158157e0df9572b9243680cd324f4267"
"@polkadot/util@^0.27.9":
version "0.27.9"
resolved "https://registry.yarnpkg.com/@polkadot/util/-/util-0.27.9.tgz#4c3328aa3d2e51f409d77459005c0d47a9a0341b"
dependencies:
"@babel/runtime" "^7.0.0-beta.51"
"@types/bn.js" "^4.11.1"