Disconnect peers on a fork

v1.3.15
Merge pull request #3616 from ethcore/stable-testing
2016-12-10 16:32:10 +01:00 · 2016-12-10 10:50:49 +01:00 · 2016-11-25 18:44:02 +01:00 · 2016-11-25 14:37:58 +01:00 · 2016-11-25 13:27:23 +01:00 · 2016-11-25 13:11:50 +01:00
24 changed files with 449 additions and 75 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -297,7 +297,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% -D warnings
    - 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
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,6 +1,6 @@
 [root]
 name = "parity"
-version = "1.3.10"
+version = "1.3.15"
 dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "clippy 0.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -20,7 +20,7 @@ dependencies = [
 "ethcore-logger 1.3.0",
 "ethcore-rpc 1.3.0",
 "ethcore-signer 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "ethsync 1.3.0",
 "fdlimit 0.1.0",
 "hyper 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -35,7 +35,7 @@ dependencies = [
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "rustc_version 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)",
 "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "syntex 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
 "time 0.1.35 (registry+https://github.com/rust-lang/crates.io-index)",
 "winapi 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -270,7 +270,7 @@ dependencies = [
 "ethcore-ipc 1.3.0",
 "ethcore-ipc-codegen 1.3.0",
 "ethcore-ipc-nano 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "ethjson 0.1.0",
 "ethstore 0.1.0",
 "evmjit 1.3.0",
