diff --git a/ethcore/src/blockchain/blockchain.rs b/ethcore/src/blockchain/blockchain.rs index 5910d0309..68fb40483 100644 --- a/ethcore/src/blockchain/blockchain.rs +++ b/ethcore/src/blockchain/blockchain.rs @@ -140,7 +140,7 @@ pub trait BlockProvider { fn blocks_with_bloom(&self, bloom: &H2048, from_block: BlockNumber, to_block: BlockNumber) -> Vec; /// Returns logs matching given filter. - fn logs(&self, mut blocks: Vec, matches: F, limit: Option) -> Vec + fn logs(&self, blocks: Vec, matches: F, limit: Option) -> Vec where F: Fn(&LogEntry) -> bool, Self: Sized; } diff --git a/js/src/views/Signer/components/RequestPendingWeb3/index.js b/js/src/views/Signer/components/RequestFinished/index.js similarity index 94% rename from js/src/views/Signer/components/RequestPendingWeb3/index.js rename to js/src/views/Signer/components/RequestFinished/index.js index f664b571c..c5ed83b6b 100644 --- a/js/src/views/Signer/components/RequestPendingWeb3/index.js +++ b/js/src/views/Signer/components/RequestFinished/index.js @@ -14,4 +14,4 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -export default from './RequestPendingWeb3'; +export default from './requestFinished'; diff --git a/js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js b/js/src/views/Signer/components/RequestFinished/requestFinished.js similarity index 91% rename from js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js rename to js/src/views/Signer/components/RequestFinished/requestFinished.js index 74a20f625..bce9e4038 100644 --- a/js/src/views/Signer/components/RequestFinishedWeb3/RequestFinishedWeb3.js +++ b/js/src/views/Signer/components/RequestFinished/requestFinished.js @@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react'; import TransactionFinished from '../TransactionFinished'; import SignRequest from '../SignRequest'; -export default class RequestFinishedWeb3 extends Component { +export default class RequestFinished extends Component { static propTypes = { id: PropTypes.object.isRequired, result: PropTypes.any.isRequired, @@ -32,11 +32,12 @@ export default class RequestFinishedWeb3 extends Component { status: PropTypes.string, error: PropTypes.string, className: PropTypes.string, - isTest: PropTypes.bool.isRequired + isTest: PropTypes.bool.isRequired, + store: PropTypes.object.isRequired } render () { - const { payload, id, result, msg, status, error, date, className, isTest } = this.props; + const { payload, id, result, msg, status, error, date, className, isTest, store } = this.props; if (payload.sign) { const { sign } = payload; @@ -52,6 +53,7 @@ export default class RequestFinishedWeb3 extends Component { status={ status } error={ error } isTest={ isTest } + store={ store } /> ); } @@ -74,6 +76,7 @@ export default class RequestFinishedWeb3 extends Component { status={ status } error={ error } isTest={ isTest } + store={ store } /> ); } diff --git a/js/src/views/Signer/components/RequestFinishedWeb3/index.js b/js/src/views/Signer/components/RequestPending/index.js similarity index 93% rename from js/src/views/Signer/components/RequestFinishedWeb3/index.js rename to js/src/views/Signer/components/RequestPending/index.js index bcf7341bb..d4b048781 100644 --- a/js/src/views/Signer/components/RequestFinishedWeb3/index.js +++ b/js/src/views/Signer/components/RequestPending/index.js @@ -14,4 +14,4 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -export default from './RequestFinishedWeb3'; +export default from './requestPending'; diff --git a/js/src/views/Signer/components/RequestPendingWeb3/RequestPendingWeb3.js b/js/src/views/Signer/components/RequestPending/requestPending.js similarity index 92% rename from js/src/views/Signer/components/RequestPendingWeb3/RequestPendingWeb3.js rename to js/src/views/Signer/components/RequestPending/requestPending.js index d9e695dbc..d8e2e0565 100644 --- a/js/src/views/Signer/components/RequestPendingWeb3/RequestPendingWeb3.js +++ b/js/src/views/Signer/components/RequestPending/requestPending.js @@ -19,7 +19,7 @@ import React, { Component, PropTypes } from 'react'; import TransactionPending from '../TransactionPending'; import SignRequest from '../SignRequest'; -export default class RequestPendingWeb3 extends Component { +export default class RequestPending extends Component { static propTypes = { id: PropTypes.object.isRequired, onConfirm: PropTypes.func.isRequired, @@ -31,7 +31,8 @@ export default class RequestPendingWeb3 extends Component { PropTypes.shape({ sign: PropTypes.object.isRequired }) ]).isRequired, className: PropTypes.string, - isTest: PropTypes.bool.isRequired + isTest: PropTypes.bool.isRequired, + store: PropTypes.object.isRequired }; onConfirm = data => { @@ -42,7 +43,7 @@ export default class RequestPendingWeb3 extends Component { }; render () { - const { payload, id, className, isSending, date, onReject, isTest } = this.props; + const { payload, id, className, isSending, date, onReject, isTest, store } = this.props; if (payload.sign) { const { sign } = payload; @@ -58,6 +59,7 @@ export default class RequestPendingWeb3 extends Component { address={ sign.address } hash={ sign.hash } isTest={ isTest } + store={ store } /> ); } @@ -80,6 +82,7 @@ export default class RequestPendingWeb3 extends Component { value={ transaction.value } date={ date } isTest={ isTest } + store={ store } /> ); } diff --git a/js/src/views/Signer/components/SignRequest/SignRequest.js b/js/src/views/Signer/components/SignRequest/SignRequest.js index 6fb2b37b7..ae4159c71 100644 --- a/js/src/views/Signer/components/SignRequest/SignRequest.js +++ b/js/src/views/Signer/components/SignRequest/SignRequest.js @@ -15,7 +15,7 @@ // along with Parity. If not, see . import React, { Component, PropTypes } from 'react'; -import nullable from '../../../../util/nullable-proptype'; +import { observer } from 'mobx-react'; import Account from '../Account'; import TransactionPendingForm from '../TransactionPendingForm'; @@ -23,12 +23,8 @@ import TxHashLink from '../TxHashLink'; import styles from './SignRequest.css'; +@observer export default class SignRequest extends Component { - static contextTypes = { - api: PropTypes.object - } - - // TODO [todr] re-use proptypes? static propTypes = { id: PropTypes.object.isRequired, address: PropTypes.string.isRequired, @@ -40,21 +36,13 @@ export default class SignRequest extends Component { status: PropTypes.string, className: PropTypes.string, isTest: PropTypes.bool.isRequired, - balance: nullable(PropTypes.object) + store: PropTypes.object.isRequired }; - state = { - balance: null - } - componentWillMount () { - this.context.api.eth.getBalance(this.props.address) - .then((balance) => { - this.setState({ balance }); - }) - .catch((err) => { - console.error('could not fetch balance', err); - }); + const { address, store } = this.props; + + store.fetchBalance(address); } render () { @@ -69,8 +57,8 @@ export default class SignRequest extends Component { } renderDetails () { - const { address, hash, isTest } = this.props; - const { balance } = this.state; + const { address, hash, isTest, store } = this.props; + const balance = store.balances[address]; if (!balance) { return
; @@ -133,11 +121,11 @@ export default class SignRequest extends Component { onConfirm = password => { const { id } = this.props; + this.props.onConfirm({ id, password }); } onReject = () => { this.props.onReject(this.props.id); } - } diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css index 91749cc61..0db00d7e4 100644 --- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css +++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css @@ -14,6 +14,7 @@ /* You should have received a copy of the GNU General Public License /* along with Parity. If not, see . */ + .container { padding: 25px 0 15px; } diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js index 54333115d..dcfdb5e00 100644 --- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js +++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js @@ -15,9 +15,7 @@ // along with Parity. If not, see . import React, { Component, PropTypes } from 'react'; -import nullable from '../../../../util/nullable-proptype'; - -import CircularProgress from 'material-ui/CircularProgress'; +import { observer } from 'mobx-react'; import { TxHash } from '../../../../ui'; @@ -30,11 +28,8 @@ import styles from './TransactionFinished.css'; import * as tUtil from '../util/transaction'; import { capitalize } from '../util/util'; +@observer export default class TransactionFinished extends Component { - static contextTypes = { - api: PropTypes.object.isRequired - }; - static propTypes = { id: PropTypes.object.isRequired, from: PropTypes.string.isRequired, @@ -48,39 +43,23 @@ export default class TransactionFinished extends Component { className: PropTypes.string, data: PropTypes.string, isTest: PropTypes.bool.isRequired, - fromBalance: nullable(PropTypes.object), - toBalance: nullable(PropTypes.object) - }; - - state = { - fromBalance: null, - toBalance: null + store: PropTypes.object.isRequired }; componentWillMount () { - const { from, to, gas, gasPrice, value } = this.props; + const { from, to, gas, gasPrice, value, store } = this.props; const fee = tUtil.getFee(gas, gasPrice); // BigNumber object const totalValue = tUtil.getTotalValue(fee, value); - this.setState({ totalValue }); - this.fetchBalance(from, 'fromBalance'); - if (to) { - this.fetchBalance(to, 'toBalance'); - } + this.setState({ totalValue }); + store.fetchBalances([from, to]); } render () { - const { fromBalance, toBalance } = this.state; + const { className, date, id, from, to, store } = this.props; - if (!fromBalance || !toBalance) { - return ( -
- -
- ); - } - - const { className, date, id } = this.props; + const fromBalance = store.balances[from]; + const toBalance = store.balances[to]; return (
@@ -88,6 +67,8 @@ export default class TransactionFinished extends Component { ); } - - fetchBalance (address, key) { - this.context.api.eth.getBalance(address) - .then((balance) => { - this.setState({ [key]: balance }); - }) - .catch((err) => { - console.error('could not fetch balance', err); - }); - } - } diff --git a/js/src/views/Signer/components/TransactionPending/TransactionPending.js b/js/src/views/Signer/components/TransactionPending/TransactionPending.js index 55f09ac97..0742c2c76 100644 --- a/js/src/views/Signer/components/TransactionPending/TransactionPending.js +++ b/js/src/views/Signer/components/TransactionPending/TransactionPending.js @@ -15,6 +15,7 @@ // along with Parity. If not, see . import React, { Component, PropTypes } from 'react'; +import { observer } from 'mobx-react'; import TransactionMainDetails from '../TransactionMainDetails'; import TransactionPendingForm from '../TransactionPendingForm'; @@ -24,11 +25,8 @@ import styles from './TransactionPending.css'; import * as tUtil from '../util/transaction'; +@observer export default class TransactionPending extends Component { - static contextTypes = { - api: PropTypes.object.isRequired - }; - static propTypes = { id: PropTypes.object.isRequired, from: PropTypes.string.isRequired, @@ -43,34 +41,32 @@ export default class TransactionPending extends Component { onReject: PropTypes.func.isRequired, isSending: PropTypes.bool.isRequired, className: PropTypes.string, - isTest: PropTypes.bool.isRequired + isTest: PropTypes.bool.isRequired, + store: PropTypes.object.isRequired }; static defaultProps = { isSending: false }; - state = { - fromBalance: null, - toBalance: null - }; - componentWillMount () { - const { gas, gasPrice, value } = this.props; + const { gas, gasPrice, value, from, to, store } = this.props; + const fee = tUtil.getFee(gas, gasPrice); // BigNumber object const totalValue = tUtil.getTotalValue(fee, value); const gasPriceEthmDisplay = tUtil.getEthmFromWeiDisplay(gasPrice); const gasToDisplay = tUtil.getGasDisplay(gas); - this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay }); - const { from, to } = this.props; - this.fetchBalance(from, 'fromBalance'); - if (to) this.fetchBalance(to, 'toBalance'); + this.setState({ gasPriceEthmDisplay, totalValue, gasToDisplay }); + store.fetchBalances([from, to]); } render () { + const { className, id, date, data, from, to, store } = this.props; const { totalValue, gasPriceEthmDisplay, gasToDisplay } = this.state; - const { className, id, date, data, from } = this.props; + + const fromBalance = store.balances[from]; + const toBalance = store.balances[to]; return (
@@ -78,6 +74,8 @@ export default class TransactionPending extends Component { { this.props.onReject(this.props.id); } - - fetchBalance (address, key) { - this.context.api.eth.getBalance(address) - .then((balance) => { - this.setState({ [key]: balance }); - }) - .catch((err) => { - console.error('could not fetch balance', err); - }); - } - } diff --git a/js/src/views/Signer/components/index.js b/js/src/views/Signer/components/index.js index 2dd5174e2..7c891f621 100644 --- a/js/src/views/Signer/components/index.js +++ b/js/src/views/Signer/components/index.js @@ -14,5 +14,5 @@ // You should have received a copy of the GNU General Public License // along with Parity. If not, see . -export RequestFinishedWeb3 from './RequestFinishedWeb3'; -export RequestPendingWeb3 from './RequestPendingWeb3'; +export RequestFinished from './RequestFinished'; +export RequestPending from './RequestPending'; diff --git a/js/src/views/Signer/containers/Embedded/embedded.js b/js/src/views/Signer/containers/Embedded/embedded.js index e06eaf274..b62c1a6c0 100644 --- a/js/src/views/Signer/containers/Embedded/embedded.js +++ b/js/src/views/Signer/containers/Embedded/embedded.js @@ -19,14 +19,19 @@ import React, { Component, PropTypes } from 'react'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; +import Store from '../../store'; import * as RequestsActions from '../../../../redux/providers/signerActions'; import { Container } from '../../../../ui'; -import { RequestPendingWeb3 } from '../../components'; +import { RequestPending } from '../../components'; import styles from './embedded.css'; class Embedded extends Component { + static contextTypes = { + api: PropTypes.object.isRequired + }; + static propTypes = { signer: PropTypes.shape({ pending: PropTypes.array.isRequired, @@ -39,6 +44,8 @@ class Embedded extends Component { isTest: PropTypes.bool.isRequired }; + store = new Store(this.context.api); + render () { return ( @@ -75,7 +82,7 @@ class Embedded extends Component { const { payload, id, isSending, date } = data; return ( - ); } diff --git a/js/src/views/Signer/containers/RequestsPage/RequestsPage.js b/js/src/views/Signer/containers/RequestsPage/RequestsPage.js index bf4968610..c53d39264 100644 --- a/js/src/views/Signer/containers/RequestsPage/RequestsPage.js +++ b/js/src/views/Signer/containers/RequestsPage/RequestsPage.js @@ -19,14 +19,19 @@ import React, { Component, PropTypes } from 'react'; import { bindActionCreators } from 'redux'; import { connect } from 'react-redux'; +import Store from '../../store'; import * as RequestsActions from '../../../../redux/providers/signerActions'; import { Container, ContainerTitle } from '../../../../ui'; -import { RequestPendingWeb3, RequestFinishedWeb3 } from '../../components'; +import { RequestPending, RequestFinished } from '../../components'; import styles from './RequestsPage.css'; class RequestsPage extends Component { + static contextTypes = { + api: PropTypes.object.isRequired + }; + static propTypes = { signer: PropTypes.shape({ pending: PropTypes.array.isRequired, @@ -39,6 +44,8 @@ class RequestsPage extends Component { isTest: PropTypes.bool.isRequired }; + store = new Store(this.context.api); + render () { const { pending, finished } = this.props.signer; @@ -101,7 +108,7 @@ class RequestsPage extends Component { const { payload, id, isSending, date } = data; return ( - ); } @@ -120,7 +128,7 @@ class RequestsPage extends Component { const { payload, id, result, msg, status, error, date } = data; return ( - ); } diff --git a/js/src/views/Signer/store.js b/js/src/views/Signer/store.js new file mode 100644 index 000000000..1bb63bbe2 --- /dev/null +++ b/js/src/views/Signer/store.js @@ -0,0 +1,66 @@ +// Copyright 2015, 2016 Ethcore (UK) Ltd. +// This file is part of Parity. + +// Parity is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. + +// Parity is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License +// along with Parity. If not, see . + +import { action, observable } from 'mobx'; + +export default class Store { + @observable balances = {}; + + constructor (api) { + this._api = api; + } + + @action setBalance = (address, balance) => { + this.setBalances({ [address]: balance }); + } + + @action setBalances = (balances) => { + this.balances = Object.assign({}, this.balances, balances); + } + + fetchBalance (address) { + this._api.eth + .getBalance(address) + .then((balance) => { + this.setBalance(address, balance); + }) + .catch((error) => { + console.warn('Store:fetchBalance', error); + }); + } + + fetchBalances (_addresses) { + const addresses = _addresses.filter((address) => address) || []; + + if (!addresses.length) { + return; + } + + Promise + .all(addresses.map((address) => this._api.eth.getBalance(address))) + .then((_balances) => { + this.setBalances( + addresses.reduce((balances, address, index) => { + balances[address] = _balances[index]; + return balances; + }, {}) + ); + }) + .catch((error) => { + console.warn('Store:fetchBalances', error); + }); + } +} diff --git a/parity/cli/mod.rs b/parity/cli/mod.rs index 33a48b3b0..394892914 100644 --- a/parity/cli/mod.rs +++ b/parity/cli/mod.rs @@ -133,6 +133,7 @@ usage! { or |c: &Config| otry!(c.network).reserved_peers.clone().map(Some), flag_reserved_only: bool = false, or |c: &Config| otry!(c.network).reserved_only.clone(), + flag_no_ancient_blocks: bool = false, or |_| None, // -- API and Console Options // RPC @@ -535,6 +536,7 @@ mod tests { flag_node_key: None, flag_reserved_peers: Some("./path_to_file".into()), flag_reserved_only: false, + flag_no_ancient_blocks: false, // -- API and Console Options // RPC diff --git a/parity/cli/usage.txt b/parity/cli/usage.txt index 0ac59da0e..f905ec74a 100644 --- a/parity/cli/usage.txt +++ b/parity/cli/usage.txt @@ -106,6 +106,8 @@ Networking Options: all - connect to any IP address. (default: {flag_allow_ips}) --max-pending-peers NUM Allow up to NUM pending connections. (default: {flag_max_pending_peers}) + --no-ancient-blocks Disable downloading old blocks after snapshot restoration + or warp sync. (default: {flag_no_ancient_blocks}) API and Console Options: --no-jsonrpc Disable the JSON-RPC API server. (default: {flag_no_jsonrpc}) diff --git a/parity/configuration.rs b/parity/configuration.rs index e08c853bd..0f0c19814 100644 --- a/parity/configuration.rs +++ b/parity/configuration.rs @@ -250,6 +250,7 @@ impl Configuration { custom_bootnodes: self.args.flag_bootnodes.is_some(), no_periodic_snapshot: self.args.flag_no_periodic_snapshot, check_seal: !self.args.flag_no_seal_check, + download_old_blocks: !self.args.flag_no_ancient_blocks, }; Cmd::Run(run_cmd) }; @@ -875,6 +876,7 @@ mod tests { fat_db: Default::default(), no_periodic_snapshot: false, check_seal: true, + download_old_blocks: true, })); } diff --git a/parity/run.rs b/parity/run.rs index 2cc791f8c..f56ba5b92 100644 --- a/parity/run.rs +++ b/parity/run.rs @@ -91,6 +91,7 @@ pub struct RunCmd { pub custom_bootnodes: bool, pub no_periodic_snapshot: bool, pub check_seal: bool, + pub download_old_blocks: bool, } pub fn open_ui(dapps_conf: &dapps::Configuration, signer_conf: &signer::Configuration) -> Result<(), String> { @@ -202,6 +203,7 @@ pub fn execute(cmd: RunCmd, logger: Arc) -> Result<(), String> { } sync_config.fork_block = spec.fork_block(); sync_config.warp_sync = cmd.warp_sync; + sync_config.download_old_blocks = cmd.download_old_blocks; // prepare account provider let account_provider = Arc::new(try!(prepare_account_provider(&cmd.dirs, cmd.acc_conf))); diff --git a/sync/src/api.rs b/sync/src/api.rs index 3191483e4..cdab0983a 100644 --- a/sync/src/api.rs +++ b/sync/src/api.rs @@ -41,6 +41,8 @@ pub const WARP_SYNC_PROTOCOL_ID: ProtocolId = *b"par"; pub struct SyncConfig { /// Max blocks to download ahead pub max_download_ahead_blocks: usize, + /// Enable ancient block download. + pub download_old_blocks: bool, /// Network ID pub network_id: usize, /// Main "eth" subprotocol name. @@ -55,6 +57,7 @@ impl Default for SyncConfig { fn default() -> SyncConfig { SyncConfig { max_download_ahead_blocks: 20000, + download_old_blocks: true, network_id: 1, subprotocol_name: *b"eth", fork_block: None, diff --git a/sync/src/chain.rs b/sync/src/chain.rs index fd3e82767..a8d0e3a50 100644 --- a/sync/src/chain.rs +++ b/sync/src/chain.rs @@ -352,6 +352,8 @@ pub struct ChainSync { sync_start_time: Option, /// Transactions propagation statistics transactions_stats: TransactionsStats, + /// Enable ancient block downloading + download_old_blocks: bool, } type RlpResponseResult = Result, PacketDecodeError>; @@ -372,6 +374,7 @@ impl ChainSync { last_sent_block_number: 0, network_id: config.network_id, fork_block: config.fork_block, + download_old_blocks: config.download_old_blocks, snapshot: Snapshot::new(), sync_start_time: None, transactions_stats: TransactionsStats::default(), @@ -539,17 +542,18 @@ impl ChainSync { // Do not assume that the block queue/chain still has our last_imported_block let chain = chain.chain_info(); self.new_blocks = BlockDownloader::new(false, &chain.best_block_hash, chain.best_block_number); - if let (Some(ancient_block_hash), Some(ancient_block_number)) = (chain.ancient_block_hash, chain.ancient_block_number) { + self.old_blocks = None; + if self.download_old_blocks { + if let (Some(ancient_block_hash), Some(ancient_block_number)) = (chain.ancient_block_hash, chain.ancient_block_number) { - trace!(target: "sync", "Downloading old blocks from {:?} (#{}) till {:?} (#{:?})", ancient_block_hash, ancient_block_number, chain.first_block_hash, chain.first_block_number); - let mut downloader = BlockDownloader::new(true, &ancient_block_hash, ancient_block_number); - if let Some(hash) = chain.first_block_hash { - trace!(target: "sync", "Downloader target set to {:?}", hash); - downloader.set_target(&hash); + trace!(target: "sync", "Downloading old blocks from {:?} (#{}) till {:?} (#{:?})", ancient_block_hash, ancient_block_number, chain.first_block_hash, chain.first_block_number); + let mut downloader = BlockDownloader::new(true, &ancient_block_hash, ancient_block_number); + if let Some(hash) = chain.first_block_hash { + trace!(target: "sync", "Downloader target set to {:?}", hash); + downloader.set_target(&hash); + } + self.old_blocks = Some(downloader); } - self.old_blocks = Some(downloader); - } else { - self.old_blocks = None; } }