From a4531a50d680afddbccdfac91c1d5f7694c3dafa Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 29 May 2018 14:34:23 +0200 Subject: [PATCH] Update for latest @polkadot/params (#64) * Update for latest @polkadot/params * Allow passing in of WS_URL environment * Cleanup block display * Update dependencies --- lerna.json | 2 +- packages/app-accounts/package.json | 4 +- packages/app-addresses/package.json | 6 +- packages/app-explorer/package.json | 8 +- packages/app-explorer/src/NodeInfo.js | 36 ++++ packages/app-explorer/src/index.css | 4 +- packages/app-explorer/src/index.js | 17 +- packages/app-extrinsics/package.json | 8 +- packages/app-extrinsics/src/Params/Call.js | 2 +- .../app-extrinsics/src/Params/Proposal.js | 2 +- packages/app-extrinsics/src/Selection.js | 4 +- packages/app-rpc/package.json | 8 +- packages/app-rpc/src/Selection.js | 2 +- packages/app-storage/package.json | 4 +- packages/app-storage/src/Query.js | 14 +- packages/app-storage/src/Selection.js | 4 +- packages/app-toolbox/package.json | 6 +- packages/app-vanitygen/package.json | 4 +- packages/apps/package.json | 22 +-- packages/apps/src/index.js | 6 +- packages/apps/webpack.config.js | 3 +- packages/ui-app/package.json | 12 +- .../ui-app/src/InputExtrinsic/SelectMethod.js | 2 +- packages/ui-app/src/InputExtrinsic/index.js | 2 +- .../src/InputExtrinsic/options/method.js | 6 +- .../src/InputExtrinsic/options/section.js | 2 +- packages/ui-app/src/InputRpc/SelectMethod.js | 2 +- packages/ui-app/src/InputRpc/index.js | 2 +- .../ui-app/src/InputRpc/options/method.js | 8 +- .../ui-app/src/InputRpc/options/section.js | 7 +- packages/ui-app/src/InputStorage/SelectKey.js | 4 +- packages/ui-app/src/InputStorage/index.js | 4 +- .../ui-app/src/InputStorage/options/key.js | 10 +- .../src/InputStorage/options/section.js | 10 +- packages/ui-app/src/Params/index.js | 13 +- packages/ui-app/src/Params/values.js | 2 +- packages/ui-keyring/package.json | 4 +- packages/ui-signer/package.json | 8 +- packages/ui-signer/src/Extrinsic.js | 2 +- yarn.lock | 181 ++++++++---------- 40 files changed, 228 insertions(+), 219 deletions(-) create mode 100644 packages/app-explorer/src/NodeInfo.js diff --git a/lerna.json b/lerna.json index b14a1b3f87..318d9db776 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "packages": [ "packages/*" ], - "version": "0.6.12" + "version": "0.7.0" } diff --git a/packages/app-accounts/package.json b/packages/app-accounts/package.json index ce0a715143..6952fc9e4d 100644 --- a/packages/app-accounts/package.json +++ b/packages/app-accounts/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-accounts", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,6 +12,6 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/ui-app": "^0.6.12" + "@polkadot/ui-app": "^0.7.0" } } diff --git a/packages/app-addresses/package.json b/packages/app-addresses/package.json index 52309ec625..f5c84ebb06 100644 --- a/packages/app-addresses/package.json +++ b/packages/app-addresses/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-addresses", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,7 +12,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/app-accounts": "^0.6.12", - "@polkadot/ui-app": "^0.6.12" + "@polkadot/app-accounts": "^0.7.0", + "@polkadot/ui-app": "^0.7.0" } } diff --git a/packages/app-explorer/package.json b/packages/app-explorer/package.json index caaeeb8e5f..4bc261d601 100644 --- a/packages/app-explorer/package.json +++ b/packages/app-explorer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-explorer", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/primitives-codec": "^0.16.15", - "@polkadot/primitives-json": "^0.16.15", - "@polkadot/ui-app": "^0.6.12", + "@polkadot/primitives-codec": "^0.17.2", + "@polkadot/primitives-json": "^0.17.2", + "@polkadot/ui-app": "^0.7.0", "@polkadot/util-crypto": "^0.22.2" } } diff --git a/packages/app-explorer/src/NodeInfo.js b/packages/app-explorer/src/NodeInfo.js new file mode 100644 index 0000000000..eed38db716 --- /dev/null +++ b/packages/app-explorer/src/NodeInfo.js @@ -0,0 +1,36 @@ +// Copyright 2017-2018 Jaco Greeff +// This software may be modified and distributed under the terms +// of the ISC license. See the LICENSE file for details. +// @flow + +import type { I18nProps } from '@polkadot/ui-app/types'; + +import React from 'react'; + +import classes from '@polkadot/ui-app/util/classes'; +import Chain from '@polkadot/ui-react-rx/Chain'; +import NodeName from '@polkadot/ui-react-rx/NodeName'; +import NodeVersion from '@polkadot/ui-react-rx/NodeVersion'; + +import translate from './translate'; + +type Props = I18nProps & {}; + +function NodeInfo ({ className, style, t }: Props): React$Node { + return ( +
+ + + +
+ ); +} + +export default translate(NodeInfo); diff --git a/packages/app-explorer/src/index.css b/packages/app-explorer/src/index.css index 5deabf2ada..a72121ec7b 100644 --- a/packages/app-explorer/src/index.css +++ b/packages/app-explorer/src/index.css @@ -12,6 +12,7 @@ .explorer--NodeInfo { font-size: 0.75rem; + margin-bottom: 1.5rem; opacity: 0.5; text-align: right; } @@ -35,8 +36,7 @@ .explorer--BestHash { font-size: 1.5em; - line-height: 1.5em; - margin-bottom: 1em; + line-height: 1.2; } .explorer--BestNumber { diff --git a/packages/app-explorer/src/index.js b/packages/app-explorer/src/index.js index abb5e5a250..f78b35a0bf 100644 --- a/packages/app-explorer/src/index.js +++ b/packages/app-explorer/src/index.js @@ -10,13 +10,11 @@ import './index.css'; import React from 'react'; import classes from '@polkadot/ui-app/util/classes'; -import Chain from '@polkadot/ui-react-rx/Chain'; import BestNumber from '@polkadot/ui-react-rx/BestNumber'; -import NodeName from '@polkadot/ui-react-rx/NodeName'; -import NodeVersion from '@polkadot/ui-react-rx/NodeVersion'; import BestHash from './BestHash'; import BlockHeaders from './BlockHeaders'; +import NodeInfo from './NodeInfo'; import translate from './translate'; type Props = I18nProps & {}; @@ -27,18 +25,6 @@ function ExplorerApp ({ className, style, t }: Props): React$Node { className={classes('explorer--App', className)} style={style} > -
- - - -
+ ); diff --git a/packages/app-extrinsics/package.json b/packages/app-extrinsics/package.json index 66e9192ef8..7d5b3f1527 100644 --- a/packages/app-extrinsics/package.json +++ b/packages/app-extrinsics/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-extrinsics", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/extrinsics-codec": "^0.16.15", - "@polkadot/ui-app": "^0.6.12", - "@polkadot/ui-signer": "^0.6.12", + "@polkadot/extrinsics-codec": "^0.17.2", + "@polkadot/ui-app": "^0.7.0", + "@polkadot/ui-signer": "^0.7.0", "react-dropzone": "^4.2.9" } } diff --git a/packages/app-extrinsics/src/Params/Call.js b/packages/app-extrinsics/src/Params/Call.js index 58520c130e..3bdd252c1a 100644 --- a/packages/app-extrinsics/src/Params/Call.js +++ b/packages/app-extrinsics/src/Params/Call.js @@ -7,7 +7,7 @@ import type { Props } from '@polkadot/ui-app/Params/types'; import React from 'react'; -import extrinsics from '@polkadot/extrinsics-substrate'; +import extrinsics from '@polkadot/extrinsics'; import Extrinsic from './Extrinsic'; diff --git a/packages/app-extrinsics/src/Params/Proposal.js b/packages/app-extrinsics/src/Params/Proposal.js index c67b530b86..4925d17aee 100644 --- a/packages/app-extrinsics/src/Params/Proposal.js +++ b/packages/app-extrinsics/src/Params/Proposal.js @@ -7,7 +7,7 @@ import type { Props } from '@polkadot/ui-app/Params/types'; import React from 'react'; -import extrinsics from '@polkadot/extrinsics-substrate'; +import extrinsics from '@polkadot/extrinsics'; import Extrinsic from './Extrinsic'; diff --git a/packages/app-extrinsics/src/Selection.js b/packages/app-extrinsics/src/Selection.js index 40fd449841..47538a53b1 100644 --- a/packages/app-extrinsics/src/Selection.js +++ b/packages/app-extrinsics/src/Selection.js @@ -9,7 +9,7 @@ import type { EncodedMessage, QueueTx$MessageAdd } from '@polkadot/ui-signer/typ import React from 'react'; -import extrinsics from '@polkadot/extrinsics-substrate'; +import extrinsics from '@polkadot/extrinsics'; import rpc from '@polkadot/jsonrpc'; import Button from '@polkadot/ui-app/Button'; import classes from '@polkadot/ui-app/util/classes'; @@ -31,7 +31,7 @@ type State = { }; const defaultExtrinsic = extrinsics.staking.public.transfer; -const defaultRpc = rpc.author.methods.submitExtrinsic; +const defaultRpc = rpc.author.public.submitExtrinsic; class Selection extends React.PureComponent { state: State = ({ diff --git a/packages/app-rpc/package.json b/packages/app-rpc/package.json index a35206bf6a..ca3ee23ac1 100644 --- a/packages/app-rpc/package.json +++ b/packages/app-rpc/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-rpc", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,8 +12,8 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/ui-app": "^0.6.12", - "@polkadot/ui-keyring": "^0.6.12", - "@polkadot/ui-signer": "^0.6.12" + "@polkadot/ui-app": "^0.7.0", + "@polkadot/ui-keyring": "^0.7.0", + "@polkadot/ui-signer": "^0.7.0" } } diff --git a/packages/app-rpc/src/Selection.js b/packages/app-rpc/src/Selection.js index dc68462045..348fb6cb94 100644 --- a/packages/app-rpc/src/Selection.js +++ b/packages/app-rpc/src/Selection.js @@ -35,7 +35,7 @@ type State = { values: Array } -const defaultMethod = rpc.author.methods.submitExtrinsic; +const defaultMethod = rpc.author.public.submitExtrinsic; class Selection extends React.PureComponent { state: State = { diff --git a/packages/app-storage/package.json b/packages/app-storage/package.json index ed8601ec9c..47cde14316 100644 --- a/packages/app-storage/package.json +++ b/packages/app-storage/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-storage", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,6 +12,6 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/ui-app": "^0.6.12" + "@polkadot/ui-app": "^0.7.0" } } diff --git a/packages/app-storage/src/Query.js b/packages/app-storage/src/Query.js index f764a9f0db..d45ed52255 100644 --- a/packages/app-storage/src/Query.js +++ b/packages/app-storage/src/Query.js @@ -52,15 +52,11 @@ class Query extends React.PureComponent { static getDerivedStateFromProps ({ value }: Props, prevState: State): State | null { const Component = Query.getCachedComponent(value); const { key, params } = value; - const inputs = Object - .keys(key.params) - .map((name, index) => { - const formatted = valueToText(key.params[name].type, params[index].value); - - return ( - {name}={formatted} - ); - }); + const inputs = key.params.map(({ name, type }, index) => ( + + {name}={valueToText(type, params[index].value)} + + )); return { Component, diff --git a/packages/app-storage/src/Selection.js b/packages/app-storage/src/Selection.js index 5a610f2e5a..9bc43657a5 100644 --- a/packages/app-storage/src/Selection.js +++ b/packages/app-storage/src/Selection.js @@ -10,7 +10,7 @@ import type { StorageQuery } from './types'; import React from 'react'; -import storage from '@polkadot/storage-substrate'; +import storage from '@polkadot/storage'; import Button from '@polkadot/ui-app/Button'; import InputStorage from '@polkadot/ui-app/InputStorage'; import Labelled from '@polkadot/ui-app/Labelled'; @@ -30,7 +30,7 @@ type State = { params: RawParams }; -const defaultValue = storage.timestamp.keys.current; +const defaultValue = storage.timestamp.public.current; let id = -1; class Selection extends React.PureComponent { diff --git a/packages/app-toolbox/package.json b/packages/app-toolbox/package.json index e9fad076f6..874c67cd3d 100644 --- a/packages/app-toolbox/package.json +++ b/packages/app-toolbox/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-toolbox", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,7 +12,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/ui-app": "^0.6.12", - "@polkadot/ui-keyring": "^0.6.12" + "@polkadot/ui-app": "^0.7.0", + "@polkadot/ui-keyring": "^0.7.0" } } diff --git a/packages/app-vanitygen/package.json b/packages/app-vanitygen/package.json index 68dfa9c087..ae366e29db 100644 --- a/packages/app-vanitygen/package.json +++ b/packages/app-vanitygen/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/app-vanitygen", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,7 +12,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/ui-app": "^0.6.12", + "@polkadot/ui-app": "^0.7.0", "chalk": "^2.4.1", "yargs": "10.1.2" }, diff --git a/packages/apps/package.json b/packages/apps/package.json index d99ddebd9d..9701d72b3d 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/apps", - "version": "0.6.12", + "version": "0.7.0", "description": "An Apps portal into the Polkadot network", "main": "index.js", "homepage": ".", @@ -13,16 +13,16 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/app-accounts": "^0.6.12", - "@polkadot/app-addresses": "^0.6.12", - "@polkadot/app-explorer": "^0.6.12", - "@polkadot/app-extrinsics": "^0.6.12", - "@polkadot/app-rpc": "^0.6.12", - "@polkadot/app-storage": "^0.6.12", - "@polkadot/app-toolbox": "^0.6.12", - "@polkadot/app-vanitygen": "^0.6.12", - "@polkadot/ui-app": "^0.6.12", - "@polkadot/ui-signer": "^0.6.12" + "@polkadot/app-accounts": "^0.7.0", + "@polkadot/app-addresses": "^0.7.0", + "@polkadot/app-explorer": "^0.7.0", + "@polkadot/app-extrinsics": "^0.7.0", + "@polkadot/app-rpc": "^0.7.0", + "@polkadot/app-storage": "^0.7.0", + "@polkadot/app-toolbox": "^0.7.0", + "@polkadot/app-vanitygen": "^0.7.0", + "@polkadot/ui-app": "^0.7.0", + "@polkadot/ui-signer": "^0.7.0" }, "devDependencies": { "babel-loader": "^8.0.0-beta.2", diff --git a/packages/apps/src/index.js b/packages/apps/src/index.js index ed2a457045..f0131fc335 100644 --- a/packages/apps/src/index.js +++ b/packages/apps/src/index.js @@ -7,4 +7,8 @@ import createApp from '@polkadot/ui-app'; import App from './App'; -createApp(App); +createApp(App, { + url: process.env.WS_URL === null || process.env.WS_URL === '' + ? undefined + : process.env.WS_URL +}); diff --git a/packages/apps/webpack.config.js b/packages/apps/webpack.config.js index 28d2f0045a..0d20af41cf 100644 --- a/packages/apps/webpack.config.js +++ b/packages/apps/webpack.config.js @@ -134,7 +134,8 @@ function createWebpack ({ alias = {}, context, name = 'index' }) { new webpack.DefinePlugin({ 'process.env': { NODE_ENV: JSON.stringify(ENV), - VERSION: JSON.stringify(pkgJson.version) + VERSION: JSON.stringify(pkgJson.version), + WS_URL: JSON.stringify(process.env.WS_URL) } }), new HtmlWebpackPlugin({ diff --git a/packages/ui-app/package.json b/packages/ui-app/package.json index fe707801c6..bdd4f640d2 100644 --- a/packages/ui-app/package.json +++ b/packages/ui-app/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/ui-app", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,11 +12,11 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/extrinsics-substrate": "^0.16.15", - "@polkadot/storage-substrate": "^0.16.15", - "@polkadot/ui-keyring": "^0.6.12", - "@polkadot/ui-react": "^0.13.22", - "@polkadot/ui-react-rx": "^0.13.22", + "@polkadot/extrinsics": "^0.17.2", + "@polkadot/storage": "^0.17.2", + "@polkadot/ui-keyring": "^0.7.0", + "@polkadot/ui-react": "^0.14.2", + "@polkadot/ui-react-rx": "^0.14.2", "i18next": "^11.1.1", "i18next-browser-languagedetector": "^2.2.0", "i18next-xhr-backend": "^1.5.1", diff --git a/packages/ui-app/src/InputExtrinsic/SelectMethod.js b/packages/ui-app/src/InputExtrinsic/SelectMethod.js index 9e73329caa..de6b6d51ff 100644 --- a/packages/ui-app/src/InputExtrinsic/SelectMethod.js +++ b/packages/ui-app/src/InputExtrinsic/SelectMethod.js @@ -9,7 +9,7 @@ import type { DropdownOptions } from './types'; import React from 'react'; -import extrinsics from '@polkadot/extrinsics-substrate'; +import extrinsics from '@polkadot/extrinsics'; import Dropdown from '../Dropdown'; import classes from '../util/classes'; diff --git a/packages/ui-app/src/InputExtrinsic/index.js b/packages/ui-app/src/InputExtrinsic/index.js index 0f75a3a3c3..f09fee60a3 100644 --- a/packages/ui-app/src/InputExtrinsic/index.js +++ b/packages/ui-app/src/InputExtrinsic/index.js @@ -12,7 +12,7 @@ import type { DropdownOptions } from './types'; import './InputExtrinsic.css'; import React from 'react'; -import map from '@polkadot/extrinsics-substrate'; +import map from '@polkadot/extrinsics'; import classes from '../util/classes'; import translate from '../translate'; diff --git a/packages/ui-app/src/InputExtrinsic/options/method.js b/packages/ui-app/src/InputExtrinsic/options/method.js index 14c7644c6e..03de22c00f 100644 --- a/packages/ui-app/src/InputExtrinsic/options/method.js +++ b/packages/ui-app/src/InputExtrinsic/options/method.js @@ -8,7 +8,7 @@ import type { DropdownOptions } from '../types'; import React from 'react'; -import map from '@polkadot/extrinsics-substrate'; +import map from '@polkadot/extrinsics'; export default function createOptions (sectionName: Extrinsic$Sections, type: 'private' | 'public'): DropdownOptions { const section = map[sectionName]; @@ -23,8 +23,8 @@ export default function createOptions (sectionName: Extrinsic$Sections, type: 'p .keys(methods) .sort() .map((name) => { - const { description = '', params = {} } = methods[name]; - const inputs = Object.keys(params).join(', '); + const { description, params } = methods[name]; + const inputs = params.map(({ name }) => name).join(', '); return { className: 'ui--DropdownLinked-Item', diff --git a/packages/ui-app/src/InputExtrinsic/options/section.js b/packages/ui-app/src/InputExtrinsic/options/section.js index 94a88a55cd..1b7747fde5 100644 --- a/packages/ui-app/src/InputExtrinsic/options/section.js +++ b/packages/ui-app/src/InputExtrinsic/options/section.js @@ -5,7 +5,7 @@ import type { DropdownOptions } from '../types'; -import map from '@polkadot/extrinsics-substrate'; +import map from '@polkadot/extrinsics'; export default function createOptions (type: 'private' | 'public'): DropdownOptions { return Object diff --git a/packages/ui-app/src/InputRpc/SelectMethod.js b/packages/ui-app/src/InputRpc/SelectMethod.js index d8a1842c74..0fce2c5287 100644 --- a/packages/ui-app/src/InputRpc/SelectMethod.js +++ b/packages/ui-app/src/InputRpc/SelectMethod.js @@ -30,7 +30,7 @@ function SelectMethod ({ className, isError, label = '', onChange, options, styl } const transform = (name: Interface$Sections): Interface$Method => - map[section].methods[name]; + map[section].public[name]; return ( { } const optionsMethod = methodOptions(newSection); - const value = map[newSection].methods[optionsMethod[0].value]; + const value = map[newSection].public[optionsMethod[0].value]; this.setState({ optionsMethod }, () => this.onMethodChange(value) diff --git a/packages/ui-app/src/InputRpc/options/method.js b/packages/ui-app/src/InputRpc/options/method.js index 233eae5c4a..a34a3b5697 100644 --- a/packages/ui-app/src/InputRpc/options/method.js +++ b/packages/ui-app/src/InputRpc/options/method.js @@ -18,16 +18,16 @@ export default function createOptions (sectionName: Interface$Sections): Dropdow } return Object - .keys(section.methods) + .keys(section.public) .sort() .filter((name) => { - const { isDeprecated = false, isHidden = false, isSubscription = false } = section.methods[name]; + const { isDeprecated, isHidden, isSubscription } = section.public[name]; return !isDeprecated && !isHidden && !isSubscription; }) .map((name) => { - const { description = '', params = {} } = section.methods[name]; - const inputs = Object.keys(params).join(', '); + const { description, params } = section.public[name]; + const inputs = params.map(({ name }) => name).join(', '); return { className: 'ui--DropdownLinked-Item', diff --git a/packages/ui-app/src/InputRpc/options/section.js b/packages/ui-app/src/InputRpc/options/section.js index f0a8585268..345cc321b2 100644 --- a/packages/ui-app/src/InputRpc/options/section.js +++ b/packages/ui-app/src/InputRpc/options/section.js @@ -12,11 +12,12 @@ export default function createOptions (): DropdownOptions { .keys(map) .sort() .filter((name) => { - const { isDeprecated = false, methods } = map[name]; + const section = map[name]; + const { isDeprecated } = section; const available = Object - .keys(methods) + .keys(section.public) .filter((name) => { - const { isDeprecated = false, isHidden = false } = methods[name]; + const { isDeprecated, isHidden } = section.public[name]; return !isDeprecated && !isHidden; }); diff --git a/packages/ui-app/src/InputStorage/SelectKey.js b/packages/ui-app/src/InputStorage/SelectKey.js index 23f89dcc7b..f733add707 100644 --- a/packages/ui-app/src/InputStorage/SelectKey.js +++ b/packages/ui-app/src/InputStorage/SelectKey.js @@ -9,7 +9,7 @@ import type { I18nProps } from '../types'; import React from 'react'; -import map from '@polkadot/storage-substrate'; +import map from '@polkadot/storage'; import Dropdown from '../Dropdown'; import classes from '../util/classes'; @@ -30,7 +30,7 @@ function SelectKey ({ className, isError, label = '', onChange, options, style, } const transform = (name: string): Storage$Key => - map[section].keys[name]; + map[section].public[name]; return ( { } const optionsMethod = keyOptions(newSection); - const value = map[newSection].keys[optionsMethod[0].value]; + const value = map[newSection].public[optionsMethod[0].value]; this.setState({ optionsMethod }, () => this.onKeyChange(value) diff --git a/packages/ui-app/src/InputStorage/options/key.js b/packages/ui-app/src/InputStorage/options/key.js index 515fe26e6d..a0665e533a 100644 --- a/packages/ui-app/src/InputStorage/options/key.js +++ b/packages/ui-app/src/InputStorage/options/key.js @@ -8,7 +8,7 @@ import type { DropdownOptions } from '../../InputExtrinsic/types'; import React from 'react'; -import map from '@polkadot/storage-substrate'; +import map from '@polkadot/storage'; export default function createOptions (sectionName: Storage$Sections): DropdownOptions { const section = map[sectionName]; @@ -18,16 +18,16 @@ export default function createOptions (sectionName: Storage$Sections): DropdownO } return Object - .keys(section.keys) + .keys(section.public) .sort() .filter((name) => { - const { isDeprecated = false, isHidden = false } = section.keys[name]; + const { isDeprecated, isHidden } = section.public[name]; return !isDeprecated && !isHidden; }) .map((name) => { - const { description = '', params = {} } = section.keys[name]; - const inputs = Object.keys(params).join(', '); + const { description, params } = section.public[name]; + const inputs = params.map(({ name }) => name).join(', '); return { className: 'ui--DropdownLinked-Item', diff --git a/packages/ui-app/src/InputStorage/options/section.js b/packages/ui-app/src/InputStorage/options/section.js index 23fe8334fd..c093109e1d 100644 --- a/packages/ui-app/src/InputStorage/options/section.js +++ b/packages/ui-app/src/InputStorage/options/section.js @@ -5,23 +5,23 @@ import type { DropdownOptions } from '../../InputExtrinsic/types'; -import map from '@polkadot/storage-substrate'; +import map from '@polkadot/storage'; export default function createOptions (): DropdownOptions { return Object .keys(map) .sort() .filter((name) => { - const { isDeprecated = false, keys } = map[name]; + const section = map[name]; const methods = Object - .keys(keys) + .keys(section.public) .filter((name) => { - const { isDeprecated = false, isHidden = false } = keys[name]; + const { isDeprecated, isHidden } = section.public[name]; return !isDeprecated && !isHidden; }); - return !isDeprecated && methods.length !== 0; + return !section.isDeprecated && methods.length !== 0; }) .map((name) => ({ text: name, diff --git a/packages/ui-app/src/Params/index.js b/packages/ui-app/src/Params/index.js index cd75149ec5..59532843ec 100644 --- a/packages/ui-app/src/Params/index.js +++ b/packages/ui-app/src/Params/index.js @@ -45,7 +45,7 @@ class Params> extends React.PureComponent @@ -70,11 +70,10 @@ class Params> extends React.PureComponent> extends React.PureComponent
- {paramNames.map((paramName, index) => ( + {params.map(({ name }, index) => ( diff --git a/packages/ui-app/src/Params/values.js b/packages/ui-app/src/Params/values.js index 8cf0e36a39..2b1f23ccb7 100644 --- a/packages/ui-app/src/Params/values.js +++ b/packages/ui-app/src/Params/values.js @@ -11,7 +11,7 @@ import isUndefined from '@polkadot/util/is/undefined'; import getInitValue from './initValue'; export default function values (params: Params): Array { - const types = Object.keys(params).map((key) => params[key].type); + const types = params.map(({ type }) => type); return types.map((type): RawParam => { if (Array.isArray(type)) { diff --git a/packages/ui-keyring/package.json b/packages/ui-keyring/package.json index a178992ffa..288acc7ce0 100644 --- a/packages/ui-keyring/package.json +++ b/packages/ui-keyring/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/ui-keyring", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,7 +12,7 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/ui-react": "^0.13.22", + "@polkadot/ui-react": "^0.14.2", "@polkadot/util-keyring": "^0.22.2", "store": "^2.0.12" }, diff --git a/packages/ui-signer/package.json b/packages/ui-signer/package.json index 3adf564a17..8de07c3e06 100644 --- a/packages/ui-signer/package.json +++ b/packages/ui-signer/package.json @@ -1,6 +1,6 @@ { "name": "@polkadot/ui-signer", - "version": "0.6.12", + "version": "0.7.0", "main": "index.js", "repository": "https://github.com/polkadot-js/apps.git", "author": "Jaco Greeff ", @@ -12,9 +12,9 @@ }, "dependencies": { "@babel/runtime": "^7.0.0-beta.47", - "@polkadot/extrinsics": "^0.16.15", - "@polkadot/ui-app": "^0.6.12", - "@polkadot/ui-keyring": "^0.6.12" + "@polkadot/extrinsics": "^0.17.2", + "@polkadot/ui-app": "^0.7.0", + "@polkadot/ui-keyring": "^0.7.0" }, "peerDependencies": { "react": "^16.4.0", diff --git a/packages/ui-signer/src/Extrinsic.js b/packages/ui-signer/src/Extrinsic.js index 406bc6dc9a..178f952a76 100644 --- a/packages/ui-signer/src/Extrinsic.js +++ b/packages/ui-signer/src/Extrinsic.js @@ -10,7 +10,7 @@ import BN from 'bn.js'; import React from 'react'; import { Trans } from 'react-i18next'; -import extrinsics from '@polkadot/extrinsics-substrate'; +import extrinsics from '@polkadot/extrinsics'; import Modal from '@polkadot/ui-app/Modal'; import IdentityIcon from '@polkadot/ui-react/IdentityIcon'; import u8aToHex from '@polkadot/util/u8a/toHex'; diff --git a/yarn.lock b/yarn.lock index a472872f8a..406c9e7a19 100644 --- a/yarn.lock +++ b/yarn.lock @@ -719,22 +719,22 @@ version "1.0.2" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz#d056b68999769728a1cff8d643bc59eb6f0be436" -"@polkadot/api-format@^0.12.15": - version "0.12.15" - resolved "https://registry.yarnpkg.com/@polkadot/api-format/-/api-format-0.12.15.tgz#62341ea7086bd39f60fc6fff20767f86cc34e0e7" +"@polkadot/api-format@^0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@polkadot/api-format/-/api-format-0.13.1.tgz#10d42410ac69b0e9dfba79e880fcef34af82007a" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/jsonrpc" "^0.16.15" - "@polkadot/primitives-json" "^0.16.15" + "@polkadot/jsonrpc" "^0.17.2" + "@polkadot/primitives-json" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-keyring" "^0.22.2" -"@polkadot/api-provider@^0.12.15": - version "0.12.15" - resolved "https://registry.yarnpkg.com/@polkadot/api-provider/-/api-provider-0.12.15.tgz#92205e42e2f7ae159fdf6a9fac666756289bf136" +"@polkadot/api-provider@^0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@polkadot/api-provider/-/api-provider-0.13.1.tgz#bf1b0802a4abd3a45d6eef60adc773a25be2e010" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/storage-substrate" "^0.16.15" + "@polkadot/storage" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-crypto" "^0.22.2" "@polkadot/util-keyring" "^0.22.2" @@ -742,24 +742,24 @@ isomorphic-fetch "^2.2.1" websocket "^1.0.25" -"@polkadot/api-rx@^0.12.15": - version "0.12.15" - resolved "https://registry.yarnpkg.com/@polkadot/api-rx/-/api-rx-0.12.15.tgz#75fbb5b9b090d7f732ad3004101a897560128d5b" +"@polkadot/api-rx@^0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@polkadot/api-rx/-/api-rx-0.13.1.tgz#cb6bd753dafc5a73237dd6d7be53240ed12b2c1f" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/api" "^0.12.15" - "@polkadot/api-provider" "^0.12.15" + "@polkadot/api" "^0.13.1" + "@polkadot/api-provider" "^0.13.1" rxjs "^5.5.10" -"@polkadot/api@^0.12.15": - version "0.12.15" - resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.12.15.tgz#ca6fb0c8b669cc1702b9a5935a56a575a85c4be5" +"@polkadot/api@^0.13.1": + version "0.13.1" + resolved "https://registry.yarnpkg.com/@polkadot/api/-/api-0.13.1.tgz#004ee54d264b3e7466d4ffd3552b75b19b667881" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/api-format" "^0.12.15" - "@polkadot/api-provider" "^0.12.15" - "@polkadot/jsonrpc" "^0.16.15" - "@polkadot/params" "^0.16.15" + "@polkadot/api-format" "^0.13.1" + "@polkadot/api-provider" "^0.13.1" + "@polkadot/jsonrpc" "^0.17.2" + "@polkadot/params" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/dev-react@^0.19.11": @@ -817,137 +817,122 @@ mkdirp "^0.5.1" rimraf "^2.6.2" -"@polkadot/extrinsics-codec@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics-codec/-/extrinsics-codec-0.16.15.tgz#92e752736af2c61ae24b371ebee6f44b5daa2db8" +"@polkadot/extrinsics-codec@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/extrinsics-codec/-/extrinsics-codec-0.17.2.tgz#1093bc9fe74bb227ea38fcb5b6745baf241883f7" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/extrinsics" "^0.16.15" - "@polkadot/params" "^0.16.15" + "@polkadot/extrinsics" "^0.17.2" + "@polkadot/params" "^0.17.2" "@polkadot/util" "^0.22.2" bn.js "^4.11.8" -"@polkadot/extrinsics-substrate@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics-substrate/-/extrinsics-substrate-0.16.15.tgz#c8ad42f38b568629a3de9089413a8275ef06dc8d" +"@polkadot/extrinsics@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.17.2.tgz#74c09019268ff81ebc5023a5c6d3bd2fd08385ee" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/extrinsics" "^0.16.15" - -"@polkadot/extrinsics@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/extrinsics/-/extrinsics-0.16.15.tgz#103cd7beb4049fee07d86ac34f02e14360dc9b32" - dependencies: - "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/params" "^0.16.15" - "@polkadot/primitives" "^0.16.15" + "@polkadot/params" "^0.17.2" + "@polkadot/primitives" "^0.17.2" "@polkadot/util" "^0.22.2" -"@polkadot/jsonrpc@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.16.15.tgz#aaa9bdff6af8fb32b49740843e203490a5285f15" +"@polkadot/jsonrpc@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/jsonrpc/-/jsonrpc-0.17.2.tgz#8056b2fddb41d1f15c2f428fb3622aeffa6d4d42" dependencies: - "@polkadot/params" "^0.16.15" + "@polkadot/params" "^0.17.2" babel-runtime "^6.26.0" -"@polkadot/params@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.16.15.tgz#31d419b6bdb815cdb87cd1a3bd251a670a5e02c7" +"@polkadot/params@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/params/-/params-0.17.2.tgz#eeb7d1427c375398f110e34b1fcf7d649af6ab40" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/extrinsics" "^0.16.15" - "@polkadot/extrinsics-substrate" "^0.16.15" - "@polkadot/primitives" "^0.16.15" + "@polkadot/extrinsics" "^0.17.2" + "@polkadot/primitives" "^0.17.2" "@polkadot/util" "^0.22.2" -"@polkadot/primitives-builder@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.16.15.tgz#89e986a6e7167247beea8dc2dcc8278b7cfd4404" +"@polkadot/primitives-builder@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-builder/-/primitives-builder-0.17.2.tgz#a470e9dc2665a7177318517884afb396f718825b" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-codec" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-codec" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-crypto" "^0.22.2" "@polkadot/util-triehash" "^0.22.2" -"@polkadot/primitives-codec@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.16.15.tgz#ecbe4c9cfc77da49361920ded193c5c2ff2c7aa0" +"@polkadot/primitives-codec@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-codec/-/primitives-codec-0.17.2.tgz#310d113b75191787b8b7fa45fdc1fd5858e5e00a" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-builder" "^0.16.15" - "@polkadot/primitives-rlp" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-builder" "^0.17.2" + "@polkadot/primitives-rlp" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-keyring" "^0.22.2" -"@polkadot/primitives-json@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.16.15.tgz#decb1fa9a134dd92a792d16a970bc9c1e783b81b" +"@polkadot/primitives-json@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-json/-/primitives-json-0.17.2.tgz#4db3603bb668f4bfae59fdddc72780860c83cd86" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-builder" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-builder" "^0.17.2" "@polkadot/util" "^0.22.2" -"@polkadot/primitives-rlp@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives-rlp/-/primitives-rlp-0.16.15.tgz#863b78da6273887631193730fab96e5d81c11b33" +"@polkadot/primitives-rlp@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives-rlp/-/primitives-rlp-0.17.2.tgz#a142e55a5cb42277ba5f2d6bd7ee34ffd31ff55e" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/primitives" "^0.16.15" - "@polkadot/primitives-builder" "^0.16.15" + "@polkadot/primitives" "^0.17.2" + "@polkadot/primitives-builder" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-crypto" "^0.22.2" -"@polkadot/primitives@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.16.15.tgz#b7f63adc89eb744d956ec93344dd74886cf9139e" +"@polkadot/primitives@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/primitives/-/primitives-0.17.2.tgz#44bd4a56708550054ad41d6fda46d66c0e1f6bcb" dependencies: "@babel/runtime" "^7.0.0-beta.47" "@polkadot/util" "^0.22.2" -"@polkadot/storage-substrate@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/storage-substrate/-/storage-substrate-0.16.15.tgz#f0ab2dc9c85ebe9f72e223d15bb84ef3f42dc5ad" +"@polkadot/storage@^0.17.2": + version "0.17.2" + resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.17.2.tgz#bbb779879faec6c3b6691aedd4af898bf54c3e55" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/storage" "^0.16.15" - "@polkadot/util" "^0.22.2" - -"@polkadot/storage@^0.16.15": - version "0.16.15" - resolved "https://registry.yarnpkg.com/@polkadot/storage/-/storage-0.16.15.tgz#e1cb8cf618ab75eb6483a236a52da14a46e15781" - dependencies: - "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/params" "^0.16.15" - "@polkadot/primitives" "^0.16.15" + "@polkadot/params" "^0.17.2" + "@polkadot/primitives" "^0.17.2" "@polkadot/util" "^0.22.2" "@polkadot/util-keyring" "^0.22.2" -"@polkadot/ui-identicon@^0.13.22": - version "0.13.22" - resolved "https://registry.yarnpkg.com/@polkadot/ui-identicon/-/ui-identicon-0.13.22.tgz#75a479cf4d22ecce676229e7719651c77172e2eb" +"@polkadot/ui-identicon@^0.14.2": + version "0.14.2" + resolved "https://registry.yarnpkg.com/@polkadot/ui-identicon/-/ui-identicon-0.14.2.tgz#7f1b935ceb6a59b3b31846389b24bc6ad67cfa21" dependencies: "@babel/runtime" "^7.0.0-beta.47" color "^3.0.0" -"@polkadot/ui-react-rx@^0.13.22": - version "0.13.22" - resolved "https://registry.yarnpkg.com/@polkadot/ui-react-rx/-/ui-react-rx-0.13.22.tgz#e96ce854651d4cf32980f6143f7fe4201fb2342d" +"@polkadot/ui-react-rx@^0.14.2": + version "0.14.2" + resolved "https://registry.yarnpkg.com/@polkadot/ui-react-rx/-/ui-react-rx-0.14.2.tgz#fa20fed553ea91cd505080550ffde898a48ec8b8" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/api-rx" "^0.12.15" - "@polkadot/extrinsics-codec" "^0.16.15" - "@polkadot/storage-substrate" "^0.16.15" + "@polkadot/api-rx" "^0.13.1" + "@polkadot/extrinsics-codec" "^0.17.2" + "@polkadot/storage" "^0.17.2" + semver "^5.5.0" -"@polkadot/ui-react@^0.13.22": - version "0.13.22" - resolved "https://registry.yarnpkg.com/@polkadot/ui-react/-/ui-react-0.13.22.tgz#a8c8d9f7ee667b29d45a8ddc8f8426613d2c55e0" +"@polkadot/ui-react@^0.14.2": + version "0.14.2" + resolved "https://registry.yarnpkg.com/@polkadot/ui-react/-/ui-react-0.14.2.tgz#02982b3e26dd2eea6ad096a08f671ce75c73ea8b" dependencies: "@babel/runtime" "^7.0.0-beta.47" - "@polkadot/ui-identicon" "^0.13.22" + "@polkadot/ui-identicon" "^0.14.2" "@polkadot/util-crypto@^0.22.2": version "0.22.2"