@@ -294,7 +294,7 @@ version = "1.3.0"
 dependencies = [
 "clippy 0.0.80 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-rpc 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "hyper 0.9.4 (git+https://github.com/ethcore/hyper)",
 "jsonrpc-core 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "jsonrpc-http-server 6.1.0 (git+https://github.com/ethcore/jsonrpc-http-server.git?branch=beta)",
@@ -336,7 +336,7 @@ name = "ethcore-ipc"
 version = "1.3.0"
 dependencies = [
 "ethcore-devtools 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
 "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -381,7 +381,7 @@ dependencies = [
 "ethcore-ipc 1.3.0",
 "ethcore-ipc-codegen 1.3.0",
 "ethcore-ipc-nano 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "nanomsg 0.5.1 (git+https://github.com/ethcore/nanomsg.rs.git)",
 "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -393,7 +393,7 @@ name = "ethcore-logger"
 version = "1.3.0"
 dependencies = [
 "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "isatty 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -408,7 +408,7 @@ dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-devtools 1.3.0",
 "ethcore-io 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "igd 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -432,7 +432,7 @@ dependencies = [
 "ethcore-devtools 1.3.0",
 "ethcore-io 1.3.0",
 "ethcore-ipc 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "ethjson 0.1.0",
 "ethsync 1.3.0",
 "json-ipc-server 0.2.4 (git+https://github.com/ethcore/json-ipc-server.git?branch=beta)",
@@ -455,7 +455,7 @@ dependencies = [
 "env_logger 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
 "ethcore-io 1.3.0",
 "ethcore-rpc 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "jsonrpc-core 2.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parity-dapps-signer 1.4.0 (git+https://github.com/ethcore/parity-ui.git)",
@@ -466,7 +466,7 @@ dependencies = [

 [[package]]
 name = "ethcore-util"
-version = "1.3.10"
+version = "1.3.15"
 dependencies = [
 "ansi_term 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
 "arrayvec 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -499,7 +499,7 @@ dependencies = [
 name = "ethjson"
 version = "0.1.0"
 dependencies = [
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
 "serde_codegen 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -547,7 +547,7 @@ dependencies = [
 "ethcore-ipc-codegen 1.3.0",
 "ethcore-ipc-nano 1.3.0",
 "ethcore-network 1.3.0",
- "ethcore-util 1.3.10",
+ "ethcore-util 1.3.15",
 "heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 "parking_lot 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1390,14 +1390,6 @@ dependencies = [
 "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "syntex"
-version = "0.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "syntex_syntax 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "syntex_syntax"
 version = "0.33.0"
@@ -1411,19 +1403,6 @@ dependencies = [
 "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]

-[[package]]
-name = "syntex_syntax"
-version = "0.36.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)",
- "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
- "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
 [[package]]
 name = "table"
 version = "0.1.0"
@@ -1765,9 +1744,7 @@ dependencies = [
 "checksum stable-heap 0.1.0 (git+https://github.com/carllerche/stable-heap?rev=3c5cd1ca47)" = "<none>"
 "checksum strsim 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "50c069df92e4b01425a8bf3576d5d417943a6a7272fbabaf5bd80b1aaa76442e"
 "checksum syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "393b6dd0889df2b064beeea954cfda6bc2571604ac460deeae0fed55a53988af"
-"checksum syntex 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc0bbe1e46dcd53ec50d6600e750152c22e0e9352cadbd413e86fb847ae899"
 "checksum syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44bded3cabafc65c90b663b1071bd2d198a9ab7515e6ce729e4570aaf53c407e"
-"checksum syntex_syntax 0.36.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2b92a8c33fad2fa99e14fe499ec17e82b6c6496a7a38a499f33b584ffa1886fa"
 "checksum target_info 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c63f48baada5c52e65a29eef93ab4f8982681b67f9e8d29c7b05abcfec2b9ffe"
 "checksum term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "f2077e54d38055cf1ca0fd7933a2e00cd3ec8f6fed352b2a377f06dcdaaf3281"
 "checksum termios 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d5d9cf598a6d7ce700a4e6a9199da127e6819a61e64b68609683cc9a01b5683a"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 description = "Ethcore client."
 name = "parity"
-version = "1.3.10"
+version = "1.3.15"
 license = "GPL-3.0"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
--- a/docker/ubuntu-stable/Dockerfile
+++ b/docker/ubuntu-stable/Dockerfile
@@ -0,0 +1,40 @@
+FROM ubuntu:14.04
+WORKDIR /build
+# install tools and dependencies
+RUN apt-get update && \
+        apt-get install -y \
+        g++ \
+        curl \
+        git \
+        file \
+        binutils \
+	make
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && \
+cargo -V && \
+gcc -v &&\
+g++ -v
+
+# build parity
+RUN git clone https://github.com/ethcore/parity && \
+        cd parity && \
+        git checkout stable && \
+        git pull && \
+        cargo build --release --verbose && \
+        ls /build/parity/target/release/parity && \
+        strip /build/parity/target/release/parity
+
+RUN file /build/parity/target/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/release/parity"]
--- a/ethcore/res/ethereum/frontier.json
+++ b/ethcore/res/ethereum/frontier.json
@@ -131,10 +131,11 @@
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
 				],
 				"eip150Transition": "0x259518",
-				"eip155Transition": 2642462,
-				"eip160Transition": 2642462,
-				"eip161abcTransition": 2642462,
-				"eip161dTransition": 2642462
+				"eip155Transition": "0x28d138",
+				"eip160Transition": "0x28d138",
+				"eip161abcTransition": "0x28d138",
+				"eip161dTransition": "0x28d138",
+				"maxCodeSize": 24576
 			}
 		}
 	},
@@ -165,7 +166,7 @@
 		"enode://a979fb575495b8d6db44f750317d0f4622bf4c2aa3365d6af7c284339968eef29b69ad0dce72a4d8db5ebb4968de0e3bec910127f134779fbcb0cb6d3331163c@52.16.188.185:30303",
 		"enode://de471bccee3d042261d52e9bff31458daecc406142b401d4cd848f677479f73104b9fdeb090af9583d3391b7f10cb2ba9e26865dd5fca4fcdc0fb1e3b723c786@54.94.239.50:30303",
 		"enode://1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082@52.74.57.123:30303",
-		"enode://248f12bc8b18d5289358085520ac78cd8076485211e6d96ab0bc93d6cd25442db0ce3a937dc404f64f207b0b9aed50e25e98ce32af5ac7cb321ff285b97de485@zero.parity.io:30303"
+		"enode://4cd540b2c3292e17cff39922e864094bf8b0741fcc8c5dcea14957e389d7944c70278d872902e3d0345927f621547efa659013c400865485ab4bfa0c6596936f@138.201.144.135:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -11,10 +11,10 @@
 				"registrar": "0x8e4e9b13d4b45cb0befc93c3061b1408f67316b2",
 				"homesteadTransition": "0x789b0",
 				"eip150Transition": "0x1b34d8",
-				"eip155Transition": "0x7fffffffffffffff",
-				"eip160Transition": "0x7fffffffffffffff",
-				"eip161abcTransition": "0x7fffffffffffffff",
-				"eip161dTransition": "0x7fffffffffffffff"
+				"eip155Transition": "0x1cc348",
+				"eip160Transition": "0x1cc348",
+				"eip161abcTransition": "0x1cc348",
+				"eip161dTransition": "0x1cc348"
 			}
 		}
 	},
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -0,0 +1,304 @@
+{
+	"name": "Ropsten",
+	"engine": {
+		"Ethash": {
+			"params": {
+				"gasLimitBoundDivisor": "0x0400",
+				"minimumDifficulty": "0x020000",
+				"difficultyBoundDivisor": "0x0800",
+				"durationLimit": "0x0d",
+				"blockReward": "0x4563918244F40000",
+				"registrar": "0x81a4b044831c4f12ba601adb9274516939e9b8a2",
+				"homesteadTransition": 0,
+				"eip150Transition": 0,
+				"eip155Transition": 10,
+				"eip160Transition": 10,
+				"eip161abcTransition": 10,
+				"eip161dTransition": 10
+			}
+		}
+	},
+	"params": {
+		"accountStartNonce": "0x0",
+		"maximumExtraDataSize": "0x20",
+		"minGasLimit": "0x1388",
+		"networkID" : "0x3"
+	},
+	"genesis": {
+		"seal": {
+			"ethereum": {
+				"nonce": "0x0000000000000042",
+				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
+			}
+		},
+		"difficulty": "0x100000",
+		"author": "0x0000000000000000000000000000000000000000",
+		"timestamp": "0x00",
+		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData": "0x3535353535353535353535353535353535353535353535353535353535353535",
+		"gasLimit": "0x1000000"
+	},
+	"nodes": [
+		"enode://a22f0977ce02653bf95e38730106356342df48b5222e2c2a1a6f9ef34769bf593bae9ca0a888cf60839edd52efc1b6e393c63a57d76f4c4fe14e641f1f9e637e@128.199.55.137:30303",
+		"enode://012239fccf3ff1d92b036983a430cb6705c6528c96c0354413f8854802138e5135c084ab36e7c54efb621c46728df8c3a6f4c1db9bb48a1330efe3f82f2dd7a6@52.169.94.142:30303"
+	],
+	"accounts": {
+		"0000000000000000000000000000000000000001": { "balance": "1", "nonce": "0", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0000000000000000000000000000000000000002": { "balance": "1", "nonce": "0", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0000000000000000000000000000000000000003": { "balance": "1", "nonce": "0", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0000000000000000000000000000000000000004": { "balance": "1", "nonce": "0", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0000000000000000000000000000000000000000": { "balance": "1" },
+		"0000000000000000000000000000000000000005": { "balance": "1" },
+		"0000000000000000000000000000000000000006": { "balance": "1" },
+		"0000000000000000000000000000000000000007": { "balance": "1" },
+		"0000000000000000000000000000000000000008": { "balance": "1" },
+		"0000000000000000000000000000000000000009": { "balance": "1" },
+		"000000000000000000000000000000000000000a": { "balance": "0" },
+		"000000000000000000000000000000000000000b": { "balance": "0" },
+		"000000000000000000000000000000000000000c": { "balance": "0" },
+		"000000000000000000000000000000000000000d": { "balance": "0" },
+		"000000000000000000000000000000000000000e": { "balance": "0" },
+		"000000000000000000000000000000000000000f": { "balance": "0" },
+		"0000000000000000000000000000000000000010": { "balance": "0" },
+		"0000000000000000000000000000000000000011": { "balance": "0" },
+		"0000000000000000000000000000000000000012": { "balance": "0" },
+		"0000000000000000000000000000000000000013": { "balance": "0" },
+		"0000000000000000000000000000000000000014": { "balance": "0" },
+		"0000000000000000000000000000000000000015": { "balance": "0" },
+		"0000000000000000000000000000000000000016": { "balance": "0" },
+		"0000000000000000000000000000000000000017": { "balance": "0" },
+		"0000000000000000000000000000000000000018": { "balance": "0" },
+		"0000000000000000000000000000000000000019": { "balance": "0" },
+		"000000000000000000000000000000000000001a": { "balance": "0" },
+		"000000000000000000000000000000000000001b": { "balance": "0" },
+		"000000000000000000000000000000000000001c": { "balance": "0" },
+		"000000000000000000000000000000000000001d": { "balance": "0" },
+		"000000000000000000000000000000000000001e": { "balance": "0" },
+		"000000000000000000000000000000000000001f": { "balance": "0" },
+		"0000000000000000000000000000000000000020": { "balance": "0" },
+		"0000000000000000000000000000000000000021": { "balance": "0" },
+		"0000000000000000000000000000000000000022": { "balance": "0" },
+		"0000000000000000000000000000000000000023": { "balance": "0" },
+		"0000000000000000000000000000000000000024": { "balance": "0" },
+		"0000000000000000000000000000000000000025": { "balance": "0" },
+		"0000000000000000000000000000000000000026": { "balance": "0" },
+		"0000000000000000000000000000000000000027": { "balance": "0" },
+		"0000000000000000000000000000000000000028": { "balance": "0" },
+		"0000000000000000000000000000000000000029": { "balance": "0" },
+		"000000000000000000000000000000000000002a": { "balance": "0" },
+		"000000000000000000000000000000000000002b": { "balance": "0" },
+		"000000000000000000000000000000000000002c": { "balance": "0" },
+		"000000000000000000000000000000000000002d": { "balance": "0" },
+		"000000000000000000000000000000000000002e": { "balance": "0" },
+		"000000000000000000000000000000000000002f": { "balance": "0" },
+		"0000000000000000000000000000000000000030": { "balance": "0" },
+		"0000000000000000000000000000000000000031": { "balance": "0" },
+		"0000000000000000000000000000000000000032": { "balance": "0" },
+		"0000000000000000000000000000000000000033": { "balance": "0" },
+		"0000000000000000000000000000000000000034": { "balance": "0" },
+		"0000000000000000000000000000000000000035": { "balance": "0" },
+		"0000000000000000000000000000000000000036": { "balance": "0" },
+		"0000000000000000000000000000000000000037": { "balance": "0" },
+		"0000000000000000000000000000000000000038": { "balance": "0" },
+		"0000000000000000000000000000000000000039": { "balance": "0" },
+		"000000000000000000000000000000000000003a": { "balance": "0" },
+		"000000000000000000000000000000000000003b": { "balance": "0" },
+		"000000000000000000000000000000000000003c": { "balance": "0" },
+		"000000000000000000000000000000000000003d": { "balance": "0" },
+		"000000000000000000000000000000000000003e": { "balance": "0" },
+		"000000000000000000000000000000000000003f": { "balance": "0" },
+		"0000000000000000000000000000000000000040": { "balance": "0" },
+		"0000000000000000000000000000000000000041": { "balance": "0" },
+		"0000000000000000000000000000000000000042": { "balance": "0" },
+		"0000000000000000000000000000000000000043": { "balance": "0" },
+		"0000000000000000000000000000000000000044": { "balance": "0" },
+		"0000000000000000000000000000000000000045": { "balance": "0" },
+		"0000000000000000000000000000000000000046": { "balance": "0" },
+		"0000000000000000000000000000000000000047": { "balance": "0" },
+		"0000000000000000000000000000000000000048": { "balance": "0" },
+		"0000000000000000000000000000000000000049": { "balance": "0" },
+		"000000000000000000000000000000000000004a": { "balance": "0" },
+		"000000000000000000000000000000000000004b": { "balance": "0" },
+		"000000000000000000000000000000000000004c": { "balance": "0" },
+		"000000000000000000000000000000000000004d": { "balance": "0" },
+		"000000000000000000000000000000000000004e": { "balance": "0" },
+		"000000000000000000000000000000000000004f": { "balance": "0" },
+		"0000000000000000000000000000000000000050": { "balance": "0" },
+		"0000000000000000000000000000000000000051": { "balance": "0" },
+		"0000000000000000000000000000000000000052": { "balance": "0" },
+		"0000000000000000000000000000000000000053": { "balance": "0" },
+		"0000000000000000000000000000000000000054": { "balance": "0" },
+		"0000000000000000000000000000000000000055": { "balance": "0" },
+		"0000000000000000000000000000000000000056": { "balance": "0" },
+		"0000000000000000000000000000000000000057": { "balance": "0" },
+		"0000000000000000000000000000000000000058": { "balance": "0" },
+		"0000000000000000000000000000000000000059": { "balance": "0" },
+		"000000000000000000000000000000000000005a": { "balance": "0" },
+		"000000000000000000000000000000000000005b": { "balance": "0" },
+		"000000000000000000000000000000000000005c": { "balance": "0" },
+		"000000000000000000000000000000000000005d": { "balance": "0" },
+		"000000000000000000000000000000000000005e": { "balance": "0" },
+		"000000000000000000000000000000000000005f": { "balance": "0" },
+		"0000000000000000000000000000000000000060": { "balance": "0" },
+		"0000000000000000000000000000000000000061": { "balance": "0" },
+		"0000000000000000000000000000000000000062": { "balance": "0" },
+		"0000000000000000000000000000000000000063": { "balance": "0" },
+		"0000000000000000000000000000000000000064": { "balance": "0" },
+		"0000000000000000000000000000000000000065": { "balance": "0" },
+		"0000000000000000000000000000000000000066": { "balance": "0" },
+		"0000000000000000000000000000000000000067": { "balance": "0" },
+		"0000000000000000000000000000000000000068": { "balance": "0" },
+		"0000000000000000000000000000000000000069": { "balance": "0" },
+		"000000000000000000000000000000000000006a": { "balance": "0" },
+		"000000000000000000000000000000000000006b": { "balance": "0" },
+		"000000000000000000000000000000000000006c": { "balance": "0" },
+		"000000000000000000000000000000000000006d": { "balance": "0" },
+		"000000000000000000000000000000000000006e": { "balance": "0" },
+		"000000000000000000000000000000000000006f": { "balance": "0" },
+		"0000000000000000000000000000000000000070": { "balance": "0" },
+		"0000000000000000000000000000000000000071": { "balance": "0" },
+		"0000000000000000000000000000000000000072": { "balance": "0" },
+		"0000000000000000000000000000000000000073": { "balance": "0" },
+		"0000000000000000000000000000000000000074": { "balance": "0" },
+		"0000000000000000000000000000000000000075": { "balance": "0" },
+		"0000000000000000000000000000000000000076": { "balance": "0" },
+		"0000000000000000000000000000000000000077": { "balance": "0" },
+		"0000000000000000000000000000000000000078": { "balance": "0" },
+		"0000000000000000000000000000000000000079": { "balance": "0" },
+		"000000000000000000000000000000000000007a": { "balance": "0" },
+		"000000000000000000000000000000000000007b": { "balance": "0" },
+		"000000000000000000000000000000000000007c": { "balance": "0" },
+		"000000000000000000000000000000000000007d": { "balance": "0" },
+		"000000000000000000000000000000000000007e": { "balance": "0" },
+		"000000000000000000000000000000000000007f": { "balance": "0" },
+		"0000000000000000000000000000000000000080": { "balance": "0" },
+		"0000000000000000000000000000000000000081": { "balance": "0" },
+		"0000000000000000000000000000000000000082": { "balance": "0" },
+		"0000000000000000000000000000000000000083": { "balance": "0" },
+		"0000000000000000000000000000000000000084": { "balance": "0" },
+		"0000000000000000000000000000000000000085": { "balance": "0" },
+		"0000000000000000000000000000000000000086": { "balance": "0" },
+		"0000000000000000000000000000000000000087": { "balance": "0" },
+		"0000000000000000000000000000000000000088": { "balance": "0" },
+		"0000000000000000000000000000000000000089": { "balance": "0" },
+		"000000000000000000000000000000000000008a": { "balance": "0" },
+		"000000000000000000000000000000000000008b": { "balance": "0" },
+		"000000000000000000000000000000000000008c": { "balance": "0" },
+		"000000000000000000000000000000000000008d": { "balance": "0" },
+		"000000000000000000000000000000000000008e": { "balance": "0" },
+		"000000000000000000000000000000000000008f": { "balance": "0" },
+		"0000000000000000000000000000000000000090": { "balance": "0" },
+		"0000000000000000000000000000000000000091": { "balance": "0" },
+		"0000000000000000000000000000000000000092": { "balance": "0" },
+		"0000000000000000000000000000000000000093": { "balance": "0" },
+		"0000000000000000000000000000000000000094": { "balance": "0" },
+		"0000000000000000000000000000000000000095": { "balance": "0" },
+		"0000000000000000000000000000000000000096": { "balance": "0" },
+		"0000000000000000000000000000000000000097": { "balance": "0" },
+		"0000000000000000000000000000000000000098": { "balance": "0" },
+		"0000000000000000000000000000000000000099": { "balance": "0" },
+		"000000000000000000000000000000000000009a": { "balance": "0" },
+		"000000000000000000000000000000000000009b": { "balance": "0" },
+		"000000000000000000000000000000000000009c": { "balance": "0" },
+		"000000000000000000000000000000000000009d": { "balance": "0" },
+		"000000000000000000000000000000000000009e": { "balance": "0" },
+		"000000000000000000000000000000000000009f": { "balance": "0" },
+		"00000000000000000000000000000000000000a0": { "balance": "0" },
+		"00000000000000000000000000000000000000a1": { "balance": "0" },
+		"00000000000000000000000000000000000000a2": { "balance": "0" },
+		"00000000000000000000000000000000000000a3": { "balance": "0" },
+		"00000000000000000000000000000000000000a4": { "balance": "0" },
+		"00000000000000000000000000000000000000a5": { "balance": "0" },
+		"00000000000000000000000000000000000000a6": { "balance": "0" },
+		"00000000000000000000000000000000000000a7": { "balance": "0" },
+		"00000000000000000000000000000000000000a8": { "balance": "0" },
+		"00000000000000000000000000000000000000a9": { "balance": "0" },
+		"00000000000000000000000000000000000000aa": { "balance": "0" },
+		"00000000000000000000000000000000000000ab": { "balance": "0" },
+		"00000000000000000000000000000000000000ac": { "balance": "0" },
+		"00000000000000000000000000000000000000ad": { "balance": "0" },
+		"00000000000000000000000000000000000000ae": { "balance": "0" },
+		"00000000000000000000000000000000000000af": { "balance": "0" },
+		"00000000000000000000000000000000000000b0": { "balance": "0" },
+		"00000000000000000000000000000000000000b1": { "balance": "0" },
+		"00000000000000000000000000000000000000b2": { "balance": "0" },
+		"00000000000000000000000000000000000000b3": { "balance": "0" },
+		"00000000000000000000000000000000000000b4": { "balance": "0" },
+		"00000000000000000000000000000000000000b5": { "balance": "0" },
+		"00000000000000000000000000000000000000b6": { "balance": "0" },
+		"00000000000000000000000000000000000000b7": { "balance": "0" },
+		"00000000000000000000000000000000000000b8": { "balance": "0" },
+		"00000000000000000000000000000000000000b9": { "balance": "0" },
+		"00000000000000000000000000000000000000ba": { "balance": "0" },
+		"00000000000000000000000000000000000000bb": { "balance": "0" },
+		"00000000000000000000000000000000000000bc": { "balance": "0" },
+		"00000000000000000000000000000000000000bd": { "balance": "0" },
+		"00000000000000000000000000000000000000be": { "balance": "0" },
+		"00000000000000000000000000000000000000bf": { "balance": "0" },
+		"00000000000000000000000000000000000000c0": { "balance": "0" },
+		"00000000000000000000000000000000000000c1": { "balance": "0" },
+		"00000000000000000000000000000000000000c2": { "balance": "0" },
+		"00000000000000000000000000000000000000c3": { "balance": "0" },
+		"00000000000000000000000000000000000000c4": { "balance": "0" },
+		"00000000000000000000000000000000000000c5": { "balance": "0" },
+		"00000000000000000000000000000000000000c6": { "balance": "0" },
+		"00000000000000000000000000000000000000c7": { "balance": "0" },
+		"00000000000000000000000000000000000000c8": { "balance": "0" },
+		"00000000000000000000000000000000000000c9": { "balance": "0" },
+		"00000000000000000000000000000000000000ca": { "balance": "0" },
+		"00000000000000000000000000000000000000cb": { "balance": "0" },
+		"00000000000000000000000000000000000000cc": { "balance": "0" },
+		"00000000000000000000000000000000000000cd": { "balance": "0" },
+		"00000000000000000000000000000000000000ce": { "balance": "0" },
+		"00000000000000000000000000000000000000cf": { "balance": "0" },
+		"00000000000000000000000000000000000000d0": { "balance": "0" },
+		"00000000000000000000000000000000000000d1": { "balance": "0" },
+		"00000000000000000000000000000000000000d2": { "balance": "0" },
+		"00000000000000000000000000000000000000d3": { "balance": "0" },
+		"00000000000000000000000000000000000000d4": { "balance": "0" },
+		"00000000000000000000000000000000000000d5": { "balance": "0" },
+		"00000000000000000000000000000000000000d6": { "balance": "0" },
+		"00000000000000000000000000000000000000d7": { "balance": "0" },
+		"00000000000000000000000000000000000000d8": { "balance": "0" },
+		"00000000000000000000000000000000000000d9": { "balance": "0" },
+		"00000000000000000000000000000000000000da": { "balance": "0" },
+		"00000000000000000000000000000000000000db": { "balance": "0" },
+		"00000000000000000000000000000000000000dc": { "balance": "0" },
+		"00000000000000000000000000000000000000dd": { "balance": "0" },
+		"00000000000000000000000000000000000000de": { "balance": "0" },
+		"00000000000000000000000000000000000000df": { "balance": "0" },
+		"00000000000000000000000000000000000000e0": { "balance": "0" },
+		"00000000000000000000000000000000000000e1": { "balance": "0" },
+		"00000000000000000000000000000000000000e2": { "balance": "0" },
+		"00000000000000000000000000000000000000e3": { "balance": "0" },
+		"00000000000000000000000000000000000000e4": { "balance": "0" },
+		"00000000000000000000000000000000000000e5": { "balance": "0" },
+		"00000000000000000000000000000000000000e6": { "balance": "0" },
+		"00000000000000000000000000000000000000e7": { "balance": "0" },
+		"00000000000000000000000000000000000000e8": { "balance": "0" },
+		"00000000000000000000000000000000000000e9": { "balance": "0" },
+		"00000000000000000000000000000000000000ea": { "balance": "0" },
+		"00000000000000000000000000000000000000eb": { "balance": "0" },
+		"00000000000000000000000000000000000000ec": { "balance": "0" },
+		"00000000000000000000000000000000000000ed": { "balance": "0" },
+		"00000000000000000000000000000000000000ee": { "balance": "0" },
+		"00000000000000000000000000000000000000ef": { "balance": "0" },
+		"00000000000000000000000000000000000000f0": { "balance": "0" },
+		"00000000000000000000000000000000000000f1": { "balance": "0" },
+		"00000000000000000000000000000000000000f2": { "balance": "0" },
+		"00000000000000000000000000000000000000f3": { "balance": "0" },
+		"00000000000000000000000000000000000000f4": { "balance": "0" },
+		"00000000000000000000000000000000000000f5": { "balance": "0" },
+		"00000000000000000000000000000000000000f6": { "balance": "0" },
+		"00000000000000000000000000000000000000f7": { "balance": "0" },
+		"00000000000000000000000000000000000000f8": { "balance": "0" },
+		"00000000000000000000000000000000000000f9": { "balance": "0" },
+		"00000000000000000000000000000000000000fa": { "balance": "0" },
+		"00000000000000000000000000000000000000fb": { "balance": "0" },
+		"00000000000000000000000000000000000000fc": { "balance": "0" },
+		"00000000000000000000000000000000000000fd": { "balance": "0" },
+		"00000000000000000000000000000000000000fe": { "balance": "0" },
+		"00000000000000000000000000000000000000ff": { "balance": "0" },
+		"874b54a8bd152966d63f706bae1ffeb0411921e5": { "balance": "1000000000000000000000000000000" }
+	}
+}
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -708,7 +708,7 @@ impl BlockChainClient for Client {
 	fn call(&self, t: &SignedTransaction, block: BlockID, analytics: CallAnalytics) -> Result<Executed, CallError> {
 		let header = try!(self.block_header(block).ok_or(CallError::StatePruned));
 		let view = HeaderView::new(&header);
-		let last_hashes = self.build_last_hashes(view.hash());
+		let last_hashes = self.build_last_hashes(view.parent_hash());
 		let env_info = EnvInfo {
 			number: view.number(),
 			author: view.author(),
--- a/ethcore/src/engines/instant_seal.rs
+++ b/ethcore/src/engines/instant_seal.rs
@@ -55,7 +55,7 @@ impl Engine for InstantSeal {
 	}

 	fn schedule(&self, _env_info: &EnvInfo) -> Schedule {
-		Schedule::new_homestead()
+		Schedule::new_post_eip150(usize::max_value(), false, false, false)
 	}

 	fn generate_seal(&self, _block: &ExecutedBlock, _accounts: Option<&AccountProvider>) -> Option<Vec<Bytes>> {
--- a/ethcore/src/ethereum/ethash.rs
+++ b/ethcore/src/ethereum/ethash.rs
@@ -62,6 +62,8 @@ pub struct EthashParams {
 	pub eip161abc_transition: u64,
 	/// Number of first block where EIP-161.d begins.
 	pub eip161d_transition: u64,
+	/// Maximum amount of code that can be deploying into a contract.
+	pub max_code_size: u64,
 }

 impl From<ethjson::spec::EthashParams> for EthashParams {
@@ -74,17 +76,18 @@ impl From<ethjson::spec::EthashParams> for EthashParams {
 			block_reward: p.block_reward.into(),
 			registrar: p.registrar.map_or_else(Address::new, Into::into),
 			homestead_transition: p.homestead_transition.map_or(0, Into::into),
-			dao_hardfork_transition: p.dao_hardfork_transition.map_or(0x7fffffffffffffff, Into::into),
+			dao_hardfork_transition: p.dao_hardfork_transition.map_or(u64::max_value(), Into::into),
 			dao_hardfork_beneficiary: p.dao_hardfork_beneficiary.map_or_else(Address::new, Into::into),
 			dao_hardfork_accounts: p.dao_hardfork_accounts.unwrap_or_else(Vec::new).into_iter().map(Into::into).collect(),
-			difficulty_hardfork_transition: p.difficulty_hardfork_transition.map_or(0x7fffffffffffffff, Into::into),
+			difficulty_hardfork_transition: p.difficulty_hardfork_transition.map_or(u64::max_value(), Into::into),
 			difficulty_hardfork_bound_divisor: p.difficulty_hardfork_bound_divisor.map_or(p.difficulty_bound_divisor.into(), Into::into),
-			bomb_defuse_transition: p.bomb_defuse_transition.map_or(0x7fffffffffffffff, Into::into),
+			bomb_defuse_transition: p.bomb_defuse_transition.map_or(u64::max_value(), Into::into),
 			eip150_transition: p.eip150_transition.map_or(0, Into::into),
 			eip155_transition: p.eip155_transition.map_or(0, Into::into),
 			eip160_transition: p.eip160_transition.map_or(0, Into::into),
 			eip161abc_transition: p.eip161abc_transition.map_or(0, Into::into),
-			eip161d_transition: p.eip161d_transition.map_or(0x7fffffffffffffff, Into::into),
+			eip161d_transition: p.eip161d_transition.map_or(u64::max_value(), Into::into),
+			max_code_size: p.max_code_size.map_or(u64::max_value(), Into::into),
 		}
 	}
 }
@@ -137,6 +140,7 @@ impl Engine for Ethash {
 			Schedule::new_homestead()
 		} else {
 			Schedule::new_post_eip150(
+				self.ethash_params.max_code_size as usize,
 				env_info.number >= self.ethash_params.eip160_transition,
 				env_info.number >= self.ethash_params.eip161abc_transition,
 				env_info.number >= self.ethash_params.eip161d_transition
--- a/ethcore/src/ethereum/mod.rs
+++ b/ethcore/src/ethereum/mod.rs
@@ -56,6 +56,9 @@ pub fn new_transition_test() -> Spec { Spec::load(include_bytes!("../../res/ethe
 /// Create a new Frontier main net chain spec without genesis accounts.
 pub fn new_mainnet_like() -> Spec { Spec::load(include_bytes!("../../res/ethereum/frontier_like_test.json")) }

+/// Create a new Ropsten chain spec.
+pub fn new_ropsten() -> Spec { Spec::load(include_bytes!("../../res/ethereum/ropsten.json")) }
+
 /// Create a new Morden chain spec.
 pub fn new_morden() -> Spec { Spec::load(include_bytes!("../../res/ethereum/morden.json")) }

--- a/ethcore/src/evm/schedule.rs
+++ b/ethcore/src/evm/schedule.rs
@@ -70,6 +70,8 @@ pub struct Schedule {
 	pub quad_coeff_div: usize,
 	/// Cost for contract length when executing `CREATE`
 	pub create_data_gas: usize,
+	/// Maximum code size when creating a contract.
+	pub create_data_limit: usize,
 	/// Transaction cost
 	pub tx_gas: usize,
 	/// `CREATE` transaction cost
@@ -111,7 +113,7 @@ impl Schedule {
 	}

 	/// Schedule for the post-EIP-150-era of the Ethereum main net.
-	pub fn new_post_eip150(fix_exp: bool, no_empty: bool, kill_empty: bool) -> Schedule {
+	pub fn new_post_eip150(max_code_size: usize, fix_exp: bool, no_empty: bool, kill_empty: bool) -> Schedule {
 		Schedule {
 			exceptional_failed_code_deposit: true,
 			have_delegate_call: true,
@@ -139,6 +141,7 @@ impl Schedule {
 			memory_gas: 3,
 			quad_coeff_div: 512,
 			create_data_gas: 200,
+			create_data_limit: max_code_size,
 			tx_gas: 21000,
 			tx_create_gas: 53000,
 			tx_data_zero_gas: 4,
@@ -183,6 +186,7 @@ impl Schedule {
 			memory_gas: 3,
 			quad_coeff_div: 512,
 			create_data_gas: 200,
+			create_data_limit: usize::max_value(),
 			tx_gas: 21000,
 			tx_create_gas: tcg,
 			tx_data_zero_gas: 4,
--- a/ethcore/src/externalities.rs
+++ b/ethcore/src/externalities.rs
@@ -241,7 +241,7 @@ impl<'a, T, V> Ext for Externalities<'a, T, V> where T: 'a + Tracer, V: 'a + VMT
 			},
 			OutputPolicy::InitContract(ref mut copy) => {
 				let return_cost = U256::from(data.len()) * U256::from(self.schedule.create_data_gas);
-				if return_cost > *gas {
+				if return_cost > *gas || data.len() > self.schedule.create_data_limit {
 					return match self.schedule.exceptional_failed_code_deposit {
 						true => Err(evm::Error::OutOfGas),
 						false => Ok(*gas)
--- a/ethcore/src/miner/miner.rs
+++ b/ethcore/src/miner/miner.rs
@@ -21,6 +21,7 @@ use util::*;
 use util::using_queue::{UsingQueue, GetAction};
 use account_provider::AccountProvider;
 use views::{BlockView, HeaderView};
+use header::Header;
 use state::{State, CleanupMode};
 use client::{MiningBlockChainClient, Executive, Executed, EnvInfo, TransactOptions, BlockID, CallAnalytics};
 use executive::contract_address;
@@ -467,8 +468,19 @@ impl Miner {
 			balance: chain.latest_balance(a),
 		};

+		let best_block_header: Header = ::util::rlp::decode(&chain.best_block_header());
 		transactions.into_iter()
-			.map(|tx| transaction_queue.add(tx, &fetch_account, origin))
+			.map(|tx| {
+				match self.engine.verify_transaction_basic(&tx, &best_block_header) {
+					Err(e) => {
+						debug!(target: "miner", "Rejected tx {:?} with invalid signature: {:?}", tx.hash(), e);
+						Err(e)
+					},
+					Ok(()) => {
+						transaction_queue.add(tx, &fetch_account, origin)
+					},
+				}
+			})
 			.collect()
 	}

--- a/json/src/spec/ethash.rs
+++ b/json/src/spec/ethash.rs
@@ -78,6 +78,10 @@ pub struct EthashParams {
 	/// See main EthashParams docs.
 	#[serde(rename="eip161dTransition")]
 	pub eip161d_transition: Option<Uint>,
+
+	/// See main EthashParams docs.
+	#[serde(rename="maxCodeSize")]
+	pub max_code_size: Option<Uint>,
 }

 /// Ethash engine deserialization.
--- a/nsis/installer.nsi
+++ b/nsis/installer.nsi
@@ -4,7 +4,7 @@
 !define DESCRIPTION "Fast, light, robust Ethereum implementation"
 !define VERSIONMAJOR 1
 !define VERSIONMINOR 3
-!define VERSIONBUILD 10
+!define VERSIONBUILD 15

 !addplugindir .\

--- a/parity/cli.rs
+++ b/parity/cli.rs
@@ -50,7 +50,7 @@ Operating Options:
                           [default: 3600].
  --chain CHAIN            Specify the blockchain type. CHAIN may be either a
                           JSON chain specification file or olympic, frontier,
-                           homestead, mainnet, morden, classic or testnet
+                           homestead, mainnet, ropsten, morden, classic or testnet
                           [default: homestead].
  -d --db-path PATH        Specify the database & configuration directory path
                           [default: $HOME/.parity].
@@ -126,7 +126,6 @@ API and Console Options:
  --ipc-apis APIS          Specify custom API set available via JSON-RPC over
                           IPC [default: web3,eth,net,ethcore,personal,traces,rpc].

-  --no-dapps               Disable the Dapps server (e.g. status page).
  --dapps-port PORT        Specify the port portion of the Dapps server
                           [default: 8080].
  --dapps-interface IP     Specify the hostname portion of the Dapps
@@ -289,6 +288,7 @@ Legacy Options:
  --etherbase ADDRESS      Equivalent to --author ADDRESS.
  --extradata STRING       Equivalent to --extra-data STRING.
  --cache MB               Equivalent to --cache-size MB.
+  --no-dapps               Disable the Dapps server (e.g. status page).

 Miscellaneous Options:
  -l --logging LOGGING     Specify the logging level. Must conform to the same
--- a/parity/configuration.rs
+++ b/parity/configuration.rs
@@ -294,7 +294,7 @@ impl Configuration {

 	fn chain(&self) -> String {
 		if self.args.flag_testnet {
-			"morden".to_owned()
+			"ropsten".to_owned()
 		} else {
 			self.args.flag_chain.clone()
 		}
@@ -826,7 +826,7 @@ mod tests {
 		// then
 		assert_eq!(conf.network_settings(), NetworkSettings {
 			name: "testname".to_owned(),
-			chain: "morden".to_owned(),
+			chain: "ropsten".to_owned(),
 			network_port: 30303,
 			rpc_enabled: true,
 			rpc_interface: "local".to_owned(),
--- a/parity/params.rs
+++ b/parity/params.rs
@@ -28,6 +28,7 @@ use dir::Directories;
 pub enum SpecType {
 	Mainnet,
 	Testnet,
+	Ropsten,
 	Olympic,
 	Classic,
 	Custom(String),
@@ -47,6 +48,7 @@ impl FromStr for SpecType {
 			"frontier" | "homestead" | "mainnet" => SpecType::Mainnet,
 			"frontier-dogmatic" | "homestead-dogmatic" | "classic" => SpecType::Classic,
 			"morden" | "testnet" => SpecType::Testnet,
+			"ropsten" => SpecType::Ropsten,
 			"olympic" => SpecType::Olympic,
 			other => SpecType::Custom(other.into()),
 		};
@@ -59,6 +61,7 @@ impl SpecType {
 		match *self {
 			SpecType::Mainnet => Ok(ethereum::new_frontier()),
 			SpecType::Testnet => Ok(ethereum::new_morden()),
+			SpecType::Ropsten => Ok(ethereum::new_ropsten()),
 			SpecType::Olympic => Ok(ethereum::new_olympic()),
 			SpecType::Classic => Ok(ethereum::new_classic()),
 			SpecType::Custom(ref file) => Ok(Spec::load(&try!(contents(file).map_err(|_| "Could not load specification file."))))
@@ -232,6 +235,7 @@ mod tests {
 		assert_eq!(SpecType::Mainnet, "mainnet".parse().unwrap());
 		assert_eq!(SpecType::Testnet, "testnet".parse().unwrap());
 		assert_eq!(SpecType::Testnet, "morden".parse().unwrap());
+		assert_eq!(SpecType::Ropsten, "ropsten".parse().unwrap());
 		assert_eq!(SpecType::Olympic, "olympic".parse().unwrap());
 	}

--- a/parity/run.rs
+++ b/parity/run.rs
@@ -80,13 +80,17 @@ pub struct RunCmd {
 	pub custom_bootnodes: bool,
 }

-pub fn execute(cmd: RunCmd) -> Result<(), String> {
+pub fn execute(mut cmd: RunCmd) -> Result<(), String> {
 	// increase max number of open files
 	raise_fd_limit();

 	// set up logger
 	let logger = try!(setup_log(&cmd.logger_config));

+	if cmd.dapps_conf.enabled {
+		warn!("Warning: Parity UI is disabled in this release. Please upgrade to version 1.4.2 or higher.");
+		cmd.dapps_conf.enabled = false;
+	}
 	// set up panic handler
 	let panic_handler = PanicHandler::new_in_arc();

--- a/sync/src/chain.rs
+++ b/sync/src/chain.rs
@@ -140,6 +140,8 @@ const HEADERS_TIMEOUT_SEC: f64 = 15f64;
 const BODIES_TIMEOUT_SEC: f64 = 10f64;
 const FORK_HEADER_TIMEOUT_SEC: f64 = 3f64;

+const MAX_REORG_BLOCKS: u64 = 64;
+
 #[derive(Copy, Clone, Eq, PartialEq, Debug)]
 /// Sync state
 pub enum SyncState {
@@ -567,6 +569,12 @@ impl ChainSync {
 					trace!(target: "sync", "Received {} subchain heads, proceeding to download", headers.len());
 					self.blocks.reset_to(hashes);
 					self.state = SyncState::Blocks;
+				} else {
+					let best = io.chain().chain_info().best_block_number;
+					if best > self.last_imported_block && best - self.last_imported_block > MAX_REORG_BLOCKS {
+						trace!(target: "sync", "No common block, disabling peer");
+						io.disable_peer(peer_id);
+					}
 				}
 			},
 			SyncState::Blocks | SyncState::NewBlocks | SyncState::Waiting => {
@@ -631,9 +639,13 @@ impl ChainSync {
 			self.highest_block = Some(header.number());
 		}
 		let mut unknown = false;
+		let difficulty: U256 = try!(r.val_at(1));
 		{
 			if let Some(ref mut peer) = self.peers.get_mut(&peer_id) {
 				peer.latest_hash = header.hash();
+				if peer.difficulty.map_or(true, |pd| difficulty > pd) {
+					peer.difficulty = Some(difficulty);
+				}
 			}
 		}
 		if self.last_imported_block > header.number() && self.last_imported_block - header.number() > MAX_NEW_BLOCK_AGE {
@@ -670,11 +682,9 @@ impl ChainSync {
 			} else {
 				trace!(target: "sync", "New unknown block {:?}", h);
 				//TODO: handle too many unknown blocks
-				let difficulty: U256 = try!(r.val_at(1));
 				if let Some(ref mut peer) = self.peers.get_mut(&peer_id) {
 					if peer.difficulty.map_or(true, |pd| difficulty > pd) {
 						//self.state = SyncState::ChainHead;
-						peer.difficulty = Some(difficulty);
 						trace!(target: "sync", "Received block {:?}  with no known parent. Peer needs syncing...", h);
 					}
 				}
@@ -729,6 +739,7 @@ impl ChainSync {
 						trace!(target: "sync", "New unknown block hash {:?}", hash);
 						if let Some(ref mut peer) = self.peers.get_mut(&peer_id) {
 							peer.latest_hash = hash.clone();
+							peer.difficulty = None;
 						}
 						max_height = number;
 					}
@@ -974,6 +985,7 @@ impl ChainSync {
 				},
 				Err(BlockImportError::Block(BlockError::UnknownParent(_))) if self.state == SyncState::NewBlocks => {
 					trace!(target: "sync", "Unknown new block parent, restarting sync");
+					restart = true;
 					break;
 				},
 				Err(e) => {
@@ -994,6 +1006,11 @@ impl ChainSync {
 		if self.blocks.is_empty() {
 			// complete sync round
 			trace!(target: "sync", "Sync round complete");
+			for (_, ref mut p) in &mut self.peers {
+				if p.difficulty.is_none() {
+					p.difficulty = Some(self.syncing_difficulty.clone());
+				}
+			}
 			self.restart(io);
 		}
 	}
--- a/sync/src/tests/chain.rs
+++ b/sync/src/tests/chain.rs
@@ -78,14 +78,14 @@ fn empty_blocks() {
 fn forked() {
 	::env_logger::init().ok();
 	let mut net = TestNet::new(3);
-	net.peer_mut(0).chain.add_blocks(300, EachBlockWith::Uncle);
-	net.peer_mut(1).chain.add_blocks(300, EachBlockWith::Uncle);
-	net.peer_mut(2).chain.add_blocks(300, EachBlockWith::Uncle);
-	net.peer_mut(0).chain.add_blocks(100, EachBlockWith::Nothing); //fork
-	net.peer_mut(1).chain.add_blocks(200, EachBlockWith::Uncle);
-	net.peer_mut(2).chain.add_blocks(200, EachBlockWith::Uncle);
-	net.peer_mut(1).chain.add_blocks(100, EachBlockWith::Uncle); //fork between 1 and 2
-	net.peer_mut(2).chain.add_blocks(10, EachBlockWith::Nothing);
+	net.peer_mut(0).chain.add_blocks(30, EachBlockWith::Uncle);
+	net.peer_mut(1).chain.add_blocks(30, EachBlockWith::Uncle);
+	net.peer_mut(2).chain.add_blocks(30, EachBlockWith::Uncle);
+	net.peer_mut(0).chain.add_blocks(10, EachBlockWith::Nothing); //fork
+	net.peer_mut(1).chain.add_blocks(20, EachBlockWith::Uncle);
+	net.peer_mut(2).chain.add_blocks(20, EachBlockWith::Uncle);
+	net.peer_mut(1).chain.add_blocks(10, EachBlockWith::Uncle); //fork between 1 and 2
+	net.peer_mut(2).chain.add_blocks(1, EachBlockWith::Nothing);
 	// peer 1 has the best chain of 601 blocks
 	let peer1_chain = net.peer(1).chain.numbers.read().clone();
 	net.sync();
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -3,7 +3,7 @@ description = "Ethcore utility library"
 homepage = "http://ethcore.io"
 license = "GPL-3.0"
 name = "ethcore-util"
-version = "1.3.10"
+version = "1.3.15"
 authors = ["Ethcore <admin@ethcore.io>"]
 build = "build.rs"
Author	SHA1	Message	Date
arkpar	a65a556239	Disconnect peers on a fork	2016-12-10 16:32:10 +01:00
arkpar	268c6d15c0	v1.3.15	2016-12-10 10:50:49 +01:00
Gav Wood	88c3520563	Merge pull request #3616 from ethcore/stable-testing Backporting to stable	2016-11-25 18:44:02 +01:00
Arkadiy Paronyan	1c45c910cc	Fix panic on importing own invalid transaction (#3550 )	2016-11-25 14:37:58 +01:00
arkpar	d6df25e871	--testnet set to ropset	2016-11-25 13:27:23 +01:00
Arkadiy Paronyan	036518d767	Ropsten network (#3539 ) * Ropsten network * Sorted premine * Comas * Removed trailing coma	2016-11-25 13:11:50 +01:00
arkpar	d8d7d9b2bc	v1.3.14	2016-11-25 12:58:10 +01:00
arkpar	a50974e61b	Better handle sync reorgs	2016-11-25 12:53:40 +01:00
Gav Wood	b669dbb390	Merge pull request #3521 from ethcore/stable-testing [stable] Check tx signatures before adding to the queue.	2016-11-19 02:50:52 +08:00
Arkadiy Paronyan	45d8fc9bf1	Check transaction signature when adding to the queue (#3508 )	2016-11-18 18:14:43 +01:00
arkpar	2981a23880	v1.3.13	2016-11-18 18:08:28 +01:00
kumavis	76952ff363	Fix Stable Docker Build (#3479 ) * Dockerfile for ubuntu stable Add Dockerfile for parity stable branch * Update Dockerfile add make	2016-11-16 22:19:42 +01:00
arkpar	1cd3e0f1cd	Removed -Z orbit	2016-11-16 12:09:26 +01:00
Gav Wood	8d76dd3127	Merge pull request #3462 from ethcore/stable-testing [stable] EIP-170	2016-11-16 11:22:50 +08:00
Arkadiy Paronyan	e09d99b94c	Updated tests	2016-11-15 20:56:49 +01:00
arkpar	0cb2c866b9	fixed test	2016-11-15 20:44:26 +01:00
Gav Wood	b1fdafea3f	Update max code size.	2016-11-15 20:43:21 +01:00
Gav Wood	116e18d2c6	Fix test.	2016-11-15 20:42:40 +01:00
Gav Wood	652bb6bd94	Introduce the actual max code size.	2016-11-15 20:42:01 +01:00
Gav Wood	08a6ce9642	Restrict max code size to 23999 bytes for EIP-150 and after.	2016-11-15 20:40:53 +01:00
arkpar	e4ab13b4fa	update HF block number	2016-11-15 17:57:56 +01:00
arkpar	18939f7f69	update HF block number	2016-11-15 16:29:41 +01:00
arkpar	9442e6c26a	v1.3.12	2016-11-15 16:27:34 +01:00
Arkadiy Paronyan	c2803d3d45	Merge pull request #3441 from ethcore/backport #3035 Backport to stable	2016-11-15 13:35:09 +01:00
Tomasz Drwięga	45e0d28129	Fixing last hashes for ethcall (#3043 )	2016-11-15 09:39:37 +01:00
Arkadiy Paronyan	080ec8043f	[stable] Disable HF and UI (#3372 ) * Disable the HF * Disabled the UI * v1.3.11	2016-11-11 16:54:25 +01:00