Bump stable to 1.8.11 (#8010 )

[ci skip] js-precompiled 20180227-201617
[stable] Backports (#8008 )
2018-02-27 21:21:56 +01:00 · 2018-02-27 20:20:43 +00:00 · 2018-02-27 20:07:23 +01:00 · 2018-02-19 16:11:54 +00:00 · 2018-02-19 15:36:06 +01:00 · 2018-02-19 11:52:39 +01:00
16 changed files with 1039 additions and 77 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -372,7 +372,7 @@ dependencies = [
 "bloomable 0.1.0",
 "ethcore-bigint 0.1.3",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethjson 0.1.0",
 "hash 0.1.0",
 "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -586,7 +586,7 @@ dependencies = [
 "ethcore-ipc-nano 1.8.0",
 "ethcore-logger 1.8.0",
 "ethcore-stratum 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethjson 0.1.0",
 "ethkey 0.2.0",
 "ethstore 0.1.0",
@@ -681,7 +681,7 @@ version = "1.8.0"
 dependencies = [
 "ethcore-bigint 0.1.3",
 "ethcore-devtools 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -731,7 +731,7 @@ dependencies = [
 "ethcore-ipc 1.8.0",
 "ethcore-ipc-codegen 1.8.0",
 "ethcore-ipc-nano 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "nanomsg 0.5.1 (git+https://github.com/paritytech/nanomsg.rs.git?branch=parity-1.7)",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -750,7 +750,7 @@ dependencies = [
 "ethcore-ipc 1.8.0",
 "ethcore-ipc-codegen 1.8.0",
 "ethcore-network 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "evm 0.1.0",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "hash 0.1.0",
@@ -802,7 +802,7 @@ dependencies = [
 "ethcore-devtools 1.8.0",
 "ethcore-io 1.8.0",
 "ethcore-logger 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethcrypto 0.1.0",
 "ethkey 0.2.0",
 "hash 0.1.0",
@@ -811,7 +811,7 @@ dependencies = [
 "libc 0.2.31 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "mio 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "parity-version 1.8.10",
+ "parity-version 1.8.11",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "path 0.1.0",
 "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -840,7 +840,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.8.0",
 "ethcore-ipc-nano 1.8.0",
 "ethcore-logger 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethcrypto 0.1.0",
 "ethkey 0.2.0",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -876,7 +876,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.8.0",
 "ethcore-ipc-nano 1.8.0",
 "ethcore-logger 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "hash 0.1.0",
 "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
 "jsonrpc-macros 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
@@ -889,7 +889,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.8.10"
+version = "1.8.11"
 dependencies = [
 "clippy 0.0.103 (registry+https://github.com/rust-lang/crates.io-index)",
 "elastic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -909,7 +909,7 @@ dependencies = [
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "memorydb 0.1.0",
- "parity-version 1.8.10",
+ "parity-version 1.8.11",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "patricia_trie 0.1.0",
 "rlp 0.2.0",
@@ -1025,7 +1025,7 @@ dependencies = [
 "ethcore-ipc-nano 1.8.0",
 "ethcore-light 1.8.0",
 "ethcore-network 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethkey 0.2.0",
 "hash 0.1.0",
 "heapsize 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1052,7 +1052,7 @@ dependencies = [
 "common-types 0.1.0",
 "ethcore-bigint 0.1.3",
 "ethcore-logger 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethjson 0.1.0",
 "evmjit 1.8.0",
 "hash 0.1.0",
@@ -1074,7 +1074,7 @@ dependencies = [
 "ethcore 1.8.0",
 "ethcore-bigint 0.1.3",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethjson 0.1.0",
 "evm 0.1.0",
 "panic_hook 0.1.0",
@@ -1372,8 +1372,8 @@ dependencies = [
 "ethcore-bigint 0.1.3",
 "ethcore-ipc 1.8.0",
 "ethcore-ipc-codegen 1.8.0",
- "ethcore-util 1.8.10",
- "parity-version 1.8.10",
+ "ethcore-util 1.8.11",
+ "parity-version 1.8.11",
 "semver 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

@@ -1505,7 +1505,7 @@ dependencies = [
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ws 0.7.1 (git+https://github.com/tomusdrw/ws-rs)",
+ "ws 0.7.5 (git+https://github.com/tomusdrw/ws-rs)",
 ]

 [[package]]
@@ -1884,7 +1884,7 @@ dependencies = [
 "ethcore-bytes 0.1.0",
 "ethcore-io 1.8.0",
 "ethcore-network 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "kvdb-memorydb 0.1.0",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2083,7 +2083,7 @@ dependencies = [

 [[package]]
 name = "parity"
-version = "1.8.10"
+version = "1.8.11"
 dependencies = [
 "ansi_term 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "app_dirs 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2107,7 +2107,7 @@ dependencies = [
 "ethcore-network 1.8.0",
 "ethcore-secretstore 1.0.0",
 "ethcore-stratum 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethkey 0.2.0",
 "ethsync 1.8.0",
 "fdlimit 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2133,7 +2133,7 @@ dependencies = [
 "parity-rpc 1.8.0",
 "parity-rpc-client 1.4.0",
 "parity-updater 1.8.0",
- "parity-version 1.8.10",
+ "parity-version 1.8.11",
 "parity-whisper 0.1.0",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "path 0.1.0",
@@ -2166,7 +2166,7 @@ dependencies = [
 "ethcore-bigint 0.1.3",
 "ethcore-bytes 0.1.0",
 "ethcore-devtools 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "fetch 0.1.0",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "futures-cpupool 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2182,7 +2182,7 @@ dependencies = [
 "parity-hash-fetch 1.8.0",
 "parity-reactor 0.1.0",
 "parity-ui 1.8.0",
- "parity-version 1.8.10",
+ "parity-version 1.8.11",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc-hex 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2229,7 +2229,7 @@ dependencies = [
 "ethabi 2.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-bigint 0.1.3",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "fetch 0.1.0",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "hash 0.1.0",
@@ -2251,7 +2251,7 @@ dependencies = [
 "ethcore 1.8.0",
 "ethcore-bigint 0.1.3",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "jsonrpc-core 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
 "jsonrpc-http-server 8.0.0 (git+https://github.com/paritytech/jsonrpc.git?branch=parity-1.8)",
 "multihash 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2265,7 +2265,7 @@ version = "0.1.0"
 dependencies = [
 "ethcore 1.8.0",
 "ethcore-io 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethkey 0.2.0",
 "kvdb 0.1.0",
 "kvdb-memorydb 0.1.0",
@@ -2281,7 +2281,7 @@ name = "parity-machine"
 version = "0.1.0"
 dependencies = [
 "ethcore-bigint 0.1.3",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 ]

 [[package]]
@@ -2309,7 +2309,7 @@ dependencies = [
 "ethcore-light 1.8.0",
 "ethcore-logger 1.8.0",
 "ethcore-network 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethcrypto 0.1.0",
 "ethjson 0.1.0",
 "ethkey 0.2.0",
@@ -2335,7 +2335,7 @@ dependencies = [
 "order-stat 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-reactor 0.1.0",
 "parity-updater 1.8.0",
- "parity-version 1.8.10",
+ "parity-version 1.8.11",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "pretty_assertions 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "rand 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2406,7 +2406,7 @@ dependencies = [
 [[package]]
 name = "parity-ui-precompiled"
 version = "1.4.0"
-source = "git+https://github.com/paritytech/js-precompiled.git?branch=stable#8458a6b0bab9c42896c2577d2bb55c0a1d86febe"
+source = "git+https://github.com/paritytech/js-precompiled.git?branch=stable#8bb56b99d68982128a7d97365ecfda548b0c4706"
 dependencies = [
 "parity-dapps-glue 1.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -2421,14 +2421,14 @@ dependencies = [
 "ethcore-bytes 0.1.0",
 "ethcore-ipc 1.8.0",
 "ethcore-ipc-codegen 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethsync 1.8.0",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "ipc-common-types 1.8.0",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-hash-fetch 1.8.0",
 "parity-reactor 0.1.0",
- "parity-version 1.8.10",
+ "parity-version 1.8.11",
 "parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "path 0.1.0",
 "target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2436,7 +2436,7 @@ dependencies = [

 [[package]]
 name = "parity-version"
-version = "1.8.10"
+version = "1.8.11"
 dependencies = [
 "ethcore-bytes 0.1.0",
 "rlp 0.2.0",
@@ -2898,7 +2898,7 @@ name = "rpc-cli"
 version = "1.4.0"
 dependencies = [
 "bigint 4.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "futures 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-rpc 1.8.0",
 "parity-rpc-client 1.4.0",
@@ -3618,7 +3618,7 @@ dependencies = [
 "common-types 0.1.0",
 "ethcore-bigint 0.1.3",
 "ethcore-bytes 0.1.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "ethjson 0.1.0",
 "evmjit 1.8.0",
 "hash 0.1.0",
@@ -3640,7 +3640,7 @@ dependencies = [
 "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-bigint 0.1.3",
 "ethcore-logger 1.8.0",
- "ethcore-util 1.8.10",
+ "ethcore-util 1.8.11",
 "log 0.3.8 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-wasm 0.15.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "vm 0.1.0",
@@ -3673,8 +3673,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"

 [[package]]
 name = "ws"
-version = "0.7.1"
-source = "git+https://github.com/tomusdrw/ws-rs#f8306a798b7541d64624299a83a2c934f173beed"
+version = "0.7.5"
+source = "git+https://github.com/tomusdrw/ws-rs#368ce39e2aa8700d568ca29dbacaecdf1bf749d1"
 dependencies = [
 "byteorder 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "bytes 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -4013,7 +4013,7 @@ dependencies = [
 "checksum wasm-utils 0.1.0 (git+https://github.com/paritytech/wasm-utils)" = "<none>"
 "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
 "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
-"checksum ws 0.7.1 (git+https://github.com/tomusdrw/ws-rs)" = "<none>"
+"checksum ws 0.7.5 (git+https://github.com/tomusdrw/ws-rs)" = "<none>"
 "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
 "checksum xdg 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a66b7c2281ebde13cf4391d70d4c7e5946c3c25e72a7b859ca8f677dcd0b0c61"
 "checksum xml-rs 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7ec6c39eaa68382c8e31e35239402c0a9489d4141a8ceb0c716099a0b515b562"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "1.8.10"
+version = "1.8.11"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# [Parity](https://parity.io/) - fast, light, and robust Ethereum client 
+# [Parity](https://parity.io/) - fast, light, and robust Ethereum client

 [![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
 [![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
--- a/ethcore/src/snapshot/error.rs
+++ b/ethcore/src/snapshot/error.rs
@@ -57,6 +57,8 @@ pub enum Error {
 	VersionNotSupported(u64),
 	/// Max chunk size is to small to fit basic account data.
 	ChunkTooSmall,
+	/// Oversized chunk
+	ChunkTooLarge,
 	/// Snapshots not supported by the consensus engine.
 	SnapshotsUnsupported,
 	/// Bad epoch transition.
@@ -85,6 +87,7 @@ impl fmt::Display for Error {
 			Error::Trie(ref err) => err.fmt(f),
 			Error::VersionNotSupported(ref ver) => write!(f, "Snapshot version {} is not supprted.", ver),
 			Error::ChunkTooSmall => write!(f, "Chunk size is too small."),
+			Error::ChunkTooLarge => write!(f, "Chunk size is too large."),
 			Error::SnapshotsUnsupported => write!(f, "Snapshots unsupported by consensus engine."),
 			Error::BadEpochProof(i) => write!(f, "Bad epoch proof for transition to epoch {}", i),
 			Error::WrongChunkFormat(ref msg) => write!(f, "Wrong chunk format: {}", msg),
--- a/ethcore/src/snapshot/mod.rs
+++ b/ethcore/src/snapshot/mod.rs
@@ -86,6 +86,11 @@ mod traits {
 // Try to have chunks be around 4MB (before compression)
 const PREFERRED_CHUNK_SIZE: usize = 4 * 1024 * 1024;

+// Maximal chunk size (decompressed)
+// Snappy::decompressed_len estimation may sometimes yield results greater
+// than PREFERRED_CHUNK_SIZE so allow some threshold here.
+const MAX_CHUNK_SIZE: usize = PREFERRED_CHUNK_SIZE / 4 * 5;
+
 // Minimum supported state chunk version.
 const MIN_SUPPORTED_STATE_CHUNK_VERSION: u64 = 1;
 // current state chunk version.
--- a/ethcore/src/snapshot/service.rs
+++ b/ethcore/src/snapshot/service.rs
@@ -23,7 +23,7 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};

-use super::{ManifestData, StateRebuilder, Rebuilder, RestorationStatus, SnapshotService};
+use super::{ManifestData, StateRebuilder, Rebuilder, RestorationStatus, SnapshotService, MAX_CHUNK_SIZE};
 use super::io::{SnapshotReader, LooseReader, SnapshotWriter, LooseWriter};

 use blockchain::BlockChain;
@@ -130,6 +130,11 @@ impl Restoration {
 	// feeds a state chunk, aborts early if `flag` becomes false.
 	fn feed_state(&mut self, hash: H256, chunk: &[u8], flag: &AtomicBool) -> Result<(), Error> {
 		if self.state_chunks_left.contains(&hash) {
+			let expected_len = snappy::decompressed_len(chunk)?;
+			if expected_len > MAX_CHUNK_SIZE {
+				trace!(target: "snapshot", "Discarding large chunk: {} vs {}", expected_len, MAX_CHUNK_SIZE);
+				return Err(::snapshot::Error::ChunkTooLarge.into());
+			}
 			let len = snappy::decompress_into(chunk, &mut self.snappy_buffer)?;

 			self.state.feed(&self.snappy_buffer[..len], flag)?;
@@ -147,6 +152,11 @@ impl Restoration {
 	// feeds a block chunk
 	fn feed_blocks(&mut self, hash: H256, chunk: &[u8], engine: &EthEngine, flag: &AtomicBool) -> Result<(), Error> {
 		if self.block_chunks_left.contains(&hash) {
+			let expected_len = snappy::decompressed_len(chunk)?;
+			if expected_len > MAX_CHUNK_SIZE {
+				trace!(target: "snapshot", "Discarding large chunk: {} vs {}", expected_len, MAX_CHUNK_SIZE);
+				return Err(::snapshot::Error::ChunkTooLarge.into());
+			}
 			let len = snappy::decompress_into(chunk, &mut self.snappy_buffer)?;

 			self.secondary.feed(&self.snappy_buffer[..len], engine, flag)?;
--- a/js/package-lock.json
+++ b/js/package-lock.json
--- a/js/package.json
+++ b/js/package.json
@@ -26,7 +26,6 @@
    "Promise"
  ],
  "scripts": {
-    "install": "napa",
    "analize": "npm run analize:lib && npm run analize:dll && npm run analize:app",
    "analize:app": "WPANALIZE=1 webpack --config webpack/app --json > .build/analize.app.json && cat .build/analize.app.json | webpack-bundle-size-analyzer",
    "analize:lib": "WPANALIZE=1 webpack --config webpack/libraries --json > .build/analize.lib.json && cat .build/analize.lib.json | webpack-bundle-size-analyzer",
@@ -64,9 +63,6 @@
    "test:npm": "(cd .npmjs && npm i) && node test/npmParity && node test/npmJsonRpc && (rm -rf .npmjs/node_modules)",
    "prepush": "npm run lint:cached"
  },
-  "napa": {
-    "qrcode-generator": "kazuhikoarase/qrcode-generator"
-  },
  "devDependencies": {
    "babel-cli": "6.23.0",
    "babel-core": "6.23.1",
@@ -196,6 +192,7 @@
    "promise-worker": "1.1.1",
    "push.js": "0.0.11",
    "qs": "6.3.0",
+    "qrcode-generator": "1.3.1",
    "react": "15.4.2",
    "react-ace": "4.1.0",
    "react-addons-css-transition-group": "15.4.2",
@@ -209,7 +206,7 @@
    "react-intl": "2.1.5",
    "react-markdown": "2.4.4",
    "react-portal": "3.0.0",
-    "react-qr-reader": "1.1.3",
+    "react-qr-reader": "2.0.1",
    "react-redux": "4.4.6",
    "react-router": "3.0.0",
    "react-router-redux": "4.0.7",
@@ -232,6 +229,7 @@
    "valid-url": "1.0.9",
    "validator": "6.2.0",
    "web3": "0.17.0-beta",
+    "webrtc-adapter": "5.0.6",
    "whatwg-fetch": "2.0.1",
    "worker-loader": "^0.8.0",
    "yarn": "^0.21.3",
--- a/js/src/ui/QrCode/qrCode.js
+++ b/js/src/ui/QrCode/qrCode.js
@@ -14,7 +14,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-import qrcode from 'qrcode-generator/js/qrcode';
+import qrcode from 'qrcode-generator/qrcode';
 import React, { Component, PropTypes } from 'react';

 import { calculateType } from './qrSize';
--- a/mac/Parity.pkgproj
+++ b/mac/Parity.pkgproj
@@ -462,7 +462,7 @@
 				<key>OVERWRITE_PERMISSIONS</key>
 				<false/>
 				<key>VERSION</key>
-				<string>1.8.10</string>
+				<string>1.8.11</string>
 			</dict>
 			<key>UUID</key>
 			<string>2DCD5B81-7BAF-4DA1-9251-6274B089FD36</string>
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -10,7 +10,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 8
-!define VERSIONBUILD 10
+!define VERSIONBUILD 11
 !define ARGS ""
 !define FIRST_START_ARGS "--mode=passive ui"

--- a/parity/run.rs
+++ b/parity/run.rs
@@ -680,11 +680,15 @@ pub fn execute_impl(cmd: RunCmd, can_restart: bool, logger: Arc<RotatingLogger>)
 	let event_loop = EventLoop::spawn();

 	// the updater service
+	let mut updater_fetch = fetch.clone();
+	// parity binaries should be smaller than 128MB
+	updater_fetch.set_limit(Some(128 * 1024 * 1024));
+
 	let updater = Updater::new(
 		Arc::downgrade(&(service.client() as Arc<BlockChainClient>)),
 		Arc::downgrade(&sync_provider),
 		update_policy,
-		fetch.clone(),
+		updater_fetch,
 		event_loop.remote(),
 	);
 	service.add_notify(updater.clone());
--- a/scripts/gitlab-build.sh
+++ b/scripts/gitlab-build.sh
@@ -22,13 +22,10 @@ echo "Parity version:     " $VER
 echo "Branch:             " $CI_BUILD_REF_NAME
 echo "--------------------"

-echo "Rhash version:"
 # NOTE for md5 and sha256 we want to display filename as well
 # hence we use --* instead of -p *
 MD5_BIN="rhash --md5"
 SHA256_BIN="rhash --sha256"
-# NOTE For SHA3 we need only hash (hence -p)
-SHA3_BIN="rhash -p %{sha3-256}"

 set_env () {
  echo "Set ENVIROMENT"
@@ -70,14 +67,12 @@ strip_binaries () {
 calculate_checksums () {
  echo "Checksum calculation:"
  rhash --version
+
  rm -rf *.md5
  rm -rf *.sha256

-  export SHA3="$($SHA3_BIN target/$PLATFORM/release/parity$S3WIN)"
-  # NOTE rhash 1.3.1 doesnt support keccak, workaround
-  if [ "$SHA3" == "%{sha3-256}" ]; then
-    export SHA3="$(target/$PLATFORM/release/parity$S3WIN tools hash target/$PLATFORM/release/parity$S3WIN)"
-  fi
+  BIN="target/$PLATFORM/release/parity$S3WIN"
+  export SHA3="$($BIN tools hash $BIN)"

  echo "Parity file SHA3: $SHA3"
  $MD5_BIN target/$PLATFORM/release/parity$S3WIN > parity$S3WIN.md5
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.8.10"
+version = "1.8.11"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
--- a/util/fetch/src/client.rs
+++ b/util/fetch/src/client.rs
@@ -127,6 +127,11 @@ impl Client {
 		})
 	}

+	/// Sets a limit on the maximum download size.
+	pub fn set_limit(&mut self, limit: Option<usize>) {
+		self.limit = limit
+	}
+
 	fn client(&self) -> Result<Arc<reqwest::Client>, Error> {
 		{
 			let (ref time, ref client) = *self.client.read();
@@ -150,8 +155,8 @@ impl Fetch for Client {
 	type Result = CpuFuture<Response, Error>;

 	fn new() -> Result<Self, Error> {
-		// Max 50MB will be downloaded.
-		Self::with_limit(Some(50*1024*1024))
+		// Max 64MB will be downloaded.
+		Self::with_limit(Some(64 * 1024 * 1024))
 	}

 	fn process<F, I, E>(&self, f: F) -> BoxFuture<I, E> where
--- a/util/version/Cargo.toml
+++ b/util/version/Cargo.toml
@@ -3,7 +3,7 @@
 [package]
 name = "parity-version"
 # NOTE: this value is used for Parity version string (via env CARGO_PKG_VERSION)
-version = "1.8.10"
+version = "1.8.11"
 authors = ["Parity Technologies <admin@parity.io>"]
 build = "build.rs"
Author	SHA1	Message	Date
Rando	21522ff863	Bump stable to 1.8.11 (#8010 )	2018-02-27 21:21:56 +01:00
GitLab Build Bot	a02d7c68b3	[ci skip] js-precompiled 20180227-201617	2018-02-27 20:20:43 +00:00
Tomasz Drwięga	2738c5cd74	[stable] Backports (#8008 ) * Detect too large packets in snapshot sync. (#7977) * Increase max download limit to 128MB (#7965) * fetch: increase max download limit to 64MB * parity: increase download size limit for updater service * Calculate proper keccak256/sha3 using parity. (#7953) * Bump WS (#7952)	2018-02-27 20:07:23 +01:00
GitLab Build Bot	a51e4d5d13	[ci skip] js-precompiled 20180219-160529	2018-02-19 16:11:54 +00:00
Jaco Greeff	6c50f9007a	[stable] Bump react-qr-reader (#7941 ) * Bump react-qr-reader * Explicit add webrtc-adapter, non-napa qrcode-generator	2018-02-19 15:36:06 +01:00
Rando	78acefd35c	Yet another commit that does not contain the words "ci" or "skip".	2018-02-19 11:52:39 +01:00
GitLab Build Bot	c3a53e7545	[ci skip] js-precompiled 20180216-151336	2018-02-16 15:19:47 +00:00