Merge remote-tracking branch 'origin/master' into check-updates
This commit is contained in:
Gav Wood
commit
afe4cc6a05
2
Cargo.lock
generated
2
Cargo.lock
generated
@ -1273,7 +1273,7 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "parity-ui-precompiled"
|
||||
version = "1.4.0"
|
||||
source = "git+https://github.com/ethcore/js-precompiled.git#55a2cc4707bf9f8bacde3c3f68e32b4a5ac777cf"
|
||||
source = "git+https://github.com/ethcore/js-precompiled.git#7700411d2b0ba1372e0d6cf72a84ecf873a181f3"
|
||||
dependencies = [
|
||||
"parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
@ -21,8 +21,7 @@
|
||||
"genesis": {
|
||||
"seal": {
|
||||
"generic": {
|
||||
"fields": 2,
|
||||
"rlp": "0x200"
|
||||
"rlp": "0xc28080"
|
||||
}
|
||||
},
|
||||
"difficulty": "0x20000",
|
||||
|
||||
@ -12,7 +12,6 @@
|
||||
"genesis": {
|
||||
"seal": {
|
||||
"generic": {
|
||||
"fields": 0,
|
||||
"rlp": "0x0"
|
||||
}
|
||||
},
|
||||
|
||||
@ -30,11 +30,9 @@ pub struct Ethereum {
|
||||
|
||||
impl Into<Generic> for Ethereum {
|
||||
fn into(self) -> Generic {
|
||||
let mut s = RlpStream::new();
|
||||
s.append(&self.mix_hash);
|
||||
s.append(&self.nonce);
|
||||
let mut s = RlpStream::new_list(2);
|
||||
s.append(&self.mix_hash).append(&self.nonce);
|
||||
Generic {
|
||||
fields: 2,
|
||||
rlp: s.out()
|
||||
}
|
||||
}
|
||||
@ -42,8 +40,6 @@ impl Into<Generic> for Ethereum {
|
||||
|
||||
/// Generic seal.
|
||||
pub struct Generic {
|
||||
/// Number of seal fields.
|
||||
pub fields: usize,
|
||||
/// Seal rlp.
|
||||
pub rlp: Vec<u8>,
|
||||
}
|
||||
@ -64,7 +60,6 @@ impl From<ethjson::spec::Seal> for Seal {
|
||||
mix_hash: eth.mix_hash.into()
|
||||
}),
|
||||
ethjson::spec::Seal::Generic(g) => Seal::Generic(Generic {
|
||||
fields: g.fields,
|
||||
rlp: g.rlp.into()
|
||||
})
|
||||
}
|
||||
|
||||
@ -94,8 +94,6 @@ pub struct Spec {
|
||||
pub receipts_root: H256,
|
||||
/// The genesis block's extra data field.
|
||||
pub extra_data: Bytes,
|
||||
/// The number of seal fields in the genesis block.
|
||||
pub seal_fields: usize,
|
||||
/// Each seal field, expressed as RLP, concatenated.
|
||||
pub seal_rlp: Bytes,
|
||||
|
||||
@ -127,7 +125,6 @@ impl From<ethjson::spec::Spec> for Spec {
|
||||
gas_used: g.gas_used,
|
||||
timestamp: g.timestamp,
|
||||
extra_data: g.extra_data,
|
||||
seal_fields: seal.fields,
|
||||
seal_rlp: seal.rlp,
|
||||
state_root_memo: RwLock::new(g.state_root),
|
||||
genesis_state: From::from(s.accounts),
|
||||
@ -192,13 +189,8 @@ impl Spec {
|
||||
header.set_gas_limit(self.gas_limit.clone());
|
||||
header.set_difficulty(self.difficulty.clone());
|
||||
header.set_seal({
|
||||
let seal = {
|
||||
let mut s = RlpStream::new_list(self.seal_fields);
|
||||
s.append_raw(&self.seal_rlp, self.seal_fields);
|
||||
s.out()
|
||||
};
|
||||
let r = Rlp::new(&seal);
|
||||
(0..self.seal_fields).map(|i| r.at(i).as_raw().to_vec()).collect()
|
||||
let r = Rlp::new(&self.seal_rlp);
|
||||
r.iter().map(|f| f.as_raw().to_vec()).collect()
|
||||
});
|
||||
trace!(target: "spec", "Header hash is {}", header.hash());
|
||||
header
|
||||
@ -227,7 +219,6 @@ impl Spec {
|
||||
self.gas_used = g.gas_used;
|
||||
self.timestamp = g.timestamp;
|
||||
self.extra_data = g.extra_data;
|
||||
self.seal_fields = seal.fields;
|
||||
self.seal_rlp = seal.rlp;
|
||||
self.state_root_memo = RwLock::new(g.state_root);
|
||||
}
|
||||
|
||||
233
js/package.json
233
js/package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "parity.js",
|
||||
"version": "0.2.89",
|
||||
"version": "0.2.91",
|
||||
"main": "release/index.js",
|
||||
"jsnext:main": "src/index.js",
|
||||
"author": "Parity Team <admin@parity.io>",
|
||||
@ -47,132 +47,127 @@
|
||||
"prepush": "npm run lint:cached"
|
||||
},
|
||||
"devDependencies": {
|
||||
"babel-cli": "~6.18.0",
|
||||
"babel-core": "~6.18.2",
|
||||
"babel-eslint": "~7.1.0",
|
||||
"babel-loader": "~6.2.3",
|
||||
"babel-plugin-lodash": "~3.2.2",
|
||||
"babel-plugin-transform-class-properties": "~6.19.0",
|
||||
"babel-plugin-transform-decorators-legacy": "~1.3.4",
|
||||
"babel-plugin-transform-react-remove-prop-types": "~0.2.9",
|
||||
"babel-plugin-transform-runtime": "~6.15.0",
|
||||
"babel-polyfill": "~6.16.0",
|
||||
"babel-preset-es2015": "~6.18.0",
|
||||
"babel-preset-es2015-rollup": "~1.2.0",
|
||||
"babel-preset-es2016": "~6.16.0",
|
||||
"babel-preset-es2017": "~6.16.0",
|
||||
"babel-preset-react": "~6.16.0",
|
||||
"babel-preset-stage-0": "~6.16.0",
|
||||
"babel-cli": "6.18.0",
|
||||
"babel-core": "6.18.2",
|
||||
"babel-eslint": "7.1.1",
|
||||
"babel-loader": "6.2.8",
|
||||
"babel-plugin-lodash": "3.2.10",
|
||||
"babel-plugin-transform-class-properties": "6.19.0",
|
||||
"babel-plugin-transform-decorators-legacy": "1.3.4",
|
||||
"babel-plugin-transform-react-remove-prop-types": "0.2.11",
|
||||
"babel-plugin-transform-runtime": "6.15.0",
|
||||
"babel-polyfill": "6.16.0",
|
||||
"babel-preset-es2015": "6.18.0",
|
||||
"babel-preset-es2015-rollup": "1.2.0",
|
||||
"babel-preset-es2016": "6.16.0",
|
||||
"babel-preset-es2017": "6.16.0",
|
||||
"babel-preset-react": "6.16.0",
|
||||
"babel-preset-stage-0": "6.16.0",
|
||||
"babel-register": "6.18.0",
|
||||
"babel-runtime": "~6.18.0",
|
||||
"chai": "~3.5.0",
|
||||
"chai-enzyme": "0.4.2",
|
||||
"cheerio": "0.20.0",
|
||||
"copy-webpack-plugin": "~4.0.0",
|
||||
"core-js": "~2.4.1",
|
||||
"coveralls": "~2.11.11",
|
||||
"css-loader": "~0.26.0",
|
||||
"ejs-loader": "~0.3.0",
|
||||
"enzyme": "2.3.0",
|
||||
"eslint": "~3.10.2",
|
||||
"eslint-config-semistandard": "~7.0.0",
|
||||
"eslint-config-standard": "~6.2.1",
|
||||
"eslint-config-standard-react": "~4.2.0",
|
||||
"eslint-plugin-promise": "~3.4.0",
|
||||
"eslint-plugin-react": "~6.7.1",
|
||||
"eslint-plugin-standard": "~2.0.0",
|
||||
"express": "~4.14.0",
|
||||
"babel-runtime": "6.18.0",
|
||||
"chai": "3.5.0",
|
||||
"chai-enzyme": "0.6.1",
|
||||
"copy-webpack-plugin": "4.0.1",
|
||||
"core-js": "2.4.1",
|
||||
"coveralls": "2.11.15",
|
||||
"css-loader": "0.26.1",
|
||||
"ejs-loader": "0.3.0",
|
||||
"enzyme": "2.6.0",
|
||||
"eslint": "3.11.1",
|
||||
"eslint-config-semistandard": "7.0.0",
|
||||
"eslint-config-standard": "6.2.1",
|
||||
"eslint-config-standard-react": "4.2.0",
|
||||
"eslint-plugin-promise": "3.4.0",
|
||||
"eslint-plugin-react": "6.7.1",
|
||||
"eslint-plugin-standard": "2.0.1",
|
||||
"express": "4.14.0",
|
||||
"extract-loader": "0.1.0",
|
||||
"extract-text-webpack-plugin": "~2.0.0-beta.4",
|
||||
"file-loader": "~0.9.0",
|
||||
"fs-extra": "~0.30.0",
|
||||
"happypack": "~3.0.0",
|
||||
"history": "~2.0.0",
|
||||
"html-loader": "~0.4.4",
|
||||
"html-webpack-plugin": "~2.24.1",
|
||||
"http-proxy-middleware": "~0.17.2",
|
||||
"husky": "~0.11.9",
|
||||
"ignore-styles": "2.0.0",
|
||||
"image-webpack-loader": "~3.0.0",
|
||||
"istanbul": "~1.0.0-alpha.2",
|
||||
"jsdom": "9.2.1",
|
||||
"json-loader": "~0.5.4",
|
||||
"mocha": "~3.0.0-1",
|
||||
"extract-text-webpack-plugin": "2.0.0-beta.4",
|
||||
"file-loader": "0.9.0",
|
||||
"happypack": "3.0.0",
|
||||
"html-loader": "0.4.4",
|
||||
"html-webpack-plugin": "2.24.1",
|
||||
"http-proxy-middleware": "0.17.2",
|
||||
"husky": "0.11.9",
|
||||
"ignore-styles": "5.0.1",
|
||||
"image-webpack-loader": "3.0.0",
|
||||
"istanbul": "1.0.0-alpha.2",
|
||||
"jsdom": "9.8.3",
|
||||
"json-loader": "0.5.4",
|
||||
"mocha": "3.2.0",
|
||||
"mock-local-storage": "1.0.2",
|
||||
"mock-socket": "~3.0.1",
|
||||
"nock": "~8.0.0",
|
||||
"mock-socket": "6.0.3",
|
||||
"nock": "9.0.2",
|
||||
"postcss-import": "8.1.0",
|
||||
"postcss-loader": "~1.1.1",
|
||||
"postcss-nested": "~1.0.0",
|
||||
"postcss-simple-vars": "~3.0.0",
|
||||
"progress": "~1.1.8",
|
||||
"raw-loader": "~0.5.1",
|
||||
"react-addons-perf": "~15.4.1",
|
||||
"react-addons-test-utils": "~15.4.1",
|
||||
"react-hot-loader": "~3.0.0-beta.6",
|
||||
"rucksack-css": "~0.8.6",
|
||||
"sinon": "~1.17.4",
|
||||
"sinon-as-promised": "~4.0.2",
|
||||
"sinon-chai": "~2.8.0",
|
||||
"style-loader": "~0.13.0",
|
||||
"url-loader": "~0.5.7",
|
||||
"webpack": "~2.1.0-beta.27",
|
||||
"webpack-dev-middleware": "~1.8.4",
|
||||
"postcss-loader": "1.1.1",
|
||||
"postcss-nested": "1.0.0",
|
||||
"postcss-simple-vars": "3.0.0",
|
||||
"progress": "1.1.8",
|
||||
"raw-loader": "0.5.1",
|
||||
"react-addons-perf": "15.4.1",
|
||||
"react-addons-test-utils": "15.4.1",
|
||||
"react-hot-loader": "3.0.0-beta.6",
|
||||
"rucksack-css": "0.9.1",
|
||||
"sinon": "1.17.6",
|
||||
"sinon-as-promised": "4.0.2",
|
||||
"sinon-chai": "2.8.0",
|
||||
"style-loader": "0.13.1",
|
||||
"url-loader": "0.5.7",
|
||||
"webpack": "2.1.0-beta.27",
|
||||
"webpack-dev-middleware": "1.8.4",
|
||||
"webpack-error-notification": "0.1.6",
|
||||
"webpack-hot-middleware": "~2.13.2",
|
||||
"websocket": "~1.0.23"
|
||||
"webpack-hot-middleware": "2.13.2",
|
||||
"websocket": "1.0.23"
|
||||
},
|
||||
"dependencies": {
|
||||
"bignumber.js": "~2.3.0",
|
||||
"bignumber.js": "3.0.1",
|
||||
"blockies": "0.0.2",
|
||||
"brace": "~0.9.0",
|
||||
"bytes": "~2.4.0",
|
||||
"chart.js": "~2.3.0",
|
||||
"es6-error": "~4.0.0",
|
||||
"es6-promise": "~3.2.1",
|
||||
"ethereumjs-tx": "~1.1.2",
|
||||
"eventemitter3": "~2.0.2",
|
||||
"file-saver": "~1.3.3",
|
||||
"format-json": "~1.0.3",
|
||||
"format-number": "~2.0.1",
|
||||
"geopattern": "~1.2.3",
|
||||
"isomorphic-fetch": "~2.2.1",
|
||||
"js-sha3": "~0.5.2",
|
||||
"lodash": "~4.11.1",
|
||||
"marked": "~0.3.6",
|
||||
"material-ui": "~0.16.4",
|
||||
"material-ui-chip-input": "~0.11.1",
|
||||
"mobx": "~2.6.1",
|
||||
"mobx-react": "~3.5.8",
|
||||
"mobx-react-devtools": "~4.2.9",
|
||||
"moment": "~2.14.1",
|
||||
"phoneformat.js": "~1.0.3",
|
||||
"qs": "~6.3.0",
|
||||
"react": "~15.4.1",
|
||||
"react-ace": "~4.0.0",
|
||||
"react-addons-css-transition-group": "~15.4.1",
|
||||
"react-chartjs-2": "~1.5.0",
|
||||
"react-copy-to-clipboard": "~4.2.3",
|
||||
"react-dom": "~15.4.1",
|
||||
"react-dropzone": "~3.7.3",
|
||||
"react-redux": "~4.4.5",
|
||||
"react-router": "~2.6.1",
|
||||
"react-router-redux": "~4.0.5",
|
||||
"react-tap-event-plugin": "~2.0.1",
|
||||
"react-tooltip": "~2.0.3",
|
||||
"recharts": "~0.15.2",
|
||||
"redux": "~3.5.2",
|
||||
"redux-actions": "~0.10.1",
|
||||
"redux-thunk": "~2.1.0",
|
||||
"rlp": "~2.0.0",
|
||||
"scryptsy": "~2.0.0",
|
||||
"brace": "0.9.0",
|
||||
"bytes": "2.4.0",
|
||||
"es6-error": "4.0.0",
|
||||
"es6-promise": "4.0.5",
|
||||
"ethereumjs-tx": "1.1.4",
|
||||
"eventemitter3": "2.0.2",
|
||||
"file-saver": "1.3.3",
|
||||
"format-json": "1.0.3",
|
||||
"format-number": "2.0.1",
|
||||
"geopattern": "1.2.3",
|
||||
"isomorphic-fetch": "2.2.1",
|
||||
"js-sha3": "0.5.5",
|
||||
"lodash": "4.17.2",
|
||||
"marked": "0.3.6",
|
||||
"material-ui": "0.16.4",
|
||||
"material-ui-chip-input": "0.11.1",
|
||||
"mobx": "2.6.4",
|
||||
"mobx-react": "4.0.3",
|
||||
"mobx-react-devtools": "4.2.10",
|
||||
"moment": "2.17.0",
|
||||
"phoneformat.js": "1.0.3",
|
||||
"qs": "6.3.0",
|
||||
"react": "15.4.1",
|
||||
"react-ace": "4.1.0",
|
||||
"react-addons-css-transition-group": "15.4.1",
|
||||
"react-copy-to-clipboard": "4.2.3",
|
||||
"react-dom": "15.4.1",
|
||||
"react-dropzone": "3.7.3",
|
||||
"react-redux": "4.4.6",
|
||||
"react-router": "3.0.0",
|
||||
"react-router-redux": "4.0.7",
|
||||
"react-tap-event-plugin": "2.0.1",
|
||||
"react-tooltip": "3.2.2",
|
||||
"recharts": "0.15.2",
|
||||
"redux": "3.6.0",
|
||||
"redux-actions": "1.1.0",
|
||||
"redux-thunk": "2.1.0",
|
||||
"rlp": "2.0.0",
|
||||
"scryptsy": "2.0.0",
|
||||
"solc": "ngotchac/solc-js",
|
||||
"store": "~1.3.20",
|
||||
"utf8": "~2.1.1",
|
||||
"valid-url": "~1.0.9",
|
||||
"validator": "~5.7.0",
|
||||
"web3": "~0.17.0-beta",
|
||||
"whatwg-fetch": "~1.0.0",
|
||||
"worker-loader": "~0.7.1"
|
||||
"store": "1.3.20",
|
||||
"utf8": "2.1.2",
|
||||
"valid-url": "1.0.9",
|
||||
"validator": "6.2.0",
|
||||
"web3": "0.17.0-beta",
|
||||
"whatwg-fetch": "2.0.1",
|
||||
"worker-loader": "0.7.1"
|
||||
}
|
||||
}
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { bytesToHex, hex2Ascii } from '../api/util/format';
|
||||
import { bytesToHex, hex2Ascii } from '~/api/util/format';
|
||||
|
||||
import ABI from './abi/certifier.json';
|
||||
|
||||
|
||||
@ -16,8 +16,7 @@
|
||||
|
||||
import ReactDOM from 'react-dom';
|
||||
import React from 'react';
|
||||
import { createHashHistory } from 'history';
|
||||
import { Redirect, Router, Route, useRouterHistory } from 'react-router';
|
||||
import { Redirect, Router, Route, hashHistory } from 'react-router';
|
||||
|
||||
import injectTapEventPlugin from 'react-tap-event-plugin';
|
||||
injectTapEventPlugin();
|
||||
@ -27,14 +26,12 @@ import Application from './basiccoin/Application';
|
||||
import Overview from './basiccoin/Overview';
|
||||
import Transfer from './basiccoin/Transfer';
|
||||
|
||||
const routerHistory = useRouterHistory(createHashHistory)({});
|
||||
|
||||
import '../../assets/fonts/Roboto/font.css';
|
||||
import '../../assets/fonts/RobotoMono/font.css';
|
||||
import './style.css';
|
||||
|
||||
ReactDOM.render(
|
||||
<Router history={ routerHistory }>
|
||||
<Router history={ hashHistory }>
|
||||
<Redirect from='/' to='/overview' />
|
||||
<Route path='/' component={ Application }>
|
||||
<Route path='deploy' component={ Deploy } />
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import BigNumber from 'bignumber.js';
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { eip20 } from '../../../../contracts/abi';
|
||||
import { eip20 } from '~/contracts/abi';
|
||||
|
||||
import { api } from '../../parity';
|
||||
import { loadBalances } from '../../services';
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import BigNumber from 'bignumber.js';
|
||||
|
||||
import * as abis from '../../contracts/abi';
|
||||
import * as abis from '~/contracts/abi';
|
||||
import { api } from './parity';
|
||||
|
||||
let managerInstance;
|
||||
|
||||
@ -17,8 +17,8 @@
|
||||
import BigNumber from 'bignumber.js';
|
||||
import { action, computed, observable, transaction } from 'mobx';
|
||||
|
||||
import * as abis from '../../contracts/abi';
|
||||
import builtins from '../../views/Dapps/builtin.json';
|
||||
import * as abis from '~/contracts/abi';
|
||||
import builtins from '~/views/Dapps/builtin.json';
|
||||
|
||||
import { api } from './parity';
|
||||
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import * as abis from '../../contracts/abi';
|
||||
import * as abis from '~/contracts/abi';
|
||||
import { api } from './parity';
|
||||
|
||||
export function attachInterface () {
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { registry as registryAbi } from '../../contracts/abi';
|
||||
import { registry as registryAbi } from '~/contracts/abi';
|
||||
|
||||
import { api } from './parity.js';
|
||||
import * as addresses from './addresses/actions.js';
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import * as abis from '../../contracts/abi';
|
||||
import * as abis from '~/contracts/abi';
|
||||
import { api } from './parity';
|
||||
|
||||
const sortEvents = (a, b) => b.blockNumber.cmp(a.blockNumber) || b.logIndex.cmp(a.logIndex);
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Contracts from '../../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
|
||||
import { loadToken, setTokenPending, deleteToken, setTokenData } from '../Tokens/actions';
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import { api } from './parity';
|
||||
|
||||
import { eip20 as eip20Abi } from '../../contracts/abi';
|
||||
import { eip20 as eip20Abi } from '~/contracts/abi';
|
||||
|
||||
export const getTokenTotalSupply = (tokenAddress) => {
|
||||
return api
|
||||
|
||||
@ -25,19 +25,18 @@ import ReactDOM from 'react-dom';
|
||||
import { AppContainer } from 'react-hot-loader';
|
||||
|
||||
import injectTapEventPlugin from 'react-tap-event-plugin';
|
||||
import { createHashHistory } from 'history';
|
||||
import { useRouterHistory } from 'react-router';
|
||||
import { hashHistory } from 'react-router';
|
||||
import qs from 'querystring';
|
||||
|
||||
import SecureApi from './secureApi';
|
||||
import ContractInstances from './contracts';
|
||||
import ContractInstances from '~/contracts';
|
||||
|
||||
import { initStore } from './redux';
|
||||
import ContextProvider from './ui/ContextProvider';
|
||||
import muiTheme from './ui/Theme';
|
||||
import ContextProvider from '~/ui/ContextProvider';
|
||||
import muiTheme from '~/ui/Theme';
|
||||
import MainApplication from './main';
|
||||
|
||||
import { setApi } from './redux/providers/apiActions';
|
||||
import { setApi } from '~/redux/providers/apiActions';
|
||||
|
||||
import './environment';
|
||||
|
||||
@ -74,13 +73,11 @@ store.dispatch(setApi(api));
|
||||
|
||||
window.secureApi = api;
|
||||
|
||||
const routerHistory = useRouterHistory(createHashHistory)({});
|
||||
|
||||
ReactDOM.render(
|
||||
<AppContainer>
|
||||
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
|
||||
<MainApplication
|
||||
routerHistory={ routerHistory }
|
||||
routerHistory={ hashHistory }
|
||||
/>
|
||||
</ContextProvider>
|
||||
</AppContainer>,
|
||||
@ -88,24 +85,6 @@ ReactDOM.render(
|
||||
);
|
||||
|
||||
if (module.hot) {
|
||||
// module.hot.accept('./redux', () => {
|
||||
// // redux store has a method replaceReducer
|
||||
// // const newStore = initStore(api);
|
||||
// console.warn('REDUX UPDATE');
|
||||
// // store.replaceReducer(appReducer);
|
||||
|
||||
// // ReactDOM.render(
|
||||
// // <AppContainer>
|
||||
// // <ContextProvider api={ api } muiTheme={ muiTheme } store={ newStore }>
|
||||
// // <MainApplication
|
||||
// // routerHistory={ routerHistory }
|
||||
// // />
|
||||
// // </ContextProvider>
|
||||
// // </AppContainer>,
|
||||
// // document.querySelector('#container')
|
||||
// // );
|
||||
// });
|
||||
|
||||
module.hot.accept('./main.js', () => {
|
||||
require('./main.js');
|
||||
|
||||
@ -113,7 +92,7 @@ if (module.hot) {
|
||||
<AppContainer>
|
||||
<ContextProvider api={ api } muiTheme={ muiTheme } store={ store }>
|
||||
<MainApplication
|
||||
routerHistory={ routerHistory }
|
||||
routerHistory={ hashHistory }
|
||||
/>
|
||||
</ContextProvider>
|
||||
</AppContainer>,
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { Redirect, Router, Route } from 'react-router';
|
||||
|
||||
import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from './views';
|
||||
import { Accounts, Account, Addresses, Address, Application, Contract, Contracts, WriteContract, Dapp, Dapps, Settings, SettingsBackground, SettingsParity, SettingsProxy, SettingsViews, Signer, Status } from '~/views';
|
||||
|
||||
import styles from './reset.css';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import ContentAdd from 'material-ui/svg-icons/content/add';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { Button, Modal, Form, Input, InputAddress } from '../../ui';
|
||||
import { Button, Modal, Form, Input, InputAddress } from '~/ui';
|
||||
import { ERRORS, validateAddress, validateName } from '../../util/validation';
|
||||
|
||||
export default class AddAddress extends Component {
|
||||
|
||||
@ -20,10 +20,10 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
|
||||
import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
|
||||
|
||||
import { Button, Modal, Form, Input, InputAddress, RadioButtons } from '../../ui';
|
||||
import { Button, Modal, Form, Input, InputAddress, RadioButtons } from '~/ui';
|
||||
import { ERRORS, validateAbi, validateAddress, validateName } from '../../util/validation';
|
||||
|
||||
import { eip20, wallet } from '../../contracts/abi';
|
||||
import { eip20, wallet } from '~/contracts/abi';
|
||||
|
||||
const ABI_TYPES = [
|
||||
{
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Form, Input, InputAddress } from '../../../ui';
|
||||
import { Form, Input, InputAddress } from '~/ui';
|
||||
|
||||
export default class AccountDetails extends Component {
|
||||
static propTypes = {
|
||||
|
||||
@ -19,7 +19,7 @@ import IconButton from 'material-ui/IconButton';
|
||||
import { RadioButton, RadioButtonGroup } from 'material-ui/RadioButton';
|
||||
import ActionAutorenew from 'material-ui/svg-icons/action/autorenew';
|
||||
|
||||
import { Form, Input, IdentityIcon } from '../../../ui';
|
||||
import { Form, Input, IdentityIcon } from '~/ui';
|
||||
|
||||
import styles from '../createAccount.css';
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { Checkbox } from 'material-ui';
|
||||
|
||||
import { IdentityIcon } from '../../../ui';
|
||||
import { IdentityIcon } from '~/ui';
|
||||
|
||||
import styles from './newGeth.css';
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ import ReactDOM from 'react-dom';
|
||||
import { FloatingActionButton } from 'material-ui';
|
||||
import EditorAttachFile from 'material-ui/svg-icons/editor/attach-file';
|
||||
|
||||
import { Form, Input } from '../../../ui';
|
||||
import { Form, Input } from '~/ui';
|
||||
|
||||
import styles from '../createAccount.css';
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Form, Input } from '../../../ui';
|
||||
import { Form, Input } from '~/ui';
|
||||
|
||||
import styles from '../createAccount.css';
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { Checkbox } from 'material-ui';
|
||||
|
||||
import { Form, Input } from '../../../ui';
|
||||
import { Form, Input } from '~/ui';
|
||||
|
||||
import styles from '../createAccount.css';
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
|
||||
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
|
||||
import PrintIcon from 'material-ui/svg-icons/action/print';
|
||||
|
||||
import { Button, Modal } from '../../ui';
|
||||
import { Button, Modal } from '~/ui';
|
||||
|
||||
import AccountDetails from './AccountDetails';
|
||||
import AccountDetailsGeth from './AccountDetailsGeth';
|
||||
@ -33,7 +33,7 @@ import NewImport from './NewImport';
|
||||
import RawKey from './RawKey';
|
||||
import RecoveryPhrase from './RecoveryPhrase';
|
||||
|
||||
import { createIdentityImg } from '../../api/util/identity';
|
||||
import { createIdentityImg } from '~/api/util/identity';
|
||||
import print from './print';
|
||||
import recoveryPage from './recovery-page.ejs';
|
||||
import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
|
||||
import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '../../ui';
|
||||
import { ConfirmDialog, IdentityIcon, IdentityName, Input } from '~/ui';
|
||||
import { newError } from '../../redux/actions';
|
||||
|
||||
import styles from './deleteAccount.css';
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { MenuItem } from 'material-ui';
|
||||
|
||||
import { AddressSelect, Form, Input, Select } from '../../../ui';
|
||||
import { AddressSelect, Form, Input, Select } from '~/ui';
|
||||
import { validateAbi } from '../../../util/validation';
|
||||
import { parseAbiType } from '../../../util/abi';
|
||||
|
||||
|
||||
@ -31,7 +31,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Form, TypedInput } from '../../../ui';
|
||||
import { Form, TypedInput } from '~/ui';
|
||||
import { parseAbiType } from '../../../util/abi';
|
||||
|
||||
import styles from '../deployContract.css';
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { BusyStep, CompletedStep, CopyToClipboard, Button, IdentityIcon, Modal, TxHash } from '../../ui';
|
||||
import { BusyStep, CompletedStep, CopyToClipboard, Button, IdentityIcon, Modal, TxHash } from '~/ui';
|
||||
import { ERRORS, validateAbi, validateCode, validateName } from '../../util/validation';
|
||||
|
||||
import DetailsStep from './DetailsStep';
|
||||
@ -27,7 +27,7 @@ import ErrorStep from './ErrorStep';
|
||||
|
||||
import styles from './deployContract.css';
|
||||
|
||||
import { ERROR_CODES } from '../../api/transport/error';
|
||||
import { ERROR_CODES } from '~/api/transport/error';
|
||||
|
||||
const STEPS = {
|
||||
CONTRACT_DETAILS: { title: 'contract details' },
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
import ContentSave from 'material-ui/svg-icons/content/save';
|
||||
|
||||
import { Button, Form, Input, InputChip, Modal } from '../../ui';
|
||||
import { Button, Form, Input, InputChip, Modal } from '~/ui';
|
||||
import { validateName } from '../../util/validation';
|
||||
|
||||
export default class EditMeta extends Component {
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { MenuItem } from 'material-ui';
|
||||
|
||||
import { AddressSelect, Form, Input, InputAddressSelect, Select } from '../../../ui';
|
||||
import { AddressSelect, Form, Input, InputAddressSelect, Select } from '~/ui';
|
||||
|
||||
import styles from '../executeContract.css';
|
||||
|
||||
|
||||
@ -20,14 +20,14 @@ import { bindActionCreators } from 'redux';
|
||||
import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui';
|
||||
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '~/ui';
|
||||
import { MAX_GAS_ESTIMATION } from '../../util/constants';
|
||||
import { validateAddress, validateUint } from '../../util/validation';
|
||||
|
||||
import DetailsStep from './DetailsStep';
|
||||
|
||||
import ERRORS from '../Transfer/errors';
|
||||
import { ERROR_CODES } from '../../api/transport/error';
|
||||
import { ERROR_CODES } from '~/api/transport/error';
|
||||
|
||||
class ExecuteContract extends Component {
|
||||
static contextTypes = {
|
||||
|
||||
@ -20,7 +20,7 @@ import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
|
||||
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
|
||||
import PrintIcon from 'material-ui/svg-icons/action/print';
|
||||
|
||||
import { Button, Modal } from '../../ui';
|
||||
import { Button, Modal } from '~/ui';
|
||||
|
||||
import { NewAccount, AccountDetails } from '../CreateAccount';
|
||||
|
||||
@ -28,7 +28,7 @@ import Completed from './Completed';
|
||||
import TnC from './TnC';
|
||||
import Welcome from './Welcome';
|
||||
|
||||
import { createIdentityImg } from '../../api/util/identity';
|
||||
import { createIdentityImg } from '~/api/util/identity';
|
||||
import print from '../CreateAccount/print';
|
||||
import recoveryPage from '../CreateAccount/recovery-page.ejs';
|
||||
import ParityLogo from '../../../assets/images/parity-logo-black-no-text.svg';
|
||||
|
||||
@ -24,7 +24,7 @@ import { List, ListItem, makeSelectable } from 'material-ui/List';
|
||||
import { Subheader, IconButton, Tabs, Tab } from 'material-ui';
|
||||
import moment from 'moment';
|
||||
|
||||
import { Button, Modal, Editor } from '../../ui';
|
||||
import { Button, Modal, Editor } from '~/ui';
|
||||
|
||||
import styles from './loadContract.css';
|
||||
|
||||
|
||||
@ -24,10 +24,10 @@ import Paper from 'material-ui/Paper';
|
||||
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import { showSnackbar } from '../../redux/providers/snackbarActions';
|
||||
import { showSnackbar } from '~/redux/providers/snackbarActions';
|
||||
|
||||
import Form, { Input } from '../../ui/Form';
|
||||
import { Button, Modal, IdentityName, IdentityIcon } from '../../ui';
|
||||
import Form, { Input } from '~/ui/Form';
|
||||
import { Button, Modal, IdentityName, IdentityIcon } from '~/ui';
|
||||
|
||||
import styles from './passwordManager.css';
|
||||
|
||||
|
||||
@ -22,8 +22,8 @@ import InfoIcon from 'material-ui/svg-icons/action/info-outline';
|
||||
import SuccessIcon from 'material-ui/svg-icons/navigation/check';
|
||||
import ErrorIcon from 'material-ui/svg-icons/navigation/close';
|
||||
|
||||
import { fromWei } from '../../../api/util/wei';
|
||||
import { Form, Input } from '../../../ui';
|
||||
import { fromWei } from '~/api/util/wei';
|
||||
import { Form, Input } from '~/ui';
|
||||
|
||||
import { termsOfService } from '../../../3rdparty/sms-verification';
|
||||
import styles from './gatherData.css';
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Form, Input } from '../../../ui';
|
||||
import { Form, Input } from '~/ui';
|
||||
|
||||
export default class QueryCode extends Component {
|
||||
static propTypes = {
|
||||
|
||||
@ -19,7 +19,7 @@ import { observer } from 'mobx-react';
|
||||
import DoneIcon from 'material-ui/svg-icons/action/done-all';
|
||||
import CancelIcon from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { Button, IdentityIcon, Modal } from '../../ui';
|
||||
import { Button, IdentityIcon, Modal } from '~/ui';
|
||||
|
||||
import {
|
||||
LOADING,
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import nullable from '../../../util/nullable-proptype';
|
||||
|
||||
import TxHash from '../../../ui/TxHash';
|
||||
import TxHash from '~/ui/TxHash';
|
||||
import {
|
||||
POSTING_CONFIRMATION, POSTED_CONFIRMATION
|
||||
} from '../store';
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import nullable from '../../../util/nullable-proptype';
|
||||
|
||||
import TxHash from '../../../ui/TxHash';
|
||||
import TxHash from '~/ui/TxHash';
|
||||
import {
|
||||
POSTING_REQUEST, POSTED_REQUEST, REQUESTING_SMS
|
||||
} from '../store';
|
||||
|
||||
@ -16,11 +16,11 @@
|
||||
|
||||
import { observable, computed, autorun, action } from 'mobx';
|
||||
import phone from 'phoneformat.js';
|
||||
import { sha3 } from '../../api/util/sha3';
|
||||
import { sha3 } from '~/api/util/sha3';
|
||||
|
||||
import Contracts from '../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
|
||||
import { checkIfVerified, checkIfRequested, awaitPuzzle } from '../../contracts/sms-verification';
|
||||
import { checkIfVerified, checkIfRequested, awaitPuzzle } from '~/contracts/sms-verification';
|
||||
import { postToServer } from '../../3rdparty/sms-verification';
|
||||
import checkIfTxFailed from '../../util/check-if-tx-failed';
|
||||
import waitForConfirmations from '../../util/wait-for-block-confirmations';
|
||||
|
||||
@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import SaveIcon from 'material-ui/svg-icons/content/save';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { Button, Modal, Editor, Form, Input } from '../../ui';
|
||||
import { Button, Modal, Editor, Form, Input } from '~/ui';
|
||||
import { ERRORS, validateName } from '../../util/validation';
|
||||
|
||||
import styles from './saveContract.css';
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { Checkbox, MenuItem } from 'material-ui';
|
||||
|
||||
import { Form, Input, Select } from '../../../ui';
|
||||
import { Form, Input, Select } from '~/ui';
|
||||
|
||||
import Price from '../Price';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import ActionDoneAll from 'material-ui/svg-icons/action/done-all';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { Button, IdentityIcon, Modal } from '../../ui';
|
||||
import { Button, IdentityIcon, Modal } from '~/ui';
|
||||
import initShapeshift from '../../3rdparty/shapeshift';
|
||||
import shapeshiftLogo from '../../../assets/images/shapeshift-logo.png';
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ import { Checkbox, MenuItem } from 'material-ui';
|
||||
|
||||
import { isEqual } from 'lodash';
|
||||
|
||||
import Form, { Input, InputAddressSelect, Select } from '../../../ui/Form';
|
||||
import Form, { Input, InputAddressSelect, Select } from '~/ui/Form';
|
||||
|
||||
import imageUnknown from '../../../../assets/images/contracts/unknown-64x64.png';
|
||||
import styles from '../transfer.css';
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import Form, { Input } from '../../../ui/Form';
|
||||
import Form, { Input } from '~/ui/Form';
|
||||
import GasPriceSelector from '../GasPriceSelector';
|
||||
|
||||
import styles from '../transfer.css';
|
||||
|
||||
@ -18,7 +18,7 @@ import { observable, computed, action, transaction } from 'mobx';
|
||||
import BigNumber from 'bignumber.js';
|
||||
|
||||
import ERRORS from './errors';
|
||||
import { ERROR_CODES } from '../../api/transport/error';
|
||||
import { ERROR_CODES } from '~/api/transport/error';
|
||||
import { DEFAULT_GAS, DEFAULT_GASPRICE, MAX_GAS_ESTIMATION } from '../../util/constants';
|
||||
|
||||
const TITLES = {
|
||||
|
||||
@ -24,8 +24,8 @@ import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
import NavigationArrowBack from 'material-ui/svg-icons/navigation/arrow-back';
|
||||
import NavigationArrowForward from 'material-ui/svg-icons/navigation/arrow-forward';
|
||||
|
||||
import { newError } from '../../ui/Errors/actions';
|
||||
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '../../ui';
|
||||
import { newError } from '~/ui/Errors/actions';
|
||||
import { BusyStep, CompletedStep, Button, IdentityIcon, Modal, TxHash } from '~/ui';
|
||||
|
||||
import Details from './Details';
|
||||
import Extras from './Extras';
|
||||
|
||||
@ -14,10 +14,10 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { newError } from '../ui/Errors/actions';
|
||||
import { newError } from '~/ui/Errors/actions';
|
||||
import { setAddressImage } from './providers/imagesActions';
|
||||
import { clearStatusLogs, toggleStatusLogs, toggleStatusRefresh } from './providers/statusActions';
|
||||
import { toggleView } from '../views/Settings/actions';
|
||||
import { toggleView } from '~/views/Settings/actions';
|
||||
|
||||
export {
|
||||
newError,
|
||||
|
||||
@ -15,11 +15,11 @@
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
import thunk from 'redux-thunk';
|
||||
|
||||
import ErrorsMiddleware from '../ui/Errors/middleware';
|
||||
import SettingsMiddleware from '../views/Settings/middleware';
|
||||
import ErrorsMiddleware from '~/ui/Errors/middleware';
|
||||
import SettingsMiddleware from '~/views/Settings/middleware';
|
||||
import SignerMiddleware from './providers/signerMiddleware';
|
||||
|
||||
import statusMiddleware from '../views/Status/middleware';
|
||||
import statusMiddleware from '~/views/Status/middleware';
|
||||
import CertificationsMiddleware from './providers/certifications/middleware';
|
||||
|
||||
export default function (api) {
|
||||
|
||||
@ -17,9 +17,9 @@
|
||||
import { throttle } from 'lodash';
|
||||
|
||||
import { loadTokens, setTokenReg, fetchBalances, fetchTokens, fetchTokensBalances } from './balancesActions';
|
||||
import { padRight } from '../../api/util/format';
|
||||
import { padRight } from '~/api/util/format';
|
||||
|
||||
import Contracts from '../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
|
||||
export default class Balances {
|
||||
constructor (store, api) {
|
||||
|
||||
@ -19,7 +19,7 @@ import { range, uniq, isEqual } from 'lodash';
|
||||
import { hashToImageUrl } from './imagesReducer';
|
||||
import { setAddressImage } from './imagesActions';
|
||||
|
||||
import * as ABIS from '../../contracts/abi';
|
||||
import * as ABIS from '~/contracts/abi';
|
||||
import imagesEthereum from '../../../assets/images/contracts/ethereum-black-64x64.png';
|
||||
|
||||
const ETH = {
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Contracts from '../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
|
||||
export function setBlock (blockNumber, block) {
|
||||
return {
|
||||
|
||||
@ -14,7 +14,7 @@
|
||||
// You should have received a copy of the GNU General Public License
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import Contracts from '../../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
import { addCertification } from './actions';
|
||||
|
||||
const knownCertifiers = [ 'smsverification' ];
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { handleActions } from 'redux-actions';
|
||||
import { bytesToHex } from '../../api/util/format';
|
||||
import { bytesToHex } from '~/api/util/format';
|
||||
|
||||
const ZERO = '0x0000000000000000000000000000000000000000000000000000000000000000';
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import * as actions from './signerActions';
|
||||
|
||||
import { inHex } from '../../api/format/input';
|
||||
import { inHex } from '~/api/format/input';
|
||||
import { Wallet } from '../../util/wallet';
|
||||
|
||||
export default class SignerMiddleware {
|
||||
|
||||
@ -20,9 +20,9 @@ import { routerReducer } from 'react-router-redux';
|
||||
import { apiReducer, balancesReducer, blockchainReducer, compilerReducer, imagesReducer, personalReducer, signerReducer, statusReducer as nodeStatusReducer, snackbarReducer } from './providers';
|
||||
import certificationsReducer from './providers/certifications/reducer';
|
||||
|
||||
import errorReducer from '../ui/Errors/reducers';
|
||||
import settingsReducer from '../views/Settings/reducers';
|
||||
import tooltipReducer from '../ui/Tooltips/reducers';
|
||||
import errorReducer from '~/ui/Errors/reducers';
|
||||
import settingsReducer from '~/views/Settings/reducers';
|
||||
import tooltipReducer from '~/ui/Tooltips/reducers';
|
||||
|
||||
export default function () {
|
||||
return combineReducers({
|
||||
|
||||
@ -15,7 +15,7 @@
|
||||
// along with Parity. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
import { hashToImageUrl } from './providers/imagesReducer';
|
||||
import { withError } from '../ui/Errors/middleware';
|
||||
import { withError } from '~/ui/Errors/middleware';
|
||||
|
||||
export {
|
||||
hashToImageUrl,
|
||||
|
||||
@ -18,8 +18,8 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
|
||||
import { hashToImageUrl } from '../../redux/providers/imagesReducer';
|
||||
import { fetchCertifications } from '../../redux/providers/certifications/actions';
|
||||
import { hashToImageUrl } from '~/redux/providers/imagesReducer';
|
||||
import { fetchCertifications } from '~/redux/providers/certifications/actions';
|
||||
|
||||
import defaultIcon from '../../../assets/images/certifications/unknown.svg';
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@ import Clipboard from 'react-copy-to-clipboard';
|
||||
import CopyIcon from 'material-ui/svg-icons/content/content-copy';
|
||||
import Theme from '../Theme';
|
||||
|
||||
import { showSnackbar } from '../../redux/providers/snackbarActions';
|
||||
import { showSnackbar } from '~/redux/providers/snackbarActions';
|
||||
|
||||
const { textColor, disabledTextColor } = Theme.flatButton;
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ import { bindActionCreators } from 'redux';
|
||||
|
||||
import Input from '../Input';
|
||||
import IdentityIcon from '../../IdentityIcon';
|
||||
import util from '../../../api/util';
|
||||
import util from '~/api/util';
|
||||
|
||||
import styles from './inputAddress.css';
|
||||
|
||||
|
||||
@ -22,9 +22,9 @@ import IconButton from 'material-ui/IconButton';
|
||||
import AddIcon from 'material-ui/svg-icons/content/add';
|
||||
import RemoveIcon from 'material-ui/svg-icons/content/remove';
|
||||
|
||||
import Input from '../../../ui/Form/Input';
|
||||
import InputAddressSelect from '../../../ui/Form/InputAddressSelect';
|
||||
import Select from '../../../ui/Form/Select';
|
||||
import Input from '~/ui/Form/Input';
|
||||
import InputAddressSelect from '~/ui/Form/InputAddressSelect';
|
||||
import Select from '~/ui/Form/Select';
|
||||
|
||||
import { ABI_TYPES } from '../../../util/abi';
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import CircularProgress from 'material-ui/CircularProgress';
|
||||
|
||||
import Contracts from '../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
import { Input, InputAddress } from '../Form';
|
||||
|
||||
import styles from './methodDecoding.css';
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import BigNumber from 'bignumber.js';
|
||||
|
||||
import util from '../api/util';
|
||||
import util from '~/api/util';
|
||||
|
||||
export const ERRORS = {
|
||||
invalidAddress: 'address is an invalid network address',
|
||||
|
||||
@ -19,8 +19,8 @@ import Transaction from 'ethereumjs-tx';
|
||||
import { pbkdf2Sync } from 'crypto';
|
||||
import { createDecipheriv } from 'browserify-aes';
|
||||
|
||||
import { inHex } from '../api/format/input';
|
||||
import { sha3 } from '../api/util/sha3';
|
||||
import { inHex } from '~/api/format/input';
|
||||
import { sha3 } from '~/api/util/sha3';
|
||||
|
||||
// Adapted from https://github.com/kvhnuke/etherwallet/blob/mercury/app/scripts/myetherwallet.js
|
||||
|
||||
|
||||
@ -16,9 +16,9 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '../../../ui';
|
||||
import CopyToClipboard from '../../../ui/CopyToClipboard';
|
||||
import Certifications from '../../../ui/Certifications';
|
||||
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags } from '~/ui';
|
||||
import CopyToClipboard from '~/ui/CopyToClipboard';
|
||||
import Certifications from '~/ui/Certifications';
|
||||
|
||||
import styles from './header.css';
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
|
||||
import etherscan from '../../../3rdparty/etherscan';
|
||||
import { Container, TxList } from '../../../ui';
|
||||
import { Container, TxList } from '~/ui';
|
||||
|
||||
import styles from './transactions.css';
|
||||
|
||||
|
||||
@ -23,16 +23,16 @@ import ContentSend from 'material-ui/svg-icons/content/send';
|
||||
import LockIcon from 'material-ui/svg-icons/action/lock';
|
||||
import VerifyIcon from 'material-ui/svg-icons/action/verified-user';
|
||||
|
||||
import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '../../modals';
|
||||
import { Actionbar, Button, Page } from '../../ui';
|
||||
import { EditMeta, DeleteAccount, Shapeshift, SMSVerification, Transfer, PasswordManager } from '~/modals';
|
||||
import { Actionbar, Button, Page } from '~/ui';
|
||||
|
||||
import shapeshiftBtn from '../../../assets/images/shapeshift-btn.png';
|
||||
|
||||
import Header from './Header';
|
||||
import Transactions from './Transactions';
|
||||
import { setVisibleAccounts } from '../../redux/providers/personalActions';
|
||||
import { setVisibleAccounts } from '~/redux/providers/personalActions';
|
||||
|
||||
import VerificationStore from '../../modals/SMSVerification/store';
|
||||
import VerificationStore from '~/modals/SMSVerification/store';
|
||||
|
||||
import styles from './account.css';
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Container } from '../../../ui';
|
||||
import { Container } from '~/ui';
|
||||
|
||||
import Summary from '../Summary';
|
||||
import styles from './list.css';
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { Link } from 'react-router';
|
||||
import { isEqual } from 'lodash';
|
||||
|
||||
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, Input } from '../../../ui';
|
||||
import { Balance, Container, ContainerTitle, IdentityIcon, IdentityName, Tags, Input } from '~/ui';
|
||||
|
||||
export default class Summary extends Component {
|
||||
static contextTypes = {
|
||||
|
||||
@ -21,9 +21,9 @@ import ContentAdd from 'material-ui/svg-icons/content/add';
|
||||
import { uniq, isEqual } from 'lodash';
|
||||
|
||||
import List from './List';
|
||||
import { CreateAccount } from '../../modals';
|
||||
import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '../../ui';
|
||||
import { setVisibleAccounts } from '../../redux/providers/personalActions';
|
||||
import { CreateAccount } from '~/modals';
|
||||
import { Actionbar, ActionbarExport, ActionbarSearch, ActionbarSort, Button, Page, Tooltip } from '~/ui';
|
||||
import { setVisibleAccounts } from '~/redux/providers/personalActions';
|
||||
|
||||
import styles from './accounts.css';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
|
||||
import { ConfirmDialog, IdentityIcon, IdentityName } from '../../../ui';
|
||||
import { ConfirmDialog, IdentityIcon, IdentityName } from '~/ui';
|
||||
import { newError } from '../../../redux/actions';
|
||||
|
||||
import styles from '../address.css';
|
||||
|
||||
@ -20,13 +20,13 @@ import { bindActionCreators } from 'redux';
|
||||
import ActionDelete from 'material-ui/svg-icons/action/delete';
|
||||
import ContentCreate from 'material-ui/svg-icons/content/create';
|
||||
|
||||
import { EditMeta } from '../../modals';
|
||||
import { Actionbar, Button, Page } from '../../ui';
|
||||
import { EditMeta } from '~/modals';
|
||||
import { Actionbar, Button, Page } from '~/ui';
|
||||
|
||||
import Header from '../Account/Header';
|
||||
import Transactions from '../Account/Transactions';
|
||||
import Delete from './Delete';
|
||||
import { setVisibleAccounts } from '../../redux/providers/personalActions';
|
||||
import { setVisibleAccounts } from '~/redux/providers/personalActions';
|
||||
|
||||
import styles from './address.css';
|
||||
|
||||
|
||||
@ -22,9 +22,9 @@ import { uniq, isEqual } from 'lodash';
|
||||
|
||||
import List from '../Accounts/List';
|
||||
import Summary from '../Accounts/Summary';
|
||||
import { AddAddress } from '../../modals';
|
||||
import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
|
||||
import { setVisibleAccounts } from '../../redux/providers/personalActions';
|
||||
import { AddAddress } from '~/modals';
|
||||
import { Actionbar, ActionbarExport, ActionbarImport, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
|
||||
import { setVisibleAccounts } from '~/redux/providers/personalActions';
|
||||
|
||||
import styles from './addresses.css';
|
||||
|
||||
|
||||
@ -16,8 +16,8 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { FirstRun } from '../../../modals';
|
||||
import { Errors, ParityBackground, Tooltips } from '../../../ui';
|
||||
import { FirstRun } from '~/modals';
|
||||
import { Errors, ParityBackground, Tooltips } from '~/ui';
|
||||
|
||||
import styles from '../application.css';
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Errors } from '../../../ui';
|
||||
import { Errors } from '~/ui';
|
||||
|
||||
import styles from '../application.css';
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ import { bindActionCreators } from 'redux';
|
||||
import { Snackbar as SnackbarMUI } from 'material-ui';
|
||||
import { darkBlack, grey800 } from 'material-ui/styles/colors';
|
||||
|
||||
import { closeSnackbar } from '../../../redux/providers/snackbarActions';
|
||||
import { closeSnackbar } from '~/redux/providers/snackbarActions';
|
||||
|
||||
const bodyStyle = {
|
||||
backgroundColor: darkBlack,
|
||||
|
||||
@ -18,8 +18,8 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
|
||||
import { BlockStatus } from '../../../ui';
|
||||
import CopyToClipboard from '../../../ui/CopyToClipboard';
|
||||
import { BlockStatus } from '~/ui';
|
||||
import CopyToClipboard from '~/ui/CopyToClipboard';
|
||||
|
||||
import styles from './status.css';
|
||||
|
||||
|
||||
@ -21,7 +21,7 @@ import { Toolbar, ToolbarGroup } from 'material-ui/Toolbar';
|
||||
import { Tab as MUITab } from 'material-ui/Tabs';
|
||||
import { isEqual } from 'lodash';
|
||||
|
||||
import { Badge, Tooltip } from '../../../ui';
|
||||
import { Badge, Tooltip } from '~/ui';
|
||||
|
||||
import styles from './tabBar.css';
|
||||
import imagesEthcoreBlock from '../../../../assets/images/parity-logo-white-no-text.svg';
|
||||
|
||||
@ -23,7 +23,7 @@ import ActionDashboard from 'material-ui/svg-icons/action/dashboard';
|
||||
import HardwareDesktopMac from 'material-ui/svg-icons/hardware/desktop-mac';
|
||||
import NotificationVpnLock from 'material-ui/svg-icons/notification/vpn-lock';
|
||||
|
||||
import { Input } from '../../ui';
|
||||
import { Input } from '~/ui';
|
||||
|
||||
import styles from './connection.css';
|
||||
|
||||
|
||||
@ -18,8 +18,8 @@ import BigNumber from 'bignumber.js';
|
||||
import moment from 'moment';
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { IdentityIcon, IdentityName, Input, InputAddress } from '../../../../ui';
|
||||
import ShortenedHash from '../../../../ui/ShortenedHash';
|
||||
import { IdentityIcon, IdentityName, Input, InputAddress } from '~/ui';
|
||||
import ShortenedHash from '~/ui/ShortenedHash';
|
||||
import { txLink } from '../../../../3rdparty/etherscan/links';
|
||||
|
||||
import styles from '../../contract.css';
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Container } from '../../../ui';
|
||||
import { Container } from '~/ui';
|
||||
|
||||
import Event from './Event';
|
||||
import styles from '../contract.css';
|
||||
|
||||
@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import LinearProgress from 'material-ui/LinearProgress';
|
||||
import { Card, CardActions, CardTitle, CardText } from 'material-ui/Card';
|
||||
|
||||
import { Button, Input, InputAddress, InputAddressSelect } from '../../../ui';
|
||||
import { Button, Input, InputAddress, InputAddressSelect } from '~/ui';
|
||||
|
||||
import styles from './queries.css';
|
||||
|
||||
|
||||
@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { Card, CardTitle, CardText } from 'material-ui/Card';
|
||||
|
||||
import InputQuery from './inputQuery';
|
||||
import { Container, Input, InputAddress } from '../../../ui';
|
||||
import { Container, Input, InputAddress } from '~/ui';
|
||||
|
||||
import styles from './queries.css';
|
||||
|
||||
|
||||
@ -24,10 +24,10 @@ import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { newError } from '../../redux/actions';
|
||||
import { setVisibleAccounts } from '../../redux/providers/personalActions';
|
||||
import { setVisibleAccounts } from '~/redux/providers/personalActions';
|
||||
|
||||
import { EditMeta, ExecuteContract } from '../../modals';
|
||||
import { Actionbar, Button, Page, Modal, Editor } from '../../ui';
|
||||
import { EditMeta, ExecuteContract } from '~/modals';
|
||||
import { Actionbar, Button, Page, Modal, Editor } from '~/ui';
|
||||
|
||||
import Header from '../Account/Header';
|
||||
import Delete from '../Address/Delete';
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { Link } from 'react-router';
|
||||
|
||||
import { Container, ContainerTitle, IdentityIcon, IdentityName } from '../../../ui';
|
||||
import { Container, ContainerTitle, IdentityIcon, IdentityName } from '~/ui';
|
||||
|
||||
export default class Summary extends Component {
|
||||
static contextTypes = {
|
||||
|
||||
@ -22,9 +22,9 @@ import ContentAdd from 'material-ui/svg-icons/content/add';
|
||||
import FileIcon from 'material-ui/svg-icons/action/description';
|
||||
import { uniq, isEqual } from 'lodash';
|
||||
|
||||
import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '../../ui';
|
||||
import { AddContract, DeployContract } from '../../modals';
|
||||
import { setVisibleAccounts } from '../../redux/providers/personalActions';
|
||||
import { Actionbar, ActionbarSearch, ActionbarSort, Button, Page } from '~/ui';
|
||||
import { AddContract, DeployContract } from '~/modals';
|
||||
import { setVisibleAccounts } from '~/redux/providers/personalActions';
|
||||
|
||||
import List from '../Accounts/List';
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ import DoneIcon from 'material-ui/svg-icons/action/done';
|
||||
import { List, ListItem } from 'material-ui/List';
|
||||
import Checkbox from 'material-ui/Checkbox';
|
||||
|
||||
import { Modal, Button } from '../../../ui';
|
||||
import { Modal, Button } from '~/ui';
|
||||
|
||||
import styles from './AddDapps.css';
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { Link } from 'react-router';
|
||||
|
||||
import { Container, ContainerTitle, Tags } from '../../../ui';
|
||||
import { Container, ContainerTitle, Tags } from '~/ui';
|
||||
|
||||
import styles from './summary.css';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ import React, { Component, PropTypes } from 'react';
|
||||
import { Checkbox } from 'material-ui';
|
||||
import { observer } from 'mobx-react';
|
||||
|
||||
import { Actionbar, Page } from '../../ui';
|
||||
import { Actionbar, Page } from '~/ui';
|
||||
import FlatButton from 'material-ui/FlatButton';
|
||||
import EyeIcon from 'material-ui/svg-icons/image/remove-red-eye';
|
||||
|
||||
|
||||
@ -18,7 +18,7 @@ import BigNumber from 'bignumber.js';
|
||||
import { action, computed, observable, transaction } from 'mobx';
|
||||
import store from 'store';
|
||||
|
||||
import Contracts from '../../contracts';
|
||||
import Contracts from '~/contracts';
|
||||
import { hashToImageUrl } from '../../redux/util';
|
||||
|
||||
import builtinApps from './builtin.json';
|
||||
|
||||
@ -21,7 +21,7 @@ import { bindActionCreators } from 'redux';
|
||||
import ActionFingerprint from 'material-ui/svg-icons/action/fingerprint';
|
||||
import ContentClear from 'material-ui/svg-icons/content/clear';
|
||||
|
||||
import { Badge, Button, ContainerTitle, ParityBackground } from '../../ui';
|
||||
import { Badge, Button, ContainerTitle, ParityBackground } from '~/ui';
|
||||
import { Embedded as Signer } from '../Signer';
|
||||
|
||||
import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg';
|
||||
|
||||
@ -19,7 +19,7 @@ import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import NavigationRefresh from 'material-ui/svg-icons/navigation/refresh';
|
||||
|
||||
import { Button, Container, ParityBackground } from '../../../ui';
|
||||
import { Button, Container, ParityBackground } from '~/ui';
|
||||
|
||||
import { updateBackground } from '../actions';
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
import { MenuItem } from 'material-ui';
|
||||
|
||||
import { Select, Container } from '../../../ui';
|
||||
import { Select, Container } from '~/ui';
|
||||
|
||||
import layout from '../layout.css';
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
|
||||
import React, { Component, PropTypes } from 'react';
|
||||
|
||||
import { Container } from '../../../ui';
|
||||
import { Container } from '~/ui';
|
||||
|
||||
import layout from '../layout.css';
|
||||
import styles from './proxy.css';
|
||||
|
||||
@ -19,7 +19,7 @@ import { connect } from 'react-redux';
|
||||
import { bindActionCreators } from 'redux';
|
||||
import { Checkbox } from 'material-ui';
|
||||
|
||||
import { Container } from '../../../ui';
|
||||
import { Container } from '~/ui';
|
||||
|
||||
import { toggleView } from '../actions';
|
||||
|
||||
|
||||
@ -20,7 +20,7 @@ import ActionSettingsEthernet from 'material-ui/svg-icons/action/settings-ethern
|
||||
import ImageBlurOn from 'material-ui/svg-icons/image/blur-on';
|
||||
import ImageRemoveRedEye from 'material-ui/svg-icons/image/remove-red-eye';
|
||||
|
||||
import { Actionbar, Page } from '../../ui';
|
||||
import { Actionbar, Page } from '~/ui';
|
||||
import imagesEthcoreBlock from '../../../assets/images/parity-logo-white-no-text.svg';
|
||||
|
||||
import styles from './settings.css';
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user