Skip to content

Update for latest @polkadot/params #64

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
jacogr merged 4 commits into from
May 29, 2018
Merged

Update for latest @polkadot/params #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25f982d
Update for latest @polkadot/params
jacogr May 29, 2018
252b445
Allow passing in of WS_URL environment
jacogr May 29, 2018
9366e23
Cleanup block display
jacogr May 29, 2018
368274c
Update dependencies
jacogr May 29, 2018
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 @@ -10,5 +10,5 @@
"packages": [
"packages/*"
],
"version": "0.6.12"
"version": "0.7.0"
}
4 changes: 2 additions & 2 deletions packages/app-accounts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -12,6 +12,6 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.47",
"@polkadot/ui-app": "^0.6.12"
"@polkadot/ui-app": "^0.7.0"
}
}
6 changes: 3 additions & 3 deletions packages/app-addresses/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -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"
}
}
8 changes: 4 additions & 4 deletions packages/app-explorer/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -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"
}
}
36 changes: 36 additions & 0 deletions packages/app-explorer/src/NodeInfo.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 (
<div className={classes('explorer--NodeInfo', className)}>
<Chain label={t('app.chain', {
defaultValue: 'chain: '
})} />
<NodeName label={t('app.name', {
defaultValue: 'client: '
})}
/>
<NodeVersion label={t('app.name', {
defaultValue: 'version: '
})} />
</div>
);
}

export default translate(NodeInfo);
4 changes: 2 additions & 2 deletions packages/app-explorer/src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

.explorer--NodeInfo {
font-size: 0.75rem;
margin-bottom: 1.5rem;
opacity: 0.5;
text-align: right;
}
Expand All @@ -35,8 +36,7 @@

.explorer--BestHash {
font-size: 1.5em;
line-height: 1.5em;
margin-bottom: 1em;
line-height: 1.2;
}

.explorer--BestNumber {
Expand Down
17 changes: 2 additions & 15 deletions packages/app-explorer/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 & {};
Expand All @@ -27,25 +25,14 @@ function ExplorerApp ({ className, style, t }: Props): React$Node {
className={classes('explorer--App', className)}
style={style}
>
<div className='explorer--NodeInfo'>
<Chain label={t('app.chain', {
defaultValue: 'chain: '
})} />
<NodeName label={t('app.name', {
defaultValue: 'client: '
})}
/>
<NodeVersion label={t('app.name', {
defaultValue: 'version: '
})} />
</div>
<BestNumber
className='explorer--BestNumber'
label={t('app.bestNumber', {
defaultValue: 'best #'
})}
/>
<BestHash />
<NodeInfo />
<BlockHeaders />
</div>
);
Expand Down
8 changes: 4 additions & 4 deletions packages/app-extrinsics/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/app-extrinsics/src/Params/Call.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
2 changes: 1 addition & 1 deletion packages/app-extrinsics/src/Params/Proposal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand Down
4 changes: 2 additions & 2 deletions packages/app-extrinsics/src/Selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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<Props, State> {
state: State = ({
Expand Down
8 changes: 4 additions & 4 deletions packages/app-rpc/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -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"
}
}
2 changes: 1 addition & 1 deletion packages/app-rpc/src/Selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type State = {
values: Array<RawParam>
}

const defaultMethod = rpc.author.methods.submitExtrinsic;
const defaultMethod = rpc.author.public.submitExtrinsic;

class Selection extends React.PureComponent<Props, State> {
state: State = {
Expand Down
4 changes: 2 additions & 2 deletions packages/app-storage/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -12,6 +12,6 @@
},
"dependencies": {
"@babel/runtime": "^7.0.0-beta.47",
"@polkadot/ui-app": "^0.6.12"
"@polkadot/ui-app": "^0.7.0"
}
}
14 changes: 5 additions & 9 deletions packages/app-storage/src/Query.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,11 @@ class Query extends React.PureComponent<Props, State> {
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 (
<span key={`param_${name}_${index}`}>{name}={formatted}</span>
);
});
const inputs = key.params.map(({ name, type }, index) => (
<span key={`param_${name}_${index}`}>
{name}={valueToText(type, params[index].value)}
</span>
));

return {
Component,
Expand Down
4 changes: 2 additions & 2 deletions packages/app-storage/src/Selection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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<Props, State> {
Expand Down
6 changes: 3 additions & 3 deletions packages/app-toolbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -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"
}
}
4 changes: 2 additions & 2 deletions packages/app-vanitygen/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>",
Expand All @@ -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"
},
Expand Down
22 changes: 11 additions & 11 deletions packages/apps/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": ".",
Expand All @@ -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",
Expand Down
6 changes: 5 additions & 1 deletion packages/apps/src/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
});
3 changes: 2 additions & 1 deletion packages/apps/webpack.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Loading