From 40d794ddfd736d7c8343a7a4b6a3e353cc1069ed Mon Sep 17 00:00:00 2001
From: "Denis S. Soldatov aka General-Beck" <general.beck@gmail.com>
Date: Sat, 29 Oct 2016 01:47:05 +0700
Subject: [PATCH 01/42] Update gitlab-ci

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e16350325..424f933fe 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -380,8 +380,8 @@ test-windows:
   before_script:
     - git submodule update --init --recursive
   script:
-    - export RUST_BACKTRACE=1
-    - ./test.sh --verbose
+    - set RUST_BACKTRACE=1
+    - PowerShell ./test.sh --verbose
   tags:
     - rust-windows
   dependencies:

From 3e3230aa34d52311a047a6f0e6d744b57d20706d Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Fri, 28 Oct 2016 18:50:17 +0000
Subject: [PATCH 02/42] [ci skip] js-precompiled 20161028-184917

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index b9d989fbd..ed9b0330b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#ba726039185238d6fd604f092b089a7d52c0f436"
+source = "git+https://github.com/ethcore/js-precompiled.git#ed68f673cf7bb576c1a7d1c4328e44f28dea7713"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From c61526f8d51efe6a02d4196a1da5872986ec686e Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 29 Oct 2016 09:55:55 +0200
Subject: [PATCH 03/42] Eslint fixes (package upgrade) (#2957)

---
 js/src/dapps/githubhint/Application/application.js | 2 +-
 js/src/modals/FirstRun/firstRun.js                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/src/dapps/githubhint/Application/application.js b/js/src/dapps/githubhint/Application/application.js
index ea7e760c5..8eb3902d3 100644
--- a/js/src/dapps/githubhint/Application/application.js
+++ b/js/src/dapps/githubhint/Application/application.js
@@ -151,7 +151,7 @@ export default class Application extends Component {
     let urlError = null;
 
     if (url && url.length) {
-      var re = /^https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}/g;
+      const re = /^https?:\/\/(?:www\.|(?!www))[^\s\.]+\.[^\s]{2,}/g; // eslint-disable-line
       urlError = re.test(url)
         ? null
         : 'not matching rexex';
diff --git a/js/src/modals/FirstRun/firstRun.js b/js/src/modals/FirstRun/firstRun.js
index e5033f9e6..2ba8cbbe8 100644
--- a/js/src/modals/FirstRun/firstRun.js
+++ b/js/src/modals/FirstRun/firstRun.js
@@ -122,7 +122,7 @@ export default class FirstRun extends Component {
             icon={ <ActionDoneAll /> }
             label='Close'
             onClick={ this.onClose } />
-      );
+        );
     }
   }
 

From e1cf6f7dd072e24d36297e6fcc1691d8ed0d0a11 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 07:58:45 +0000
Subject: [PATCH 04/42] [ci skip] js-precompiled 20161029-075744

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed9b0330b..8d040eade 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#ed68f673cf7bb576c1a7d1c4328e44f28dea7713"
+source = "git+https://github.com/ethcore/js-precompiled.git#93753cb4d50f85eca91e024196235c6f0deb3bd4"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 65c985bef3a6d2ffa1523f3699f941940b79fafa Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 29 Oct 2016 13:04:47 +0200
Subject: [PATCH 05/42] Gavcoin event display updates (#2956)

* Mapp all known addresses

* Display timestamp in event log

* Shorten addresses

* Display "Pending" timestamps as well

* Pending/Loading with empty timestamp
---
 .../dapps/gavcoin/Application/application.js  | 12 ++---
 js/src/dapps/gavcoin/Events/Event/event.js    | 44 +++++++++++++++----
 js/src/dapps/gavcoin/Events/events.css        |  9 ++--
 js/src/dapps/gavcoin/Events/events.js         | 10 ++---
 js/src/dapps/gavcoin/format/index.js          |  4 ++
 5 files changed, 55 insertions(+), 24 deletions(-)

diff --git a/js/src/dapps/gavcoin/Application/application.js b/js/src/dapps/gavcoin/Application/application.js
index 1ae5d870a..c5eda9db8 100644
--- a/js/src/dapps/gavcoin/Application/application.js
+++ b/js/src/dapps/gavcoin/Application/application.js
@@ -53,6 +53,7 @@ export default class Application extends Component {
     action: null,
     address: null,
     accounts: [],
+    accountsInfo: {},
     blockNumber: new BigNumber(-1),
     ethBalance: new BigNumber(0),
     gavBalance: new BigNumber(0),
@@ -68,7 +69,7 @@ export default class Application extends Component {
   }
 
   render () {
-    const { accounts, address, blockNumber, gavBalance, loading, price, remaining, totalSupply } = this.state;
+    const { accounts, accountsInfo, address, blockNumber, gavBalance, loading, price, remaining, totalSupply } = this.state;
 
     if (loading) {
       return (
@@ -93,7 +94,7 @@ export default class Application extends Component {
           gavBalance={ gavBalance }
           onAction={ this.onAction } />
         <Events
-          accounts={ accounts } />
+          accountsInfo={ accountsInfo } />
       </div>
     );
   }
@@ -216,8 +217,8 @@ export default class Application extends Component {
             api.personal.accountsInfo()
           ]);
       })
-      .then(([address, addresses, infos]) => {
-        infos = infos || {};
+      .then(([address, addresses, accountsInfo]) => {
+        accountsInfo = accountsInfo || {};
         console.log(`gavcoin was found at ${address}`);
 
         const contract = api.newContract(abis.gavcoin, address);
@@ -226,9 +227,10 @@ export default class Application extends Component {
           loading: false,
           address,
           contract,
+          accountsInfo,
           instance: contract.instance,
           accounts: addresses.map((address) => {
-            const info = infos[address] || {};
+            const info = accountsInfo[address] || {};
 
             return {
               address,
diff --git a/js/src/dapps/gavcoin/Events/Event/event.js b/js/src/dapps/gavcoin/Events/Event/event.js
index 0b4094ac0..c068454f0 100644
--- a/js/src/dapps/gavcoin/Events/Event/event.js
+++ b/js/src/dapps/gavcoin/Events/Event/event.js
@@ -14,10 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import moment from 'moment';
 import React, { Component, PropTypes } from 'react';
 
 import IdentityIcon from '../../IdentityIcon';
-import { formatBlockNumber, formatCoins, formatEth } from '../../format';
+import { formatCoins, formatEth, formatHash } from '../../format';
 
 import styles from '../events.css';
 
@@ -27,7 +28,8 @@ const EMPTY_COLUMN = (
 
 export default class Event extends Component {
   static contextTypes = {
-    accounts: PropTypes.array.isRequired
+    accountsInfo: PropTypes.object.isRequired,
+    api: PropTypes.object.isRequired
   }
 
   static propTypes = {
@@ -38,14 +40,23 @@ export default class Event extends Component {
     toAddress: PropTypes.string
   }
 
+  state = {
+    block: null
+  }
+
+  componentDidMount () {
+    this.loadBlock();
+  }
+
   render () {
     const { event, fromAddress, toAddress, price, value } = this.props;
-    const { blockNumber, state, type } = event;
+    const { block } = this.state;
+    const { state, type } = event;
     const cls = `${styles.event} ${styles[state]} ${styles[type.toLowerCase()]}`;
 
     return (
       <tr className={ cls }>
-        { this.renderBlockNumber(blockNumber) }
+        { this.renderTimestamp(block) }
         { this.renderType(type) }
         { this.renderValue(value) }
         { this.renderPrice(price) }
@@ -55,10 +66,10 @@ export default class Event extends Component {
     );
   }
 
-  renderBlockNumber (blockNumber) {
+  renderTimestamp (block) {
     return (
       <td className={ styles.blocknumber }>
-        { formatBlockNumber(blockNumber) }
+        { !block ? ' ' : moment(block.timestamp).fromNow() }
       </td>
     );
   }
@@ -77,8 +88,8 @@ export default class Event extends Component {
   }
 
   renderAddressName (address) {
-    const { accounts } = this.context;
-    const account = accounts.find((_account) => _account.address === address);
+    const { accountsInfo } = this.context;
+    const account = accountsInfo[address];
 
     if (account && account.name) {
       return (
@@ -90,7 +101,7 @@ export default class Event extends Component {
 
     return (
       <div className={ styles.address }>
-        { address }
+        { formatHash(address) }
       </div>
     );
   }
@@ -126,4 +137,19 @@ export default class Event extends Component {
       </td>
     );
   }
+
+  loadBlock () {
+    const { api } = this.context;
+    const { event } = this.props;
+
+    if (!event || !event.blockNumber || event.blockNumber.eq(0)) {
+      return;
+    }
+
+    api.eth
+      .getBlockByNumber(event.blockNumber)
+      .then((block) => {
+        this.setState({ block });
+      });
+  }
 }
diff --git a/js/src/dapps/gavcoin/Events/events.css b/js/src/dapps/gavcoin/Events/events.css
index 9be9b37af..cf9184744 100644
--- a/js/src/dapps/gavcoin/Events/events.css
+++ b/js/src/dapps/gavcoin/Events/events.css
@@ -16,18 +16,20 @@
 */
 .events {
   padding: 4em 2em;
+  text-align: center;
 }
 
 .list {
-  width: 100%;
+  margin: 0 auto;
   border: none;
   border-spacing: 0;
+  text-align: left;
 }
 
 .list td {
   vertical-align: top;
-  padding: 4px 0.5em;
-  max-height: 32px;
+  padding: 0.25em 1em;
+  max-height: 1.5em;
 }
 
 .event {
@@ -38,7 +40,6 @@
 .blocknumber,
 .ethvalue,
 .gavvalue {
-  font-family: 'Roboto Mono', monospace;
 }
 
 .blocknumber,
diff --git a/js/src/dapps/gavcoin/Events/events.js b/js/src/dapps/gavcoin/Events/events.js
index ba71d6541..97dac30bb 100644
--- a/js/src/dapps/gavcoin/Events/events.js
+++ b/js/src/dapps/gavcoin/Events/events.js
@@ -27,7 +27,7 @@ import styles from './events.css';
 
 export default class Events extends Component {
   static childContextTypes = {
-    accounts: PropTypes.array
+    accountsInfo: PropTypes.object
   }
 
   static contextTypes = {
@@ -36,7 +36,7 @@ export default class Events extends Component {
   }
 
   static propTypes = {
-    accounts: PropTypes.array
+    accountsInfo: PropTypes.object.isRequired
   }
 
   state = {
@@ -84,11 +84,9 @@ export default class Events extends Component {
   }
 
   getChildContext () {
-    const { accounts } = this.props;
+    const { accountsInfo } = this.props;
 
-    return {
-      accounts
-    };
+    return { accountsInfo };
   }
 
   setupFilters () {
diff --git a/js/src/dapps/gavcoin/format/index.js b/js/src/dapps/gavcoin/format/index.js
index 5e32012d0..ee554bb60 100644
--- a/js/src/dapps/gavcoin/format/index.js
+++ b/js/src/dapps/gavcoin/format/index.js
@@ -50,3 +50,7 @@ export function formatCoins (amount, decimals = 6) {
 export function formatEth (eth, decimals = 3) {
   return api.util.fromWei(eth).toFormat(decimals);
 }
+
+export function formatHash (hash) {
+  return `${hash.substr(0, 10)}...${hash.substr(-8)}`;
+}

From 290ed3343f52e252b91d49edfdc94b10765c3776 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 11:06:59 +0000
Subject: [PATCH 06/42] [ci skip] js-precompiled 20161029-110604

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8d040eade..870d39fa1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#93753cb4d50f85eca91e024196235c6f0deb3bd4"
+source = "git+https://github.com/ethcore/js-precompiled.git#d35381a1442215c9b21f472c2a644d1ecbe43336"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 9e82eeccfeb05fc99bdd6d3ba332c0562b10e586 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sat, 29 Oct 2016 13:07:06 +0200
Subject: [PATCH 07/42] Snapshot sync improvements (#2960)

* Status packet timeout

* Snapshot collection state

* Pause snapshot download

* Updated tests
---
 sync/src/api.rs            |   2 +-
 sync/src/chain.rs          | 186 ++++++++++++++++++++++++++++---------
 sync/src/snapshot.rs       |   5 +-
 sync/src/tests/chain.rs    |   5 +
 sync/src/tests/helpers.rs  |  14 ++-
 sync/src/tests/snapshot.rs |  18 ++--
 6 files changed, 174 insertions(+), 56 deletions(-)

diff --git a/sync/src/api.rs b/sync/src/api.rs
index 67a81237a..abe18c3cd 100644
--- a/sync/src/api.rs
+++ b/sync/src/api.rs
@@ -58,7 +58,7 @@ impl Default for SyncConfig {
 			network_id: U256::from(1),
 			subprotocol_name: *b"eth",
 			fork_block: None,
-			warp_sync: true,
+			warp_sync: false,
 		}
 	}
 }
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index d18adb6ea..06949682b 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -123,6 +123,7 @@ const MAX_NEW_BLOCK_AGE: BlockNumber = 20;
 const MAX_TRANSACTION_SIZE: usize = 300*1024;
 // Min number of blocks to be behind for a snapshot sync
 const SNAPSHOT_RESTORE_THRESHOLD: BlockNumber = 100000;
+const SNAPSHOT_MIN_PEERS: usize = 3;
 
 const STATUS_PACKET: u8 = 0x00;
 const NEW_BLOCK_HASHES_PACKET: u8 = 0x01;
@@ -147,21 +148,27 @@ const SNAPSHOT_DATA_PACKET: u8 = 0x14;
 
 pub const SNAPSHOT_SYNC_PACKET_COUNT: u8 = 0x15;
 
-const HEADERS_TIMEOUT_SEC: f64 = 15f64;
-const BODIES_TIMEOUT_SEC: f64 = 10f64;
-const RECEIPTS_TIMEOUT_SEC: f64 = 10f64;
-const FORK_HEADER_TIMEOUT_SEC: f64 = 3f64;
-const SNAPSHOT_MANIFEST_TIMEOUT_SEC: f64 = 3f64;
-const SNAPSHOT_DATA_TIMEOUT_SEC: f64 = 60f64;
+const MAX_SNAPSHOT_CHUNKS_DOWNLOAD_AHEAD: usize = 3;
+
+const WAIT_PEERS_TIMEOUT_SEC: u64 = 5;
+const STATUS_TIMEOUT_SEC: u64 = 5;
+const HEADERS_TIMEOUT_SEC: u64 = 15;
+const BODIES_TIMEOUT_SEC: u64 = 10;
+const RECEIPTS_TIMEOUT_SEC: u64 = 10;
+const FORK_HEADER_TIMEOUT_SEC: u64 = 3;
+const SNAPSHOT_MANIFEST_TIMEOUT_SEC: u64 = 3;
+const SNAPSHOT_DATA_TIMEOUT_SEC: u64 = 60;
 
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 /// Sync state
 pub enum SyncState {
-	/// Waiting for pv64 peers to start snapshot syncing
+	/// Collecting enough peers to start syncing.
+	WaitingPeers,
+	/// Waiting for snapshot manifest download
 	SnapshotManifest,
 	/// Downloading snapshot data
 	SnapshotData,
-	/// Waiting for snapshot restoration to complete
+	/// Waiting for snapshot restoration progress.
 	SnapshotWaiting,
 	/// Downloading new blocks
 	Blocks,
@@ -276,7 +283,7 @@ struct PeerInfo {
 	/// Holds requested snapshot chunk hash if any.
 	asking_snapshot_data: Option<H256>,
 	/// Request timestamp
-	ask_time: f64,
+	ask_time: u64,
 	/// Holds a set of transactions recently sent to this peer to avoid spamming.
 	last_sent_transactions: HashSet<H256>,
 	/// Pending request is expired and result should be ignored
@@ -324,10 +331,13 @@ pub struct ChainSync {
 	network_id: U256,
 	/// Optional fork block to check
 	fork_block: Option<(BlockNumber, H256)>,
-	/// Snapshot sync allowed.
-	snapshot_sync_enabled: bool,
 	/// Snapshot downloader.
 	snapshot: Snapshot,
+	/// Connected peers pending Status message.
+	/// Value is request timestamp.
+	handshaking_peers: HashMap<PeerId, u64>,
+	/// Sync start timestamp. Measured when first peer is connected
+	sync_start_time: Option<u64>,
 }
 
 type RlpResponseResult = Result<Option<(PacketId, RlpStream)>, PacketDecodeError>;
@@ -337,20 +347,21 @@ impl ChainSync {
 	pub fn new(config: SyncConfig, chain: &BlockChainClient) -> ChainSync {
 		let chain_info = chain.chain_info();
 		let mut sync = ChainSync {
-			state: SyncState::Idle,
+			state: if config.warp_sync { SyncState::WaitingPeers } else { SyncState::Idle },
 			starting_block: chain.chain_info().best_block_number,
 			highest_block: None,
 			peers: HashMap::new(),
+			handshaking_peers: HashMap::new(),
 			active_peers: HashSet::new(),
 			new_blocks: BlockDownloader::new(false, &chain_info.best_block_hash, chain_info.best_block_number),
 			old_blocks: None,
 			last_sent_block_number: 0,
 			network_id: config.network_id,
 			fork_block: config.fork_block,
-			snapshot_sync_enabled: config.warp_sync,
 			snapshot: Snapshot::new(),
+			sync_start_time: None,
 		};
-		sync.init_downloaders(chain);
+		sync.update_targets(chain);
 		sync
 	}
 
@@ -442,20 +453,67 @@ impl ChainSync {
 		self.active_peers.remove(&peer_id);
 	}
 
-	fn start_snapshot_sync(&mut self, io: &mut SyncIo, peer_id: PeerId) {
+	fn maybe_start_snapshot_sync(&mut self, io: &mut SyncIo) {
+		if self.state != SyncState::WaitingPeers {
+			return;
+		}
+		let best_block = io.chain().chain_info().best_block_number;
+
+		let (best_hash, max_peers, snapshot_peers) = {
+			//collect snapshot infos from peers
+			let snapshots = self.peers.iter()
+				.filter(|&(_, p)| p.is_allowed() && p.snapshot_number.map_or(false, |sn| best_block < sn && (sn - best_block) > SNAPSHOT_RESTORE_THRESHOLD))
+				.filter_map(|(p, peer)| peer.snapshot_hash.map(|hash| (p, hash.clone())));
+
+			let mut snapshot_peers = HashMap::new();
+			let mut max_peers: usize = 0;
+			let mut best_hash = None;
+			for (p, hash) in snapshots {
+				let peers = snapshot_peers.entry(hash).or_insert_with(Vec::new);
+				peers.push(*p);
+				if peers.len() > max_peers {
+					max_peers = peers.len();
+					best_hash = Some(hash);
+				}
+			}
+			(best_hash, max_peers, snapshot_peers)
+		};
+
+		let timeout = self.sync_start_time.map_or(false, |t| ((time::precise_time_ns() - t) / 1_000_000_000) > WAIT_PEERS_TIMEOUT_SEC);
+
+		if let (Some(hash), Some(peers)) = (best_hash, best_hash.map_or(None, |h| snapshot_peers.get(&h))) {
+			if max_peers >= SNAPSHOT_MIN_PEERS {
+				trace!(target: "sync", "Starting confirmed snapshot sync {:?} with {:?}", hash, peers);
+				self.start_snapshot_sync(io, peers);
+			} else if timeout {
+				trace!(target: "sync", "Starting unconfirmed snapshot sync {:?} with {:?}", hash, peers);
+				self.start_snapshot_sync(io, peers);
+			}
+		} else if timeout {
+			trace!(target: "sync", "No snapshots found, starting full sync");
+			self.state = SyncState::Idle;
+			self.continue_sync(io);
+		}
+	}
+
+	fn start_snapshot_sync(&mut self, io: &mut SyncIo, peers: &[PeerId]) {
 		self.snapshot.clear();
-		self.request_snapshot_manifest(io, peer_id);
+		for p in peers {
+			if self.peers.get(p).map_or(false, |p| p.asking == PeerAsking::Nothing) {
+				self.request_snapshot_manifest(io, *p);
+			}
+		}
 		self.state = SyncState::SnapshotManifest;
 	}
 
 	/// Restart sync disregarding the block queue status. May end up re-downloading up to QUEUE_SIZE blocks
 	pub fn restart(&mut self, io: &mut SyncIo) {
-		self.init_downloaders(io.chain());
+		self.update_targets(io.chain());
 		self.reset_and_continue(io);
 	}
 
-	/// Restart sync after bad block has been detected. May end up re-downloading up to QUEUE_SIZE blocks
-	fn init_downloaders(&mut self, chain: &BlockChainClient) {
+	/// Update sync after the blockchain has been changed externally.
+	pub fn update_targets(&mut self, chain: &BlockChainClient) {
 		// 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);
@@ -475,6 +533,7 @@ impl ChainSync {
 
 	/// Called by peer to report status
 	fn on_peer_status(&mut self, io: &mut SyncIo, peer_id: PeerId, r: &UntrustedRlp) -> Result<(), PacketDecodeError> {
+		self.handshaking_peers.remove(&peer_id);
 		let protocol_version: u8 = try!(r.val_at(0));
 		let warp_protocol = io.protocol_version(&WARP_SYNC_PROTOCOL_ID, peer_id) != 0;
 		let peer = PeerInfo {
@@ -486,7 +545,7 @@ impl ChainSync {
 			asking: PeerAsking::Nothing,
 			asking_blocks: Vec::new(),
 			asking_hash: None,
-			ask_time: 0f64,
+			ask_time: 0,
 			last_sent_transactions: HashSet::new(),
 			expired: false,
 			confirmation: if self.fork_block.is_none() { ForkConfirmation::Confirmed } else { ForkConfirmation::Unconfirmed },
@@ -496,7 +555,12 @@ impl ChainSync {
 			block_set: None,
 		};
 
-		trace!(target: "sync", "New peer {} (protocol: {}, network: {:?}, difficulty: {:?}, latest:{}, genesis:{})", peer_id, peer.protocol_version, peer.network_id, peer.difficulty, peer.latest_hash, peer.genesis);
+		if self.sync_start_time.is_none() {
+			self.sync_start_time = Some(time::precise_time_ns());
+		}
+
+		trace!(target: "sync", "New peer {} (protocol: {}, network: {:?}, difficulty: {:?}, latest:{}, genesis:{}, snapshot:{:?})",
+			peer_id, peer.protocol_version, peer.network_id, peer.difficulty, peer.latest_hash, peer.genesis, peer.snapshot_number);
 		if io.is_expired() {
 			trace!(target: "sync", "Status packet from expired session {}:{}", peer_id, io.peer_info(peer_id));
 			return Ok(());
@@ -578,7 +642,7 @@ impl ChainSync {
 		}
 		let item_count = r.item_count();
 		trace!(target: "sync", "{} -> BlockHeaders ({} entries), state = {:?}, set = {:?}", peer_id, item_count, self.state, block_set);
-		if self.state == SyncState::Idle && self.old_blocks.is_none() {
+		if (self.state == SyncState::Idle || self.state == SyncState::WaitingPeers) && self.old_blocks.is_none() {
 			trace!(target: "sync", "Ignored unexpected block headers");
 			self.continue_sync(io);
 			return Ok(());
@@ -875,7 +939,7 @@ impl ChainSync {
 		}
 		self.clear_peer_download(peer_id);
 		if !self.reset_peer_asking(peer_id, PeerAsking::SnapshotManifest) || self.state != SyncState::SnapshotManifest {
-			trace!(target: "sync", "{}: Ignored unexpected manifest", peer_id);
+			trace!(target: "sync", "{}: Ignored unexpected/expired manifest", peer_id);
 			self.continue_sync(io);
 			return Ok(());
 		}
@@ -918,7 +982,7 @@ impl ChainSync {
 		match io.snapshot_service().status() {
 			RestorationStatus::Inactive | RestorationStatus::Failed => {
 				trace!(target: "sync", "{}: Snapshot restoration aborted", peer_id);
-				self.state = SyncState::Idle;
+				self.state = SyncState::WaitingPeers;
 				self.snapshot.clear();
 				self.continue_sync(io);
 				return Ok(());
@@ -960,6 +1024,7 @@ impl ChainSync {
 	/// Called by peer when it is disconnecting
 	pub fn on_peer_aborting(&mut self, io: &mut SyncIo, peer: PeerId) {
 		trace!(target: "sync", "== Disconnecting {}: {}", peer, io.peer_info(peer));
+		self.handshaking_peers.remove(&peer);
 		if self.peers.contains_key(&peer) {
 			debug!(target: "sync", "Disconnected {}", peer);
 			self.clear_peer_download(peer);
@@ -975,12 +1040,14 @@ impl ChainSync {
 		if let Err(e) = self.send_status(io, peer) {
 			debug!(target:"sync", "Error sending status request: {:?}", e);
 			io.disable_peer(peer);
+		} else {
+			self.handshaking_peers.insert(peer, time::precise_time_ns());
 		}
 	}
 
 	/// Resume downloading
 	fn continue_sync(&mut self, io: &mut SyncIo) {
-		if self.state != SyncState::Waiting && self.state != SyncState::SnapshotWaiting
+		if (self.state == SyncState::Blocks || self.state == SyncState::NewBlocks || self.state == SyncState::Idle)
 			&& !self.peers.values().any(|p| p.asking != PeerAsking::Nothing && p.block_set != Some(BlockSet::OldBlocks) && p.can_sync()) {
 			self.complete_sync(io);
 		}
@@ -1040,11 +1107,9 @@ impl ChainSync {
 		let higher_difficulty = peer_difficulty.map_or(true, |pd| pd > syncing_difficulty);
 		if force || self.state == SyncState::NewBlocks || higher_difficulty || self.old_blocks.is_some() {
 			match self.state {
-				SyncState::Idle if self.snapshot_sync_enabled
-					&& chain_info.best_block_number < peer_snapshot_number
-					&& (peer_snapshot_number - chain_info.best_block_number) > SNAPSHOT_RESTORE_THRESHOLD => {
-					trace!(target: "sync", "Starting snapshot sync: {} vs {}", peer_snapshot_number, chain_info.best_block_number);
-					self.start_snapshot_sync(io, peer_id);
+				SyncState::WaitingPeers => {
+					trace!(target: "sync", "Checking snapshot sync: {} vs {}", peer_snapshot_number, chain_info.best_block_number);
+					self.maybe_start_snapshot_sync(io);
 				},
 				SyncState::Idle | SyncState::Blocks | SyncState::NewBlocks => {
 					if io.chain().queue_info().is_full() {
@@ -1070,6 +1135,13 @@ impl ChainSync {
 					}
 				},
 				SyncState::SnapshotData => {
+					if let RestorationStatus::Ongoing { state_chunks: _, block_chunks: _, state_chunks_done, block_chunks_done, } = io.snapshot_service().status() {
+						if self.snapshot.done_chunks() - (state_chunks_done + block_chunks_done) as usize > MAX_SNAPSHOT_CHUNKS_DOWNLOAD_AHEAD {
+							trace!(target: "sync", "Snapshot queue full, pausing sync");
+							self.state = SyncState::SnapshotWaiting;
+							return;
+						}
+					}
 					if peer_snapshot_hash.is_some() && peer_snapshot_hash == self.snapshot.snapshot_hash() {
 						self.request_snapshot_data(io, peer_id);
 					}
@@ -1253,7 +1325,7 @@ impl ChainSync {
 				warn!(target:"sync", "Asking {:?} while requesting {:?}", peer.asking, asking);
 			}
 			peer.asking = asking;
-			peer.ask_time = time::precise_time_s();
+			peer.ask_time = time::precise_time_ns();
 			let result = if packet_id >= ETH_PACKET_COUNT {
 				sync.send_protocol(WARP_SYNC_PROTOCOL_ID, peer_id, packet_id, packet)
 			} else {
@@ -1590,17 +1662,18 @@ impl ChainSync {
 
 	#[cfg_attr(feature="dev", allow(match_same_arms))]
 	pub fn maintain_peers(&mut self, io: &mut SyncIo) {
-		let tick = time::precise_time_s();
+		let tick = time::precise_time_ns();
 		let mut aborting = Vec::new();
 		for (peer_id, peer) in &self.peers {
+			let elapsed = (tick - peer.ask_time) / 1_000_000_000;
 			let timeout = match peer.asking {
-				PeerAsking::BlockHeaders => (tick - peer.ask_time) > HEADERS_TIMEOUT_SEC,
-				PeerAsking::BlockBodies => (tick - peer.ask_time) > BODIES_TIMEOUT_SEC,
-				PeerAsking::BlockReceipts => (tick - peer.ask_time) > RECEIPTS_TIMEOUT_SEC,
+				PeerAsking::BlockHeaders => elapsed > HEADERS_TIMEOUT_SEC,
+				PeerAsking::BlockBodies => elapsed > BODIES_TIMEOUT_SEC,
+				PeerAsking::BlockReceipts => elapsed > RECEIPTS_TIMEOUT_SEC,
 				PeerAsking::Nothing => false,
-				PeerAsking::ForkHeader => (tick - peer.ask_time) > FORK_HEADER_TIMEOUT_SEC,
-				PeerAsking::SnapshotManifest => (tick - peer.ask_time) > SNAPSHOT_MANIFEST_TIMEOUT_SEC,
-				PeerAsking::SnapshotData => (tick - peer.ask_time) > SNAPSHOT_DATA_TIMEOUT_SEC,
+				PeerAsking::ForkHeader => elapsed > FORK_HEADER_TIMEOUT_SEC,
+				PeerAsking::SnapshotManifest => elapsed > SNAPSHOT_MANIFEST_TIMEOUT_SEC,
+				PeerAsking::SnapshotData => elapsed > SNAPSHOT_DATA_TIMEOUT_SEC,
 			};
 			if timeout {
 				trace!(target:"sync", "Timeout {}", peer_id);
@@ -1611,16 +1684,42 @@ impl ChainSync {
 		for p in aborting {
 			self.on_peer_aborting(io, p);
 		}
+
+		// Check for handshake timeouts
+		for (peer, ask_time) in &self.handshaking_peers {
+			let elapsed = (tick - ask_time) / 1_000_000_000;
+			if elapsed > STATUS_TIMEOUT_SEC {
+				trace!(target:"sync", "Status timeout {}", peer);
+				io.disconnect_peer(*peer);
+			}
+		}
 	}
 
 	fn check_resume(&mut self, io: &mut SyncIo) {
 		if self.state == SyncState::Waiting && !io.chain().queue_info().is_full() && self.state == SyncState::Waiting {
 			self.state = SyncState::Blocks;
 			self.continue_sync(io);
-		} else if self.state == SyncState::SnapshotWaiting && io.snapshot_service().status() == RestorationStatus::Inactive {
-			trace!(target:"sync", "Snapshot restoration is complete");
-			self.restart(io);
-			self.continue_sync(io);
+		} else if self.state == SyncState::SnapshotWaiting {
+			match io.snapshot_service().status() {
+				RestorationStatus::Inactive => {
+					trace!(target:"sync", "Snapshot restoration is complete");
+					self.restart(io);
+					self.continue_sync(io);
+				},
+				RestorationStatus::Ongoing { state_chunks: _, block_chunks: _, state_chunks_done, block_chunks_done, } => {
+					if !self.snapshot.is_complete() && self.snapshot.done_chunks() - (state_chunks_done + block_chunks_done) as usize <= MAX_SNAPSHOT_CHUNKS_DOWNLOAD_AHEAD {
+						trace!(target:"sync", "Resuming snapshot sync");
+						self.state = SyncState::SnapshotData;
+						self.continue_sync(io);
+					}
+				},
+				RestorationStatus::Failed => {
+					trace!(target: "sync", "Snapshot restoration aborted");
+					self.state = SyncState::WaitingPeers;
+					self.snapshot.clear();
+					self.continue_sync(io);
+				},
+			}
 		}
 	}
 
@@ -1828,6 +1927,7 @@ impl ChainSync {
 
 	/// Maintain other peers. Send out any new blocks and transactions
 	pub fn maintain_sync(&mut self, io: &mut SyncIo) {
+		self.maybe_start_snapshot_sync(io);
 		self.check_resume(io);
 	}
 
@@ -2050,7 +2150,7 @@ mod tests {
 				asking: PeerAsking::Nothing,
 				asking_blocks: Vec::new(),
 				asking_hash: None,
-				ask_time: 0f64,
+				ask_time: 0,
 				last_sent_transactions: HashSet::new(),
 				expired: false,
 				confirmation: super::ForkConfirmation::Confirmed,
diff --git a/sync/src/snapshot.rs b/sync/src/snapshot.rs
index ca9adf220..9f4262105 100644
--- a/sync/src/snapshot.rs
+++ b/sync/src/snapshot.rs
@@ -113,7 +113,7 @@ impl Snapshot {
 	}
 
 	pub fn done_chunks(&self) -> usize {
-		self.total_chunks() - self.completed_chunks.len()
+		self.completed_chunks.len()
 	}
 
 	pub fn is_complete(&self) -> bool {
@@ -165,6 +165,7 @@ mod test {
 		let mut snapshot = Snapshot::new();
 		let (manifest, mhash, state_chunks, block_chunks) = test_manifest();
 		snapshot.reset_to(&manifest, &mhash);
+		assert_eq!(snapshot.done_chunks(), 0);
 		assert!(snapshot.validate_chunk(&H256::random().to_vec()).is_err());
 
 		let requested: Vec<H256> = (0..40).map(|_| snapshot.needed_chunk().unwrap()).collect();
@@ -194,6 +195,8 @@ mod test {
 		}
 
 		assert!(snapshot.is_complete());
+		assert_eq!(snapshot.done_chunks(), 40);
+		assert_eq!(snapshot.done_chunks(), snapshot.total_chunks());
 		assert_eq!(snapshot.snapshot_hash(), Some(manifest.into_rlp().sha3()));
 	}
 }
diff --git a/sync/src/tests/chain.rs b/sync/src/tests/chain.rs
index c54529beb..17c051162 100644
--- a/sync/src/tests/chain.rs
+++ b/sync/src/tests/chain.rs
@@ -18,6 +18,7 @@ use util::*;
 use ethcore::client::{TestBlockChainClient, BlockChainClient, BlockID, EachBlockWith};
 use chain::{SyncState};
 use super::helpers::*;
+use SyncConfig;
 
 #[test]
 fn two_peers() {
@@ -156,6 +157,10 @@ fn restart() {
 fn status_empty() {
 	let net = TestNet::new(2);
 	assert_eq!(net.peer(0).sync.read().status().state, SyncState::Idle);
+	let mut config = SyncConfig::default();
+	config.warp_sync = true;
+	let net = TestNet::new_with_config(2, config);
+	assert_eq!(net.peer(0).sync.read().status().state, SyncState::WaitingPeers);
 }
 
 #[test]
diff --git a/sync/src/tests/helpers.rs b/sync/src/tests/helpers.rs
index 202ab4f17..d5e07a936 100644
--- a/sync/src/tests/helpers.rs
+++ b/sync/src/tests/helpers.rs
@@ -127,20 +127,24 @@ pub struct TestNet {
 
 impl TestNet {
 	pub fn new(n: usize) -> TestNet {
-		Self::new_with_fork(n, None)
+		Self::new_with_config(n, SyncConfig::default())
 	}
 
 	pub fn new_with_fork(n: usize, fork: Option<(BlockNumber, H256)>) -> TestNet {
+		let mut config = SyncConfig::default();
+		config.fork_block = fork;
+		Self::new_with_config(n, config)
+	}
+
+	pub fn new_with_config(n: usize, config: SyncConfig) -> TestNet {
 		let mut net = TestNet {
 			peers: Vec::new(),
 			started: false,
 		};
 		for _ in 0..n {
 			let chain = TestBlockChainClient::new();
-			let mut config = SyncConfig::default();
-			config.fork_block = fork;
 			let ss = Arc::new(TestSnapshotService::new());
-			let sync = ChainSync::new(config, &chain);
+			let sync = ChainSync::new(config.clone(), &chain);
 			net.peers.push(TestPeer {
 				sync: RwLock::new(sync),
 				snapshot_service: ss,
@@ -164,7 +168,7 @@ impl TestNet {
 			for client in 0..self.peers.len() {
 				if peer != client {
 					let mut p = self.peers.get_mut(peer).unwrap();
-					p.sync.write().restart(&mut TestIo::new(&mut p.chain, &p.snapshot_service, &mut p.queue, Some(client as PeerId)));
+					p.sync.write().update_targets(&mut p.chain);
 					p.sync.write().on_peer_connected(&mut TestIo::new(&mut p.chain, &p.snapshot_service, &mut p.queue, Some(client as PeerId)), client as PeerId);
 				}
 			}
diff --git a/sync/src/tests/snapshot.rs b/sync/src/tests/snapshot.rs
index 813513e84..5d0b21b47 100644
--- a/sync/src/tests/snapshot.rs
+++ b/sync/src/tests/snapshot.rs
@@ -19,6 +19,7 @@ use ethcore::snapshot::{SnapshotService, ManifestData, RestorationStatus};
 use ethcore::header::BlockNumber;
 use ethcore::client::{EachBlockWith};
 use super::helpers::*;
+use SyncConfig;
 
 pub struct TestSnapshotService {
 	manifest: Option<ManifestData>,
@@ -122,11 +123,16 @@ impl SnapshotService for TestSnapshotService {
 #[test]
 fn snapshot_sync() {
 	::env_logger::init().ok();
-	let mut net = TestNet::new(2);
-	net.peer_mut(0).snapshot_service = Arc::new(TestSnapshotService::new_with_snapshot(16, H256::new(), 500000));
-	net.peer_mut(0).chain.add_blocks(1, EachBlockWith::Nothing);
-	net.sync_steps(19); // status + manifest + chunks
-	assert_eq!(net.peer(1).snapshot_service.state_restoration_chunks.lock().len(), net.peer(0).snapshot_service.manifest.as_ref().unwrap().state_hashes.len());
-	assert_eq!(net.peer(1).snapshot_service.block_restoration_chunks.lock().len(), net.peer(0).snapshot_service.manifest.as_ref().unwrap().block_hashes.len());
+	let mut config = SyncConfig::default();
+	config.warp_sync = true;
+	let mut net = TestNet::new_with_config(5, config);
+	let snapshot_service = Arc::new(TestSnapshotService::new_with_snapshot(16, H256::new(), 500000));
+	for i in 0..4 {
+		net.peer_mut(i).snapshot_service = snapshot_service.clone();
+		net.peer_mut(i).chain.add_blocks(1, EachBlockWith::Nothing);
+	}
+	net.sync_steps(50);
+	assert_eq!(net.peer(4).snapshot_service.state_restoration_chunks.lock().len(), net.peer(0).snapshot_service.manifest.as_ref().unwrap().state_hashes.len());
+	assert_eq!(net.peer(4).snapshot_service.block_restoration_chunks.lock().len(), net.peer(0).snapshot_service.manifest.as_ref().unwrap().block_hashes.len());
 }
 

From f17cad9dff83a8d9a19af0b294ecb5ec8f456144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Sat, 29 Oct 2016 13:08:49 +0200
Subject: [PATCH 08/42] Fixing clippy warnings 2 (#2961)

---
 ethcore/src/miner/banning_queue.rs     | 4 ++--
 ethcore/src/miner/transaction_queue.rs | 1 +
 ethcore/src/snapshot/account.rs        | 2 +-
 parity/informant.rs                    | 2 +-
 sync/src/chain.rs                      | 2 +-
 util/src/trie/triedb.rs                | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ethcore/src/miner/banning_queue.rs b/ethcore/src/miner/banning_queue.rs
index 0329503bf..f127dc7e8 100644
--- a/ethcore/src/miner/banning_queue.rs
+++ b/ethcore/src/miner/banning_queue.rs
@@ -130,7 +130,7 @@ impl BanningTransactionQueue {
 				// Ban sender
 				let sender_banned = self.ban_sender(sender);
 				// Ban recipient and codehash
-				let is_banned = sender_banned || match transaction.action {
+				let recipient_or_code_banned = match transaction.action {
 					Action::Call(recipient) => {
 						self.ban_recipient(recipient)
 					},
@@ -138,7 +138,7 @@ impl BanningTransactionQueue {
 						self.ban_codehash(transaction.data.sha3())
 					},
 				};
-				is_banned
+				sender_banned || recipient_or_code_banned
 			},
 			None => false,
 		}
diff --git a/ethcore/src/miner/transaction_queue.rs b/ethcore/src/miner/transaction_queue.rs
index f8baf8989..51c1863f6 100644
--- a/ethcore/src/miner/transaction_queue.rs
+++ b/ethcore/src/miner/transaction_queue.rs
@@ -110,6 +110,7 @@ impl PartialOrd for TransactionOrigin {
 }
 
 impl Ord for TransactionOrigin {
+	#[cfg_attr(feature="dev", allow(match_same_arms))]
 	fn cmp(&self, other: &TransactionOrigin) -> Ordering {
 		if *other == *self {
 			return Ordering::Equal;
diff --git a/ethcore/src/snapshot/account.rs b/ethcore/src/snapshot/account.rs
index 7e4585365..38a4028e1 100644
--- a/ethcore/src/snapshot/account.rs
+++ b/ethcore/src/snapshot/account.rs
@@ -178,7 +178,7 @@ impl Account {
 			CodeState::Hash => {
 				let code_hash = try!(rlp.val_at(3));
 				if let Some(code) = code_map.get(&code_hash) {
-					acct_db.emplace(code_hash.clone(), DBValue::from_slice(&code));
+					acct_db.emplace(code_hash.clone(), DBValue::from_slice(code));
 				}
 
 				(code_hash, None)
diff --git a/parity/informant.rs b/parity/informant.rs
index 9b0b6c754..ae59cb9d0 100644
--- a/parity/informant.rs
+++ b/parity/informant.rs
@@ -184,7 +184,7 @@ impl ChainNotify for Informant {
 		let ripe = Instant::now() > *last_import + Duration::from_secs(1) && !importing;
 		let txs_imported = imported.iter()
 			.take(imported.len() - if ripe {1} else {0})
-			.filter_map(|h| self.client.block(BlockID::Hash(h.clone())))
+			.filter_map(|h| self.client.block(BlockID::Hash(*h)))
 			.map(|b| BlockView::new(&b).transactions_count())
 			.sum();
 
diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 06949682b..72df47c07 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -1509,7 +1509,7 @@ impl ChainSync {
 		}
 		trace!(target: "sync", "{} -> GetNodeData: return {} entries", peer_id, added);
 		let mut rlp = RlpStream::new_list(added);
-		for d in data.into_iter() {
+		for d in data {
 			rlp.append(&d);
 		}
 		Ok(Some((NODE_DATA_PACKET, rlp)))
diff --git a/util/src/trie/triedb.rs b/util/src/trie/triedb.rs
index cd8c9939a..d929c9d68 100644
--- a/util/src/trie/triedb.rs
+++ b/util/src/trie/triedb.rs
@@ -133,7 +133,7 @@ impl<'db> TrieDB<'db> {
 	}
 
 	/// Get the data of the root node.
-	fn root_data<'a, R: 'a + Recorder>(&self, r: &'a mut R) -> super::Result<DBValue> {
+	fn root_data<R: Recorder>(&self, r: &mut R) -> super::Result<DBValue> {
 		self.db.get(self.root).ok_or_else(|| Box::new(TrieError::InvalidStateRoot(*self.root)))
 			.map(|node| { r.record(self.root, &*node, 0); node })
 	}

From 227bf4b8c5c69d56a2a37b1404f98f1f0787e513 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Sat, 29 Oct 2016 13:09:16 +0200
Subject: [PATCH 09/42] Run cargo with verbose flag when testing (#2943)

* Run cargo with verbose flag when testing

* use full verbose flag
---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 327d83deb..44bffa7d9 100755
--- a/test.sh
+++ b/test.sh
@@ -2,7 +2,7 @@
 # Running Parity Full Test Sute
 
 FEATURES="json-tests"
-OPTIONS="--release"
+OPTIONS="--verbose --release"
 
 case $1 in
     --no-json)

From 1a258fc0a732c780c8fb7f2344f1eb2f5a236330 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 11:21:07 +0000
Subject: [PATCH 10/42] [ci skip] js-precompiled 20161029-112006

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 870d39fa1..b680687e3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#d35381a1442215c9b21f472c2a644d1ecbe43336"
+source = "git+https://github.com/ethcore/js-precompiled.git#18430becb29cdde5ee3f62ca81c5910e553b5b9b"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 598679000c3cee386e4023001e2fa02828419d70 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 11:29:09 +0000
Subject: [PATCH 11/42] [ci skip] js-precompiled 20161029-112814

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index b680687e3..6dba19a11 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#18430becb29cdde5ee3f62ca81c5910e553b5b9b"
+source = "git+https://github.com/ethcore/js-precompiled.git#897a9afd0a4aa500e2e29e5d978618446a6b6086"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From fe02f93e4cf6b63ab2a64ba8ffa6a128276dfee9 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 11:42:16 +0000
Subject: [PATCH 12/42] [ci skip] js-precompiled 20161029-114119

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 6dba19a11..3df83fb84 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#897a9afd0a4aa500e2e29e5d978618446a6b6086"
+source = "git+https://github.com/ethcore/js-precompiled.git#b65eb2375043a03d425a559910c1a4e5ab71d7d6"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 144930f12cf3541d6d3bf04792eaf16dbfc88152 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Drwi=C4=99ga?= <tomusdrw@users.noreply.github.com>
Date: Sat, 29 Oct 2016 15:31:13 +0200
Subject: [PATCH 13/42] Updating ws-rs (#2962)

---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3df83fb84..845935e56 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -516,7 +516,7 @@ dependencies = [
  "parity-ui 1.4.0",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws 0.5.2 (git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable)",
+ "ws 0.5.3 (git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable)",
 ]
 
 [[package]]
@@ -1884,8 +1884,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "ws"
-version = "0.5.2"
-source = "git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable#00bd2134b07b4bc8ea47b7f6c7afce16bbe34c8f"
+version = "0.5.3"
+source = "git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable#b4538aec81e4c19519469127cece5fe62c88bb04"
 dependencies = [
  "bytes 0.4.0-dev (git+https://github.com/carllerche/bytes)",
  "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2099,7 +2099,7 @@ dependencies = [
 "checksum webpki 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "813503a5985585e0812d430cd1328ee322f47f66629c8ed4ecab939cf9e92f91"
 "checksum winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "4dfaaa8fbdaa618fa6914b59b2769d690dd7521920a18d84b42d254678dd5fd4"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum ws 0.5.2 (git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable)" = "<none>"
+"checksum ws 0.5.3 (git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable)" = "<none>"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum xml-rs 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "65e74b96bd3179209dc70a980da6df843dff09e46eee103a0376c0949257e3ef"
 "checksum xmltree 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "472a9d37c7c53ab2391161df5b89b1f3bf76dab6ab150d7941ecbdd832282082"

From 49a7b84f14d713a8fd1756cfe9f16d786641ad64 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 29 Oct 2016 15:32:10 +0200
Subject: [PATCH 14/42] Pass gas & gasPrice to token transfers (#2964)

---
 js/src/dapps/gavcoin/Actions/ActionBuyIn/actionBuyIn.js | 2 +-
 js/src/modals/Transfer/transfer.js                      | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/js/src/dapps/gavcoin/Actions/ActionBuyIn/actionBuyIn.js b/js/src/dapps/gavcoin/Actions/ActionBuyIn/actionBuyIn.js
index 42de205c1..fe67c3739 100644
--- a/js/src/dapps/gavcoin/Actions/ActionBuyIn/actionBuyIn.js
+++ b/js/src/dapps/gavcoin/Actions/ActionBuyIn/actionBuyIn.js
@@ -43,7 +43,7 @@ export default class ActionBuyIn extends Component {
     accountError: ERRORS.invalidAccount,
     amount: 0,
     amountError: ERRORS.invalidAmount,
-    maxPrice: api.util.fromWei(this.props.price.mul(1.2)).toString(),
+    maxPrice: api.util.fromWei(this.props.price.mul(1.2)).toFixed(0),
     maxPriceError: null,
     sending: false,
     complete: false
diff --git a/js/src/modals/Transfer/transfer.js b/js/src/modals/Transfer/transfer.js
index 2217d0e9c..0ffad525c 100644
--- a/js/src/modals/Transfer/transfer.js
+++ b/js/src/modals/Transfer/transfer.js
@@ -420,13 +420,15 @@ export default class Transfer extends Component {
 
   _sendToken () {
     const { account, balance } = this.props;
-    const { recipient, value, tag } = this.state;
+    const { gas, gasPrice, recipient, value, tag } = this.state;
     const token = balance.tokens.find((balance) => balance.token.tag === tag).token;
 
     return token.contract.instance.transfer
       .postTransaction({
         from: account.address,
-        to: token.address
+        to: token.address,
+        gas,
+        gasPrice
       }, [
         recipient,
         new BigNumber(value).mul(token.format).toFixed(0)
@@ -483,7 +485,7 @@ export default class Transfer extends Component {
         to: token.address
       }, [
         recipient,
-        new BigNumber(value || 0).mul(token.format).toString()
+        new BigNumber(value || 0).mul(token.format).toFixed(0)
       ]);
   }
 

From 3a6c1c377c9a57d11d890cfecdff0f41e6b8f849 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 13:34:58 +0000
Subject: [PATCH 15/42] [ci skip] js-precompiled 20161029-133354

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 845935e56..62fa3d984 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#b65eb2375043a03d425a559910c1a4e5ab71d7d6"
+source = "git+https://github.com/ethcore/js-precompiled.git#39fa4ad1e1775e8f4efed7a94fa21318f8053091"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 99d6d87e78eb960fe9bb17052f95ec521b46cd58 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sat, 29 Oct 2016 17:38:34 +0200
Subject: [PATCH 16/42] Discovery performance optimization (#2972)

---
 util/network/<std macros>     |  0
 util/network/src/discovery.rs | 20 +++++++++++++-------
 util/network/src/host.rs      |  2 +-
 3 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 util/network/<std macros>

diff --git a/util/network/<std macros> b/util/network/<std macros>
new file mode 100644
index 000000000..e69de29bb
diff --git a/util/network/src/discovery.rs b/util/network/src/discovery.rs
index 595ac7605..d9cd7a4d7 100644
--- a/util/network/src/discovery.rs
+++ b/util/network/src/discovery.rs
@@ -57,6 +57,7 @@ pub struct NodeEntry {
 
 pub struct BucketEntry {
 	pub address: NodeEntry,
+	pub id_hash: H256,
 	pub timeout: Option<u64>,
 }
 
@@ -85,6 +86,7 @@ struct Datagramm {
 
 pub struct Discovery {
 	id: NodeId,
+	id_hash: H256,
 	secret: Secret,
 	public_endpoint: NodeEndpoint,
 	udp_socket: UdpSocket,
@@ -109,6 +111,7 @@ impl Discovery {
 		let socket = UdpSocket::bound(&listen).expect("Error binding UDP socket");
 		Discovery {
 			id: key.public().clone(),
+			id_hash: key.public().sha3(),
 			secret: key.secret().clone(),
 			public_endpoint: public,
 			token: token,
@@ -150,8 +153,9 @@ impl Discovery {
 
 	fn update_node(&mut self, e: NodeEntry) {
 		trace!(target: "discovery", "Inserting {:?}", &e);
+		let id_hash = e.id.sha3();
 		let ping = {
-			let mut bucket = self.node_buckets.get_mut(Discovery::distance(&self.id, &e.id) as usize).unwrap();
+			let mut bucket = self.node_buckets.get_mut(Discovery::distance(&self.id_hash, &id_hash) as usize).unwrap();
 			let updated = if let Some(node) = bucket.nodes.iter_mut().find(|n| n.address.id == e.id) {
 				node.address = e.clone();
 				node.timeout = None;
@@ -159,7 +163,7 @@ impl Discovery {
 			} else { false };
 
 			if !updated {
-				bucket.nodes.push_front(BucketEntry { address: e, timeout: None });
+				bucket.nodes.push_front(BucketEntry { address: e, timeout: None, id_hash: id_hash, });
 			}
 
 			if bucket.nodes.len() > BUCKET_SIZE {
@@ -174,7 +178,7 @@ impl Discovery {
 	}
 
 	fn clear_ping(&mut self, id: &NodeId) {
-		let mut bucket = self.node_buckets.get_mut(Discovery::distance(&self.id, id) as usize).unwrap();
+		let mut bucket = self.node_buckets.get_mut(Discovery::distance(&self.id_hash, &id.sha3()) as usize).unwrap();
 		if let Some(node) = bucket.nodes.iter_mut().find(|n| &n.address.id == id) {
 			node.timeout = None;
 		}
@@ -224,8 +228,8 @@ impl Discovery {
 		self.discovery_round += 1;
 	}
 
-	fn distance(a: &NodeId, b: &NodeId) -> u32 {
-		let d = a.sha3() ^ b.sha3();
+	fn distance(a: &H256, b: &H256) -> u32 {
+		let d = *a ^ *b;
 		let mut ret:u32 = 0;
 		for i in 0..32 {
 			let mut v: u8 = d[i];
@@ -279,11 +283,12 @@ impl Discovery {
 	fn nearest_node_entries(target: &NodeId, buckets: &[NodeBucket]) -> Vec<NodeEntry> {
 		let mut found: BTreeMap<u32, Vec<&NodeEntry>> = BTreeMap::new();
 		let mut count = 0;
+		let target_hash = target.sha3();
 
 		// Sort nodes by distance to target
 		for bucket in buckets {
 			for node in &bucket.nodes {
-				let distance = Discovery::distance(target, &node.address.id);
+				let distance = Discovery::distance(&target_hash, &node.id_hash);
 				found.entry(distance).or_insert_with(Vec::new).push(&node.address);
 				if count == BUCKET_SIZE {
 					// delete the most distant element
@@ -626,7 +631,8 @@ mod tests {
 		for _ in 0..(16 + 10) {
 			buckets[0].nodes.push_back(BucketEntry {
 				address: NodeEntry { id: NodeId::new(), endpoint: ep.clone() },
-				timeout: None
+				timeout: None,
+				id_hash: NodeId::new().sha3(),
 			});
 		}
 		let nearest = Discovery::nearest_node_entries(&NodeId::new(), &buckets);
diff --git a/util/network/src/host.rs b/util/network/src/host.rs
index 177a44843..d6e530d6f 100644
--- a/util/network/src/host.rs
+++ b/util/network/src/host.rs
@@ -61,7 +61,7 @@ const SYS_TIMER: usize = LAST_SESSION + 1;
 
 // Timeouts
 const MAINTENANCE_TIMEOUT: u64 = 1000;
-const DISCOVERY_REFRESH_TIMEOUT: u64 = 7200;
+const DISCOVERY_REFRESH_TIMEOUT: u64 = 60_000;
 const DISCOVERY_ROUND_TIMEOUT: u64 = 300;
 const NODE_TABLE_TIMEOUT: u64 = 300_000;
 

From c342fa3035c729d8c9826e5a4ff27a6c4b612d14 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sat, 29 Oct 2016 17:38:50 +0200
Subject: [PATCH 17/42] WS bump (#2973)

---
 Cargo.lock | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 62fa3d984..296c17c31 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -990,7 +990,7 @@ dependencies = [
 [[package]]
 name = "mio"
 version = "0.6.0-dev"
-source = "git+https://github.com/carllerche/mio?rev=62ec763c9cc34d8a452ed0392c575c50ddd5fc8d#62ec763c9cc34d8a452ed0392c575c50ddd5fc8d"
+source = "git+https://github.com/ethcore/mio?branch=timer-fix#31eccc40ece3d47abaefaf23bb2114033175b972"
 dependencies = [
  "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1885,12 +1885,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 [[package]]
 name = "ws"
 version = "0.5.3"
-source = "git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable#b4538aec81e4c19519469127cece5fe62c88bb04"
+source = "git+https://github.com/ethcore/ws-rs.git?branch=mio-upstream-stable#0cd6c5e3e9d5e61a37d53eb8dcbad523dcc69314"
 dependencies = [
  "bytes 0.4.0-dev (git+https://github.com/carllerche/bytes)",
  "httparse 1.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.6.0-dev (git+https://github.com/carllerche/mio?rev=62ec763c9cc34d8a452ed0392c575c50ddd5fc8d)",
+ "mio 0.6.0-dev (git+https://github.com/ethcore/mio?branch=timer-fix)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.2.0 (git+https://github.com/carllerche/slab?rev=5476efcafb)",
@@ -1996,7 +1996,7 @@ dependencies = [
 "checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54"
 "checksum mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)" = "<none>"
 "checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
-"checksum mio 0.6.0-dev (git+https://github.com/carllerche/mio?rev=62ec763c9cc34d8a452ed0392c575c50ddd5fc8d)" = "<none>"
+"checksum mio 0.6.0-dev (git+https://github.com/ethcore/mio?branch=timer-fix)" = "<none>"
 "checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a"
 "checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8"
 "checksum nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)" = "<none>"

From 4d1cfd67068d696533aece48c594d438d1a6fdde Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 29 Oct 2016 17:39:08 +0200
Subject: [PATCH 18/42] Align password change dialog with create (#2970)

---
 .../PasswordManager/passwordManager.css       | 10 +++++
 .../modals/PasswordManager/passwordManager.js | 44 ++++++++++---------
 2 files changed, 34 insertions(+), 20 deletions(-)

diff --git a/js/src/modals/PasswordManager/passwordManager.css b/js/src/modals/PasswordManager/passwordManager.css
index aa0f72cb3..f538ef546 100644
--- a/js/src/modals/PasswordManager/passwordManager.css
+++ b/js/src/modals/PasswordManager/passwordManager.css
@@ -46,6 +46,16 @@
   font-size: 1.1rem;
 }
 
+.passwords {
+  display: flex;
+  flex-wrap: wrap;
+}
+
+.password {
+  flex: 0 1 50%;
+  width: 50%;
+}
+
 .passwordHint {
   font-size: 0.9rem;
   color: lightgrey;
diff --git a/js/src/modals/PasswordManager/passwordManager.js b/js/src/modals/PasswordManager/passwordManager.js
index 800fba929..368664a71 100644
--- a/js/src/modals/PasswordManager/passwordManager.js
+++ b/js/src/modals/PasswordManager/passwordManager.js
@@ -181,33 +181,37 @@ export default class PasswordManager extends Component {
                 disabled={ disabled }
                 onSubmit={ this.handleChangePassword }
                 onChange={ this.onEditCurrent } />
-
               <Input
-                label='new password'
-                hint='the new password for this account'
-                type='password'
-                submitOnBlur={ false }
-                disabled={ disabled }
-                onSubmit={ this.handleChangePassword }
-                onChange={ this.onEditNew } />
-              <Input
-                label='repeat new password'
-                hint='repeat the new password for this account'
-                type='password'
-                submitOnBlur={ false }
-                error={ repeatError }
-                disabled={ disabled }
-                onSubmit={ this.handleChangePassword }
-                onChange={ this.onEditRepeatNew } />
-
-              <Input
-                label='new password hint'
+                label='(optional) new password hint'
                 hint='hint for the new password'
                 submitOnBlur={ false }
                 value={ passwordHint }
                 disabled={ disabled }
                 onSubmit={ this.handleChangePassword }
                 onChange={ this.onEditHint } />
+              <div className={ styles.passwords }>
+                <div className={ styles.password }>
+                  <Input
+                    label='new password'
+                    hint='the new password for this account'
+                    type='password'
+                    submitOnBlur={ false }
+                    disabled={ disabled }
+                    onSubmit={ this.handleChangePassword }
+                    onChange={ this.onEditNew } />
+                </div>
+                <div className={ styles.password }>
+                  <Input
+                    label='repeat new password'
+                    hint='repeat the new password for this account'
+                    type='password'
+                    submitOnBlur={ false }
+                    error={ repeatError }
+                    disabled={ disabled }
+                    onSubmit={ this.handleChangePassword }
+                    onChange={ this.onEditRepeatNew } />
+                </div>
+              </div>
             </div>
           </Form>
         </Tab>

From e2b82e1e377fe5c7ade90bb5f989fd725ed87587 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 15:44:04 +0000
Subject: [PATCH 19/42] [ci skip] js-precompiled 20161029-154241

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 296c17c31..25343f4f9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#39fa4ad1e1775e8f4efed7a94fa21318f8053091"
+source = "git+https://github.com/ethcore/js-precompiled.git#293affdf3aa7735862d5a83a4b1f1edc7edd5936"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From fca545ce9822cb24a2b51845cebb292bc6842540 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Sat, 29 Oct 2016 17:59:27 +0200
Subject: [PATCH 20/42] Removed junk file

---
 util/network/<std macros> | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 util/network/<std macros>

diff --git a/util/network/<std macros> b/util/network/<std macros>
deleted file mode 100644
index e69de29bb..000000000

From c24ac577fb2c5feaaac5e7f4223874f1afd01fca Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 16:01:29 +0000
Subject: [PATCH 21/42] [ci skip] js-precompiled 20161029-160033

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 25343f4f9..b4477e976 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#293affdf3aa7735862d5a83a4b1f1edc7edd5936"
+source = "git+https://github.com/ethcore/js-precompiled.git#5c2278c4456a82229069f13b16ebf5bdb630e34c"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From e304a2f3fe95b4bc0352299182e7c640630a65a9 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sat, 29 Oct 2016 19:06:33 +0200
Subject: [PATCH 22/42] Add favicon (#2974)

* Add favicon.ico

* Add favicon to all html pages

* Cleanup favicon background
---
 js/assets/images/ethcore-block-black.png | Bin 0 -> 11783 bytes
 js/assets/images/parity.ico              | Bin 0 -> 1150 bytes
 js/src/dapps/basiccoin.html              |   1 +
 js/src/dapps/gavcoin.html                |   1 +
 js/src/dapps/githubhint.html             |   1 +
 js/src/dapps/registry.html               |   1 +
 js/src/dapps/signaturereg.html           |   1 +
 js/src/dapps/tokenreg.html               |   1 +
 js/src/dev.parity.html                   |   1 +
 js/src/dev.web3.html                     |   1 +
 js/src/index.html                        |   1 +
 js/src/index.js                          |   2 ++
 js/webpack.config.js                     |   6 +++++-
 13 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 js/assets/images/ethcore-block-black.png
 create mode 100644 js/assets/images/parity.ico

diff --git a/js/assets/images/ethcore-block-black.png b/js/assets/images/ethcore-block-black.png
new file mode 100644
index 0000000000000000000000000000000000000000..780a5be5c6d2de859db903bb565e659e5dd1e2e4
GIT binary patch
literal 11783
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

literal 0
HcmV?d00001

diff --git a/js/assets/images/parity.ico b/js/assets/images/parity.ico
new file mode 100644
index 0000000000000000000000000000000000000000..4551b46bede66e0130b4c248e9c21cc0b5150153
GIT binary patch
literal 1150
zcmZuwOHUeM6unKFxU5N&uG?L^?yu+{X_}C@Gj7}%SO_a=y6Hj|7!^fLjD&}Y0Rluo
z5~D^z;|rpYpdiRY<aIjdnrUt8OzzA#=ey^-=RQW{m2r=bit&6e-(HKn6OoUG8IXZI
z;l}I53xLpu!=b+K?(UFErLeiViLtRUSS%KVLLtSt_uThi?#amsW@l%yzrT-YG^!Sh
z#Sn=^aBy${m&=7*F8AUYkB^UE=jP_n?RKTvY{Kn!gYjy$8i?QD-=p8}3)c@14|)dU
z4+aC(O}&{+M)Bq4Wt^Rzsb9O@#>K@2JRXnk?e6X(7!2y#<d#Y$%+Jp&mP{tGwY8<O
zI-O32#<<~d7>PteeHIrNadma2YvUoStE;%VxdC-AEiHkZMx*h2pKInvUG;h$)oK+h
zD=WIcx3{Ny&d<+bv)Mp>tU<5W)4X^-*W|OVR;v}Kr>EK<`c6ztXl~rQy}iZ4!h&ii
z@3}Eo>ZVTif?CGM$6>eI(Q36+3;kKg?d@&-CdaH%I-N!!5Kx@6!XA)IoV777DVNJ&
zy{UnHBSvHIh%pX*h;cs5IMia|%=7s880+in>PO#=jSXb8S*;6WS1J{)GxunPLIGZ{
zSN&OQYF=AgLq4C^KCwT<%%1R@GeNGIpWpA-x)5V->=XTHoI`Ww4i69E^ZEYblEd6M
zn>>&C?(FQq;c#GjdRlA5dQdxkOdaIWObz@uCMPE`Gc$vDJgzfOU(TJ=>D0ZWqoe;~
z^9=L<Ef$L!kG<l|)41k8eSLkcT+^4l+8dF}5s~EEC;R?IWNJ!eBx2a5$mfj62b+lV
Nr^t^_fBeWH_ZMu!LJt4{

literal 0
HcmV?d00001

diff --git a/js/src/dapps/basiccoin.html b/js/src/dapps/basiccoin.html
index 7ac5cb3cb..315a10818 100644
--- a/js/src/dapps/basiccoin.html
+++ b/js/src/dapps/basiccoin.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>Basic Token Deployment</title>
   </head>
   <body>
diff --git a/js/src/dapps/gavcoin.html b/js/src/dapps/gavcoin.html
index f777f2920..3b260bce1 100644
--- a/js/src/dapps/gavcoin.html
+++ b/js/src/dapps/gavcoin.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>GAVcoin</title>
   </head>
   <body>
diff --git a/js/src/dapps/githubhint.html b/js/src/dapps/githubhint.html
index 085b15953..4689fd7d9 100644
--- a/js/src/dapps/githubhint.html
+++ b/js/src/dapps/githubhint.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>GitHub Hint</title>
   </head>
   <body>
diff --git a/js/src/dapps/registry.html b/js/src/dapps/registry.html
index 83c5e8c9b..512932a0a 100644
--- a/js/src/dapps/registry.html
+++ b/js/src/dapps/registry.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>Token Registry</title>
   </head>
   <body>
diff --git a/js/src/dapps/signaturereg.html b/js/src/dapps/signaturereg.html
index be62400d2..3929b425c 100644
--- a/js/src/dapps/signaturereg.html
+++ b/js/src/dapps/signaturereg.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>Method Signature Registry</title>
   </head>
   <body>
diff --git a/js/src/dapps/tokenreg.html b/js/src/dapps/tokenreg.html
index bcf04e298..8510aa817 100644
--- a/js/src/dapps/tokenreg.html
+++ b/js/src/dapps/tokenreg.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>Token Registry</title>
   </head>
   <body>
diff --git a/js/src/dev.parity.html b/js/src/dev.parity.html
index 56811f7c2..c2eb392d3 100644
--- a/js/src/dev.parity.html
+++ b/js/src/dev.parity.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>dev::Parity.js</title>
   </head>
   <body>
diff --git a/js/src/dev.web3.html b/js/src/dev.web3.html
index e55e0109b..ced98fca7 100644
--- a/js/src/dev.web3.html
+++ b/js/src/dev.web3.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>dev::Web3</title>
   </head>
   <body>
diff --git a/js/src/index.html b/js/src/index.html
index 4ca2e7c1a..397a827d0 100644
--- a/js/src/index.html
+++ b/js/src/index.html
@@ -4,6 +4,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <link rel="icon" href="parity.ico" type="image/x-icon">
     <title>Parity</title>
     <style>
       html, body, #container {
diff --git a/js/src/index.js b/js/src/index.js
index 24649b026..48ec7488b 100644
--- a/js/src/index.js
+++ b/js/src/index.js
@@ -39,6 +39,8 @@ import './environment';
 
 import '../assets/fonts/Roboto/font.css';
 import '../assets/fonts/RobotoMono/font.css';
+import '../assets/images/parity.ico';
+
 import styles from './reset.css';
 import './index.html';
 
diff --git a/js/webpack.config.js b/js/webpack.config.js
index d253b6592..299e24dbb 100644
--- a/js/webpack.config.js
+++ b/js/webpack.config.js
@@ -83,9 +83,13 @@ module.exports = {
         loader: 'style!css'
       },
       {
-        test: /\.(png|jpg|)$/,
+        test: /\.(png|jpg)$/,
         loader: 'file-loader'
       },
+      {
+        test: /\.ico$/,
+        loader: 'file-loader?name=[name].[ext]'
+      },
       {
         test: /\.(woff(2)|ttf|eot|svg|otf)(\?v=[0-9]\.[0-9]\.[0-9])?$/,
         loader: 'file-loader'

From ffb9cc7b187755a8b66af9cefcec78ad431ff8e4 Mon Sep 17 00:00:00 2001
From: arkpar <arkady.paronyan@gmail.com>
Date: Sat, 29 Oct 2016 20:41:07 +0200
Subject: [PATCH 23/42] Fixed build

---
 util/network/src/discovery.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/util/network/src/discovery.rs b/util/network/src/discovery.rs
index d9cd7a4d7..0aa775031 100644
--- a/util/network/src/discovery.rs
+++ b/util/network/src/discovery.rs
@@ -551,6 +551,7 @@ impl Discovery {
 mod tests {
 	use super::*;
 	use util::hash::*;
+	use util::sha3::*;
 	use std::net::*;
 	use node_table::*;
 	use std::str::FromStr;

From 5a8cee955796433fb27013c5094bc8529d89e241 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 18:57:56 +0000
Subject: [PATCH 24/42] [ci skip] js-precompiled 20161029-185701

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index b4477e976..d30bdc367 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#5c2278c4456a82229069f13b16ebf5bdb630e34c"
+source = "git+https://github.com/ethcore/js-precompiled.git#17314713f81057d20767ca45f7676998e7be142e"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 8796574e5afe12ed7cd62c4b487d298cb33a615a Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sat, 29 Oct 2016 21:27:53 +0200
Subject: [PATCH 25/42] Use separate lock for code cache (#2977)

---
 ethcore/src/state_db.rs | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/ethcore/src/state_db.rs b/ethcore/src/state_db.rs
index affc0b405..3506b8951 100644
--- a/ethcore/src/state_db.rs
+++ b/ethcore/src/state_db.rs
@@ -43,8 +43,6 @@ struct AccountCache {
 	// When changing the type of the values here, be sure to update `mem_used` and
 	// `new`.
 	accounts: LruCache<Address, Option<Account>>,
-	/// DB Code cache. Maps code hashes to shared bytes.
-	code: MemoryLruCache<H256, Arc<Vec<u8>>>,
 	/// Information on the modifications in recently committed blocks; specifically which addresses
 	/// changed in which block. Ordered by block number.
 	modifications: VecDeque<BlockChanges>,
@@ -95,6 +93,8 @@ pub struct StateDB {
 	db: Box<JournalDB>,
 	/// Shared canonical state cache.
 	account_cache: Arc<Mutex<AccountCache>>,
+	/// DB Code cache. Maps code hashes to shared bytes.
+	code_cache: Arc<Mutex<MemoryLruCache<H256, Arc<Vec<u8>>>>>,
 	/// Local dirty cache.
 	local_cache: Vec<CacheQueueItem>,
 	/// Shared account bloom. Does not handle chain reorganizations.
@@ -125,9 +125,9 @@ impl StateDB {
 			db: db,
 			account_cache: Arc::new(Mutex::new(AccountCache {
 				accounts: LruCache::new(cache_items),
-				code: MemoryLruCache::new(code_cache_size),
 				modifications: VecDeque::new(),
 			})),
+			code_cache: Arc::new(Mutex::new(MemoryLruCache::new(code_cache_size))),
 			local_cache: Vec::new(),
 			account_bloom: Arc::new(Mutex::new(bloom)),
 			cache_size: cache_size,
@@ -320,6 +320,7 @@ impl StateDB {
 		StateDB {
 			db: self.db.boxed_clone(),
 			account_cache: self.account_cache.clone(),
+			code_cache: self.code_cache.clone(),
 			local_cache: Vec::new(),
 			account_bloom: self.account_bloom.clone(),
 			cache_size: self.cache_size,
@@ -334,6 +335,7 @@ impl StateDB {
 		StateDB {
 			db: self.db.boxed_clone(),
 			account_cache: self.account_cache.clone(),
+			code_cache: self.code_cache.clone(),
 			local_cache: Vec::new(),
 			account_bloom: self.account_bloom.clone(),
 			cache_size: self.cache_size,
@@ -352,10 +354,9 @@ impl StateDB {
 	pub fn mem_used(&self) -> usize {
 		// TODO: account for LRU-cache overhead; this is a close approximation.
 		self.db.mem_used() + {
-			let cache = self.account_cache.lock();
-
-			cache.code.current_size() +
-				cache.accounts.len() * ::std::mem::size_of::<Option<Account>>()
+			let accounts = self.account_cache.lock().accounts.len();
+			let code_size = self.code_cache.lock().current_size();
+			code_size + accounts * ::std::mem::size_of::<Option<Account>>()
 		}
 	}
 
@@ -380,9 +381,9 @@ impl StateDB {
 	/// it simply maps hashes to raw code and will always be correct in the absence of
 	/// hash collisions.
 	pub fn cache_code(&self, hash: H256, code: Arc<Vec<u8>>) {
-		let mut cache = self.account_cache.lock();
+		let mut cache = self.code_cache.lock();
 
-		cache.code.insert(hash, code);
+		cache.insert(hash, code);
 	}
 
 	/// Get basic copy of the cached account. Does not include storage.
@@ -397,9 +398,9 @@ impl StateDB {
 
 	/// Get cached code based on hash.
 	pub fn get_cached_code(&self, hash: &H256) -> Option<Arc<Vec<u8>>> {
-		let mut cache = self.account_cache.lock();
+		let mut cache = self.code_cache.lock();
 
-		cache.code.get_mut(hash).map(|code| code.clone())
+		cache.get_mut(hash).map(|code| code.clone())
 	}
 
 	/// Get value from a cached account.

From 222b2b70ea797270613d68eb7d285aeb710c073e Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sat, 29 Oct 2016 19:29:59 +0000
Subject: [PATCH 26/42] [ci skip] js-precompiled 20161029-192902

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index d30bdc367..184bf27fa 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#17314713f81057d20767ca45f7676998e7be142e"
+source = "git+https://github.com/ethcore/js-precompiled.git#3964ffa5ab19dc08694c301ce7f268d008413f3e"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From 86c0dbeedc79864fb2fda1922d42556336810ab2 Mon Sep 17 00:00:00 2001
From: Jannis Redmann <mail@jannisr.de>
Date: Sun, 30 Oct 2016 09:37:15 +0100
Subject: [PATCH 27/42] refactor etherscan.io links (#2896)

* use proper querystring builder

* etherscan.txLink helper

* refactor to etherscan.txLink

* etherscan.addressLink helper

* refactor to etherscan.addressLink

* move txLink & addressLink into common file
---
 js/package.json                               |  1 +
 js/src/3rdparty/etherscan/call.js             | 17 +++++-------
 js/src/3rdparty/etherscan/index.js            |  5 +++-
 .../etherscan/links.js}                       | 12 +++++----
 js/src/ui/TxHash/txHash.js                    |  4 +--
 .../Transactions/Transaction/transaction.js   | 24 +++++++++--------
 js/src/views/Contract/Events/Event/event.js   |  3 ++-
 .../Account/AccountLink/AccountLink.js        |  4 +--
 .../TransactionFinished.js                    |  5 ++--
 .../components/TxHashLink/TxHashLink.js       | 26 +++----------------
 .../views/Signer/components/util/account.js   | 25 ------------------
 .../Signer/components/util/transaction.js     |  8 ------
 12 files changed, 44 insertions(+), 90 deletions(-)
 rename js/src/{views/Signer/components/constants/constants.js => 3rdparty/etherscan/links.js} (68%)
 delete mode 100644 js/src/views/Signer/components/util/account.js

diff --git a/js/package.json b/js/package.json
index bafb3efcd..12244daa5 100644
--- a/js/package.json
+++ b/js/package.json
@@ -125,6 +125,7 @@
     "material-ui": "^0.16.1",
     "material-ui-chip-input": "^0.8.0",
     "moment": "^2.14.1",
+    "qs": "^6.3.0",
     "react": "^15.2.1",
     "react-addons-css-transition-group": "^15.2.1",
     "react-dom": "^15.2.1",
diff --git a/js/src/3rdparty/etherscan/call.js b/js/src/3rdparty/etherscan/call.js
index 1324bcc9d..5c6cd5945 100644
--- a/js/src/3rdparty/etherscan/call.js
+++ b/js/src/3rdparty/etherscan/call.js
@@ -14,6 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+import { stringify } from 'qs';
+
 const options = {
   method: 'GET',
   headers: {
@@ -23,19 +25,14 @@ const options = {
 
 export function call (module, action, _params, test) {
   const host = test ? 'testnet.etherscan.io' : 'api.etherscan.io';
-  let params = '';
 
-  if (_params) {
-    Object.keys(_params).map((param) => {
-      const value = _params[param];
+  const query = stringify(Object.assign({
+    module, action
+  }, _params || {}));
 
-      params = `${params}&${param}=${value}`;
-    });
-  }
-
-  return fetch(`http://${host}/api?module=${module}&action=${action}${params}`, options)
+  return fetch(`https://${host}/api?${query}`, options)
     .then((response) => {
-      if (response.status !== 200) {
+      if (!response.ok) {
         throw { code: response.status, message: response.statusText }; // eslint-disable-line
       }
 
diff --git a/js/src/3rdparty/etherscan/index.js b/js/src/3rdparty/etherscan/index.js
index 55aeba473..ada1503cd 100644
--- a/js/src/3rdparty/etherscan/index.js
+++ b/js/src/3rdparty/etherscan/index.js
@@ -16,10 +16,13 @@
 
 import { account } from './account';
 import { stats } from './stats';
+import { txLink, addressLink } from './links';
 
 const etherscan = {
   account: account,
-  stats: stats
+  stats: stats,
+  txLink: txLink,
+  addressLink: addressLink
 };
 
 export default etherscan;
diff --git a/js/src/views/Signer/components/constants/constants.js b/js/src/3rdparty/etherscan/links.js
similarity index 68%
rename from js/src/views/Signer/components/constants/constants.js
rename to js/src/3rdparty/etherscan/links.js
index c02384775..2745873fc 100644
--- a/js/src/views/Signer/components/constants/constants.js
+++ b/js/src/3rdparty/etherscan/links.js
@@ -14,8 +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/>.
 
-// links to chain explorers
-export const BASE_LINK_ACCOUNT_MORDEN = 'https://testnet.etherscan.io/address/';
-export const BASE_LINK_ACCOUNT_HOMESTEAD = 'https://etherscan.io/address/';
-export const BASE_LINK_TX_MORDEN = 'https://testnet.etherscan.io/tx/';
-export const BASE_LINK_TX_HOMESTEAD = 'https://etherscan.io/tx/';
+export const txLink = (hash, isTestnet = false) => {
+  return `https://${isTestnet ? 'testnet.' : ''}etherscan.io/tx/${hash}`;
+};
+
+export const addressLink = (address, isTestnet = false) => {
+  return `https://${isTestnet ? 'testnet.' : ''}etherscan.io/address/${address}`;
+};
diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js
index 7b2080463..fa6304d18 100644
--- a/js/src/ui/TxHash/txHash.js
+++ b/js/src/ui/TxHash/txHash.js
@@ -19,6 +19,7 @@ import React, { Component, PropTypes } from 'react';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 import { LinearProgress } from 'material-ui';
+import { txLink } from '../../3rdparty/etherscan/links';
 
 import styles from './txHash.css';
 
@@ -55,7 +56,6 @@ class TxHash extends Component {
 
   render () {
     const { hash, isTest } = this.props;
-    const link = `https://${isTest ? 'testnet.' : ''}etherscan.io/tx/${hash}`;
 
     return (
       <div className={ styles.details }>
@@ -63,7 +63,7 @@ class TxHash extends Component {
           The transaction has been posted to the network with a transaction hash of
         </div>
         <div className={ styles.hash }>
-          <a href={ link } target='_blank'>{ hash }</a>
+          <a href={ txLink(hash, isTest) } target='_blank'>{ hash }</a>
         </div>
         { this.renderConfirmations() }
       </div>
diff --git a/js/src/views/Account/Transactions/Transaction/transaction.js b/js/src/views/Account/Transactions/Transaction/transaction.js
index 7cf2bce31..3eed8bbfb 100644
--- a/js/src/views/Account/Transactions/Transaction/transaction.js
+++ b/js/src/views/Account/Transactions/Transaction/transaction.js
@@ -23,6 +23,7 @@ import { bindActionCreators } from 'redux';
 import { fetchBlock, fetchTransaction } from '../../../../redux/providers/blockchainActions';
 
 import { IdentityIcon, IdentityName, MethodDecoding } from '../../../../ui';
+import { txLink, addressLink } from '../../../../3rdparty/etherscan/links';
 
 import styles from '../transactions.css';
 
@@ -55,9 +56,7 @@ class Transaction extends Component {
   }
 
   render () {
-    const { block, transaction, isTest } = this.props;
-
-    const prefix = `https://${isTest ? 'testnet.' : ''}etherscan.io/`;
+    const { block, transaction } = this.props;
 
     return (
       <tr>
@@ -65,9 +64,9 @@ class Transaction extends Component {
           <div>{ this.formatBlockTimestamp(block) }</div>
           <div>{ this.formatNumber(transaction.blockNumber) }</div>
         </td>
-        { this.renderAddress(prefix, transaction.from) }
+        { this.renderAddress(transaction.from) }
         { this.renderTransaction() }
-        { this.renderAddress(prefix, transaction.to) }
+        { this.renderAddress(transaction.to) }
         <td className={ styles.method }>
           { this.renderMethod() }
         </td>
@@ -93,15 +92,16 @@ class Transaction extends Component {
   renderTransaction () {
     const { transaction, isTest } = this.props;
 
-    const prefix = `https://${isTest ? 'testnet.' : ''}etherscan.io/`;
-    const hashLink = `${prefix}tx/${transaction.hash}`;
-
     return (
       <td className={ styles.transaction }>
         { this.renderEtherValue() }
         <div>⇒</div>
         <div>
-          <a href={ hashLink } target='_blank' className={ styles.link }>
+          <a
+            className={ styles.link }
+            href={ txLink(transaction.hash, isTest) }
+            target='_blank'
+          >
             { this.formatHash(transaction.hash) }
           </a>
         </div>
@@ -109,10 +109,12 @@ class Transaction extends Component {
     );
   }
 
-  renderAddress (prefix, address) {
+  renderAddress (address) {
+    const { isTest } = this.props;
+
     const eslink = address ? (
       <a
-        href={ `${prefix}address/${address}` }
+        href={ addressLink(address, isTest) }
         target='_blank'
         className={ styles.link }>
         <IdentityName address={ address } shorten />
diff --git a/js/src/views/Contract/Events/Event/event.js b/js/src/views/Contract/Events/Event/event.js
index cfe5be251..bf9bf593c 100644
--- a/js/src/views/Contract/Events/Event/event.js
+++ b/js/src/views/Contract/Events/Event/event.js
@@ -22,6 +22,7 @@ import { bindActionCreators } from 'redux';
 
 import { fetchBlock, fetchTransaction } from '../../../../redux/providers/blockchainActions';
 import { IdentityIcon, IdentityName, Input, InputAddress } from '../../../../ui';
+import { txLink } from '../../../../3rdparty/etherscan/links';
 
 import styles from '../../contract.css';
 
@@ -49,7 +50,7 @@ class Event extends Component {
     const block = blocks[event.blockNumber.toString()];
     const transaction = transactions[event.transactionHash] || {};
     const classes = `${styles.event} ${styles[event.state]}`;
-    const url = `https://${isTest ? 'testnet.' : ''}etherscan.io/tx/${event.transactionHash}`;
+    const url = txLink(event.transactionHash, isTest);
     const keys = Object.keys(event.params).join(', ');
     const values = Object.keys(event.params).map((name, index) => {
       const param = event.params[name];
diff --git a/js/src/views/Signer/components/Account/AccountLink/AccountLink.js b/js/src/views/Signer/components/Account/AccountLink/AccountLink.js
index 8cf041fda..4e3c0a0a9 100644
--- a/js/src/views/Signer/components/Account/AccountLink/AccountLink.js
+++ b/js/src/views/Signer/components/Account/AccountLink/AccountLink.js
@@ -16,7 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 
-import { getAccountLink } from '../../util/account';
+import { addressLink } from '../../../../../3rdparty/etherscan/links';
 import styles from './AccountLink.css';
 
 export default class AccountLink extends Component {
@@ -57,7 +57,7 @@ export default class AccountLink extends Component {
   }
 
   updateLink (address, chain) {
-    const link = getAccountLink(address, chain);
+    const link = addressLink(address, chain === 'morden' || chain === 'testnet');
 
     this.setState({
       link
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
index 9326f57e6..3b4f46751 100644
--- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
+++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
@@ -120,8 +120,9 @@ export default class TransactionFinished extends Component {
   }
 
   renderTxHash () {
-    const { txHash, chain } = this.props;
-    if (!txHash) {
+    const { txHash } = this.props;
+    const { chain } = this.state;
+    if (!txHash || !chain) {
       return;
     }
 
diff --git a/js/src/views/Signer/components/TxHashLink/TxHashLink.js b/js/src/views/Signer/components/TxHashLink/TxHashLink.js
index 812c4461d..3ee0538d4 100644
--- a/js/src/views/Signer/components/TxHashLink/TxHashLink.js
+++ b/js/src/views/Signer/components/TxHashLink/TxHashLink.js
@@ -16,7 +16,7 @@
 
 import React, { Component, PropTypes } from 'react';
 
-import { getTxLink } from '../util/transaction';
+import { txLink } from '../../../../3rdparty/etherscan/links';
 
 export default class TxHashLink extends Component {
 
@@ -27,27 +27,12 @@ export default class TxHashLink extends Component {
     className: PropTypes.string
   }
 
-  state = {
-    link: null
-  };
-
-  componentWillMount () {
-    const { txHash, chain } = this.props;
-    this.updateLink(txHash, chain);
-  }
-
-  componentWillReceiveProps (nextProps) {
-    const { txHash, chain } = nextProps;
-    this.updateLink(txHash, chain);
-  }
-
   render () {
-    const { children, txHash, className } = this.props;
-    const { link } = this.state;
+    const { children, txHash, className, chain } = this.props;
 
     return (
       <a
-        href={ link }
+        href={ txLink(txHash, chain === 'morden' || chain === 'testnet') }
         target='_blank'
         className={ className }>
         { children || txHash }
@@ -55,9 +40,4 @@ export default class TxHashLink extends Component {
     );
   }
 
-  updateLink (txHash, chain) {
-    const link = getTxLink(txHash, chain);
-    this.setState({ link });
-  }
-
 }
diff --git a/js/src/views/Signer/components/util/account.js b/js/src/views/Signer/components/util/account.js
deleted file mode 100644
index d37f029c1..000000000
--- a/js/src/views/Signer/components/util/account.js
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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 <http://www.gnu.org/licenses/>.
-
-import { BASE_LINK_ACCOUNT_MORDEN, BASE_LINK_ACCOUNT_HOMESTEAD } from '../constants/constants';
-
-export const getAccountLink = _getAccountLink;
-
-function _getAccountLink (address, chain) {
-  const isTestNet = chain === 'morden' || chain === 'testnet';
-  const base = isTestNet ? BASE_LINK_ACCOUNT_MORDEN : BASE_LINK_ACCOUNT_HOMESTEAD;
-  return base + address;
-}
diff --git a/js/src/views/Signer/components/util/transaction.js b/js/src/views/Signer/components/util/transaction.js
index b843b7643..25800e806 100644
--- a/js/src/views/Signer/components/util/transaction.js
+++ b/js/src/views/Signer/components/util/transaction.js
@@ -18,7 +18,6 @@ import BigNumber from 'bignumber.js';
 
 const WEI_TO_ETH_MULTIPLIER = 0.000000000000000001;
 const WEI_TO_SZABU_MULTIPLIER = 0.000000000001;
-import { BASE_LINK_TX_MORDEN, BASE_LINK_TX_HOMESTEAD } from '../constants/constants';
 
 export const getShortData = _getShortData;
 // calculations
@@ -33,8 +32,6 @@ export const getTotalValueDisplay = _getTotalValueDisplay;
 export const getTotalValueDisplayWei = _getTotalValueDisplayWei;
 export const getEthmFromWeiDisplay = _getEthmFromWeiDisplay;
 export const getGasDisplay = _getGasDisplay;
-// links
-export const getTxLink = _getTxLink;
 
 function _getShortData (data) {
   if (data.length <= 3) {
@@ -111,11 +108,6 @@ function _getEthmFromWeiDisplay (weiHexString) {
   return value.times(WEI_TO_ETH_MULTIPLIER).times(1e7).toFixed(5);
 }
 
-function _getTxLink (txHash, chain) {
-  const base = chain === 'morden' || chain === 'testnet' ? BASE_LINK_TX_MORDEN : BASE_LINK_TX_HOMESTEAD;
-  return base + txHash;
-}
-
 function _getGasDisplay (gas) {
   return new BigNumber(gas).times(1e-7).toFormat(4);
 }

From 30022192507d807bb56ede012ab9d2ef1a0ff81f Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 30 Oct 2016 08:39:09 +0000
Subject: [PATCH 28/42] [ci skip] js-precompiled 20161030-083815

---
 Cargo.lock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cargo.lock b/Cargo.lock
index 184bf27fa..a4fc98ded 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1213,7 +1213,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#3964ffa5ab19dc08694c301ce7f268d008413f3e"
+source = "git+https://github.com/ethcore/js-precompiled.git#fdf739c062200a19678efa212c7cd7245584d979"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

From acaa40e22198ba80349cbc2f865822a50ff0e7c4 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 30 Oct 2016 09:54:21 +0100
Subject: [PATCH 29/42] Import raw private key (#2945)

* Initial selection screen

* UI in-place

* Make actual import API calls

* Simplify value checking logic
---
 .../CreationType/creationType.js              |   3 +
 .../CreateAccount/NewAccount/newAccount.js    |   2 +
 js/src/modals/CreateAccount/RawKey/index.js   |  17 ++
 js/src/modals/CreateAccount/RawKey/rawKey.js  | 189 ++++++++++++++++++
 js/src/modals/CreateAccount/createAccount.js  |  51 ++++-
 5 files changed, 255 insertions(+), 7 deletions(-)
 create mode 100644 js/src/modals/CreateAccount/RawKey/index.js
 create mode 100644 js/src/modals/CreateAccount/RawKey/rawKey.js

diff --git a/js/src/modals/CreateAccount/CreationType/creationType.js b/js/src/modals/CreateAccount/CreationType/creationType.js
index 866b33236..fe982a297 100644
--- a/js/src/modals/CreateAccount/CreationType/creationType.js
+++ b/js/src/modals/CreateAccount/CreationType/creationType.js
@@ -50,6 +50,9 @@ export default class CreationType extends Component {
           <RadioButton
             label='Import account from an Ethereum pre-sale wallet'
             value='fromPresale' />
+          <RadioButton
+            label='Import raw private key'
+            value='fromRaw' />
         </RadioButtonGroup>
       </div>
     );
diff --git a/js/src/modals/CreateAccount/NewAccount/newAccount.js b/js/src/modals/CreateAccount/NewAccount/newAccount.js
index 282efb5ab..323152213 100644
--- a/js/src/modals/CreateAccount/NewAccount/newAccount.js
+++ b/js/src/modals/CreateAccount/NewAccount/newAccount.js
@@ -26,6 +26,8 @@ import styles from '../createAccount.css';
 const ERRORS = {
   noName: 'you need to specify a valid name for the account',
   noPhrase: 'you need to specify the recovery phrase',
+  noKey: 'you need to provide the raw private key',
+  invalidKey: 'the raw key needs to be hex, 64 characters in length',
   invalidPassword: 'you need to specify a password >= 8 characters',
   noMatchPassword: 'the supplied passwords does not match'
 };
diff --git a/js/src/modals/CreateAccount/RawKey/index.js b/js/src/modals/CreateAccount/RawKey/index.js
new file mode 100644
index 000000000..6e372f475
--- /dev/null
+++ b/js/src/modals/CreateAccount/RawKey/index.js
@@ -0,0 +1,17 @@
+// 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 <http://www.gnu.org/licenses/>.
+
+export default from './rawKey';
diff --git a/js/src/modals/CreateAccount/RawKey/rawKey.js b/js/src/modals/CreateAccount/RawKey/rawKey.js
new file mode 100644
index 000000000..6e03874d8
--- /dev/null
+++ b/js/src/modals/CreateAccount/RawKey/rawKey.js
@@ -0,0 +1,189 @@
+// 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 <http://www.gnu.org/licenses/>.
+
+import React, { Component, PropTypes } from 'react';
+
+import { Form, Input } from '../../../ui';
+
+import styles from '../createAccount.css';
+
+import { ERRORS } from '../NewAccount';
+
+export default class RawKey extends Component {
+  static contextTypes = {
+    api: PropTypes.object.isRequired
+  }
+
+  static propTypes = {
+    onChange: PropTypes.func.isRequired
+  }
+
+  state = {
+    rawKey: '',
+    rawKeyError: ERRORS.noKey,
+    accountName: '',
+    accountNameError: ERRORS.noName,
+    passwordHint: '',
+    password1: '',
+    password1Error: ERRORS.invalidPassword,
+    password2: '',
+    password2Error: ERRORS.noMatchPassword,
+    isValidPass: false,
+    isValidName: false,
+    isValidKey: false
+  }
+
+  componentWillMount () {
+    this.props.onChange(false, {});
+  }
+
+  render () {
+    const { accountName, accountNameError, passwordHint, password1, password1Error, password2, password2Error, rawKey, rawKeyError } = this.state;
+
+    return (
+      <Form>
+        <Input
+          hint='the raw hex encoded private key'
+          label='private key'
+          error={ rawKeyError }
+          value={ rawKey }
+          onChange={ this.onEditKey } />
+        <Input
+          label='account name'
+          hint='a descriptive name for the account'
+          error={ accountNameError }
+          value={ accountName }
+          onChange={ this.onEditAccountName } />
+        <Input
+          label='password hint'
+          hint='(optional) a hint to help with remembering the password'
+          value={ passwordHint }
+          onChange={ this.onEditPasswordHint } />
+        <div className={ styles.passwords }>
+          <div className={ styles.password }>
+            <Input
+              className={ styles.password }
+              label='password'
+              hint='a strong, unique password'
+              type='password'
+              error={ password1Error }
+              value={ password1 }
+              onChange={ this.onEditPassword1 } />
+          </div>
+          <div className={ styles.password }>
+            <Input
+              className={ styles.password }
+              label='password (repeat)'
+              hint='verify your password'
+              type='password'
+              error={ password2Error }
+              value={ password2 }
+              onChange={ this.onEditPassword2 } />
+          </div>
+        </div>
+      </Form>
+    );
+  }
+
+  updateParent = () => {
+    const { isValidName, isValidPass, isValidKey, accountName, passwordHint, password1, rawKey } = this.state;
+    const isValid = isValidName && isValidPass && isValidKey;
+
+    this.props.onChange(isValid, {
+      name: accountName,
+      passwordHint,
+      password: password1,
+      rawKey
+    });
+  }
+
+  onEditPasswordHint = (event, value) => {
+    this.setState({
+      passwordHint: value
+    });
+  }
+
+  onEditKey = (event) => {
+    const { api } = this.context;
+    const rawKey = event.target.value;
+    let rawKeyError = null;
+
+    console.log(rawKey.length, rawKey);
+
+    if (!rawKey || !rawKey.trim().length) {
+      rawKeyError = ERRORS.noKey;
+    } else if (rawKey.substr(0, 2) !== '0x' || rawKey.substr(2).length !== 64 || !api.util.isHex(rawKey)) {
+      rawKeyError = ERRORS.invalidKey;
+    }
+
+    this.setState({
+      rawKey,
+      rawKeyError,
+      isValidKey: !rawKeyError
+    }, this.updateParent);
+  }
+
+  onEditAccountName = (event) => {
+    const accountName = event.target.value;
+    let accountNameError = null;
+
+    if (!accountName || accountName.trim().length < 2) {
+      accountNameError = ERRORS.noName;
+    }
+
+    this.setState({
+      accountName,
+      accountNameError,
+      isValidName: !accountNameError
+    }, this.updateParent);
+  }
+
+  onEditPassword1 = (event) => {
+    const value = event.target.value;
+    let error1 = null;
+    let error2 = null;
+
+    if (!value || value.trim().length < 8) {
+      error1 = ERRORS.invalidPassword;
+    }
+
+    if (value !== this.state.password2) {
+      error2 = ERRORS.noMatchPassword;
+    }
+
+    this.setState({
+      password1: value,
+      password1Error: error1,
+      password2Error: error2,
+      isValidPass: !error1 && !error2
+    }, this.updateParent);
+  }
+
+  onEditPassword2 = (event) => {
+    const value = event.target.value;
+    let error2 = null;
+
+    if (value !== this.state.password1) {
+      error2 = ERRORS.noMatchPassword;
+    }
+
+    this.setState({
+      password2: value,
+      password2Error: error2,
+      isValidPass: !error2
+    }, this.updateParent);
+  }
+}
diff --git a/js/src/modals/CreateAccount/createAccount.js b/js/src/modals/CreateAccount/createAccount.js
index e4b502571..e0808b47b 100644
--- a/js/src/modals/CreateAccount/createAccount.js
+++ b/js/src/modals/CreateAccount/createAccount.js
@@ -29,6 +29,7 @@ import CreationType from './CreationType';
 import NewAccount from './NewAccount';
 import NewGeth from './NewGeth';
 import NewImport from './NewImport';
+import RawKey from './RawKey';
 import RecoveryPhrase from './RecoveryPhrase';
 
 const TITLES = {
@@ -58,6 +59,7 @@ export default class CreateAccount extends Component {
     passwordHint: null,
     password: null,
     phrase: null,
+    rawKey: null,
     json: null,
     canCreate: false,
     createType: null,
@@ -110,6 +112,11 @@ export default class CreateAccount extends Component {
             <RecoveryPhrase
               onChange={ this.onChangeDetails } />
           );
+        } else if (createType === 'fromRaw') {
+          return (
+            <RawKey
+              onChange={ this.onChangeDetails } />
+          );
         }
 
         return (
@@ -220,6 +227,28 @@ export default class CreateAccount extends Component {
             canCreate: true
           });
 
+          this.newError(error);
+        });
+    } else if (createType === 'fromRaw') {
+      return api.personal
+        .newAccountFromSecret(this.state.rawKey, this.state.password)
+        .then((address) => {
+          this.setState({ address });
+          return api.personal
+            .setAccountName(address, this.state.name)
+            .then(() => api.personal.setAccountMeta(address, { passwordHint: this.state.passwordHint }));
+        })
+        .then(() => {
+          this.onNext();
+          this.props.onUpdate && this.props.onUpdate();
+        })
+        .catch((error) => {
+          console.error('onCreate', error);
+
+          this.setState({
+            canCreate: true
+          });
+
           this.newError(error);
         });
     } else if (createType === 'fromGeth') {
@@ -288,27 +317,35 @@ export default class CreateAccount extends Component {
     });
   }
 
-  onChangeDetails = (valid, { name, passwordHint, address, password, phrase }) => {
+  onChangeDetails = (canCreate, { name, passwordHint, address, password, phrase, rawKey }) => {
     this.setState({
-      canCreate: valid,
+      canCreate,
       name,
       passwordHint,
       address,
       password,
-      phrase
+      phrase,
+      rawKey
     });
   }
 
-  onChangeGeth = (valid, gethAddresses) => {
+  onChangeRaw = (canCreate, rawKey) => {
     this.setState({
-      canCreate: valid,
+      canCreate,
+      rawKey
+    });
+  }
+
+  onChangeGeth = (canCreate, gethAddresses) => {
+    this.setState({
+      canCreate,
       gethAddresses
     });
   }
 
-  onChangeWallet = (valid, { name, passwordHint, password, json }) => {
+  onChangeWallet = (canCreate, { name, passwordHint, password, json }) => {
     this.setState({
-      canCreate: valid,
+      canCreate,
       name,
       passwordHint,
       password,

From 70f87ea00295424281f1a60bd757ef89d4f931d9 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 30 Oct 2016 09:55:46 +0100
Subject: [PATCH 30/42] Publish parity.js to npmjs registry (#2978)

* Skeleton packages

* Publish parity.js package to npm

* [ci skip] js-precompiled 20161029-190427

* Extra step information

* [ci skip] js-precompiled 20161029-192209

* Use autToken for npmjs (cannot run headless in docker)

* [ci skip] js-precompiled 20161029-193414

* Correct package.json structure

* [ci skip] js-precompiled 20161029-194003

* Scope package to public

* [ci skip] js-precompiled 20161029-194529

* Start package version at 0.1.0

* Build proper umd library

* [ci skip] js-precompiled 20161029-231233

* Update build/release stage

* [ci skip] js-precompiled 20161030-071454

* Basic README.md to satisfy npmjs

* [ci skip] js-precompiled 20161030-073150

* CommonJs format

* [ci skip] js-precompiled 20161030-075034

* Update README.md

* update dependencies

* [ci skip] js-precompiled 20161030-075727

* Starting package version

* Build only on master
---
 .gitlab-ci.yml         | 23 ++++++------
 js/.gitignore          |  1 +
 js/package.json        | 13 ++++---
 js/parity.md           | 81 +++++++++++++++++++++++++++++++++++++++++
 js/parity.package.json | 32 +++++++++++++++++
 js/scripts/release.sh  | 71 +++++++++++++++++++++++-------------
 js/src/library.js      | 23 ++++++++++++
 js/webpack.npm.js      | 82 ++++++++++++++++++++++++++++++++++++++++++
 8 files changed, 282 insertions(+), 44 deletions(-)
 create mode 100644 js/parity.md
 create mode 100644 js/parity.package.json
 create mode 100644 js/src/library.js
 create mode 100644 js/webpack.npm.js

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 424f933fe..1d69dbce0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   - test
 variables:
   GIT_DEPTH: "3"
-  SIMPLECOV: "true" 
+  SIMPLECOV: "true"
   RUST_BACKTRACE: "1"
   RUSTFLAGS: "-D warnings"
 cache:
@@ -26,7 +26,7 @@ linux-stable:
     - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
     - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
     - md5sum "parity_"$VER"_amd64.deb" >> "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -56,7 +56,7 @@ linux-stable-14.04:
     - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
     - dpkg-deb -b deb "parity_"$VER"_amd64.deb"
     - md5sum "parity_"$VER"_amd64.deb" >> "parity_"$VER"_amd64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-ubuntu_14_04-gnu/parity.md5 --body parity.md5
@@ -121,7 +121,7 @@ linux-centos:
     - cargo build --release --verbose
     - strip target/release/parity
     - md5sum target/release/parity >> parity.md5
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity --body target/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-unknown-centos-gnu/parity.md5 --body parity.md5
@@ -158,7 +158,7 @@ linux-armv7:
     - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
     - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
     - md5sum "parity_"$VER"_armhf.deb" >> "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity --body target/armv7-unknown-linux-gnueabihf/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/armv7-unknown-linux-gnueabihf/parity.md5 --body parity.md5
@@ -198,7 +198,7 @@ linux-arm:
     - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
     - dpkg-deb -b deb "parity_"$VER"_armhf.deb"
     - md5sum "parity_"$VER"_armhf.deb" >> "parity_"$VER"_armhf.deb.md5"
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity --body target/arm-unknown-linux-gnueabihf/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabihf/parity.md5 --body parity.md5
@@ -231,8 +231,8 @@ linux-armv6:
     - cat .cargo/config
     - cargo build --target arm-unknown-linux-gnueabi --release --verbose
     - arm-linux-gnueabi-strip target/arm-unknown-linux-gnueabi/release/parity
-    - md5sum target/arm-unknown-linux-gnueabi/release/parity >> parity.md5 
-    - aws configure set aws_access_key_id $s3_key 
+    - md5sum target/arm-unknown-linux-gnueabi/release/parity >> parity.md5
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity --body target/arm-unknown-linux-gnueabi/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/arm-unknown-linux-gnueabi/parity.md5 --body parity.md5
@@ -270,7 +270,7 @@ linux-aarch64:
     - export VER=$(grep -m 1 version Cargo.toml | awk '{print $3}' | tr -d '"' | tr -d "\n")
     - dpkg-deb -b deb "parity_"$VER"_arm64.deb"
     - md5sum "parity_"$VER"_arm64.deb" >> "parity_"$VER"_arm64.deb.md5"
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity --body target/aarch64-unknown-linux-gnu/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/aarch64-unknown-linux-gnu/parity.md5 --body parity.md5
@@ -295,7 +295,7 @@ darwin:
     - cargo build --release --verbose
     - rm -rf parity.md5
     - md5sum target/release/parity >> parity.md5
-    - aws configure set aws_access_key_id $s3_key 
+    - aws configure set aws_access_key_id $s3_key
     - aws configure set aws_secret_access_key $s3_secret
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity --body target/release/parity
     - aws s3api put-object --bucket builds-parity --key $CI_BUILD_REF_NAME/x86_64-apple-darwin/parity.md5 --body parity.md5
@@ -391,9 +391,6 @@ js-release:
   image: ethcore/javascript:latest
   only:
     - master
-    - beta
-    - tags
-    - stable
   before_script:
     - ./js/scripts/install-deps.sh
   script:
diff --git a/js/.gitignore b/js/.gitignore
index b3ece001c..acb73a82a 100644
--- a/js/.gitignore
+++ b/js/.gitignore
@@ -5,3 +5,4 @@ build
 .coverage
 .dist
 .happypack
+.npmjs
diff --git a/js/package.json b/js/package.json
index 12244daa5..7896f5c05 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,9 +1,9 @@
 {
   "name": "parity.js",
-  "version": "0.0.1",
+  "version": "0.1.0",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
-  "author": "Ethcore Team <admin@ethcore.io>",
+  "author": "Parity Team <admin@parity.io>",
   "maintainers": [
     "Jaco Greeff"
   ],
@@ -11,7 +11,7 @@
   "license": "GPL-3.0",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/ethcore/parity.js.git"
+    "url": "git+https://github.com/ethcore/parity.git"
   },
   "keywords": [
     "Ethereum",
@@ -27,15 +27,13 @@
     "build:app": "webpack --progress",
     "build:lib": "webpack --config webpack.libraries --progress",
     "build:dll": "webpack --config webpack.vendor --progress",
-
     "ci:build": "npm run ci:build:dll && npm run ci:build:app && npm run ci:build:lib",
     "ci:build:app": "NODE_ENV=production webpack",
     "ci:build:lib": "NODE_ENV=production webpack --config webpack.libraries",
     "ci:build:dll": "NODE_ENV=production webpack --config webpack.vendor",
-
+    "ci:build:npm": "NODE_ENV=production webpack --config webpack.npm",
     "start": "npm install && npm run build:dll && npm run start:app",
     "start:app": "webpack-dev-server -d --history-api-fallback --open --hot --inline --progress --colors --port 3000",
-
     "clean": "rm -rf ./build ./coverage",
     "coveralls": "npm run testCoverage && coveralls < coverage/lcov.info",
     "lint": "eslint --ignore-path .gitignore ./src/",
@@ -65,7 +63,7 @@
     "chai": "^3.5.0",
     "chai-enzyme": "0.4.2",
     "cheerio": "0.20.0",
-    "copy-webpack-plugin": "^3.0.1",
+    "copy-webpack-plugin": "^4.0.0",
     "core-js": "^2.4.1",
     "coveralls": "^2.11.11",
     "css-loader": "^0.23.1",
@@ -79,6 +77,7 @@
     "eslint-plugin-standard": "^2.0.0",
     "extract-text-webpack-plugin": "^1.0.1",
     "file-loader": "^0.8.5",
+    "fs-extra": "^0.30.0",
     "happypack": "^2.2.1",
     "history": "^2.0.0",
     "html-loader": "^0.4.3",
diff --git a/js/parity.md b/js/parity.md
new file mode 100644
index 000000000..3e42f5c8d
--- /dev/null
+++ b/js/parity.md
@@ -0,0 +1,81 @@
+# parity.js
+
+Parity.js is a thin, fast, Promise-based wrapper around the Ethereum APIs.
+
+## installation
+
+Install the package with `npm install --save @parity/parity.js`
+
+## usage
+
+### initialisation
+
+```javascript
+// import the actual Api class
+import { Api } from '@parity/parity.js';
+
+// do the setup
+const transport = new Api.Transport.Http('http://localhost:8545');
+const api = new Api(transport);
+```
+
+### making calls
+
+perform a call
+
+```javascript
+api.eth
+  .coinbase()
+  .then((coinbase) => {
+    console.log(`The coinbase is ${coinbase}`);
+  });
+```
+
+multiple promises
+
+```javascript
+Promise
+  .all([
+    api.eth.coinbase(),
+    api.net.listening()
+  ])
+  .then(([coinbase, listening]) => {
+    // do stuff here
+  });
+```
+
+chaining promises
+
+```javascript
+api.eth
+  .newFilter({...})
+  .then((filterId) => api.eth.getFilterChanges(filterId))
+  .then((changes) => {
+    console.log(changes);
+  });
+```
+
+### contracts
+
+attach contract
+
+```javascript
+const abi = [{ name: 'callMe', inputs: [{ type: 'bool', ...}, { type: 'string', ...}]}, ...abi...];
+const address = '0x123456...9abc';
+const contract = new api.newContract(abi, address);
+```
+
+find & call a function
+
+```javascript
+contract.instance
+  .callMe
+  .call({ gas: 21000 }, [true, 'someString']) // or estimateGas or postTransaction
+  .then((result) => {
+    console.log(`the result was ${result}`);
+  });
+```
+
+## apis
+
+APIs implement the calls as exposed in the [Ethcore JSON Ethereum RPC](https://github.com/ethcore/ethereum-rpc-json/) definitions. Mapping follows the naming conventions of the originals, i.e. `eth_call` becomes `eth.call`, `personal_accounts` becomes `personal.accounts`, etc.
diff --git a/js/parity.package.json b/js/parity.package.json
new file mode 100644
index 000000000..7d18cc5ed
--- /dev/null
+++ b/js/parity.package.json
@@ -0,0 +1,32 @@
+{
+  "name": "@parity/parity.js",
+  "description": "The Parity Promise-base API & ABI library for interfacing with Ethereum over RPC",
+  "version": "0.0.0",
+  "main": "library.js",
+  "author": "Parity Team <admin@parity.io>",
+  "maintainers": [
+    "Jaco Greeff"
+  ],
+  "contributors": [],
+  "license": "GPL-3.0",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ethcore/parity.git"
+  },
+  "keywords": [
+    "Ethereum",
+    "ABI",
+    "API",
+    "RPC",
+    "Parity",
+    "Promise"
+  ],
+  "scripts": {
+  },
+  "devDependencies": {
+  },
+  "dependencies": {
+    "bignumber.js": "^2.3.0",
+    "js-sha3": "^0.5.2"
+  }
+}
diff --git a/js/scripts/release.sh b/js/scripts/release.sh
index 95e561b77..22fd91ab6 100755
--- a/js/scripts/release.sh
+++ b/js/scripts/release.sh
@@ -1,11 +1,18 @@
 #!/bin/bash
 set -e
 
+# variables
+UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
+PACKAGES=( "parity.js" )
+BRANCH=$CI_BUILD_REF_NAME
+GIT_JS_PRECOMPILED="https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/js-precompiled.git"
+GIT_PARITY="https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/parity.git"
+
 # setup the git user defaults for the current repo
 function setup_git_user {
   git config push.default simple
   git config merge.ours.driver true
-  git config user.email "jaco+gitlab@ethcore.io"
+  git config user.email "$GITHUB_EMAIL"
   git config user.name "GitLab Build Bot"
 }
 
@@ -15,47 +22,63 @@ GITLOG=./.git/gitcommand.log
 pushd $BASEDIR
 cd ../.dist
 
-# variables
-UTCDATE=`date -u "+%Y%m%d-%H%M%S"`
-
-# init git
+# add local files and send it up
+echo "*** Setting up GitHub config for js-precompiled"
 rm -rf ./.git
 git init
-
-# add local files and send it up
-echo "Setting up GitHub config for js-precompiled"
 setup_git_user
 
-echo "Checking out $CI_BUILD_REF_NAME branch"
-git remote add origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/js-precompiled.git
+echo "*** Checking out $BRANCH branch"
+git remote add origin $GIT_JS_PRECOMPILED
 git fetch origin 2>$GITLOG
-git checkout -b $CI_BUILD_REF_NAME
+git checkout -b $BRANCH
 
-echo "Committing compiled files for $UTCDATE"
+echo "*** Committing compiled files for $UTCDATE"
 git add .
 git commit -m "$UTCDATE"
 
-echo "Merging remote"
-git merge origin/$CI_BUILD_REF_NAME -X ours --commit -m "$UTCDATE [release]"
-git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG
+echo "*** Merging remote"
+git merge origin/$BRANCH -X ours --commit -m "$UTCDATE [release]"
+git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
 PRECOMPILED_HASH=`git rev-parse HEAD`
 
-# back to root
-popd
+# move to root
+cd ../..
 
-echo "Setting up GitHub config for parity"
+echo "*** Setting up GitHub config for parity"
 setup_git_user
-git remote set-url origin https://${GITHUB_JS_PRECOMPILED}:@github.com/ethcore/parity.git
-git reset --hard origin/$CI_BUILD_REF_NAME 2>$GITLOG
+git remote set-url origin $GIT_PARITY
+git reset --hard origin/$BRANCH 2>$GITLOG
 
-echo "Updating cargo package parity-ui-precompiled#$PRECOMPILED_HASH"
+echo "*** Bumping package.json patch version"
+cd js
+npm --no-git-tag-version version
+npm version patch
+cd ..
+
+echo "*** Updating cargo parity-ui-precompiled#$PRECOMPILED_HASH"
 cargo update -p parity-ui-precompiled
 # --precise "$PRECOMPILED_HASH"
 
-echo "Committing updated files"
-git add .
+echo "*** Committing updated files"
+git add Cargo.lock js/package.json
 git commit -m "[ci skip] js-precompiled $UTCDATE"
-git push origin HEAD:refs/heads/$CI_BUILD_REF_NAME 2>$GITLOG
+git push origin HEAD:refs/heads/$BRANCH 2>$GITLOG
+
+echo "*** Building packages for npmjs"
+cd js
+# echo -e "$NPM_USERNAME\n$NPM_PASSWORD\n$NPM_EMAIL" | npm login
+echo "$NPM_TOKEN" >> ~/.npmrc
+npm run ci:build:npm
+
+echo "*** Publishing $PACKAGE to npmjs"
+cd .npmjs
+npm publish --access public
+cd ..
+
+# back to root
+echo "*** Release completed"
+popd
 
 # exit with exit code
 exit 0
diff --git a/js/src/library.js b/js/src/library.js
new file mode 100644
index 000000000..fbbab2286
--- /dev/null
+++ b/js/src/library.js
@@ -0,0 +1,23 @@
+// 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 <http://www.gnu.org/licenses/>.
+
+import Abi from './abi';
+import Api from './api';
+
+export {
+  Abi,
+  Api
+};
diff --git a/js/webpack.npm.js b/js/webpack.npm.js
new file mode 100644
index 000000000..23e2b7939
--- /dev/null
+++ b/js/webpack.npm.js
@@ -0,0 +1,82 @@
+// 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 <http://www.gnu.org/licenses/>.
+
+const path = require('path');
+const webpack = require('webpack');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+const packageJson = require('./package.json');
+
+const ENV = process.env.NODE_ENV || 'development';
+const isProd = ENV === 'production';
+
+module.exports = {
+  context: path.join(__dirname, './src'),
+  entry: 'library.js',
+  output: {
+    path: path.join(__dirname, '.npmjs'),
+    filename: 'library.js',
+    libraryTarget: 'commonjs'
+  },
+  module: {
+    loaders: [
+      {
+        test: /(\.jsx|\.js)$/,
+        loader: 'babel',
+        exclude: /node_modules/
+      }
+    ]
+  },
+  resolve: {
+    root: path.resolve('./src'),
+    extensions: ['', '.js']
+  },
+  plugins: (function () {
+    const plugins = [
+      new CopyWebpackPlugin([
+        {
+          from: '../parity.package.json',
+          to: 'package.json',
+          transform: function (content, path) {
+            const json = JSON.parse(content.toString());
+            json.version = packageJson.version;
+            return new Buffer(JSON.stringify(json, null, '  '), 'utf-8');
+          }
+        },
+        {
+          from: '../LICENSE'
+        },
+        {
+          from: '../parity.md',
+          to: 'README.md'
+        }
+      ], { copyUnmodified: true })
+    ];
+
+    if (isProd) {
+      plugins.push(new webpack.optimize.UglifyJsPlugin({
+        screwIe8: true,
+        compress: {
+          warnings: false
+        },
+        output: {
+          comments: false
+        }
+      }));
+    }
+
+    return plugins;
+  }())
+};

From bccc56b6b048f63dc9e1cc7fbedbe74795830a49 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sun, 30 Oct 2016 09:56:34 +0100
Subject: [PATCH 31/42] mio version bump (#2982)

---
 Cargo.lock                            | 34 +++++++++++++++++++--
 ethcore/src/client/client.rs          |  6 ++--
 ethcore/src/snapshot/service.rs       | 10 +++----
 ethcore/src/snapshot/watcher.rs       |  7 +++--
 ethcore/src/verification/queue/mod.rs | 10 ++++---
 util/io/Cargo.toml                    |  2 +-
 util/io/src/lib.rs                    |  7 +++--
 util/io/src/service.rs                | 43 ++++++++++++++-------------
 util/network/Cargo.toml               |  3 +-
 util/network/src/connection.rs        | 34 ++++++++++++---------
 util/network/src/discovery.rs         |  9 +++---
 util/network/src/host.rs              |  8 ++---
 util/network/src/lib.rs               |  1 +
 util/network/src/session.rs           |  1 +
 14 files changed, 111 insertions(+), 64 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a4fc98ded..8435e4f6e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -370,7 +370,7 @@ version = "1.4.0"
 dependencies = [
  "crossbeam 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)",
+ "mio 0.6.0 (git+https://github.com/carllerche/mio)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -451,6 +451,7 @@ name = "ethcore-network"
 version = "1.4.0"
 dependencies = [
  "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bytes 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "ethcore-devtools 1.4.0",
  "ethcore-io 1.4.0",
  "ethcore-util 1.4.0",
@@ -459,7 +460,7 @@ dependencies = [
  "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)",
+ "mio 0.6.0 (git+https://github.com/carllerche/mio)",
  "parking_lot 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
  "rlp 0.1.0",
@@ -886,6 +887,11 @@ name = "lazy_static"
 version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "lazycell"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "libc"
 version = "0.2.15"
@@ -1002,6 +1008,22 @@ dependencies = [
  "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "mio"
+version = "0.6.0"
+source = "git+https://github.com/carllerche/mio#9f17b70d6fecbf912168267ea74cf536f2cba705"
+dependencies = [
+ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "net2 0.2.23 (registry+https://github.com/rust-lang/crates.io-index)",
+ "nix 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "miow"
 version = "0.1.3"
@@ -1593,6 +1615,11 @@ name = "slab"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "slab"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "smallvec"
 version = "0.1.8"
@@ -1984,6 +2011,7 @@ dependencies = [
 "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
 "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a"
 "checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"
+"checksum lazycell 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ce12306c4739d86ee97c23139f3a34ddf0387bbf181bc7929d287025a8c3ef6b"
 "checksum libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "23e3757828fa702a20072c37ff47938e9dd331b92fac6e223d26d4b7a55f7ee2"
 "checksum linked-hash-map 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bda158e0dabeb97ee8a401f4d17e479d6b891a14de0bba79d5cc2d4d325b5e48"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
@@ -1996,6 +2024,7 @@ dependencies = [
 "checksum miniz-sys 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "9d1f4d337a01c32e1f2122510fed46393d53ca35a7f429cb0450abaedfa3ed54"
 "checksum mio 0.5.1 (git+https://github.com/ethcore/mio?branch=v0.5.x)" = "<none>"
 "checksum mio 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a637d1ca14eacae06296a008fa7ad955347e34efcb5891cfd8ba05491a37907e"
+"checksum mio 0.6.0 (git+https://github.com/carllerche/mio)" = "<none>"
 "checksum mio 0.6.0-dev (git+https://github.com/ethcore/mio?branch=timer-fix)" = "<none>"
 "checksum miow 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d5bfc6782530ac8ace97af10a540054a37126b63b0702ddaaa243b73b5745b9a"
 "checksum msdos_time 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c04b68cc63a8480fb2550343695f7be72effdec953a9d4508161c3e69041c7d8"
@@ -2062,6 +2091,7 @@ dependencies = [
 "checksum slab 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d807fd58c4181bbabed77cb3b891ba9748241a552bcc5be698faaebefc54f46e"
 "checksum slab 0.2.0 (git+https://github.com/carllerche/slab?rev=5476efcafb)" = "<none>"
 "checksum slab 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6dbdd334bd28d328dad1c41b0ea662517883d8880d8533895ef96c8003dec9c4"
+"checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23"
 "checksum smallvec 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "fcc8d19212aacecf95e4a7a2179b26f7aeb9732a915cf01f05b0d3e044865410"
 "checksum solicit 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "172382bac9424588d7840732b250faeeef88942e37b6e35317dce98cafdd75b2"
 "checksum spmc 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "93bdab61c1a413e591c4d17388ffa859eaff2df27f1e13a5ec8b716700605adf"
diff --git a/ethcore/src/client/client.rs b/ethcore/src/client/client.rs
index 4709955d1..0c50d85aa 100644
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -139,7 +139,7 @@ pub struct Client {
 	miner: Arc<Miner>,
 	sleep_state: Mutex<SleepState>,
 	liveness: AtomicBool,
-	io_channel: IoChannel<ClientIoMessage>,
+	io_channel: Mutex<IoChannel<ClientIoMessage>>,
 	notify: RwLock<Vec<Weak<ChainNotify>>>,
 	queue_transactions: AtomicUsize,
 	last_hashes: RwLock<VecDeque<H256>>,
@@ -235,7 +235,7 @@ impl Client {
 			import_lock: Mutex::new(()),
 			panic_handler: panic_handler,
 			miner: miner,
-			io_channel: message_channel,
+			io_channel: Mutex::new(message_channel),
 			notify: RwLock::new(Vec::new()),
 			queue_transactions: AtomicUsize::new(0),
 			last_hashes: RwLock::new(VecDeque::new()),
@@ -1139,7 +1139,7 @@ impl BlockChainClient for Client {
 			debug!("Ignoring {} transactions: queue is full", transactions.len());
 		} else {
 			let len = transactions.len();
-			match self.io_channel.send(ClientIoMessage::NewTransactions(transactions)) {
+			match self.io_channel.lock().send(ClientIoMessage::NewTransactions(transactions)) {
 				Ok(_) => {
 					self.queue_transactions.fetch_add(len, AtomicOrdering::SeqCst);
 				}
diff --git a/ethcore/src/snapshot/service.rs b/ethcore/src/snapshot/service.rs
index cc30a5c26..16f7c6ec6 100644
--- a/ethcore/src/snapshot/service.rs
+++ b/ethcore/src/snapshot/service.rs
@@ -213,7 +213,7 @@ pub struct Service {
 	restoration: Mutex<Option<Restoration>>,
 	snapshot_root: PathBuf,
 	db_config: DatabaseConfig,
-	io_channel: Channel,
+	io_channel: Mutex<Channel>,
 	pruning: Algorithm,
 	status: Mutex<RestorationStatus>,
 	reader: RwLock<Option<LooseReader>>,
@@ -233,7 +233,7 @@ impl Service {
 			restoration: Mutex::new(None),
 			snapshot_root: params.snapshot_root,
 			db_config: params.db_config,
-			io_channel: params.channel,
+			io_channel: Mutex::new(params.channel),
 			pruning: params.pruning,
 			status: Mutex::new(RestorationStatus::Inactive),
 			reader: RwLock::new(None),
@@ -567,7 +567,7 @@ impl SnapshotService for Service {
 	}
 
 	fn begin_restore(&self, manifest: ManifestData) {
-		if let Err(e) = self.io_channel.send(ClientIoMessage::BeginRestoration(manifest)) {
+		if let Err(e) = self.io_channel.lock().send(ClientIoMessage::BeginRestoration(manifest)) {
 			trace!("Error sending snapshot service message: {:?}", e);
 		}
 	}
@@ -578,13 +578,13 @@ impl SnapshotService for Service {
 	}
 
 	fn restore_state_chunk(&self, hash: H256, chunk: Bytes) {
-		if let Err(e) = self.io_channel.send(ClientIoMessage::FeedStateChunk(hash, chunk)) {
+		if let Err(e) = self.io_channel.lock().send(ClientIoMessage::FeedStateChunk(hash, chunk)) {
 			trace!("Error sending snapshot service message: {:?}", e);
 		}
 	}
 
 	fn restore_block_chunk(&self, hash: H256, chunk: Bytes) {
-		if let Err(e) = self.io_channel.send(ClientIoMessage::FeedBlockChunk(hash, chunk)) {
+		if let Err(e) = self.io_channel.lock().send(ClientIoMessage::FeedBlockChunk(hash, chunk)) {
 			trace!("Error sending snapshot service message: {:?}", e);
 		}
 	}
diff --git a/ethcore/src/snapshot/watcher.rs b/ethcore/src/snapshot/watcher.rs
index 498f00737..43439e437 100644
--- a/ethcore/src/snapshot/watcher.rs
+++ b/ethcore/src/snapshot/watcher.rs
@@ -16,6 +16,7 @@
 
 //! Watcher for snapshot-related chain events.
 
+use util::Mutex;
 use client::{BlockChainClient, Client, ChainNotify};
 use ids::BlockID;
 use service::ClientIoMessage;
@@ -55,7 +56,7 @@ trait Broadcast: Send + Sync {
 	fn take_at(&self, num: Option<u64>);
 }
 
-impl Broadcast for IoChannel<ClientIoMessage> {
+impl Broadcast for Mutex<IoChannel<ClientIoMessage>> {
 	fn take_at(&self, num: Option<u64>) {
 		let num = match num {
 			Some(n) => n,
@@ -64,7 +65,7 @@ impl Broadcast for IoChannel<ClientIoMessage> {
 
 		trace!(target: "snapshot_watcher", "broadcast: {}", num);
 
-		if let Err(e) = self.send(ClientIoMessage::TakeSnapshot(num)) {
+		if let Err(e) = self.lock().send(ClientIoMessage::TakeSnapshot(num)) {
 			warn!("Snapshot watcher disconnected from IoService: {}", e);
 		}
 	}
@@ -91,7 +92,7 @@ impl Watcher {
 				client: client,
 				sync_status: sync_status,
 			}),
-			broadcast: Box::new(channel),
+			broadcast: Box::new(Mutex::new(channel)),
 			period: period,
 			history: history,
 		}
diff --git a/ethcore/src/verification/queue/mod.rs b/ethcore/src/verification/queue/mod.rs
index f801bbe2e..99e09784d 100644
--- a/ethcore/src/verification/queue/mod.rs
+++ b/ethcore/src/verification/queue/mod.rs
@@ -109,7 +109,7 @@ pub struct VerificationQueue<K: Kind> {
 struct QueueSignal {
 	deleting: Arc<AtomicBool>,
 	signalled: AtomicBool,
-	message_channel: IoChannel<ClientIoMessage>,
+	message_channel: Mutex<IoChannel<ClientIoMessage>>,
 }
 
 impl QueueSignal {
@@ -121,7 +121,8 @@ impl QueueSignal {
 		}
 
 		if self.signalled.compare_and_swap(false, true, AtomicOrdering::Relaxed) == false {
-			if let Err(e) = self.message_channel.send_sync(ClientIoMessage::BlockVerified) {
+			let channel = self.message_channel.lock().clone();
+			if let Err(e) = channel.send_sync(ClientIoMessage::BlockVerified) {
 				debug!("Error sending BlockVerified message: {:?}", e);
 			}
 		}
@@ -135,7 +136,8 @@ impl QueueSignal {
 		}
 
 		if self.signalled.compare_and_swap(false, true, AtomicOrdering::Relaxed) == false {
-			if let Err(e) = self.message_channel.send(ClientIoMessage::BlockVerified) {
+			let channel = self.message_channel.lock().clone();
+			if let Err(e) = channel.send(ClientIoMessage::BlockVerified) {
 				debug!("Error sending BlockVerified message: {:?}", e);
 			}
 		}
@@ -178,7 +180,7 @@ impl<K: Kind> VerificationQueue<K> {
 		let ready_signal = Arc::new(QueueSignal {
 			deleting: deleting.clone(),
 			signalled: AtomicBool::new(false),
-			message_channel: message_channel
+			message_channel: Mutex::new(message_channel),
 		});
 		let empty = Arc::new(SCondvar::new());
 		let panic_handler = PanicHandler::new_in_arc();
diff --git a/util/io/Cargo.toml b/util/io/Cargo.toml
index cd3aedd91..3cd51e656 100644
--- a/util/io/Cargo.toml
+++ b/util/io/Cargo.toml
@@ -7,7 +7,7 @@ version = "1.4.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]
-mio = { git = "https://github.com/ethcore/mio", branch = "v0.5.x" }
+mio = { git = "https://github.com/carllerche/mio" }
 crossbeam = "0.2"
 parking_lot = "0.3"
 log = "0.3"
diff --git a/util/io/src/lib.rs b/util/io/src/lib.rs
index 082192dfa..99282d9d8 100644
--- a/util/io/src/lib.rs
+++ b/util/io/src/lib.rs
@@ -65,7 +65,8 @@ mod service;
 mod worker;
 mod panics;
 
-use mio::{EventLoop, Token};
+use mio::{Token};
+use mio::deprecated::{EventLoop, NotifyError};
 use std::fmt;
 
 pub use worker::LOCAL_STACK_SIZE;
@@ -96,8 +97,8 @@ impl From<::std::io::Error> for IoError {
 	}
 }
 
-impl<Message> From<::mio::NotifyError<service::IoMessage<Message>>> for IoError where Message: Send + Clone {
-	fn from(_err: ::mio::NotifyError<service::IoMessage<Message>>) -> IoError {
+impl<Message> From<NotifyError<service::IoMessage<Message>>> for IoError where Message: Send + Clone {
+	fn from(_err: NotifyError<service::IoMessage<Message>>) -> IoError {
 		IoError::Mio(::std::io::Error::new(::std::io::ErrorKind::ConnectionAborted, "Network IO notification error"))
 	}
 }
diff --git a/util/io/src/service.rs b/util/io/src/service.rs
index d06d34284..01f390a2c 100644
--- a/util/io/src/service.rs
+++ b/util/io/src/service.rs
@@ -18,13 +18,16 @@ use std::sync::{Arc, Weak};
 use std::thread::{self, JoinHandle};
 use std::collections::HashMap;
 use mio::*;
+use mio::timer::{Timeout};
+use mio::deprecated::{EventLoop, Handler, Sender, EventLoopBuilder};
 use crossbeam::sync::chase_lev;
 use slab::Slab;
 use {IoError, IoHandler};
 use worker::{Worker, Work, WorkType};
 use panics::*;
-use parking_lot::{RwLock};
+use parking_lot::{RwLock, Mutex};
 use std::sync::{Condvar as SCondvar, Mutex as SMutex};
+use std::time::Duration;
 
 /// Timer ID
 pub type TimerToken = usize;
@@ -209,9 +212,9 @@ impl<Message> Handler for IoManager<Message> where Message: Send + Clone + Sync
 	type Timeout = Token;
 	type Message = IoMessage<Message>;
 
-	fn ready(&mut self, _event_loop: &mut EventLoop<Self>, token: Token, events: EventSet) {
-		let handler_index  = token.as_usize() / TOKENS_PER_HANDLER;
-		let token_id  = token.as_usize() % TOKENS_PER_HANDLER;
+	fn ready(&mut self, _event_loop: &mut EventLoop<Self>, token: Token, events: Ready) {
+		let handler_index  = token.0 / TOKENS_PER_HANDLER;
+		let token_id  = token.0 % TOKENS_PER_HANDLER;
 		if let Some(handler) = self.handlers.read().get(handler_index) {
 			if events.is_hup() {
 				self.worker_channel.push(Work { work_type: WorkType::Hup, token: token_id, handler: handler.clone(), handler_id: handler_index });
@@ -229,11 +232,11 @@ impl<Message> Handler for IoManager<Message> where Message: Send + Clone + Sync
 	}
 
 	fn timeout(&mut self, event_loop: &mut EventLoop<Self>, token: Token) {
-		let handler_index  = token.as_usize()  / TOKENS_PER_HANDLER;
-		let token_id  = token.as_usize()  % TOKENS_PER_HANDLER;
+		let handler_index  = token.0  / TOKENS_PER_HANDLER;
+		let token_id  = token.0  % TOKENS_PER_HANDLER;
 		if let Some(handler) = self.handlers.read().get(handler_index) {
-			if let Some(timer) = self.timers.read().get(&token.as_usize()) {
-				event_loop.timeout_ms(token, timer.delay).expect("Error re-registering user timer");
+			if let Some(timer) = self.timers.read().get(&token.0) {
+				event_loop.timeout(token, Duration::from_millis(timer.delay)).expect("Error re-registering user timer");
 				self.worker_channel.push(Work { work_type: WorkType::Timeout, token: token_id, handler: handler.clone(), handler_id: handler_index });
 				self.work_ready.notify_all();
 			}
@@ -258,18 +261,18 @@ impl<Message> Handler for IoManager<Message> where Message: Send + Clone + Sync
 				let to_remove: Vec<_> = timers.keys().cloned().filter(|timer_id| timer_id / TOKENS_PER_HANDLER == handler_id).collect();
 				for timer_id in to_remove {
 					let timer = timers.remove(&timer_id).expect("to_remove only contains keys from timers; qed");
-					event_loop.clear_timeout(timer.timeout);
+					event_loop.clear_timeout(&timer.timeout);
 				}
 			},
 			IoMessage::AddTimer { handler_id, token, delay } => {
 				let timer_id = token + handler_id * TOKENS_PER_HANDLER;
-				let timeout = event_loop.timeout_ms(Token(timer_id), delay).expect("Error registering user timer");
+				let timeout = event_loop.timeout(Token(timer_id), Duration::from_millis(delay)).expect("Error registering user timer");
 				self.timers.write().insert(timer_id, UserTimer { delay: delay, timeout: timeout });
 			},
 			IoMessage::RemoveTimer { handler_id, token } => {
 				let timer_id = token + handler_id * TOKENS_PER_HANDLER;
 				if let Some(timer) = self.timers.write().remove(&timer_id) {
-					event_loop.clear_timeout(timer.timeout);
+					event_loop.clear_timeout(&timer.timeout);
 				}
 			},
 			IoMessage::RegisterStream { handler_id, token } => {
@@ -283,7 +286,7 @@ impl<Message> Handler for IoManager<Message> where Message: Send + Clone + Sync
 					// unregister a timer associated with the token (if any)
 					let timer_id = token + handler_id * TOKENS_PER_HANDLER;
 					if let Some(timer) = self.timers.write().remove(&timer_id) {
-						event_loop.clear_timeout(timer.timeout);
+						event_loop.clear_timeout(&timer.timeout);
 					}
 				}
 			},
@@ -372,7 +375,7 @@ impl<Message> IoChannel<Message> where Message: Send + Clone + Sync + 'static {
 pub struct IoService<Message> where Message: Send + Sync + Clone + 'static {
 	panic_handler: Arc<PanicHandler>,
 	thread: Option<JoinHandle<()>>,
-	host_channel: Sender<IoMessage<Message>>,
+	host_channel: Mutex<Sender<IoMessage<Message>>>,
 	handlers: Arc<RwLock<Slab<Arc<IoHandler<Message>>, HandlerId>>>,
 }
 
@@ -386,9 +389,9 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static {
 	/// Starts IO event loop
 	pub fn start() -> Result<IoService<Message>, IoError> {
 		let panic_handler = PanicHandler::new_in_arc();
-		let mut config = EventLoopConfig::new();
+		let mut config = EventLoopBuilder::new();
 		config.messages_per_tick(1024);
-		let mut event_loop = EventLoop::configured(config).expect("Error creating event loop");
+		let mut event_loop = config.build().expect("Error creating event loop");
 		let channel = event_loop.channel();
 		let panic = panic_handler.clone();
 		let handlers = Arc::new(RwLock::new(Slab::new(MAX_HANDLERS)));
@@ -402,14 +405,14 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static {
 		Ok(IoService {
 			panic_handler: panic_handler,
 			thread: Some(thread),
-			host_channel: channel,
+			host_channel: Mutex::new(channel),
 			handlers: handlers,
 		})
 	}
 
 	/// Regiter an IO handler with the event loop.
 	pub fn register_handler(&self, handler: Arc<IoHandler<Message>+Send>) -> Result<(), IoError> {
-		try!(self.host_channel.send(IoMessage::AddHandler {
+		try!(self.host_channel.lock().send(IoMessage::AddHandler {
 			handler: handler,
 		}));
 		Ok(())
@@ -417,20 +420,20 @@ impl<Message> IoService<Message> where Message: Send + Sync + Clone + 'static {
 
 	/// Send a message over the network. Normaly `HostIo::send` should be used. This can be used from non-io threads.
 	pub fn send_message(&self, message: Message) -> Result<(), IoError> {
-		try!(self.host_channel.send(IoMessage::UserMessage(message)));
+		try!(self.host_channel.lock().send(IoMessage::UserMessage(message)));
 		Ok(())
 	}
 
 	/// Create a new message channel
 	pub fn channel(&self) -> IoChannel<Message> {
-		IoChannel::new(self.host_channel.clone(), Arc::downgrade(&self.handlers))
+		IoChannel::new(self.host_channel.lock().clone(), Arc::downgrade(&self.handlers))
 	}
 }
 
 impl<Message> Drop for IoService<Message> where Message: Send + Sync + Clone {
 	fn drop(&mut self) {
 		trace!(target: "shutdown", "[IoService] Closing...");
-		self.host_channel.send(IoMessage::Shutdown).unwrap_or_else(|e| warn!("Error on IO service shutdown: {:?}", e));
+		self.host_channel.lock().send(IoMessage::Shutdown).unwrap_or_else(|e| warn!("Error on IO service shutdown: {:?}", e));
 		self.thread.take().unwrap().join().ok();
 		trace!(target: "shutdown", "[IoService] Closed.");
 	}
diff --git a/util/network/Cargo.toml b/util/network/Cargo.toml
index 8b566fcf2..1a79df0e0 100644
--- a/util/network/Cargo.toml
+++ b/util/network/Cargo.toml
@@ -8,7 +8,8 @@ authors = ["Ethcore <admin@ethcore.io>"]
 
 [dependencies]
 log = "0.3"
-mio = { git = "https://github.com/ethcore/mio", branch = "v0.5.x" }
+mio = { git = "https://github.com/carllerche/mio" }
+bytes = "0.3.0"
 rand = "0.3.12"
 time = "0.1.34"
 tiny-keccak = "1.0"
diff --git a/util/network/src/connection.rs b/util/network/src/connection.rs
index aadec31b9..0d7c14239 100644
--- a/util/network/src/connection.rs
+++ b/util/network/src/connection.rs
@@ -18,7 +18,8 @@ use std::sync::Arc;
 use std::collections::VecDeque;
 use std::net::SocketAddr;
 use std::sync::atomic::{AtomicBool, Ordering as AtomicOrdering};
-use mio::{Handler, Token, EventSet, EventLoop, PollOpt, TryRead, TryWrite};
+use mio::{Token, Ready, PollOpt};
+use mio::deprecated::{Handler, EventLoop, TryRead, TryWrite};
 use mio::tcp::*;
 use util::hash::*;
 use util::sha3::*;
@@ -34,6 +35,7 @@ use rcrypto::aessafe::*;
 use rcrypto::symmetriccipher::*;
 use rcrypto::buffer::*;
 use tiny_keccak::Keccak;
+use bytes::{Buf, MutBuf};
 use crypto;
 
 const ENCRYPTED_HEADER_LEN: usize = 32;
@@ -57,7 +59,7 @@ pub struct GenericConnection<Socket: GenericSocket> {
 	/// Send out packets FIFO
 	send_queue: VecDeque<Cursor<Bytes>>,
 	/// Event flags this connection expects
-	interest: EventSet,
+	interest: Ready,
 	/// Shared network statistics
 	stats: Arc<NetworkStats>,
 	/// Registered flag
@@ -81,8 +83,9 @@ impl<Socket: GenericSocket> GenericConnection<Socket> {
 		let sock_ref = <Socket as Read>::by_ref(&mut self.socket);
 		loop {
 			let max = self.rec_size - self.rec_buf.len();
-			match sock_ref.take(max as u64).try_read_buf(&mut self.rec_buf) {
+			match sock_ref.take(max as u64).try_read(unsafe { self.rec_buf.mut_bytes() }) {
 				Ok(Some(size)) if size != 0  => {
+					unsafe { self.rec_buf.advance(size); }
 					self.stats.inc_recv(size);
 					trace!(target:"network", "{}: Read {} of {} bytes", self.token, self.rec_buf.len(), self.rec_size);
 					if self.rec_size != 0 && self.rec_buf.len() == self.rec_size {
@@ -109,7 +112,7 @@ impl<Socket: GenericSocket> GenericConnection<Socket> {
 			trace!(target:"network", "{}: Sending {} bytes", self.token, data.len());
 			self.send_queue.push_back(Cursor::new(data));
 			if !self.interest.is_writable() {
-				self.interest.insert(EventSet::writable());
+				self.interest.insert(Ready::writable());
 			}
 			io.update_registration(self.token).ok();
 		}
@@ -128,16 +131,19 @@ impl<Socket: GenericSocket> GenericConnection<Socket> {
 		{
 			let buf = self.send_queue.front_mut().unwrap();
 			let send_size = buf.get_ref().len();
-			if (buf.position() as usize) >= send_size {
+			let pos = buf.position() as usize;
+			if (pos as usize) >= send_size {
 				warn!(target:"net", "Unexpected connection data");
 				return Ok(WriteStatus::Complete)
 			}
-			match self.socket.try_write_buf(buf) {
-				Ok(Some(size)) if (buf.position() as usize) < send_size => {
+			let buf = buf as &mut Buf;
+			match self.socket.try_write(buf.bytes()) {
+				Ok(Some(size)) if (pos + size) < send_size => {
+					buf.advance(size);
 					self.stats.inc_send(size);
 					Ok(WriteStatus::Ongoing)
 				},
-				Ok(Some(size)) if (buf.position() as usize) == send_size => {
+				Ok(Some(size)) if (pos + size) == send_size => {
 					self.stats.inc_send(size);
 					trace!(target:"network", "{}: Wrote {} bytes", self.token, send_size);
 					Ok(WriteStatus::Complete)
@@ -151,7 +157,7 @@ impl<Socket: GenericSocket> GenericConnection<Socket> {
 				self.send_queue.pop_front();
 			}
 			if self.send_queue.is_empty() {
-				self.interest.remove(EventSet::writable());
+				self.interest.remove(Ready::writable());
 				try!(io.update_registration(self.token));
 			}
 			Ok(r)
@@ -171,7 +177,7 @@ impl Connection {
 			send_queue: VecDeque::new(),
 			rec_buf: Bytes::new(),
 			rec_size: 0,
-			interest: EventSet::hup() | EventSet::readable(),
+			interest: Ready::hup() | Ready::readable(),
 			stats: stats,
 			registered: AtomicBool::new(false),
 		}
@@ -205,7 +211,7 @@ impl Connection {
 			rec_buf: Vec::new(),
 			rec_size: 0,
 			send_queue: self.send_queue.clone(),
-			interest: EventSet::hup(),
+			interest: Ready::hup(),
 			stats: self.stats.clone(),
 			registered: AtomicBool::new(false),
 		})
@@ -499,7 +505,7 @@ mod tests {
 	use std::sync::atomic::AtomicBool;
 	use super::super::stats::*;
 	use std::io::{Read, Write, Error, Cursor, ErrorKind};
-	use mio::{EventSet};
+	use mio::{Ready};
 	use std::collections::VecDeque;
 	use util::bytes::*;
 	use devtools::*;
@@ -545,7 +551,7 @@ mod tests {
 				send_queue: VecDeque::new(),
 				rec_buf: Bytes::new(),
 				rec_size: 0,
-				interest: EventSet::hup() | EventSet::readable(),
+				interest: Ready::hup() | Ready::readable(),
 				stats: Arc::<NetworkStats>::new(NetworkStats::new()),
 				registered: AtomicBool::new(false),
 			}
@@ -568,7 +574,7 @@ mod tests {
 				send_queue: VecDeque::new(),
 				rec_buf: Bytes::new(),
 				rec_size: 0,
-				interest: EventSet::hup() | EventSet::readable(),
+				interest: Ready::hup() | Ready::readable(),
 				stats: Arc::<NetworkStats>::new(NetworkStats::new()),
 				registered: AtomicBool::new(false),
 			}
diff --git a/util/network/src/discovery.rs b/util/network/src/discovery.rs
index 0aa775031..1f506ee89 100644
--- a/util/network/src/discovery.rs
+++ b/util/network/src/discovery.rs
@@ -20,6 +20,7 @@ use std::collections::{HashSet, HashMap, BTreeMap, VecDeque};
 use std::mem;
 use std::default::Default;
 use mio::*;
+use mio::deprecated::{Handler, EventLoop};
 use mio::udp::*;
 use util::sha3::*;
 use time;
@@ -108,7 +109,7 @@ pub struct TableUpdates {
 
 impl Discovery {
 	pub fn new(key: &KeyPair, listen: SocketAddr, public: NodeEndpoint, token: StreamToken, allow_ips: AllowIP) -> Discovery {
-		let socket = UdpSocket::bound(&listen).expect("Error binding UDP socket");
+		let socket = UdpSocket::bind(&listen).expect("Error binding UDP socket");
 		Discovery {
 			id: key.public().clone(),
 			id_hash: key.public().sha3(),
@@ -532,15 +533,15 @@ impl Discovery {
 	}
 
 	pub fn register_socket<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
-		event_loop.register(&self.udp_socket, Token(self.token), EventSet::all(), PollOpt::edge()).expect("Error registering UDP socket");
+		event_loop.register(&self.udp_socket, Token(self.token), Ready::all(), PollOpt::edge()).expect("Error registering UDP socket");
 		Ok(())
 	}
 
 	pub fn update_registration<Host:Handler>(&self, event_loop: &mut EventLoop<Host>) -> Result<(), NetworkError> {
 		let registration = if !self.send_queue.is_empty() {
-			EventSet::readable() | EventSet::writable()
+			Ready::readable() | Ready::writable()
 		} else {
-			EventSet::readable()
+			Ready::readable()
 		};
 		event_loop.reregister(&self.udp_socket, Token(self.token), registration, PollOpt::edge()).expect("Error reregistering UDP socket");
 		Ok(())
diff --git a/util/network/src/host.rs b/util/network/src/host.rs
index d6e530d6f..9b9906cc3 100644
--- a/util/network/src/host.rs
+++ b/util/network/src/host.rs
@@ -26,6 +26,7 @@ use std::io::{Read, Write};
 use std::fs;
 use ethkey::{KeyPair, Secret, Random, Generator};
 use mio::*;
+use mio::deprecated::{EventLoop};
 use mio::tcp::*;
 use util::hash::*;
 use util::Hashable;
@@ -744,8 +745,7 @@ impl Host {
 		trace!(target: "network", "Accepting incoming connection");
 		loop {
 			let socket = match self.tcp_listener.lock().accept() {
-				Ok(None) => break,
-				Ok(Some((sock, _addr))) => sock,
+				Ok((sock, _addr)) => sock,
 				Err(e) => {
 					warn!("Error accepting connection: {:?}", e);
 					break
@@ -1101,7 +1101,7 @@ impl IoHandler<NetworkIoMessage> for Host {
 				}
 			}
 			DISCOVERY => self.discovery.lock().as_ref().unwrap().register_socket(event_loop).expect("Error registering discovery socket"),
-			TCP_ACCEPT => event_loop.register(&*self.tcp_listener.lock(), Token(TCP_ACCEPT), EventSet::all(), PollOpt::edge()).expect("Error registering stream"),
+			TCP_ACCEPT => event_loop.register(&*self.tcp_listener.lock(), Token(TCP_ACCEPT), Ready::all(), PollOpt::edge()).expect("Error registering stream"),
 			_ => warn!("Unexpected stream registration")
 		}
 	}
@@ -1129,7 +1129,7 @@ impl IoHandler<NetworkIoMessage> for Host {
 				}
 			}
 			DISCOVERY => self.discovery.lock().as_ref().unwrap().update_registration(event_loop).expect("Error reregistering discovery socket"),
-			TCP_ACCEPT => event_loop.reregister(&*self.tcp_listener.lock(), Token(TCP_ACCEPT), EventSet::all(), PollOpt::edge()).expect("Error reregistering stream"),
+			TCP_ACCEPT => event_loop.reregister(&*self.tcp_listener.lock(), Token(TCP_ACCEPT), Ready::all(), PollOpt::edge()).expect("Error reregistering stream"),
 			_ => warn!("Unexpected stream update")
 		}
 	}
diff --git a/util/network/src/lib.rs b/util/network/src/lib.rs
index fcd36235a..f21cb498d 100644
--- a/util/network/src/lib.rs
+++ b/util/network/src/lib.rs
@@ -70,6 +70,7 @@ extern crate slab;
 extern crate ethkey;
 extern crate ethcrypto as crypto;
 extern crate rlp;
+extern crate bytes;
 
 #[macro_use]
 extern crate log;
diff --git a/util/network/src/session.rs b/util/network/src/session.rs
index 6d6009535..b1224f56d 100644
--- a/util/network/src/session.rs
+++ b/util/network/src/session.rs
@@ -19,6 +19,7 @@ use std::net::SocketAddr;
 use std::cmp::Ordering;
 use std::sync::*;
 use mio::*;
+use mio::deprecated::{Handler, EventLoop};
 use mio::tcp::*;
 use util::hash::*;
 use rlp::*;

From 0189481ee6b374d9a94e56e672e745a919cbfb7d Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 30 Oct 2016 09:10:18 +0000
Subject: [PATCH 32/42] [ci skip] js-precompiled 20161030-090922

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8435e4f6e..357dd27ee 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#fdf739c062200a19678efa212c7cd7245584d979"
+source = "git+https://github.com/ethcore/js-precompiled.git#bf27c9a8c87c8a678d9d247dc9bb776fb6c9caf4"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 7896f5c05..8e9db5432 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 4ded10fcbe3602b404a83f84aa069b4b4fa78db3 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sun, 30 Oct 2016 12:19:20 +0100
Subject: [PATCH 33/42] Fixed transaction propagation (#2984)

---
 sync/src/chain.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sync/src/chain.rs b/sync/src/chain.rs
index 72df47c07..7f48daa71 100644
--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -1349,7 +1349,7 @@ impl ChainSync {
 	/// Called when peer sends us new transactions
 	fn on_peer_transactions(&mut self, io: &mut SyncIo, peer_id: PeerId, r: &UntrustedRlp) -> Result<(), PacketDecodeError> {
 		// Accept transactions only when fully synced
-		if !io.is_chain_queue_empty() || self.state != SyncState::Idle || self.state != SyncState::NewBlocks {
+		if !io.is_chain_queue_empty() || (self.state != SyncState::Idle && self.state != SyncState::NewBlocks) {
 			trace!(target: "sync", "{} Ignoring transactions while syncing", peer_id);
 			return Ok(());
 		}

From 10a6e95d8aaab83f5e8d4546cf30dfb36ee83c41 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 30 Oct 2016 12:20:52 +0100
Subject: [PATCH 34/42] Display network status for finished Signer requests
 (#2983)

* Display confirmation for finished requests

* Update box padding
---
 js/src/ui/TxHash/txHash.css                   |  5 +++-
 js/src/ui/TxHash/txHash.js                    | 16 +++++++---
 .../TransactionFinished.css                   |  5 ++--
 .../TransactionFinished.js                    | 29 +++++++++++++------
 4 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/js/src/ui/TxHash/txHash.css b/js/src/ui/TxHash/txHash.css
index c57aef3d4..ef55ee701 100644
--- a/js/src/ui/TxHash/txHash.css
+++ b/js/src/ui/TxHash/txHash.css
@@ -23,6 +23,7 @@
 
 .hash {
   padding-top: 1em;
+  word-break: break-all;
 }
 
 .confirm {
@@ -31,11 +32,13 @@
 }
 
 .progressbar {
-  margin: 0.5em !important;
+  margin: 0.5em 0 !important;
   width: 30% !important;
+  min-width: 220px;
   display: inline-block !important;
   height: 0.75em !important;
 }
 
 .progressinfo {
+  text-align: center;
 }
diff --git a/js/src/ui/TxHash/txHash.js b/js/src/ui/TxHash/txHash.js
index fa6304d18..5af000499 100644
--- a/js/src/ui/TxHash/txHash.js
+++ b/js/src/ui/TxHash/txHash.js
@@ -30,7 +30,8 @@ class TxHash extends Component {
 
   static propTypes = {
     hash: PropTypes.string.isRequired,
-    isTest: PropTypes.bool
+    isTest: PropTypes.bool,
+    summary: PropTypes.bool
   }
 
   state = {
@@ -55,13 +56,20 @@ class TxHash extends Component {
   }
 
   render () {
-    const { hash, isTest } = this.props;
+    const { hash, isTest, summary } = this.props;
+    let header = null;
 
-    return (
-      <div className={ styles.details }>
+    if (!summary) {
+      header = (
         <div className={ styles.header }>
           The transaction has been posted to the network with a transaction hash of
         </div>
+      );
+    }
+
+    return (
+      <div className={ styles.details }>
+        { header }
         <div className={ styles.hash }>
           <a href={ txLink(hash, isTest) } target='_blank'>{ hash }</a>
         </div>
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css
index be995fe17..ef7c75f08 100644
--- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css
+++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.css
@@ -29,7 +29,7 @@
 
 .statusContainer {
   width: 220px;
-  padding: 20px 40px 0 40px;
+  padding: 0 40px 0 40px;
   /*border-left: 1px solid #aaa;*/
   position: absolute;
   top: 0;
@@ -46,7 +46,8 @@
 }
 
 .isRejected {
-  opacity: 0.7;
+  opacity: 0.5;
+  padding-top: 2em;
 }
 
 .txHash {
diff --git a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
index 3b4f46751..b781adb6d 100644
--- a/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
+++ b/js/src/views/Signer/components/TransactionFinished/TransactionFinished.js
@@ -17,6 +17,9 @@
 import React, { Component, PropTypes } from 'react';
 
 import CircularProgress from 'material-ui/CircularProgress';
+
+import { TxHash } from '../../../../ui';
+
 import TransactionMainDetails from '../TransactionMainDetails';
 import TxHashLink from '../TxHashLink';
 import TransactionSecondaryDetails from '../TransactionSecondaryDetails';
@@ -57,7 +60,7 @@ export default class TransactionFinished extends Component {
   };
 
   componentWillMount () {
-    const { gas, gasPrice, value } = this.props;
+    const { from, to, gas, gasPrice, value } = this.props;
     const fee = tUtil.getFee(gas, gasPrice); // BigNumber object
     const totalValue = tUtil.getTotalValue(fee, value);
     this.setState({ totalValue });
@@ -70,9 +73,10 @@ export default class TransactionFinished extends Component {
         console.error('could not fetch chain', err);
       });
 
-    const { from, to } = this.props;
     this.fetchBalance(from, 'fromBalance');
-    if (to) this.fetchBalance(to, 'toBalance');
+    if (to) {
+      this.fetchBalance(to, 'toBalance');
+    }
   }
 
   render () {
@@ -109,13 +113,20 @@ export default class TransactionFinished extends Component {
   }
 
   renderStatus () {
-    const { status } = this.props;
-    const klass = status === 'confirmed' ? styles.isConfirmed : styles.isRejected;
+    const { status, txHash } = this.props;
+
+    if (status !== 'confirmed') {
+      return (
+        <div>
+          <span className={ styles.isRejected }>{ capitalize(status) }</span>
+        </div>
+      );
+    }
+
     return (
-      <div>
-        <span className={ klass }>{ capitalize(status) }</span>
-        { this.renderTxHash() }
-      </div>
+      <TxHash
+        summary
+        hash={ txHash } />
     );
   }
 

From 0b835323b95853f44baf1e33a3f8a31bf66c42a0 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 30 Oct 2016 11:34:48 +0000
Subject: [PATCH 35/42] [ci skip] js-precompiled 20161030-113341

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 357dd27ee..bbb87c3c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#bf27c9a8c87c8a678d9d247dc9bb776fb6c9caf4"
+source = "git+https://github.com/ethcore/js-precompiled.git#6edb30ec44dba32f4b8a9355bf6ed140e892ad80"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 8e9db5432..dc540e6ab 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 43f40d37f6b0c80b2f1eb0d456efafef1c2aab9a Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sun, 30 Oct 2016 13:05:33 +0100
Subject: [PATCH 36/42] Allow build warnings (#2985)

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1d69dbce0..efd91663d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -5,7 +5,7 @@ variables:
   GIT_DEPTH: "3"
   SIMPLECOV: "true"
   RUST_BACKTRACE: "1"
-  RUSTFLAGS: "-D warnings"
+  RUSTFLAGS: ""
 cache:
   key: "$CI_BUILD_NAME/$CI_BUILD_REF_NAME"
   untracked: true
@@ -316,7 +316,7 @@ windows:
     - set INCLUDE=C:\Program Files (x86)\Microsoft SDKs\Windows\v7.1A\Include;C:\vs2015\VC\include;C:\Program Files (x86)\Windows Kits\10\Include\10.0.10240.0\ucrt
     - set LIB=C:\vs2015\VC\lib;C:\Program Files (x86)\Windows Kits\10\Lib\10.0.10240.0\ucrt\x64
     - set RUST_BACKTRACE=1
-    - set RUSTFLAGS=%RUSTFLAGS% -Zorbit=off -D warnings
+    - set RUSTFLAGS=%RUSTFLAGS% -Zorbit=off
     - rustup default stable-x86_64-pc-windows-msvc
     - cargo build --release --verbose
     - curl -sL --url "https://github.com/ethcore/win-build/raw/master/SimpleFC.dll" -o nsis\SimpleFC.dll

From d3a2f7dce92bd238385d0cfc90a2ffebbe5ef9de Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 30 Oct 2016 12:07:40 +0000
Subject: [PATCH 37/42] [ci skip] js-precompiled 20161030-120641

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index bbb87c3c6..3f5dd2601 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#6edb30ec44dba32f4b8a9355bf6ed140e892ad80"
+source = "git+https://github.com/ethcore/js-precompiled.git#40526fa76637935ab2dcbafcbafa9bbb7999d7cd"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index dc540e6ab..4c5e236ab 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 6931878ff1923a220a1a962c86002b0b39c01abb Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sun, 30 Oct 2016 15:39:36 +0100
Subject: [PATCH 38/42] Networking and syncing tweaks (#2990)

* Reduce periodic snapshot delay

* Prevent connecting to peers over the min_peers limit

* Smaller block requests for slower connections
---
 parity/run.rs            |  2 +-
 sync/src/block_sync.rs   |  2 +-
 util/network/src/host.rs | 44 +++++++++++++++++++++-------------------
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/parity/run.rs b/parity/run.rs
index 7f35f3514..7e7e7456a 100644
--- a/parity/run.rs
+++ b/parity/run.rs
@@ -53,7 +53,7 @@ use url;
 const SNAPSHOT_PERIOD: u64 = 10000;
 
 // how many blocks to wait before starting a periodic snapshot.
-const SNAPSHOT_HISTORY: u64 = 500;
+const SNAPSHOT_HISTORY: u64 = 100;
 
 #[derive(Debug, PartialEq)]
 pub struct RunCmd {
diff --git a/sync/src/block_sync.rs b/sync/src/block_sync.rs
index a45553f52..277067537 100644
--- a/sync/src/block_sync.rs
+++ b/sync/src/block_sync.rs
@@ -29,7 +29,7 @@ use sync_io::SyncIo;
 use blocks::BlockCollection;
 
 const MAX_HEADERS_TO_REQUEST: usize = 128;
-const MAX_BODIES_TO_REQUEST: usize = 128;
+const MAX_BODIES_TO_REQUEST: usize = 64;
 const MAX_RECEPITS_TO_REQUEST: usize = 128;
 const SUBCHAIN_SIZE: u64 = 256;
 const MAX_ROUND_PARENTS: usize = 32;
diff --git a/util/network/src/host.rs b/util/network/src/host.rs
index 9b9906cc3..b5e4ed914 100644
--- a/util/network/src/host.rs
+++ b/util/network/src/host.rs
@@ -747,7 +747,7 @@ impl Host {
 			let socket = match self.tcp_listener.lock().accept() {
 				Ok((sock, _addr)) => sock,
 				Err(e) => {
-					warn!("Error accepting connection: {:?}", e);
+					debug!(target: "network", "Error accepting connection: {:?}", e);
 					break
 				},
 			};
@@ -801,29 +801,31 @@ impl Host {
 					},
 					Ok(SessionData::Ready) => {
 						self.num_sessions.fetch_add(1, AtomicOrdering::SeqCst);
-						if !s.info.originated {
-							let session_count = self.session_count();
-							let (max_peers, reserved_only) = {
-								let info = self.info.read();
-								let mut max_peers = info.config.max_peers;
-								for cap in s.info.capabilities.iter() {
-									if let Some(num) = info.config.reserved_protocols.get(&cap.protocol) {
-										max_peers += *num;
-										break;
-									}
-								}
-								(max_peers, info.config.non_reserved_mode == NonReservedPeerMode::Deny)
-							};
-
-							if session_count >= max_peers as usize || reserved_only {
-								// only proceed if the connecting peer is reserved.
-								if !self.reserved_nodes.read().contains(s.id().unwrap()) {
-									s.disconnect(io, DisconnectReason::TooManyPeers);
-									return;
+						let session_count = self.session_count();
+						let (min_peers, max_peers, reserved_only) = {
+							let info = self.info.read();
+							let mut max_peers = info.config.max_peers;
+							for cap in s.info.capabilities.iter() {
+								if let Some(num) = info.config.reserved_protocols.get(&cap.protocol) {
+									max_peers += *num;
+									break;
 								}
 							}
+							(info.config.min_peers as usize, max_peers as usize, info.config.non_reserved_mode == NonReservedPeerMode::Deny)
+						};
 
-							// Add it no node table
+						if reserved_only ||
+							(s.info.originated && session_count >= min_peers) ||
+							(!s.info.originated && session_count >= max_peers) {
+							// only proceed if the connecting peer is reserved.
+							if !self.reserved_nodes.read().contains(s.id().unwrap()) {
+								s.disconnect(io, DisconnectReason::TooManyPeers);
+								return;
+							}
+						}
+
+						// Add it to the node table
+						if !s.info.originated {
 							if let Ok(address) = s.remote_addr() {
 								let entry = NodeEntry { id: s.id().unwrap().clone(), endpoint: NodeEndpoint { address: address, udp_port: address.port() } };
 								self.nodes.write().add_node(Node::new(entry.id.clone(), entry.endpoint.clone()));

From 6b85d58ae733750c485982793c9b479776c0e2b8 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 30 Oct 2016 14:42:20 +0000
Subject: [PATCH 39/42] [ci skip] js-precompiled 20161030-144119

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 3f5dd2601..ed7044ba6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#40526fa76637935ab2dcbafcbafa9bbb7999d7cd"
+source = "git+https://github.com/ethcore/js-precompiled.git#52ebdd068617632f11ff9e4d80614d77eaad48e6"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index 4c5e236ab..fb2945342 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From cf027d74f93a3a6fb13b7dbeb46582f318d147e4 Mon Sep 17 00:00:00 2001
From: Arkadiy Paronyan <arkady.paronyan@gmail.com>
Date: Sun, 30 Oct 2016 17:48:36 +0100
Subject: [PATCH 40/42] Print messages to stderr (#2991)

---
 parity/cli/usage.rs | 23 +++++++++++++++--------
 parity/main.rs      |  4 ++--
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/parity/cli/usage.rs b/parity/cli/usage.rs
index da406d36a..a38c28876 100644
--- a/parity/cli/usage.rs
+++ b/parity/cli/usage.rs
@@ -14,6 +14,13 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.
 
+macro_rules! println_stderr(
+    ($($arg:tt)*) => { {
+        let r = writeln!(&mut ::std::io::stderr(), $($arg)*);
+        r.expect("failed printing to stderr");
+    } }
+);
+
 macro_rules! otry {
 	($e: expr) => (
 		match $e {
@@ -39,7 +46,7 @@ macro_rules! usage {
 	) => {
 		use toml;
 		use std::{fs, io, process};
-		use std::io::Read;
+		use std::io::{Read, Write};
 		use util::version;
 		use docopt::{Docopt, Error as DocoptError};
 		use helpers::replace_home;
@@ -58,20 +65,20 @@ macro_rules! usage {
 				match self {
 					ArgsError::Docopt(e) => e.exit(),
 					ArgsError::Parsing(errors) => {
-						println!("There is an error in config file.");
+						println_stderr!("There is an error in config file.");
 						for e in &errors {
-							println!("{}", e);
+							println_stderr!("{}", e);
 						}
 						process::exit(2)
 					},
 					ArgsError::Decode(e) => {
-						println!("You might have supplied invalid parameters in config file.");
-						println!("{}", e);
+						println_stderr!("You might have supplied invalid parameters in config file.");
+						println_stderr!("{}", e);
 						process::exit(2)
 					},
 					ArgsError::Config(path, e) => {
-						println!("There was an error reading your config file at: {}", path);
-						println!("{}", e);
+						println_stderr!("There was an error reading your config file at: {}", path);
+						println_stderr!("{}", e);
 						process::exit(2)
 					}
 				}
@@ -136,7 +143,7 @@ macro_rules! usage {
 				let config = match (fs::File::open(&config_file), raw_args.flag_config.is_some()) {
 					// Load config file
 					(Ok(mut file), _) => {
-						println!("Loading config file from {}", &config_file);
+						println_stderr!("Loading config file from {}", &config_file);
 						let mut config = String::new();
 						try!(file.read_to_string(&mut config).map_err(|e| ArgsError::Config(config_file, e)));
 						try!(Self::parse_config(&config))
diff --git a/parity/main.rs b/parity/main.rs
index e0d6dfe36..83598231a 100644
--- a/parity/main.rs
+++ b/parity/main.rs
@@ -207,10 +207,10 @@ fn main() {
 
 	match start() {
 		Ok(result) => {
-			println!("{}", result);
+			info!("{}", result);
 		},
 		Err(err) => {
-			println!("{}", err);
+			info!("{}", err);
 			process::exit(1);
 		}
 	}

From 3e8900db3e80a9e9e9e84b85b0877a4df512be06 Mon Sep 17 00:00:00 2001
From: GitLab Build Bot <jaco+gitlab@ethcore.io>
Date: Sun, 30 Oct 2016 16:50:29 +0000
Subject: [PATCH 41/42] [ci skip] js-precompiled 20161030-164930

---
 Cargo.lock      | 2 +-
 js/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed7044ba6..92fb0f8d5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1235,7 +1235,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/ethcore/js-precompiled.git#52ebdd068617632f11ff9e4d80614d77eaad48e6"
+source = "git+https://github.com/ethcore/js-precompiled.git#eec3d41e6fd1a10e4d69470a9e8c2a7b1b464466"
 dependencies = [
  "parity-dapps-glue 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
diff --git a/js/package.json b/js/package.json
index fb2945342..ecd749792 100644
--- a/js/package.json
+++ b/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "parity.js",
-  "version": "0.1.4",
+  "version": "0.1.5",
   "main": "release/index.js",
   "jsnext:main": "src/index.js",
   "author": "Parity Team <admin@parity.io>",

From 6da02e0a7a67f006e94fabde20cc057182e6a1f0 Mon Sep 17 00:00:00 2001
From: Jaco Greeff <jacogr@gmail.com>
Date: Sun, 30 Oct 2016 20:38:07 +0100
Subject: [PATCH 42/42] s/Used/Provided/ gas (#2993)

---
 js/src/ui/MethodDecoding/methodDecoding.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/src/ui/MethodDecoding/methodDecoding.js b/js/src/ui/MethodDecoding/methodDecoding.js
index 21e7730e8..fab293784 100644
--- a/js/src/ui/MethodDecoding/methodDecoding.js
+++ b/js/src/ui/MethodDecoding/methodDecoding.js
@@ -139,7 +139,7 @@ class MethodDecoding extends Component {
 
     return (
       <div className={ styles.gasDetails }>
-        { historic ? 'Used' : 'Will use' } <span className={ styles.highlight }>{ gas.toFormat(0) } gas ({ gasPrice.div(1000000).toFormat(0) }M/<small>ETH</small>)</span> for a total transaction cost of <span className={ styles.highlight }>{ this.renderEtherValue(gasValue) }</span>
+        { historic ? 'Provided' : 'Provides' } <span className={ styles.highlight }>{ gas.toFormat(0) } gas ({ gasPrice.div(1000000).toFormat(0) }M/<small>ETH</small>)</span> for a total transaction value of <span className={ styles.highlight }>{ this.renderEtherValue(gasValue) }</span>
       </div>
     );
   }