Merge branch 'generate-json-rpc-doc' of https://github.com/cpurta/parity-ethereum into cpurta-generate-json-rpc-doc-03

Copy correct parity repo to jsonrpc folder
Copy correct parity repo to jsonrpc folder before attempting to build docs since the CI runner clones the repo as parity and not parity-ethereum.
2018-08-20 22:44:55 +02:00 · 2018-07-31 08:10:05 -07:00 · 2018-07-27 16:42:25 +03:00 · 2018-07-26 13:42:42 -07:00 · 2018-07-26 00:10:57 +03:00 · 2018-07-25 13:49:19 -07:00
351 changed files with 8737 additions and 11047 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -12,9 +12,9 @@ Do **not** open an issue on Github if you think your discovered bug could be a *

 Otherwise, just create a [new issue](https://github.com/paritytech/parity-ethereum/issues/new) in our repository and state:

- What's your Parity Ethereum version?
+- What's your Parity version?
 - What's your operating system and version?
- How did you install Parity Ethereum?
+- How did you install parity?
 - Is your node fully synchronized?
 - Did you try turning it off and on again?

@@ -22,12 +22,12 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual

 ## Contribute!

-If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
+If you would like to contribute to Parity, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).

 Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.

 ## License.

-By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+By contributing to Parity, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).

 Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,11 +1,13 @@
 _Before filing a new issue, please **provide the following information**._

- **Parity Ethereum version**: 0.0.0
- **Operating system**: Windows / MacOS / Linux
- **Installation**: homebrew / one-line installer / built from source
- **Fully synchronized**: no / yes
- **Network**: ethereum / ropsten / kovan / ...
- **Restarted**: no / yes
+> I'm running:
+>
+> - **Which Parity version?**: 0.0.0
+> - **Which operating system?**: Windows / MacOS / Linux
+> - **How installed?**: via installer / homebrew / binaries / from source
+> - **Are you fully synchronized?**: no / yes
+> - **Which network are you connected to?**: ethereum / ropsten / kovan / ...
+> - **Did you try to restart the node?**: no / yes

 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._

--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,183 +1,242 @@
 stages:
  - test
+  - push-release
  - build
-  - publish
-  - misc
-
-image:                             parity/rust:gitlab-ci
-
+  - docs
 variables:
-  CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "${CI_PROJECT_DIR}/cargo"
-  BUILD_TARGET:                    ubuntu
-  BUILD_ARCH:                      amd64
-  CARGO_TARGET:                    x86_64-unknown-linux-gnu
-
+  RUST_BACKTRACE: "1"
+  RUSTFLAGS: ""
+  CARGOFLAGS: ""
+  CI_SERVER_NAME: "GitLab CI"
 cache:
-  key:                             "${CI_JOB_NAME}"
+  key: "$CI_BUILD_STAGE-$CI_BUILD_REF_NAME"
  paths:
-    - ${CI_PROJECT_DIR}/target/
-    - ${CI_PROJECT_DIR}/cargo/
-
-.releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
-  only:                            &releaseable_branches
+    - target/
+  untracked: true
+linux-amd64:
+  stage: build
+  image: parity/rust:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - rustup default stable
+    # ARGUMENTS: 1. BUILD_PLATFORM (target for binaries) 2. PLATFORM (target for cargo) 3. ARC (architecture) 4. & 5. CC & CXX flags 6. binary identifier
+    - scripts/gitlab-build.sh x86_64-unknown-linux-gnu x86_64-unknown-linux-gnu amd64 gcc g++ linux
+  tags:
+    - rust-stable
+  artifacts:
+    paths:
+    - parity.zip
+    name: "stable-x86_64-unknown-linux-gnu_parity"
+linux-i686:
+  stage: build
+  image: parity/rust-i686:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh i686-unknown-linux-gnu i686-unknown-linux-gnu i386 gcc g++ linux
+  tags:
+    - rust-i686
+  artifacts:
+    paths:
+      - parity.zip
+    name: "i686-unknown-linux-gnu"
+  allow_failure: true
+linux-armv7:
+  stage: build
+  image: parity/rust-armv7:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh armv7-unknown-linux-gnueabihf armv7-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ linux
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "armv7_unknown_linux_gnueabihf_parity"
+  allow_failure: true
+linux-armhf:
+  stage: build
+  image: parity/rust-arm:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh arm-unknown-linux-gnueabihf arm-unknown-linux-gnueabihf armhf arm-linux-gnueabihf-gcc arm-linux-gnueabihf-g++ linux
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "arm-unknown-linux-gnueabihf_parity"
+  allow_failure: true
+linux-aarch64:
+  stage: build
+  image: parity/rust-arm64:gitlab-ci
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
+  script:
+    - scripts/gitlab-build.sh aarch64-unknown-linux-gnu aarch64-unknown-linux-gnu arm64 aarch64-linux-gnu-gcc aarch64-linux-gnu-g++ linux
+  tags:
+    - rust-arm
+  artifacts:
+    paths:
+    - parity.zip
+    name: "aarch64-unknown-linux-gnu_parity"
+linux-snap:
+  stage: build
+  image: parity/snapcraft:gitlab-ci
+  only:
    - stable
    - beta
    - tags
-
-.collect_artifacts:                &collect_artifacts
+    - triggers
+  script:
+    - scripts/gitlab-build.sh x86_64-unknown-snap-gnu x86_64-unknown-linux-gnu amd64 gcc g++ snap
+  tags:
+    - rust-stable
  artifacts:
-    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
-    when:                          on_success
-    expire_in:                     1 mos
    paths:
-    - artifacts/
-
-.determine_version:                &determine_version
-  - VERSION="$(sed -r -n '1,/^version/s/^version = "([^"]+)".*$/\1/p' Cargo.toml)"
-  - DATE_STR="$(date +%Y%m%d)"
-  - ID_SHORT="$(echo ${CI_COMMIT_SHA} | cut -c 1-7)"
-  - test "${CI_COMMIT_REF_NAME}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
-  - export VERSION
-  - echo "Version = ${VERSION}"
-
-test-linux:
-  stage:                           test
-  variables:
-    RUN_TESTS:                     "true"
+    - parity.zip
+    name: "stable-x86_64-unknown-snap-gnu_parity"
+darwin:
+  stage: build
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
  script:
-    - scripts/gitlab/test.sh stable
+    - scripts/gitlab-build.sh x86_64-apple-darwin x86_64-apple-darwin macos gcc g++ macos
  tags:
-    - rust-stable
-
-build-linux:
-  stage:                           build
-  only:                            *releaseable_branches
-  variables:
-    CARGO_TARGET:                  x86_64-unknown-linux-gnu
-  script:
-    - scripts/gitlab/build-unix.sh
-  <<:                              *collect_artifacts
-  tags:
-    - rust-stable
-
-build-darwin:
-  stage:                           build
-  only:                            *releaseable_branches
-  variables:
-    CARGO_TARGET:                  x86_64-apple-darwin
-    CC:                            gcc
-    CXX:                           g++
-  script:
-    - scripts/gitlab/build-unix.sh
-  tags:
-    - rust-osx
-  <<:                              *collect_artifacts
-
-build-windows:
-  stage:                           build
-  only:                            *releaseable_branches
+    - osx
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-apple-darwin_parity"
+windows:
  cache:
-    key:                           "${CI_JOB_NAME}"
-    paths:
-      - "%CI_PROJECT_DIR%/target/"
-      - "%CI_PROJECT_DIR%/cargo/"
-  variables:
-    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    key: "%CI_BUILD_STAGE%-%CI_BUILD_REF_NAME%"
+    untracked: true
+  stage: build
+  only:
+    - beta
+    - tags
+    - stable
+    - triggers
  script:
-    - sh scripts/gitlab/build-windows.sh
+    - sh scripts/gitlab-build.sh x86_64-pc-windows-msvc x86_64-pc-windows-msvc amd64 "" "" windows
  tags:
   - rust-windows
-  <<:                              *collect_artifacts
-
-publish-docker:
-  stage:                           publish
-  only:                            *releaseable_branches
-  cache: {}
-  dependencies:
-    - build-linux
-  tags:
-    - shell
-  script:
-    - scripts/gitlab/publish-docker.sh parity
-
-publish-awss3:
-  stage:                           publish
-  only:
-    - nightly
-    - /^v2.*$/
-  cache: {}
-  dependencies:
-    - build-linux
-    - build-darwin
-    - build-windows
-  before_script:                   *determine_version
-  script:
-    - scripts/gitlab/publish-awss3.sh
-  tags:
-    - shell
-
-docs-jsonrpc:
-  stage:                            misc
+  artifacts:
+    paths:
+    - parity.zip
+    name: "x86_64-pc-windows-msvc_parity"
+android-armv7:
+  stage: build
+  image: parity/parity-android:latest
  only:
+    - beta
    - tags
-  cache: {}
+    - stable
+    - triggers
  script:
-    - scripts/gitlab/docs-jsonrpc.sh
-  tags:
-    - shell
-
-test-android:
-  stage:                           misc
-  image:                           parity/rust-android:gitlab-ci
-  variables:
-    CARGO_TARGET:                  armv7-linux-androideabi
-  script:
-    - scripts/gitlab/test.sh stable
+    - cargo build --target=armv7-linux-androideabi
  tags:
    - rust-arm
-
-test-darwin:
-  stage:                           misc
-  variables:
-    CARGO_TARGET:                  x86_64-apple-darwin
-    CC:                            gcc
-    CXX:                           g++
-    RUN_TESTS:                     "true"
-  script:
-    - scripts/gitlab/test.sh stable
-  tags:
-    - rust-osx
-
-test-windows:
-  stage:                           misc
-  cache:
-    key:                           "${CI_JOB_NAME}"
+  allow_failure: true
+  artifacts:
    paths:
-      - "%CI_PROJECT_DIR%/target/"
-      - "%CI_PROJECT_DIR%/cargo/"
-  variables:
-    CARGO_TARGET:                  x86_64-pc-windows-msvc
-    RUN_TESTS:                     "true"
+    - parity.zip
+    name: "armv7-linux-androideabi_parity"
+docker-build:
+  stage: build
+  only:
+    - tags
+    - master
+    - beta
+    - stable
+    - triggers
+  before_script:
+    - docker info
  script:
-    - sh scripts/gitlab/test.sh stable
+    - if [ "$CI_BUILD_REF_NAME" == "master" ]; then DOCKER_TAG="latest"; else DOCKER_TAG=$CI_BUILD_REF_NAME; fi
+    - echo "Tag:" $DOCKER_TAG
+    - docker login -u $Docker_Hub_User_Parity -p $Docker_Hub_Pass_Parity
+    - scripts/docker-build.sh $DOCKER_TAG
+    - docker logout
  tags:
-   - rust-windows
-
-test-beta:
-  stage:                           misc
-  variables:
-    RUN_TESTS:                     "true"
+    - docker
+test-coverage:
+  stage: test
+  only:
+    - master
  script:
-    - scripts/gitlab/test.sh beta
+    - scripts/gitlab-test.sh test-coverage
+  tags:
+    - kcov
+  allow_failure: true
+test-rust-stable:
+  stage: test
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh stable
+  tags:
+    - rust-stable
+test-rust-beta:
+  stage: test
+  only:
+    - triggers
+    - master
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-test.sh beta
  tags:
    - rust-beta
-
-test-nightly:
-  stage:                           misc
-  variables:
-    RUN_TESTS:                     "true"
+  allow_failure: true
+test-rust-nightly:
+  stage: test
+  only:
+    - triggers
+    - master
+  image: parity/rust:gitlab-ci
  script:
-    - scripts/gitlab/test.sh nightly
+    - scripts/gitlab-test.sh nightly
  tags:
+    - rust
    - rust-nightly
+  allow_failure: true
+json-rpc-docs:
+  stage: docs
+  only:
+    - tags
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-rpc-docs.sh
+  tags:
+    - docs
+push-release:
+  stage: push-release
+  only:
+    - tags
+    - triggers
+  image: parity/rust:gitlab-ci
+  script:
+    - scripts/gitlab-push-release.sh
+  tags:
+    - curl
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,7 +2,7 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.2.0"
+version = "2.1.0"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

@@ -33,7 +33,7 @@ fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
 jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 ethcore = { path = "ethcore", features = ["parity"] }
-parity-bytes = "0.1"
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
 ethcore-logger = { path = "logger" }
@@ -43,10 +43,10 @@ ethcore-private-tx = { path = "ethcore/private-tx" }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
 ethcore-transaction = { path = "ethcore/transaction" }
-ethereum-types = "0.4"
+ethereum-types = "0.3"
 node-filter = { path = "ethcore/node_filter" }
 ethkey = { path = "ethkey" }
-rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rpc-cli = { path = "rpc_cli" }
 parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
@@ -57,13 +57,13 @@ parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
-parity-path = "0.1"
+path = { git = "https://github.com/paritytech/parity-common" }
 dir = { path = "util/dir" }
 panic_hook = { path = "util/panic_hook" }
-keccak-hash = "0.1"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
 migration-rocksdb = { path = "util/migration-rocksdb" }
-kvdb = "0.1"
-kvdb-rocksdb = "0.1.3"
+kvdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
 journaldb = { path = "util/journaldb" }
 mem = { path = "util/mem" }

@@ -89,7 +89,6 @@ daemonize = { git = "https://github.com/paritytech/daemonize" }
 [features]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
-ci-skip-issue = ["ethcore/ci-skip-issue"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
@@ -131,6 +130,7 @@ members = [
 	"evmbin",
 	"miner",
 	"parity-clib",
+	"transaction-pool",
 	"whisper",
 	"whisper/cli",
 	"util/triehash-ethereum",
--- a/README.md
+++ b/README.md
@@ -1,44 +1,52 @@
-![Parity Ethereum](docs/logo-parity-ethereum.svg)
+## Parity-Ethereum - a fast, light, and robust EVM and WASM blockchain client

-## The fastest and most advanced Ethereum client.
+### [» Download the latest release «](https://github.com/paritytech/parity-ethereum/releases/latest)

-<p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>
+[![build status](https://gitlab.parity.io/parity/parity/badges/master/build.svg)](https://gitlab.parity.io/parity/parity/commits/master)
+[![codecov](https://codecov.io/gh/paritytech/parity-ethereum/branch/master/graph/badge.svg)](https://codecov.io/gh/paritytech/parity-ethereum)
+[![Snap Status](https://build.snapcraft.io/badge/paritytech/parity.svg)](https://build.snapcraft.io/user/paritytech/parity)
+[![GPLv3](https://img.shields.io/badge/license-GPL%20v3-green.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)

-<p align="center"><a href="https://gitlab.parity.io/parity/parity/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity/badges/master/build.svg" /></a>
-<a href="https://codecov.io/gh/paritytech/parity-ethereum" target="_blank"><img src="https://codecov.io/gh/paritytech/parity-ethereum/branch/master/graph/badge.svg" /></a>
-<a href="https://build.snapcraft.io/user/paritytech/parity" target="_blank"><img src="https://build.snapcraft.io/badge/paritytech/parity.svg" /></a>
-<a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>

-**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.
+### Join the chat!

- Clean, modular codebase for easy customisation
- Advanced CLI-based client
- Minimal memory and storage footprint
- Synchronise in hours, not days with Warp Sync
- Modular for light integration into your service or product
+Get in touch with us on Gitter:
+[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
+[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
+[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
+[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)

-## Technical Overview
+Or join our community on Matrix:
+[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)

-Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
+Official website: https://parity.io | Be sure to check out [our wiki](https://wiki.parity.io) for more information.

-By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
+----

-If you run into problems while using Parity Ethereum, check out the [wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/paritytech/parity-ethereum/issues/new), or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).
+## About Parity-Ethereum

-Parity Ethereum's current beta-release is 2.1. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+Parity-Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity-Ethereum using the sophisticated and cutting-edge Rust programming language. Parity-Ethereum is licensed under the GPLv3, and can be used for all your Ethereum needs.

-## Build Dependencies
+By default, Parity-Ethereum will run a JSON-RPC HTTP server on `127.0.0.1:8545` and a Web-Sockets server on `127.0.0.1:8546`. This is fully configurable and supports a number of APIs.

-Parity Ethereum requires **Rust version 1.29.x** to build.
+If you run into problems while using Parity-Ethereum, feel free to file an issue in this repository or hop on our [Gitter](https://gitter.im/paritytech/parity) or [Riot](https://riot.im/app/#/group/+parity:matrix.parity.io) chat room to ask a question. We are glad to help! **For security-critical issues**, please refer to the security policy outlined in [SECURITY.md](SECURITY.md).

-We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
+Parity-Ethereum's current beta-release is 2.0. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+
+----
+
+## Build dependencies
+
+**Parity-Ethereum requires Rust version 1.27.0 to build**
+
+We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have rustup, you can install it like this:

 - Linux:
  ```bash
  $ curl https://sh.rustup.rs -sSf | sh
  ```

-  Parity Ethereum also requires `gcc`, `g++`, `libudev-dev`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
+  Parity-Ethereum also requires `gcc`, `g++`, `libudev-dev`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.

 - OSX:
  ```bash
@@ -48,19 +56,21 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
  `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.

 - Windows
-  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
-  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
+  Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the rustup installer from
+  https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the msvc toolchain:
  ```bash
  $ rustup default stable-x86_64-pc-windows-msvc
  ```

-Once you have `rustup` installed, then you need to install:
+Once you have rustup installed, then you need to install:
 * [Perl](https://www.perl.org)
 * [Yasm](https://yasm.tortall.net)

-Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.
+Make sure that these binaries are in your `PATH`. After that you should be able to build Parity-Ethereum from source.

-## Install from the Snapcraft Store
+----
+
+## Install from the snap store

 In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):

@@ -68,22 +78,24 @@ In any of the [supported Linux distros](https://snapcraft.io/docs/core/install):
 sudo snap install parity
 ```

-Alternatively, if you want to contribute testing the upcoming release:
+Or, if you want to contribute testing the upcoming release:

 ```bash
 sudo snap install parity --beta
 ```

-Moreover, to test the latest code from the master branch:
+And to test the latest code landed into the master branch:

 ```bash
 sudo snap install parity --edge
 ```

-## Build from Source Code
+----
+
+## Build from source

 ```bash
-# download Parity Ethereum code
+# download Parity-Ethereum code
 $ git clone https://github.com/paritytech/parity-ethereum
 $ cd parity-ethereum

@@ -91,7 +103,7 @@ $ cd parity-ethereum
 $ cargo build --release --features final
 ```

-This produces an executable in the `./target/release` subdirectory.
+This will produce an executable in the `./target/release` subdirectory.

 Note: if cargo fails to parse manifest try:

@@ -105,7 +117,7 @@ Note, when compiling a crate and you receive errors, it's in most cases your out
 $ cargo clean
 ```

-This always compiles the latest nightly builds. If you want to build stable or beta, do a
+This will always compile the latest nightly builds. If you want to build stable or beta, do a

 ```bash
 $ git checkout stable
@@ -117,7 +129,11 @@ or
 $ git checkout beta
 ```

-## Simple One-Line Installer for Mac and Linux
+first.
+
+----
+
+## Simple one-line installer for Mac and Ubuntu

 ```bash
 bash <(curl https://get.parity.io -L)
@@ -129,49 +145,22 @@ The one-line installer always defaults to the latest beta release. To install a
 bash <(curl https://get.parity.io -L) -r stable
 ```

-## Start Parity Ethereum
+## Start Parity-Ethereum

 ### Manually

-To start Parity Ethereum manually, just run
+To start Parity-Ethereum manually, just run

 ```bash
 $ ./target/release/parity
 ```

-so Parity Ethereum begins syncing the Ethereum blockchain.
+and Parity-Ethereum will begin syncing the Ethereum blockchain.

-### Using `systemd` service file
+### Using systemd service file

-To start Parity Ethereum as a regular user using `systemd` init:
+To start Parity-Ethereum as a regular user using systemd init:

 1. Copy `./scripts/parity.service` to your
-`systemd` user directory (usually `~/.config/systemd/user`).
-2. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
-
-## Parity Ethereum toolchain
-
-In addition to the Parity Ethereum client, there are additional tools in this repository available:
-
- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/ethstore/) - Parity Ethereum key management.
- [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/ethkey/) - Parity Ethereum keys generator.
- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
-
-## Join the chat!
-
-Questions? Get in touch with us on Gitter:
-[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
-[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
-[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
-[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
-
-Alternatively, join our community on Matrix:
-[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
-
-## Documentation
-
-Official website: https://parity.io
-
-Be sure to [check out our wiki](https://wiki.parity.io) for more information.
+systemd user directory (usually `~/.config/systemd/user`).
+2. To configure Parity-Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity-Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
--- a/chainspec/Cargo.toml
+++ b/chainspec/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "chainspec"
 version = "0.1.0"
-authors = ["Marek Kotewicz <marek@parity.io>"]
+authors = ["debris <marek.kotewicz@gmail.com>"]

 [dependencies]
 ethjson = { path = "../json" }
--- a/docker/README.md
+++ b/docker/README.md
@@ -0,0 +1,3 @@
+Usage
+
+```docker build -f docker/ubuntu/Dockerfile --tag ethcore/parity:branch_or_tag_name .```
--- a/docker/alpine/Dockerfile
+++ b/docker/alpine/Dockerfile
@@ -0,0 +1,43 @@
+FROM alpine:edge AS builder
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+RUN apk add --no-cache \
+  build-base \
+  cargo \
+  cmake \
+  eudev-dev \
+  linux-headers \
+  perl \
+  rust
+
+WORKDIR /parity
+COPY . /parity
+RUN cargo build --release --target x86_64-alpine-linux-musl --verbose
+RUN strip target/x86_64-alpine-linux-musl/release/parity
+
+
+FROM alpine:edge
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+RUN apk add --no-cache \
+  libstdc++ \
+  eudev-libs \
+  libgcc
+
+RUN addgroup -g 1000 parity \
+  && adduser -u 1000 -G parity -s /bin/sh -D parity
+
+USER parity
+
+EXPOSE 8080 8545 8180
+
+WORKDIR /home/parity
+
+RUN mkdir -p /home/parity/.local/share/io.parity.ethereum/
+COPY --chown=parity:parity --from=builder /parity/target/x86_64-alpine-linux-musl/release/parity ./
+
+ENTRYPOINT ["./parity"]
--- a/docker/android/Dockerfile
+++ b/docker/android/Dockerfile
@@ -0,0 +1,61 @@
+FROM ubuntu:xenial
+LABEL maintainer="Parity Technologies <devops@parity.io>"
+
+RUN apt-get update && \
+    apt-get install -yq sudo curl file build-essential wget git g++ cmake pkg-config bison flex \
+                        unzip lib32stdc++6 lib32z1 python autotools-dev automake autoconf libtool \
+                        gperf xsltproc docbook-xsl
+
+# Rust & Cargo
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+ENV PATH /root/.cargo/bin:$PATH
+RUN rustup toolchain install stable
+RUN rustup target add --toolchain stable arm-linux-androideabi
+RUN rustup target add --toolchain stable armv7-linux-androideabi
+
+# Android NDK and toolchain
+RUN cd /usr/local && \
+    wget -q https://dl.google.com/android/repository/android-ndk-r16b-linux-x86_64.zip && \
+    unzip -q android-ndk-r16b-linux-x86_64.zip && \
+    rm android-ndk-r16b-linux-x86_64.zip
+ENV NDK_HOME /usr/local/android-ndk-r16b
+RUN /usr/local/android-ndk-r16b/build/tools/make-standalone-toolchain.sh \
+    --arch=arm --install-dir=/opt/ndk-standalone --stl=libc++ --platform=android-26
+ENV PATH $PATH:/opt/ndk-standalone/bin
+
+# Compiling libudev for Android
+# This is the most hacky part of the process, as we need to apply a patch and pass specific
+# options that the compiler environment doesn't define.
+RUN cd /root && \
+    git clone https://github.com/gentoo/eudev.git
+ADD libudev.patch /root
+RUN cd /root/eudev && \
+    git checkout 83d918449f22720d84a341a05e24b6d109e6d3ae && \
+    ./autogen.sh && \
+    ./configure --disable-introspection --disable-programs --disable-hwdb \
+                --host=arm-linux-androideabi --prefix=/opt/ndk-standalone/sysroot/usr/ \
+                --enable-shared=false CC=arm-linux-androideabi-clang \
+                CFLAGS="-D LINE_MAX=2048 -D RLIMIT_NLIMITS=15 -D IPTOS_LOWCOST=2 -std=gnu99" \
+                CXX=arm-linux-androideabi-clang++ && \
+    git apply - < /root/libudev.patch && \
+    make && \
+    make install
+RUN rm -rf /root/eudev
+RUN rm /root/libudev.patch
+
+# Rust-related configuration
+ADD cargo-config.toml /root/.cargo/config
+ENV ARM_LINUX_ANDROIDEABI_OPENSSL_DIR /opt/ndk-standalone/sysroot/usr
+ENV ARMV7_LINUX_ANDROIDEABI_OPENSSL_DIR /opt/ndk-standalone/sysroot/usr
+ENV CC_arm_linux_androideabi arm-linux-androideabi-clang
+ENV CC_armv7_linux_androideabi arm-linux-androideabi-clang
+ENV CXX_arm_linux_androideabi arm-linux-androideabi-clang++
+ENV CXX_armv7_linux_androideabi arm-linux-androideabi-clang++
+ENV AR_arm_linux_androideabi arm-linux-androideabi-ar
+ENV AR_armv7_linux_androideabi arm-linux-androideabi-ar
+ENV CFLAGS_arm_linux_androideabi -std=gnu11 -fPIC -D OS_ANDROID
+ENV CFLAGS_armv7_linux_androideabi -std=gnu11 -fPIC -D OS_ANDROID
+ENV CXXFLAGS_arm_linux_androideabi -std=gnu++11 -fPIC -fexceptions -frtti -static-libstdc++ -D OS_ANDROID
+ENV CXXFLAGS_armv7_linux_androideabi -std=gnu++11 -fPIC -fexceptions -frtti -static-libstdc++ -D OS_ANDROID
+ENV CXXSTDLIB_arm_linux_androideabi ""
+ENV CXXSTDLIB_armv7_linux_androideabi ""
--- a/docker/android/cargo-config.toml
+++ b/docker/android/cargo-config.toml
@@ -0,0 +1,9 @@
+[target.armv7-linux-androideabi]
+linker = "arm-linux-androideabi-clang"
+ar = "arm-linux-androideabi-ar"
+rustflags = ["-C", "link-arg=-lc++_static", "-C", "link-arg=-lc++abi", "-C", "link-arg=-landroid_support"]
+
+[target.arm-linux-androideabi]
+linker = "arm-linux-androideabi-clang"
+ar = "arm-linux-androideabi-ar"
+rustflags = ["-C", "link-arg=-lc++_static", "-C", "link-arg=-lc++abi", "-C", "link-arg=-landroid_support"]
--- a/docker/android/libudev.patch
+++ b/docker/android/libudev.patch
@@ -0,0 +1,216 @@
+diff --git a/src/collect/collect.c b/src/collect/collect.c
+index 2cf1f00..b24f26b 100644
+--- a/src/collect/collect.c
+++ b/src/collect/collect.c
+@@ -84,7 +84,7 @@ static void usage(void)
+                "  invoked for each ID in <idlist>) collect returns 0, the\n"
+                "  number of missing IDs otherwise.\n"
+                "  On error a negative number is returned.\n\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ /*
+diff --git a/src/scsi_id/scsi_id.c b/src/scsi_id/scsi_id.c
+index 8b76d87..7bf3948 100644
+--- a/src/scsi_id/scsi_id.c
+++ b/src/scsi_id/scsi_id.c
+@@ -321,7 +321,7 @@ static void help(void) {
+                "  -u --replace-whitespace          Replace all whitespace by underscores\n"
+                "  -v --verbose                     Verbose logging\n"
+                "  -x --export                      Print values as environment keys\n"
+-               , program_invocation_short_name);
+               , "parity");
+ 
+ }
+ 
+diff --git a/src/shared/hashmap.h b/src/shared/hashmap.h
+index a03ee58..a7c2005 100644
+--- a/src/shared/hashmap.h
+++ b/src/shared/hashmap.h
+@@ -98,10 +98,7 @@ extern const struct hash_ops uint64_hash_ops;
+ #if SIZEOF_DEV_T != 8
+ unsigned long devt_hash_func(const void *p, const uint8_t hash_key[HASH_KEY_SIZE]) _pure_;
+ int devt_compare_func(const void *a, const void *b) _pure_;
+-extern const struct hash_ops devt_hash_ops = {
+-        .hash = devt_hash_func,
+-        .compare = devt_compare_func
+-};
+extern const struct hash_ops devt_hash_ops;
+ #else
+ #define devt_hash_func uint64_hash_func
+ #define devt_compare_func uint64_compare_func
+diff --git a/src/shared/log.c b/src/shared/log.c
+index 4a40996..1496984 100644
+--- a/src/shared/log.c
+++ b/src/shared/log.c
+@@ -335,7 +335,7 @@ static int write_to_syslog(
+ 
+         IOVEC_SET_STRING(iovec[0], header_priority);
+         IOVEC_SET_STRING(iovec[1], header_time);
+-        IOVEC_SET_STRING(iovec[2], program_invocation_short_name);
+        IOVEC_SET_STRING(iovec[2], "parity");
+         IOVEC_SET_STRING(iovec[3], header_pid);
+         IOVEC_SET_STRING(iovec[4], buffer);
+ 
+@@ -383,7 +383,7 @@ static int write_to_kmsg(
+         char_array_0(header_pid);
+ 
+         IOVEC_SET_STRING(iovec[0], header_priority);
+-        IOVEC_SET_STRING(iovec[1], program_invocation_short_name);
+        IOVEC_SET_STRING(iovec[1], "parity");
+         IOVEC_SET_STRING(iovec[2], header_pid);
+         IOVEC_SET_STRING(iovec[3], buffer);
+         IOVEC_SET_STRING(iovec[4], "\n");
+diff --git a/src/udev/udevadm-control.c b/src/udev/udevadm-control.c
+index 6af7163..3271e56 100644
+--- a/src/udev/udevadm-control.c
+++ b/src/udev/udevadm-control.c
+@@ -41,7 +41,7 @@ static void print_help(void) {
+                "  -p --property=KEY=VALUE  Set a global property for all events\n"
+                "  -m --children-max=N      Maximum number of children\n"
+                "     --timeout=SECONDS     Maximum time to block for a reply\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int adm_control(struct udev *udev, int argc, char *argv[]) {
+diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c
+index 0aec976..a31ac02 100644
+--- a/src/udev/udevadm-info.c
+++ b/src/udev/udevadm-info.c
+@@ -279,7 +279,7 @@ static void help(void) {
+                "  -P --export-prefix          Export the key name with a prefix\n"
+                "  -e --export-db              Export the content of the udev database\n"
+                "  -c --cleanup-db             Clean up the udev database\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int uinfo(struct udev *udev, int argc, char *argv[]) {
+diff --git a/src/udev/udevadm-monitor.c b/src/udev/udevadm-monitor.c
+index 15ded09..b58dd08 100644
+--- a/src/udev/udevadm-monitor.c
+++ b/src/udev/udevadm-monitor.c
+@@ -73,7 +73,7 @@ static void help(void) {
+                "  -u --udev                                Print udev events\n"
+                "  -s --subsystem-match=SUBSYSTEM[/DEVTYPE] Filter events by subsystem\n"
+                "  -t --tag-match=TAG                       Filter events by tag\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int adm_monitor(struct udev *udev, int argc, char *argv[]) {
+diff --git a/src/udev/udevadm-settle.c b/src/udev/udevadm-settle.c
+index 33597bc..b36a504 100644
+--- a/src/udev/udevadm-settle.c
+++ b/src/udev/udevadm-settle.c
+@@ -43,7 +43,7 @@ static void help(void) {
+                "     --version              Show package version\n"
+                "  -t --timeout=SECONDS      Maximum time to wait for events\n"
+                "  -E --exit-if-exists=FILE  Stop waiting if file exists\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int adm_settle(struct udev *udev, int argc, char *argv[]) {
+diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c
+index baaeca9..50ed812 100644
+--- a/src/udev/udevadm-test-builtin.c
+++ b/src/udev/udevadm-test-builtin.c
+@@ -39,7 +39,7 @@ static void help(struct udev *udev) {
+                "  -h --help     Print this message\n"
+                "     --version  Print version of the program\n\n"
+                "Commands:\n"
+-               , program_invocation_short_name);
+               , "parity");
+ 
+         udev_builtin_list(udev);
+ }
+diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c
+index 47fd924..a855412 100644
+--- a/src/udev/udevadm-test.c
+++ b/src/udev/udevadm-test.c
+@@ -39,7 +39,7 @@ static void help(void) {
+                "     --version                         Show package version\n"
+                "  -a --action=ACTION                   Set action string\n"
+                "  -N --resolve-names=early|late|never  When to resolve names\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int adm_test(struct udev *udev, int argc, char *argv[]) {
+diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c
+index 4dc756a..67787d3 100644
+--- a/src/udev/udevadm-trigger.c
+++ b/src/udev/udevadm-trigger.c
+@@ -92,7 +92,7 @@ static void help(void) {
+                "  -y --sysname-match=NAME           Trigger devices with this /sys path\n"
+                "     --name-match=NAME              Trigger devices with this /dev name\n"
+                "  -b --parent-match=NAME            Trigger devices with that parent device\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int adm_trigger(struct udev *udev, int argc, char *argv[]) {
+diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c
+index 3e57cf6..b03dfaa 100644
+--- a/src/udev/udevadm.c
+++ b/src/udev/udevadm.c
+@@ -62,7 +62,7 @@ static int adm_help(struct udev *udev, int argc, char *argv[]) {
+         printf("%s [--help] [--version] [--debug] COMMAND [COMMAND OPTIONS]\n\n"
+                "Send control commands or test the device manager.\n\n"
+                "Commands:\n"
+-               , program_invocation_short_name);
+               , "parity");
+ 
+         for (i = 0; i < ELEMENTSOF(udevadm_cmds); i++)
+                 if (udevadm_cmds[i]->help != NULL)
+@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
+                                 goto out;
+                         }
+ 
+-        fprintf(stderr, "%s: missing or unknown command\n", program_invocation_short_name);
+        fprintf(stderr, "%s: missing or unknown command\n", "parity");
+         rc = 2;
+ out:
+         mac_selinux_finish();
+diff --git a/src/udev/udevd.c b/src/udev/udevd.c
+index cf826c6..4eec0af 100644
+--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
+@@ -1041,7 +1041,7 @@ static void help(void) {
+                "  -t --event-timeout=SECONDS  Seconds to wait before terminating an event\n"
+                "  -N --resolve-names=early|late|never\n"
+                "                              When to resolve users and groups\n"
+-               , program_invocation_short_name);
+               , "parity");
+ }
+ 
+ static int parse_argv(int argc, char *argv[]) {
+diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c
+index 1dce0d5..f65badf 100644
+--- a/src/v4l_id/v4l_id.c
+++ b/src/v4l_id/v4l_id.c
+@@ -49,7 +49,7 @@ int main(int argc, char *argv[]) {
+                         printf("%s [-h,--help] <device file>\n\n"
+                                "Video4Linux device identification.\n\n"
+                                "  -h  Print this message\n"
+-                               , program_invocation_short_name);
+                               , "parity");
+                         return 0;
+                 case '?':
+                         return -EINVAL;
+diff --git a/src/shared/path-util.c b/src/shared/path-util.c
+index 0744563..7151356 100644
+--- a/src/shared/path-util.c
+++ b/src/shared/path-util.c
+@@ -109,7 +109,7 @@ char *path_make_absolute_cwd(const char *p) {
+         if (path_is_absolute(p))
+                 return strdup(p);
+ 
+-        cwd = get_current_dir_name();
+        cwd = getcwd(malloc(128), 128);
+         if (!cwd)
+                 return NULL;
+ 
--- a/docker/centos/Dockerfile
+++ b/docker/centos/Dockerfile
@@ -0,0 +1,36 @@
+FROM centos:latest
+WORKDIR /build
+
+# install tools and dependencies
+RUN yum -y update&& \
+    yum install -y git make gcc-c++ gcc file binutils cmake
+
+# install rustup
+RUN curl -sSf https://static.rust-lang.org/rustup.sh -o rustup.sh &&\
+ls&&\
+ sh rustup.sh --disable-sudo
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# set compiler
+ENV CXX g++
+ENV CC gcc
+
+# show tools
+RUN rustc -vV && \
+cargo -V && \
+gcc -v &&\
+g++ -v
+
+# build parity
+ADD . /build/parity
+RUN cd parity&&\
+    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/docker/hub/Dockerfile
+++ b/docker/hub/Dockerfile
@@ -0,0 +1,64 @@
+FROM ubuntu:xenial
+MAINTAINER Parity Technologies <devops@parity.io>
+WORKDIR /build
+#ENV for build TAG
+ARG BUILD_TAG
+ENV BUILD_TAG ${BUILD_TAG:-master}
+RUN echo "Build tag:" $BUILD_TAG
+# install tools and dependencies
+RUN apt-get update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        # make
+        build-essential \
+        # add-apt-repository
+        software-properties-common \
+        make \
+        cmake \
+        curl \
+        wget \
+        git \
+        g++ \
+        gcc \
+        libc6 \
+        libc6-dev \
+        binutils \
+        file \
+        libudev-dev \
+        pkg-config \
+        dpkg-dev &&\
+# install rustup
+ curl https://sh.rustup.rs -sSf | sh -s -- -y && \
+# rustup directory
+ PATH=/root/.cargo/bin:$PATH && \
+# show backtraces
+ RUST_BACKTRACE=1 && \
+# build parity
+cd /build&&git clone https://github.com/paritytech/parity-ethereum && \
+        cd parity-ethereum&& \
+	git pull&& \
+	git checkout $BUILD_TAG && \
+        cargo build --verbose --release --features final && \
+        strip /build/parity-ethereum/target/release/parity && \
+ file /build/parity-ethereum/target/release/parity&&mkdir -p /parity&& cp /build/parity-ethereum/target/release/parity /parity&&\
+#cleanup Docker image
+ rm -rf /root/.cargo&&rm -rf /root/.multirust&&rm -rf /root/.rustup&&rm -rf /build&&\
+ apt-get purge -y  \
+        # make
+        build-essential \
+        # add-apt-repository
+        software-properties-common \
+        make \
+        cmake \
+        curl \
+        wget \
+        git \
+        g++ \
+        gcc \
+        binutils \
+        file \
+        pkg-config \
+        dpkg-dev &&\
+ rm -rf /var/lib/apt/lists/*
+# setup ENTRYPOINT
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/parity/parity"]
--- a/docker/ubuntu-aarch64/Dockerfile
+++ b/docker/ubuntu-aarch64/Dockerfile
@@ -0,0 +1,45 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get -y update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-aarch64-linux-gnu g++-aarch64-linux-gnu \
+        libc6-arm64-cross libc6-dev-arm64-cross wget file ca-certificates \
+        binutils-aarch64-linux-gnu cmake \
+        && \
+    apt-get clean
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+ENV RUST_TARGETS="aarch64-unknown-linux-gnu"
+
+# multirust add arm--linux-gnuabhf toolchain
+RUN rustup target add aarch64-unknown-linux-gnu
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && cargo -V
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.aarch64-unknown-linux-gnu]\n\
+        linker = "aarch64-linux-gnu-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target aarch64-unknown-linux-gnu --release --verbose && \
+        ls /build/parity/target/aarch64-unknown-linux-gnu/release/parity &&     \
+        /usr/bin/aarch64-linux-gnu-strip /build/parity/target/aarch64-unknown-linux-gnu/release/parity
+
+RUN file /build/parity/target/aarch64-unknown-linux-gnu/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/aarch64-unknown-linux-gnu/release/parity"]
--- a/docker/ubuntu-arm/Dockerfile
+++ b/docker/ubuntu-arm/Dockerfile
@@ -0,0 +1,45 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get -y update && \
+        apt-get install -y --force-yes --no-install-recommends \
+        curl git make g++ gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf \
+        libc6-dev-armhf-cross wget file ca-certificates \
+        binutils-arm-linux-gnueabihf cmake \
+        && \
+    apt-get clean
+
+# install rustup
+RUN curl https://sh.rustup.rs -sSf | sh -s -- -y
+
+# rustup directory
+ENV PATH /root/.cargo/bin:$PATH
+
+ENV RUST_TARGETS="arm-unknown-linux-gnueabihf"
+
+# multirust add arm--linux-gnuabhf toolchain
+RUN rustup target add armv7-unknown-linux-gnueabihf
+
+# show backtraces
+ENV RUST_BACKTRACE 1
+
+# show tools
+RUN rustc -vV && cargo -V
+
+# build parity
+ADD . /build/parity
+RUN cd parity && \
+        mkdir -p .cargo && \
+        echo '[target.armv7-unknown-linux-gnueabihf]\n\
+        linker = "arm-linux-gnueabihf-gcc"\n'\
+        >>.cargo/config && \
+        cat .cargo/config && \
+        cargo build --target armv7-unknown-linux-gnueabihf --release --verbose && \
+        ls /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity && \
+        /usr/bin/arm-linux-gnueabihf-strip /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+
+RUN file /build/parity/target/armv7-unknown-linux-gnueabihf/release/parity
+
+EXPOSE 8080 8545 8180
+ENTRYPOINT ["/build/parity/target/armv7-unknown-linux-gnueabihf/release/parity"]
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@@ -0,0 +1,42 @@
+FROM ubuntu:14.04
+WORKDIR /build
+
+# install tools and dependencies
+RUN apt-get update && \
+        apt-get install -y \
+        g++ \
+        build-essential \
+        cmake \
+        curl \
+        git \
+        file \
+        binutils \
+        pkg-config \
+        libudev-dev
+
+# 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
+ADD . /build/parity
+RUN cd parity && \
+        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/docs/CHANGELOG-1.11.md
+++ b/docs/CHANGELOG-1.11.md
@@ -1,84 +1,4 @@
-Note: Parity 1.11 reached End-of-Life on 2018-09-19 (EOL).
-
-## Parity-Ethereum [v1.11.11](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.11) (2018-09-11)
-
-Parity-Ethereum 1.11.11-stable is a bug-fix release to improve performance and stability.
-
-The full list of included changes:
-
- Stable backports 1.11.11 ([#9443](https://github.com/paritytech/parity-ethereum/pull/9443))
-  - Parity-version: bump stable to 1.11.11
-  - Update tobalaba.json ([#9419](https://github.com/paritytech/parity-ethereum/pull/9419))
-  - Update hardcoded sync ([#9421](https://github.com/paritytech/parity-ethereum/pull/9421))
-    - Update foundation hardcoded header to block 6219777
-    - Update ropsten hardcoded header to block 3917825
-    - Update kovan hardcoded header to block 8511489
-  - Parity: print correct keys path on startup ([#9501](https://github.com/paritytech/parity-ethereum/pull/9501))
-  - Only check warp syncing for eth_getWorks ([#9484](https://github.com/paritytech/parity-ethereum/pull/9484))
-    - Only check warp syncing for eth_getWorks
-    - Use SyncStatus::is_snapshot_syncing
-
-## Parity-Ethereum [v1.11.10](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.10) (2018-08-31)
-
-Parity-Ethereum 1.11.10-stable is a bug-fix release to improve performance and stability.
-
-The full list of included changes:
-
- Stable backports for 1.11.10 ([#9228](https://github.com/paritytech/parity-ethereum/pull/9228))
-  - Parity-version: bump stable to 1.11.9
-  - Fix compilation error on nightly rust ([#8707](https://github.com/paritytech/parity-ethereum/pull/8707))
-    - On nightly rust passing `public_url` works but that breaks on stable. This works for both.
-  - Parity-version: bump stable to 1.11.10
-  - Check if synced when using eth_getWork ([#9193](https://github.com/paritytech/parity-ethereum/issues/9193)) ([#9210](https://github.com/paritytech/parity-ethereum/pull/9210))
-    - Check if synced when using eth_getWork ([#9193](https://github.com/paritytech/parity-ethereum/issues/9193))
-    - Don't use fn syncing
-    - Fix identation
-    - Fix typo
-    - Don't check for warping
-    - Rpc: avoid calling queue_info twice on eth_getWork
-  - Fix potential as_usize overflow when casting from U256 in miner ([#9221](https://github.com/paritytech/parity-ethereum/pull/9221))
-  - Allow old blocks from peers with lower difficulty ([#9226](https://github.com/paritytech/parity-ethereum/pull/9226))
-    - Previously we only allow downloading of old blocks if the peer difficulty was greater than our syncing difficulty. This change allows downloading of blocks from peers where the difficulty is greater then the last downloaded old block.
-  - Update Dockerfile ([#9242](https://github.com/paritytech/parity-ethereum/pull/9242))
-    - Update Dockerfile
-    - Fix Docker build
-  - Fix dockerfile paths: parity -> parity-ethereum ([#9248](https://github.com/paritytech/parity-ethereum/pull/9248))
-  - Update tobalaba.json ([#9313](https://github.com/paritytech/parity-ethereum/pull/9313))
-  - Light client `Provide default nonce in transactions when it´s missing` ([#9370](https://github.com/paritytech/parity-ethereum/pull/9370))
-    - Provide `default_nonce` in tx`s when it´s missing
-    - When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead!
-  - Changed http:// to https:// on Yasm link ([#9369](https://github.com/paritytech/parity-ethereum/pull/9369))
-    - Changed http:// to https:// on Yasm link in README.md
-    - Provide `default_nonce` in tx`s when it´s missing
-    - When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead!
-    - Address grumbles
-  - Ethcore: kovan: delay activation of strict score validation ([#9406](https://github.com/paritytech/parity-ethereum/pull/9406))
-  - Use impl Future in the light client RPC helpers ([#8628](https://github.com/paritytech/parity-ethereum/pull/8628))
-  - Better support for eth_getLogs in light mode ([#9186](https://github.com/paritytech/parity-ethereum/pull/9186))
-    - Light client on-demand request for headers range.
-    - Cache headers in HeaderWithAncestors response.
-      - Also fulfills request locally if all headers are in cache.
-    - Lightfetch::logs fetches missing headers on demand.
-    - Lightfetch::logs limit the number of headers requested at a time.
-    - Lightfetch::logs refactor header fetching logic.
-    - Enforce limit on header range length in light client logs request.
-    - Fix light request tests after struct change.
-    - Respond to review comments.
-  - Propagate transactions for next 4 blocks. ([#9265](https://github.com/paritytech/parity-ethereum/pull/9265))
-    - This PR also removes the limit of max 64 transactions per packet, currently we only attempt to prevent the packet size to go over 8MB. This will only be the case for super-large transactions or high-block-gas-limit chains.
-    - Patching this is important only for chains that have blocks that can fit more than 4k transactions (over 86M block gas limit)
-    - For mainnet, we should actually see a tiny bit faster propagation since instead of computing 4k pending set, we only need `4 * 8M / 21k = 1523` transactions.
-  - Ethcore: fix pow difficulty validation ([#9328](https://github.com/paritytech/parity-ethereum/pull/9328))
-    - Ethcore: fix pow difficulty validation
-    - Ethcore: validate difficulty is not zero
-    - Ethcore: add issue link to regression test
-    - Ethcore: fix tests
-    - Ethcore: move difficulty_to_boundary to ethash crate
-    - Ethcore: reuse difficulty_to_boundary and boundary_to_difficulty
-    - Ethcore: fix grumbles in difficulty_to_boundary_aux
- Add snapcraft cmake build dependency ([#9243](https://github.com/paritytech/parity-ethereum/pull/9243))
-
-## Parity-Ethereum [v1.11.8](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.8) (2018-07-27)
+## Parity [v1.11.8](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.8) (2018-07-27)

 Parity 1.11.8-stable is a bug-fix release to improve performance and stability.

@@ -122,7 +42,7 @@ The full list of included changes:
  - Ethcore: update to parity-wasm 0.31
  - Rpc: fix broken merge

-## Parity-Ethereum [v1.11.7](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.7) "Prosperity" (2018-07-17)
+## Parity [v1.11.7](https://github.com/paritytech/parity-ethereum/releases/tag/v1.11.7) "Prosperity" (2018-07-17)

 Parity 1.11.7 "Prosperity" is a bug-fix release to improve performance and stability that marks the 1.11 release track as `stable`. Among other fixes, this release significantly addresses peering and synchronization issues. If you experienced such issues before, upgrading is highly recommended. If you rely on old versions of Parity, check out the `old-stable-1.10` branch, cherry-pick fixes, and compile your binaries independently. There will be no official support for any versions prior to 1.11.7, however (EOL).

--- a/docs/CHANGELOG-2.0.md
+++ b/docs/CHANGELOG-2.0.md
@@ -1,551 +0,0 @@
-## Parity-Ethereum [v2.0.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.6) (2018-09-20)
-
-Parity-Ethereum 2.0.6-stable is a release that does not improve performance and stability; no changes were made.
-
-The full list of included changes:
-
- Backports to 2.0.6 stable ([#9600](https://github.com/paritytech/parity-ethereum/pull/9600))
- Ci: disable build cache for json-rpc-docs ([#9587](https://github.com/paritytech/parity-ethereum/pull/9587))
-
-## Parity-Ethereum [v2.0.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.5) (2018-09-18)
-
-Parity-Ethereum 2.0.5-stable is a bug-fix release to improve performance and stability.
-
-Please, note:
-
- This release marks the 2.0 track of Parity-Ethereum as stable.
- This release contains a low-severity issue with the web-sockets ports. [#9545](https://github.com/paritytech/parity-ethereum/pull/9545)
- This release resolves a potential network fragmentation issue. [#9526](https://github.com/paritytech/parity-ethereum/pull/9526)
- The default `gas_floor_target` was increased to `8_000_000`, the default `gas_cap` to `10_000_000`.
- With this release, all versions of Parity Ethereum 1.x prior to 2.0 reached end of life.
- Users are urged to upgrade to 2.0.5-stable or 2.1.0-beta.
-
-The full list of included changes:
-
- Backports for 2.0.5 stable ([#9519](https://github.com/paritytech/parity-ethereum/pull/9519))
-  - Parity-version: mark 2.0.5 track stable
-  - Deps: bump fs-swap to 0.2.4
-  - Remove initial token for WS. ([#9545](https://github.com/paritytech/parity-ethereum/pull/9545))
-  - Version: mark release critical
-  - Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564))
-    - Gas-floor-target increased to 8M by default
-    - Gas-cap increased to 10M by default
-  - Improve P2P discovery ([#9526](https://github.com/paritytech/parity-ethereum/pull/9526))
-    - Add `target` to Rust traces
-    - Network-devp2p: Don't remove discovery peer in main sync
-    - Network-p2p: Refresh discovery more often
-    - Update Peer discovery protocol
-    - Run discovery more often when not enough nodes connected
-    - Start the first discovery early
-    - Update fast discovery rate
-    - Fix tests
-    - Fix `ping` tests
-    - Fixing remote Node address ; adding PingPong round
-    - Fix tests: update new +1 PingPong round
-    - Increase slow Discovery rate
-      - Check in flight FindNode before pings
-    - Add `deprecated` to deprecated_echo_hash
-    - Refactor `discovery_round` branching
-  - Net_version caches network_id to avoid redundant acquire of sync read lock ([#9544](https://github.com/paritytech/parity-ethereum/pull/9544))
-    - Net_version caches network_id to avoid redundant acquire of sync read lock, [#8746](https://github.com/paritytech/parity-ethereum/issues/8746)
-    - Use lower_hex display formatting for `net_peerCount` RPC method
- Update snapcraft.yaml ([#9530](https://github.com/paritytech/parity-ethereum/pull/9530))
-  - Fix DEPRECATED `prepare`
-  - Fix TODO https://bugs.launchpad.net/snapcraft/+bug/1778530
-
-## Parity-Ethereum [v2.0.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.4) (2018-09-11)
-
-Parity-Ethereum 2.0.4-beta is a bug-fix release to improve performance and stability:
-
- `eth_coinbase` now provides an actual account for light clients
- don't report skipped primaries when empty steps are enabled in proof-of-authority networks
- fix snapshot restoration failure on windows
- check warp sync status for `eth_getWorks`
-
-The full list of included changes:
-
- Beta backports to 2.0.4 ([#9452](https://github.com/paritytech/parity-ethereum/pull/9452))
-  - Parity-version: bump beta to 2.0.4
-  - [Light/jsonrpc] Provide the actual account for `eth_coinbase` RPC and unify error handeling for light and full client ([#9383](https://github.com/paritytech/parity-ethereum/pull/9383))
-    - Provide the actual `account` for eth_coinbase
-    - The previous implementation always provided the `zero address` on `eth_coinbase` RPC. Now, instead the actual address is returned on success or an error when no account(s) is found!
-    - Full client `eth_coinbase` return err
-    - In the full-client return an error when no account is found instead of returning the `zero address`
-    - Remove needless blocks on single import
-    - Remove needless `static` lifetime on const
-    - Fix `rpc_eth_author` test
-  - Parity: print correct keys path on startup ([#9501](https://github.com/paritytech/parity-ethereum/pull/9501))
-  - Aura: don't report skipped primaries when empty steps are enabled ([#9435](https://github.com/paritytech/parity-ethereum/pull/9435))
-  - Only check warp syncing for eth_getWorks ([#9484](https://github.com/paritytech/parity-ethereum/pull/9484))
-    - Only check warp syncing for eth_getWorks
-    - Use SyncStatus::is_snapshot_syncing
-  - Fix Snapshot restoration failure on Windows ([#9491](https://github.com/paritytech/parity-ethereum/pull/9491))
-    - Close Blooms DB files before DB restoration
-    - Address Grumbles
-
-## Parity-Ethereum [v2.0.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.3) (2018-09-01)
-
-Parity-Ethereum 2.0.3-beta is a bug-fix release to improve performance and stability. Hopefully. ;)
-
-The full list of included changes:
-
- Beta backports for 2.0.3 ([#9229](https://github.com/paritytech/parity-ethereum/pull/9229))
-  - parity-version: bump beta to 2.0.2
-  - remove ssl from dockerfiles, closes [#8880](https://github.com/paritytech/parity-ethereum/issues/8880) ([#9195](https://github.com/paritytech/parity-ethereum/pull/9195))
-  - snap: remove ssl dependencies from snapcraft definition ([#9222](https://github.com/paritytech/parity-ethereum/pull/9222))
-  - parity-version: bump beta to 2.0.3
-  - Remove all dapp permissions related settings ([#9120](https://github.com/paritytech/parity-ethereum/pull/9120))
-    - Completely remove all dapps struct from rpc
-    - Remove unused pub use
-    - Remove dapp policy/permission func in ethcore
-    - Remove all dapps settings from rpc
-    - Fix rpc tests
-    - Use both origin and user_agent
-    - Address grumbles
-    - Address grumbles
-    - Fix tests
-  - Check if synced when using eth_getWork ([#9193](https://github.com/paritytech/parity-ethereum/issues/9193)) ([#9210](https://github.com/paritytech/parity-ethereum/pull/9210))
-    - Check if synced when using eth_getWork ([#9193](https://github.com/paritytech/parity-ethereum/issues/9193))
-    - Don't use fn syncing
-    - Fix identation
-    - Fix typo
-    - Don't check for warping
-    - rpc: avoid calling queue_info twice on eth_getWork
-    - Fix potential as_usize overflow when casting from U256 in miner ([#9221](https://github.com/paritytech/parity-ethereum/pull/9221))
-    - Allow old blocks from peers with lower difficulty ([#9226](https://github.com/paritytech/parity-ethereum/pull/9226))
-    - Previously we only allow downloading of old blocks if the peer difficulty was greater than our syncing difficulty. This change allows downloading of blocks from peers where the difficulty is greater then the last downloaded old block.
-  - Update Dockerfile ([#9242](https://github.com/paritytech/parity-ethereum/pull/9242))
-    - Update Dockerfile
-    - fix Docker build
-  - fix dockerfile paths: parity -> parity-ethereum ([#9248](https://github.com/paritytech/parity-ethereum/pull/9248))
-  - Propagate transactions for next 4 blocks. ([#9265](https://github.com/paritytech/parity-ethereum/pull/9265))
-    - Closes [#9255](https://github.com/paritytech/parity-ethereum/issues/9255)
-    - This PR also removes the limit of max 64 transactions per packet, currently we only attempt to prevent the packet size to go over 8MB. This will only be the case for super-large transactions or high-block-gas-limit chains.
-    - Patching this is important only for chains that have blocks that can fit more than 4k transactions (over 86M block gas limit)
-    - For mainnet, we should actually see a tiny bit faster propagation since instead of computing 4k pending set, we only need `4 * 8M / 21k = 1523` transactions.
-  - Update tobalaba.json ([#9313](https://github.com/paritytech/parity-ethereum/pull/9313))
-  - Fix load share ([#9321](https://github.com/paritytech/parity-ethereum/pull/9321))
-    - fix(light_sync): calculate `load_share` properly
-    - refactor(api.rs): extract `light_params` fn, add test
-    - style(api.rs): add trailing commas
-  - ethcore: fix pow difficulty validation ([#9328](https://github.com/paritytech/parity-ethereum/pull/9328))
-    - ethcore: fix pow difficulty validation
-    - ethcore: validate difficulty is not zero
-    - ethcore: add issue link to regression test
-    - ethcore: fix tests
-    - ethcore: move difficulty_to_boundary to ethash crate
-    - ethcore: reuse difficulty_to_boundary and boundary_to_difficulty
-    - ethcore: fix grumbles in difficulty_to_boundary_aux
-  - Light client `Provide default nonce in transactions when it´s missing` ([#9370](https://github.com/paritytech/parity-ethereum/pull/9370))
-    - Provide `default_nonce` in tx's when it's missing
-    - When `nonce` is missing in a `EthTransaction` will cause it to fall in these cases provide `default_nonce` value instead!
-    - Changed http:// to https:// on Yasm link ([#9369](https://github.com/paritytech/parity-ethereum/pull/9369))
-    - Changed http:// to https:// on Yasm link in README.md
-    - Address grumbles
-  - ethcore: kovan: delay activation of strict score validation ([#9406](https://github.com/paritytech/parity-ethereum/pull/9406))
-  - Better support for eth_getLogs in light mode ([#9186](https://github.com/paritytech/parity-ethereum/pull/9186))
-    - Light client on-demand request for headers range.
-    - Cache headers in HeaderWithAncestors response.
-    - Also fulfills request locally if all headers are in cache.
-    - LightFetch::logs fetches missing headers on demand.
-    - LightFetch::logs limit the number of headers requested at a time.
-    - LightFetch::logs refactor header fetching logic.
-    - Enforce limit on header range length in light client logs request.
-    - Fix light request tests after struct change.
-    - Respond to review comments.
-  - Add update docs script to CI ([#9219](https://github.com/paritytech/parity-ethereum/pull/9219))
-    - Add update docs script to CI
-    - Added a script to CI that will use the jsonrpc tool to update rpc documentation then commit and push those to the wiki repo.
-    - fix gitlab ci lint
-    - Only apply jsonrpc docs update on tags
-    - Update gitlab-rpc-docs.sh
-    - Copy correct parity repo to jsonrpc folder
-    - Copy correct parity repo to jsonrpc folder before attempting to build docs since the CI runner clones the repo as parity and not parity-ethereum.
-    - Fix JSONRPC docs CI job
-    - Update remote config in wiki repo before pushing changes using a github token for authentication. Add message to wiki tag when pushing changes. Use project directory to correctly copy parity code base into the jsonrpc repo for doc generation.
-    - Fix set_remote_wiki function call in CI
-  - Prevent blockchain & miner racing when accessing pending block. ([#9310](https://github.com/paritytech/parity-ethereum/pull/9310))
-    - Prevent blockchain & miner racing when accessing pending block.
-    - Fix unavailability of pending block during reseal.
-  - Prevent sync restart if import queue full ([#9381](https://github.com/paritytech/parity-ethereum/pull/9381))
-  - Add POA Networks: Core and Sokol ([#9413](https://github.com/paritytech/parity-ethereum/pull/9413))
-    - ethcore: add poa network and sokol chainspecs
-    - rpc: simplify chain spec docs
-    - cli: rearrange networks by main/test and size/range
-    - parity: don't blacklist 0x00a328 on sokol testnet
-    - parity: add sokol and poanet to params and clean up a bit, add tests
-    - ethcore: add the poa networks and clean up a bit
-    - ethcore: fix path to poacore chain spec
-    - parity: rename poa networks to poacore and poasokol
-    - parity: fix configuration tests
-    - parity: fix parameter tests
-    - ethcore: rename POA Core and POA Sokol
-  - Update tobalaba.json ([#9419](https://github.com/paritytech/parity-ethereum/pull/9419))
-  - Update hardcoded sync ([#9421](https://github.com/paritytech/parity-ethereum/pull/9421))
-    - Update foundation hardcoded header to block 6219777
-    - Update ropsten hardcoded header to block 3917825
-    - Update kovan hardcoded header to block 8511489
-
-## Parity-Ethereum [v2.0.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.1) (2018-07-27)
-
-Parity-Ethereum 2.0.1-beta is a bug-fix release to improve performance and stability.
-
-Note, authorities in PoA networks based on the Aura engine, should upgrade their nodes to 1.11.8-stable or 2.0.1-beta as this release includes a critical fix.
-
-The full list of included changes:
-
- Backports to 2.0.1-beta ([#9145](https://github.com/paritytech/parity-ethereum/pull/9145))
-  - Parity-version: bump beta to 2.0.1
-  - Ci: update version strings for snaps ([#9160](https://github.com/paritytech/parity-ethereum/pull/9160))
-  - Be more graceful on Aura difficulty validation ([#9164](https://github.com/paritytech/parity-ethereum/pull/9164))
-    - Be more graceful on Aura difficulty validation
-    - Test: rejects_step_backwards
-    - Test: proposer_switching
-    - Test: rejects_future_block
-    - Test: reports_skipped
-    - Test: verify_empty_seal_steps
-  - Remove node-health ([#9119](https://github.com/paritytech/parity-ethereum/pull/9119))
-    - Remove node-health
-    - Remove ntp_servers
-    - Add --ntp-servers as legacy instead of removing it
-    - Add --ntp-servers to deprecated args
-    - Remove unused stuff
-    - Remove _legacy_ntp_servers
-  - Parity: fix UserDefaults json parser ([#9189](https://github.com/paritytech/parity-ethereum/pull/9189))
-    - Parity: fix UserDefaults json parser
-    - Parity: use serde_derive for UserDefaults
-    - Parity: support deserialization of old UserDefault json format
-    - Parity: make UserDefaults serde backwards compatible
-    - Parity: tabify indentation in UserDefaults
-  - Fix bugfix hard fork logic ([#9138](https://github.com/paritytech/parity-ethereum/pull/9138))
-    - Fix bugfix hard fork logic
-    - Remove dustProtectionTransition from bugfix category
-      - Eip-168 is not enabled by default
-    - Remove unnecessary 'static
-  - Disable per-sender limit for local transactions. ([#9148](https://github.com/paritytech/parity-ethereum/pull/9148))
-    - Disable per-sender limit for local transactions.
-    - Add a missing new line.
-  - Rpc: fix is_major_importing sync state condition ([#9112](https://github.com/paritytech/parity-ethereum/pull/9112))
-    - Rpc: fix is_major_importing sync state condition
-    - Rpc: fix informant printout when waiting for peers
-  - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135))
-  - Docker: update hub dockerfile ([#9173](https://github.com/paritytech/parity-ethereum/pull/9173))
-    - Update Dockerfile for hub
-      - Update to Ubuntu Xenial 16.04
-      - Fix cmake version
-    - Docker: fix tab indentation in hub dockerfile
-  - Rpc: fix broken merge
-  - Rpc: remove node_health leftover from merge
-  - Rpc: remove dapps leftover from merge
-
-## Parity-Ethereum [v2.0.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.0) "Ethereum" (2018-07-18)
-
-This is the Parity-Ethereum//v2.0.0-beta release, code-named "Ethereum", **YOLO!**
-
-Please note, Parity-Ethereum//v2.0.0 comes with some breaking changes that might be interrupting your usual workflows. Please mind them before upgrading:
-
- The Parity client is now called _Parity-Ethereum_ to distinguish it from other software we provide, such as [_Parity-Bitcoin_](https://github.com/paritytech/parity-bitcoin/) and [_Parity-Polkadot_](https://github.com/paritytech/polkadot) ([#9052](https://github.com/paritytech/parity-ethereum/pull/9052)).
- The public node and the user interface (a.k.a. _"Parity Wallet"_) are completely removed from the Parity-Ethereum//v2.0.0 client ([#8758](https://github.com/paritytech/parity-ethereum/pull/8758), [#8783](https://github.com/paritytech/parity-ethereum/pull/8783), [#8641](https://github.com/paritytech/parity-ethereum/pull/8641)). Users interested running a Parity Wallet, check out [the stand-alone UI application](https://github.com/Parity-JS/shell/releases).
- The DApps subsystem was completely removed from the client ([#9017](https://github.com/paritytech/parity-ethereum/pull/9017), [#9107](https://github.com/paritytech/parity-ethereum/pull/9107)). Again, use the standalone wallet if you wish to continue working with them.
- Windows and MacOS versions are not available as installer anymore and the system trays were removed ([#8778](https://github.com/paritytech/parity-ethereum/pull/8778)). If you desire to run Parity-Ethereum on Windows or MacOS, you still can get the binaries from our mirrors. Furthermore, MacOS users are encouraged [to use our homebrew tap](https://github.com/paritytech/homebrew-paritytech/).
- Linux versions are not available as deb-/rpm-packages anymore ([#8887](https://github.com/paritytech/parity-ethereum/pull/8887)). Communities are encouraged to provide their own packages or maintain their own repositories, such as [Arch Linux does](https://www.archlinux.org/packages/community/x86_64/parity/) for instance.
- MD5-checksums are completely replaced by SHA256-checksums ([#8884](https://github.com/paritytech/parity-ethereum/pull/8884)). This is also reflected on our homepage by now.
- Deprecated, removed, or replaced CLI-options are hidden from client `--help` to further discourage their usage ([#8967](https://github.com/paritytech/parity-ethereum/pull/8967)).
-
-Additional noteworthy changes to the client:
-
- Tracing of precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity-ethereum/pull/8486))
- _Parity-Ethereum_ as a library now provides APIs for running full and light nodes and a C interface ([#8412](https://github.com/paritytech/parity-ethereum/pull/8412)). Shared crates are now available in [_Parity-Common_](https://github.com/paritytech/parity-common) ([#9083](https://github.com/paritytech/parity-ethereum/pull/9083)).
- The Morden database and keys are now moved to a `./Morden` subdirectory instead of `./test` which is by default used by Ropsten ([#8621](https://github.com/paritytech/parity-ethereum/pull/8621)).
- Adding support for having an on-chain contract calculating the block rewards ([#8419](https://github.com/paritytech/parity-ethereum/pull/8419)).
- Enforcing warp-only synchronization with `--warp-barrier [blocknumber]` flag ([#8228](https://github.com/paritytech/parity-ethereum/pull/8228)).
- Adding a fork-choice and meta-data framework suitable for implementing Casper ([#8401](https://github.com/paritytech/parity-ethereum/pull/8401)).
- Returning an error if RLP-size of a transaction exceeds a 300kB limit ([#8473](https://github.com/paritytech/parity-ethereum/pull/8473)).
- Warp-sync is now resumable by keeping the downloaded chunks between client restarts. Also, it seeds downloaded snapshots for other nodes ([#8544](https://github.com/paritytech/parity-ethereum/pull/8544)).
- The developer chain `--chain dev` now contains Byzantium features, this breaks existing developer chains ([#8717](https://github.com/paritytech/parity-ethereum/pull/8717)).
- The EIP150, EIP160 and EIP161 forks are now to be specified in common params section of a chain-spec file instead of the Ethash params to enable these features on non-proof-of-work chains ([#8614](https://github.com/paritytech/parity-ethereum/pull/8614)). Please update your chain specs.
- Allowing to disable local-by-default for transactions with new configurations ([#8882](https://github.com/paritytech/parity-ethereum/pull/8882)).
- Never drop local transactions from different senders ([#9002](https://github.com/paritytech/parity-ethereum/pull/9002)).
- Optimize pending transactions filter and fix ethstats reporting of pending transactions ([#9026](https://github.com/paritytech/parity-ethereum/pull/9026)).
- Add separate database directory for light client allowing to run full and light nodes at the same time ([#9064](https://github.com/paritytech/parity-ethereum/pull/9064)).
-
-If you are upgrading directly from versions 1.10.9 or earlier, please note important changes to our transaction-queue implementation, namely:
-
- The pool now limits transactions per-sender (see `--tx-queue-per-sender`), local transactions also have to obey that limit. Consider increasing the limit via CLI-flag when running benchmarks or sending a lot of transactions at once.
- In case the pool is full, transactions received over the network, but originating from accounts that you have private keys for might not get accepted to the pool any more with higher priority. Consider running with larger pool size or submitting the transactions directly on the node via `eth_sendRawTransaction`.
-
-The full list of included changes:
-
- Backports to 2.0.0-beta ([#9094](https://github.com/paritytech/parity-ethereum/pull/9094))
-  - Parity-version: betalize 2.0
-  - Multiple improvements to discovery ping handling ([#8771](https://github.com/paritytech/parity-ethereum/pull/8771))
-    - Discovery: Only add nodes to routing table after receiving pong.
-    - Discovery: Refactor packet creation into its own function.
-    - Discovery: Additional testing for new add_node behavior.
-    - Discovery: Track expiration of pings to non-yet-in-bucket nodes.
-    - Discovery: Verify echo hash on pong packets.
-    - Discovery: Track timeouts on FIND_NODE requests.
-    - Discovery: Retry failed pings with exponential backoff.
-    - !fixup Use slice instead of Vec for request_backoff.
-  - Add separate database directory for light client ([#9064](https://github.com/paritytech/parity-ethereum/pull/9064))
-    - Add separate default DB path for light client ([#8927](https://github.com/paritytech/parity-ethereum/pull/8927))
-    - Improve readability
-  - Revert "Replace `std::env::home_dir` with `dirs::home_dir` ([#9077](https://github.com/paritytech/parity-ethereum/pull/9077))" ([#9097](https://github.com/paritytech/parity-ethereum/pull/9097))
-    - Revert "Replace `std::env::home_dir` with `dirs::home_dir` ([#9077](https://github.com/paritytech/parity-ethereum/pull/9077))"
-      - This reverts commit 7e77932.
-    - Restore some of the changes
-    - Update parity-common
-  - Offload cull to IoWorker. ([#9099](https://github.com/paritytech/parity-ethereum/pull/9099))
-  - Fix work-notify. ([#9104](https://github.com/paritytech/parity-ethereum/pull/9104))
-  - Update hidapi, fixes [#7542](https://github.com/paritytech/parity-ethereum/issues/7542) ([#9108](https://github.com/paritytech/parity-ethereum/pull/9108))
-  - Docker: add cmake dependency ([#9111](https://github.com/paritytech/parity-ethereum/pull/9111))
-  - Update light client hardcoded headers ([#9098](https://github.com/paritytech/parity-ethereum/pull/9098))
-    - Insert Kovan hardcoded headers until 7690241
-    - Insert Kovan hardcoded headers until block 7690241
-    - Insert Ropsten hardcoded headers until 3612673
-    - Insert Mainnet hardcoded headers until block 5941249
-  - Make sure to produce full blocks. ([#9115](https://github.com/paritytech/parity-ethereum/pull/9115))
-  - Insert ETC (classic) hardcoded headers until block 6170625 ([#9121](https://github.com/paritytech/parity-ethereum/pull/9121))
-  - Fix verification in ethcore-sync collect_blocks ([#9135](https://github.com/paritytech/parity-ethereum/pull/9135))
-  - Completely remove all dapps struct from rpc ([#9107](https://github.com/paritytech/parity-ethereum/pull/9107))
-    - Completely remove all dapps struct from rpc
-    - Remove unused pub use
-  - `evm bench` fix broken dependencies ([#9134](https://github.com/paritytech/parity-ethereum/pull/9134))
-    - `evm bench` use valid dependencies
-    - Benchmarks of the `evm` used stale versions of a couple a crates that this commit fixes!
-    - Fix warnings
-  - Update snapcraft.yaml ([#9132](https://github.com/paritytech/parity-ethereum/pull/9132))
- Parity Ethereum 2.0.0 ([#9052](https://github.com/paritytech/parity-ethereum/pull/9052))
- Don't fetch snapshot chunks at random ([#9088](https://github.com/paritytech/parity-ethereum/pull/9088))
- Remove the dapps system ([#9017](https://github.com/paritytech/parity-ethereum/pull/9017))
- Fix nightly warnings ([#9080](https://github.com/paritytech/parity-ethereum/pull/9080))
- Db: remove wal disabling / fast-and-loose option. ([#8963](https://github.com/paritytech/parity-ethereum/pull/8963))
- Transactions hashes missing in trace_replayBlockTransactions method result [#8725](https://github.com/paritytech/parity-ethereum/issues/8725) ([#8883](https://github.com/paritytech/parity-ethereum/pull/8883))
- Delete crates from parity-ethereum and fetch them from parity-common instead ([#9083](https://github.com/paritytech/parity-ethereum/pull/9083))
- Updater verification ([#8787](https://github.com/paritytech/parity-ethereum/pull/8787))
- Phrasing, precisions and typos in CLI help ([#9060](https://github.com/paritytech/parity-ethereum/pull/9060))
- Some work towards iOS build ([#9045](https://github.com/paritytech/parity-ethereum/pull/9045))
- Clean up deprecated options and add CHECK macro ([#9036](https://github.com/paritytech/parity-ethereum/pull/9036))
- Replace `std::env::home_dir` with `dirs::home_dir` ([#9077](https://github.com/paritytech/parity-ethereum/pull/9077))
- Fix warning in secret-store test ([#9074](https://github.com/paritytech/parity-ethereum/pull/9074))
- Seedhashcompute remove needless `new` impl ([#9063](https://github.com/paritytech/parity-ethereum/pull/9063))
- Remove trait bounds from several structs ([#9055](https://github.com/paritytech/parity-ethereum/pull/9055))
- Docs: add changelog for 1.10.9 stable and 1.11.6 beta ([#9069](https://github.com/paritytech/parity-ethereum/pull/9069))
- Enable test in `miner/pool/test` ([#9072](https://github.com/paritytech/parity-ethereum/pull/9072))
- Fetch: replace futures-timer with tokio-timer ([#9066](https://github.com/paritytech/parity-ethereum/pull/9066))
- Remove util-error ([#9054](https://github.com/paritytech/parity-ethereum/pull/9054))
- Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/paritytech/parity-ethereum/pull/8998))
- A last bunch of txqueue performance optimizations ([#9024](https://github.com/paritytech/parity-ethereum/pull/9024))
- Reduce number of constraints for triedb types ([#9043](https://github.com/paritytech/parity-ethereum/pull/9043))
- Bump fs-swap to 0.2.3 so it is compatible with osx 10.11 again ([#9050](https://github.com/paritytech/parity-ethereum/pull/9050))
- Recursive test ([#9042](https://github.com/paritytech/parity-ethereum/pull/9042))
- Introduce more optional features in ethcore ([#9020](https://github.com/paritytech/parity-ethereum/pull/9020))
- Update ETSC bootnodes ([#9038](https://github.com/paritytech/parity-ethereum/pull/9038))
- Optimize pending transactions filter ([#9026](https://github.com/paritytech/parity-ethereum/pull/9026))
- Eip160/eip161 spec: u64 -> BlockNumber ([#9044](https://github.com/paritytech/parity-ethereum/pull/9044))
- Move the C/C++ example to another directory ([#9032](https://github.com/paritytech/parity-ethereum/pull/9032))
- Bump parking_lot to 0.6 ([#9013](https://github.com/paritytech/parity-ethereum/pull/9013))
- Never drop local transactions from different senders. ([#9002](https://github.com/paritytech/parity-ethereum/pull/9002))
- Precise HTTP or WebSockets for JSON-RPC options ([#9027](https://github.com/paritytech/parity-ethereum/pull/9027))
- Recently rejected cache for transaction queue ([#9005](https://github.com/paritytech/parity-ethereum/pull/9005))
- Make HashDB generic ([#8739](https://github.com/paritytech/parity-ethereum/pull/8739))
- Only return error log for rustls ([#9025](https://github.com/paritytech/parity-ethereum/pull/9025))
- Update Changelogs for 1.10.8 and 1.11.5 ([#9012](https://github.com/paritytech/parity-ethereum/pull/9012))
- Attempt to graceful shutdown in case of panics ([#8999](https://github.com/paritytech/parity-ethereum/pull/8999))
- Simplify kvdb error types ([#8924](https://github.com/paritytech/parity-ethereum/pull/8924))
- Add option for user to set max size limit for RPC requests ([#9010](https://github.com/paritytech/parity-ethereum/pull/9010))
- Bump ntp to 0.5.0 ([#9009](https://github.com/paritytech/parity-ethereum/pull/9009))
- Removed duplicate dependency ([#9021](https://github.com/paritytech/parity-ethereum/pull/9021))
- Minimal effective gas price in the queue ([#8934](https://github.com/paritytech/parity-ethereum/pull/8934))
- Parity: fix db path when migrating to blooms db ([#8975](https://github.com/paritytech/parity-ethereum/pull/8975))
- Preserve the current abort behavior ([#8995](https://github.com/paritytech/parity-ethereum/pull/8995))
- Improve should_replace on NonceAndGasPrice ([#8980](https://github.com/paritytech/parity-ethereum/pull/8980))
- Tentative fix for missing dependency error ([#8973](https://github.com/paritytech/parity-ethereum/pull/8973))
- Refactor evm Instruction to be a c-like enum ([#8914](https://github.com/paritytech/parity-ethereum/pull/8914))
- Fix deadlock in blockchain. ([#8977](https://github.com/paritytech/parity-ethereum/pull/8977))
- Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/paritytech/parity-ethereum/pull/8984))
- Use local parity-dapps-glue instead of crate published at crates.io ([#8983](https://github.com/paritytech/parity-ethereum/pull/8983))
- Parity: omit redundant last imported block number in light sync informant ([#8962](https://github.com/paritytech/parity-ethereum/pull/8962))
- Disable hardware-wallets on platforms that don't support `libusb` ([#8464](https://github.com/paritytech/parity-ethereum/pull/8464))
- Bump error-chain and quick_error versions ([#8972](https://github.com/paritytech/parity-ethereum/pull/8972))
- Evm benchmark utilities ([#8944](https://github.com/paritytech/parity-ethereum/pull/8944))
- Parity: hide legacy options from cli --help ([#8967](https://github.com/paritytech/parity-ethereum/pull/8967))
- Scripts: fix docker build tag on latest using master ([#8952](https://github.com/paritytech/parity-ethereum/pull/8952))
- Add type for passwords. ([#8920](https://github.com/paritytech/parity-ethereum/pull/8920))
- Deps: bump fs-swap ([#8953](https://github.com/paritytech/parity-ethereum/pull/8953))
- Eliminate some more `transmute()` ([#8879](https://github.com/paritytech/parity-ethereum/pull/8879))
- Restrict vault.json permssion to owner and using random suffix for temp vault.json file ([#8932](https://github.com/paritytech/parity-ethereum/pull/8932))
- Print SS.self_public when starting SS node ([#8949](https://github.com/paritytech/parity-ethereum/pull/8949))
- Scripts: minor improvements ([#8930](https://github.com/paritytech/parity-ethereum/pull/8930))
- Rpc: cap gas limit of local calls ([#8943](https://github.com/paritytech/parity-ethereum/pull/8943))
- Docs: update changelogs ([#8931](https://github.com/paritytech/parity-ethereum/pull/8931))
- Ethcore: fix compilation when using slow-blocks or evm-debug features ([#8936](https://github.com/paritytech/parity-ethereum/pull/8936))
- Fixed blooms dir creation ([#8941](https://github.com/paritytech/parity-ethereum/pull/8941))
- Update hardcoded headers ([#8925](https://github.com/paritytech/parity-ethereum/pull/8925))
- New blooms database ([#8712](https://github.com/paritytech/parity-ethereum/pull/8712))
- Ethstore: retry deduplication of wallet file names until success ([#8910](https://github.com/paritytech/parity-ethereum/pull/8910))
- Update ropsten.json ([#8926](https://github.com/paritytech/parity-ethereum/pull/8926))
- Include node identity in the P2P advertised client version. ([#8830](https://github.com/paritytech/parity-ethereum/pull/8830))
- Allow disabling local-by-default for transactions with new config entry ([#8882](https://github.com/paritytech/parity-ethereum/pull/8882))
- Allow Poll Lifetime to be configured via CLI ([#8885](https://github.com/paritytech/parity-ethereum/pull/8885))
- Cleanup nibbleslice ([#8915](https://github.com/paritytech/parity-ethereum/pull/8915))
- Hardware-wallets `Clean up things I missed in the latest PR` ([#8890](https://github.com/paritytech/parity-ethereum/pull/8890))
- Remove debian/.deb and centos/.rpm packaging scripts ([#8887](https://github.com/paritytech/parity-ethereum/pull/8887))
- Remove a weird emoji in new_social docs ([#8913](https://github.com/paritytech/parity-ethereum/pull/8913))
- Minor fix in chain supplier and light provider ([#8906](https://github.com/paritytech/parity-ethereum/pull/8906))
- Block 0 is valid in queries ([#8891](https://github.com/paritytech/parity-ethereum/pull/8891))
- Fixed osx permissions ([#8901](https://github.com/paritytech/parity-ethereum/pull/8901))
- Atomic create new files with permissions to owner in ethstore ([#8896](https://github.com/paritytech/parity-ethereum/pull/8896))
- Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/paritytech/parity-ethereum/pull/8892))
- Add support for --chain tobalaba ([#8870](https://github.com/paritytech/parity-ethereum/pull/8870))
- Fix some warns on nightly ([#8889](https://github.com/paritytech/parity-ethereum/pull/8889))
- Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/paritytech/parity-ethereum/pull/8886))
- Secretstore: service pack 1 ([#8435](https://github.com/paritytech/parity-ethereum/pull/8435))
- Handle removed logs in filter changes and add geth compatibility field ([#8796](https://github.com/paritytech/parity-ethereum/pull/8796))
- Fixed ipc leak, closes [#8774](https://github.com/paritytech/parity-ethereum/issues/8774) ([#8876](https://github.com/paritytech/parity-ethereum/pull/8876))
- Scripts: remove md5 checksums ([#8884](https://github.com/paritytech/parity-ethereum/pull/8884))
- Hardware_wallet/Ledger `Sign messages` + some refactoring ([#8868](https://github.com/paritytech/parity-ethereum/pull/8868))
- Check whether we need resealing in miner and unwrap has_account in account_provider ([#8853](https://github.com/paritytech/parity-ethereum/pull/8853))
- Docker: Fix alpine build ([#8878](https://github.com/paritytech/parity-ethereum/pull/8878))
- Remove mac os installers etc ([#8875](https://github.com/paritytech/parity-ethereum/pull/8875))
- Readme.md: update the list of dependencies ([#8864](https://github.com/paritytech/parity-ethereum/pull/8864))
- Fix concurrent access to signer queue ([#8854](https://github.com/paritytech/parity-ethereum/pull/8854))
- Tx permission contract improvement ([#8400](https://github.com/paritytech/parity-ethereum/pull/8400))
- Limit the number of transactions in pending set ([#8777](https://github.com/paritytech/parity-ethereum/pull/8777))
- Use sealing.enabled to emit eth_mining information ([#8844](https://github.com/paritytech/parity-ethereum/pull/8844))
- Don't allocate in expect_valid_rlp unless necessary ([#8867](https://github.com/paritytech/parity-ethereum/pull/8867))
- Fix Cli Return Code on --help for ethkey, ethstore & whisper ([#8863](https://github.com/paritytech/parity-ethereum/pull/8863))
- Fix subcrate test compile ([#8862](https://github.com/paritytech/parity-ethereum/pull/8862))
- Network-devp2p: downgrade logging to debug, add target ([#8784](https://github.com/paritytech/parity-ethereum/pull/8784))
- Clearing up a comment about the prefix for signing ([#8828](https://github.com/paritytech/parity-ethereum/pull/8828))
- Disable parallel verification and skip verifiying already imported txs. ([#8834](https://github.com/paritytech/parity-ethereum/pull/8834))
- Devp2p: Move UDP socket handling from Discovery to Host. ([#8790](https://github.com/paritytech/parity-ethereum/pull/8790))
- Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/paritytech/parity-ethereum/issues/8088) ([#8803](https://github.com/paritytech/parity-ethereum/pull/8803))
- Specify critical release flag per network ([#8821](https://github.com/paritytech/parity-ethereum/pull/8821))
- Fix `deadlock_detection` feature branch compilation ([#8824](https://github.com/paritytech/parity-ethereum/pull/8824))
- Use system allocator when profiling memory ([#8831](https://github.com/paritytech/parity-ethereum/pull/8831))
- Added from and to to Receipt ([#8756](https://github.com/paritytech/parity-ethereum/pull/8756))
- Ethcore: fix ancient block error msg handling ([#8832](https://github.com/paritytech/parity-ethereum/pull/8832))
- Ci: Fix docker tags ([#8822](https://github.com/paritytech/parity-ethereum/pull/8822))
- Parity: fix indentation in sync logging ([#8794](https://github.com/paritytech/parity-ethereum/pull/8794))
- Removed obsolete IpcMode enum ([#8819](https://github.com/paritytech/parity-ethereum/pull/8819))
- Remove UI related settings from CLI ([#8783](https://github.com/paritytech/parity-ethereum/pull/8783))
- Remove windows tray and installer ([#8778](https://github.com/paritytech/parity-ethereum/pull/8778))
- Docs: add changelogs for 1.10.6 and 1.11.3 ([#8810](https://github.com/paritytech/parity-ethereum/pull/8810))
- Fix ancient blocks queue deadlock ([#8751](https://github.com/paritytech/parity-ethereum/pull/8751))
- Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity-ethereum/pull/8802))
- Fix evmbin compilation ([#8795](https://github.com/paritytech/parity-ethereum/pull/8795))
- Have space between feature cfg flag ([#8791](https://github.com/paritytech/parity-ethereum/pull/8791))
- Rpc: fix address formatting in TransactionRequest Display ([#8786](https://github.com/paritytech/parity-ethereum/pull/8786))
- Conditionally compile ethcore public test helpers ([#8743](https://github.com/paritytech/parity-ethereum/pull/8743))
- Remove Result wrapper from AccountProvider in RPC impls ([#8763](https://github.com/paritytech/parity-ethereum/pull/8763))
- Update `license header` and `scripts` ([#8666](https://github.com/paritytech/parity-ethereum/pull/8666))
- Remove HostTrait altogether ([#8681](https://github.com/paritytech/parity-ethereum/pull/8681))
- Ethcore-sync: fix connection to peers behind chain fork block ([#8710](https://github.com/paritytech/parity-ethereum/pull/8710))
- Remove public node settings from cli ([#8758](https://github.com/paritytech/parity-ethereum/pull/8758))
- Custom Error Messages on ENFILE and EMFILE IO Errors ([#8744](https://github.com/paritytech/parity-ethereum/pull/8744))
- Ci: Fixes for Android Pipeline ([#8745](https://github.com/paritytech/parity-ethereum/pull/8745))
- Remove NetworkService::config() ([#8653](https://github.com/paritytech/parity-ethereum/pull/8653))
- Fix XOR distance calculation in discovery Kademlia impl ([#8589](https://github.com/paritytech/parity-ethereum/pull/8589))
- Print warnings when fetching pending blocks ([#8711](https://github.com/paritytech/parity-ethereum/pull/8711))
- Fix PoW blockchains sealing notifications in chain_new_blocks ([#8656](https://github.com/paritytech/parity-ethereum/pull/8656))
- Remove -k/--insecure option from curl installer ([#8719](https://github.com/paritytech/parity-ethereum/pull/8719))
- Ease tiny-keccak version requirements (1.4.1 -> 1.4) ([#8726](https://github.com/paritytech/parity-ethereum/pull/8726))
- Bump tinykeccak to 1.4 ([#8728](https://github.com/paritytech/parity-ethereum/pull/8728))
- Remove a couple of unnecessary `transmute()` ([#8736](https://github.com/paritytech/parity-ethereum/pull/8736))
- Fix some nits using clippy ([#8731](https://github.com/paritytech/parity-ethereum/pull/8731))
- Add 'interface' option to cli ([#8699](https://github.com/paritytech/parity-ethereum/pull/8699))
- Remove unused function new_pow_test_spec ([#8735](https://github.com/paritytech/parity-ethereum/pull/8735))
- Add a deadlock detection thread ([#8727](https://github.com/paritytech/parity-ethereum/pull/8727))
- Fix local transactions policy. ([#8691](https://github.com/paritytech/parity-ethereum/pull/8691))
- Shutdown the Snapshot Service early ([#8658](https://github.com/paritytech/parity-ethereum/pull/8658))
- Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity-ethereum/pull/8686))
- Fix compilation error on nightly rust ([#8707](https://github.com/paritytech/parity-ethereum/pull/8707))
- Add a test for decoding corrupt data ([#8713](https://github.com/paritytech/parity-ethereum/pull/8713))
- Update dev chain ([#8717](https://github.com/paritytech/parity-ethereum/pull/8717))
- Remove unused imports ([#8722](https://github.com/paritytech/parity-ethereum/pull/8722))
- Implement recursive Debug for Nodes in patrica_trie::TrieDB ([#8697](https://github.com/paritytech/parity-ethereum/pull/8697))
- Parity: trim whitespace when parsing duration strings ([#8692](https://github.com/paritytech/parity-ethereum/pull/8692))
- Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity-ethereum/pull/8683))
- Remove empty file ([#8705](https://github.com/paritytech/parity-ethereum/pull/8705))
- Update mod.rs ([#8695](https://github.com/paritytech/parity-ethereum/pull/8695))
- Use impl Future in the light client RPC helpers ([#8628](https://github.com/paritytech/parity-ethereum/pull/8628))
- Fix cli signer ([#8682](https://github.com/paritytech/parity-ethereum/pull/8682))
- Allow making direct RPC queries from the C API ([#8588](https://github.com/paritytech/parity-ethereum/pull/8588))
- Remove the error when stopping the network ([#8671](https://github.com/paritytech/parity-ethereum/pull/8671))
- Move connection_filter to the network crate ([#8674](https://github.com/paritytech/parity-ethereum/pull/8674))
- Remove HostInfo::client_version() and secret() ([#8677](https://github.com/paritytech/parity-ethereum/pull/8677))
- Refactor EIP150, EIP160 and EIP161 forks to be specified in CommonParams ([#8614](https://github.com/paritytech/parity-ethereum/pull/8614))
- Parity: improve cli help and logging ([#8665](https://github.com/paritytech/parity-ethereum/pull/8665))
- Updated tiny-keccak to 1.4.2 ([#8669](https://github.com/paritytech/parity-ethereum/pull/8669))
- Remove the Keccak C library and use the pure Rust impl ([#8657](https://github.com/paritytech/parity-ethereum/pull/8657))
- Remove HostInfo::next_nonce ([#8644](https://github.com/paritytech/parity-ethereum/pull/8644))
- Fix not downloading old blocks ([#8642](https://github.com/paritytech/parity-ethereum/pull/8642))
- Resumable warp-sync / Seed downloaded snapshots ([#8544](https://github.com/paritytech/parity-ethereum/pull/8544))
- Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity-ethereum/pull/8641))
- Changelog for 1.10.4-stable and 1.11.1-beta ([#8637](https://github.com/paritytech/parity-ethereum/pull/8637))
- Typo ([#8640](https://github.com/paritytech/parity-ethereum/pull/8640))
- Fork choice and metadata framework for Engine ([#8401](https://github.com/paritytech/parity-ethereum/pull/8401))
- Check that the Android build doesn't dep on c++_shared ([#8538](https://github.com/paritytech/parity-ethereum/pull/8538))
- Remove NetworkContext::io_channel() ([#8625](https://github.com/paritytech/parity-ethereum/pull/8625))
- Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity-ethereum/pull/8528))
- Store morden db and keys in "path/to/parity/data/Morden" (ropsten uses "test", like before) ([#8621](https://github.com/paritytech/parity-ethereum/pull/8621))
- ´main.rs´ typo ([#8629](https://github.com/paritytech/parity-ethereum/pull/8629))
- Fix BlockReward contract "arithmetic operation overflow" ([#8611](https://github.com/paritytech/parity-ethereum/pull/8611))
- Gitlab test script fixes ([#8573](https://github.com/paritytech/parity-ethereum/pull/8573))
- Remove manually added text to the errors ([#8595](https://github.com/paritytech/parity-ethereum/pull/8595))
- Fix account list double 0x display ([#8596](https://github.com/paritytech/parity-ethereum/pull/8596))
- Typo: wrong indentation in kovan config ([#8610](https://github.com/paritytech/parity-ethereum/pull/8610))
- Fix packet count when talking with PAR2 peers ([#8555](https://github.com/paritytech/parity-ethereum/pull/8555))
- Use full qualified syntax for itertools::Itertools::flatten ([#8606](https://github.com/paritytech/parity-ethereum/pull/8606))
- 2 tiny modification on snapshot ([#8601](https://github.com/paritytech/parity-ethereum/pull/8601))
- Fix the mio test again ([#8602](https://github.com/paritytech/parity-ethereum/pull/8602))
- Remove inject.js server-side injection for dapps ([#8539](https://github.com/paritytech/parity-ethereum/pull/8539))
- Block_header can fail so return Result ([#8581](https://github.com/paritytech/parity-ethereum/pull/8581))
- Block::decode() returns Result ([#8586](https://github.com/paritytech/parity-ethereum/pull/8586))
- Fix compiler warning ([#8590](https://github.com/paritytech/parity-ethereum/pull/8590))
- Fix Parity UI link ([#8600](https://github.com/paritytech/parity-ethereum/pull/8600))
- Make mio optional in ethcore-io ([#8537](https://github.com/paritytech/parity-ethereum/pull/8537))
- Attempt to fix intermittent test failures ([#8584](https://github.com/paritytech/parity-ethereum/pull/8584))
- Changelog and Readme ([#8591](https://github.com/paritytech/parity-ethereum/pull/8591))
- Added Dockerfile for alpine linux by @andresilva, closes [#3565](https://github.com/paritytech/parity-ethereum/issues/3565) ([#8587](https://github.com/paritytech/parity-ethereum/pull/8587))
- Add whisper CLI to the pipelines ([#8578](https://github.com/paritytech/parity-ethereum/pull/8578))
- Rename `whisper-cli binary` to `whisper` ([#8579](https://github.com/paritytech/parity-ethereum/pull/8579))
- Changelog nit ([#8585](https://github.com/paritytech/parity-ethereum/pull/8585))
- Remove unnecessary cloning in overwrite_with ([#8580](https://github.com/paritytech/parity-ethereum/pull/8580))
- Handle socket address parsing errors ([#8545](https://github.com/paritytech/parity-ethereum/pull/8545))
- Update CHANGELOG for 1.9, 1.10, and 1.11 ([#8556](https://github.com/paritytech/parity-ethereum/pull/8556))
- Decoding headers can fail ([#8570](https://github.com/paritytech/parity-ethereum/pull/8570))
- Refactoring `ethcore-sync` - Fixing warp-sync barrier ([#8543](https://github.com/paritytech/parity-ethereum/pull/8543))
- Remove State::replace_backend ([#8569](https://github.com/paritytech/parity-ethereum/pull/8569))
- Make trace-time publishable. ([#8568](https://github.com/paritytech/parity-ethereum/pull/8568))
- Don't block sync when importing old blocks ([#8530](https://github.com/paritytech/parity-ethereum/pull/8530))
- Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity-ethereum/pull/8486))
- Parity as a library ([#8412](https://github.com/paritytech/parity-ethereum/pull/8412))
- Rlp decode returns Result ([#8527](https://github.com/paritytech/parity-ethereum/pull/8527))
- Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity-ethereum/pull/8541))
- Keep all enacted blocks notify in order ([#8524](https://github.com/paritytech/parity-ethereum/pull/8524))
- Ethcore, rpc, machine: refactor block reward application and tracing ([#8490](https://github.com/paritytech/parity-ethereum/pull/8490))
- Consolidate crypto functionality in `ethcore-crypto`. ([#8432](https://github.com/paritytech/parity-ethereum/pull/8432))
- Eip 145: Bitwise shifting instructions in EVM ([#8451](https://github.com/paritytech/parity-ethereum/pull/8451))
- Remove expect ([#8536](https://github.com/paritytech/parity-ethereum/pull/8536))
- Don't panic in import_block if invalid rlp ([#8522](https://github.com/paritytech/parity-ethereum/pull/8522))
- Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity-ethereum/pull/8491))
- Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity-ethereum/pull/8463))
- Transaction Pool improvements ([#8470](https://github.com/paritytech/parity-ethereum/pull/8470))
- More changes for Android ([#8421](https://github.com/paritytech/parity-ethereum/pull/8421))
- Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity-ethereum/pull/8520))
- Secretstore: merge two types of errors into single one + Error::is_non_fatal ([#8357](https://github.com/paritytech/parity-ethereum/pull/8357))
- Hardware Wallet trait ([#8071](https://github.com/paritytech/parity-ethereum/pull/8071))
- Directly return None if tracing is disabled ([#8504](https://github.com/paritytech/parity-ethereum/pull/8504))
- Show imported messages for light client ([#8517](https://github.com/paritytech/parity-ethereum/pull/8517))
- Remove unused dependency `bigint` ([#8505](https://github.com/paritytech/parity-ethereum/pull/8505))
- `duration_ns: u64 -> duration: Duration` ([#8457](https://github.com/paritytech/parity-ethereum/pull/8457))
- Return error if RLP size of transaction exceeds the limit ([#8473](https://github.com/paritytech/parity-ethereum/pull/8473))
- Remove three old warp boot nodes. ([#8497](https://github.com/paritytech/parity-ethereum/pull/8497))
- Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity-ethereum/pull/8493))
- Update hardcodedSync for Ethereum, Kovan, and Ropsten ([#8489](https://github.com/paritytech/parity-ethereum/pull/8489))
- Fix snap builds ([#8483](https://github.com/paritytech/parity-ethereum/pull/8483))
- Bump master to 1.12 ([#8477](https://github.com/paritytech/parity-ethereum/pull/8477))
- Don't require write lock when fetching status. ([#8481](https://github.com/paritytech/parity-ethereum/pull/8481))
- Use rename_all for RichBlock and RichHeader serialization ([#8471](https://github.com/paritytech/parity-ethereum/pull/8471))
--- a/docs/logo-parity-ethereum.svg
+++ b/docs/logo-parity-ethereum.svg
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -3,11 +3,13 @@ name = "ethash"
 version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]

+[lib]
+
 [dependencies]
 crunchy = "0.1.0"
 either = "1.0.0"
-ethereum-types = "0.4"
-keccak-hash = "0.1"
+ethereum-types = "0.3"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
 log = "0.4"
 memmap = "0.6"
 parking_lot = "0.6"
--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -15,23 +15,23 @@ common-types = { path = "types" }
 crossbeam = "0.3"
 ethash = { path = "../ethash" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-parity-bytes = "0.1"
-hashdb = "0.2.1"
-memorydb = "0.2.1"
-patricia-trie = "0.2"
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
+hashdb = { git = "https://github.com/paritytech/parity-common" }
+memorydb = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie = { git = "https://github.com/paritytech/parity-common" }
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-parity-crypto = "0.1"
+parity-crypto = { git = "https://github.com/paritytech/parity-common" }
 error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
 ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
 ethcore-stratum = { path = "./stratum", optional = true }
 ethcore-transaction = { path = "./transaction" }
-ethereum-types = "0.4"
+ethereum-types = "0.3"
 memory-cache = { path = "../util/memory_cache" }
-ethabi = "6.0"
-ethabi-derive = "6.0"
-ethabi-contract = "6.0"
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
 ethjson = { path = "../json" }
 ethkey = { path = "../ethkey" }
 ethstore = { path = "../ethstore" }
@@ -47,26 +47,26 @@ parity-machine = { path = "../machine" }
 parking_lot = "0.6"
 rayon = "1.0"
 rand = "0.4"
-rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rlp_compress = { path = "../util/rlp_compress" }
 rlp_derive = { path = "../util/rlp_derive" }
-kvdb = "0.1"
-kvdb-memorydb = "0.1"
-parity-snappy = "0.1"
+kvdb = { git = "https://github.com/paritytech/parity-common" }
+kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
+snappy = { git = "https://github.com/paritytech/rust-snappy" }
 stop-guard = { path = "../util/stop-guard" }
 macros = { path = "../util/macros" }
 rustc-hex = "1.0"
 stats = { path = "../util/stats" }
-trace-time = "0.1"
+trace-time = { path = "../util/trace-time" }
 using_queue = { path = "../util/using_queue" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
-keccak-hash = "0.1"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
 triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
 journaldb = { path = "../util/journaldb" }
 keccak-hasher = { path = "../util/keccak-hasher" }
-kvdb-rocksdb = "0.1.3"
+kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
 tempdir = {version="0.3", optional = true}

 [target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
@@ -77,7 +77,7 @@ fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }

 [dev-dependencies]
 tempdir = "0.3"
-trie-standardmap = "0.1"
+trie-standardmap = { git = "https://github.com/paritytech/parity-common" }

 [features]
 parity = ["work-notify", "price-info", "stratum"]
@@ -102,8 +102,6 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 slow-blocks = []
 # Run JSON consensus tests.
 json-tests = ["ethcore-transaction/json-tests", "test-helpers", "tempdir"]
-# Skip JSON consensus tests with pending issues.
-ci-skip-issue = []
 # Run memory/cpu heavy tests.
 test-heavy = []
 # Compile benches
--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@@ -5,13 +5,13 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 bit-set = "0.4"
-parity-bytes = "0.1"
-ethereum-types = "0.4"
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
+ethereum-types = "0.3"
 heapsize = "0.4"
 lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }
-keccak-hash = "0.1"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
 parking_lot = "0.6"
 memory-cache = { path = "../../util/memory_cache" }

--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -45,7 +45,7 @@ macro_rules! enum_with_from_u8 {
 enum_with_from_u8! {
 	#[doc = "Virtual machine bytecode instruction."]
 	#[repr(u8)]
-	#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Debug, Hash)]
+	#[derive(Eq, PartialEq, Ord, PartialOrd, Clone, Copy, Debug)]
 	pub enum Instruction {
 		#[doc = "halts execution"]
 		STOP = 0x00,
@@ -328,7 +328,7 @@ enum_with_from_u8! {
 		#[doc = "like CALLCODE but keeps caller's value and sender"]
 		DELEGATECALL = 0xf4,
 		#[doc = "create a new account and set creation address to sha3(sender + sha3(init code)) % 2**160"]
-		CREATE2 = 0xf5,
+		CREATE2 = 0xfb,
 		#[doc = "stop execution and revert state changes. Return output data."]
 		REVERT = 0xfd,
 		#[doc = "like CALL but it does not take value, nor modify the state"]
--- a/ethcore/evm/src/interpreter/gasometer.rs
+++ b/ethcore/evm/src/interpreter/gasometer.rs
@@ -125,17 +125,12 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 				let newval = stack.peek(1);
 				let val = U256::from(&*ext.storage_at(&address)?);

-				let gas = if schedule.eip1283 {
-					let orig = U256::from(&*ext.initial_storage_at(&address)?);
-					calculate_eip1283_sstore_gas(schedule, &orig, &val, &newval)
+				let gas = if val.is_zero() && !newval.is_zero() {
+					schedule.sstore_set_gas
 				} else {
-					if val.is_zero() && !newval.is_zero() {
-						schedule.sstore_set_gas
-					} else {
-						// Refund for below case is added when actually executing sstore
-						// !is_zero(&val) && is_zero(newval)
-						schedule.sstore_reset_gas
-					}
+					// Refund for below case is added when actually executing sstore
+					// !is_zero(&val) && is_zero(newval)
+					schedule.sstore_reset_gas
 				};
 				Request::Gas(Gas::from(gas))
 			},
@@ -233,7 +228,11 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 			},
 			instructions::CREATE | instructions::CREATE2 => {
 				let gas = Gas::from(schedule.create_gas);
-				let mem = mem_needed(stack.peek(1), stack.peek(2))?;
+				let mem = match instruction {
+					instructions::CREATE => mem_needed(stack.peek(1), stack.peek(2))?,
+					instructions::CREATE2 => mem_needed(stack.peek(2), stack.peek(3))?,
+					_ => unreachable!("instruction can only be CREATE/CREATE2 checked above; qed"),
+				};

 				Request::GasMemProvide(gas, mem, None)
 			},
@@ -343,89 +342,6 @@ fn add_gas_usize<Gas: evm::CostType>(value: Gas, num: usize) -> (Gas, bool) {
 	value.overflow_add(Gas::from(num))
 }

-#[inline]
-fn calculate_eip1283_sstore_gas<Gas: evm::CostType>(schedule: &Schedule, original: &U256, current: &U256, new: &U256) -> Gas {
-	Gas::from(
-		if current == new {
-			// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
-			schedule.sload_gas
-		} else {
-			// 2. If current value does not equal new value
-			if original == current {
-				// 2.1. If original value equals current value (this storage slot has not been changed by the current execution context)
-				if original.is_zero() {
-					// 2.1.1. If original value is 0, 20000 gas is deducted.
-					schedule.sstore_set_gas
-				} else {
-					// 2.1.2. Otherwise, 5000 gas is deducted.
-					schedule.sstore_reset_gas
-
-					// 2.1.2.1. If new value is 0, add 15000 gas to refund counter.
-				}
-			} else {
-				// 2.2. If original value does not equal current value (this storage slot is dirty), 200 gas is deducted. Apply both of the following clauses.
-				schedule.sload_gas
-
-				// 2.2.1. If original value is not 0
-				// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove 15000 gas from refund counter. We can prove that refund counter will never go below 0.
-				// 2.2.1.2. If new value is 0 (also means that current value is not 0), add 15000 gas to refund counter.
-
-				// 2.2.2. If original value equals new value (this storage slot is reset)
-				// 2.2.2.1. If original value is 0, add 19800 gas to refund counter.
-				// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
-			}
-		}
-	)
-}
-
-pub fn handle_eip1283_sstore_clears_refund(ext: &mut vm::Ext, original: &U256, current: &U256, new: &U256) {
-	let sstore_clears_schedule = U256::from(ext.schedule().sstore_refund_gas);
-
-	if current == new {
-		// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
-	} else {
-		// 2. If current value does not equal new value
-		if original == current {
-			// 2.1. If original value equals current value (this storage slot has not been changed by the current execution context)
-			if original.is_zero() {
-				// 2.1.1. If original value is 0, 20000 gas is deducted.
-			} else {
-				// 2.1.2. Otherwise, 5000 gas is deducted.
-				if new.is_zero() {
-					// 2.1.2.1. If new value is 0, add 15000 gas to refund counter.
-					ext.add_sstore_refund(sstore_clears_schedule);
-				}
-			}
-		} else {
-			// 2.2. If original value does not equal current value (this storage slot is dirty), 200 gas is deducted. Apply both of the following clauses.
-
-			if !original.is_zero() {
-				// 2.2.1. If original value is not 0
-				if current.is_zero() {
-					// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove 15000 gas from refund counter. We can prove that refund counter will never go below 0.
-					ext.sub_sstore_refund(sstore_clears_schedule);
-				} else if new.is_zero() {
-					// 2.2.1.2. If new value is 0 (also means that current value is not 0), add 15000 gas to refund counter.
-					ext.add_sstore_refund(sstore_clears_schedule);
-				}
-			}
-
-			if original == new {
-				// 2.2.2. If original value equals new value (this storage slot is reset)
-				if original.is_zero() {
-					// 2.2.2.1. If original value is 0, add 19800 gas to refund counter.
-					let refund = U256::from(ext.schedule().sstore_set_gas - ext.schedule().sload_gas);
-					ext.add_sstore_refund(refund);
-				} else {
-					// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
-					let refund = U256::from(ext.schedule().sstore_reset_gas - ext.schedule().sload_gas);
-					ext.add_sstore_refund(refund);
-				}
-			}
-		}
-	}
-}
-
 #[test]
 fn test_mem_gas_cost() {
 	// given
--- a/ethcore/evm/src/interpreter/informant.rs
+++ b/ethcore/evm/src/interpreter/informant.rs
@@ -42,7 +42,7 @@ mod inner {
 	use ethereum_types::U256;

 	use interpreter::stack::Stack;
-	use instructions::{Instruction, InstructionInfo};
+	use instructions::{Instruction, InstructionInfo, INSTRUCTIONS};
 	use CostType;

 	macro_rules! evm_debug {
@@ -97,7 +97,7 @@ mod inner {
 				&self.spacing,
 				pc,
 				Self::color(instruction, info.name),
-				instruction as u8,
+				instruction,
 				current_gas,
 				Self::as_micro(&time),
 			));
@@ -117,16 +117,18 @@ mod inner {

 		pub fn done(&mut self) {
 			// Print out stats
+			let infos = &*INSTRUCTIONS;
+
 			let mut stats: Vec<(_,_)> = self.stats.drain().collect();
 			stats.sort_by(|ref a, ref b| b.1.avg().cmp(&a.1.avg()));

 			print(format!("\n{}-------OPCODE STATS:", self.spacing));
 			for (instruction, stats) in stats.into_iter() {
-				let info = instruction.info();
+				let info = infos[instruction as usize];
 				print(format!("{}-------{:>19}(0x{:<2x}) count: {:4}, avg: {:10}μs",
 					self.spacing,
 					Self::color(instruction, info.name),
-					instruction as u8,
+					instruction,
 					stats.count,
 					stats.avg(),
 				));
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -274,7 +274,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 		self.gasometer.as_mut().expect(GASOMETER_PROOF).current_mem_gas = requirements.memory_total_gas;
 		self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas - requirements.gas_cost;

-		evm_debug!({ self.informant.before_instruction(self.reader.position, instruction, info, &self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas, &self.stack) });
+		evm_debug!({ informant.before_instruction(reader.position, instruction, info, &self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas, &stack) });

 		let (mem_written, store_written) = match self.do_trace {
 			true => (Self::mem_written(instruction, &self.stack), Self::store_written(instruction, &self.stack)),
@@ -287,7 +287,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 			current_gas, ext, instruction, requirements.provide_gas
 		)?;

-		evm_debug!({ self.informant.after_instruction(instruction) });
+		evm_debug!({ informant.after_instruction(instruction) });

 		if let InstructionResult::UnusedGas(ref gas) = result {
 			self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas + *gas;
@@ -426,13 +426,13 @@ impl<Cost: CostType> Interpreter<Cost> {
 			},
 			instructions::CREATE | instructions::CREATE2 => {
 				let endowment = self.stack.pop_back();
-				let init_off = self.stack.pop_back();
-				let init_size = self.stack.pop_back();
 				let address_scheme = match instruction {
 					instructions::CREATE => CreateContractAddress::FromSenderAndNonce,
 					instructions::CREATE2 => CreateContractAddress::FromSenderSaltAndCodeHash(self.stack.pop_back().into()),
 					_ => unreachable!("instruction can only be CREATE/CREATE2 checked above; qed"),
 				};
+				let init_off = self.stack.pop_back();
+				let init_size = self.stack.pop_back();

 				let create_gas = provided.expect("`provided` comes through Self::exec from `Gasometer::get_gas_cost_mem`; `gas_gas_mem_cost` guarantees `Some` when instruction is `CALL`/`CALLCODE`/`DELEGATECALL`/`CREATE`; this is `CREATE`; qed");

@@ -629,14 +629,8 @@ impl<Cost: CostType> Interpreter<Cost> {

 				let current_val = U256::from(&*ext.storage_at(&address)?);
 				// Increase refund for clear
-				if ext.schedule().eip1283 {
-					let original_val = U256::from(&*ext.initial_storage_at(&address)?);
-					gasometer::handle_eip1283_sstore_clears_refund(ext, &original_val, &current_val, &val);
-				} else {
-					if !current_val.is_zero() && val.is_zero() {
-						let sstore_clears_schedule = U256::from(ext.schedule().sstore_refund_gas);
-						ext.add_sstore_refund(sstore_clears_schedule);
-					}
+				if !current_val.is_zero() && val.is_zero() {
+					ext.inc_sstore_clears();
 				}
 				ext.set_storage(address, H256::from(&val))?;
 			},
@@ -801,7 +795,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 						TWO_POW_96 => a >> 96,
 						TWO_POW_224 => a >> 224,
 						TWO_POW_248 => a >> 248,
-						_ => a / b,
+						_ => a.overflowing_div(b).0,
 					}
 				} else {
 					U256::zero()
@@ -811,7 +805,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let a = self.stack.pop_back();
 				let b = self.stack.pop_back();
 				self.stack.push(if !b.is_zero() {
-					a % b
+					a.overflowing_rem(b).0
 				} else {
 					U256::zero()
 				});
@@ -827,7 +821,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				} else if a == min && b == !U256::zero() {
 					min
 				} else {
-					let c = a / b;
+					let c = a.overflowing_div(b).0;
 					set_sign(c, sign_a ^ sign_b)
 				});
 			},
@@ -838,7 +832,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let b = get_and_reset_sign(ub).0;

 				self.stack.push(if !b.is_zero() {
-					let c = a % b;
+					let c = a.overflowing_rem(b).0;
 					set_sign(c, sign_a)
 				} else {
 					U256::zero()
@@ -926,7 +920,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 					// upcast to 512
 					let a5 = U512::from(a);
 					let res = a5.overflowing_add(U512::from(b)).0;
-					let x = res % U512::from(c);
+					let x = res.overflowing_rem(U512::from(c)).0;
 					U256::from(x)
 				} else {
 					U256::zero()
@@ -940,7 +934,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				self.stack.push(if !c.is_zero() {
 					let a5 = U512::from(a);
 					let res = a5.overflowing_mul(U512::from(b)).0;
-					let x = res % U512::from(c);
+					let x = res.overflowing_rem(U512::from(c)).0;
 					U256::from(x)
 				} else {
 					U256::zero()
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
@@ -716,7 +716,7 @@ fn test_jumps(factory: super::Factory) {
 		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

-	assert_eq!(ext.sstore_clears, U256::from(ext.schedule().sstore_refund_gas));
+	assert_eq!(ext.sstore_clears, 1);
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000"); // 5!
 	assert_store(&ext, 1, "0000000000000000000000000000000000000000000000000000000000000078"); // 5!
 	assert_eq!(gas_left, U256::from(54_117));
--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -9,21 +9,21 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.4"
 ethcore = { path = ".."}
-parity-bytes = "0.1"
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
 ethcore-transaction = { path = "../transaction" }
-ethereum-types = "0.4"
-memorydb = "0.2.1"
-patricia-trie = "0.2"
+ethereum-types = "0.3"
+memorydb = { git = "https://github.com/paritytech/parity-common" }
+patricia-trie = { git = "https://github.com/paritytech/parity-common" }
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
 ethcore-io = { path = "../../util/io" }
-hashdb = "0.2.1"
+hashdb = { git = "https://github.com/paritytech/parity-common" }
 heapsize = "0.4"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
-rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rlp_derive = { path = "../../util/rlp_derive" }
-smallvec = "0.6"
+smallvec = "0.4"
 futures = "0.1"
 rand = "0.4"
 itertools = "0.5"
@@ -32,16 +32,16 @@ serde = "1.0"
 serde_derive = "1.0"
 parking_lot = "0.6"
 stats = { path = "../../util/stats" }
-keccak-hash = "0.1"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
-kvdb = "0.1"
+kvdb = { git = "https://github.com/paritytech/parity-common" }
 memory-cache = { path = "../../util/memory_cache" }
 error-chain = { version = "0.12", default-features = false }

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = "0.1"
+kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
 tempdir = "0.3"

 [features]
--- a/ethcore/light/src/cache.rs
+++ b/ethcore/light/src/cache.rs
@@ -31,7 +31,7 @@ use ethereum_types::{H256, U256};
 use memory_cache::MemoryLruCache;

 /// Configuration for how much data to cache.
-#[derive(Copy, Clone, Debug, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub struct CacheSizes {
 	/// Maximum size, in bytes, of cached headers.
 	pub headers: usize,
@@ -83,33 +83,33 @@ impl Cache {
 			receipts: MemoryLruCache::new(sizes.receipts),
 			chain_score: MemoryLruCache::new(sizes.chain_score),
 			corpus: None,
-			corpus_expiration,
+			corpus_expiration: corpus_expiration,
 		}
 	}

 	/// Query header by hash.
 	pub fn block_header(&mut self, hash: &H256) -> Option<encoded::Header> {
-		self.headers.get_mut(hash).cloned()
+		self.headers.get_mut(hash).map(|x| x.clone())
 	}

 	/// Query hash by number.
-	pub fn block_hash(&mut self, num: BlockNumber) -> Option<H256> {
-		self.canon_hashes.get_mut(&num).map(|h| *h)
+	pub fn block_hash(&mut self, num: &BlockNumber) -> Option<H256> {
+		self.canon_hashes.get_mut(num).map(|x| x.clone())
 	}

 	/// Query block body by block hash.
 	pub fn block_body(&mut self, hash: &H256) -> Option<encoded::Body> {
-		self.bodies.get_mut(hash).cloned()
+		self.bodies.get_mut(hash).map(|x| x.clone())
 	}

 	/// Query block receipts by block hash.
 	pub fn block_receipts(&mut self, hash: &H256) -> Option<Vec<Receipt>> {
-		self.receipts.get_mut(hash).cloned()
+		self.receipts.get_mut(hash).map(|x| x.clone())
 	}

 	/// Query chain score by block hash.
 	pub fn chain_score(&mut self, hash: &H256) -> Option<U256> {
-		self.chain_score.get_mut(hash).map(|h| *h)
+		self.chain_score.get_mut(hash).map(|x| x.clone())
 	}

 	/// Cache the given header.
--- a/ethcore/light/src/cht.rs
+++ b/ethcore/light/src/cht.rs
@@ -92,7 +92,7 @@ pub struct BlockInfo {
 /// Build an in-memory CHT from a closure which provides necessary information
 /// about blocks. If the fetcher ever fails to provide the info, the CHT
 /// will not be generated.
-pub fn build<F>(cht_num: u64, mut fetcher: F) -> Option<CHT<MemoryDB<KeccakHasher>>>
+pub fn build<F>(cht_num: u64, mut fetcher: F) ->  Option<CHT<MemoryDB<KeccakHasher>>>
 	where F: FnMut(BlockId) -> Option<BlockInfo>
 {
 	let mut db = MemoryDB::<KeccakHasher>::new();
@@ -118,8 +118,8 @@ pub fn build<F>(cht_num: u64, mut fetcher: F) -> Option<CHT<MemoryDB<KeccakHashe
 	}

 	Some(CHT {
-		db,
-		root,
+		db: db,
+		root: root,
 		number: cht_num,
 	})
 }
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -33,7 +33,7 @@ use cht;
 use ethcore::block_status::BlockStatus;
 use ethcore::encoded;
 use ethcore::engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
-use ethcore::error::{Error, EthcoreResult, ErrorKind as EthcoreErrorKind, BlockError};
+use ethcore::error::{Error, BlockImportError, BlockImportErrorKind, BlockError};
 use ethcore::header::Header;
 use ethcore::ids::BlockId;
 use ethcore::spec::{Spec, SpecHardcodedSync};
@@ -51,10 +51,10 @@ use smallvec::SmallVec;
 const HISTORY: u64 = 2048;

 /// The best block key. Maps to an RLP list: [best_era, last_era]
-const CURRENT_KEY: &[u8] = &*b"best_and_latest";
+const CURRENT_KEY: &'static [u8] = &*b"best_and_latest";

 /// Key storing the last canonical epoch transition.
-const LAST_CANONICAL_TRANSITION: &[u8] = &*b"canonical_transition";
+const LAST_CANONICAL_TRANSITION: &'static [u8] = &*b"canonical_transition";

 /// Information about a block.
 #[derive(Debug, Clone)]
@@ -97,10 +97,9 @@ struct Entry {

 impl HeapSizeOf for Entry {
 	fn heap_size_of_children(&self) -> usize {
-		if self.candidates.spilled() {
-			self.candidates.capacity() * ::std::mem::size_of::<Candidate>()
-		} else {
-			0
+		match self.candidates.spilled() {
+			false => 0,
+			true => self.candidates.capacity() * ::std::mem::size_of::<Candidate>(),
 		}
 	}
 }
@@ -135,7 +134,7 @@ impl Decodable for Entry {
 		// rely on the invariant that the canonical entry is always first.
 		let canon_hash = candidates[0].hash;
 		Ok(Entry {
-			candidates,
+			candidates: candidates,
 			canonical_hash: canon_hash,
 		})
 	}
@@ -270,9 +269,9 @@ impl HeaderChain {
 				best_block: RwLock::new(best_block),
 				candidates: RwLock::new(candidates),
 				live_epoch_proofs: RwLock::new(live_epoch_proofs),
-				db,
-				col,
-				cache,
+				db: db,
+				col: col,
+				cache: cache,
 			}

 		} else {
@@ -286,8 +285,8 @@ impl HeaderChain {
 				candidates: RwLock::new(BTreeMap::new()),
 				live_epoch_proofs: RwLock::new(live_epoch_proofs),
 				db: db.clone(),
-				col,
-				cache,
+				col: col,
+				cache: cache,
 			};

 			// insert the hardcoded sync into the database.
@@ -303,8 +302,9 @@ impl HeaderChain {
 				let decoded_header_num = decoded_header.number();

 				// write the block in the DB.
-				info!(target: "chain", "Inserting hardcoded block #{} in chain", decoded_header_num);
-				let pending = chain.insert_with_td(&mut batch, &decoded_header,
+				info!(target: "chain", "Inserting hardcoded block #{} in chain",
+					  decoded_header_num);
+				let pending = chain.insert_with_td(&mut batch, decoded_header,
 												hardcoded_sync.total_difficulty, None)?;

 				// check that we have enough hardcoded CHT roots. avoids panicking later.
@@ -324,7 +324,7 @@ impl HeaderChain {
 		};

 		// instantiate genesis epoch data if it doesn't exist.
-		if chain.db.get(col, LAST_CANONICAL_TRANSITION)?.is_none() {
+		if let None = chain.db.get(col, LAST_CANONICAL_TRANSITION)? {
 			let genesis_data = spec.genesis_epoch_data()?;

 			{
@@ -349,9 +349,9 @@ impl HeaderChain {
 	pub fn insert(
 		&self,
 		transaction: &mut DBTransaction,
-		header: &Header,
+		header: Header,
 		transition_proof: Option<Vec<u8>>,
-	) -> EthcoreResult<PendingChanges> {
+	) -> Result<PendingChanges, BlockImportError> {
 		self.insert_inner(transaction, header, None, transition_proof)
 	}

@@ -361,27 +361,27 @@ impl HeaderChain {
 	pub fn insert_with_td(
 		&self,
 		transaction: &mut DBTransaction,
-		header: &Header,
+		header: Header,
 		total_difficulty: U256,
 		transition_proof: Option<Vec<u8>>,
-	) -> EthcoreResult<PendingChanges> {
+	) -> Result<PendingChanges, BlockImportError> {
 		self.insert_inner(transaction, header, Some(total_difficulty), transition_proof)
 	}

 	fn insert_inner(
 		&self,
 		transaction: &mut DBTransaction,
-		header: &Header,
+		header: Header,
 		total_difficulty: Option<U256>,
 		transition_proof: Option<Vec<u8>>,
-	) -> EthcoreResult<PendingChanges> {
+	) -> Result<PendingChanges, BlockImportError> {
 		let hash = header.hash();
 		let number = header.number();
 		let parent_hash = *header.parent_hash();
 		let transition = transition_proof.map(|proof| EpochTransition {
 			block_hash: hash,
 			block_number: number,
-			proof,
+			proof: proof,
 		});

 		let mut pending = PendingChanges {
@@ -403,7 +403,7 @@ impl HeaderChain {
 							.and_then(|entry| entry.candidates.iter().find(|c| c.hash == parent_hash))
 							.map(|c| c.total_difficulty)
 							.ok_or_else(|| BlockError::UnknownParent(parent_hash))
-							.map_err(EthcoreErrorKind::Block)?
+							.map_err(BlockImportErrorKind::Block)?
 					};

 				parent_td + *header.difficulty()
@@ -415,9 +415,9 @@ impl HeaderChain {
 			let cur_era = candidates.entry(number)
 				.or_insert_with(|| Entry { candidates: SmallVec::new(), canonical_hash: hash });
 			cur_era.candidates.push(Candidate {
-				hash,
-				parent_hash,
-				total_difficulty,
+				hash: hash,
+				parent_hash: parent_hash,
+				total_difficulty: total_difficulty,
 			});

 			// fix ordering of era before writing.
@@ -479,9 +479,9 @@ impl HeaderChain {

 			trace!(target: "chain", "New best block: ({}, {}), TD {}", number, hash, total_difficulty);
 			pending.best_block = Some(BlockDescriptor {
-				hash,
-				number,
-				total_difficulty,
+				hash: hash,
+				number: number,
+				total_difficulty: total_difficulty,
 			});

 			// produce next CHT root if it's time.
@@ -651,7 +651,7 @@ impl HeaderChain {
 						Ok(db_value) => {
 							db_value.map(|x| x.into_vec()).map(encoded::Header::new)
 								.and_then(|header| {
-									cache.insert_block_header(hash, header.clone());
+									cache.insert_block_header(hash.clone(), header.clone());
 									Some(header)
 								 })
 						},
@@ -772,17 +772,16 @@ impl HeaderChain {

 	/// Get block status.
 	pub fn status(&self, hash: &H256) -> BlockStatus {
-		if self.db.get(self.col, hash).ok().map_or(false, |x| x.is_some()) {
-			BlockStatus::InChain
-		} else {
-			BlockStatus::Unknown
+		match self.db.get(self.col, &*hash).ok().map_or(false, |x| x.is_some()) {
+			true => BlockStatus::InChain,
+			false => BlockStatus::Unknown,
 		}
 	}

 	/// Insert a pending transition.
-	pub fn insert_pending_transition(&self, batch: &mut DBTransaction, hash: H256, t: &PendingEpochTransition) {
+	pub fn insert_pending_transition(&self, batch: &mut DBTransaction, hash: H256, t: PendingEpochTransition) {
 		let key = pending_transition_key(hash);
-		batch.put(self.col, &*key, &*::rlp::encode(t));
+		batch.put(self.col, &*key, &*::rlp::encode(&t));
 	}

 	/// Get pending transition for a specific block hash.
@@ -866,7 +865,7 @@ mod tests {
 	use ethcore::ids::BlockId;
 	use ethcore::header::Header;
 	use ethcore::spec::Spec;
-	use cache::Cache;
+  	use cache::Cache;
 	use kvdb::KeyValueDB;
 	use kvdb_memorydb;

@@ -898,7 +897,7 @@ mod tests {
 			parent_hash = header.hash();

 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, &header, None).unwrap();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);

@@ -931,7 +930,7 @@ mod tests {
 			parent_hash = header.hash();

 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, &header, None).unwrap();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);

@@ -950,7 +949,7 @@ mod tests {
 				parent_hash = header.hash();

 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, &header, None).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);

@@ -974,7 +973,7 @@ mod tests {
 				parent_hash = header.hash();

 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, &header, None).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);

@@ -1027,7 +1026,7 @@ mod tests {
 				parent_hash = header.hash();

 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, &header, None).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);

@@ -1067,7 +1066,7 @@ mod tests {
 				parent_hash = header.hash();

 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, &header, None).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);

@@ -1084,7 +1083,7 @@ mod tests {
 				parent_hash = header.hash();

 				let mut tx = db.transaction();
-				let pending = chain.insert(&mut tx, &header, None).unwrap();
+				let pending = chain.insert(&mut tx, header, None).unwrap();
 				db.write(tx).unwrap();
 				chain.apply_pending(pending);

@@ -1142,7 +1141,7 @@ mod tests {
 				None
 			};

-			let pending = chain.insert(&mut tx, &header, epoch_proof).unwrap();
+			let pending = chain.insert(&mut tx, header, epoch_proof).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);

@@ -1170,7 +1169,7 @@ mod tests {
 			parent_hash = header.hash();

 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, &header, None).unwrap();
+			let pending = chain.insert(&mut tx, header, None).unwrap();
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);

@@ -1209,7 +1208,7 @@ mod tests {
 			parent_hash = header.hash();

 			let mut tx = db.transaction();
-			let pending = chain.insert(&mut tx, &header, None).expect("failed inserting a transaction");
+			let pending = chain.insert(&mut tx, header, None).expect("failed inserting a transaction");
 			db.write(tx).unwrap();
 			chain.apply_pending(pending);

--- a/ethcore/light/src/client/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -22,7 +22,7 @@ use ethcore::block_status::BlockStatus;
 use ethcore::client::{ClientReport, EnvInfo, ClientIoMessage};
 use ethcore::engines::{epoch, EthEngine, EpochChange, EpochTransition, Proof};
 use ethcore::machine::EthereumMachine;
-use ethcore::error::{Error, EthcoreResult};
+use ethcore::error::{Error, BlockImportError};
 use ethcore::ids::BlockId;
 use ethcore::header::{BlockNumber, Header};
 use ethcore::verification::queue::{self, HeaderQueue};
@@ -85,7 +85,7 @@ pub trait LightChainClient: Send + Sync {

 	/// Queue header to be verified. Required that all headers queued have their
 	/// parent queued prior.
-	fn queue_header(&self, header: Header) -> EthcoreResult<H256>;
+	fn queue_header(&self, header: Header) -> Result<H256, BlockImportError>;

 	/// Attempt to get a block hash by block id.
 	fn block_hash(&self, id: BlockId) -> Option<H256>;
@@ -127,6 +127,9 @@ pub trait LightChainClient: Send + Sync {
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;

+	/// Get the EIP-86 transition block number.
+	fn eip86_transition(&self) -> BlockNumber;
+
 	/// Get a report of import activity since the last call.
 	fn report(&self) -> ClientReport;
 }
@@ -176,7 +179,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		io_channel: IoChannel<ClientIoMessage>,
 		cache: Arc<Mutex<Cache>>
 	) -> Result<Self, Error> {
-		Ok(Self {
+		Ok(Client {
 			queue: HeaderQueue::new(config.queue, spec.engine.clone(), io_channel, config.check_seal),
 			engine: spec.engine.clone(),
 			chain: {
@@ -185,9 +188,9 @@ impl<T: ChainDataFetcher> Client<T> {
 			},
 			report: RwLock::new(ClientReport::default()),
 			import_lock: Mutex::new(()),
-			db,
+			db: db,
 			listeners: RwLock::new(vec![]),
-			fetcher,
+			fetcher: fetcher,
 			verify_full: config.verify_full,
 		})
 	}
@@ -206,7 +209,7 @@ impl<T: ChainDataFetcher> Client<T> {
 	}

 	/// Import a header to the queue for additional verification.
-	pub fn import_header(&self, header: Header) -> EthcoreResult<H256> {
+	pub fn import_header(&self, header: Header) -> Result<H256, BlockImportError> {
 		self.queue.import(header).map_err(Into::into)
 	}

@@ -229,7 +232,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		BlockChainInfo {
 			total_difficulty: best_td,
 			pending_total_difficulty: best_td + self.queue.total_difficulty(),
-			genesis_hash,
+			genesis_hash: genesis_hash,
 			best_block_hash: best_hdr.hash(),
 			best_block_number: best_hdr.number(),
 			best_block_timestamp: best_hdr.timestamp(),
@@ -313,14 +316,14 @@ impl<T: ChainDataFetcher> Client<T> {
 					The node may not be able to synchronize further.", e);
 			}

-			let epoch_proof = self.engine.is_epoch_end(
+			let epoch_proof =  self.engine.is_epoch_end(
 				&verified_header,
 				&|h| self.chain.block_header(BlockId::Hash(h)).and_then(|hdr| hdr.decode().ok()),
 				&|h| self.chain.pending_transition(h),
 			);

 			let mut tx = self.db.transaction();
-			let pending = match self.chain.insert(&mut tx, &verified_header, epoch_proof) {
+			let pending = match self.chain.insert(&mut tx, verified_header, epoch_proof) {
 				Ok(pending) => {
 					good.push(hash);
 					self.report.write().blocks_imported += 1;
@@ -511,8 +514,8 @@ impl<T: ChainDataFetcher> Client<T> {
 		};

 		let mut batch = self.db.transaction();
-		self.chain.insert_pending_transition(&mut batch, header.hash(), &epoch::PendingTransition {
-			proof,
+		self.chain.insert_pending_transition(&mut batch, header.hash(), epoch::PendingTransition {
+			proof: proof,
 		});
 		self.db.write_buffered(batch);
 		Ok(())
@@ -526,7 +529,7 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {

 	fn chain_info(&self) -> BlockChainInfo { Client::chain_info(self) }

-	fn queue_header(&self, header: Header) -> EthcoreResult<H256> {
+	fn queue_header(&self, header: Header) -> Result<H256, BlockImportError> {
 		self.import_header(header)
 	}

@@ -582,6 +585,10 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::cht_root(self, i)
 	}

+	fn eip86_transition(&self) -> BlockNumber {
+		self.engine().params().eip86_transition
+	}
+
 	fn report(&self) -> ClientReport {
 		Client::report(self)
 	}
@@ -602,7 +609,7 @@ impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
 		self.chain.epoch_transition_for(parent_hash).map(|(hdr, proof)| EpochTransition {
 			block_hash: hdr.hash(),
 			block_number: hdr.number(),
-			proof,
+			proof: proof,
 		})
 	}

--- a/ethcore/light/src/client/service.rs
+++ b/ethcore/light/src/client/service.rs
@@ -79,8 +79,8 @@ impl<T: ChainDataFetcher> Service<T> {
 		spec.engine.register_client(Arc::downgrade(&client) as _);

 		Ok(Service {
-			client,
-			io_service,
+			client: client,
+			io_service: io_service,
 		})
 	}

--- a/ethcore/light/src/lib.rs
+++ b/ethcore/light/src/lib.rs
@@ -43,7 +43,7 @@ pub mod provider;
 mod types;

 pub use self::cache::Cache;
-pub use self::provider::{Provider, MAX_HEADERS_PER_REQUEST};
+pub use self::provider::Provider;
 pub use self::transaction_queue::TransactionQueue;
 pub use types::request as request;

--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -44,9 +44,6 @@ pub trait IoContext {

 	/// Persistent peer id
 	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId>;
-
-	/// Whether given peer id is reserved peer
-	fn is_reserved_peer(&self, peer: PeerId) -> bool;
 }

 impl<T> IoContext for T where T: ?Sized + NetworkContext {
@@ -79,10 +76,6 @@ impl<T> IoContext for T where T: ?Sized + NetworkContext {
 	fn persistent_peer_id(&self, peer: PeerId) -> Option<NodeId> {
 		self.session_info(peer).and_then(|info| info.id)
 	}
-
-	fn is_reserved_peer(&self, peer: PeerId) -> bool {
-		NetworkContext::is_reserved_peer(self, peer)
-	}
 }

 /// Basic context for the protocol.
@@ -133,7 +126,7 @@ impl<'a> BasicContext for TickCtx<'a> {
 	}

 	fn request_from(&self, peer: PeerId, requests: Requests) -> Result<ReqId, Error> {
-		self.proto.request_from(self.io, peer, requests)
+		self.proto.request_from(self.io, &peer, requests)
 	}

 	fn make_announcement(&self, announcement: Announcement) {
@@ -166,7 +159,7 @@ impl<'a> BasicContext for Ctx<'a> {
 	}

 	fn request_from(&self, peer: PeerId, requests: Requests) -> Result<ReqId, Error> {
-		self.proto.request_from(self.io, peer, requests)
+		self.proto.request_from(self.io, &peer, requests)
 	}

 	fn make_announcement(&self, announcement: Announcement) {
--- a/ethcore/light/src/net/load_timer.rs
+++ b/ethcore/light/src/net/load_timer.rs
@@ -108,9 +108,9 @@ impl LoadDistribution {

 		LoadTimer {
 			start: Instant::now(),
-			n,
+			n: n,
 			dist: self,
-			kind,
+			kind: kind,
 		}
 	}

@@ -120,15 +120,17 @@ impl LoadDistribution {
 	pub fn expected_time(&self, kind: Kind) -> Duration {
 		let samples = self.samples.read();
 		samples.get(&kind).and_then(|s| {
-			if s.is_empty() { return None }
+			if s.len() == 0 { return None }

-			let alpha: f64 = 1_f64 / s.len() as f64;
-			let start = *s.front().expect("length known to be non-zero; qed") as f64;
-			let ema = s.iter().skip(1).fold(start, |a, &c| {
+			let alpha: f64 = 1f64 / s.len() as f64;
+			let start = s.front().expect("length known to be non-zero; qed").clone();
+			let ema = s.iter().skip(1).fold(start as f64, |a, &c| {
 				(alpha * c as f64) + ((1.0 - alpha) * a)
 			});

-			Some(Duration::from_nanos(ema as u64))
+			// TODO: use `Duration::from_nanos` once stable (https://github.com/rust-lang/rust/issues/46507)
+			let ema = ema as u64;
+			Some(Duration::new(ema / 1_000_000_000, (ema % 1_000_000_000) as u32))
 		}).unwrap_or_else(move || hardcoded_serve_time(kind))
 	}

--- a/ethcore/light/src/net/mod.rs
+++ b/ethcore/light/src/net/mod.rs
@@ -77,7 +77,7 @@ const UPDATE_INTERVAL: Duration = Duration::from_millis(5000);
 const PACKET_COUNT_V1: u8 = 9;

 /// Supported protocol versions.
-pub const PROTOCOL_VERSIONS: &[(u8, u8)] = &[
+pub const PROTOCOL_VERSIONS: &'static [(u8, u8)] = &[
 	(1, PACKET_COUNT_V1),
 ];

@@ -309,9 +309,9 @@ mod id_guard {
 		/// (for forming responses, triggering handlers) until defused
 		pub fn new(peers: RwLockReadGuard<'a, PeerMap>, peer_id: PeerId, req_id: ReqId) -> Self {
 			IdGuard {
-				peers,
-				peer_id,
-				req_id,
+				peers: peers,
+				peer_id: peer_id,
+				req_id: req_id,
 				active: true,
 			}
 		}
@@ -354,7 +354,6 @@ pub struct LightProtocol {
 	peers: RwLock<PeerMap>,
 	capabilities: RwLock<Capabilities>,
 	flow_params: RwLock<Arc<FlowParams>>,
-	free_flow_params: Arc<FlowParams>,
 	handlers: Vec<Arc<Handler>>,
 	req_id: AtomicUsize,
 	sample_store: Box<SampleStore>,
@@ -376,24 +375,23 @@ impl LightProtocol {
 		);

 		LightProtocol {
-			provider,
+			provider: provider,
 			config: params.config,
-			genesis_hash,
+			genesis_hash: genesis_hash,
 			network_id: params.network_id,
 			pending_peers: RwLock::new(HashMap::new()),
 			peers: RwLock::new(HashMap::new()),
 			capabilities: RwLock::new(params.capabilities),
 			flow_params: RwLock::new(Arc::new(flow_params)),
-			free_flow_params: Arc::new(FlowParams::free()),
 			handlers: Vec::new(),
 			req_id: AtomicUsize::new(0),
-			sample_store,
-			load_distribution,
+			sample_store: sample_store,
+			load_distribution: load_distribution,
 		}
 	}

 	/// Attempt to get peer status.
-	pub fn peer_status(&self, peer: PeerId) -> Option<Status> {
+	pub fn peer_status(&self, peer: &PeerId) -> Option<Status> {
 		self.peers.read().get(&peer)
 			.map(|peer| peer.lock().status.clone())
 	}
@@ -414,9 +412,9 @@ impl LightProtocol {
 	/// insufficient credits. Does not check capabilities before sending.
 	/// On success, returns a request id which can later be coordinated
 	/// with an event.
-	pub fn request_from(&self, io: &IoContext, peer_id: PeerId, requests: Requests) -> Result<ReqId, Error> {
+	pub fn request_from(&self, io: &IoContext, peer_id: &PeerId, requests: Requests) -> Result<ReqId, Error> {
 		let peers = self.peers.read();
-		let peer = match peers.get(&peer_id) {
+		let peer = match peers.get(peer_id) {
 			Some(peer) => peer,
 			None => return Err(Error::UnknownPeer),
 		};
@@ -444,7 +442,7 @@ impl LightProtocol {
 					peer_id, cost, pre_creds);

 				let req_id = ReqId(self.req_id.fetch_add(1, Ordering::SeqCst));
-				io.send(peer_id, packet::REQUEST, {
+				io.send(*peer_id, packet::REQUEST, {
 					let mut stream = RlpStream::new_list(2);
 					stream.append(&req_id.0).append_list(&requests.requests());
 					stream.out()
@@ -473,7 +471,7 @@ impl LightProtocol {
 			// TODO: "urgent" announcements like new blocks?
 			// the timer approach will skip 1 (possibly 2) in rare occasions.
 			if peer_info.sent_head == announcement.head_hash ||
-				peer_info.status.head_num >= announcement.head_num ||
+				peer_info.status.head_num >= announcement.head_num  ||
 				now - peer_info.last_update < UPDATE_INTERVAL {
 				continue
 			}
@@ -530,18 +528,18 @@ impl LightProtocol {
 	//   - check whether peer exists
 	//   - check whether request was made
 	//   - check whether request kinds match
-	fn pre_verify_response(&self, peer: PeerId, raw: &Rlp) -> Result<IdGuard, Error> {
+	fn pre_verify_response(&self, peer: &PeerId, raw: &Rlp) -> Result<IdGuard, Error> {
 		let req_id = ReqId(raw.val_at(0)?);
 		let cur_credits: U256 = raw.val_at(1)?;

 		trace!(target: "pip", "pre-verifying response for {} from peer {}", req_id, peer);

 		let peers = self.peers.read();
-		let res = match peers.get(&peer) {
+		let res = match peers.get(peer) {
 			Some(peer_info) => {
 				let mut peer_info = peer_info.lock();
 				let peer_info: &mut Peer = &mut *peer_info;
-				let req_info = peer_info.pending_requests.remove(req_id, Instant::now());
+				let req_info = peer_info.pending_requests.remove(&req_id, Instant::now());
 				let last_batched = peer_info.pending_requests.is_empty();
 				let flow_info = peer_info.remote_flow.as_mut();

@@ -567,29 +565,29 @@ impl LightProtocol {
 			None => Err(Error::UnknownPeer), // probably only occurs in a race of some kind.
 		};

-		res.map(|_| IdGuard::new(peers, peer, req_id))
+		res.map(|_| IdGuard::new(peers, *peer, req_id))
 	}

 	/// Handle a packet using the given io context.
 	/// Packet data is _untrusted_, which means that invalid data won't lead to
 	/// issues.
-	pub fn handle_packet(&self, io: &IoContext, peer: PeerId, packet_id: u8, data: &[u8]) {
+	pub fn handle_packet(&self, io: &IoContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
 		let rlp = Rlp::new(data);

 		trace!(target: "pip", "Incoming packet {} from peer {}", packet_id, peer);

 		// handle the packet
 		let res = match packet_id {
-			packet::STATUS => self.status(peer, io, &rlp),
-			packet::ANNOUNCE => self.announcement(peer, io, &rlp),
+			packet::STATUS => self.status(peer, io, rlp),
+			packet::ANNOUNCE => self.announcement(peer, io, rlp),

-			packet::REQUEST => self.request(peer, io, &rlp),
-			packet::RESPONSE => self.response(peer, io, &rlp),
+			packet::REQUEST => self.request(peer, io, rlp),
+			packet::RESPONSE => self.response(peer, io, rlp),

-			packet::UPDATE_CREDITS => self.update_credits(peer, io, &rlp),
-			packet::ACKNOWLEDGE_UPDATE => self.acknowledge_update(peer, io, &rlp),
+			packet::UPDATE_CREDITS => self.update_credits(peer, io, rlp),
+			packet::ACKNOWLEDGE_UPDATE => self.acknowledge_update(peer, io, rlp),

-			packet::SEND_TRANSACTIONS => self.relay_transactions(peer, io, &rlp),
+			packet::SEND_TRANSACTIONS => self.relay_transactions(peer, io, rlp),

 			other => {
 				Err(Error::UnrecognizedPacket(other))
@@ -597,7 +595,7 @@ impl LightProtocol {
 		};

 		if let Err(e) = res {
-			punish(peer, io, &e);
+			punish(*peer, io, e);
 		}
 	}

@@ -684,14 +682,14 @@ impl LightProtocol {
 	}

 	/// called when a peer connects.
-	pub fn on_connect(&self, peer: PeerId, io: &IoContext) {
-		let proto_version = match io.protocol_version(peer).ok_or(Error::WrongNetwork) {
+	pub fn on_connect(&self, peer: &PeerId, io: &IoContext) {
+		let proto_version = match io.protocol_version(*peer).ok_or(Error::WrongNetwork) {
 			Ok(pv) => pv,
-			Err(e) => { punish(peer, io, &e); return }
+			Err(e) => { punish(*peer, io, e); return }
 		};

 		if PROTOCOL_VERSIONS.iter().find(|x| x.0 == proto_version).is_none() {
-			punish(peer, io, &Error::UnsupportedProtocolVersion(proto_version));
+			punish(*peer, io, Error::UnsupportedProtocolVersion(proto_version));
 			return;
 		}

@@ -707,22 +705,17 @@ impl LightProtocol {
 			last_head: None,
 		};

-		let capabilities = self.capabilities.read();
-		let cost_local_flow = self.flow_params.read();
-		let local_flow = if io.is_reserved_peer(peer) {
-			&*self.free_flow_params
-		} else {
-			&**cost_local_flow
-		};
-		let status_packet = status::write_handshake(&status, &capabilities, Some(local_flow));
+		let capabilities = self.capabilities.read().clone();
+		let local_flow = self.flow_params.read();
+		let status_packet = status::write_handshake(&status, &capabilities, Some(&**local_flow));

-		self.pending_peers.write().insert(peer, PendingPeer {
+		self.pending_peers.write().insert(*peer, PendingPeer {
 			sent_head: chain_info.best_block_hash,
 			last_update: Instant::now(),
 		});

 		trace!(target: "pip", "Sending status to peer {}", peer);
-		io.send(peer, packet::STATUS, status_packet);
+		io.send(*peer, packet::STATUS, status_packet);
 	}

 	/// called when a peer disconnects.
@@ -743,8 +736,8 @@ impl LightProtocol {

 		for handler in &self.handlers {
 			handler.on_disconnect(&Ctx {
-				peer,
-				io,
+				peer: peer,
+				io: io,
 				proto: self,
 			}, &unfulfilled)
 		}
@@ -755,7 +748,7 @@ impl LightProtocol {
 		where F: FnOnce(&BasicContext) -> T
 	{
 		f(&TickCtx {
-			io,
+			io: io,
 			proto: self,
 		})
 	}
@@ -763,7 +756,7 @@ impl LightProtocol {
 	fn tick_handlers(&self, io: &IoContext) {
 		for handler in &self.handlers {
 			handler.tick(&TickCtx {
-				io,
+				io: io,
 				proto: self,
 			})
 		}
@@ -794,15 +787,15 @@ impl LightProtocol {
 			let mut peer_info = peer_info.lock();

 			io.send(*peer_id, packet::UPDATE_CREDITS, packet_body.clone());
-			peer_info.awaiting_acknowledge = Some((now, new_params.clone()));
+			peer_info.awaiting_acknowledge = Some((now.clone(), new_params.clone()));
 		}
 	}
 }

 impl LightProtocol {
 	// Handle status message from peer.
-	fn status(&self, peer: PeerId, io: &IoContext, data: &Rlp) -> Result<(), Error> {
-		let pending = match self.pending_peers.write().remove(&peer) {
+	fn status(&self, peer: &PeerId, io: &IoContext, data: Rlp) -> Result<(), Error> {
+		let pending = match self.pending_peers.write().remove(peer) {
 			Some(pending) => pending,
 			None => {
 				return Err(Error::UnexpectedHandshake);
@@ -820,37 +813,33 @@ impl LightProtocol {
 			return Err(Error::WrongNetwork);
 		}

-		if Some(status.protocol_version as u8) != io.protocol_version(peer) {
+		if Some(status.protocol_version as u8) != io.protocol_version(*peer) {
 			return Err(Error::BadProtocolVersion);
 		}

 		let remote_flow = flow_params.map(|params| (params.create_credits(), params));
-		let local_flow = if io.is_reserved_peer(peer) {
-			self.free_flow_params.clone()
-		} else {
-			self.flow_params.read().clone()
-		};
+		let local_flow = self.flow_params.read().clone();

-		self.peers.write().insert(peer, Mutex::new(Peer {
+		self.peers.write().insert(*peer, Mutex::new(Peer {
 			local_credits: local_flow.create_credits(),
 			status: status.clone(),
 			capabilities,
-			remote_flow,
+			remote_flow: remote_flow,
 			sent_head: pending.sent_head,
 			last_update: pending.last_update,
 			pending_requests: RequestSet::default(),
 			failed_requests: Vec::new(),
 			propagated_transactions: HashSet::new(),
 			skip_update: false,
-			local_flow,
+			local_flow: local_flow,
 			awaiting_acknowledge: None,
 		}));

 		let any_kept = self.handlers.iter().map(
 			|handler| handler.on_connect(
 				&Ctx {
-					peer,
-					io,
+					peer: *peer,
+					io: io,
 					proto: self,
 				},
 				&status,
@@ -866,8 +855,8 @@ impl LightProtocol {
 	}

 	// Handle an announcement.
-	fn announcement(&self, peer: PeerId, io: &IoContext, data: &Rlp) -> Result<(), Error> {
-		if !self.peers.read().contains_key(&peer) {
+	fn announcement(&self, peer: &PeerId, io: &IoContext, data: Rlp) -> Result<(), Error> {
+		if !self.peers.read().contains_key(peer) {
 			debug!(target: "pip", "Ignoring announcement from unknown peer");
 			return Ok(())
 		}
@@ -877,7 +866,7 @@ impl LightProtocol {
 		// scope to ensure locks are dropped before moving into handler-space.
 		{
 			let peers = self.peers.read();
-			let peer_info = match peers.get(&peer) {
+			let peer_info = match peers.get(peer) {
 				Some(info) => info,
 				None => return Ok(()),
 			};
@@ -901,8 +890,8 @@ impl LightProtocol {

 		for handler in &self.handlers {
 			handler.on_announcement(&Ctx {
-				peer,
-				io,
+				peer: *peer,
+				io: io,
 				proto: self,
 			}, &announcement);
 		}
@@ -911,7 +900,7 @@ impl LightProtocol {
 	}

 	// Receive requests from a peer.
-	fn request(&self, peer_id: PeerId, io: &IoContext, raw: &Rlp) -> Result<(), Error> {
+	fn request(&self, peer_id: &PeerId, io: &IoContext, raw: Rlp) -> Result<(), Error> {
 		// the maximum amount of requests we'll fill in a single packet.
 		const MAX_REQUESTS: usize = 256;

@@ -919,7 +908,7 @@ impl LightProtocol {
 		use ::request::CompleteRequest;

 		let peers = self.peers.read();
-		let peer = match peers.get(&peer_id) {
+		let peer = match peers.get(peer_id) {
 			Some(peer) => peer,
 			None => {
 				debug!(target: "pip", "Ignoring request from unknown peer");
@@ -979,7 +968,7 @@ impl LightProtocol {
 	}

 	// handle a packet with responses.
-	fn response(&self, peer: PeerId, io: &IoContext, raw: &Rlp) -> Result<(), Error> {
+	fn response(&self, peer: &PeerId, io: &IoContext, raw: Rlp) -> Result<(), Error> {
 		let (req_id, responses) = {
 			let id_guard = self.pre_verify_response(peer, &raw)?;
 			let responses: Vec<Response> = raw.list_at(2)?;
@@ -988,9 +977,9 @@ impl LightProtocol {

 		for handler in &self.handlers {
 			handler.on_responses(&Ctx {
-				io,
+				io: io,
 				proto: self,
-				peer,
+				peer: *peer,
 			}, req_id, &responses);
 		}

@@ -998,10 +987,10 @@ impl LightProtocol {
 	}

 	// handle an update of request credits parameters.
-	fn update_credits(&self, peer_id: PeerId, io: &IoContext, raw: &Rlp) -> Result<(), Error> {
+	fn update_credits(&self, peer_id: &PeerId, io: &IoContext, raw: Rlp) -> Result<(), Error> {
 		let peers = self.peers.read();

-		let peer = peers.get(&peer_id).ok_or(Error::UnknownPeer)?;
+		let peer = peers.get(peer_id).ok_or(Error::UnknownPeer)?;
 		let mut peer = peer.lock();

 		trace!(target: "pip", "Received an update to request credit params from peer {}", peer_id);
@@ -1033,9 +1022,9 @@ impl LightProtocol {
 	}

 	// handle an acknowledgement of request credits update.
-	fn acknowledge_update(&self, peer_id: PeerId, _io: &IoContext, _raw: &Rlp) -> Result<(), Error> {
+	fn acknowledge_update(&self, peer_id: &PeerId, _io: &IoContext, _raw: Rlp) -> Result<(), Error> {
 		let peers = self.peers.read();
-		let peer = peers.get(&peer_id).ok_or(Error::UnknownPeer)?;
+		let peer = peers.get(peer_id).ok_or(Error::UnknownPeer)?;
 		let mut peer = peer.lock();

 		trace!(target: "pip", "Received an acknowledgement for new request credit params from peer {}", peer_id);
@@ -1052,7 +1041,7 @@ impl LightProtocol {
 	}

 	// Receive a set of transactions to relay.
-	fn relay_transactions(&self, peer: PeerId, io: &IoContext, data: &Rlp) -> Result<(), Error> {
+	fn relay_transactions(&self, peer: &PeerId, io: &IoContext, data: Rlp) -> Result<(), Error> {
 		const MAX_TRANSACTIONS: usize = 256;

 		let txs: Vec<_> = data.iter()
@@ -1064,8 +1053,8 @@ impl LightProtocol {

 		for handler in &self.handlers {
 			handler.on_transactions(&Ctx {
-				peer,
-				io,
+				peer: *peer,
+				io: io,
 				proto: self,
 			}, &txs);
 		}
@@ -1075,7 +1064,7 @@ impl LightProtocol {
 }

 // if something went wrong, figure out how much to punish the peer.
-fn punish(peer: PeerId, io: &IoContext, e: &Error) {
+fn punish(peer: PeerId, io: &IoContext, e: Error) {
 	match e.punishment() {
 		Punishment::None => {}
 		Punishment::Disconnect => {
@@ -1102,11 +1091,11 @@ impl NetworkProtocolHandler for LightProtocol {
 	}

 	fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
-		self.handle_packet(&io, *peer, packet_id, data);
+		self.handle_packet(&io, peer, packet_id, data);
 	}

 	fn connected(&self, io: &NetworkContext, peer: &PeerId) {
-		self.on_connect(*peer, &io);
+		self.on_connect(peer, &io);
 	}

 	fn disconnected(&self, io: &NetworkContext, peer: &PeerId) {
--- a/ethcore/light/src/net/request_credits.rs
+++ b/ethcore/light/src/net/request_credits.rs
@@ -46,7 +46,7 @@ pub struct Credits {

 impl Credits {
 	/// Get the current amount of credits..
-	pub fn current(&self) -> U256 { self.estimate }
+	pub fn current(&self) -> U256 { self.estimate.clone() }

 	/// Make a definitive update.
 	/// This will be the value obtained after receiving
@@ -68,11 +68,12 @@ impl Credits {
 	/// If unsuccessful, the structure will be unaltered an an
 	/// error will be produced.
 	pub fn deduct_cost(&mut self, cost: U256) -> Result<(), Error> {
-		if cost > self.estimate {
-			Err(Error::NoCredits)
-		} else {
-			self.estimate = self.estimate - cost;
-			Ok(())
+		match cost > self.estimate {
+			true => Err(Error::NoCredits),
+			false => {
+				self.estimate = self.estimate - cost;
+				Ok(())
+			}
 		}
 	}
 }
@@ -120,7 +121,7 @@ impl Default for CostTable {
 	fn default() -> Self {
 		// arbitrarily chosen constants.
 		CostTable {
-			base: 100_000.into(),
+			base: 100000.into(),
 			headers: Some(10000.into()),
 			transaction_index: Some(10000.into()),
 			body: Some(15000.into()),
@@ -192,17 +193,17 @@ impl Decodable for CostTable {
 		}

 		let table = CostTable {
-			base,
-			headers,
-			transaction_index,
-			body,
-			receipts,
-			account,
-			storage,
-			code,
-			header_proof,
-			transaction_proof,
-			epoch_signal,
+			base: base,
+			headers: headers,
+			transaction_index: transaction_index,
+			body: body,
+			receipts: receipts,
+			account: account,
+			storage: storage,
+			code: code,
+			header_proof: header_proof,
+			transaction_proof: transaction_proof,
+			epoch_signal: epoch_signal,
 		};

 		if table.costs_set() == 0 {
@@ -226,9 +227,9 @@ impl FlowParams {
 	/// credit limit, and (minimum) rate of recharge.
 	pub fn new(limit: U256, costs: CostTable, recharge: U256) -> Self {
 		FlowParams {
-			costs,
-			limit,
-			recharge,
+			costs: costs,
+			limit: limit,
+			recharge: recharge,
 		}
 	}

@@ -282,7 +283,7 @@ impl FlowParams {
 		};

 		FlowParams {
-			costs,
+			costs: costs,
 			limit: max.into(),
 			recharge: recharge.into(),
 		}
@@ -292,19 +293,19 @@ impl FlowParams {
 	pub fn free() -> Self {
 		let free_cost: Option<U256> = Some(0.into());
 		FlowParams {
-			limit: (!0_u64).into(),
+			limit: (!0u64).into(),
 			recharge: 1.into(),
 			costs: CostTable {
 				base: 0.into(),
-				headers: free_cost,
-				transaction_index: free_cost,
-				body: free_cost,
-				receipts: free_cost,
-				account: free_cost,
-				storage: free_cost,
-				code: free_cost,
-				header_proof: free_cost,
-				transaction_proof: free_cost,
+				headers: free_cost.clone(),
+				transaction_index: free_cost.clone(),
+				body: free_cost.clone(),
+				receipts: free_cost.clone(),
+				account: free_cost.clone(),
+				storage: free_cost.clone(),
+				code: free_cost.clone(),
+				header_proof: free_cost.clone(),
+				transaction_proof: free_cost.clone(),
 				epoch_signal: free_cost,
 			}
 		}
@@ -369,7 +370,7 @@ impl FlowParams {
 		// recompute and update only in terms of full seconds elapsed
 		// in order to keep the estimate as an underestimate.
 		let elapsed = (now - credits.recharge_point).as_secs();
-		credits.recharge_point += Duration::from_secs(elapsed);
+		credits.recharge_point = credits.recharge_point + Duration::from_secs(elapsed);

 		let elapsed: U256 = elapsed.into();

@@ -417,7 +418,7 @@ mod tests {
 		use std::time::Duration;

 		let flow_params = FlowParams::new(100.into(), Default::default(), 20.into());
-		let mut credits = flow_params.create_credits();
+		let mut credits =  flow_params.create_credits();

 		assert!(credits.deduct_cost(101.into()).is_err());
 		assert!(credits.deduct_cost(10.into()).is_ok());
--- a/ethcore/light/src/net/request_set.rs
+++ b/ethcore/light/src/net/request_set.rs
@@ -73,7 +73,7 @@ impl RequestSet {
 	}

 	/// Remove a set of requests from the stack.
-	pub fn remove(&mut self, req_id: ReqId, now: Instant) -> Option<Requests> {
+	pub fn remove(&mut self, req_id: &ReqId, now: Instant) -> Option<Requests> {
 		let id = match self.ids.remove(&req_id) {
 			Some(id) => id,
 			None => return None,
@@ -165,7 +165,7 @@ mod tests {
 		let test_end = test_begin + req_time;
 		assert!(req_set.check_timeout(test_end));

-		req_set.remove(ReqId(0), test_begin + Duration::from_secs(1)).unwrap();
+		req_set.remove(&ReqId(0), test_begin + Duration::from_secs(1)).unwrap();
 		assert!(!req_set.check_timeout(test_end));
 		assert!(req_set.check_timeout(test_end + Duration::from_secs(1)));
 	}
@@ -183,7 +183,7 @@ mod tests {
 		}

 		for i in (0..5).rev() {
-			assert!(req_set.remove(ReqId(i), test_end).is_some());
+			assert!(req_set.remove(&ReqId(i), test_end).is_some());
 			assert_eq!(req_set.cumulative_cost, i.into());
 		}
 	}
--- a/ethcore/light/src/net/status.rs
+++ b/ethcore/light/src/net/status.rs
@@ -43,8 +43,8 @@ enum Key {

 impl Key {
 	// get the string value of this key.
-	fn as_str(self) -> &'static str {
-		match self {
+	fn as_str(&self) -> &'static str {
+		match *self {
 			Key::ProtocolVersion => "protocolVersion",
 			Key::NetworkId => "networkId",
 			Key::HeadTD => "headTd",
@@ -85,7 +85,7 @@ impl Key {
 // helper for decoding key-value pairs in the handshake or an announcement.
 struct Parser<'a> {
 	pos: usize,
-	rlp: &'a Rlp<'a>,
+	rlp: Rlp<'a>,
 }

 impl<'a> Parser<'a> {
@@ -208,10 +208,10 @@ impl Capabilities {
 ///   - chain status
 ///   - serving capabilities
 ///   - request credit parameters
-pub fn parse_handshake(rlp: &Rlp) -> Result<(Status, Capabilities, Option<FlowParams>), DecoderError> {
+pub fn parse_handshake(rlp: Rlp) -> Result<(Status, Capabilities, Option<FlowParams>), DecoderError> {
 	let mut parser = Parser {
 		pos: 0,
-		rlp,
+		rlp: rlp,
 	};

 	let status = Status {
@@ -304,7 +304,7 @@ pub struct Announcement {
 }

 /// Parse an announcement.
-pub fn parse_announcement(rlp: &Rlp) -> Result<Announcement, DecoderError> {
+pub fn parse_announcement(rlp: Rlp) -> Result<Announcement, DecoderError> {
 	let mut last_key = None;

 	let mut announcement = Announcement {
@@ -320,7 +320,7 @@ pub fn parse_announcement(rlp: &Rlp) -> Result<Announcement, DecoderError> {

 	let mut parser = Parser {
 		pos: 4,
-		rlp,
+		rlp: rlp,
 	};

 	while let Some((key, item)) = parser.get_next()? {
@@ -404,7 +404,7 @@ mod tests {
 		let handshake = write_handshake(&status, &capabilities, Some(&flow_params));

 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(&Rlp::new(&handshake)).unwrap();
+			= parse_handshake(Rlp::new(&handshake)).unwrap();

 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
@@ -439,7 +439,7 @@ mod tests {
 		let handshake = write_handshake(&status, &capabilities, Some(&flow_params));

 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(&Rlp::new(&handshake)).unwrap();
+			= parse_handshake(Rlp::new(&handshake)).unwrap();

 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
@@ -489,7 +489,7 @@ mod tests {
 		};

 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(&Rlp::new(&interleaved)).unwrap();
+			= parse_handshake(Rlp::new(&interleaved)).unwrap();

 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
@@ -510,7 +510,7 @@ mod tests {
 		};

 		let serialized = write_announcement(&announcement);
-		let read = parse_announcement(&Rlp::new(&serialized)).unwrap();
+		let read = parse_announcement(Rlp::new(&serialized)).unwrap();

 		assert_eq!(read, announcement);
 	}
@@ -522,26 +522,26 @@ mod tests {
 		let mut stream = RlpStream::new_list(6);
 		stream
 			.append(&H256::zero())
-			.append(&10_u64)
-			.append(&100_000_u64)
-			.append(&2_u64)
-			.append_raw(&encode_pair(Key::ServeStateSince, &44_u64), 1)
+			.append(&10u64)
+			.append(&100_000u64)
+			.append(&2u64)
+			.append_raw(&encode_pair(Key::ServeStateSince, &44u64), 1)
 			.append_raw(&encode_flag(Key::ServeHeaders), 1);

 		let out = stream.drain();
-		assert!(parse_announcement(&Rlp::new(&out)).is_err());
+		assert!(parse_announcement(Rlp::new(&out)).is_err());

 		let mut stream = RlpStream::new_list(6);
 		stream
 			.append(&H256::zero())
-			.append(&10_u64)
-			.append(&100_000_u64)
-			.append(&2_u64)
+			.append(&10u64)
+			.append(&100_000u64)
+			.append(&2u64)
 			.append_raw(&encode_flag(Key::ServeHeaders), 1)
-			.append_raw(&encode_pair(Key::ServeStateSince, &44_u64), 1);
+			.append_raw(&encode_pair(Key::ServeStateSince, &44u64), 1);

 		let out = stream.drain();
-		assert!(parse_announcement(&Rlp::new(&out)).is_ok());
+		assert!(parse_announcement(Rlp::new(&out)).is_ok());
 	}

 	#[test]
@@ -566,7 +566,7 @@ mod tests {
 		let handshake = write_handshake(&status, &capabilities, None);

 		let (read_status, read_capabilities, read_flow)
-			= parse_handshake(&Rlp::new(&handshake)).unwrap();
+			= parse_handshake(Rlp::new(&handshake)).unwrap();

 		assert_eq!(read_status, status);
 		assert_eq!(read_capabilities, capabilities);
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -87,10 +87,6 @@ impl IoContext for Expect {
 	fn persistent_peer_id(&self, _peer: PeerId) -> Option<NodeId> {
 		None
 	}
-
-	fn is_reserved_peer(&self, peer: PeerId) -> bool {
-		peer == 0xff
-	}
 }

 // can't implement directly for Arc due to cross-crate orphan rules.
@@ -194,10 +190,6 @@ fn write_handshake(status: &Status, capabilities: &Capabilities, proto: &LightPr
 	::net::status::write_handshake(status, capabilities, Some(&*flow_params))
 }

-fn write_free_handshake(status: &Status, capabilities: &Capabilities, proto: &LightProtocol) -> Vec<u8> {
-	::net::status::write_handshake(status, capabilities, Some(&proto.free_flow_params))
-}
-
 // helper for setting up the protocol handler and provider.
 fn setup(capabilities: Capabilities) -> (Arc<TestProviderInner>, LightProtocol) {
 	let provider = Arc::new(TestProviderInner {
@@ -236,20 +228,7 @@ fn handshake_expected() {

 	let packet_body = write_handshake(&status, &capabilities, &proto);

-	proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
-}
-
-#[test]
-fn reserved_handshake_expected() {
-	let capabilities = capabilities();
-
-	let (provider, proto) = setup(capabilities);
-
-	let status = status(provider.client.chain_info());
-
-	let packet_body = write_free_handshake(&status, &capabilities, &proto);
-
-	proto.on_connect(0xff, &Expect::Send(0xff, packet::STATUS, packet_body));
+	proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 }

 #[test]
@@ -264,7 +243,7 @@ fn genesis_mismatch() {

 	let packet_body = write_handshake(&status, &capabilities, &proto);

-	proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
+	proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 }

 #[test]
@@ -277,12 +256,12 @@ fn credit_overflow() {

 	{
 		let packet_body = write_handshake(&status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
 	}

 	{
 		let my_status = write_handshake(&status, &capabilities, &proto);
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}

 	// 1 billion requests is far too many for the default flow params.
@@ -294,7 +273,7 @@ fn credit_overflow() {
 	}));
 	let request = make_packet(111, &requests);

-	proto.handle_packet(&Expect::Punish(1), 1, packet::REQUEST, &request);
+	proto.handle_packet(&Expect::Punish(1), &1, packet::REQUEST, &request);
 }

 // test the basic request types -- these just make sure that requests are parsed
@@ -316,8 +295,8 @@ fn get_block_headers() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}

 	let request = Request::Headers(IncompleteHeadersRequest {
@@ -338,7 +317,9 @@ fn get_block_headers() {

 		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();

-		let response = vec![Response::Headers(HeadersResponse { headers })];
+		let response = vec![Response::Headers(HeadersResponse {
+			headers: headers,
+		})];

 		let mut stream = RlpStream::new_list(3);
 		stream.append(&req_id).append(&new_creds).append_list(&response);
@@ -347,7 +328,7 @@ fn get_block_headers() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -366,8 +347,8 @@ fn get_block_bodies() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}

 	let mut builder = Builder::default();
@@ -395,7 +376,7 @@ fn get_block_bodies() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -414,8 +395,8 @@ fn get_block_receipts() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &my_status);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &my_status);
 	}

 	// find the first 10 block hashes starting with `f` because receipts are only provided
@@ -450,7 +431,7 @@ fn get_block_receipts() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -466,8 +447,8 @@ fn get_state_proofs() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}

 	let req_id = 112;
@@ -509,7 +490,7 @@ fn get_state_proofs() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -523,8 +504,8 @@ fn get_contract_code() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}

 	let req_id = 112;
@@ -552,7 +533,7 @@ fn get_contract_code() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -566,8 +547,8 @@ fn epoch_signal() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}

 	let req_id = 112;
@@ -595,7 +576,7 @@ fn epoch_signal() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -609,8 +590,8 @@ fn proof_of_execution() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}

 	let req_id = 112;
@@ -641,7 +622,7 @@ fn proof_of_execution() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);

 	// next: way too much requested gas.
 	if let Request::Execution(ref mut req) = request {
@@ -652,7 +633,7 @@ fn proof_of_execution() {
 	let request_body = make_packet(req_id, &requests);

 	let expected = Expect::Punish(1);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }

 #[test]
@@ -701,33 +682,33 @@ fn id_guard() {
 	{
 		let mut stream = RlpStream::new_list(3);
 		stream.append(&req_id_1.0);
-		stream.append(&4_000_000_usize);
-		stream.begin_list(2).append(&125_usize).append(&3_usize);
+		stream.append(&4_000_000usize);
+		stream.begin_list(2).append(&125usize).append(&3usize);

 		let packet = stream.out();
-		assert!(proto.response(peer_id, &Expect::Nothing, &Rlp::new(&packet)).is_err());
+		assert!(proto.response(&peer_id, &Expect::Nothing, Rlp::new(&packet)).is_err());
 	}

 	// next, do an unexpected response.
 	{
 		let mut stream = RlpStream::new_list(3);
-		stream.append(&10000_usize);
-		stream.append(&3_000_000_usize);
+		stream.append(&10000usize);
+		stream.append(&3_000_000usize);
 		stream.begin_list(0);

 		let packet = stream.out();
-		assert!(proto.response(peer_id, &Expect::Nothing, &Rlp::new(&packet)).is_err());
+		assert!(proto.response(&peer_id, &Expect::Nothing, Rlp::new(&packet)).is_err());
 	}

 	// lastly, do a valid (but empty) response.
 	{
 		let mut stream = RlpStream::new_list(3);
 		stream.append(&req_id_2.0);
-		stream.append(&3_000_000_usize);
+		stream.append(&3_000_000usize);
 		stream.begin_list(0);

 		let packet = stream.out();
-		assert!(proto.response(peer_id, &Expect::Nothing, &Rlp::new(&packet)).is_ok());
+		assert!(proto.response(&peer_id, &Expect::Nothing, Rlp::new(&packet)).is_ok());
 	}

 	let peers = proto.peers.read();
@@ -749,8 +730,8 @@ fn get_transaction_index() {

 	{
 		let packet_body = write_handshake(&cur_status, &capabilities, &proto);
-		proto.on_connect(1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
-		proto.handle_packet(&Expect::Nothing, 1, packet::STATUS, &packet_body);
+		proto.on_connect(&1, &Expect::Send(1, packet::STATUS, packet_body.clone()));
+		proto.handle_packet(&Expect::Nothing, &1, packet::STATUS, &packet_body);
 	}

 	let req_id = 112;
@@ -778,5 +759,5 @@ fn get_transaction_index() {
 	};

 	let expected = Expect::Respond(packet::RESPONSE, response);
-	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
+	proto.handle_packet(&expected, &1, packet::REQUEST, &request_body);
 }
--- a/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -19,18 +19,17 @@
 //! will take the raw data received here and extract meaningful results from it.

 use std::cmp;
-use std::collections::{HashMap, BTreeSet};
+use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::sync::Arc;

 use ethcore::executed::{Executed, ExecutionError};

-use futures::{Poll, Future, Async};
-use futures::sync::oneshot::{self, Receiver};
+use futures::{Poll, Future};
+use futures::sync::oneshot::{self, Receiver, Canceled};
 use network::PeerId;
 use parking_lot::{RwLock, Mutex};
 use rand;
-use std::time::{Duration, SystemTime};

 use net::{
 	self, Handler, PeerStatus, Status, Capabilities,
@@ -50,45 +49,7 @@ pub mod request;
 /// The result of execution
 pub type ExecutionResult = Result<Executed, ExecutionError>;

-/// The default number of retries for OnDemand queries to send to the other nodes
-pub const DEFAULT_RETRY_COUNT: usize = 10;
-
-/// The default time limit in milliseconds for inactive (no new peer to connect to) OnDemand queries (0 for unlimited)
-pub const DEFAULT_QUERY_TIME_LIMIT: Duration = Duration::from_millis(10000);
-
-const NULL_DURATION: Duration = Duration::from_secs(0);
-
-/// OnDemand related errors
-pub mod error {
-	use futures::sync::oneshot::Canceled;
-
-	error_chain! {
-
-		foreign_links {
-			ChannelCanceled(Canceled) #[doc = "Canceled oneshot channel"];
-		}
-
-		errors {
-			#[doc = "Max number of on-demand query attempts reached without result."]
-			MaxAttemptReach(query_index: usize) {
-				description("On-demand query limit reached")
-				display("On-demand query limit reached on query #{}", query_index)
-			}
-
-			#[doc = "No reply with current peer set, time out occured while waiting for new peers for additional query attempt."]
-			TimeoutOnNewPeers(query_index: usize, remaining_attempts: usize) {
-				description("Timeout for On-demand query")
-				display("Timeout for On-demand query; {} query attempts remain for query #{}", remaining_attempts, query_index)
-			}
-
-		}
-
-	}
-
-}
-
 // relevant peer info.
-#[derive(Debug, Clone, PartialEq, Eq)]
 struct Peer {
 	status: Status,
 	capabilities: Capabilities,
@@ -108,26 +69,18 @@ impl Peer {
 		};

 		local_caps.serve_headers >= request.serve_headers &&
-			can_serve_since(request.serve_chain_since, local_caps.serve_chain_since) &&
-			can_serve_since(request.serve_state_since, local_caps.serve_state_since)
+		    can_serve_since(request.serve_chain_since, local_caps.serve_chain_since) &&
+		    can_serve_since(request.serve_state_since, local_caps.serve_state_since)
 	}
 }

-
-/// Either an array of responses or a single error.
-type PendingResponse = self::error::Result<Vec<Response>>;
-
 // Attempted request info and sender to put received value.
 struct Pending {
 	requests: basic_request::Batch<CheckedRequest>,
 	net_requests: basic_request::Batch<NetworkRequest>,
 	required_capabilities: Capabilities,
 	responses: Vec<Response>,
-	sender: oneshot::Sender<PendingResponse>,
-	base_query_index: usize,
-	remaining_query_count: usize,
-	query_id_history: BTreeSet<PeerId>,
-	inactive_time_limit: Option<SystemTime>,
+	sender: oneshot::Sender<Vec<Response>>,
 }

 impl Pending {
@@ -158,16 +111,19 @@ impl Pending {
 	// verification.
 	// `idx` is the index of the request the response corresponds to.
 	fn update_header_refs(&mut self, idx: usize, response: &Response) {
-		if let Response::HeaderByHash(ref hdr) = *response {
+		match *response {
+			Response::HeaderByHash(ref hdr) => {
 				// fill the header for all requests waiting on this one.
 				// TODO: could be faster if we stored a map usize => Vec<usize>
 				// but typical use just has one header request that others
 				// depend on.
-			for r in self.requests.iter_mut().skip(idx + 1) {
-				if r.needs_header().map_or(false, |(i, _)| i == idx) {
-					r.provide_header(hdr.clone())
+				for r in self.requests.iter_mut().skip(idx + 1) {
+					if r.needs_header().map_or(false, |(i, _)| i == idx) {
+						r.provide_header(hdr.clone())
+					}
 				}
 			}
+			_ => {}, // no other responses produce headers.
 		}
 	}

@@ -189,9 +145,7 @@ impl Pending {
 	// if the requests are complete, send the result and consume self.
 	fn try_complete(self) -> Option<Self> {
 		if self.requests.is_complete() {
-			if self.sender.send(Ok(self.responses)).is_err() {
-				debug!(target: "on_demand", "Dropped oneshot channel receiver on complete request at query #{}", self.query_id_history.len());
-			}
+			let _ = self.sender.send(self.responses);
 			None
 		} else {
 			Some(self)
@@ -226,25 +180,6 @@ impl Pending {
 		self.net_requests = builder.build();
 		self.required_capabilities = capabilities;
 	}
-
-	// returning no reponse, it will result in an error.
-	// self is consumed on purpose.
-	fn no_response(self) {
-		trace!(target: "on_demand", "Dropping a pending query (no reply) at query #{}", self.query_id_history.len());
-		let err = self::error::ErrorKind::MaxAttemptReach(self.requests.num_answered());
-		if self.sender.send(Err(err.into())).is_err() {
-			debug!(target: "on_demand", "Dropped oneshot channel receiver on no response");
-		}
-	}
-
-	// returning a peer discovery timeout during query attempts
-	fn time_out(self) {
-		trace!(target: "on_demand", "Dropping a pending query (no new peer time out) at query #{}", self.query_id_history.len());
-		let err = self::error::ErrorKind::TimeoutOnNewPeers(self.requests.num_answered(), self.query_id_history.len());
-		if self.sender.send(Err(err.into())).is_err() {
-			debug!(target: "on_demand", "Dropped oneshot channel receiver on time out");
-		}
-	}
 }

 // helper to guess capabilities required for a given batch of network requests.
@@ -269,8 +204,6 @@ fn guess_capabilities(requests: &[CheckedRequest]) -> Capabilities {
 				caps.serve_headers = true,
 			CheckedRequest::HeaderByHash(_, _) =>
 				caps.serve_headers = true,
-			CheckedRequest::HeaderWithAncestors(_, _) =>
-				caps.serve_headers = true,
 			CheckedRequest::TransactionIndex(_, _) => {} // hashes yield no info.
 			CheckedRequest::Signal(_, _) =>
 				caps.serve_headers = true,
@@ -298,21 +231,16 @@ fn guess_capabilities(requests: &[CheckedRequest]) -> Capabilities {
 /// A future extracting the concrete output type of the generic adapter
 /// from a vector of responses.
 pub struct OnResponses<T: request::RequestAdapter> {
-	receiver: Receiver<PendingResponse>,
+	receiver: Receiver<Vec<Response>>,
 	_marker: PhantomData<T>,
 }

 impl<T: request::RequestAdapter> Future for OnResponses<T> {
 	type Item = T::Out;
-	type Error = self::error::Error;
+	type Error = Canceled;

 	fn poll(&mut self) -> Poll<Self::Item, Self::Error> {
-		match self.receiver.poll() {
-			Ok(Async::Ready(Ok(v))) => Ok(Async::Ready(T::extract_from(v))),
-			Ok(Async::Ready(Err(e))) => Err(e),
-			Ok(Async::NotReady) => Ok(Async::NotReady),
-			Err(e) => Err(e.into()),
-		}
+		self.receiver.poll().map(|async| async.map(T::extract_from))
 	}
 }

@@ -326,22 +254,17 @@ pub struct OnDemand {
 	in_transit: RwLock<HashMap<ReqId, Pending>>,
 	cache: Arc<Mutex<Cache>>,
 	no_immediate_dispatch: bool,
-	base_retry_count: usize,
-	query_inactive_time_limit: Option<Duration>,
 }

 impl OnDemand {
-
 	/// Create a new `OnDemand` service with the given cache.
 	pub fn new(cache: Arc<Mutex<Cache>>) -> Self {
 		OnDemand {
 			pending: RwLock::new(Vec::new()),
 			peers: RwLock::new(HashMap::new()),
 			in_transit: RwLock::new(HashMap::new()),
-			cache,
+			cache: cache,
 			no_immediate_dispatch: false,
-			base_retry_count: DEFAULT_RETRY_COUNT,
-			query_inactive_time_limit: Some(DEFAULT_QUERY_TIME_LIMIT),
 		}
 	}

@@ -360,11 +283,11 @@ impl OnDemand {
 	/// Fails if back-references are not coherent.
 	/// The returned vector of responses will correspond to the requests exactly.
 	pub fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
-		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>
+		-> Result<Receiver<Vec<Response>>, basic_request::NoSuchOutput>
 	{
 		let (sender, receiver) = oneshot::channel();
 		if requests.is_empty() {
-			assert!(sender.send(Ok(Vec::new())).is_ok(), "receiver still in scope; qed");
+			assert!(sender.send(Vec::new()).is_ok(), "receiver still in scope; qed");
 			return Ok(receiver);
 		}

@@ -387,7 +310,7 @@ impl OnDemand {
 				}
 			}
 			if let CheckedRequest::HeaderByHash(ref req, _) = request {
-				header_producers.insert(i, req.0);
+				header_producers.insert(i, req.0.clone());
 			}

 			builder.push(request)?;
@@ -398,15 +321,11 @@ impl OnDemand {
 		let capabilities = guess_capabilities(requests.requests());

 		self.submit_pending(ctx, Pending {
-			requests,
-			net_requests,
+			requests: requests,
+			net_requests: net_requests,
 			required_capabilities: capabilities,
-			responses,
-			sender,
-			base_query_index: 0,
-			remaining_query_count: 0,
-			query_id_history: BTreeSet::new(),
-			inactive_time_limit: None,
+			responses: responses,
+			sender: sender,
 		});

 		Ok(receiver)
@@ -445,68 +364,30 @@ impl OnDemand {
 		let peers = self.peers.read();
 		*pending = ::std::mem::replace(&mut *pending, Vec::new()).into_iter()
 			.filter(|pending| !pending.sender.is_canceled())
-			.filter_map(|mut pending| {
+			.filter_map(|pending| {
 				// the peer we dispatch to is chosen randomly
 				let num_peers = peers.len();
-				let history_len = pending.query_id_history.len();
-				let offset = if history_len == 0 {
-					pending.remaining_query_count = self.base_retry_count;
-					let rand = rand::random::<usize>();
-					pending.base_query_index = rand;
-					rand
-				} else {
-					pending.base_query_index + history_len
-				} % cmp::max(num_peers, 1);
-				let init_remaining_query_count = pending.remaining_query_count; // to fail in case of big reduction of nb of peers
-				for (peer_id, peer) in peers.iter().chain(peers.iter())
-					.skip(offset).take(num_peers) {
+				let rng = rand::random::<usize>() % cmp::max(num_peers, 1);
+				for (peer_id, peer) in peers.iter().chain(peers.iter()).skip(rng).take(num_peers) {
 					// TODO: see which requests can be answered by the cache?
-					if pending.remaining_query_count == 0 {
-						break
+
+					if !peer.can_fulfill(&pending.required_capabilities) {
+						continue
 					}

-					if pending.query_id_history.insert(peer_id.clone()) {
-
-						if !peer.can_fulfill(&pending.required_capabilities) {
-							trace!(target: "on_demand", "Peer {} without required capabilities, skipping, {} remaining attempts", peer_id, pending.remaining_query_count);
-							continue
-						}
-
-						pending.remaining_query_count -= 1;
-						pending.inactive_time_limit = None;
-
-						match ctx.request_from(*peer_id, pending.net_requests.clone()) {
-							Ok(req_id) => {
-								trace!(target: "on_demand", "Dispatched request {} to peer {}, {} remaining attempts", req_id, peer_id, pending.remaining_query_count);
-								self.in_transit.write().insert(req_id, pending);
-								return None
-							}
-							Err(net::Error::NoCredits) | Err(net::Error::NotServer) => {}
-							Err(e) => debug!(target: "on_demand", "Error dispatching request to peer: {}", e),
+					match ctx.request_from(*peer_id, pending.net_requests.clone()) {
+						Ok(req_id) => {
+							trace!(target: "on_demand", "Dispatched request {} to peer {}", req_id, peer_id);
+							self.in_transit.write().insert(req_id, pending);
+							return None
 						}
+						Err(net::Error::NoCredits) | Err(net::Error::NotServer) => {}
+						Err(e) => debug!(target: "on_demand", "Error dispatching request to peer: {}", e),
 					}
 				}

-				if pending.remaining_query_count == 0	{
-					pending.no_response();
-					None
-				} else if init_remaining_query_count == pending.remaining_query_count {
-					if let Some(query_inactive_time_limit) = self.query_inactive_time_limit {
-						let now = SystemTime::now();
-						if let Some(inactive_time_limit) = pending.inactive_time_limit {
-							if now > inactive_time_limit {
-								pending.time_out();
-								return None
-							}
-						} else {
-							debug!(target: "on_demand", "No more peers to query, waiting for {} seconds until dropping query", query_inactive_time_limit.as_secs());
-							pending.inactive_time_limit = Some(now + query_inactive_time_limit);
-						}
-					}
-					Some(pending)
-				} else {
-					Some(pending)
-				}
+				// TODO: maximum number of failures _when we have peers_.
+				Some(pending)
 			})
 			.collect(); // `pending` now contains all requests we couldn't dispatch.

@@ -526,21 +407,6 @@ impl OnDemand {
 			self.attempt_dispatch(ctx);
 		}
 	}
-
-	/// Set the retry count for a query.
-	pub fn default_retry_number(&mut self, nb_retry: usize) {
-		self.base_retry_count = nb_retry;
-	}
-
-	/// Set the time limit for a query.
-	pub fn query_inactive_time_limit(&mut self, inactive_time_limit: Duration) {
-		self.query_inactive_time_limit = if inactive_time_limit == NULL_DURATION {
-			None
-		} else {
-			Some(inactive_time_limit)
-		};
-	}
-
 }

 impl Handler for OnDemand {
@@ -593,16 +459,6 @@ impl Handler for OnDemand {
 			None => return,
 		};

-		if responses.is_empty() {
-			if pending.remaining_query_count == 0 {
-				pending.no_response();
-				return;
-			}
-		} else {
-			// do not keep query counter for others elements of this batch
-			pending.query_id_history.clear();
-		}
-
 		// for each incoming response
 		//   1. ensure verification data filled.
 		//   2. pending.requests.supply_response
--- a/ethcore/light/src/on_demand/request.rs
+++ b/ethcore/light/src/on_demand/request.rs
@@ -16,7 +16,6 @@

 //! Request types, verification, and verification errors.

-use std::cmp;
 use std::sync::Arc;

 use bytes::Bytes;
@@ -48,8 +47,6 @@ pub enum Request {
 	HeaderProof(HeaderProof),
 	/// A request for a header by hash.
 	HeaderByHash(HeaderByHash),
-	/// A request for a header by hash with a range of its ancestors.
-	HeaderWithAncestors(HeaderWithAncestors),
 	/// A request for the index of a transaction.
 	TransactionIndex(TransactionIndex),
 	/// A request for block receipts.
@@ -139,7 +136,6 @@ macro_rules! impl_single {
 // implement traits for each kind of request.
 impl_single!(HeaderProof, HeaderProof, (H256, U256));
 impl_single!(HeaderByHash, HeaderByHash, encoded::Header);
-impl_single!(HeaderWithAncestors, HeaderWithAncestors, Vec<encoded::Header>);
 impl_single!(TransactionIndex, TransactionIndex, net_request::TransactionIndexResponse);
 impl_single!(Receipts, BlockReceipts, Vec<Receipt>);
 impl_single!(Body, Body, encoded::Block);
@@ -224,7 +220,7 @@ impl HeaderRef {
 	fn field(&self) -> Field<H256> {
 		match *self {
 			HeaderRef::Stored(ref hdr) => Field::Scalar(hdr.hash()),
-			HeaderRef::Unresolved(_, field) => field,
+			HeaderRef::Unresolved(_, ref field) => field.clone(),
 		}
 	}

@@ -232,7 +228,7 @@ impl HeaderRef {
 	fn needs_header(&self) -> Option<(usize, Field<H256>)> {
 		match *self {
 			HeaderRef::Stored(_) => None,
-			HeaderRef::Unresolved(idx, field) => Some((idx, field)),
+			HeaderRef::Unresolved(idx, ref field) => Some((idx, field.clone())),
 		}
 	}
 }
@@ -250,7 +246,6 @@ impl From<encoded::Header> for HeaderRef {
 pub enum CheckedRequest {
 	HeaderProof(HeaderProof, net_request::IncompleteHeaderProofRequest),
 	HeaderByHash(HeaderByHash, net_request::IncompleteHeadersRequest),
-	HeaderWithAncestors(HeaderWithAncestors, net_request::IncompleteHeadersRequest),
 	TransactionIndex(TransactionIndex, net_request::IncompleteTransactionIndexRequest),
 	Receipts(BlockReceipts, net_request::IncompleteReceiptsRequest),
 	Body(Body, net_request::IncompleteBodyRequest),
@@ -273,16 +268,6 @@ impl From<Request> for CheckedRequest {
 				trace!(target: "on_demand", "HeaderByHash Request, {:?}", net_req);
 				CheckedRequest::HeaderByHash(req, net_req)
 			}
-			Request::HeaderWithAncestors(req) => {
-				let net_req = net_request::IncompleteHeadersRequest {
-					start: req.block_hash.map(Into::into),
-					skip: 0,
-					max: req.ancestor_count + 1,
-					reverse: true,
-				};
-				trace!(target: "on_demand", "HeaderWithAncestors Request, {:?}", net_req);
-				CheckedRequest::HeaderWithAncestors(req, net_req)
-			}
 			Request::HeaderProof(req) => {
 				let net_req = net_request::IncompleteHeaderProofRequest {
 					num: req.num().into(),
@@ -292,7 +277,7 @@ impl From<Request> for CheckedRequest {
 			}
 			Request::TransactionIndex(req) => {
 				let net_req = net_request::IncompleteTransactionIndexRequest {
-					hash: req.0,
+					hash: req.0.clone(),
 				};
 				trace!(target: "on_demand", "TransactionIndex Request, {:?}", net_req);
 				CheckedRequest::TransactionIndex(req, net_req)
@@ -322,7 +307,7 @@ impl From<Request> for CheckedRequest {
 			Request::Code(req) => {
 				let net_req = net_request::IncompleteCodeRequest {
 					block_hash: req.header.field(),
-					code_hash: req.code_hash,
+					code_hash: req.code_hash.into(),
 				};
 				trace!(target: "on_demand", "Code Request, {:?}", net_req);
 				CheckedRequest::Code(req, net_req)
@@ -359,7 +344,6 @@ impl CheckedRequest {
 		match self {
 			CheckedRequest::HeaderProof(_, req) => NetRequest::HeaderProof(req),
 			CheckedRequest::HeaderByHash(_, req) => NetRequest::Headers(req),
-			CheckedRequest::HeaderWithAncestors(_, req) => NetRequest::Headers(req),
 			CheckedRequest::TransactionIndex(_, req) => NetRequest::TransactionIndex(req),
 			CheckedRequest::Receipts(_, req) => NetRequest::Receipts(req),
 			CheckedRequest::Body(_, req) => NetRequest::Body(req),
@@ -404,7 +388,7 @@ impl CheckedRequest {
 		match *self {
 			CheckedRequest::HeaderProof(ref check, _) => {
 				let mut cache = cache.lock();
-				cache.block_hash(check.num)
+				cache.block_hash(&check.num)
 					.and_then(|h| cache.chain_score(&h).map(|s| (h, s)))
 					.map(|(h, s)| Response::HeaderProof((h, s)))
 			}
@@ -415,27 +399,6 @@ impl CheckedRequest {

 				None
 			}
-			CheckedRequest::HeaderWithAncestors(_, ref req) => {
-				if req.skip != 1 || !req.reverse {
-					return None;
-				}
-
-				if let Some(&net_request::HashOrNumber::Hash(start)) = req.start.as_ref() {
-					let mut result = Vec::with_capacity(req.max as usize);
-					let mut hash = start;
-					let mut cache = cache.lock();
-					for _ in 0..req.max {
-						match cache.block_header(&hash) {
-							Some(header) => {
-								hash = header.parent_hash();
-								result.push(header);
-							}
-							None => return None,
-						}
-					}
-					Some(Response::HeaderWithAncestors(result))
-				} else { None }
-			}
 			CheckedRequest::Receipts(ref check, ref req) => {
 				// empty transactions -> no receipts
 				if check.0.as_ref().ok().map_or(false, |hdr| hdr.receipts_root() == KECCAK_NULL_RLP) {
@@ -448,7 +411,7 @@ impl CheckedRequest {
 			}
 			CheckedRequest::Body(ref check, ref req) => {
 				// check for empty body.
-				if let Ok(hdr) = check.0.as_ref() {
+				if let Some(hdr) = check.0.as_ref().ok() {
 					if hdr.transactions_root() == KECCAK_NULL_RLP && hdr.uncles_hash() == KECCAK_EMPTY_LIST_RLP {
 						let mut stream = RlpStream::new_list(3);
 						stream.append_raw(hdr.rlp().as_raw(), 1);
@@ -504,7 +467,6 @@ macro_rules! match_me {
 		match $me {
 			CheckedRequest::HeaderProof($check, $req) => $e,
 			CheckedRequest::HeaderByHash($check, $req) => $e,
-			CheckedRequest::HeaderWithAncestors($check, $req) => $e,
 			CheckedRequest::TransactionIndex($check, $req) => $e,
 			CheckedRequest::Receipts($check, $req) => $e,
 			CheckedRequest::Body($check, $req) => $e,
@@ -534,15 +496,6 @@ impl IncompleteRequest for CheckedRequest {
 					_ => Ok(()),
 				}
 			}
-			CheckedRequest::HeaderWithAncestors(ref check, ref req) => {
-				req.check_outputs(&mut f)?;
-
-				// make sure the output given is definitively a hash.
-				match check.block_hash {
-					Field::BackReference(r, idx) => f(r, idx, OutputKind::Hash),
-					_ => Ok(()),
-				}
-			}
 			CheckedRequest::TransactionIndex(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Receipts(_, ref req) => req.check_outputs(f),
 			CheckedRequest::Body(_, ref req) => req.check_outputs(f),
@@ -571,10 +524,6 @@ impl IncompleteRequest for CheckedRequest {
 				trace!(target: "on_demand", "HeaderByHash request completed {:?}", req);
 				req.complete().map(CompleteRequest::Headers)
 			}
-			CheckedRequest::HeaderWithAncestors(_, req) => {
-				trace!(target: "on_demand", "HeaderWithAncestors request completed {:?}", req);
-				req.complete().map(CompleteRequest::Headers)
-			}
 			CheckedRequest::TransactionIndex(_, req) => {
 				trace!(target: "on_demand", "TransactionIndex request completed {:?}", req);
 				req.complete().map(CompleteRequest::TransactionIndex)
@@ -638,9 +587,6 @@ impl net_request::CheckedRequest for CheckedRequest {
 			CheckedRequest::HeaderByHash(ref prover, _) =>
 				expect!((&NetResponse::Headers(ref res), &CompleteRequest::Headers(ref req)) =>
 					prover.check_response(cache, &req.start, &res.headers).map(Response::HeaderByHash)),
-			CheckedRequest::HeaderWithAncestors(ref prover, _) =>
-				expect!((&NetResponse::Headers(ref res), &CompleteRequest::Headers(ref req)) =>
-					prover.check_response(cache, &req.start, &res.headers).map(Response::HeaderWithAncestors)),
 			CheckedRequest::TransactionIndex(ref prover, _) =>
 				expect!((&NetResponse::TransactionIndex(ref res), _) =>
 					prover.check_response(cache, res).map(Response::TransactionIndex)),
@@ -674,8 +620,6 @@ pub enum Response {
 	HeaderProof((H256, U256)),
 	/// Response to a header-by-hash request.
 	HeaderByHash(encoded::Header),
-	/// Response to a header-by-hash with ancestors request.
-	HeaderWithAncestors(Vec<encoded::Header>),
 	/// Response to a transaction-index request.
 	TransactionIndex(net_request::TransactionIndexResponse),
 	/// Response to a receipts request.
@@ -717,10 +661,6 @@ pub enum Error {
 	Decoder(::rlp::DecoderError),
 	/// Empty response.
 	Empty,
-	/// Response data length exceeds request max.
-	TooManyResults(u64, u64),
-	/// Response data is incomplete.
-	TooFewResults(u64, u64),
 	/// Trie lookup error (result of bad proof)
 	Trie(TrieError),
 	/// Bad inclusion proof
@@ -737,8 +677,6 @@ pub enum Error {
 	WrongTrieRoot(H256, H256),
 	/// Wrong response kind.
 	WrongKind,
-	/// Wrong sequence of headers.
-	WrongHeaderSequence,
 }

 impl From<::rlp::DecoderError> for Error {
@@ -769,9 +707,9 @@ impl HeaderProof {
 	/// Provide the expected CHT root to compare against.
 	pub fn new(num: u64, cht_root: H256) -> Option<Self> {
 		::cht::block_to_cht_number(num).map(|cht_num| HeaderProof {
-			num,
-			cht_num,
-			cht_root,
+			num: num,
+			cht_num: cht_num,
+			cht_root: cht_root,
 		})
 	}

@@ -799,65 +737,6 @@ impl HeaderProof {
 	}
 }

-/// Request for a header by hash with a range of ancestors.
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct HeaderWithAncestors {
-	/// Hash of the last block in the range to fetch.
-	pub block_hash: Field<H256>,
-	/// Number of headers before the last block to fetch in addition.
-	pub ancestor_count: u64,
-}
-
-impl HeaderWithAncestors {
-	/// Check a response for the headers.
-	pub fn check_response(
-		&self,
-		cache: &Mutex<::cache::Cache>,
-		start: &net_request::HashOrNumber,
-		headers: &[encoded::Header]
-	) -> Result<Vec<encoded::Header>, Error> {
-		let expected_hash = match (self.block_hash, start) {
-			(Field::Scalar(h), &net_request::HashOrNumber::Hash(h2)) => {
-				if h != h2 { return Err(Error::WrongHash(h, h2)) }
-				h
-			}
-			(_, &net_request::HashOrNumber::Hash(h2)) => h2,
-			_ => return Err(Error::HeaderByNumber),
-		};
-
-		let start_header = headers.first().ok_or(Error::Empty)?;
-		let start_hash = start_header.hash();
-		if start_hash != expected_hash {
-			return Err(Error::WrongHash(expected_hash, start_hash));
-		}
-
-		let expected_len = 1 + cmp::min(self.ancestor_count, start_header.number());
-		let actual_len = headers.len() as u64;
-		match actual_len.cmp(&expected_len) {
-			cmp::Ordering::Less =>
-				return Err(Error::TooFewResults(expected_len, actual_len)),
-			cmp::Ordering::Greater =>
-				return Err(Error::TooManyResults(expected_len, actual_len)),
-			cmp::Ordering::Equal => (),
-		};
-
-		for (header, prev_header) in headers.iter().zip(headers[1..].iter()) {
-			if header.number() != prev_header.number() + 1 ||
-				header.parent_hash() != prev_header.hash()
-			{
-				return Err(Error::WrongHeaderSequence)
-			}
-		}
-
-		let mut cache = cache.lock();
-		for header in headers {
-			cache.insert_block_header(header.hash(), header.clone());
-		}
-
-		Ok(headers.to_vec())
-	}
-}
-
 /// Request for a header by hash.
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct HeaderByHash(pub Field<H256>);
@@ -871,9 +750,9 @@ impl HeaderByHash {
 		headers: &[encoded::Header]
 	) -> Result<encoded::Header, Error> {
 		let expected_hash = match (self.0, start) {
-			(Field::Scalar(h), &net_request::HashOrNumber::Hash(h2)) => {
-				if h != h2 { return Err(Error::WrongHash(h, h2)) }
-				h
+			(Field::Scalar(ref h), &net_request::HashOrNumber::Hash(ref h2)) => {
+				if h != h2 { return Err(Error::WrongHash(*h, *h2)) }
+				*h
 			}
 			(_, &net_request::HashOrNumber::Hash(h2)) => h2,
 			_ => return Err(Error::HeaderByNumber),
@@ -881,11 +760,12 @@ impl HeaderByHash {

 		let header = headers.get(0).ok_or(Error::Empty)?;
 		let hash = header.hash();
-		if hash == expected_hash {
-			cache.lock().insert_block_header(hash, header.clone());
-			Ok(header.clone())
-		} else {
-			Err(Error::WrongHash(expected_hash, hash))
+		match hash == expected_hash {
+			true => {
+				cache.lock().insert_block_header(hash, header.clone());
+				Ok(header.clone())
+			}
+			false => Err(Error::WrongHash(expected_hash, hash)),
 		}
 	}
 }
@@ -956,12 +836,15 @@ impl BlockReceipts {
 		let receipts_root = self.0.as_ref()?.receipts_root();
 		let found_root = ::triehash::ordered_trie_root(receipts.iter().map(|r| ::rlp::encode(r)));

-		if receipts_root == found_root {
-			cache.lock().insert_block_receipts(receipts_root, receipts.to_vec());
-			Ok(receipts.to_vec())
-		} else {
-			trace!(target: "on_demand", "Receipt Reponse: \"WrongTrieRoot\" receipts_root: {:?} found_root: {:?}", receipts_root, found_root);
-			Err(Error::WrongTrieRoot(receipts_root, found_root))
+		match receipts_root == found_root {
+			true => {
+				cache.lock().insert_block_receipts(receipts_root, receipts.to_vec());
+				Ok(receipts.to_vec())
+			}
+			false => {
+				trace!(target: "on_demand", "Receipt Reponse: \"WrongTrieRoot\" receipts_root: {:?} found_root: {:?}", receipts_root, found_root);
+				Err(Error::WrongTrieRoot(receipts_root, found_root))
+			}
 		}
 	}
 }
@@ -1048,7 +931,7 @@ impl TransactionProof {
 		let root = self.header.as_ref()?.state_root();

 		let mut env_info = self.env_info.clone();
-		env_info.gas_limit = self.tx.gas;
+		env_info.gas_limit = self.tx.gas.clone();

 		let proved_execution = state::check_proof(
 			state_items,
@@ -1162,83 +1045,6 @@ mod tests {
 		assert!(HeaderByHash(hash.into()).check_response(&cache, &hash.into(), &[raw_header]).is_ok())
 	}

-	#[test]
-	fn check_header_with_ancestors() {
-		let mut last_header_hash = H256::default();
-		let mut headers = (0..11).map(|num| {
-			let mut header = Header::new();
-			header.set_number(num);
-			header.set_parent_hash(last_header_hash);
-
-			last_header_hash = header.hash();
-			header
-		}).collect::<Vec<_>>();
-
-		headers.reverse();  // because responses are in reverse order
-
-		let raw_headers = headers.iter()
-			.map(|hdr| encoded::Header::new(::rlp::encode(hdr).into_vec()))
-			.collect::<Vec<_>>();
-
-		let mut invalid_successor = Header::new();
-		invalid_successor.set_number(11);
-		invalid_successor.set_parent_hash(headers[1].hash());
-
-		let raw_invalid_successor = encoded::Header::new(::rlp::encode(&invalid_successor).into_vec());
-
-		let cache = Mutex::new(make_cache());
-
-		let header_with_ancestors = |hash, count| {
-			HeaderWithAncestors {
-				block_hash: hash,
-				ancestor_count: count
-			}
-		};
-
-		// Correct responses
-		assert!(header_with_ancestors(headers[0].hash().into(), 0)
-				.check_response(&cache, &headers[0].hash().into(), &raw_headers[0..1]).is_ok());
-		assert!(header_with_ancestors(headers[0].hash().into(), 2)
-				.check_response(&cache, &headers[0].hash().into(), &raw_headers[0..3]).is_ok());
-		assert!(header_with_ancestors(headers[0].hash().into(), 10)
-				.check_response(&cache, &headers[0].hash().into(), &raw_headers[0..11]).is_ok());
-		assert!(header_with_ancestors(headers[2].hash().into(), 2)
-				.check_response(&cache, &headers[2].hash().into(), &raw_headers[2..5]).is_ok());
-		assert!(header_with_ancestors(headers[2].hash().into(), 10)
-				.check_response(&cache, &headers[2].hash().into(), &raw_headers[2..11]).is_ok());
-		assert!(header_with_ancestors(invalid_successor.hash().into(), 0)
-				.check_response(&cache, &invalid_successor.hash().into(), &[raw_invalid_successor.clone()]).is_ok());
-
-		// Incorrect responses
-		assert_eq!(header_with_ancestors(invalid_successor.hash().into(), 0)
-				   .check_response(&cache, &headers[0].hash().into(), &raw_headers[0..1]),
-				   Err(Error::WrongHash(invalid_successor.hash(), headers[0].hash())));
-		assert_eq!(header_with_ancestors(headers[0].hash().into(), 0)
-				   .check_response(&cache, &headers[0].hash().into(), &[]),
-				   Err(Error::Empty));
-		assert_eq!(header_with_ancestors(headers[0].hash().into(), 10)
-				   .check_response(&cache, &headers[0].hash().into(), &raw_headers[0..10]),
-				   Err(Error::TooFewResults(11, 10)));
-		assert_eq!(header_with_ancestors(headers[0].hash().into(), 9)
-				   .check_response(&cache, &headers[0].hash().into(), &raw_headers[0..11]),
-				   Err(Error::TooManyResults(10, 11)));
-
-		let response = &[raw_headers[0].clone(), raw_headers[2].clone()];
-		assert_eq!(header_with_ancestors(headers[0].hash().into(), 1)
-				   .check_response(&cache, &headers[0].hash().into(), response),
-				   Err(Error::WrongHeaderSequence));
-
-		let response = &[raw_invalid_successor.clone(), raw_headers[0].clone()];
-		assert_eq!(header_with_ancestors(invalid_successor.hash().into(), 1)
-				   .check_response(&cache, &invalid_successor.hash().into(), response),
-				   Err(Error::WrongHeaderSequence));
-
-		let response = &[raw_invalid_successor.clone(), raw_headers[1].clone()];
-		assert_eq!(header_with_ancestors(invalid_successor.hash().into(), 1)
-				   .check_response(&cache, &invalid_successor.hash().into(), response),
-				   Err(Error::WrongHeaderSequence));
-	}
-
 	#[test]
 	fn check_body() {
 		use rlp::RlpStream;
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -33,9 +33,6 @@ use transaction_queue::TransactionQueue;

 use request;

-/// Maximum allowed size of a headers request.
-pub const MAX_HEADERS_PER_REQUEST: u64 = 512;
-
 /// Defines the operations that a provider for the light subprotocol must fulfill.
 pub trait Provider: Send + Sync {
 	/// Provide current blockchain info.
@@ -57,6 +54,7 @@ pub trait Provider: Send + Sync {
 	/// results within must adhere to the `skip` and `reverse` parameters.
 	fn block_headers(&self, req: request::CompleteHeadersRequest) -> Option<request::HeadersResponse> {
 		use request::HashOrNumber;
+		const MAX_HEADERS_TO_SEND: u64 = 512;

 		if req.max == 0 { return None }

@@ -85,11 +83,11 @@ pub trait Provider: Send + Sync {
 			}
 		};

-		let max = ::std::cmp::min(MAX_HEADERS_PER_REQUEST, req.max);
+		let max = ::std::cmp::min(MAX_HEADERS_TO_SEND, req.max);

-		let headers: Vec<_> = (0_u64..max)
+		let headers: Vec<_> = (0u64..max)
 			.map(|x: u64| x.saturating_mul(req.skip.saturating_add(1)))
-			.take_while(|&x| if req.reverse { x < start_num } else { best_num.saturating_sub(start_num) >= x })
+			.take_while(|x| if req.reverse { x < &start_num } else { best_num.saturating_sub(start_num) >= *x })
 			.map(|x| if req.reverse { start_num.saturating_sub(x) } else { start_num.saturating_add(x) })
 			.map(|x| self.block_header(BlockId::Number(x)))
 			.take_while(|x| x.is_some())
@@ -99,7 +97,7 @@ pub trait Provider: Send + Sync {
 		if headers.is_empty() {
 			None
 		} else {
-			Some(::request::HeadersResponse { headers })
+			Some(::request::HeadersResponse { headers: headers })
 		}
 	}

@@ -172,18 +170,18 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {

 	fn block_body(&self, req: request::CompleteBodyRequest) -> Option<request::BodyResponse> {
 		BlockChainClient::block_body(self, BlockId::Hash(req.hash))
-			.map(|body| ::request::BodyResponse { body })
+			.map(|body| ::request::BodyResponse { body: body })
 	}

 	fn block_receipts(&self, req: request::CompleteReceiptsRequest) -> Option<request::ReceiptsResponse> {
-		BlockChainClient::encoded_block_receipts(self, &req.hash)
+		BlockChainClient::block_receipts(self, &req.hash)
 			.map(|x| ::request::ReceiptsResponse { receipts: ::rlp::decode_list(&x) })
 	}

 	fn account_proof(&self, req: request::CompleteAccountRequest) -> Option<request::AccountResponse> {
 		self.prove_account(req.address_hash, BlockId::Hash(req.block_hash)).map(|(proof, acc)| {
 			::request::AccountResponse {
-				proof,
+				proof: proof,
 				nonce: acc.nonce,
 				balance: acc.balance,
 				code_hash: acc.code_hash,
@@ -195,7 +193,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn storage_proof(&self, req: request::CompleteStorageRequest) -> Option<request::StorageResponse> {
 		self.prove_storage(req.address_hash, req.key_hash, BlockId::Hash(req.block_hash)).map(|(proof, item) | {
 			::request::StorageResponse {
-				proof,
+				proof: proof,
 				value: item,
 			}
 		})
@@ -203,7 +201,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {

 	fn contract_code(&self, req: request::CompleteCodeRequest) -> Option<request::CodeResponse> {
 		self.state_data(&req.code_hash)
-			.map(|code| ::request::CodeResponse { code })
+			.map(|code| ::request::CodeResponse { code: code })
 	}

 	fn header_proof(&self, req: request::CompleteHeaderProofRequest) -> Option<request::HeaderProofResponse> {
@@ -252,7 +250,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 		// prove our result.
 		match cht.prove(req.num, 0) {
 			Ok(Some(proof)) => Some(::request::HeaderProofResponse {
-				proof,
+				proof: proof,
 				hash: needed_hdr.hash(),
 				td: needed_td,
 			}),
@@ -268,12 +266,12 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 		use transaction::Transaction;

 		let id = BlockId::Hash(req.block_hash);
-		let nonce = match self.nonce(&req.from, id) {
+		let nonce = match self.nonce(&req.from, id.clone()) {
 			Some(nonce) => nonce,
 			None => return None,
 		};
 		let transaction = Transaction {
-			nonce,
+			nonce: nonce,
 			gas: req.gas,
 			gas_price: req.gas_price,
 			action: req.action,
@@ -294,7 +292,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {

 	fn epoch_signal(&self, req: request::CompleteSignalRequest) -> Option<request::SignalResponse> {
 		self.epoch_signal(req.block_hash).map(|signal| request::SignalResponse {
-			signal,
+			signal: signal,
 		})
 	}
 }
@@ -310,8 +308,8 @@ impl<L> LightProvider<L> {
 	/// Create a new `LightProvider` from the given client and transaction queue.
 	pub fn new(client: Arc<L>, txqueue: Arc<RwLock<TransactionQueue>>) -> Self {
 		LightProvider {
-			client,
-			txqueue,
+			client: client,
+			txqueue: txqueue,
 		}
 	}
 }
--- a/ethcore/light/src/transaction_queue.rs
+++ b/ethcore/light/src/transaction_queue.rs
@@ -74,7 +74,7 @@ impl<'a> From<&'a PendingTransaction> for TransactionInfo {
 	fn from(tx: &'a PendingTransaction) -> Self {
 		TransactionInfo {
 			hash: tx.hash(),
-			nonce: tx.nonce,
+			nonce: tx.nonce.clone(),
 			condition: tx.condition.clone(),
 		}
 	}
@@ -95,7 +95,7 @@ impl AccountTransactions {
 	}

 	fn next_nonce(&self) -> U256 {
-		self.current.last().map(|last| last.nonce + 1)
+		self.current.last().map(|last| last.nonce + 1.into())
 			.unwrap_or_else(|| *self.cur_nonce.value())
 	}

@@ -104,10 +104,16 @@ impl AccountTransactions {
 		let mut promoted = Vec::new();
 		let mut next_nonce = self.next_nonce();

-		while let Some(tx) = self.future.remove(&next_nonce) {
-			promoted.push(tx.hash);
-			self.current.push(tx);
-			next_nonce = next_nonce + 1;
+		loop {
+			match self.future.remove(&next_nonce) {
+				Some(tx) => {
+					promoted.push(tx.hash);
+					self.current.push(tx)
+				},
+				None => break,
+			}
+
+			next_nonce = next_nonce + 1.into();
 		}

 		promoted
@@ -148,7 +154,7 @@ impl fmt::Debug for TransactionQueue {

 impl TransactionQueue {
 	/// Import a pending transaction to be queued.
-	pub fn import(&mut self, tx: PendingTransaction) -> Result<ImportDestination, transaction::Error> {
+	pub fn import(&mut self, tx: PendingTransaction) -> Result<ImportDestination, transaction::Error>  {
 		let sender = tx.sender();
 		let hash = tx.hash();
 		let nonce = tx.nonce;
@@ -168,7 +174,7 @@ impl TransactionQueue {
 			}
 			Entry::Occupied(mut entry) => {
 				let acct_txs = entry.get_mut();
-				if nonce < *acct_txs.cur_nonce.value() {
+				if &nonce < acct_txs.cur_nonce.value() {
 					// don't accept txs from before known current nonce.
 					if acct_txs.cur_nonce.is_known() {
 						return Err(transaction::Error::Old)
@@ -190,7 +196,7 @@ impl TransactionQueue {
 					}
 					Err(idx) => {
 						let cur_len = acct_txs.current.len();
-						let incr_nonce = nonce + 1;
+						let incr_nonce = nonce + 1.into();

 						// current is sorted with one tx per nonce,
 						// so if a tx with given nonce wasn't found that means it is either
@@ -209,7 +215,7 @@ impl TransactionQueue {
 							}

 							(ImportDestination::Current, vec![hash])
-						} else if idx == cur_len && acct_txs.current.last().map_or(false, |f| f.nonce + 1 != nonce) {
+						} else if idx == cur_len && acct_txs.current.last().map_or(false, |f| f.nonce + 1.into() != nonce) {
 							trace!(target: "txqueue", "Queued future transaction for {}, nonce={}", sender, nonce);
 							let future_nonce = nonce;
 							acct_txs.future.insert(future_nonce, tx_info);
@@ -529,7 +535,7 @@ mod tests {
 		let tx_b: PendingTransaction = Transaction::default().fake_sign(sender).into();
 		let tx_a: PendingTransaction = {
 			let mut tx_a = Transaction::default();
-			tx_a.gas_price = tx_b.gas_price + 1;
+			tx_a.gas_price = tx_b.gas_price + 1.into();
 			tx_a.fake_sign(sender).into()
 		};

--- a/ethcore/light/src/types/request/mod.rs
+++ b/ethcore/light/src/types/request/mod.rs
@@ -764,7 +764,9 @@ pub mod header {
 				headers.push(encoded::Header::new(item.as_raw().to_owned()));
 			}

-			Ok(Response { headers })
+			Ok(Response {
+				headers: headers,
+			})
 		}
 	}

@@ -812,7 +814,7 @@ pub mod header_proof {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.num {
 				self.num = match oracle(req, idx) {
-					Ok(Output::Number(num)) => Field::Scalar(num),
+					Ok(Output::Number(num)) => Field::Scalar(num.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1051,7 +1053,7 @@ pub mod block_body {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.hash {
 				self.hash = match oracle(req, idx) {
-					Ok(Output::Hash(hash)) => Field::Scalar(hash),
+					Ok(Output::Hash(hash)) => Field::Scalar(hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1150,14 +1152,14 @@ pub mod account {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}

 			if let Field::BackReference(req, idx) = self.address_hash {
 				self.address_hash = match oracle(req, idx) {
-					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash),
+					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1255,21 +1257,21 @@ pub mod storage {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}

 			if let Field::BackReference(req, idx) = self.address_hash {
 				self.address_hash = match oracle(req, idx) {
-					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash),
+					Ok(Output::Hash(address_hash)) => Field::Scalar(address_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}

 			if let Field::BackReference(req, idx) = self.key_hash {
 				self.key_hash = match oracle(req, idx) {
-					Ok(Output::Hash(key_hash)) => Field::Scalar(key_hash),
+					Ok(Output::Hash(key_hash)) => Field::Scalar(key_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1355,14 +1357,14 @@ pub mod contract_code {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}

 			if let Field::BackReference(req, idx) = self.code_hash {
 				self.code_hash = match oracle(req, idx) {
-					Ok(Output::Hash(code_hash)) => Field::Scalar(code_hash),
+					Ok(Output::Hash(code_hash)) => Field::Scalar(code_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1450,7 +1452,7 @@ pub mod execution {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1512,7 +1514,9 @@ pub mod execution {
 				items.push(item);
 			}

-			Ok(Response { items })
+			Ok(Response {
+				items: items,
+			})
 		}
 	}

@@ -1574,7 +1578,7 @@ pub mod epoch_signal {
 		fn fill<F>(&mut self, oracle: F) where F: Fn(usize, usize) -> Result<Output, NoSuchOutput> {
 			if let Field::BackReference(req, idx) = self.block_hash {
 				self.block_hash = match oracle(req, idx) {
-					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash),
+					Ok(Output::Hash(block_hash)) => Field::Scalar(block_hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
--- a/ethcore/node_filter/Cargo.toml
+++ b/ethcore/node_filter/Cargo.toml
@@ -10,16 +10,16 @@ authors = ["Parity Technologies <admin@parity.io>"]
 ethcore = { path = ".."}
 ethcore-network = { path = "../../util/network" }
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
-ethereum-types = "0.4"
+ethereum-types = "0.3"
 log = "0.4"
 parking_lot = "0.6"
-ethabi = "6.0"
-ethabi-derive = "6.0"
-ethabi-contract = "6.0"
+ethabi = "5.1"
+ethabi-derive = "5.0"
+ethabi-contract = "5.0"
 lru-cache = "0.1"

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
-kvdb-memorydb = "0.1"
+kvdb-memorydb = { git = "https://github.com/paritytech/parity-common" }
 ethcore-io = { path = "../../util/io" }
 tempdir = "0.3"
--- a/ethcore/node_filter/src/lib.rs
+++ b/ethcore/node_filter/src/lib.rs
@@ -44,16 +44,16 @@ use parking_lot::Mutex;

 use ethcore::client::{BlockChainClient, BlockId};
 use ethereum_types::{H256, Address};
-use ethabi::FunctionOutputDecoder;
 use network::{ConnectionFilter, ConnectionDirection};
 use devp2p::NodeId;

-use_contract!(peer_set, "res/peer_set.json");
+use_contract!(peer_set, "PeerSet", "res/peer_set.json");

 const MAX_CACHE_SIZE: usize = 4096;

 /// Connection filter that uses a contract to manage permissions.
 pub struct NodeFilter {
+	contract: peer_set::PeerSet,
 	client: Weak<BlockChainClient>,
 	contract_address: Address,
 	permission_cache: Mutex<LruCache<(H256, NodeId), bool>>,
@@ -63,6 +63,7 @@ impl NodeFilter {
 	/// Create a new instance. Accepts a contract address.
 	pub fn new(client: Weak<BlockChainClient>, contract_address: Address) -> NodeFilter {
 		NodeFilter {
+			contract: peer_set::PeerSet::default(),
 			client,
 			contract_address,
 			permission_cache: Mutex::new(LruCache::new(MAX_CACHE_SIZE)),
@@ -95,9 +96,9 @@ impl ConnectionFilter for NodeFilter {
 		let id_low = H256::from_slice(&connecting_id[0..32]);
 		let id_high = H256::from_slice(&connecting_id[32..64]);

-		let (data, decoder) = peer_set::functions::connection_allowed::call(own_low, own_high, id_low, id_high);
-		let allowed = client.call_contract(BlockId::Latest, address, data)
-			.and_then(|value| decoder.decode(&value).map_err(|e| e.to_string()))
+		let allowed = self.contract.functions()
+			.connection_allowed()
+			.call(own_low, own_high, id_low, id_high, &|data| client.call_contract(BlockId::Latest, address, data))
 			.unwrap_or_else(|e| {
 				debug!("Error callling peer set contract: {:?}", e);
 				false
--- a/ethcore/private-tx/Cargo.toml
+++ b/ethcore/private-tx/Cargo.toml
@@ -7,36 +7,34 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 error-chain = { version = "0.12", default-features = false }
-ethabi = "6.0"
-ethabi-derive = "6.0"
-ethabi-contract = "6.0"
+ethabi = "5.1"
+ethabi-contract = "5.0"
+ethabi-derive = "5.0"
 ethcore = { path = ".." }
-parity-bytes = "0.1"
-parity-crypto = "0.1"
+parity-bytes = { git = "https://github.com/paritytech/parity-common" }
+parity-crypto = { git = "https://github.com/paritytech/parity-common" }
 ethcore-io = { path = "../../util/io" }
 ethcore-logger = { path = "../../logger" }
 ethcore-miner = { path = "../../miner" }
 ethcore-transaction = { path = "../transaction" }
-ethereum-types = "0.4"
+ethereum-types = "0.3"
 ethjson = { path = "../../json" }
 ethkey = { path = "../../ethkey" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
-heapsize = "0.4"
-keccak-hash = "0.1.2"
+keccak-hash = { git = "https://github.com/paritytech/parity-common" }
 log = "0.4"
 parking_lot = "0.6"
-patricia-trie = "0.2"
+patricia-trie = { git = "https://github.com/paritytech/parity-common" }
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
-rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp = { git = "https://github.com/paritytech/parity-common" }
 rlp_derive = { path = "../../util/rlp_derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
 tiny-keccak = "1.4"
-transaction-pool = "1.13.2"
 url = "1"

 [dev-dependencies]
--- a/ethcore/private-tx/src/encryptor.rs
+++ b/ethcore/private-tx/src/encryptor.rs
@@ -208,7 +208,7 @@ impl Encryptor for SecretStoreEncryptor {
 		let key = match self.retrieve_key("", false, contract_address, &*accounts) {
 			Ok(key) => Ok(key),
 			Err(Error(ErrorKind::EncryptionKeyNotFound(_), _)) => {
-				trace!(target: "privatetx", "Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
+				trace!("Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
 				self.retrieve_key(&format!("/{}", self.config.threshold), true, contract_address, &*accounts)
 			}
 			Err(err) => Err(err),
--- a/ethcore/private-tx/src/error.rs
+++ b/ethcore/private-tx/src/error.rs
@@ -21,14 +21,12 @@ use ethcore::account_provider::SignError;
 use ethcore::error::{Error as EthcoreError, ExecutionError};
 use transaction::Error as TransactionError;
 use ethkey::Error as KeyError;
-use txpool::Error as TxPoolError;

 error_chain! {
 	foreign_links {
 		Io(::std::io::Error) #[doc = "Error concerning the Rust standard library's IO subsystem."];
 		Decoder(DecoderError) #[doc = "RLP decoding error."];
 		Trie(TrieError) #[doc = "Error concerning TrieDBs."];
-		Txpool(TxPoolError) #[doc = "Tx pool error."];
 	}

 	errors {
--- a/ethcore/private-tx/src/lib.rs
+++ b/ethcore/private-tx/src/lib.rs
@@ -37,11 +37,9 @@ extern crate ethkey;
 extern crate ethjson;
 extern crate fetch;
 extern crate futures;
-extern crate heapsize;
 extern crate keccak_hash as hash;
 extern crate parking_lot;
 extern crate patricia_trie as trie;
-extern crate transaction_pool as txpool;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate rlp;
 extern crate url;
@@ -63,7 +61,7 @@ extern crate rand;
 extern crate ethcore_logger;

 pub use encryptor::{Encryptor, SecretStoreEncryptor, EncryptorConfig, NoopEncryptor};
-pub use private_transactions::{VerifiedPrivateTransaction, VerificationStore, PrivateTransactionSigningDesc, SigningStore};
+pub use private_transactions::{PrivateTransactionDesc, VerificationStore, PrivateTransactionSigningDesc, SigningStore};
 pub use messages::{PrivateTransaction, SignedPrivateTransaction};
 pub use error::{Error, ErrorKind};

@@ -73,7 +71,7 @@ use std::time::Duration;
 use ethereum_types::{H128, H256, U256, Address};
 use hash::keccak;
 use rlp::*;
-use parking_lot::RwLock;
+use parking_lot::{Mutex, RwLock};
 use bytes::Bytes;
 use ethkey::{Signature, recover, public_to_address};
 use io::IoChannel;
@@ -89,12 +87,11 @@ use ethcore::miner::{self, Miner, MinerService, pool_client::NonceCache};
 use ethcore::trace::{Tracer, VMTracer};
 use rustc_hex::FromHex;
 use ethkey::Password;
-use ethabi::FunctionOutputDecoder;

 // Source avaiable at https://github.com/parity-contracts/private-tx/blob/master/contracts/PrivateContract.sol
 const DEFAULT_STUB_CONTRACT: &'static str = include_str!("../res/private.evm");

-use_contract!(private_contract, "res/private.json");
+use_contract!(private, "PrivateContract", "res/private.json");

 /// Initialization vector length.
 const INIT_VEC_LEN: usize = 16;
@@ -131,8 +128,9 @@ pub struct Provider {
 	signer_account: Option<Address>,
 	passwords: Vec<Password>,
 	notify: RwLock<Vec<Weak<ChainNotify>>>,
-	transactions_for_signing: RwLock<SigningStore>,
-	transactions_for_verification: VerificationStore,
+	transactions_for_signing: Mutex<SigningStore>,
+	// TODO [ToDr] Move the Mutex/RwLock inside `VerificationStore` after refactored to `drain`.
+	transactions_for_verification: Mutex<VerificationStore>,
 	client: Arc<Client>,
 	miner: Arc<Miner>,
 	accounts: Arc<AccountProvider>,
@@ -163,8 +161,8 @@ impl Provider where {
 			signer_account: config.signer_account,
 			passwords: config.passwords,
 			notify: RwLock::default(),
-			transactions_for_signing: RwLock::default(),
-			transactions_for_verification: VerificationStore::default(),
+			transactions_for_signing: Mutex::default(),
+			transactions_for_verification: Mutex::default(),
 			client,
 			miner,
 			accounts,
@@ -192,9 +190,9 @@ impl Provider where {
 	/// 3. Save it with state returned on prev step to the queue for signing
 	/// 4. Broadcast corresponding message to the chain
 	pub fn create_private_transaction(&self, signed_transaction: SignedTransaction) -> Result<Receipt, Error> {
-		trace!(target: "privatetx", "Creating private transaction from regular transaction: {:?}", signed_transaction);
+		trace!("Creating private transaction from regular transaction: {:?}", signed_transaction);
 		if self.signer_account.is_none() {
-			warn!(target: "privatetx", "Signing account not set");
+			trace!("Signing account not set");
 			bail!(ErrorKind::SignerAccountNotSet);
 		}
 		let tx_hash = signed_transaction.hash();
@@ -205,7 +203,10 @@ impl Provider where {
 			Action::Call(contract) => {
 				let data = signed_transaction.rlp_bytes();
 				let encrypted_transaction = self.encrypt(&contract, &Self::iv_from_transaction(&signed_transaction), &data)?;
-				let private = PrivateTransaction::new(encrypted_transaction, contract);
+				let private = PrivateTransaction {
+					encrypted: encrypted_transaction,
+					contract,
+				};
 				// TODO [ToDr] Using BlockId::Latest is bad here,
 				// the block may change in the middle of execution
 				// causing really weird stuff to happen.
@@ -214,16 +215,16 @@ impl Provider where {
 				// in private-tx to avoid such mistakes.
 				let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest)?;
 				let private_state = self.execute_private_transaction(BlockId::Latest, &signed_transaction)?;
-				trace!(target: "privatetx", "Private transaction created, encrypted transaction: {:?}, private state: {:?}", private, private_state);
+				trace!("Private transaction created, encrypted transaction: {:?}, private state: {:?}", private, private_state);
 				let contract_validators = self.get_validators(BlockId::Latest, &contract)?;
-				trace!(target: "privatetx", "Required validators: {:?}", contract_validators);
+				trace!("Required validators: {:?}", contract_validators);
 				let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
-				trace!(target: "privatetx", "Hashed effective private state for sender: {:?}", private_state_hash);
-				self.transactions_for_signing.write().add_transaction(private.hash(), signed_transaction, contract_validators, private_state, contract_nonce)?;
-				self.broadcast_private_transaction(private.hash(), private.rlp_bytes().into_vec());
+				trace!("Hashed effective private state for sender: {:?}", private_state_hash);
+				self.transactions_for_signing.lock().add_transaction(private.hash(), signed_transaction, contract_validators, private_state, contract_nonce)?;
+				self.broadcast_private_transaction(private.rlp_bytes().into_vec());
 				Ok(Receipt {
 					hash: tx_hash,
-					contract_address: Some(contract),
+					contract_address: None,
 					status_code: 0,
 				})
 			}
@@ -239,6 +240,14 @@ impl Provider where {
 		keccak(&state_buf.as_ref())
 	}

+	/// Extract signed transaction from private transaction
+	fn extract_original_transaction(&self, private: PrivateTransaction, contract: &Address) -> Result<UnverifiedTransaction, Error> {
+		let encrypted_transaction = private.encrypted;
+		let transaction_bytes = self.decrypt(contract, &encrypted_transaction)?;
+		let original_transaction: UnverifiedTransaction = Rlp::new(&transaction_bytes).as_val()?;
+		Ok(original_transaction)
+	}
+
 	fn pool_client<'a>(&'a self, nonce_cache: &'a NonceCache) -> miner::pool_client::PoolClient<'a, Client> {
 		let engine = self.client.engine();
 		let refuse_service_transactions = true;
@@ -252,122 +261,48 @@ impl Provider where {
 	}

 	/// Retrieve and verify the first available private transaction for every sender
-	fn process_verification_queue(&self) -> Result<(), Error> {
+	///
+	/// TODO [ToDr] It seems that:
+	/// The 3 methods `ready_transaction,get_descriptor,remove` are always used in conjuction so most likely
+	/// can be replaced with a single `drain()` method instead.
+	/// Thanks to this we also don't really need to lock the entire verification for the time of execution.
+	fn process_queue(&self) -> Result<(), Error> {
 		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
-		let process_transaction = |transaction: &VerifiedPrivateTransaction| -> Result<_, String> {
-			let private_hash = transaction.private_transaction.hash();
-			match transaction.validator_account {
-				None => {
-					trace!(target: "privatetx", "Propagating transaction further");
-					self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes().into_vec());
-					return Ok(());
-				}
-				Some(validator_account) => {
-					if !self.validator_accounts.contains(&validator_account) {
-						trace!(target: "privatetx", "Propagating transaction further");
-						self.broadcast_private_transaction(private_hash, transaction.private_transaction.rlp_bytes().into_vec());
-						return Ok(());
-					}
-					let tx_action = transaction.transaction.action.clone();
-					if let Action::Call(contract) = tx_action {
-						// TODO [ToDr] Usage of BlockId::Latest
-						let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest);
-						if let Err(e) = contract_nonce {
-							bail!("Cannot retrieve contract nonce: {:?}", e);
-						}
-						let contract_nonce = contract_nonce.expect("Error was checked before");
-						let private_state = self.execute_private_transaction(BlockId::Latest, &transaction.transaction);
-						if let Err(e) = private_state {
-							bail!("Cannot retrieve private state: {:?}", e);
-						}
-						let private_state = private_state.expect("Error was checked before");
-						let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
-						trace!(target: "privatetx", "Hashed effective private state for validator: {:?}", private_state_hash);
-						let password = find_account_password(&self.passwords, &*self.accounts, &validator_account);
-						let signed_state = self.accounts.sign(validator_account, password, private_state_hash);
-						if let Err(e) = signed_state {
-							bail!("Cannot sign the state: {:?}", e);
-						}
-						let signed_state = signed_state.expect("Error was checked before");
-						let signed_private_transaction = SignedPrivateTransaction::new(private_hash, signed_state, None);
-						trace!(target: "privatetx", "Sending signature for private transaction: {:?}", signed_private_transaction);
-						self.broadcast_signed_private_transaction(signed_private_transaction.hash(), signed_private_transaction.rlp_bytes().into_vec());
-					} else {
-						bail!("Incorrect type of action for the transaction");
-					}
-				}
-			}
-			Ok(())
-		};
-		let ready_transactions = self.transactions_for_verification.drain(self.pool_client(&nonce_cache));
+		let mut verification_queue = self.transactions_for_verification.lock();
+		let ready_transactions = verification_queue.ready_transactions(self.pool_client(&nonce_cache));
 		for transaction in ready_transactions {
-			if let Err(e) = process_transaction(&transaction) {
-				warn!(target: "privatetx", "Error: {:?}", e);
+			let transaction_hash = transaction.signed().hash();
+			match verification_queue.private_transaction_descriptor(&transaction_hash) {
+				Ok(desc) => {
+					if !self.validator_accounts.contains(&desc.validator_account) {
+						trace!("Cannot find validator account in config");
+						bail!(ErrorKind::ValidatorAccountNotSet);
+					}
+					let account = desc.validator_account;
+					if let Action::Call(contract) = transaction.signed().action {
+						// TODO [ToDr] Usage of BlockId::Latest
+						let contract_nonce = self.get_contract_nonce(&contract, BlockId::Latest)?;
+						let private_state = self.execute_private_transaction(BlockId::Latest, transaction.signed())?;
+						let private_state_hash = self.calculate_state_hash(&private_state, contract_nonce);
+						trace!("Hashed effective private state for validator: {:?}", private_state_hash);
+						let password = find_account_password(&self.passwords, &*self.accounts, &account);
+						let signed_state = self.accounts.sign(account, password, private_state_hash)?;
+						let signed_private_transaction = SignedPrivateTransaction::new(desc.private_hash, signed_state, None);
+						trace!("Sending signature for private transaction: {:?}", signed_private_transaction);
+						self.broadcast_signed_private_transaction(signed_private_transaction.rlp_bytes().into_vec());
+					} else {
+						warn!("Incorrect type of action for the transaction");
+					}
+				},
+				Err(e) => {
+					warn!("Cannot retrieve descriptor for transaction with error {:?}", e);
+				}
 			}
+			verification_queue.remove_private_transaction(&transaction_hash);
 		}
 		Ok(())
 	}

-	/// Add signed private transaction into the store
-	/// Creates corresponding public transaction if last required signature collected and sends it to the chain
-	pub fn process_signature(&self, signed_tx: &SignedPrivateTransaction) -> Result<(), Error> {
-		trace!(target: "privatetx", "Processing signed private transaction");
-		let private_hash = signed_tx.private_transaction_hash();
-		let desc = match self.transactions_for_signing.read().get(&private_hash) {
-			None => {
-				// Not our transaction, broadcast further to peers
-				self.broadcast_signed_private_transaction(signed_tx.hash(), signed_tx.rlp_bytes().into_vec());
-				return Ok(());
-			},
-			Some(desc) => desc,
-		};
-		let last = self.last_required_signature(&desc, signed_tx.signature())?;
-
-		if last {
-			let mut signatures = desc.received_signatures.clone();
-			signatures.push(signed_tx.signature());
-			let rsv: Vec<Signature> = signatures.into_iter().map(|sign| sign.into_electrum().into()).collect();
-			//Create public transaction
-			let public_tx = self.public_transaction(
-				desc.state.clone(),
-				&desc.original_transaction,
-				&rsv,
-				desc.original_transaction.nonce,
-				desc.original_transaction.gas_price
-			)?;
-			trace!(target: "privatetx", "Last required signature received, public transaction created: {:?}", public_tx);
-			//Sign and add it to the queue
-			let chain_id = desc.original_transaction.chain_id();
-			let hash = public_tx.hash(chain_id);
-			let signer_account = self.signer_account.ok_or_else(|| ErrorKind::SignerAccountNotSet)?;
-			let password = find_account_password(&self.passwords, &*self.accounts, &signer_account);
-			let signature = self.accounts.sign(signer_account, password, hash)?;
-			let signed = SignedTransaction::new(public_tx.with_signature(signature, chain_id))?;
-			match self.miner.import_own_transaction(&*self.client, signed.into()) {
-				Ok(_) => trace!(target: "privatetx", "Public transaction added to queue"),
-				Err(err) => {
-					warn!(target: "privatetx", "Failed to add transaction to queue, error: {:?}", err);
-					bail!(err);
-				}
-			}
-			//Remove from store for signing
-			if let Err(err) = self.transactions_for_signing.write().remove(&private_hash) {
-				warn!(target: "privatetx", "Failed to remove transaction from signing store, error: {:?}", err);
-				bail!(err);
-			}
-		} else {
-			//Add signature to the store
-			match self.transactions_for_signing.write().add_signature(&private_hash, signed_tx.signature()) {
-				Ok(_) => trace!(target: "privatetx", "Signature stored for private transaction"),
-				Err(err) => {
-					warn!(target: "privatetx", "Failed to add signature to signing store, error: {:?}", err);
-					bail!(err);
-				}
-			}
-		}
-		Ok(())
- 	}
-
 	fn last_required_signature(&self, desc: &PrivateTransactionSigningDesc, sign: Signature) -> Result<bool, Error>  {
 		if desc.received_signatures.contains(&sign) {
 			return Ok(false);
@@ -381,26 +316,26 @@ impl Provider where {
 						Ok(desc.received_signatures.len() + 1 == desc.validators.len())
 					}
 					false => {
-						warn!(target: "privatetx", "Sender's state doesn't correspond to validator's");
+						trace!("Sender's state doesn't correspond to validator's");
 						bail!(ErrorKind::StateIncorrect);
 					}
 				}
 			}
 			Err(err) => {
-				warn!(target: "privatetx", "Sender's state doesn't correspond to validator's, error {:?}", err);
+				trace!("Sender's state doesn't correspond to validator's, error {:?}", err);
 				bail!(err);
 			}
 		}
 	}

 	/// Broadcast the private transaction message to the chain
-	fn broadcast_private_transaction(&self, transaction_hash: H256, message: Bytes) {
-		self.notify(|notify| notify.broadcast(ChainMessageType::PrivateTransaction(transaction_hash, message.clone())));
+	fn broadcast_private_transaction(&self, message: Bytes) {
+		self.notify(|notify| notify.broadcast(ChainMessageType::PrivateTransaction(message.clone())));
 	}

 	/// Broadcast signed private transaction message to the chain
-	fn broadcast_signed_private_transaction(&self, transaction_hash: H256, message: Bytes) {
-		self.notify(|notify| notify.broadcast(ChainMessageType::SignedPrivateTransaction(transaction_hash, message.clone())));
+	fn broadcast_signed_private_transaction(&self, message: Bytes) {
+		self.notify(|notify| notify.broadcast(ChainMessageType::SignedPrivateTransaction(message.clone())));
 	}

 	fn iv_from_transaction(transaction: &SignedTransaction) -> H128 {
@@ -416,33 +351,41 @@ impl Provider where {
 	}

 	fn encrypt(&self, contract_address: &Address, initialisation_vector: &H128, data: &[u8]) -> Result<Bytes, Error> {
-		trace!(target: "privatetx", "Encrypt data using key(address): {:?}", contract_address);
+		trace!("Encrypt data using key(address): {:?}", contract_address);
 		Ok(self.encryptor.encrypt(contract_address, &*self.accounts, initialisation_vector, data)?)
 	}

 	fn decrypt(&self, contract_address: &Address, data: &[u8]) -> Result<Bytes, Error> {
-		trace!(target: "privatetx", "Decrypt data using key(address): {:?}", contract_address);
+		trace!("Decrypt data using key(address): {:?}", contract_address);
 		Ok(self.encryptor.decrypt(contract_address, &*self.accounts, data)?)
 	}

 	fn get_decrypted_state(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
-		let (data, decoder) = private_contract::functions::state::call();
-		let value = self.client.call_contract(block, *address, data)?;
-		let state = decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
+		let contract = private::PrivateContract::default();
+		let state = contract.functions()
+			.state()
+			.call(&|data| self.client.call_contract(block, *address, data))
+			.map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
+
 		self.decrypt(address, &state)
 	}

 	fn get_decrypted_code(&self, address: &Address, block: BlockId) -> Result<Bytes, Error> {
-		let (data, decoder) = private_contract::functions::code::call();
-		let value = self.client.call_contract(block, *address, data)?;
-		let state = decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
-		self.decrypt(address, &state)
+		let contract = private::PrivateContract::default();
+		let code = contract.functions()
+			.code()
+			.call(&|data| self.client.call_contract(block, *address, data))
+			.map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?;
+
+		self.decrypt(address, &code)
 	}

 	pub fn get_contract_nonce(&self, address: &Address, block: BlockId) -> Result<U256, Error> {
-		let (data, decoder) = private_contract::functions::nonce::call();
-		let value = self.client.call_contract(block, *address, data)?;
-		decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
+		let contract = private::PrivateContract::default();
+		Ok(contract.functions()
+			.nonce()
+			.call(&|data| self.client.call_contract(block, *address, data))
+			.map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?)
 	}

 	fn snapshot_to_storage(raw: Bytes) -> HashMap<H256, H256> {
@@ -478,7 +421,7 @@ impl Provider where {
 			Action::Call(ref contract_address) => {
 				let contract_code = Arc::new(self.get_decrypted_code(contract_address, block)?);
 				let contract_state = self.get_decrypted_state(contract_address, block)?;
-				trace!(target: "privatetx", "Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
+				trace!("Patching contract at {:?}, code: {:?}, state: {:?}", contract_address, contract_code, contract_state);
 				state.patch_account(contract_address, contract_code, Self::snapshot_to_storage(contract_state))?;
 				Some(*contract_address)
 			},
@@ -506,7 +449,7 @@ impl Provider where {
 				(enc_code, self.encrypt(&address, &Self::iv_from_transaction(transaction), &Self::snapshot_from_storage(&storage))?)
 			},
 		};
-		trace!(target: "privatetx", "Private contract executed. code: {:?}, state: {:?}, result: {:?}", encrypted_code, encrypted_storage, result.output);
+		trace!("Private contract executed. code: {:?}, state: {:?}, result: {:?}", encrypted_code, encrypted_storage, result.output);
 		Ok(PrivateExecutionResult {
 			code: encrypted_code,
 			state: encrypted_storage,
@@ -517,11 +460,13 @@ impl Provider where {

 	fn generate_constructor(validators: &[Address], code: Bytes, storage: Bytes) -> Bytes {
 		let constructor_code = DEFAULT_STUB_CONTRACT.from_hex().expect("Default contract code is valid");
-		private_contract::constructor(constructor_code, validators.iter().map(|a| *a).collect::<Vec<Address>>(), code, storage)
+		let private = private::PrivateContract::default();
+		private.constructor(constructor_code, validators.iter().map(|a| *a).collect::<Vec<Address>>(), code, storage)
 	}

 	fn generate_set_state_call(signatures: &[Signature], storage: Bytes) -> Bytes {
-		private_contract::functions::set_state::encode_input(
+		let private = private::PrivateContract::default();
+		private.functions().set_state().input(
 			storage,
 			signatures.iter().map(|s| {
 				let mut v: [u8; 32] = [0; 32];
@@ -595,20 +540,22 @@ impl Provider where {

 	/// Returns private validators for a contract.
 	pub fn get_validators(&self, block: BlockId, address: &Address) -> Result<Vec<Address>, Error> {
-		let (data, decoder) = private_contract::functions::get_validators::call();
-		let value = self.client.call_contract(block, *address, data)?;
-		decoder.decode(&value).map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)).into())
+		let contract = private::PrivateContract::default();
+		Ok(contract.functions()
+			.get_validators()
+			.call(&|data| self.client.call_contract(block, *address, data))
+			.map_err(|e| ErrorKind::Call(format!("Contract call failed {:?}", e)))?)
 	}
 }

 pub trait Importer {
 	/// Process received private transaction
-	fn import_private_transaction(&self, _rlp: &[u8]) -> Result<H256, Error>;
+	fn import_private_transaction(&self, _rlp: &[u8]) -> Result<(), Error>;

 	/// Add signed private transaction into the store
 	///
 	/// Creates corresponding public transaction if last required signature collected and sends it to the chain
-	fn import_signed_private_transaction(&self, _rlp: &[u8]) -> Result<H256, Error>;
+	fn import_signed_private_transaction(&self, _rlp: &[u8]) -> Result<(), Error>;
 }

 // TODO [ToDr] Offload more heavy stuff to the IoService thread.
@@ -617,59 +564,115 @@ pub trait Importer {
 // for both verification and execution.

 impl Importer for Arc<Provider> {
-	fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, Error> {
-		trace!(target: "privatetx", "Private transaction received");
+	fn import_private_transaction(&self, rlp: &[u8]) -> Result<(), Error> {
+		trace!("Private transaction received");
 		let private_tx: PrivateTransaction = Rlp::new(rlp).as_val()?;
-		let private_tx_hash = private_tx.hash();
-		let contract = private_tx.contract();
+		let contract = private_tx.contract;
 		let contract_validators = self.get_validators(BlockId::Latest, &contract)?;

 		let validation_account = contract_validators
 			.iter()
 			.find(|address| self.validator_accounts.contains(address));

-		//extract the original transaction
-		let encrypted_data = private_tx.encrypted();
-		let transaction_bytes = self.decrypt(&contract, &encrypted_data)?;
-		let original_tx: UnverifiedTransaction = Rlp::new(&transaction_bytes).as_val()?;
-		let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
-		//add to the queue for further verification
-		self.transactions_for_verification.add_transaction(
-			original_tx,
-			validation_account.map(|&account| account),
-			private_tx,
-			self.pool_client(&nonce_cache),
-		)?;
-		let provider = Arc::downgrade(self);
-		let result = self.channel.send(ClientIoMessage::execute(move |_| {
-			if let Some(provider) = provider.upgrade() {
-				if let Err(e) = provider.process_verification_queue() {
-					warn!(target: "privatetx", "Unable to process the queue: {}", e);
-				}
+		match validation_account {
+			None => {
+				// TODO [ToDr] This still seems a bit invalid, imho we should still import the transaction to the pool.
+				// Importing to pool verifies correctness and nonce; here we are just blindly forwarding.
+				//
+				// Not for verification, broadcast further to peers
+				self.broadcast_private_transaction(rlp.into());
+				return Ok(());
+			},
+			Some(&validation_account) => {
+				let hash = private_tx.hash();
+				trace!("Private transaction taken for verification");
+				let original_tx = self.extract_original_transaction(private_tx, &contract)?;
+				trace!("Validating transaction: {:?}", original_tx);
+				// Verify with the first account available
+				trace!("The following account will be used for verification: {:?}", validation_account);
+				let nonce_cache = NonceCache::new(NONCE_CACHE_SIZE);
+				self.transactions_for_verification.lock().add_transaction(
+					original_tx,
+					contract,
+					validation_account,
+					hash,
+					self.pool_client(&nonce_cache),
+				)?;
+				let provider = Arc::downgrade(self);
+				self.channel.send(ClientIoMessage::execute(move |_| {
+					if let Some(provider) = provider.upgrade() {
+						if let Err(e) = provider.process_queue() {
+							debug!("Unable to process the queue: {}", e);
+						}
+					}
+				})).map_err(|_| ErrorKind::ClientIsMalformed.into())
 			}
-		}));
-		if let Err(e) = result {
-			warn!(target: "privatetx", "Error sending NewPrivateTransaction message: {:?}", e);
 		}
-		Ok(private_tx_hash)
 	}

-	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, Error> {
+	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<(), Error> {
 		let tx: SignedPrivateTransaction = Rlp::new(rlp).as_val()?;
-		trace!(target: "privatetx", "Signature for private transaction received: {:?}", tx);
+		trace!("Signature for private transaction received: {:?}", tx);
 		let private_hash = tx.private_transaction_hash();
-		let provider = Arc::downgrade(self);
-		let result = self.channel.send(ClientIoMessage::execute(move |_| {
-			if let Some(provider) = provider.upgrade() {
-				if let Err(e) = provider.process_signature(&tx) {
-					warn!(target: "privatetx", "Unable to process the signature: {}", e);
+		let desc = match self.transactions_for_signing.lock().get(&private_hash) {
+			None => {
+				// TODO [ToDr] Verification (we can't just blindly forward every transaction)
+
+				// Not our transaction, broadcast further to peers
+				self.broadcast_signed_private_transaction(rlp.into());
+				return Ok(());
+			},
+			Some(desc) => desc,
+		};
+
+		let last = self.last_required_signature(&desc, tx.signature())?;
+
+		if last {
+			let mut signatures = desc.received_signatures.clone();
+			signatures.push(tx.signature());
+			let rsv: Vec<Signature> = signatures.into_iter().map(|sign| sign.into_electrum().into()).collect();
+			//Create public transaction
+			let public_tx = self.public_transaction(
+				desc.state.clone(),
+				&desc.original_transaction,
+				&rsv,
+				desc.original_transaction.nonce,
+				desc.original_transaction.gas_price
+			)?;
+			trace!("Last required signature received, public transaction created: {:?}", public_tx);
+			//Sign and add it to the queue
+			let chain_id = desc.original_transaction.chain_id();
+			let hash = public_tx.hash(chain_id);
+			let signer_account = self.signer_account.ok_or_else(|| ErrorKind::SignerAccountNotSet)?;
+			let password = find_account_password(&self.passwords, &*self.accounts, &signer_account);
+			let signature = self.accounts.sign(signer_account, password, hash)?;
+			let signed = SignedTransaction::new(public_tx.with_signature(signature, chain_id))?;
+			match self.miner.import_own_transaction(&*self.client, signed.into()) {
+				Ok(_) => trace!("Public transaction added to queue"),
+				Err(err) => {
+					trace!("Failed to add transaction to queue, error: {:?}", err);
+					bail!(err);
+				}
+			}
+			//Remove from store for signing
+			match self.transactions_for_signing.lock().remove(&private_hash) {
+				Ok(_) => {}
+				Err(err) => {
+					trace!("Failed to remove transaction from signing store, error: {:?}", err);
+					bail!(err);
+				}
+			}
+		} else {
+			//Add signature to the store
+			match self.transactions_for_signing.lock().add_signature(&private_hash, tx.signature()) {
+				Ok(_) => trace!("Signature stored for private transaction"),
+				Err(err) => {
+					trace!("Failed to add signature to signing store, error: {:?}", err);
+					bail!(err);
 				}
 			}
-		}));
-		if let Err(e) = result {
-			warn!(target: "privatetx", "Error sending NewSignedPrivateTransaction message: {:?}", e);
 		}
-		Ok(private_hash)
+		Ok(())
 	}
 }

@@ -686,9 +689,9 @@ fn find_account_password(passwords: &Vec<Password>, account_provider: &AccountPr
 impl ChainNotify for Provider {
 	fn new_blocks(&self, imported: Vec<H256>, _invalid: Vec<H256>, _route: ChainRoute, _sealed: Vec<H256>, _proposed: Vec<Bytes>, _duration: Duration) {
 		if !imported.is_empty() {
-			trace!(target: "privatetx", "New blocks imported, try to prune the queue");
-			if let Err(err) = self.process_verification_queue() {
-				warn!(target: "privatetx", "Cannot prune private transactions queue. error: {:?}", err);
+			trace!("New blocks imported, try to prune the queue");
+			if let Err(err) = self.process_queue() {
+				trace!("Cannot prune private transactions queue. error: {:?}", err);
 			}
 		}
 	}
--- a/ethcore/private-tx/src/messages.rs
+++ b/ethcore/private-tx/src/messages.rs
@@ -25,41 +25,15 @@ use transaction::signature::{add_chain_replay_protection, check_replay_protectio
 #[derive(Default, Debug, Clone, PartialEq, RlpEncodable, RlpDecodable, Eq)]
 pub struct PrivateTransaction {
 	/// Encrypted data
-	encrypted: Bytes,
+	pub encrypted: Bytes,
 	/// Address of the contract
-	contract: Address,
-	/// Hash
-	hash: H256,
+	pub contract: Address,
 }

 impl PrivateTransaction {
-	/// Constructor
-	pub fn new(encrypted: Bytes, contract: Address) -> Self {
-		PrivateTransaction {
-			encrypted,
-			contract,
-			hash: 0.into(),
-		}.compute_hash()
-	}
-
-	fn compute_hash(mut self) -> PrivateTransaction {
-		self.hash = keccak(&*self.rlp_bytes());
-		self
-	}
-
-	/// Hash of the private transaction
+	/// Compute hash on private transaction
 	pub fn hash(&self) -> H256 {
-		self.hash
-	}
-
-	/// Address of the contract
-	pub fn contract(&self) -> Address {
-		self.contract
-	}
-
-	/// Encrypted data
-	pub fn encrypted(&self) -> Bytes {
-		self.encrypted.clone()
+		keccak(&*self.rlp_bytes())
 	}
 }

@@ -75,8 +49,6 @@ pub struct SignedPrivateTransaction {
 	r: U256,
 	/// The S field of the signature
 	s: U256,
-	/// Hash
-	hash: H256,
 }

 impl SignedPrivateTransaction {
@@ -87,13 +59,7 @@ impl SignedPrivateTransaction {
 			r: sig.r().into(),
 			s: sig.s().into(),
 			v: add_chain_replay_protection(sig.v() as u64, chain_id),
-			hash: 0.into(),
-		}.compute_hash()
-	}
-
-	fn compute_hash(mut self) -> SignedPrivateTransaction {
-		self.hash = keccak(&*self.rlp_bytes());
-		self
+		}
 	}

 	pub fn standard_v(&self) -> u8 { check_replay_protection(self.v) }
@@ -107,9 +73,4 @@ impl SignedPrivateTransaction {
 	pub fn private_transaction_hash(&self) -> H256 {
 		self.private_transaction_hash
 	}
-
-	/// Own hash
-	pub fn hash(&self) -> H256 {
-		self.hash
-	}
 }
--- a/ethcore/private-tx/src/private_transactions.rs
+++ b/ethcore/private-tx/src/private_transactions.rs
@@ -15,139 +15,62 @@
 // along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::sync::Arc;
-use std::cmp;
 use std::collections::{HashMap, HashSet};

 use bytes::Bytes;
 use ethcore_miner::pool;
 use ethereum_types::{H256, U256, Address};
-use heapsize::HeapSizeOf;
 use ethkey::Signature;
-use messages::PrivateTransaction;
-use parking_lot::RwLock;
 use transaction::{UnverifiedTransaction, SignedTransaction};
-use txpool;
-use txpool::{VerifiedTransaction, Verifier};
-use error::{Error, ErrorKind};

-type Pool = txpool::Pool<VerifiedPrivateTransaction, pool::scoring::NonceAndGasPrice>;
+use error::{Error, ErrorKind};

 /// Maximum length for private transactions queues.
 const MAX_QUEUE_LEN: usize = 8312;

-/// Private transaction stored in queue for verification
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub struct VerifiedPrivateTransaction {
-	/// Original private transaction
-	pub private_transaction: PrivateTransaction,
+/// Desriptor for private transaction stored in queue for verification
+#[derive(Default, Debug, Clone, PartialEq, Eq)]
+pub struct PrivateTransactionDesc {
+	/// Hash of the private transaction
+	pub private_hash: H256,
+	/// Contract's address used in private transaction
+	pub contract: Address,
 	/// Address that should be used for verification
-	pub validator_account: Option<Address>,
-	/// Resulting verified transaction
-	pub transaction: SignedTransaction,
-	/// Original transaction hash
-	pub transaction_hash: H256,
-	/// Original transaction sender
-	pub transaction_sender: Address,
-}
-
-impl txpool::VerifiedTransaction for VerifiedPrivateTransaction {
-	type Hash = H256;
-	type Sender = Address;
-
-	fn hash(&self) -> &H256 {
-		&self.transaction_hash
-	}
-
-	fn mem_usage(&self) -> usize {
-		self.transaction.heap_size_of_children()
-	}
-
-	fn sender(&self) -> &Address {
-		&self.transaction_sender
-	}
-}
-
-impl pool::ScoredTransaction for VerifiedPrivateTransaction {
-	fn priority(&self) -> pool::Priority {
-		pool::Priority::Regular
-	}
-
-	/// Gets transaction gas price.
-	fn gas_price(&self) -> &U256 {
-		&self.transaction.gas_price
-	}
-
-	/// Gets transaction nonce.
-	fn nonce(&self) -> U256 {
-		self.transaction.nonce
-	}
-}
-
-/// Checks readiness of transactions by looking if the transaction from sender already exists.
-/// Guarantees only one transaction per sender
-#[derive(Debug)]
-pub struct PrivateReadyState<C> {
-	senders: HashSet<Address>,
-	state: C,
-}
-
-impl<C> PrivateReadyState<C> {
-	/// Create new State checker, given client interface.
-	pub fn new(
-		state: C,
-	) -> Self {
-		PrivateReadyState {
-			senders: Default::default(),
-			state,
-		}
-	}
-}
-
-impl<C: pool::client::NonceClient> txpool::Ready<VerifiedPrivateTransaction> for PrivateReadyState<C> {
-	fn is_ready(&mut self, tx: &VerifiedPrivateTransaction) -> txpool::Readiness {
-		let sender = tx.sender();
-		let state = &self.state;
-		let state_nonce = state.account_nonce(sender);
-		if self.senders.contains(sender) {
-			txpool::Readiness::Future
-		} else {
-			self.senders.insert(*sender);
-			match tx.transaction.nonce.cmp(&state_nonce) {
-				cmp::Ordering::Greater => txpool::Readiness::Future,
-				cmp::Ordering::Less => txpool::Readiness::Stale,
-				cmp::Ordering::Equal => txpool::Readiness::Ready,
-			}
-		}
-	}
+	pub validator_account: Address,
 }

 /// Storage for private transactions for verification
 pub struct VerificationStore {
-	verification_pool: RwLock<Pool>,
-	verification_options: pool::verifier::Options,
+	/// Descriptors for private transactions in queue for verification with key - hash of the original transaction
+	descriptors: HashMap<H256, PrivateTransactionDesc>,
+	/// Queue with transactions for verification
+	///
+	/// TODO [ToDr] Might actually be better to use `txpool` directly and:
+	/// 1. Store descriptors inside `VerifiedTransaction`
+	/// 2. Use custom `ready` implementation to only fetch one transaction per sender.
+	/// 3. Get rid of passing dummy `block_number` and `timestamp`
+	transactions: pool::TransactionQueue,
 }

 impl Default for VerificationStore {
 	fn default() -> Self {
 		VerificationStore {
-			verification_pool: RwLock::new(
-				txpool::Pool::new(
-					txpool::NoopListener,
-					pool::scoring::NonceAndGasPrice(pool::PrioritizationStrategy::GasPriceOnly),
-					pool::Options {
-						max_count: MAX_QUEUE_LEN,
-						max_per_sender: MAX_QUEUE_LEN / 10,
-						max_mem_usage: 8 * 1024 * 1024,
-					},
-				)
-			),
-			verification_options: pool::verifier::Options {
-				// TODO [ToDr] This should probably be based on some real values?
-				minimal_gas_price: 0.into(),
-				block_gas_limit: 8_000_000.into(),
-				tx_gas_limit: U256::max_value(),
-				no_early_reject: false,
-			},
+			descriptors: Default::default(),
+			transactions: pool::TransactionQueue::new(
+				pool::Options {
+					max_count: MAX_QUEUE_LEN,
+					max_per_sender: MAX_QUEUE_LEN / 10,
+					max_mem_usage: 8 * 1024 * 1024,
+				},
+				pool::verifier::Options {
+					// TODO [ToDr] This should probably be based on some real values?
+					minimal_gas_price: 0.into(),
+					block_gas_limit: 8_000_000.into(),
+					tx_gas_limit: U256::max_value(),
+					no_early_reject: false
+				},
+				pool::PrioritizationStrategy::GasPriceOnly,
+			)
 		}
 	}
 }
@@ -155,43 +78,66 @@ impl Default for VerificationStore {
 impl VerificationStore {
 	/// Adds private transaction for verification into the store
 	pub fn add_transaction<C: pool::client::Client>(
-		&self,
+		&mut self,
 		transaction: UnverifiedTransaction,
-		validator_account: Option<Address>,
-		private_transaction: PrivateTransaction,
+		contract: Address,
+		validator_account: Address,
+		private_hash: H256,
 		client: C,
 	) -> Result<(), Error> {
+		if self.descriptors.len() > MAX_QUEUE_LEN {
+			bail!(ErrorKind::QueueIsFull);
+		}

-		let options = self.verification_options.clone();
-		// Use pool's verifying pipeline for original transaction's verification
-		let verifier = pool::verifier::Verifier::new(client, options, Default::default(), None);
-		let unverified = pool::verifier::Transaction::Unverified(transaction);
-		let verified_tx = verifier.verify_transaction(unverified)?;
-		let signed_tx: SignedTransaction = verified_tx.signed().clone();
-		let signed_hash = signed_tx.hash();
-		let signed_sender = signed_tx.sender();
-		let verified = VerifiedPrivateTransaction {
-			private_transaction,
+		let transaction_hash = transaction.hash();
+		if self.descriptors.get(&transaction_hash).is_some() {
+			bail!(ErrorKind::PrivateTransactionAlreadyImported);
+		}
+
+		let results = self.transactions.import(
+			client,
+			vec![pool::verifier::Transaction::Unverified(transaction)],
+		);
+
+		// Verify that transaction was imported
+		results.into_iter()
+			.next()
+			.expect("One transaction inserted; one result returned; qed")?;
+
+		self.descriptors.insert(transaction_hash, PrivateTransactionDesc {
+			private_hash,
+			contract,
 			validator_account,
-			transaction: signed_tx,
-			transaction_hash: signed_hash,
-			transaction_sender: signed_sender,
-		};
-		let mut pool = self.verification_pool.write();
-		pool.import(verified)?;
+		});
+
 		Ok(())
 	}

-	/// Drains transactions ready for verification from the pool
+	/// Returns transactions ready for verification
 	/// Returns only one transaction per sender because several cannot be verified in a row without verification from other peers
-	pub fn drain<C: pool::client::NonceClient>(&self, client: C) -> Vec<Arc<VerifiedPrivateTransaction>> {
-		let ready = PrivateReadyState::new(client);
-		let transactions: Vec<_> = self.verification_pool.read().pending(ready).collect();
-		let mut pool = self.verification_pool.write();
-		for tx in &transactions {
-			pool.remove(tx.hash(), true);
-		}
-		transactions
+	pub fn ready_transactions<C: pool::client::NonceClient>(&self, client: C) -> Vec<Arc<pool::VerifiedTransaction>> {
+		// We never store PendingTransactions and we don't use internal cache,
+		// so we don't need to provide real block number of timestamp here
+		let block_number = 0;
+		let timestamp = 0;
+		let nonce_cap = None;
+
+		self.transactions.collect_pending(client, block_number, timestamp, nonce_cap, |transactions| {
+			// take only one transaction per sender
+			let mut senders = HashSet::with_capacity(self.descriptors.len());
+			transactions.filter(move |tx| senders.insert(tx.signed().sender())).collect()
+		})
+	}
+
+	/// Returns descriptor of the corresponding private transaction
+	pub fn private_transaction_descriptor(&self, transaction_hash: &H256) -> Result<&PrivateTransactionDesc, Error> {
+		self.descriptors.get(transaction_hash).ok_or(ErrorKind::PrivateTransactionNotFound.into())
+	}
+
+	/// Remove transaction from the queue for verification
+	pub fn remove_private_transaction(&mut self, transaction_hash: &H256) {
+		self.descriptors.remove(transaction_hash);
+		self.transactions.remove(&[*transaction_hash], true);
 	}
 }

--- a/ethcore/res/ethereum/byzantium_test.json
+++ b/ethcore/res/ethereum/byzantium_test.json
@@ -6,12 +6,11 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": "0x29A2241AF62C0000",
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
+				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": "0x0",
-				"difficultyBombDelays": {
-					"0": 3000000
-				}
+				"eip649Transition": "0x0"
 			}
 		}
 	},
--- a/ethcore/res/ethereum/classic.json
+++ b/ethcore/res/ethereum/classic.json
@@ -31,7 +31,8 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": 3000000,
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
--- a/ethcore/res/ethereum/constantinople_test.json
+++ b/ethcore/res/ethereum/constantinople_test.json
@@ -1,20 +1,16 @@
 {
-	"name": "Constantinople (test)",
+	"name": "Byzantium (Test)",
 	"engine": {
 		"Ethash": {
 			"params": {
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": {
-					"0": "0x29A2241AF62C0000",
-					"5": "0x1BC16D674EC80000"
-				},
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x0",
+				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": "0x0",
-				"difficultyBombDelays": {
-					"0": 5000000
-				}
+				"eip649Transition": "0x0"
 			}
 		}
 	},
@@ -33,14 +29,11 @@
 		"eip161abcTransition": "0x0",
 		"eip161dTransition": "0x0",
 		"eip140Transition": "0x0",
+		"eip210Transition": "0x0",
 		"eip211Transition": "0x0",
 		"eip214Transition": "0x0",
 		"eip155Transition": "0x0",
-		"eip658Transition": "0x0",
-		"eip145Transition": "0x0",
-		"eip1014Transition": "0x0",
-		"eip1052Transition": "0x0",
-		"eip1283Transition": "0x0"
+		"eip658Transition": "0x0"
 	},
 	"genesis": {
 		"seal": {
@@ -61,9 +54,9 @@
 		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
 		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
 		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 20 } } } },
+		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 100 } } } },
 		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
-		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
 		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	}
 }
--- a/ethcore/res/ethereum/easthub.json
+++ b/ethcore/res/ethereum/easthub.json
@@ -27,7 +27,8 @@
 		"eip155Transition": "0x0",
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
--- a/ethcore/res/ethereum/eip150_test.json
+++ b/ethcore/res/ethereum/eip150_test.json
@@ -23,6 +23,7 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip98Transition": "0x7fffffffffffffff",
+		"eip86Transition": "0x7fffffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x7fffffffffffffff"
--- a/ethcore/res/ethereum/eip161_test.json
+++ b/ethcore/res/ethereum/eip161_test.json
@@ -23,7 +23,8 @@
 		"eip161abcTransition": "0x0",
 		"eip161dTransition": "0x0",
 		"eip98Transition": "0x7fffffffffffffff",
-		"eip155Transition": "0x0",
+		"eip86Transition": "0x7fffffffffffffff",
+		"eip155Transition": "0x7fffffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0"
 	},
--- a/ethcore/res/ethereum/eip210_test.json
+++ b/ethcore/res/ethereum/eip210_test.json
@@ -1,54 +0,0 @@
-{
-	"name": "EIP210 (test)",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"blockReward": "0x4563918244F40000",
-				"homesteadTransition": "0x0"
-			}
-		}
-	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"registrar" : "0xc6d9d2cd449a754c494264e1809c50e34d64562b",
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID" : "0x1",
-		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": "0x0",
-		"eip98Transition": "0xffffffffffffffff",
-		"eip150Transition": "0x0",
-		"eip160Transition": "0x0",
-		"eip161abcTransition": "0x0",
-		"eip161dTransition": "0x0",
-		"eip210Transition": "0x0"
-	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x0000000000000042",
-				"mixHash": "0x0000000000000000000000000000000000000000000000000000000000000000"
-			}
-		},
-		"difficulty": "0x400000000",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "0x11bbe8db4e347b4e8c937c1c8370e4b5ed33adb3db69cbdb7a38e1e50b1b82fa",
-		"gasLimit": "0x1388"
-	},
-	"accounts": {
-		"0000000000000000000000000000000000000001": { "balance": "1", "builtin": { "name": "ecrecover", "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0000000000000000000000000000000000000002": { "balance": "1", "builtin": { "name": "sha256", "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0000000000000000000000000000000000000003": { "balance": "1", "builtin": { "name": "ripemd160", "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0000000000000000000000000000000000000004": { "balance": "1", "builtin": { "name": "identity", "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": "0x00", "pricing": { "modexp": { "divisor": 100 } } } },
-		"0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": "0x00", "pricing": { "linear": { "base": 500, "word": 0 } } } },
-		"0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": "0x00", "pricing": { "linear": { "base": 2000, "word": 0 } } } },
-		"0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": "0x00", "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
-	}
-}
--- a/ethcore/res/ethereum/ellaism.json
+++ b/ethcore/res/ethereum/ellaism.json
@@ -29,6 +29,7 @@
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": "0x0",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"wasmActivationTransition": 2000000,
 		"eip140Transition": 2000000,
 		"eip211Transition": 2000000,
--- a/ethcore/res/ethereum/expanse.json
+++ b/ethcore/res/ethereum/expanse.json
@@ -8,19 +8,15 @@
 				"difficultyBoundDivisor": "0x0800",
 				"difficultyIncrementDivisor": "0x3C",
 				"durationLimit": "0x3C",
-				"blockReward": {
-					"0x0": "0x6f05b59d3b200000",
-					"0xC3500": "0x3782DACE9D900000"
-				},
+				"blockReward": "0x6f05b59d3b200000",
 				"homesteadTransition": "0x30d40",
 				"difficultyHardforkTransition": "0x59d9",
 				"difficultyHardforkBoundDivisor": "0x0200",
 				"bombDefuseTransition": "0x30d40",
 				"eip100bTransition": "0xC3500",
 				"metropolisDifficultyIncrementDivisor": "0x1E",
-				"difficultyBombDelays": {
-					"0xC3500": 3000000
-				},
+				"eip649Transition": "0xC3500",
+				"eip649Reward": "0x3782DACE9D900000",
 				"expip2Transition": "0xC3500",
 				"expip2DurationLimit": "0x1E"
 			}
@@ -42,6 +38,7 @@
 		"eip161abcTransition": "0x927C0",
 		"eip161dTransition": "0x927C0",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x927C0",
 		"eip140Transition": "0xC3500",
 		"eip211Transition": "0xC3500",
--- a/ethcore/res/ethereum/foundation.json
+++ b/ethcore/res/ethereum/foundation.json
@@ -7,10 +7,7 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": {
-					"0": "0x4563918244F40000",
-					"4370000": "0x29A2241AF62C0000"
-				},
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0x118c30",
 				"daoHardforkTransition": "0x1d4c00",
 				"daoHardforkBeneficiary": "0xbf4ed7b27f1d666546e30d74d50d173d20bca754",
@@ -132,10 +129,9 @@
 					"0xbb9bc244d798123fde783fcc1c72d3bb8c189413",
 					"0x807640a13483f8ac783c557fcdf27be11ea4ac7a"
 				],
+				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": 4370000,
-				"difficultyBombDelays": {
-					"4370000": 3000000
-				}
+				"eip649Transition": 4370000
 			}
 		}
 	},
@@ -154,6 +150,7 @@
 		"eip161dTransition": 2675000,
 		"eip155Transition": 2675000,
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": 2675000,
 		"eip140Transition": 4370000,
@@ -177,8 +174,8 @@
 		"stateRoot": "0xd7f8974fb5ac78d9ac099b9ad5018bedc2ce0a72dad1827a1709da30580f0544"
 	},
 	"hardcodedSync": 	{
-    "header": "f9020ba0c7139a7f4b14c2e12dbe34aeb92711b37747bf8698ecdd6f2c3b1f5f3840e288a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479452e44f279f4203dcf680395379e5f9990a69f13ca06e817f8a9b206f93a393da76a3ece2a74b98eaecc4dae0cfa8f409455e88ccb4a0d739197170d2bc6bbb24fac0ce695982090702082fe1541bb7634f018dfe87b3a038503b7299fb1c113a78b4a3a5dfd997ef32e7fbf722fc178dfcb21e1af1f7f5b9010000020000000000000008000000000010000000000000000000000000000200000002000000000008000000000000000000000000000000000000000000000000000000000000000001004008000000000000000000000000000080000000000008000000080000000000008000000000000000000000000000040210004000000010000000400000000001040000000200000000000000440008000000040000000000000000000000000010000000000000000000000000000000800000000000100002000000000000000000002000000000000000000000000000000000000080000000100000000000000000040400000000000000004000000000000000870c90e059b181c6835ee8018379fb9583065150845b833d198a7777772e62772e636f6da0171fc2d066507ea10c8c2d7bedd5ccc3f0dfb4d590a3998a614013326c0b213a88b4fd884826187393",
-		"totalDifficulty": "6255555800944520547241",
+    "header": "f9020ba0bb120488b73cb04a3c423dfa6760eb631165fa3d6d8e0b1be360d3e2a00add78a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479452e44f279f4203dcf680395379e5f9990a69f13ca02d2cbb3c43370257122898259f1e06da38fd23031f74b40d6bd022b037ecd3daa0107b3a01662ca77aa1c72cde45bd66c062d781310d7a364e5b6442bd791431cea011e451bfe7b89addb96020182e0e7eb448d0a66303924a2835a149247bea4188b90100000000200004820000130000020000322004002000140000801000081208000880800200100000000a080000000800400000000000080240800000020028a100000400410000001088008008400080000100000000200000000220804028000000302000000180200c004644000000000101800000040040020200100020100220200a00000000280002011040000000000080a00000002002048000100001000206000000c000002010000004800030000000000300884008121000208020080000020280000000010104002000004000002084000c08402820000004000001841109008410040410080080004121044080800800000000004858040000c000870c64944ccfd130835aa801837a212d8320dc6b845b452c758a7777772e62772e636f6da02078861f3b30aaea6fad290d86919dd7542433a56edc1af557426cbd2eacd60d88a68a26940894b23f",
+		"totalDifficulty": "5282739680501645457616",
 		"CHTs": [
 			"0x0eb474b7721727204978e92e27d31cddff56471911e424a4c8271c35f9c982cc",
 			"0xe10e94515fb5ffb7ffa9bf50db4a959b3f50c2ff75e0b8bd5f5e038749e52a11",
@@ -3080,143 +3077,7 @@
 			"0x8a5cb6854c19a865f51e3ee9eaf8e843a97b272f6467634ba40e547a435ef624",
 			"0x9afe42a0dffca8ec063c83908fd6237d6130c9dfeab57078bdd02b6ac6d0ea07",
 			"0xa05cc6108b475d3e68e280e98f514cfb6df4f004e1b7708fcfd4528d346bea6b",
-			"0x71f10879b875caefab46669e8525b9c0487bbe3247e43a6cdb1dedbfb4d4ba33",
-			"0x7debdafd2b1410469fd76e2a39dcd1b8f400292f5359ecd39186a5be0f9e44b8",
-			"0x076f8741b668f3f715a7142f5c1592ffb58ca13e8612edc340619a1ca6ce3f2a",
-			"0xe312bb85cd945eb45f72868e6651633964f22ce3ffcbd0f3701bf57ac0c13edd",
-			"0xe6eae7aad7fed9c690a14eb7aa107c83a5e54736940ac6d82e251181e1103eae",
-			"0x794c8ade9063600442f83d4be14d7bbb191c692314253a2c62dcb33f3e7d28bd",
-			"0x6fd9db41dc1074a4349a6d3881757ad931bdf9ec261fc4e0a5ba9cfa5fafbf41",
-			"0x37557ead7100564651992a919949af3f39f3eacc03aa0ea158dd59abc4e2a93d",
-			"0x7a3b01cf210dfc42e4e41c95af1af357d15409fecae888abf4fa35149f44ed2e",
-			"0x89e952ed9afda8aa0ff80ceb90e5857dc7fc3cb6259ac6089da5fed49223cf42",
-			"0xf1ae8d3769142a1f3c8bc0ecf8454f05b09354a2ad5c921d0a6845417bc2f244",
-			"0xa04e022b2afd83a1e14d0d67595070b29f196dcfc05d92b2ce7c582d67af4a00",
-			"0xa3a0c85dfc3d8055a29de34492b3e231691bb6e9ca06684a205837ab9870c72e",
-			"0xee2529ad0af60748cc0bd8d97189d878643a52710dd200f79f27d8a4a4c8c093",
-			"0xac88fe07805a058f1341ed89795f0e5e9ace050de0742f863c1c9c63b17aed12",
-			"0x8fddc716ab43397541f6b22644949c6d7214b01ca8223310a34840df37c47746",
-			"0x3cbb4d1a2ea6fce170de64b1f4bbb8d9239fe191018b737e62eda77aeb7d0306",
-			"0x3807421ad84d6f2f9d5d830364a0455d6846e114b87cd08a3cb9a33e40c7c084",
-			"0x283199cbf0e1c997025bd36522619417d9e6184073b830fb22c3de106a68b598",
-			"0xcbc85a7ee2122abad27b1f5a07bd15d864af382a62fd552092b7feec4d2e4856",
-			"0x84586eae7108f2e1217d53be81f26bff7cc35409c64c1af827bb5263d813302f",
-			"0x5d2d93535aa7db5e2204e419ecf4d7c0647ce40522806bd24ecf348eb49a1f17",
-			"0x3a6118c84312f120c0d3e4ae4ec0b8103448da31953fa27a8400ed7e4875897e",
-			"0x4a0d1639274d31dc5d9eb49338b204e9cc9610913c0320e7da74a02ed2486fb6",
-			"0xa7770b7cf4f83c387344cff6ddd3441dd131333df0f210a57a271fc1a61f08f8",
-			"0x35066ce607eafc9bdd3386097a98c844bda683ce29faf25708b1a2f3e25c9aca",
-			"0x7068b1f5c017ff5b995f2c65db7daed3cd9fd0e658322ee2debbba7de3ebdd72",
-			"0xfbcf8cec0ed675d12ab4fab45754fd00a329d19ad77afe4413a0581bb6dab8dd",
-			"0x78035e412813b0a3f7e3f46bafe436b57b83278499fe8b8a1bdb3066f538d0b1",
-			"0x28bfbcd7eb38793a1ea711b6dd73c55da0faee3a9707c743737f0692dc6b56a1",
-			"0x9fb1607599329b61570a0daeb7b1a93210ac286e02a64ae309e1950cdd76c5e5",
-			"0x8903d98196291218a50fe03a5cd51592e1b458315491d735187cb39d0e21f397",
-			"0x97aa20d84821d36a44ce18eff501df95549c8266220ad612d0ba9d293d65271a",
-			"0x3245e35a2c6d46002dbf5bfedee31fd28a88409edbc55ee1ef7972a249b1cce2",
-			"0xd6149428168dbf78ab2f706f041a61e3074e3d18ed47bd343d54c3e4f2e051fe",
-			"0x9f4a04d0e3a2b8773a258bfcdee5242e44761aa1a1d2f9a7162f04a2b85de6c8",
-			"0x0162a3449c2be2a0a45a771027e5fb67169c5a56c4ef6f386093fa79f9942fce",
-			"0x5c1196a72f2c6fb5771e0390ef25499acd52c6aeeac3615ff17dcf2c405069ca",
-			"0x319097551b7df30bc67f5ee6f068cf3b34e71371b91635e9009af7acfe97e12d",
-			"0x8b89e2e091824d0c3276128543991cf7c35a82bed4b92b4e67aeb4652033a823",
-			"0x75d6dd431d5568625946b3578e68d47523518cb2e141369aee5273fb7cdc4013",
-			"0xc473b7b23c164759487af8c96865f0f3af3f3e40e9607665f94f937c3334f604",
-			"0x1f61783925fc03f3f5465f37aad2276c466ddb91a47db036f042c0b2edbbf643",
-			"0x3f6370976528cc31e4d099711329d5c670a2538623621b164d470fd7ee2cfb17",
-			"0x3705bd7548fcdeb0dbb3162394edb2adcd5128524eb837b71a04ff0c9c21c22b",
-			"0xe15e99e427efae16230af47e59ff89b76df25db44fa2dfe95d2419b6de35ee7a",
-			"0xbb4a17b5e4879b52e6a4838df9525ae01b168197db2910caea805011588559a7",
-			"0x60e6cc67da461bafef5c3b7e4f9e964a24c3146c4fc22c2e046301e457d1cdfc",
-			"0x72ef37234da6fe157e0e87b11528c3e41d115f10f1dcfce60e54d83c1406989a",
-			"0x63c3a73812427f73be785d4690a6ff81912d3ac17c8d76970ded284383ec97a2",
-			"0xf88c0457e00ec47c27ddc6d99fe6c0b82bf9249018a96b1c7e6b90e906adfaad",
-			"0x9258fa102e450844e091b58dfff2fd05b8fa099d53667626e340fda7ff7f9bd1",
-			"0x68adeaa1063528386db31407596442f815769731da8b560272ba3e1b8817a11a",
-			"0x222a41b6e681d2acf8a9fbd9310d34145a3c49160c29681b95c85176abadddf2",
-			"0x00745c4bb8cf5fb63700444f9258eb94e4b527ba8739fed4bbd7b13083854929",
-			"0xf27199044245d103b296bb81188982baa87175843b06424e0b5fe9dc6e005705",
-			"0xe00c3bfee8d71930faae9ca720f25f342ad166f438c07b0664c0c2d6b9f82c58",
-			"0x05e2bd6caee8a926c0f61bd0e5553b304656cf4749f54bb45b72d2a84fcf2378",
-			"0xcff8627a22e37d1087c3b858079a4f90a1fac65cd397dce26be8c3efe2515e1e",
-			"0x4885a5f8fb2e367a9edb32b02ad4390a4ef8f317a0e7d3bcfd5eccb9d8d05b1d",
-			"0x194638cb01699bfdb67b09ce5e2e8d5dbcfd403ae325a7a0311923ba5207c5b6",
-			"0x20e7c0ec1db7ca6adeeeb0c7950b7911e1627bb173425c4eaa105cfcc9c43db6",
-			"0x1010eb2f28d04da879c67f4c9e51fd480753081eac6123c5161502f3180764f0",
-			"0x09a0d0aac41a4e2fadb48c1751011fb46774f10ee263567d823e275aa0a33ec3",
-			"0xde190e4dde46d967a4e32ecfda15323c7f4081f40d5f245916055af44b008e81",
-			"0x21870402899f8c05003a175f2c0d37fdfb52c9bda3eea3ac8616c832fd8ac173",
-			"0xbec735492b66890aeb0ccb5611a84a908477269c2336e076c42cbb620cee8861",
-			"0xb9daeedd739766f82a95505a9e71daa503a5f0c3ee1a6a97f842b2ffb6ddc6ad",
-			"0x9f30d706fc86c7322a10a3c572df2ef4f2f49bcb49c5afc2c6299cf051e2e38f",
-			"0x9dc1d641fab155885db408328e60c06d97a0e3327b64a18d46e7ced7cacff446",
-			"0x252594a4da3cc4e794d954e88c15a2c847dd84d895eca06b9365a85a71fc46eb",
-			"0x979ea7682319cb0674066b10eb7919a87ad1ec0618ddb24723f13c55899cbb6c",
-			"0x570b4dce3b4613a8266688291f06bafa9d3b7828e3e6a9bfd27e7d2f3ba59125",
-			"0x39e97e3c20af2dcfa347ec193cae2c00100effd4f3987bfe21973db8c5e11fc5",
-			"0xf66b0859b41bf7dc53dd23762ecc593f4572a8a9f82b4c51257af1eda6344bcf",
-			"0xfc32a5b84537ed5947874eca72d189f74676855be5ded4d32eac2ebc0c3a3306",
-			"0xa89c577f12bedcc225cdfbf86ebe8112aef97b9c34a504dda52cea4f40f72be1",
-			"0x67e4b71c08fd93f1c37cc60826c5d8c18e14b89a7f271e0828b114de39aff694",
-			"0x342279789cd6a721f5f4866e3a16d19f88b24ac277563ec7b0716ecdf8dace3d",
-			"0x220a5babb290dc16440f4b01bc117c41af5073110b1375cae0317f9fd364d44c",
-			"0xbc1019eec10ff493e095915f66d46f0855b55aa681352774dc300d54147efb00",
-			"0xa9cc80ffc08c2b4c38fa178e3ac56ef982d0487b7139ed241fdda3894f4b67e2",
-			"0xb35267a4b6020a2e53e112f4ba7807ec50ba78a3b2d64fc3e3bfe918bb25bd9e",
-			"0xd5021c0c199dbb1b61e5e0d4bcd59fd064ddb6d6611421e57161f9c37fba91f0",
-			"0xea0af5bbcc015b06951c9ff3df3c233f4bdd6ef8eab97f0b3a9e10b01efd7a5a",
-			"0xc060f20f45851e6de2fe1dcb6d8996add5335c34892f84a1db711d0c47c5da4a",
-			"0xbd30199b078305b459565598fea6740a4d187e4813d3887f72d7958ebcc8da48",
-			"0xeafa07e96737a0e53ee7a09bc1b394ae4c1ec6c937901a8066b0cb6b6908aff5",
-			"0x68abed404e0a66ded23d152fc5544b14b0a4fe918a51b667f2dc827575c12136",
-			"0x27da4b5111565097dba6e6dade4f0275ea8234b50f391aa270bb3cfb361e6331",
-			"0x85126b95e3532b5045710f60d0aa3f6b0e801130722bc7d85a67479e0b1fba25",
-			"0x658afe5a3d3b0916372785f952d92069045b747fc67be6c8bce3d695a434d058",
-			"0x9017ad7725867d37402da5ef1727289abcdf9982a0c7dbd7fa6f175ef8ff5f90",
-			"0x892a34192371a1de6d4c2ceabeff5aa9e26c3f41e74260d305872f366bdb73d1",
-			"0x786a848c13f84c87ca554654f0ab35f7fea5014669d919595e087e6463c47253",
-			"0xf1235641dd0ac33ed19e39ee58e282f2e0dd8edc0949e0510f2c65469d85e1ef",
-			"0xa55273939373f7a4052d8bc36501fe17d9b571fd170041ada7b4385d49ecb5e6",
-			"0x79ba81c39c2e7dad9768cdbf754242dc2b5b74fde750c32ee153ab121a633406",
-			"0x74ef128355bdc842c1b109d4b1d3dc6f85a21a110b32fe1b4ce71cd282a20ba5",
-			"0xf0a05137693ab9dae7624cbf4abce1554d4921014cda61584d649c66e9eb09f0",
-			"0x5566a8d7495aae3cb42e66bcc683bb194f53894e3281812484bf36da583b7d9a",
-			"0xbe65f10ed3eb5e862850eb4e30c73172f5417634b087b1dece7df97dda2857c9",
-			"0x5ad40161397a2d0f53d71284d878e711b6d73930d2a79a789e4bf08223e9eeb9",
-			"0x1a88c4e12ba89abf67c8f8de223964e4f3d0ee8951b9a1851c9172b278b956e8",
-			"0xc1bae22721de65936975b20b01380c7707cb603622106a166c1472bdcaaaf94b",
-			"0x68106522840c17b0e93b0cacfdbb1d2c5b219cb90aa61a5d0b04a0291caa4b82",
-			"0x0e8a214b18b92fc025bd374a8d9859244b3855a7d3a364d1a0e092546a17b2b0",
-			"0x584294fe2fc330adfcbbaf251480f2c727da2d38ce54ffcc1b363adb9c0fdb0a",
-			"0xb86b9042acd8d6dd4eaa967b3dce6e4e49cbad95f4a7cfea95299da0cb3aecab",
-			"0x99d4f215dabbe6bcd894d4ce7ee6d16a4543c38d9ab19a4f3b933f37eaa7fa5f",
-			"0xd078bfda23ecf966b656aabf0bb69d27902d33773b2471145268426846a5a1b8",
-			"0x87234af13d71e681c987c38fcc3661889b406e298e3a1ffbd5115fe6fe6e65c8",
-			"0xb9f78fdabc8cd4fbb08fd1e1d00ed552c4bc7cba0672ce91c52deb2834a7b223",
-			"0x76704df0766b51c9327acf08ffd35fb9c3f041b73808094b0d4ae1f7e7d7d0b8",
-			"0xb5e4ec16c993e2ade6e951099512deb2f8fd07956e4d97dfc639a7eeef96d336",
-			"0xc9c919862f5a82a5381e7def2883049fbbb99f24be9902152323811e32db40bc",
-			"0x8df21edd784b8b776ffd603a6da87a6602e6424cb3905d977b909a7b10160abe",
-			"0xd5c524bf24c3c8f2e9cccd5aff20b96fbb8f2045f37ef1014eeea1b82787361f",
-			"0xb64756c799db5e1eca16416cb833605916a9bbbcb3c82a54def34f16e6fcfdaa",
-			"0xfac273bab2facbfc28e2c53c03a44e69ddadfbf57b08499bb43855abae456f1c",
-			"0x43f8990cdc4735bc47fd89cd23c9a99d5453885b1903d4b3185b6b0413735ff6",
-			"0x7420a69d819df5f4106fc9e315e8c125c8876a3a1cae8ef7198a921c121792ec",
-			"0x696861af19fa56f07d5e2eacffa3508cc3638b7acfe4789c002929dfdc47fc3a",
-			"0x86c80d2150fca01803a41a900e66b764ce82af2e0ec19fde53971afbb6390ead",
-			"0x9cf14af73b44b555ceec13119567723ae8e8af927a6f24846635ff5000acfec6",
-			"0x95b50e682e4b6b2a08606a62bce427682ce484c2056d891dc206fae9e062d3f0",
-			"0x789755e975f432a059cb5cbeb067c8f9dfd97b54d8d1a45a1e47592d9eb770d6",
-			"0x87b682b780890ad3d542c76548d7d5287fb244291d62619ed079340293a245d6",
-			"0x8c0155b066048d9e95f5eb1b6ecfcc179feb71ee0426301b03f778573eeee7a7",
-			"0x0fe45f09ef25d05e5c42751a35714af86a5d7a4fa235956edaa36dd0e5ea7533",
-			"0x3b5ee72615fcc04f48cec067ba2d1d9bc0e64c4cdf9d5bcf97c1a999ae940245",
-			"0xcf773973676c9b0e31a549d78a6bbc79826c471b6fed42078d9b35a08d1d28a0",
-			"0xd5ecadc4dba308c0d790adea1e118d6984716600091d341276311631acfbb267",
-			"0xf344c0cf6516f0fa6617e48076726aefbdaaf5a31f67ad8199bc3f6e426bf904",
-			"0x3f3d2d33f36ba9009e9a72f3f5bbcb5df5392a19fc7afc8d37823aaf52b03477",
-			"0x346a89411f090d559ff90e670bf0a385b1b09f117fc9ffa18b09d3b6d5d8e45c",
-			"0x5bc5689e2b4572b8ceea472cc7827e22cbfd018920beebf5c5b25f65f5cd5357"
+			"0x71f10879b875caefab46669e8525b9c0487bbe3247e43a6cdb1dedbfb4d4ba33"
 		]
 	},
 	"nodes": [
--- a/ethcore/res/ethereum/frontier_like_test.json
+++ b/ethcore/res/ethereum/frontier_like_test.json
@@ -143,6 +143,7 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
--- a/ethcore/res/ethereum/frontier_test.json
+++ b/ethcore/res/ethereum/frontier_test.json
@@ -23,6 +23,7 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
--- a/ethcore/res/ethereum/homestead_test.json
+++ b/ethcore/res/ethereum/homestead_test.json
@@ -19,6 +19,7 @@
 		"minGasLimit": "0x1388",
 		"networkID" : "0x1",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff",
 		"eip150Transition": "0x7fffffffffffffff",
 		"eip160Transition": "0x7fffffffffffffff",
--- a/ethcore/res/ethereum/kovan.json
+++ b/ethcore/res/ethereum/kovan.json
@@ -19,7 +19,7 @@
 						"0x00a0a24b9f0e5ec7aa4c7389b8302fd0123194de"
 					]
 				},
-				"validateScoreTransition": 4301764,
+				"validateScoreTransition": 1000000,
 				"validateStepTransition": 1500000,
 				"maximumUncleCountTransition": 5067000,
 				"maximumUncleCount": 0
@@ -43,13 +43,7 @@
 		"eip211Transition": 5067000,
 		"eip214Transition": 5067000,
 		"eip658Transition": 5067000,
-		"wasmActivationTransition": 6600000,
-		"eip145Transition": 9200000,
-		"eip1014Transition": 9200000,
-		"eip1052Transition": 9200000,
-		"eip1283Transition": 9200000,
-		"kip4Transition": 9200000,
-		"kip6Transition": 9200000
+		"wasmActivationTransition": 6600000
 	},
 	"genesis": {
 		"seal": {
@@ -62,8 +56,8 @@
 		"gasLimit": "0x5B8D80"
 	},
 	"hardcodedSync": {
-		"header": "f9023ea00861b3771ffb84fce48b8ba3c54a09f81e91ccb38c401261f06d370098889a43a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479400e6d2b931f55a3f1701c7389d592a7778897879a071cc81d58cdd21d1e17f7389e55c530cd9f94cc15bb32af6477320682327dcffa06090021a7c09ae5e75e443410ebdb76de04f1eafb0ab910daae96ee6eec560eaa032510bf257dd03b11f3b4761b94b495a5b5a18cd6eb17c77785e0f46e2ffc882b901000000000000008000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000000000000400000000004000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000090fffffffffffffffffffffffffffffffd8381e001837a12008306697a845b83bd6096d583010b068650617269747986312e32372e30826c698416e0ef58b841117e2088e2835bf2afcd5d48f42b3bf2a1f33435f21f089ead2a6bae7d01c1486e645b460bb3c726a827ff1eb50e0579f3410563bae090fc256cf1d8d594b82100",
-		"totalDifficulty": "2845866505151538604560067685603735513869853136",
+		"header": "f9023ea070413bfe3ceb9160c7dee87bf060a0cc5e324f7c539cfce4e78802ff805063b6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479400e4a10650e5a6d6001c38ff8e64f97016a1645ca0f8ac12c30b4fd0d27a1a50c090659014574b554ba6e9cdb76f57efbcfbd390a9a0b474ac6cc4673c17c5f511a8b43cc44dbb01bb028735830163667d7a3a2582b9a0bcd44b7c04fa24760df7d733ca8ecd99e8da89de0716e6017fffa434bfd7519ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000090fffffffffffffffffffffffffffffffd83755801837a11f88301d8de845b27471c96d583010b038650617269747986312e32362e31826c698416c9d1c7b8418bc805f23fb01fdd498b37df5519f49691d65160fe6a6794b8106e2ecc4782407f0dae3a512546b7d93e89bbb2a761c750553deeea1f9401231f56ae0ccb059201",
+		"totalDifficulty": "2654916374389120143910668097894183918476475680",
 		"CHTs": [
 			"0xdb9557458495268ddd69409fc1f66631ed5ff9bf6c479be6eabe5d83a460acac",
 			"0xd413800c22172be6e0b7a36348c90098955991f119ddad32c5b928e8db4deb02",
@@ -3946,281 +3940,7 @@
 			"0x36e94b03402f18c689f5234973ce1e626a82aac085dbdd682b51cce21f8c1872",
 			"0x00abd1d34c7e55f58681866558cb844c11faa55e8cac70ede75811f55341cfde",
 			"0x9983fc20e63e77ec0680522035b03167403681674ec62293cd6b7fe360c69157",
-			"0xe98b658fb8b6b7fba7463562f86348bf1e3534bc9148e8559423b3ee5ab68472",
-			"0x77ea189d3a408a8c5b1792881d93ba7a471f90a976ed334cfbdf865ff94cf20f",
-			"0xfbe2fb93b3ecb384679870205f2be2f47140f8d832f841ba8653e00d68056c82",
-			"0x330f5f04314ae57097db5258d861b993cbdc2ca0522421917463b94636a99d1b",
-			"0xa59cbefffd0e1cff04bd4004d21fbb64c4ca542b98220487ccc79a39a6a0fba8",
-			"0xe08f21b0f5ab216c1009c904939515d0ef8d8ca80f8c3cd5465944bb6550e728",
-			"0x37f1db42a7e99ea8b6d7f9ec5bfb39f9613cf79d98345816533b85726c64dab8",
-			"0x8c226434c5115b7ac0f894d8c4389a1e38a3118fa0993b59a42291286b85bd7e",
-			"0xa9977dc362eba9d32d13188dffa6cd0178e0b8c29cc24a3c04cd6cb0781fc133",
-			"0x502a68fcd1c187d662ff6852179d7602b04b5ec3141ffb39841b571bbc6cce25",
-			"0x09a716a32626ad3443d7f5f6e5fce5145e8b962a531464e36aae6356ae93b15f",
-			"0x2c165daaf0e8a4433d8bf97091bb573f1a7cbc7e82f2af353af9c580fbffa8c6",
-			"0xd8b47ed7ed3bb85bf44ac2b5e5916bbb282353f71dea6e172434f05cb1276c4b",
-			"0x2bff102b5209c88370b2deaf941653c364a90b39a6c3402336b8b3c9b47731a9",
-			"0xf6011e416be00e243d9b6b57df1bec2458d271b2a8a964292521f6f8bc7355de",
-			"0x8f4a6d08359aa81c14391d8483bb8e621c24bac1e32b2c5c505d5617487bd06d",
-			"0xd2f89aa90547e1956491879dd5924a50142d76460532f00423cfe70f36546873",
-			"0x929b13fbde5275f999f145a273219d6f7f4c25ac29b4eab3f89d68305e7f4341",
-			"0x1e7e79d55594c3555eb7d90e4b5bcc8b59ecd98848884b81ac5c2d53bebd5cbb",
-			"0x11c2705c4a89fa9187f63dfc7a8bd4e2c087d6e937e777393f1e2856f6f00104",
-			"0x294b40af144ac5046bd2a5451d1cc9900858e0e351f3f78b50b2dbc203111600",
-			"0x26432c2ba81f919c085a4d2326c22bac341c17f456d8a93a1971c0fd741ea79a",
-			"0xc488baa35e04ed6bf20753fcf856f31a98c00be65d51b73c6a5490d18fb89d71",
-			"0x915e1768627ebbee21159a0562d8a5df69b05f057fdc8b4bb69bcadaeadf2ae6",
-			"0x2303b2be6801e3fe8c02c0d0355069240da4f617b47a4ce6bbfaaae56a1e0915",
-			"0x0e4af9d5e2cab6a62d9203979db08996bd1f111a315049859e2093e83e465262",
-			"0xe54756890992736382616fceb3999d22ae462b9b5f8b1da072277da2df6b5f4b",
-			"0xb5aa407d54e2ea651563333d3d330af0cf45a992bf89db0c229962454c4da4cf",
-			"0x88832a6db2c8c3d899dc59154ca323c08c5eaa8c05d142978490246e7b4ba7ad",
-			"0xdca9619220c991618eca5cb18b1c14c6fe4167614a8360c9e1737c93a129e714",
-			"0x3fad9a66462792be9f771b39b6f64e537683a74441b85b53f9c5e6a2fb687100",
-			"0x6dc5466ae00317d52511d9e153ffa37cb6060639a010c8db25b33aed702b486e",
-			"0x2a2ca3148598d3106bae23b6f66a24e3e93afeb576d283ba6822220780008e95",
-			"0x480f699ec76a16530e382c2e8d91c7edd3ec0d393ccdeb28c7d692eb52b0af96",
-			"0x082d3f5dcff2a41e2fad715d64eef361271648bd976d895b40765089c544b65e",
-			"0xed14dc5ed74dfdda8b45dfcfe99e8581767cac57505805a4945b79e2110bf92c",
-			"0x6890d1a6c90f5c1020ea4439957ea54df3cc22f14e22047f63c9a93696210b95",
-			"0x55ae4e30fc02206a0f389e03c0ef5b1409f8fe34d6a5dbd5487af608e3b82369",
-			"0xa709e308a7899591337d59ea459098364c1d6638202047583851acc5e6df5017",
-			"0xaed8371c95bccbe53effffee29f40a3e9656bc95cceefa364f7191415dbe15bd",
-			"0xa7450bb8e1ff3c7b53bada0cb8ae783e561a3ef74cd3be0d19cb9ac5ae807aea",
-			"0x9fdebd0ae46437e3421d7f0a95a76f47b34f0e0eda37d69c078ef5b44411c027",
-			"0xa18a165a98307fb994401171c41e375a4637fcf2beeaec8c18fd24304b068570",
-			"0x930f3cd1edb90c020c19a6f6a8b86c86981c3ebb8fc19073f09c345fa4b0ea6e",
-			"0xe4c0549658dbbf4f541c60606c8b85dba190f58e5af0bcfbed101e0ff4a8f455",
-			"0xcfd5428494534819ee14e002c69987fc54207917e83a2b6e97a1e1b801a5d939",
-			"0x0cc3a6a2a5de66f64f5491908b5585eb3464fda42c7a58a9100a8cd0ce763b04",
-			"0xcf635d0b4522c64a9b00902770ae33b618580983bb32b94134a69ca8f6c6258f",
-			"0x2cf5c41cf911dff328ef15253a7419733a104cf9cd1846af43d5fdcd914b321c",
-			"0x6d4ea125dbf83b8a9dcba40c4a81673a365ce81dd8eb1fc10510ee7e80a40b1f",
-			"0x9c68f243fdf1738f9218c30664318278afa8f461c13bf5e1bf30133d3fa6347e",
-			"0x62aa880648363c1f3b5bbba3e73dc58566870ddbde0911c5e11aca003a13b525",
-			"0x286a2b6f2e35c2a6900a02d37d82263dc55a3c40d6c40488258af61f8cb8b589",
-			"0x296136ec9fba18ad43a5435acbc3006e52a182aea1e3eb005f25ceaafde2d0de",
-			"0x9ebd2127fa6f5f43a03fcad8dea37bde3893f627b48e63b9e2c6e33af811a95a",
-			"0xe8e58e2b6fe45ba1881eef4ec1e1d954e12793ee68060d50b9c9502009725317",
-			"0xf831613def863279307f637be60e9608179e9a148557585034d20816ed7d5553",
-			"0x9ac311437bfcaa1c66e1c32fa18f8964ca9d9ffe3cb3be306b64519b35051e48",
-			"0x931a4862f94054ec0f96037a225f1c3421ef99d8e4a8f774407cf913273bf4ec",
-			"0x07dead0442ebccefbadb2859e0f462fe8d3e6677c7fd04b0f35165ceb017c171",
-			"0xc4afb80e1dcb56ab83d5b20475d2212b6c55ab63fee058a914661657d2b1187e",
-			"0xe198b8ed96c1b7dcefab5197036f1e5789ea6622dcca2d817e63537b00710b6f",
-			"0x728b8b91918a059e3f46ec7658bc5948016f76ec200d91ec3a163bad8ad6bfd6",
-			"0xacdebce23301e49e068c83a73ad8484d8af7a0c28d066e62787542e154b42559",
-			"0x7f66807da0c2b155126b1d3a69488b10de7f0ca38f6cfe6fa670dce511a1f667",
-			"0xabf510ce1a016b5b3d4610b3cc5c9dec43a6a66f3555a70e1c16cd451e8894c6",
-			"0x56ee11eb3233fefdc056827fccbea1ff2be8a3f460038eef68a1c730bc1104cf",
-			"0xbc4df43d4acd0fc2cea064abc5b5d1754b29073533652448d44c09adc1d32998",
-			"0xf61b97d2d1e537a6d20438f4729bb59ffc8db6b7375c6e710b4be9e136f1e19d",
-			"0xf89f04d5cde25522103d1e175d68dfb4955b4519a5c2cda1a041298579174be1",
-			"0x702c60e25d6a10ac9657553e376f2385cc94737ee292a3ae671ec02af982ad84",
-			"0x5194589410d5f02de764bba1c25da027861793270c956c56e67e017d89323799",
-			"0xc448a3b8bb1b6efed04d84f82d63aa0c7ca19d3cbf817efe4db82b897ad6a019",
-			"0xdee875d8c517db5cf20b745be7ea1d389612e47880657d003c6bfcfdbc8a6303",
-			"0x0528ce8bc52f4878268be5e00b5028c9af85cf61a6279e75240e2adf7b498ac2",
-			"0x6cc80f5c62a1510d9cc97ca8b4c6245938ddbefce782635dde0ca2516932fa21",
-			"0x184f9e305ce4fa0bdb47ad00bc7d10691bfbd7cb13b9c9d4d82c37678e8df080",
-			"0x69456f4aae64f57b3709d6c6701a1894802a4db96374da6b979b87aeaa5e301e",
-			"0x60d1bd0acd9013472acc0b8ce0b90a088f35d5c19645146ed8b3c6330ec92052",
-			"0x09f87c83c6be698b2eff45ffbeef79254e5ff8d3534831c79346e5b837110c1d",
-			"0xc5fc2dab2c43c27132f31a915423a6d6a30a560e4aa266483ef2ef1ac48d0fba",
-			"0x87a147b03150b429b0c86569db27ecde32c1bb9a48b1ea4426d8dfb895339673",
-			"0x1a68fd5e6efa8e5183843fad88d6445fe8b07c01b884f30563ce527e6b10749d",
-			"0x4123e02f2c2869bfd99f3138aac82bcf1923260ac28f33bc4ff2dfcd54c48e4b",
-			"0x452345c2de5fb18422b4327a79053cfff33f277f0e3fc69bf2073d0bda4dfb74",
-			"0x830eb26c402a88c6281b0a48a93ab16a64a8e4244f87d589b471a3ceb4577f6a",
-			"0x84445f1f8805d911009a3e55ebda5e12ff347e5a34d0028ca44a2a26846ba903",
-			"0xf91a600ecc8aa47f838a8d877487c15babc10ff97a5be8bbe4c3eb705fb04dc5",
-			"0x01e749439d413c66340934dce9d4c55179375208069fefbf89aef7c3c7f02bb8",
-			"0xacfb6917a7365046ccbad1ca8fdaccf8164c216ba8d96cf64af5340ee3aec2c7",
-			"0xa1c20a4bb21a0a99f3a38818c05a3ba66e8321f24dcc7ab26487810be8211dbc",
-			"0x7c88ea06f3c8cab9ac0b29376f53fff4b56672a1704520fbe8de0e3ca0bf8acc",
-			"0xc19e59ef2361963b94bb211b8f6c172670ed83fce3d54b3e00d1a82f292d1d2f",
-			"0x386ebf9ab1a551ddaf599d9384e70a34a961ec55d5f609c088c6fdbf38add80f",
-			"0x8a635842c7d38cb2bae11ebe3f6ec09e2d41ef6b7093e4ea8cbf079df97f06e8",
-			"0x2d12afbf38c0378d287693cc7fd49f3e068d454ac5ea7bc76f6b3e505bb09f27",
-			"0x33b7eb72362caff0e54cd853549bc4a802345d774856558a8b128e494ec63948",
-			"0x31eef3a0c2c9f586ad2305d8ed9831619ad6ce2aee9a16800cf4aa048b1d593d",
-			"0xfbeb707dd62204a0f3a06ef9046fba5b3b88fff3a38b5b08cc3213f5965c69c8",
-			"0xc8913325245c39d0609c6af407354e9d309c5d582c8957a90c86c944d2f5c6aa",
-			"0xbedd0ccdb57b01e688c14d6230aa84f5912cf13a72839f654eede63ca05ff52e",
-			"0x0b0b7435e02cbc3654eabd042c32409f4e178cb60f5e306ba041c985378cc286",
-			"0x749b3fade2cbe924b3d76f2b9e216c1675e8687bf7ede81b090ea36a4468871a",
-			"0x9a59125cd56262bf0b6d2393be4ba8f769b9d5a53b644a0700c9905dc4d91c14",
-			"0xdd2001f6cbcaf2d29a7d022e6f723e4691390f56ed6a599cb58bee74c64c67a7",
-			"0x05870eb07cf5d1c1013fedd8cbab73b7341e930a0c02e2dfe898d5299981e34d",
-			"0xef78e2f60d74c818cbf8996913c08a7c5abedb3f0f7ca412737c071cd6a38ccc",
-			"0x636a6d39d02bc22c139d9e203b1ae8b2dc485cb596641ba6e05929296e87ffc4",
-			"0x8cd6e1340deed5cf75bb30c3183807b653c7ccca712f379d5f885ef1a4100945",
-			"0x549d904ec260af5776c241a80c2075e31869b8da7026a078fe158c0b0d646b11",
-			"0xc73927c3be804cdab32e543e78f38f8e0899d7f0418e0b37af336c2bb37269cd",
-			"0x62a4d4dc610995d0f08756056ac199c3f0959674eee8d4503067b822e37bd1a5",
-			"0x4b4a3cb0ac65532d63592978b1afe838cceb7cac04d30a58cd4d73af4b99d2de",
-			"0x2c5aa96bb3b58a76b4acefd0275f9f7f82418501ac2c2052e0a5f43eaa4eed64",
-			"0xd6b8f1a8e502a93e14a8177bd750fb7e7974b7527f50bee37690b523dbeb077e",
-			"0xaf38bbf2941d5ac311f8ab4cec22642049473bb3a8493ecc27cce73dad188797",
-			"0x778b83f79934655d67e52a38c09410e5b5cc28b26f4f70b84d2bdff5519bcc74",
-			"0xcc016a4cf3d1f7119704551809e89c1b4f95d1dfc4cb7f95db2c5d2a6ff1036a",
-			"0x6b904799fc1df35a787bd7b1ce4337697bad98b25b2bbf264a7bc68d452df41c",
-			"0x915536046dad19310976f8d158795e4237bec7fd5c2d2fc8ab1fd6a3b5b75e43",
-			"0xc84167f477d317ed1e6b1452cd746d43ed679f4ff2eae84b1676ae99d3bb0fca",
-			"0x71758a9fb0e66a7a04a076569cd3bb41d5b91cd1cc26b21a773e67524af84e63",
-			"0x54f60d40ea84652f938d2856533d82a7c0b91091a0ad009f48e599a917b52bb1",
-			"0x618cec420aeabdbdedb8afba71b0d0408da5095ea3231455b6c817f9a585d437",
-			"0x57cf387db60cc35262bfa939b0272af7c490720e496b5f8cbbed6b4b26397824",
-			"0x7c8973551ad57c278a0d8702cfed004dac293e2b9464debdc48fa88be033ba5c",
-			"0xc80eed1b2bf137a5574d40252d4d02d0e3f87618c79b764407d8009a2b4932e2",
-			"0x09ab540be725d669810c498557b61a53b343104c5303cccaeb31e518782d64d0",
-			"0xc996eeca57ce9a7ed79f6db45ecefe1710abc4b3e21dec8f707eb5f7632c9c43",
-			"0x160af8ed3f5f55bfe0a9129da94ed002277580b297e29cbe23a962c41eed1cf4",
-			"0xb8935e0d55dad821ba5605607cd6a025d6ff76ac3d9d855fbdb3d000ef864dec",
-			"0x10f6dcd55318225d362a40859030fed3199ae015791ccf4c4bb343e7cb97822f",
-			"0x6f3a76c93761f73bd148c57f2bd00670c20bbd19338b7fddbbca65e598b70ab5",
-			"0x6e99e5531942dde6d881eac1f03c6fd2ba6f9d79b6f88408eca815d84ff48157",
-			"0xb05ebff5d64b736d36b372da80fe28d6e76b64c74e1ca94f1a859936c7ecfe7b",
-			"0x815a140ac8538595dd724ab2c31e13d30c03ed3b64d2cbc72871fe402c7c88b8",
-			"0xf4376c81472e0b3995618f7845887159eec1e929b8a485c2693219f4d5ade069",
-			"0x30ff47cd807666e5ac48659bbfdcf8883fc1c9ea4e9be8b397dbc969a82f8d95",
-			"0x74e35254636ae2f72005ec69e62273e9cb7387fbd4234aa58184e11725e2f569",
-			"0xb4f3de4e9a22e787077a53017e72bcc8ec26a1499c98305dabb61ce6582cbb09",
-			"0x3a05acc943f2b7d0c93cb4c5fcbbfa3ab9e536a2cda7f1c325fe3748401b4f71",
-			"0xd75d428c14fcc7ceb929328989235a5fc46f8ed3e0136d81dfc15866756455a1",
-			"0x20833cf410b3a0626a6c7e07d5fe09bee17b218416725ec3fac716597e1f6576",
-			"0xed31b1b593289be968e483888fc80e5c360beb66626702f388a0848bf104687a",
-			"0xf55fdb35314f9b873a70bb207536eb2e22958ff9264f1e088b0dd82bb9358b2a",
-			"0x701d2b5d8794e244d85366d13fa0382827ccbcf557ae2735bc3f88bcb5c778d9",
-			"0x0492794944f7d179da85f68eec5ce4575a90b7a6f161ae199373ac4685c6c665",
-			"0xb1fb246d93a6ca7a0ce6518a4d0cbaab074bf2ada05fad7a6d199cb830bebf8f",
-			"0x77172f0acbcf0eb3ffc2e314b548210fc74c10826162b2d63195cb984d606623",
-			"0xc9f684762b2378428ebf3dc8e207fe8d2b33c5a0ae1510ef44e2dda7e5979faa",
-			"0xeb864bdea464cbc95b1e3a4be62231f91d1230179b7bf61f755abf5f05cbc9a3",
-			"0x10fb3751407e792cd70fced2271f125d438d9cf3843d9ac6f89681616d0cb1ad",
-			"0x79f96b934d4b22eb9315230c113fcfe0ee2828133e10b14cf2e9b3a8007dd7ec",
-			"0xf8c0546c0c5eb3d9ee16295c5e0fb510a0ff3f55cb654313db2d8ec6195ee996",
-			"0xcdc41342d4045064634291c9bbce68efd7227bc2832b372502fd4907f1957ca3",
-			"0x7c09a67309e6a0993fe1cabb7528e5cab4ba6a79042b22b3a6cbb10778cdecc3",
-			"0x7d5c881d1a199b82608d7e27456788164041cb1e5ece5e3b813db550cb402203",
-			"0x4f7238409440404425f9f60c034696e4713bab4f4e507b76bdb2697d1117ad70",
-			"0x8e8642cc65aae464b068178c4c2276dc8860b63cdd8f3447ba07a0e7a9b20c71",
-			"0x59fd79b1b77ddb040cb6bd45f10ec5ebbc7ba421e14dd79755e568774010041f",
-			"0xc8bfd004b479e0ac8e2e798045343198909a6f5657625028bd28af69de58d9d0",
-			"0xb550f5483d01e8d32258708d82d463f28658d5155a15da214bb2c748e27365e6",
-			"0xeb7de7083d7c73f3f443e6d009e97783ecefd77157b830cab2ae7d41a91b0b0c",
-			"0x6f3145fafbfa23c5667b646b3b5fe12b0fb08e45f09e62e9254efed6ed812880",
-			"0x66cbab429d401739e655ee55de9dc3ee6223230e38daadb1fee88da03c46197e",
-			"0x410eb1081b98fc38f2447bcd358a0996bb9660f949b4d9d6a6596aa41de59557",
-			"0x2fb84f43e9750be8f37cd293742776ec76d95170689710254d7847369626d6c8",
-			"0xf1d6c7c8a81aeb7611531452bc46b69db1b56a31c1c835ec5b497b6f4aad2b8e",
-			"0x1449b942575209a4bfcac57d594cba694bf494e98e154142d5423deb193ad2dc",
-			"0xa14bbe0f97892409b86989212bf815a5024769707bb8fea7479417402a346f05",
-			"0x1ebaf8a3c224720c6cb4079b8e355411f0181318dff7766faa204d4292e6593f",
-			"0x70169dab4258b561057c427b3d31de403d87302180db843d3ac6fcece4a8bff6",
-			"0xeafa1e0854e1d0dedffc92fe173f2333d3a0581199fd3c63ea69356206329d65",
-			"0x54de1a943017c40959dbfc25e318b0055b0e041cb170b0f34e1fe76f41bf2f15",
-			"0xb4ce2d897abe390b9b53be9809fbc1dce8d23c2d726dfa1d0e1419d8caf2c6a5",
-			"0xca872995f8268bb0855fc685e69d590defd10fc6befb61a57ae75255ef92cc23",
-			"0x3e3606562cdf9f8460c18efeca2d7f3649ac96fcd81d2bbd501e73a01c729f27",
-			"0xec09b7014e049e25e0749f0a0899a2893605003f128bca3bfbe92a00c9dbbda8",
-			"0x9421e443b91c741c80138137362f7b30dd9a0db6a815a3b4a799ec12ba6de4c4",
-			"0x78c95ab7995ca6058f64f7fc4af9575923bfa70a092ad2268f0b2a3a20dcc247",
-			"0x386b36edeea33668de333683b1ec3d9c665f150aa96cf78be27fdfd8f185479e",
-			"0xc732d05a6122e07f7566a2a751adf5da1cd1ee23dc0b34c0cfe7cc12f0970c5f",
-			"0x283d97620ed18ac85ab1d2c613d64df485b6efa26aa6efa71f840240a95cc240",
-			"0xce779d27aacf6e512f5b52f96507325568f754b31db766cb4aede53c9e1845af",
-			"0x50bbb90f2a3cf4c479be3e118936246db591f98e37caef06fbee553502b4c364",
-			"0xcdf95c14c577f913331709c5d044fa536a4afbc06cd8d60ea7b5d9ac463e86e1",
-			"0x3a7d03a8ed71d0ef15ed70677ece7a2ea32ad1e96ea5c3266a1d9f580efa862e",
-			"0xda132c0fa137c542b06170fe085b483afdbc97c63b4546079262ed0fe1125c1b",
-			"0xe4cc4056951325ee41cbb70fb823eccad0f266e032e839a2e3a8e851f0a6c73a",
-			"0xc301415694835a5bf36e226ffa42d2fa8069dba6be6becbc2a7a6653c295e8a4",
-			"0x1856c6fbe4494ba46fb87deed5c10e361a83ee73bfbc8f1b604c6fc0301f62db",
-			"0x1b822bd73acd2fed2f8daf6936ddc8175507f373e701217b645cd6cb2ef2019f",
-			"0xdaec59b4c520d6b5be4d82b1b1338a5dd55c9df443d697fbab750c337f6986d3",
-			"0xce6ff73593693f7cda1159724457a2aebf0ca608105a5926fc98afe5010349b1",
-			"0x53c50cc4da6192ddfa851aa104f92c865ce212a87500098d18100394140ad6ce",
-			"0xf015a6887a543a0849a128cec761f10f7d94f7be083f739c767c727aa9ed95d1",
-			"0xa54bdb8a7ce7327aee991715a7d673d403f2248574bbc0ae5aeb9a32b3d9528d",
-			"0x47d46b4777a303430fa4e45305b31a113acb4aeebf205ca215447f9d27ea401b",
-			"0x7a9504b64ca570814194b95acb8400357667122b5b1fa4cef386b35e28de2c61",
-			"0xa63e5964474672c45b8b021b7cc408e30364c163c800fc302f342f119689e022",
-			"0x988eaa51716d4cb523fdd5fed04dcc195c5fe00a8e4b6135fe70b6f09520bdb0",
-			"0xfb8a8f98809114b3d433875844e5fe90cf0321b772aaf86863f96e8013b8de7c",
-			"0xc893ef50496aa272414f6a06af7d53281fbc7265a3e389a42c7c49d32d24fc46",
-			"0x4956f7747cb6489eeeb92b1c759f54d534397074c9cd017b2f5181187248449f",
-			"0x4b48dfaa0b7984d4eea56cc40c5130936f98752e1c2d02762b5caab600c39691",
-			"0x23df05dd92b7e6c024c02fef9cc6aef2ceea2d0a4827de1f87bc7eb4f8c8907c",
-			"0x47ba2e8a2e5d4fd0bb04be0d76a2d553d4bbfc574d1b5c715393fea03672f4dd",
-			"0xa8553d8cc2aa6cfa89c96564022be9e89aa5a6b0b98d88fb7976583cb2b4d2ef",
-			"0xaa3e7684a3a9daeb343a10566c21ed1fccb46f4ac4b80efaa8725127468b7072",
-			"0x55acb0e629a6b654ba723f330770a4238cee9aa9b98fc4536a7c8bcf6050b9e0",
-			"0xcf2cc1a66e1d9e2fcd8709c6e695bef0ea95e4d14523d34a544adacaef0bf786",
-			"0x6d955c9a59acd3c90593b8eb22dcd614a89ec947d554a0fc8323e817cea7b332",
-			"0xe29b3ce7a0e8325135a33a1127d1db2f17637090712a0b440bcc3a3bd6301186",
-			"0x47187e16fd16d67eb94e48e2f35eb520191ce412b95c1d18443487887700c516",
-			"0xe2ea962ec229af7a26687783a7ba8f65490d9aed8f34bdf7aeb978c901f67c1f",
-			"0xcbbc65451fd646ce67f78593806e3b66379d1a3aed301e6e67df9e3ecfd3cdea",
-			"0xedc8308273c7ec9b50c8c328c62cda10e4e8505e3f67d134d0961d0fda239747",
-			"0x57d5dda883a2dc7ef9b36453edcf481d97c06113d7a060131dd39133ded06e6a",
-			"0x9392ffa1001ca3a85455471b660ee9d89c8d6d421fb4b00d7ef1eaef22747009",
-			"0x0751d3a58d8bfce5febe6980c821c92f9bf5beb8685358375640f751fc5c8369",
-			"0x6ad5fcb53f602b55dc728c7850f628ed5c500b65c6b0d22c077fc4df980d9306",
-			"0xb9f2d92291fede8a3def3f527a8449f6e330d587df1ec3daedc1f42cdcbd6af2",
-			"0x85eef96182742e4090221c1ac4433c106467e48f8c46ead864e6150d7d50946d",
-			"0x6e800d685f7f68839978c124f300aedb6c34dd7ccd7b2dcd3144223d0e3db527",
-			"0x9395edff6ff47843cda1e5cee061f449dcb7b5a0ca07daf9788079aa7c5b2ca3",
-			"0xa2995f2cd9a79024f92ecfaac2cbb17a9325b3f54480bf2ae5f3d171132780f6",
-			"0xef907147aaa023015d9b8f3e7414dd4b84e551af0d9f19fb918ad5f632096657",
-			"0xa44d76467ee5fd7acc90c13bb12740b3fa8a0096ad0be0e3619841e67323c5ba",
-			"0xaa574a790a0a50cdac6be3819be64c67427f5a891a0029333da60a01680d83f3",
-			"0x531d9c8a5d68299fd55cfe498922d54af8b119500f7e6bc0c1b66b45234dab1d",
-			"0x45cc89de803b6eea973d45c26b4b4287d322dae61163ecebdd3db92f8a40be52",
-			"0xb305c50ca54418553d0a08c2a01908f3d413ee3eafb55eeb4cfe32aaad32597c",
-			"0x5767e979f2322c81537baf5d300d24e736373eb399c0e7ae989fc0f177c40bcd",
-			"0xe3646fedcf2aa89d6ab6a6a225cbfcf539317e4c59be2655b46f0d89142d9b18",
-			"0x9edc1e15d3b2e5eb5f0b60f15e3b39b0be95ddf0bb6e4d18f4c52322b66c7867",
-			"0x5bf071715890e9f227fc66c705e782add56e39eadd30dc982066fc067ac64fcd",
-			"0xddb572bdf8c2ff6ce8a0d9b6b2c95cbb33dfa9b96bde4b74812ac016a93770e2",
-			"0xf0687ab1fb94e49d1e113b1fb0127548d60ca1dcf341a1952d16dec090aa2736",
-			"0x94308074a4ed0dda1ebaf569b6cd5b4b6f7e77bbc41c737c78462a1ab330e3c1",
-			"0xa7141bddbfa78144aae11810acf034e48bffc3368c862d4f750112899150936d",
-			"0x1560476607eb8c091ffbc0ec21cb3091c3385f9c83f8d27c4a301ac200a92820",
-			"0x8c0b77737383dde0abf21d1350f0d2c285344720c314c564717ffa034acb1739",
-			"0x2782b37efd53e9a34ed2742be32de2480de342a384d81bdf3359d3686a3b504f",
-			"0x6e9848f3a434e019bc209a02ec769dc63e084b9c0f00472c218589dd3c256017",
-			"0x721d8f1bc957b825d3abe06a6ad9d8bba2e03b915aa779ac42fd9e5bc247411a",
-			"0xb937b6dbba5291fd35427afb0126ffd47962a07c3bbd6c77e4b80f6bf751c684",
-			"0xa5461d8dd8d05bf13875c6b2b62c82d371163d2f8ca80c2c0ee4d94061355a7b",
-			"0x58901227df5457e57c74db16ed72b9b6f9303de046e7adf6fc269db7ee9e0a28",
-			"0x33cb303cd28fa770e6c9f067831cb1829a8ccce845ac6bdce7d3da5d4ba8f3d1",
-			"0x3ea819ffcb3839d7a16ce09958849118a801152ecedc92de0ae5154f6c8a5d1f",
-			"0x001ed88b63827a6c71d7214b42551990e3f313720d982ea5f1049ede4f9d228a",
-			"0x2e346b0acbeeeb88e08ca6af0f2bcc3669e093475d8c224f23a45d4e2fca462c",
-			"0xb4ed38878080e2128b706ca1ac4c92c0def02a8ec094d07312068c10f6b144ca",
-			"0xd0d3c577cf73421791431a6f00452f33fd06f771de9ae2caa32ef2c93bd03951",
-			"0xb3dc9827308478b197b3995e39aa930d40df8cb98fcb2958c6ff8ece2bbd4c16",
-			"0x44547163a565de79110c1e42b81151a6e304df14953e648742558efa6f63672f",
-			"0x487a072363419adfe51ce0b8be352c0f497e5720617e9a237500293459cb7bc0",
-			"0xe7e9d6bbc5de3d62822c92cec484926d935038fff8be29ff3743008499000d9f",
-			"0xe151cd789208eeaa791f146f7e7efd46c17e2f8aaf061ba5bdbd7357a32cea39",
-			"0xf5e2de235cd7ecbc34828c244da80de6c9c452c253e6c876d9843bf5bc665daf",
-			"0xd0bdde209238ddc6ccd1e06e6e69c2c16b38ebac8b9f3202d46bd6bebacdd893",
-			"0x5c3cab37f5d83ad8fe9349ba88ead08f36e71f149f10642c819ae53b26ccb0a6",
-			"0x1d069657a6a467ecb3a781a3d72a8b701faf497e1098fbb9c04ae29820fa4e75",
-			"0x8fa114b013195af63e697432f3be7017ce8fd6e7ec26f23f832b003e82f17ce0",
-			"0x2664fa9d45f83ddb5c8a758c6fa3201abe7ea14571c886815585c543f245b301",
-			"0xd6c3528e946a4461efa56df07020008870ed64fde08cd72e7f8be581207f0d1a",
-			"0xdc4c0f579f3e44278905dbc69610f7d1025e068f75e5475400d96c97297fe5a3",
-			"0x06124cac7f9a1c10d48216905db968c9580b3744ff89b37b9b49e7308b04da8a",
-			"0x5c0c6c98bce9c64b7b62d62ecf02f435ce54b76c58883da177611774c79d5fba",
-			"0x424553682070092aa2ab3e454c66dac9d6bf6baae6379d91405a47fa48a3f200",
-			"0x3d09aa437ff840909ec6024c1e407ee7b5622561e4991b76968c146ae1c4976b",
-			"0x3ef50c81169af169c100f58f3afcb8e2f926d957b2adbaca8787be5d4e8d7233",
-			"0x8783eaeb56ca2d7fec84e0e272b77271fdfd6c14452a2e1dd83de770c5d99a1a",
-			"0x861024460895378ba100c5d0c05e62bb6cac8b21ae529ab5cab39eb6c6cabd90",
-			"0x1c741ed9eda60e5ac585e2f48f06fb988367c2c40a0d8111bb04b260fe44ec6b"
+			"0xe98b658fb8b6b7fba7463562f86348bf1e3534bc9148e8559423b3ee5ab68472"
 		]
 	},
 	"accounts": {
--- a/ethcore/res/ethereum/mcip3_test.json
+++ b/ethcore/res/ethereum/mcip3_test.json
@@ -9,6 +9,7 @@
 				"durationLimit":"0x0d",
 				"homesteadTransition":"0x118c30",
 				"eip100bTransition":"0x7fffffffffffff",
+				"eip649Transition":"0x7fffffffffffff",
 				"blockReward":"0x1105a0185b50a80000",
 				"mcip3Transition":"0x00",
 				"mcip3MinerReward":"0xd8d726b7177a80000",
@@ -32,6 +33,7 @@
 		"eip160Transition":"0x7fffffffffffff",
 		"eip161abcTransition":"0x7fffffffffffff",
 		"eip161dTransition":"0x7fffffffffffff",
+		"eip86Transition":"0x7fffffffffffff",
 		"eip98Transition":"0x7fffffffffffff",
 		"eip140Transition":"0x7fffffffffffff",
 		"eip155Transition":"0x7fffffffffffff",
--- a/ethcore/res/ethereum/mcip6_byz.json
+++ b/ethcore/res/ethereum/mcip6_byz.json
@@ -1,159 +1,158 @@
 {
-	"name": "Musicoin Byzantium Test",
-	"dataDir": "mcip6test",
-	"engine": {
-		"Ethash": {
-			"params": {
-				"minimumDifficulty": "0x020000",
-				"difficultyBoundDivisor": "0x0800",
-				"durationLimit": "0x0d",
-				"homesteadTransition": "0x17",
-				"eip100bTransition": "0x2a",
-				"blockReward": "0x1105a0185b50a80000",
-				"mcip3Transition": "0x17",
-				"mcip3MinerReward": "0xd8d726b7177a80000",
-				"mcip3UbiReward": "0x2b5e3af16b1880000",
-				"mcip3UbiContract": "0x00efdd5883ec628983e9063c7d969fe268bbf310",
-				"mcip3DevReward": "0xc249fdd327780000",
-				"mcip3DevContract": "0x00756cf8159095948496617f5fb17ed95059f536",
-				"difficultyBombDelays": {
-					"0x2a": 3000000
-				}
+	"name":"Musicoin Byzantium Test",
+	"dataDir":"mcip6test",
+	"engine":{
+		"Ethash":{
+			"params":{
+				"minimumDifficulty":"0x020000",
+				"difficultyBoundDivisor":"0x0800",
+				"durationLimit":"0x0d",
+				"homesteadTransition":"0x17",
+				"eip100bTransition":"0x2a",
+				"eip649Transition":"0x2a",
+				"blockReward":"0x1105a0185b50a80000",
+				"mcip3Transition":"0x17",
+				"mcip3MinerReward":"0xd8d726b7177a80000",
+				"mcip3UbiReward":"0x2b5e3af16b1880000",
+				"mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
+				"mcip3DevReward":"0xc249fdd327780000",
+				"mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
 			}
 		}
 	},
-	"params": {
-		"gasLimitBoundDivisor": "0x0400",
-		"registrar": "0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
-		"accountStartNonce": "0x00",
-		"maximumExtraDataSize": "0x20",
-		"minGasLimit": "0x1388",
-		"networkID": "0x76740c",
-		"forkBlock": "0x2b",
-		"forkCanonHash": "0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
-		"eip150Transition": "0x2a",
-		"eip160Transition": "0x7fffffffffffff",
-		"eip161abcTransition": "0x7fffffffffffff",
-		"eip161dTransition": "0x7fffffffffffff",
-		"eip98Transition": "0x7fffffffffffff",
-		"eip140Transition": "0x2a",
-		"eip155Transition": "0x2a",
-		"eip211Transition": "0x2a",
-		"eip214Transition": "0x2a",
-		"eip658Transition": "0x2a",
-		"maxCodeSize": "0x6000",
+	"params":{
+		"gasLimitBoundDivisor":"0x0400",
+		"registrar":"0x5C271c4C9A67E7D73b7b3669d47504741354f21D",
+		"accountStartNonce":"0x00",
+		"maximumExtraDataSize":"0x20",
+		"minGasLimit":"0x1388",
+		"networkID":"0x76740c",
+		"forkBlock":"0x2b",
+		"forkCanonHash":"0x23c3171e864a5d513a3ef85e4cf86dac4cc36b89e5b8e63bf0ebcca68b9e43c9",
+		"eip150Transition":"0x2a",
+		"eip160Transition":"0x7fffffffffffff",
+		"eip161abcTransition":"0x7fffffffffffff",
+		"eip161dTransition":"0x7fffffffffffff",
+		"eip86Transition":"0x7fffffffffffff",
+		"eip98Transition":"0x7fffffffffffff",
+		"eip140Transition":"0x2a",
+		"eip155Transition":"0x2a",
+		"eip211Transition":"0x2a",
+		"eip214Transition":"0x2a",
+		"eip658Transition":"0x2a",
+		"maxCodeSize":"0x6000",
 		"maxCodeSizeTransition": "0x7fffffffffffff"
 	},
-	"genesis": {
-		"seal": {
-			"ethereum": {
-				"nonce": "0x000000000000002a",
-				"mixHash": "0x00000000000000000000000000000000000000647572616c65787365646c6578"
+	"genesis":{
+		"seal":{
+			"ethereum":{
+				"nonce":"0x000000000000002a",
+				"mixHash":"0x00000000000000000000000000000000000000647572616c65787365646c6578"
 			}
 		},
-		"difficulty": "0x3d0900",
-		"author": "0x0000000000000000000000000000000000000000",
-		"timestamp": "0x00",
-		"parentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-		"extraData": "",
-		"gasLimit": "0x7a1200"
+		"difficulty":"0x3d0900",
+		"author":"0x0000000000000000000000000000000000000000",
+		"timestamp":"0x00",
+		"parentHash":"0x0000000000000000000000000000000000000000000000000000000000000000",
+		"extraData":"",
+		"gasLimit":"0x7a1200"
 	},
-	"nodes": [
+	"nodes":[
 		"enode://5ddc110733f6d34101973cdef3f9b43484159acf6f816d3b1ee92bc3c98ea453e857bb1207edf0ec0242008ab3a0f9f05eeaee99d47bd414c08a5bdf4847de13@176.9.3.148:30303",
        "enode://38f074f4db8e64dfbaf87984bf290eef67772a901a7113d1b62f36216be152b8450c393d6fc562a5e38f04f99bc8f439a99010a230b1d92dc1df43bf0bd00615@176.9.3.148:30403"
 	],
-	"accounts": {
-		"0000000000000000000000000000000000000001": {
-			"balance": "1",
-			"builtin": {
-				"name": "ecrecover",
-				"pricing": {
-					"linear": {
-						"base": 3000,
-						"word": 0
+	"accounts":{
+		"0000000000000000000000000000000000000001":{
+			"balance":"1",
+			"builtin":{
+				"name":"ecrecover",
+				"pricing":{
+					"linear":{
+						"base":3000,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000002": {
-			"balance": "1",
-			"builtin": {
-				"name": "sha256",
-				"pricing": {
-					"linear": {
-						"base": 60,
-						"word": 12
+		"0000000000000000000000000000000000000002":{
+			"balance":"1",
+			"builtin":{
+				"name":"sha256",
+				"pricing":{
+					"linear":{
+						"base":60,
+						"word":12
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000003": {
-			"balance": "1",
-			"builtin": {
-				"name": "ripemd160",
-				"pricing": {
-					"linear": {
-						"base": 600,
-						"word": 120
+		"0000000000000000000000000000000000000003":{
+			"balance":"1",
+			"builtin":{
+				"name":"ripemd160",
+				"pricing":{
+					"linear":{
+						"base":600,
+						"word":120
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000004": {
-			"balance": "1",
-			"builtin": {
-				"name": "identity",
-				"pricing": {
-					"linear": {
-						"base": 15,
-						"word": 3
+		"0000000000000000000000000000000000000004":{
+			"balance":"1",
+			"builtin":{
+				"name":"identity",
+				"pricing":{
+					"linear":{
+						"base":15,
+						"word":3
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000005": {
-			"builtin": {
-				"name": "modexp",
-				"activate_at": "0x2a",
-				"pricing": {
-					"modexp": {
-						"divisor": 20
+		"0000000000000000000000000000000000000005":{
+			"builtin":{
+				"name":"modexp",
+				"activate_at":"0x2a",
+				"pricing":{
+					"modexp":{
+						"divisor":20
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000006": {
-			"builtin": {
-				"name": "alt_bn128_add",
-				"activate_at": "0x2a",
-				"pricing": {
-					"linear": {
-						"base": 500,
-						"word": 0
+		"0000000000000000000000000000000000000006":{
+			"builtin":{
+				"name":"alt_bn128_add",
+				"activate_at":"0x2a",
+				"pricing":{
+					"linear":{
+						"base":500,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000007": {
-			"builtin": {
-				"name": "alt_bn128_mul",
-				"activate_at": "0x2a",
-				"pricing": {
-					"linear": {
-						"base": 40000,
-						"word": 0
+		"0000000000000000000000000000000000000007":{
+			"builtin":{
+				"name":"alt_bn128_mul",
+				"activate_at":"0x2a",
+				"pricing":{
+					"linear":{
+						"base":40000,
+						"word":0
 					}
 				}
 			}
 		},
-		"0000000000000000000000000000000000000008": {
-			"builtin": {
-				"name": "alt_bn128_pairing",
-				"activate_at": "0x2a",
-				"pricing": {
-					"alt_bn128_pairing": {
-						"base": 100000,
-						"pair": 80000
+		"0000000000000000000000000000000000000008":{
+			"builtin":{
+				"name":"alt_bn128_pairing",
+				"activate_at":"0x2a",
+				"pricing":{
+					"alt_bn128_pairing":{
+						"base":100000,
+						"pair":80000
 					}
 				}
 			}
--- a/ethcore/res/ethereum/morden.json
+++ b/ethcore/res/ethereum/morden.json
@@ -31,7 +31,8 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": 1915000,
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
--- a/ethcore/res/ethereum/musicoin.json
+++ b/ethcore/res/ethereum/musicoin.json
@@ -9,16 +9,14 @@
 				"durationLimit":"0x0d",
 				"homesteadTransition":"0x118c30",
 				"eip100bTransition":"0x21e88e",
+				"eip649Transition":"0x21e88e",
 				"blockReward":"0x1105a0185b50a80000",
 				"mcip3Transition":"0x124f81",
 				"mcip3MinerReward":"0xd8d726b7177a80000",
 				"mcip3UbiReward":"0x2b5e3af16b1880000",
 				"mcip3UbiContract":"0x00efdd5883ec628983e9063c7d969fe268bbf310",
 				"mcip3DevReward":"0xc249fdd327780000",
-				"mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536",
-				"difficultyBombDelays": {
-					"0x21e88e": 3000000
-				}
+				"mcip3DevContract":"0x00756cf8159095948496617f5fb17ed95059f536"
 			}
 		}
 	},
@@ -35,6 +33,7 @@
 		"eip160Transition":"0x21e88e",
 		"eip161abcTransition":"0x21e88e",
 		"eip161dTransition":"0x21e88e",
+		"eip86Transition":"0x7fffffffffffff",
 		"eip98Transition":"0x7fffffffffffff",
 		"eip140Transition":"0x21e88e",
 		"eip155Transition":"0x21e88e",
--- a/ethcore/res/ethereum/olympic.json
+++ b/ethcore/res/ethereum/olympic.json
@@ -23,6 +23,7 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip155Transition": "0x7fffffffffffffff"
 	},
 	"genesis": {
--- a/ethcore/res/ethereum/poacore.json
+++ b/ethcore/res/ethereum/poacore.json
--- a/ethcore/res/ethereum/poasokol.json
+++ b/ethcore/res/ethereum/poasokol.json
--- a/ethcore/res/ethereum/ropsten.json
+++ b/ethcore/res/ethereum/ropsten.json
@@ -7,17 +7,11 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": {
-					"0": "0x4563918244F40000",
-					"1700000": "0x29A2241AF62C0000",
-					"4200000": "0x1BC16D674EC80000"
-				},
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": 0,
+				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": 1700000,
-				"difficultyBombDelays": {
-					"1700000": 3000000,
-					"4200000": 2000000
-				}
+				"eip649Transition": 1700000
 			}
 		}
 	},
@@ -38,14 +32,11 @@
 		"eip161dTransition": 10,
 		"eip155Transition": 10,
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip140Transition": 1700000,
 		"eip211Transition": 1700000,
 		"eip214Transition": 1700000,
-		"eip658Transition": 1700000,
-		"eip145Transition": 4200000,
-		"eip1014Transition": 4200000,
-		"eip1052Transition": 4200000,
-		"eip1283Transition": 4200000
+		"eip658Transition": 1700000
 	},
 	"genesis": {
 		"seal": {
@@ -62,8 +53,8 @@
 		"gasLimit": "0x1000000"
 	},
 	"hardcodedSync":{
-		"header": "f9020fa0a415a8dcd55fe9c93372da415ff6897036e48cd3c1a5ff8ffe119eea1096ecd6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d493479443d58f2096e015db88e44346e73d8c59cb1753bda0100f05d66d36782b7c061c724d8d07619cc61053eda41badc8d2cb9292898ebaa00a60317b490365f40f0528e1f559b0f49facb6638c82a9490d368e963647c704a0118b536c3bdabf90273d527dfc26914c7878176fff16cee8fbb150e00ffcdd29b9010000000000000000040000002040000000000000000000000000000000000000000040020000000000010800000000000010000000000200000800000000600400000000080100c000004002080000000045000000008000080000000020000200404010010200010004000000000008020000008000000000000000108010440000800080000400010000080010820008000410800000100000000000000000000240244000000010000000000010010000000000002000000000000000000004000000020000001000002000000000000000013000000100000800008000200000104000000000000080000080200402010000000000000000001020000008008501602a8414833bc8018347b7a983476d40845b838083904d696e656420627920416e74506f6f6ca0f540bc9cfa258b97576bfb9a79518b2c07ed73a98bc6baa61cf7af4b40ad5b6988965658a406315a8a",
-		"totalDifficulty": "9811143388018700",
+		"header": "f90213a0f6a1b2e8155af1d1d77879826e2535cb6023ba35705934380ab05f65bcbfb107a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794f3af96f89b3d7cdcbe0c083690a28185feb0b3cea015ca95dffe4c5de6d9c02d9282df0db94855b0d602738f4b6fcb2268694cd92aa07ecb0900077c45bd4d3ca910218099f726fea18461f90be18897710767a51559a0251f2cb798e965c5d9b11c882f37c69fd2c42b314fabe64d2b4998c76eb93ae8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008439b475f9833720018389769d82f618845b45928b96d583010b038650617269747986312e32362e31826c69a0fbd0db05012df54423a6b25395ec4f6e66d9f11af8b9c492c4fb7197fcd6a5ba8877d4a227c2bdf4de",
+		"totalDifficulty": "8809217991079619",
 		"CHTs": [
 			"0x614648fc0a459451850bdfe353a932b5ff824e1b568478394f78b3ed5427e37a",
 			"0x1eae561c582dbb7f4e041998e084e165d0332c915d3a6da367638a8d24f3fafc",
@@ -1828,164 +1819,14 @@
 			"0x4b40cd83205f8b946ca9f11fc3306872650e658e631511fd4080bc8ca749d913",
 			"0x652acc59b71ca20bb65ca195d1a4b3e177f6a3985bdcd6120e1a45b7d4a0c7ca",
 			"0x49a5e2580ceb329665244e489592aea27d54da8189a665d9435e037ea70c46a5",
-			"0x379801356beb3a8e5fa7311792c69c7ac1f675a9c08c837f9f0e9f53c243d6a7",
-			"0xfeff4543c70356b7d9767c26b228cac8452c95bc4875e92a60d7e6fc50468667",
-			"0x82eb18827313399cb3b0d3c975eb9a9480c3aa5587ce72d321bedccaaab56115",
-			"0xa644c582a751a6d8cbf30e59d6e770a6f441c017b486cdb23e6b9c48c614967d",
-			"0x75e6f4d4185515a3c58dea60b55d5e50af053bb261db2d3de00f812a4072ee2c",
-			"0x9018506876afe91cd2cded037f41c5ee8503fede2a59c47dfe7ea1b36c460f73",
-			"0x0b8bc06bf211f715291846c6c34b805b6aee91ef4e8c63cf3d15ec79b44ddae8",
-			"0x150e43fee00d798b8611d4e03838072d8b9c8ee3771e840ee2c161a541d6b643",
-			"0xe98c938110bd4227c660a9bdccba3b5ce5b8414d909514502e8f354f96abce69",
-			"0x0fdc3bd666d74a99e623f6d4957bcbfb17395bbdacb52b18ecf7aa5d2e4ad2ce",
-			"0x2c72d738e803c0522b5f424731ad6327548ef08ded4caf4ae0466b2cf171ac4b",
-			"0xa7709a082f8a2ed01e2e88c4a2d18930f510fe5b831d2a1bbb1a85a858f19e54",
-			"0x8ccb960803f6b6e87515ec20a36734128da0dd6e65845013d89996070d3cbc69",
-			"0x4ab2e49286c8505f32ca54314d1b5c3b2952578d191c69d1cc7ba78a000a01d4",
-			"0x6bb792b52949c952f20b9d11274c8a05edb44c4070d949bdfddcb0eef2464454",
-			"0xf61eccaeddac91487b2f5d7b3ec57d1ccbdd0e1307d2f624319fff525149941f",
-			"0x2dcf01b0d9ce31c13c20959618f2e5e0c7f8c48521f00c12c99d28bfcf202f57",
-			"0xb1e83745e6013706904b7322350c8b453aaaba0a61ba89f35eef8f19759ceeb4",
-			"0x8a2cd4944bee70696aa216b453774f4d915dee4bb78c8f7ff55410cddec318fe",
-			"0x49a78ff97bd4938cd030df23e5ff4d84ace59ef3fdc0099941d8ad7f82235894",
-			"0x61e2096919419c8856a5473f135f4f9febb102f80eecc90ad60baaed77a99d29",
-			"0xb95709562a26564e57cafa00d0969305ffdd0aea7e523ba90957a6cbad6ceb70",
-			"0xb7a6438f176aed77a9c6470e28ab8cf19dad8f77dd3313cfbbbc9276761f454b",
-			"0xc85a1c37b5a4e1e8ae67df31b369f0b44cdcf66418b42206e5b4a738a0a0bae7",
-			"0xf034b0d125eb1bd1bbde1fe413aef80fdc136339eed062b97cb9da2f4bc94ba5",
-			"0xcddbaba3e9e1680a2d1586a1e9e2268afb51b4894f2b41fb2eac5f667b6cb655",
-			"0x971b2fbd25a97bc710c30b6b98efc90428a7e423c09fe772622e7ea37d18e49c",
-			"0x8571bcf05c836a59a5d3216634ed1f691edb7bcddc7b5412bc513ae9e1fc0423",
-			"0x0543d8abe5e1bd541a5bc994b0c7ea5a556575d2e9302d1dc36348ebb7ab9e82",
-			"0xebd8f9095619980043f234bf4f7682534ae6a15b4584e9d1ae524138471467c3",
-			"0xd0699a768c873ca5bd615ab5b0fd9c7c6c649c4245b58cb622210ac2bfcf3111",
-			"0x35bd5a50b11033878751d985459657bd4c0206584cd1def98a355d7ffb0539f4",
-			"0xd476d2b8b62b720520ba0990137629f83db9c6896f1e788fa5bf08614af1f2bb",
-			"0x2a8034765c582c07580c0da45c4216bb513171d073a99cbca2fa2adc0c05dbf8",
-			"0x084b45a575706daccfbbbcc321a9546b0c911861f2639d81f210b77680f60fb7",
-			"0x499bfc54ba17718aa8f74ceb412dd9b6b6c7d1cbde4d8ad2385a5d5d77e98915",
-			"0x8638684b06607afb53385f477f0f295453f14e36161da6dc7728336475303a9d",
-			"0xa686ad8ccc3507627712d203f7ff3be65c289da67269388d0ad8949ad3a5a589",
-			"0x6d262ff8babed3a603f400501cd77344585fff92e5bab5f5848873042ab87cb0",
-			"0xb5755234055b3534fceeafcc84d0d77dac220d3466e1dbbbe7d7d44c345e1eec",
-			"0x92a54b989a1aafd36f979ff0f1fc73f9b1508628f054430234f4460cd9f3959d",
-			"0x1a48d9bb57e9a70b03c066c97ff9520c177b8361f2b3c343ac71fd8cbdbadba5",
-			"0xc9e103919e8b6827a1fd57a3e99155a24810f524fb69a7e3fbf486707b2da690",
-			"0x22a5ba2899ce696fe691a2c545b98ddecb7c0a844cff2375e50e0a0f0f9cf9b3",
-			"0x154890ebebe7f014aa88f8da52c9713e2b0cc8b9b6c7d29b354afa000c2eb429",
-			"0xf9a72e3ce36943a442d0dbc7a869a6344003d6a7ee4d344c1899ab8b96746a6b",
-			"0x270fe45a526aa3bcc8e4a5be075610ae9b15d6fe48b04c6ff0c82a1c7f56e0d8",
-			"0x9eacbdd695faa85bdbff10bcefcd5edfcc489c3380cb1c73ab5ca6cba2492995",
-			"0xca15124d292e0465c7e50276cfd374c82391bb668d68a3b19c67fbb9e68b0bba",
-			"0x9a8cfd3f1b8ad178c982feed1fc306dc996da3d928e99a6f8ad240e55f52cc3e",
-			"0xc173b14778977c5d6dcb1079023c493406911c6d6791ad08104f847323aff7cf",
-			"0x82b3e9b9a407ff0596aa7eabdeba10dded85fbf3258d12949ed4f46484e0f649",
-			"0xb8a009c28a2328b7c95531bc64e072388d797130652ea0a84159c801af562a5f",
-			"0x80e45ff8b60d28dbb45530b7b56e049e605d28087df7133766de0e151dfbd01c",
-			"0x7667e9cd22c5427e6f37f215b1d9cd90b2659d5db0bb499daa382e09fcfd58e3",
-			"0x825014f354bee6aa4cf5283f86e8293c0ea6faf07862abe2cfa12740a0d846d3",
-			"0xbe9116073311dc303fa29f7a226ff79fd39ec2ffbd2d2270652b972a701aef54",
-			"0xb3fd19eb6b0163156a350156b15e660853f68a903ea6ed758bf80b2fbc5a655b",
-			"0x3c5a408909bf485e8c3d8e683d8ae4e7b7149d1f01874807428a3f88e1293d4f",
-			"0xc759f51aceddb90e6e4273fb9439908592dea649f5202f530d15d455c5c8c7c8",
-			"0x1fc97f79d1b1d72da309bf2027ae193f0594ecb77c07a472421baadda577a24c",
-			"0x09c4fd284e5c0672ad031629e58fb2776d1e772c6041c91433f287304dfdcd1a",
-			"0x8c6b40f8700a0638ca5b7bb003c2de6b54e731881a072988cb78ba89557db1d6",
-			"0xcbc701507f4f970d8dbf15306d6ac5bdd46b6f58bfd2dd07db4ee01c65aab5f7",
-			"0x6b911e52f43696cab429c0e511fc40011846af92a2631f4d3f2cd040567f021f",
-			"0x4fa5373f6eeacba61818052da8a9787c4ed86be0bffe0672c0aea792cc3d2d49",
-			"0x518ceeb36cf1a406b89040ab0c60e380068f5f6571d042d3bd9a9d7af1b12204",
-			"0x82039214db7d3beae631682e9249b06f98e16153f864c2026a6edcb0727a6532",
-			"0x9a9e534af83084007e54dadbce2a0224008a8c42356c2ea650606e8e72d2ad8d",
-			"0xc4dc0b662ac8d4d987b8c2c65cd27fb8992f65d598bbc25f017c45b7032451f9",
-			"0xa921f124b5275f07b2c064d477d5779963096632f03c54ac9c87917bc4aa6e52",
-			"0xb4fe786c84a19c8db63117c421ce53244436d0c04384c62d508a88589f4e5c83",
-			"0xd57ea382802130e3ee8e7671be2b40a1392ebc6528e2e10d9d51f2899ac7ea54",
-			"0x224523fcd11abd078840803bbde2c3d1d359a0c2cfdd6f9110a93ac4d3c49845",
-			"0x5da21f79c0f1030e2a5dbfa283becced75e7ff223ef14a6cb5527434503ac71a",
-			"0x3e315746e89fd3e662f4dfe28245457c3b8a4ea6d9450b93639424a6d8ef7d41",
-			"0xe142bd09a6967021c4c5a5c7491b0df3b1bcf13564ac934a2668e1b2252e4723",
-			"0x2e9ab88b366cba155d1f6093e4edbbafd80032b07a192a35942aeea1bf0f1074",
-			"0xbcbd1b446853135abae9f330d63a06119a93fb53b63c621941f5a74324c384a1",
-			"0x7816de8933a433aa2719c99db24e692e6ac6551416b08f803302c7751fcfa3ee",
-			"0x52c53032dd84842dff6580013ab1edca7c251598ba5fc8b903c40e3d9e537095",
-			"0x771222b46cdcbeba729436ef39f81732aaf4893da720c1e7b59ebb3fd38ab9d6",
-			"0xfc440de1896e1b2848f2cc5c7d62c0a6b0019008de8aab41df5395586d340d4c",
-			"0x0df9b803307465e54cc77ee60dd6988e3d713d496ac0209509c5312ad0f19888",
-			"0x88179429086844e69122c70b6af8b689abea11e13ba0809743532663e3047c3e",
-			"0x503898d86c4038eb76124e18459e0d57ec25b177fc79bb87eeccce3fa75f0037",
-			"0xf46efd490382e4e4a3ac0e10926b46ec56e833769acfe3879acffb13030cfe9d",
-			"0x6efde5293a9d22e688165f2a51bb83e3b53584f9ef5bacc0bd1d99f5c7df18d4",
-			"0xc03dc313d9be55674000d061851c139f4c57c6fb46106b98c3442832a51c5f3a",
-			"0x8ec2accb7c89019d0fe2a31ddada0b8251ebe88a439de9d68be73c0994a6523a",
-			"0x36ec73d7e8c0181f6335c668ad7713f8eed607e0c302b43413f904b26160bdc1",
-			"0xa53e90d88a751a78397adc6d2fb4f93ad2b38f0ebd00b32932c4b2a39a276d9f",
-			"0xea2a25111ca37a53c8fade1ef65097f0cb85e00881b1ff201d36c9151a8e1a0f",
-			"0x8c1a24ac75821a4b0570c22b682c6030c678244b059ffd4b21e4d3cd05afb585",
-			"0xd230d46b14f9586f7b1947add191a69ed381cb6fdaa9b28c28869da8c6724dc6",
-			"0x4e8c717de6c94b4be274f052d9df627c945afe18df35c58a90a035759dce6b48",
-			"0xdefefe94ca6d93b78ef9f92911eec4c2ae0c10148691755f1624f86445a3b2b2",
-			"0xfa6c031ec69c7dac9f9b6524054806e2fa524c3200fdeac030d3bf7029ab776b",
-			"0x9204683278cad559a3f9ed2ec1f6539f34efb17957830d0aaa92b73cd0994732",
-			"0x2bb26a0cc5eb7424033e8bf552c7964573a0954e5b6aae32a51d95d951fc044b",
-			"0xf6e3827687af53fc532ba163d7ebd5ce18ffa6384157982b6dfdb1f4be82faf5",
-			"0x627bda246bf499f4498e8c512c8f601e36a1dcd778f21a598736f83b5b33fbd8",
-			"0x5816773273e4ef45fbacbe920dc3420602d8134fffe302459891cd6e65627f6f",
-			"0x7cd637fa8a5bb32dfd7c076c34e0e536d7c6710f1888f5ec18d64191a9930744",
-			"0xfe016a6e9ffd59237b349a817ba8c36f7775fef6513c4d430fbfc20ce72fcb1d",
-			"0x7c466b30cf23cb7115a3855d9d9c537c29f380ecfd7aaa0a6e59d9680bc43971",
-			"0xc49551e5eb138d28f5557ea8e8a8bbc7c058084ba0edf8f6bf64471928ecde43",
-			"0x7366cd68072f52c5644dc9fbe2e72339705dddd2b03690dd748265723944e754",
-			"0xbfb7c3bed071283cc18cca4192e2bdc1f97aee9b7185d493a29f20ed4d52ae3d",
-			"0x40c9fbfde126c8c92cf6d15a18be4b5a4da39ff60ce45cf5e9a2c1782244947a",
-			"0x1358333dd1b82e7c805dced5dcc2edd5d5784fe8104b64eabc598096c26d05ed",
-			"0x0a9777f7711b6d9f6cc6ad4a78b716199b57f026d1f30f04ded5d2cd8286322c",
-			"0x7a848ef083a03e4112c75bef258633779cc495df4ac5529e12c8eadc484baad7",
-			"0x17025c4c255f509163d11df3cac35c1de823e5ec71cfd66693393882d81fddb8",
-			"0xed0a2fe0dfe85c7d606d0d1b355518a48220e91202ec1c1178c8b37c86e1c9cb",
-			"0x4674e5e97dc0c615b03c34c702ceb07aec48cd7e8edc953a188d194a8cab35c1",
-			"0xa004c31b7a6f6511d7eeda4c400c5ede847ce2ea4339641b6c419f688cc4e574",
-			"0x1bb6c124e94df05e091f6aea45e7658351fd21318e91105274a15be4f7a7a632",
-			"0xc365b8bab2d6b902508d075195a1e23b04c97e40217c4ffa49fe16bb13e5b575",
-			"0x93c1383e2ab52ded5fc86e1b6f6e292c0d0977e8756e1fcbf87b099682060e25",
-			"0x2921b874e3855d9afca966d5088e9b1cfe59f37db54bf0c1e8bc5c5a97e7ef6c",
-			"0xfee916dad70495cb45c6ac632241a73869f0f553bf7172cc4e63fa382a5e1077",
-			"0xc63d63b401941d11edf755d7b6564b4fcba1f84ed99cd08f1580faf2c224478c",
-			"0x8069f00ca36baba06b310e28f6873e78b3ded25b456d95dad7eef4c517e7d096",
-			"0x48dc0968af32e91a8a3f252bc0082d7c22f8dd9797e4fa774d5b5365386a4602",
-			"0x861ffb24def147c4577aaa332aa2b5d3165542c4fd1e1882a9050e5de10f1f57",
-			"0x9fdfb7305249e7a38068f8099b74c5584a2f2df3f0514371f20042a6c0d2c85e",
-			"0x90212f15c5d6b686810e1895a139bbc26141181c3c472ee28ef9904553a2faed",
-			"0xdf967dfde0b63153142628dae7522307afb35b24146d9fc1d35874914244eec8",
-			"0xfb17a9d9e9a5ab6d742f55c0e8d80c5e5d722e9411e84bc47b1d2fe5fc33dd71",
-			"0x56b2c30b802088f9ebf0918c7ce44b50a96a0eac98f89e1711f53452006259c2",
-			"0x4c38b33bd4089a48a65369955540219b44af520000b8f8c346bdc96d47dc2479",
-			"0x7d3487d3823204a94e557b7a942d7c657c1b49d9f40f2d739a9099d4438695b3",
-			"0x2f82f94eb74aa2c0fb91bdb38ba0b416ce7e033c7e2a74aea113d201b225e24d",
-			"0xce8ac4b2f0f74601280bc3df0f5955d033e5c511372d812b36dffbca4b2e4736",
-			"0xb6ea6c89e91ecca1fbd723188a77370e9d23c3df8aac282cbcbe000b13d31b57",
-			"0xb8b8b7cb900482562227a0a1256ddbe822cdcf134a196e29b1aa6fd92423a4ed",
-			"0x0f47ab9f4985c3175e0a30a237d4f7c42db4a58f95344a86a818e459296610fe",
-			"0xc26a55a23eb390fc83fbdc9f07ee3ce09e8a2b28bc09386323ffc0844e13be24",
-			"0x1d5e97a7fdf5f34192e9b6dd255c41b63e24e1b4ef4ea43ae510fd1f50abb022",
-			"0x58b6120c4f0a1004e51703e77decb1c85bdd40bc83654d3f8ce5f7e3b4b6ca25",
-			"0xa2f4b27f5641d9294ee0411bcabc574f94b294ed8c50c9ae0c3d58caea7d6ba9",
-			"0xc4d6d3a8b4debec7ec7f3e2a6e1c64de46ec1187ed6e87fa2d87412c9874a3a6",
-			"0xfb59d9b66471893988d0fed17898fe2b7873d85aed217c20b6f438ed70fc340b",
-			"0x850df664737f288ae16d701878ad04f399b367fccaa2ddbf975d77868bea7cf5",
-			"0x4dfe47362c005896f82ac2d02a12ee9418693cd2f5d1bcfdc321980897171993",
-			"0xb652952de1bf9e1174e5f6a37b069b437792672a37a9e0159c4f36b6e64306b4",
-			"0xb72dd6cb5df1b00dbbd84e097e2da79af2ce60559697ab4c93b0a8b85b2ee406",
-			"0xb96fd4a94ac30c10f757691f7f06f25a4900fe424f4eb7ccf322e2f95249b914",
-			"0x99fd442599036f161ccef1ae8088c5ef694c1819f5b76d9d2fa8f979935f69f8"
+			"0x379801356beb3a8e5fa7311792c69c7ac1f675a9c08c837f9f0e9f53c243d6a7"
 		]
 	},
 	"nodes": [
 		"enode://6332792c4a00e3e4ee0926ed89e0d27ef985424d97b6a45bf0f23e51f0dcb5e66b875777506458aea7af6f9e4ffb69f43f3778ee73c81ed9d34c51c4b16b0b0f@52.232.243.152:30303",
 		"enode://94c15d1b9e2fe7ce56e458b9a3b672ef11894ddedd0c6f247e0f1d3487f52b66208fb4aeb8179fce6e3a749ea93ed147c37976d67af557508d199d9594c35f09@192.81.208.223:30303",
 		"enode://30b7ab30a01c124a6cceca36863ece12c4f5fa68e3ba9b0b51407ccc002eeed3b3102d20a88f1c1d3c3154e2449317b8ef95090e77b312d5cc39354f86d5d606@52.176.7.10:30303",
-		"enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303",
-		"enode://691907d5a7dee24884b791e799183e5db01f4fe0b6e9b795ffaf5cf85a3023a637f2abadc82fc0da168405092df869126377c5f190794cd2d1c067245ae2b1ce@13.125.237.43:30303"
+		"enode://865a63255b3bb68023b6bffd5095118fcc13e79dcf014fe4e47e065c350c7cc72af2e53eff895f11ba1bbb6a2b33271c1116ee870f266618eadfc2e78aa7349c@52.176.100.77:30303"
 	],
 	"accounts": {
 		"0000000000000000000000000000000000000000": { "balance": "1" },
--- a/ethcore/res/ethereum/social.json
+++ b/ethcore/res/ethereum/social.json
@@ -27,7 +27,8 @@
 		"eip161abcTransition": "0x7fffffffffffffff",
 		"eip161dTransition": "0x7fffffffffffffff",
 		"eip155Transition": "0x0",
-		"eip98Transition": "0x7fffffffffffff"
+		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff"
 	},
 	"genesis": {
 		"seal": {
--- a/ethcore/res/ethereum/tests
+++ b/ethcore/res/ethereum/tests
--- a/ethcore/res/ethereum/tests-issues/currents.json
+++ b/ethcore/res/ethereum/tests-issues/currents.json
@@ -1,370 +0,0 @@
-{ "block":
-	[
-		{
-			"reference": "9590",
-			"failing": "stCreateTest",
-			"subtests": [
-				"CreateOOGafterInitCodeReturndata2_d0g1v0_Constantinople"
-			]
-		},
-		{
-			"reference": "9590",
-			"failing": "stCreate2",
-			"subtests": [
-				"RevertDepthCreateAddressCollision_d0g1v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d1g1v1_Constantinople",
-				"CREATE2_Suicide_d5g0v0_Constantinople",
-				"CREATE2_Suicide_d7g0v0_Constantinople",
-				"create2collisionSelfdestructedOOG_d2g0v0_Byzantium",
-				"create2collisionSelfdestructedOOG_d2g0v0_Constantinople",
-				"create2collisionNonce_d1g0v0_Byzantium",
-				"create2collisionNonce_d1g0v0_Constantinople",
-				"CreateMessageRevertedOOGInInit_d0g1v0_Constantinople",
-				"create2callPrecompiles_d3g0v0_Constantinople",
-				"create2collisionCode_d1g0v0_Byzantium",
-				"create2collisionCode_d1g0v0_Constantinople",
-				"create2collisionStorage_d0g0v0_Byzantium",
-				"create2collisionStorage_d0g0v0_Constantinople",
-				"create2callPrecompiles_d4g0v0_Constantinople",
-				"create2collisionSelfdestructedRevert_d0g0v0_Byzantium",
-				"create2collisionSelfdestructedRevert_d0g0v0_Constantinople",
-				"CreateMessageReverted_d0g1v0_Constantinople",
-				"RevertOpcodeCreate_d0g1v0_Constantinople",
-				"CREATE2_Suicide_d11g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d5g0v0_Constantinople",
-				"create2collisionSelfdestructedOOG_d1g0v0_Byzantium",
-				"create2collisionSelfdestructedOOG_d1g0v0_Constantinople",
-				"returndatacopy_following_create_d1g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d1g1v1_Constantinople",
-				"create2collisionSelfdestructed_d2g0v0_Byzantium",
-				"create2collisionSelfdestructed_d2g0v0_Constantinople",
-				"create2callPrecompiles_d2g0v0_Constantinople",
-				"create2InitCodes_d2g0v0_Constantinople",
-				"create2collisionNonce_d2g0v0_Byzantium",
-				"create2collisionNonce_d2g0v0_Constantinople",
-				"create2collisionCode_d0g0v0_Byzantium",
-				"create2collisionCode_d0g0v0_Constantinople",
-				"CREATE2_Bounds_d0g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d0g0v0_Constantinople",
-				"CREATE2_Suicide_d1g0v0_Constantinople",
-				"CREATE2_Bounds3_d0g1v0_Constantinople",
-				"create2collisionStorage_d2g0v0_Byzantium",
-				"create2collisionStorage_d2g0v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d0g0v1_Constantinople",
-				"create2callPrecompiles_d5g0v0_Constantinople",
-				"create2collisionCode2_d0g0v0_Byzantium",
-				"create2collisionCode2_d0g0v0_Constantinople",
-				"create2noCash_d0g0v0_Byzantium",
-				"create2noCash_d0g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d7g0v0_Constantinople",
-				"create2SmartInitCode_d1g0v0_Constantinople",
-				"create2InitCodes_d6g0v0_Constantinople",
-				"create2noCash_d1g0v0_Byzantium",
-				"create2noCash_d1g0v0_Constantinople",
-				"CREATE2_ContractSuicideDuringInit_ThenStoreThenReturn_d0g0v0_Constantinople",
-				"RevertOpcodeInCreateReturns_d0g0v0_Constantinople",
-				"create2collisionStorage_d1g0v0_Byzantium",
-				"create2collisionStorage_d1g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d3g0v0_Constantinople",
-				"create2collisionBalance_d0g0v0_Byzantium",
-				"create2collisionBalance_d0g0v0_Constantinople",
-				"create2collisionSelfdestructed2_d0g0v0_Constantinople",
-				"create2InitCodes_d3g0v0_Constantinople",
-				"create2collisionCode2_d1g0v0_Byzantium",
-				"create2collisionCode2_d1g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d1g0v0_Constantinople",
-				"create2collisionBalance_d1g0v0_Byzantium",
-				"create2collisionBalance_d1g0v0_Constantinople",
-				"CREATE2_Bounds3_d0g2v0_Constantinople",
-				"create2callPrecompiles_d6g0v0_Constantinople",
-				"Create2Recursive_d0g0v0_Constantinople",
-				"create2collisionSelfdestructedOOG_d0g0v0_Byzantium",
-				"create2collisionSelfdestructedOOG_d0g0v0_Constantinople",
-				"CREATE2_Suicide_d3g0v0_Constantinople",
-				"returndatacopy_following_create_d0g0v0_Constantinople",
-				"create2InitCodes_d8g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d0g0v1_Constantinople",
-				"create2checkFieldsInInitcode_d2g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d1g0v1_Constantinople",
-				"Create2OnDepth1024_d0g0v0_Constantinople",
-				"create2collisionSelfdestructed2_d1g0v0_Constantinople",
-				"create2collisionSelfdestructedRevert_d2g0v0_Byzantium",
-				"create2collisionSelfdestructedRevert_d2g0v0_Constantinople",
-				"create2callPrecompiles_d0g0v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d0g1v1_Constantinople",
-				"create2collisionSelfdestructed_d1g0v0_Byzantium",
-				"create2collisionSelfdestructed_d1g0v0_Constantinople",
-				"call_outsize_then_create2_successful_then_returndatasize_d0g0v0_Byzantium",
-				"call_outsize_then_create2_successful_then_returndatasize_d0g0v0_Constantinople",
-				"Create2OOGafterInitCodeRevert_d0g0v0_Constantinople",
-				"Create2OOGafterInitCodeReturndata3_d0g0v0_Constantinople",
-				"Create2OOGafterInitCodeReturndataSize_d0g0v0_Constantinople",
-				"create2InitCodes_d7g0v0_Constantinople",
-				"CREATE2_Suicide_d10g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d0g1v0_Constantinople",
-				"create2InitCodes_d5g0v0_Constantinople",
-				"create2collisionSelfdestructedRevert_d1g0v0_Byzantium",
-				"create2collisionSelfdestructedRevert_d1g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d1g1v0_Constantinople",
-				"create2collisionSelfdestructed_d0g0v0_Byzantium",
-				"create2collisionSelfdestructed_d0g0v0_Constantinople",
-				"create2noCash_d2g0v0_Byzantium",
-				"create2noCash_d2g0v0_Constantinople",
-				"CREATE2_Bounds3_d0g0v0_Constantinople",
-				"create2collisionNonce_d0g0v0_Byzantium",
-				"create2collisionNonce_d0g0v0_Constantinople",
-				"CREATE2_Suicide_d2g0v0_Constantinople",
-				"Create2OOGafterInitCode_d0g0v0_Constantinople",
-				"call_then_create2_successful_then_returndatasize_d0g0v0_Byzantium",
-				"call_then_create2_successful_then_returndatasize_d0g0v0_Constantinople",
-				"create2collisionBalance_d2g0v0_Byzantium",
-				"create2collisionBalance_d2g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d6g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d0g1v1_Constantinople",
-				"returndatacopy_afterFailing_create_d0g0v0_Constantinople",
-				"returndatacopy_following_revert_in_create_d0g0v0_Constantinople",
-				"CREATE2_Suicide_d9g0v0_Constantinople",
-				"create2callPrecompiles_d7g0v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d1g0v1_Constantinople",
-				"create2InitCodes_d1g0v0_Constantinople",
-				"CREATE2_Bounds_d0g1v0_Constantinople",
-				"Create2OOGafterInitCodeReturndata_d0g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d4g0v0_Constantinople",
-				"CreateMessageRevertedOOGInInit_d0g0v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d1g1v0_Constantinople",
-				"returndatacopy_following_successful_create_d0g0v0_Constantinople",
-				"create2checkFieldsInInitcode_d0g0v0_Constantinople",
-				"CreateMessageReverted_d0g0v0_Constantinople",
-				"create2SmartInitCode_d0g0v0_Constantinople",
-				"CREATE2_Bounds2_d0g0v0_Constantinople",
-				"returndatasize_following_successful_create_d0g0v0_Constantinople",
-				"CREATE2_Bounds2_d0g1v0_Constantinople",
-				"returndatacopy_0_0_following_successful_create_d0g0v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d0g0v0_Constantinople",
-				"CREATE2_Suicide_d0g0v0_Constantinople",
-				"create2InitCodes_d0g0v0_Constantinople",
-				"Create2OnDepth1023_d0g0v0_Constantinople",
-				"create2InitCodes_d4g0v0_Constantinople",
-				"Create2OOGafterInitCodeReturndata2_d0g0v0_Constantinople",
-				"create2collisionBalance_d3g0v0_Byzantium",
-				"create2collisionBalance_d3g0v0_Constantinople",
-				"CREATE2_Suicide_d4g0v0_Constantinople",
-				"Create2OOGafterInitCode_d0g1v0_Constantinople",
-				"RevertDepthCreateAddressCollision_d1g0v0_Constantinople",
-				"Create2OOGafterInitCodeRevert2_d0g0v0_Constantinople",
-				"Create2OOGafterInitCodeReturndata_d0g1v0_Constantinople",
-				"Create2Recursive_d0g1v0_Constantinople",
-				"create2collisionCode_d2g0v0_Byzantium",
-				"create2collisionCode_d2g0v0_Constantinople",
-				"CREATE2_Suicide_d6g0v0_Constantinople",
-				"CREATE2_Suicide_d8g0v0_Constantinople",
-				"RevertOpcodeCreate_d0g0v0_Constantinople",
-				"Create2OOGafterInitCodeReturndata2_d0g1v0_Constantinople",
-				"create2callPrecompiles_d1g0v0_Constantinople",
-				"RevertInCreateInInit_d0g0v0_Constantinople",
-				"RevertDepthCreate2OOG_d1g0v0_Constantinople"
-			]
-		},
-		{
-			"reference": "9590",
-			"failing": "bcStateTest",
-			"subtests": [
-				"suicideStorageCheck_Byzantium",
-				"suicideStorageCheck_Constantinople",
-				"suicideStorageCheckVCreate2_Byzantium",
-				"suicideStorageCheckVCreate2_Constantinople",
-				"create2collisionwithSelfdestructSameBlock_Constantinople",
-				"blockhashNonConstArg_Constantinople",
-				"suicideThenCheckBalance_Constantinople",
-				"suicideThenCheckBalance_Homestead",
-				"suicideStorageCheckVCreate_Byzantium",
-				"suicideStorageCheckVCreate_Constantinople"
-			]
-		},
-		{
-			"reference": "9590",
-			"failing": "stEIP158Specific",
-			"subtests": [
-				"callToEmptyThenCallError_d0g0v0_Byzantium",
-				"callToEmptyThenCallError_d0g0v0_Constantinople",
-				"callToEmptyThenCallError_d0g0v0_EIP158"
-			]
-		},
-		{
-			"reference": "9590",
-			"failing": "stPreCompiledContracts",
-			"subtests": [
-				"identity_to_smaller_d0g0v0_Constantinople",
-				"identity_to_bigger_d0g0v0_Constantinople"
-			]
-		},
-		{
-			"reference": "9590",
-			"failing": "stReturnDataTest",
-			"subtests": [
-				"modexp_modsize0_returndatasize_d0g1v0_Constantinople",
-				"modexp_modsize0_returndatasize_d0g2v0_Constantinople",
-				"modexp_modsize0_returndatasize_d0g3v0_Constantinople"
-			]
-		},
-		{
-			"reference": "9590",
-			"failing": "stSpecialTest",
-			"subtests": [
-				"push32withoutByte_d0g0v0_Constantinople"
-			]
-		}
-
-	],
-	"state":
-	[
-		{
-			"reference": "9590",
-			"failing": "stCreateTest",
-			"subtests": {
-				"CreateOOGafterInitCodeReturndata2": {
-					"subnumbers": ["2"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "9590",
-			"failing": "stCreate2Test",
-			"subtests": {
-				"RevertInCreateInInit": {
-					"subnumbers": ["1"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "9590",
-			"failing": "stEIP150Specific",
-			"subtests": {
-				"NewGasPriceForCodes": {
-					"subnumbers": ["1"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "9590",
-			"failing": "stInitCodeTest",
-			"subtests": {
-				"OutOfGasContractCreation": {
-					"subnumbers": ["4"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "9590",
-			"failing": "stPreCompiledContracts",
-			"subtests": {
-				"modexp": {
-					"subnumbers": ["*"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "9590",
-			"failing": "stRevertTest",
-			"subtests": {
-				"LoopCallsDepthThenRevert3": {
-					"subnumbers": ["1"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertOpcodeCreate": {
-					"subnumbers": ["1"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertSubCallStorageOOG2": {
-					"subnumbers": ["1","3"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertDepthCreateOOG": {
-					"subnumbers": ["3","4"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertOpcodeMultipleSubCalls": {
-					"subnumbers": ["*"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertOpcodeDirectCall": {
-					"subnumbers": ["1","2"],
-					"chain": "Constantinople (test)"
-				},
-				"LoopCallsDepthThenRevert2": {
-					"subnumbers": ["1"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertDepth2": {
-					"subnumbers": ["1"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertRemoteSubCallStorageOOG2": {
-					"subnumbers": ["1","2"],
-					"chain": "Constantinople (test)"
-				},
-				"RevertDepthCreateAddressCollision": {
-					"subnumbers": ["3","4"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "9590",
-			"failing": "stStaticCall",
-			"subtests": {
-				"static_RevertDepth2": {
-					"subnumbers": ["1","3"],
-					"chain": "Constantinople (test)"
-				},
-				"static_CheckOpcodes4": {
-					"subnumbers": ["3"],
-					"chain": "Constantinople (test)"
-				},
-				"static_CheckOpcodes3": {
-					"subnumbers": ["5","6","7","8"],
-					"chain": "Constantinople (test)"
-				},
-				"static_callBasic": {
-					"subnumbers": ["1","2"],
-					"chain": "Constantinople (test)"
-				},
-				"static_CheckOpcodes2": {
-					"subnumbers": ["5","6","7","8"],
-					"chain": "Constantinople (test)"
-				},
-				"static_callCreate": {
-					"subnumbers": ["2"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		},
-		{
-			"reference": "https://github.com/ethereum/tests/issues/512",
-			"failing": "stZeroKnowledge",
-			"subtests": {
-				"pointAddTrunc": {
-					"subnumbers": ["*"],
-					"chain": "Constantinople (test)"
-				},
-				"pointAdd": {
-					"subnumbers": ["*"],
-					"chain": "Constantinople (test)"
-				},
-				"pointMulAdd": {
-					"subnumbers": ["*"],
-					"chain": "Constantinople (test)"
-				},
-				"pointMulAdd2": {
-					"subnumbers": ["*"],
-					"chain": "Constantinople (test)"
-				}
-			}
-		}
-	]
-}
--- a/ethcore/res/ethereum/tobalaba.json
+++ b/ethcore/res/ethereum/tobalaba.json
@@ -16,14 +16,14 @@
 		"gasLimitBoundDivisor": "0x400",
 		"minGasLimit": "0x1388",
 		"networkID": "0x62121",
-		"wasmActivationTransition": 7250000,
-		"eip140Transition": 7250000,
-		"eip211Transition": 7250000,
-		"eip214Transition": 7250000,
-		"eip658Transition": 7250000,
+		"wasmActivationTransition": 6666666,
+		"eip140Transition": 6666666,
+		"eip211Transition": 6666666,
+		"eip214Transition": 6666666,
+		"eip658Transition": 6666666,

 		"maxCodeSize": 24576,
-		"maxCodeSizeTransition": 7250000,
+		"maxCodeSizeTransition": 6666666,

 		"registrar": "0xb8624dc8cb3ca3147c178ac4c21734eb49e04071"
 	},
@@ -54,14 +54,14 @@
 			"balance": "0x7E37BE2022B2B09472D89C0000"
 		},

-		"0x0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "activate_at": 7250000, "pricing": { "linear": { "base": 3000, "word": 0 } } } },
-		"0x0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "activate_at": 7250000, "pricing": { "linear": { "base": 60, "word": 12 } } } },
-		"0x0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "activate_at": 7250000, "pricing": { "linear": { "base": 600, "word": 120 } } } },
-		"0x0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "activate_at": 7250000, "pricing": { "linear": { "base": 15, "word": 3 } } } },
-		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 7250000, "pricing": { "modexp": { "divisor": 20 } } } },
-		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 7250000, "pricing": { "linear": { "base": 500, "word": 0 } } } },
-		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 7250000, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
-		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 7250000, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
+		"0x0000000000000000000000000000000000000001": { "builtin": { "name": "ecrecover", "activate_at": 6666666, "pricing": { "linear": { "base": 3000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000002": { "builtin": { "name": "sha256", "activate_at": 6666666, "pricing": { "linear": { "base": 60, "word": 12 } } } },
+		"0x0000000000000000000000000000000000000003": { "builtin": { "name": "ripemd160", "activate_at": 6666666, "pricing": { "linear": { "base": 600, "word": 120 } } } },
+		"0x0000000000000000000000000000000000000004": { "builtin": { "name": "identity", "activate_at": 6666666, "pricing": { "linear": { "base": 15, "word": 3 } } } },
+		"0x0000000000000000000000000000000000000005": { "builtin": { "name": "modexp", "activate_at": 6666666, "pricing": { "modexp": { "divisor": 20 } } } },
+		"0x0000000000000000000000000000000000000006": { "builtin": { "name": "alt_bn128_add", "activate_at": 6666666, "pricing": { "linear": { "base": 500, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000007": { "builtin": { "name": "alt_bn128_mul", "activate_at": 6666666, "pricing": { "linear": { "base": 40000, "word": 0 } } } },
+		"0x0000000000000000000000000000000000000008": { "builtin": { "name": "alt_bn128_pairing", "activate_at": 6666666, "pricing": { "alt_bn128_pairing": { "base": 100000, "pair": 80000 } } } }
 	},

 	"nodes": [
--- a/ethcore/res/ethereum/transition_test.json
+++ b/ethcore/res/ethereum/transition_test.json
@@ -6,15 +6,11 @@
 				"minimumDifficulty": "0x020000",
 				"difficultyBoundDivisor": "0x0800",
 				"durationLimit": "0x0d",
-				"blockReward": {
-					"0x0": "0x4563918244F40000",
-					"0x5": "0x29A2241AF62C0000"
-				},
+				"blockReward": "0x4563918244F40000",
 				"homesteadTransition": "0",
+				"eip649Reward": "0x29A2241AF62C0000",
 				"eip100bTransition": "5",
-				"difficultyBombDelays": {
-					"5": 3000000
-				}
+				"eip649Transition": "5"
 			}
 		}
 	},
--- a/ethcore/res/instant_seal.json
+++ b/ethcore/res/instant_seal.json
@@ -1,9 +1,7 @@
 {
 	"name": "DevelopmentChain",
 	"engine": {
-		"instantSeal": {
-			"params": {}
-		}
+		"instantSeal": null
 	},
 	"params": {
 		"gasLimitBoundDivisor": "0x0400",
@@ -18,6 +16,7 @@
 		"eip161dTransition": "0x0",
 		"eip155Transition": "0x0",
 		"eip98Transition": "0x7fffffffffffff",
+		"eip86Transition": "0x7fffffffffffff",
 		"maxCodeSize": 24576,
 		"maxCodeSizeTransition": "0x0",
 		"eip140Transition": "0x0",
--- a/ethcore/res/null.json
+++ b/ethcore/res/null.json
@@ -11,6 +11,7 @@
 		"maximumExtraDataSize": "0x20",
 		"minGasLimit": "0x1388",
 		"networkID" : "0x2",
+		"eip86Transition": "0x7fffffffffffff",
 		"eip140Transition": "0x0",
 		"eip211Transition": "0x0",
 		"eip214Transition": "0x0",
--- a/ethcore/res/wasm-tests
+++ b/ethcore/res/wasm-tests
--- a/ethcore/service/Cargo.toml
+++ b/ethcore/service/Cargo.toml
@@ -10,13 +10,12 @@ ethcore = { path = ".." }
 ethcore-io = { path = "../../util/io" }
 ethcore-private-tx = { path = "../private-tx" }
 ethcore-sync = { path = "../sync" }
-ethereum-types = "0.4"
-kvdb = "0.1"
+kvdb = { git = "https://github.com/paritytech/parity-common" }
 log = "0.4"
 stop-guard = { path = "../../util/stop-guard" }
-trace-time = "0.1"
+trace-time = { path = "../../util/trace-time" }

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
 tempdir = "0.3"
-kvdb-rocksdb = "0.1.3"
+kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common" }
--- a/ethcore/service/src/lib.rs
+++ b/ethcore/service/src/lib.rs
@@ -19,7 +19,6 @@ extern crate ethcore;
 extern crate ethcore_io as io;
 extern crate ethcore_private_tx;
 extern crate ethcore_sync as sync;
-extern crate ethereum_types;
 extern crate kvdb;
 extern crate stop_guard;

--- a/ethcore/service/src/service.rs
+++ b/ethcore/service/src/service.rs
@@ -21,7 +21,6 @@ use std::path::Path;
 use std::time::Duration;

 use ansi_term::Colour;
-use ethereum_types::H256;
 use io::{IoContext, TimerToken, IoHandler, IoService, IoError};
 use stop_guard::StopGuard;

@@ -55,24 +54,12 @@ impl PrivateTxService {
 }

 impl PrivateTxHandler for PrivateTxService {
-	fn import_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
-		match self.provider.import_private_transaction(rlp) {
-			Ok(import_result) => Ok(import_result),
-			Err(err) => {
-				warn!(target: "privatetx", "Unable to import private transaction packet: {}", err);
-				bail!(err.to_string())
-			}
-		}
+	fn import_private_transaction(&self, rlp: &[u8]) -> Result<(), String> {
+		self.provider.import_private_transaction(rlp).map_err(|e| e.to_string())
 	}

-	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<H256, String> {
-		match self.provider.import_signed_private_transaction(rlp) {
-			Ok(import_result) => Ok(import_result),
-			Err(err) => {
-				warn!(target: "privatetx", "Unable to import signed private transaction packet: {}", err);
-				bail!(err.to_string())
-			}
-		}
+	fn import_signed_private_transaction(&self, rlp: &[u8]) -> Result<(), String> {
+		self.provider.import_signed_private_transaction(rlp).map_err(|e| e.to_string())
 	}
 }

--- a/ethcore/src/block.rs
+++ b/ethcore/src/block.rs
@@ -637,11 +637,10 @@ mod tests {
 	use ethereum_types::Address;
 	use std::sync::Arc;
 	use transaction::SignedTransaction;
-	use verification::queue::kind::blocks::Unverified;

 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header
 	fn enact_bytes(
-		block_bytes: Vec<u8>,
+		block_bytes: &[u8],
 		engine: &EthEngine,
 		tracing: bool,
 		db: StateDB,
@@ -649,10 +648,10 @@ mod tests {
 		last_hashes: Arc<LastHashes>,
 		factories: Factories,
 	) -> Result<LockedBlock, Error> {
-		let block = Unverified::from_rlp(block_bytes)?;
-		let header = block.header;
+		let block = view!(BlockView, block_bytes);
+		let header = block.header();
 		let transactions: Result<Vec<_>, Error> = block
-			.transactions
+			.transactions()
 			.into_iter()
 			.map(SignedTransaction::new)
 			.map(|r| r.map_err(Into::into))
@@ -684,8 +683,8 @@ mod tests {
 		b.populate_from(&header);
 		b.push_transactions(transactions)?;

-		for u in block.uncles {
-			b.push_uncle(u)?;
+		for u in &block.uncles() {
+			b.push_uncle(u.clone())?;
 		}

 		b.close_and_lock()
@@ -693,7 +692,7 @@ mod tests {

 	/// Enact the block given by `block_bytes` using `engine` on the database `db` with given `parent` block header. Seal the block aferwards
 	fn enact_and_seal(
-		block_bytes: Vec<u8>,
+		block_bytes: &[u8],
 		engine: &EthEngine,
 		tracing: bool,
 		db: StateDB,
@@ -701,9 +700,8 @@ mod tests {
 		last_hashes: Arc<LastHashes>,
 		factories: Factories,
 	) -> Result<SealedBlock, Error> {
-		let header = Unverified::from_rlp(block_bytes.clone())?.header;
-		Ok(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)?
-		   .seal(engine, header.seal().to_vec())?)
+		let header = view!(BlockView, block_bytes).header_view();
+		Ok(enact_bytes(block_bytes, engine, tracing, db, parent, last_hashes, factories)?.seal(engine, header.seal())?)
 	}

 	#[test]
@@ -733,7 +731,7 @@ mod tests {
 		let orig_db = b.drain().state.drop().1;

 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
-		let e = enact_and_seal(orig_bytes.clone(), engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
+		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();

 		assert_eq!(e.rlp_bytes(), orig_bytes);

@@ -764,7 +762,7 @@ mod tests {
 		let orig_db = b.drain().state.drop().1;

 		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
-		let e = enact_and_seal(orig_bytes.clone(), engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();
+		let e = enact_and_seal(&orig_bytes, engine, false, db, &genesis_header, last_hashes, Default::default()).unwrap();

 		let bytes = e.rlp_bytes();
 		assert_eq!(bytes, orig_bytes);
--- a/ethcore/src/blockchain/blockchain.rs
+++ b/ethcore/src/blockchain/blockchain.rs
@@ -35,7 +35,6 @@ use encoded;
 use engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
 use engines::ForkChoice;
 use ethereum_types::{H256, Bloom, BloomRef, U256};
-use error::Error as EthcoreError;
 use header::*;
 use heapsize::HeapSizeOf;
 use itertools::Itertools;
@@ -61,21 +60,6 @@ pub trait BlockChainDB: Send + Sync {

 	/// Trace blooms database.
 	fn trace_blooms(&self) -> &blooms_db::Database;
-
-	/// Restore the DB from the given path
-	fn restore(&self, new_db: &str) -> Result<(), EthcoreError> {
-		// First, close the Blooms databases
-		self.blooms().close()?;
-		self.trace_blooms().close()?;
-
-		// Restore the key_value DB
-		self.key_value().restore(new_db)?;
-
-		// Re-open the Blooms databases
-		self.blooms().reopen()?;
-		self.trace_blooms().reopen()?;
-		Ok(())
-	}
 }

 /// Generic database handler. This trait contains one function `open`. When called, it opens database with a
@@ -160,6 +144,11 @@ pub trait BlockProvider {
 			.and_then(|n| body.view().localized_transaction_at(&address.block_hash, n, address.index)))
 	}

+	/// Get transaction receipt.
+	fn transaction_receipt(&self, address: &TransactionAddress) -> Option<Receipt> {
+		self.block_receipts(&address.block_hash).and_then(|br| br.receipts.into_iter().nth(address.index))
+	}
+
 	/// Get a list of transactions for a given block.
 	/// Returns None if block does not exist.
 	fn transactions(&self, hash: &H256) -> Option<Vec<LocalizedTransaction>> {
--- a/ethcore/src/client/bad_blocks.rs
+++ b/ethcore/src/client/bad_blocks.rs
@@ -1,81 +0,0 @@
-// Copyright 2015-2018 Parity Technologies (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/>.
-
-//! Stores recently seen bad blocks.
-
-use bytes::{Bytes, ToPretty};
-use ethereum_types::H256;
-use itertools::Itertools;
-use memory_cache::MemoryLruCache;
-use parking_lot::RwLock;
-use verification::queue::kind::blocks::Unverified;
-
-/// Recently seen bad blocks.
-pub struct BadBlocks {
-	last_blocks: RwLock<MemoryLruCache<H256, (Unverified, String)>>,
-}
-
-impl Default for BadBlocks {
-	fn default() -> Self {
-		BadBlocks {
-			last_blocks: RwLock::new(MemoryLruCache::new(8 * 1024 * 1024)),
-		}
-	}
-}
-
-impl BadBlocks {
-	/// Reports given RLP as invalid block.
-	pub fn report(&self, raw: Bytes, message: String) {
-		match Unverified::from_rlp(raw) {
-			Ok(unverified) => {
-				error!(
-					target: "client",
-					"\nBad block detected: {}\nRLP: {}\nHeader: {:?}\nUncles: {}\nTransactions:{}\n",
-					message,
-					unverified.bytes.to_hex(),
-					unverified.header,
-					unverified.uncles
-						.iter()
-						.enumerate()
-						.map(|(index, uncle)| format!("[Uncle {}] {:?}", index, uncle))
-						.join("\n"),
-					unverified.transactions
-						.iter()
-						.enumerate()
-						.map(|(index, tx)| format!("[Tx {}] {:?}", index, tx))
-						.join("\n"),
-				);
-				self.last_blocks.write().insert(unverified.header.hash(), (unverified, message));
-			},
-			Err(err) => {
-				error!(target: "client", "Bad undecodable block detected: {}\n{:?}", message, err);
-			},
-		}
-	}
-
-	/// Returns a list of recently detected bad blocks with error descriptions.
-	pub fn bad_blocks(&self) -> Vec<(Unverified, String)> {
-		self.last_blocks.read()
-			.backstore()
-			.iter()
-			.map(|(_k, (unverified, message))| (
-				Unverified::from_rlp(unverified.bytes.clone())
-					.expect("Bytes coming from UnverifiedBlock so decodable; qed"),
-				message.clone(),
-			))
-			.collect()
-	}
-}
--- a/ethcore/src/client/chain_notify.rs
+++ b/ethcore/src/client/chain_notify.rs
@@ -26,9 +26,9 @@ pub enum ChainMessageType {
 	/// Consensus message
 	Consensus(Vec<u8>),
 	/// Message with private transaction
-	PrivateTransaction(H256, Vec<u8>),
+	PrivateTransaction(Vec<u8>),
 	/// Message with signed private transaction
-	SignedPrivateTransaction(H256, Vec<u8>),
+	SignedPrivateTransaction(Vec<u8>),
 }

 /// Route type to indicate whether it is enacted or retracted.
--- a/ethcore/src/client/client.rs
+++ b/ethcore/src/client/client.rs
@@ -16,6 +16,7 @@

 use std::collections::{HashSet, BTreeMap, VecDeque};
 use std::cmp;
+use std::fmt;
 use std::str::FromStr;
 use std::sync::atomic::{AtomicUsize, AtomicBool, Ordering as AtomicOrdering};
 use std::sync::{Arc, Weak};
@@ -39,27 +40,23 @@ use client::{
 	RegistryInfo, ReopenBlock, PrepareOpenBlock, ScheduleInfo, ImportSealedBlock,
 	BroadcastProposalBlock, ImportBlock, StateOrBlock, StateInfo, StateClient, Call,
 	AccountData, BlockChain as BlockChainTrait, BlockProducer, SealedBlockImporter,
-	ClientIoMessage,
+	ClientIoMessage
 };
 use client::{
 	BlockId, TransactionId, UncleId, TraceId, ClientConfig, BlockChainClient,
-	TraceFilter, CallAnalytics, Mode,
+	TraceFilter, CallAnalytics, BlockImportError, Mode,
 	ChainNotify, ChainRoute, PruningInfo, ProvingBlockChainClient, EngineInfo, ChainMessageType,
-	IoClient, BadBlocks,
+	IoClient,
 };
-use client::bad_blocks;
 use encoded;
 use engines::{EthEngine, EpochTransition, ForkChoice};
-use error::{
-	ImportErrorKind, ExecutionError, CallError, BlockError,
-	QueueError, QueueErrorKind, Error as EthcoreError, EthcoreResult, ErrorKind as EthcoreErrorKind
-};
+use error::{ImportErrorKind, BlockImportErrorKind, ExecutionError, CallError, BlockError, ImportResult, Error as EthcoreError};
 use vm::{EnvInfo, LastHashes};
 use evm::Schedule;
 use executive::{Executive, Executed, TransactOptions, contract_address};
 use factory::{Factories, VmFactory};
 use header::{BlockNumber, Header, ExtendedHeader};
-use io::IoChannel;
+use io::{IoChannel, IoError};
 use log_entry::LocalizedLogEntry;
 use miner::{Miner, MinerService};
 use ethcore_miner::pool::VerifiedTransaction;
@@ -86,7 +83,7 @@ pub use types::block_status::BlockStatus;
 pub use blockchain::CacheSize as BlockChainCacheSize;
 pub use verification::QueueInfo as BlockQueueInfo;

-use_contract!(registry, "res/contracts/registrar.json");
+use_contract!(registry, "Registry", "res/contracts/registrar.json");

 const MAX_ANCIENT_BLOCKS_QUEUE_SIZE: usize = 4096;
 // Max number of blocks imported at once.
@@ -164,9 +161,6 @@ struct Importer {

 	/// Ethereum engine to be used during import
 	pub engine: Arc<EthEngine>,
-
-	/// A lru cache of recently detected bad blocks
-	pub bad_blocks: bad_blocks::BadBlocks,
 }

 /// Blockchain database client backed by a persistent database. Owns and manages a blockchain and a block queue.
@@ -232,6 +226,8 @@ pub struct Client {
 	/// An action to be done if a mode/spec_name change happens
 	on_user_defaults_change: Mutex<Option<Box<FnMut(Option<Mode>) + 'static + Send>>>,

+	/// Link to a registry object useful for looking up names
+	registrar: registry::Registry,
 	registrar_address: Option<Address>,

 	/// A closure to call when we want to restart the client
@@ -256,7 +252,6 @@ impl Importer {
 			miner,
 			ancient_verifier: AncientVerifier::new(engine.clone()),
 			engine,
-			bad_blocks: Default::default(),
 		})
 	}

@@ -294,26 +289,22 @@ impl Importer {
 					continue;
 				}

-				match self.check_and_lock_block(block, client) {
-					Ok(closed_block) => {
-						if self.engine.is_proposal(&header) {
-							self.block_queue.mark_as_good(&[hash]);
-							proposed_blocks.push(bytes);
-						} else {
-							imported_blocks.push(hash);
+				if let Ok(closed_block) = self.check_and_lock_block(block, client) {
+					if self.engine.is_proposal(&header) {
+						self.block_queue.mark_as_good(&[hash]);
+						proposed_blocks.push(bytes);
+					} else {
+						imported_blocks.push(hash);

-							let transactions_len = closed_block.transactions().len();
+						let transactions_len = closed_block.transactions().len();

-							let route = self.commit_block(closed_block, &header, encoded::Block::new(bytes), client);
-							import_results.push(route);
+						let route = self.commit_block(closed_block, &header, encoded::Block::new(bytes), client);
+						import_results.push(route);

-							client.report.write().accrue_block(&header, transactions_len);
-						}
-					},
-					Err(err) => {
-						self.bad_blocks.report(bytes, format!("{:?}", err));
-						invalid_blocks.insert(hash);
-					},
+						client.report.write().accrue_block(&header, transactions_len);
+					}
+				} else {
+					invalid_blocks.insert(header.hash());
 				}
 			}

@@ -353,7 +344,7 @@ impl Importer {
 		imported
 	}

-	fn check_and_lock_block(&self, block: PreverifiedBlock, client: &Client) -> EthcoreResult<LockedBlock> {
+	fn check_and_lock_block(&self, block: PreverifiedBlock, client: &Client) -> Result<LockedBlock, ()> {
 		let engine = &*self.engine;
 		let header = block.header.clone();

@@ -361,7 +352,7 @@ impl Importer {
 		let best_block_number = client.chain.read().best_block_number();
 		if client.pruning_info().earliest_state > header.number() {
 			warn!(target: "client", "Block import failed for #{} ({})\nBlock is ancient (current best block: #{}).", header.number(), header.hash(), best_block_number);
-			bail!("Block is ancient");
+			return Err(());
 		}

 		// Check if parent is in chain
@@ -369,7 +360,7 @@ impl Importer {
 			Some(h) => h,
 			None => {
 				warn!(target: "client", "Block import failed for #{} ({}): Parent not found ({}) ", header.number(), header.hash(), header.parent_hash());
-				bail!("Parent not found");
+				return Err(());
 			}
 		};

@@ -388,13 +379,13 @@ impl Importer {

 		if let Err(e) = verify_family_result {
 			warn!(target: "client", "Stage 3 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			bail!(e);
+			return Err(());
 		};

 		let verify_external_result = self.verifier.verify_block_external(&header, engine);
 		if let Err(e) = verify_external_result {
 			warn!(target: "client", "Stage 4 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			bail!(e);
+			return Err(());
 		};

 		// Enact Verified Block
@@ -414,13 +405,9 @@ impl Importer {
 			&mut chain.ancestry_with_metadata_iter(*header.parent_hash()),
 		);

-		let mut locked_block = match enact_result {
-			Ok(b) => b,
-			Err(e) => {
-				warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-				bail!(e);
-			}
-		};
+		let mut locked_block = enact_result.map_err(|e| {
+			warn!(target: "client", "Block import failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
+		})?;

 		// Strip receipts for blocks before validate_receipts_transition,
 		// if the expected receipts root header does not match.
@@ -434,7 +421,7 @@ impl Importer {
 		// Final Verification
 		if let Err(e) = self.verifier.verify_block_final(&header, locked_block.block().header()) {
 			warn!(target: "client", "Stage 5 block verification failed for #{} ({})\nError: {:?}", header.number(), header.hash(), e);
-			bail!(e);
+			return Err(());
 		}

 		Ok(locked_block)
@@ -444,7 +431,7 @@ impl Importer {
 	///
 	/// The block is guaranteed to be the next best blocks in the
 	/// first block sequence. Does no sealing or transaction validation.
-	fn import_old_block(&self, unverified: Unverified, receipts_bytes: &[u8], db: &KeyValueDB, chain: &BlockChain) -> EthcoreResult<()> {
+	fn import_old_block(&self, unverified: Unverified, receipts_bytes: &[u8], db: &KeyValueDB, chain: &BlockChain) -> Result<(), ::error::Error> {
 		let receipts = ::rlp::decode_list(receipts_bytes);
 		let _import_lock = self.import_lock.lock();

@@ -777,6 +764,7 @@ impl Client {
 			factories: factories,
 			history: history,
 			on_user_defaults_change: Mutex::new(None),
+			registrar: registry::Registry::default(),
 			registrar_address,
 			exit_handler: Mutex::new(None),
 			importer,
@@ -1153,8 +1141,7 @@ impl Client {
 			},
 		};

-		let processing_threads = self.config.snapshot.processing_threads;
-		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hashdb(), writer, p, processing_threads)?;
+		snapshot::take_snapshot(&*self.engine, &self.chain.read(), start_hash, db.as_hashdb(), writer, p)?;

 		Ok(())
 	}
@@ -1299,7 +1286,9 @@ impl snapshot::DatabaseRestore for Client {
 		let mut tracedb = self.tracedb.write();
 		self.importer.miner.clear();
 		let db = self.db.write();
-		db.restore(new_db)?;
+		db.key_value().restore(new_db)?;
+		db.blooms().reopen()?;
+		db.trace_blooms().reopen()?;

 		let cache_size = state_db.cache_size();
 		*state_db = StateDB::new(journaldb::new(db.key_value().clone(), self.pruning, ::db::COL_STATE), cache_size);
@@ -1366,17 +1355,17 @@ impl BlockChainTrait for Client {}

 impl RegistryInfo for Client {
 	fn registry_address(&self, name: String, block: BlockId) -> Option<Address> {
-		use ethabi::FunctionOutputDecoder;
-
 		let address = self.registrar_address?;

-		let (data, decoder) = registry::functions::get_address::call(keccak(name.as_bytes()), "A");
-		let value = decoder.decode(&self.call_contract(block, address, data).ok()?).ok()?;
-		if value.is_zero() {
-			None
-		} else {
-			Some(value)
-		}
+		self.registrar.functions()
+			.get_address()
+			.call(keccak(name.as_bytes()), "A", &|data| self.call_contract(block, address, data))
+			.ok()
+			.and_then(|a| if a.is_zero() {
+				None
+			} else {
+				Some(a)
+			})
 	}
 }

@@ -1395,26 +1384,16 @@ impl CallContract for Client {
 }

 impl ImportBlock for Client {
-	fn import_block(&self, unverified: Unverified) -> EthcoreResult<H256> {
+	fn import_block(&self, unverified: Unverified) -> Result<H256, BlockImportError> {
 		if self.chain.read().is_known(&unverified.hash()) {
-			bail!(EthcoreErrorKind::Import(ImportErrorKind::AlreadyInChain));
+			bail!(BlockImportErrorKind::Import(ImportErrorKind::AlreadyInChain));
 		}
-
 		let status = self.block_status(BlockId::Hash(unverified.parent_hash()));
-		if status == BlockStatus::Unknown {
-			bail!(EthcoreErrorKind::Block(BlockError::UnknownParent(unverified.parent_hash())));
+		if status == BlockStatus::Unknown || status == BlockStatus::Pending {
+			bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(unverified.parent_hash())));
 		}

-		let raw = unverified.bytes.clone();
-		match self.importer.block_queue.import(unverified) {
-			Ok(res) => Ok(res),
-			// we only care about block errors (not import errors)
-			Err(EthcoreError(EthcoreErrorKind::Block(err), _))=> {
-				self.importer.bad_blocks.report(raw, format!("{:?}", err));
-				bail!(EthcoreErrorKind::Block(err))
-			},
-			Err(e) => Err(e),
-		}
+		Ok(self.importer.block_queue.import(unverified)?)
 	}
 }

@@ -1492,7 +1471,7 @@ impl Call for Client {
 		let sender = t.sender();
 		let options = || TransactOptions::with_tracing().dont_check_nonce();

-		let exec = |gas| {
+		let cond = |gas| {
 			let mut tx = t.as_unsigned().clone();
 			tx.gas = gas;
 			let tx = tx.fake_sign(sender);
@@ -1500,28 +1479,22 @@ impl Call for Client {
 			let mut clone = state.clone();
 			let machine = self.engine.machine();
 			let schedule = machine.schedule(env_info.number);
-			Executive::new(&mut clone, &env_info, &machine, &schedule)
+			Ok(Executive::new(&mut clone, &env_info, &machine, &schedule)
 				.transact_virtual(&tx, options())
-				.ok()
 				.map(|r| r.exception.is_none())
+				.unwrap_or(false))
 		};

-		let cond = |gas| exec(gas).unwrap_or(false);
-
-		if !cond(upper) {
+		if !cond(upper)? {
 			upper = max_upper;
-			match exec(upper) {
-				Some(false) => return Err(CallError::Exceptional),
-				None => {
-					trace!(target: "estimate_gas", "estimate_gas failed with {}", upper);
-					let err = ExecutionError::Internal(format!("Requires higher than upper limit of {}", upper));
-					return Err(err.into())
-				},
-				_ => {},
+			if !cond(upper)? {
+				trace!(target: "estimate_gas", "estimate_gas failed with {}", upper);
+				let err = ExecutionError::Internal(format!("Requires higher than upper limit of {}", upper));
+				return Err(err.into())
 			}
 		}
 		let lower = t.gas_required(&self.engine.schedule(env_info.number)).into();
-		if cond(lower) {
+		if cond(lower)? {
 			trace!(target: "estimate_gas", "estimate_gas succeeded with {}", lower);
 			return Ok(lower)
 		}
@@ -1530,12 +1503,12 @@ impl Call for Client {
 		/// Returns the lowest value between `lower` and `upper` for which `cond` returns true.
 		/// We assert: `cond(lower) = false`, `cond(upper) = true`
 		fn binary_chop<F, E>(mut lower: U256, mut upper: U256, mut cond: F) -> Result<U256, E>
-			where F: FnMut(U256) -> bool
+			where F: FnMut(U256) -> Result<bool, E>
 		{
 			while upper - lower > 1.into() {
-				let mid = (lower + upper) / 2;
+				let mid = (lower + upper) / 2.into();
 				trace!(target: "estimate_gas", "{} .. {} .. {}", lower, mid, upper);
-				let c = cond(mid);
+				let c = cond(mid)?;
 				match c {
 					true => upper = mid,
 					false => lower = mid,
@@ -1557,12 +1530,6 @@ impl EngineInfo for Client {
 	}
 }

-impl BadBlocks for Client {
-	fn bad_blocks(&self) -> Vec<(Unverified, String)> {
-		self.importer.bad_blocks.bad_blocks()
-	}
-}
-
 impl BlockChainClient for Client {
 	fn replay(&self, id: TransactionId, analytics: CallAnalytics) -> Result<Executed, CallError> {
 		let address = self.transaction_address(id).ok_or(CallError::TransactionNotFound)?;
@@ -1792,49 +1759,26 @@ impl BlockChainClient for Client {
 	}

 	fn transaction_receipt(&self, id: TransactionId) -> Option<LocalizedReceipt> {
-		// NOTE Don't use block_receipts here for performance reasons
-		let address = self.transaction_address(id)?;
-		let hash = address.block_hash;
 		let chain = self.chain.read();
-		let number = chain.block_number(&hash)?;
-		let body = chain.block_body(&hash)?;
-		let mut receipts = chain.block_receipts(&hash)?.receipts;
-		receipts.truncate(address.index + 1);
+		self.transaction_address(id)
+			.and_then(|address| chain.block_number(&address.block_hash).and_then(|block_number| {
+				let transaction = chain.block_body(&address.block_hash)
+					.and_then(|body| body.view().localized_transaction_at(&address.block_hash, block_number, address.index));

-		let transaction = body.view().localized_transaction_at(&hash, number, address.index)?;
-		let receipt = receipts.pop()?;
-		let gas_used = receipts.last().map_or_else(|| 0.into(), |r| r.gas_used);
-		let no_of_logs = receipts.into_iter().map(|receipt| receipt.logs.len()).sum::<usize>();
-
-		let receipt = transaction_receipt(self.engine().machine(), transaction, receipt, gas_used, no_of_logs);
-		Some(receipt)
-	}
-
-	fn block_receipts(&self, id: BlockId) -> Option<Vec<LocalizedReceipt>> {
-		let hash = self.block_hash(id)?;
-
-		let chain = self.chain.read();
-		let receipts = chain.block_receipts(&hash)?;
-		let number = chain.block_number(&hash)?;
-		let body = chain.block_body(&hash)?;
-		let engine = self.engine.clone();
-
-		let mut gas_used = 0.into();
-		let mut no_of_logs = 0;
-
-		Some(body
-			.view()
-			.localized_transactions(&hash, number)
-			.into_iter()
-			.zip(receipts.receipts)
-			.map(move |(transaction, receipt)| {
-				let result = transaction_receipt(engine.machine(), transaction, receipt, gas_used, no_of_logs);
-				gas_used = result.cumulative_gas_used;
-				no_of_logs += result.logs.len();
-				result
-			})
-			.collect()
-		)
+				let previous_receipts = (0..address.index + 1)
+					.map(|index| {
+						let mut address = address.clone();
+						address.index = index;
+						chain.transaction_receipt(&address)
+					})
+					.collect();
+				match (transaction, previous_receipts) {
+					(Some(transaction), Some(previous_receipts)) => {
+						Some(transaction_receipt(self.engine().machine(), transaction, previous_receipts))
+					},
+					_ => None,
+				}
+			}))
 	}

 	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute> {
@@ -1853,7 +1797,7 @@ impl BlockChainClient for Client {
 		self.state_db.read().journal_db().state(hash)
 	}

-	fn encoded_block_receipts(&self, hash: &H256) -> Option<Bytes> {
+	fn block_receipts(&self, hash: &H256) -> Option<Bytes> {
 		self.chain.read().block_receipts(hash).map(|receipts| ::rlp::encode(&receipts).into_vec())
 	}

@@ -2093,6 +2037,10 @@ impl BlockChainClient for Client {
 	fn registrar_address(&self) -> Option<Address> {
 		self.registrar_address.clone()
 	}
+
+	fn eip86_transition(&self) -> u64 {
+		self.engine().params().eip86_transition
+	}
 }

 impl IoClient for Client {
@@ -2117,14 +2065,14 @@ impl IoClient for Client {
 		});
 	}

-	fn queue_ancient_block(&self, unverified: Unverified, receipts_bytes: Bytes) -> EthcoreResult<H256> {
+	fn queue_ancient_block(&self, unverified: Unverified, receipts_bytes: Bytes) -> Result<H256, BlockImportError> {
 		trace_time!("queue_ancient_block");

 		let hash = unverified.hash();
 		{
 			// check block order
 			if self.chain.read().is_known(&hash) {
-				bail!(EthcoreErrorKind::Import(ImportErrorKind::AlreadyInChain));
+				bail!(BlockImportErrorKind::Import(ImportErrorKind::AlreadyInChain));
 			}
 			let parent_hash = unverified.parent_hash();
 			// NOTE To prevent race condition with import, make sure to check queued blocks first
@@ -2132,8 +2080,8 @@ impl IoClient for Client {
 			let is_parent_pending = self.queued_ancient_blocks.read().0.contains(&parent_hash);
 			if !is_parent_pending {
 				let status = self.block_status(BlockId::Hash(parent_hash));
-				if  status == BlockStatus::Unknown {
-					bail!(EthcoreErrorKind::Block(BlockError::UnknownParent(parent_hash)));
+				if  status == BlockStatus::Unknown || status == BlockStatus::Pending {
+					bail!(BlockImportErrorKind::Block(BlockError::UnknownParent(parent_hash)));
 				}
 			}
 		}
@@ -2147,7 +2095,7 @@ impl IoClient for Client {

 		let queued = self.queued_ancient_blocks.clone();
 		let lock = self.ancient_blocks_import_lock.clone();
-		self.queue_ancient_blocks.queue(&self.io_channel.read(), 1, move |client| {
+		match self.queue_ancient_blocks.queue(&self.io_channel.read(), 1, move |client| {
 			trace_time!("import_ancient_block");
 			// Make sure to hold the lock here to prevent importing out of order.
 			// We use separate lock, cause we don't want to block queueing.
@@ -2171,9 +2119,10 @@ impl IoClient for Client {
 					break;
 				}
 			}
-		})?;
-
-		Ok(hash)
+		}) {
+			Ok(_) => Ok(hash),
+			Err(e) => bail!(BlockImportErrorKind::Other(format!("{}", e))),
+		}
 	}

 	fn queue_consensus_message(&self, message: Bytes) {
@@ -2269,7 +2218,7 @@ impl ScheduleInfo for Client {
 }

 impl ImportSealedBlock for Client {
-	fn import_sealed_block(&self, block: SealedBlock) -> EthcoreResult<H256> {
+	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult {
 		let h = block.header().hash();
 		let start = Instant::now();
 		let route = {
@@ -2408,14 +2357,16 @@ impl Drop for Client {

 /// Returns `LocalizedReceipt` given `LocalizedTransaction`
 /// and a vector of receipts from given block up to transaction index.
-fn transaction_receipt(
-	machine: &::machine::EthereumMachine,
-	mut tx: LocalizedTransaction,
-	receipt: Receipt,
-	prior_gas_used: U256,
-	prior_no_of_logs: usize,
-) -> LocalizedReceipt {
+fn transaction_receipt(machine: &::machine::EthereumMachine, mut tx: LocalizedTransaction, mut receipts: Vec<Receipt>) -> LocalizedReceipt {
+	assert_eq!(receipts.len(), tx.transaction_index + 1, "All previous receipts are provided.");
+
 	let sender = tx.sender();
+	let receipt = receipts.pop().expect("Current receipt is provided; qed");
+	let prior_gas_used = match tx.transaction_index {
+		0 => 0.into(),
+		i => receipts.get(i - 1).expect("All previous receipts are provided; qed").gas_used,
+	};
+	let no_of_logs = receipts.into_iter().map(|receipt| receipt.logs.len()).sum::<usize>();
 	let transaction_hash = tx.hash();
 	let block_hash = tx.block_hash;
 	let block_number = tx.block_number;
@@ -2444,7 +2395,7 @@ fn transaction_receipt(
 			transaction_hash: transaction_hash,
 			transaction_index: transaction_index,
 			transaction_log_index: i,
-			log_index: prior_no_of_logs + i,
+			log_index: no_of_logs + i,
 		}).collect(),
 		log_bloom: receipt.log_bloom,
 		outcome: receipt.outcome,
@@ -2492,33 +2443,6 @@ mod tests {
 		assert!(client.tree_route(&genesis, &new_hash).is_none());
 	}

-	#[test]
-	fn should_return_block_receipts() {
-		use client::{BlockChainClient, BlockId, TransactionId};
-		use test_helpers::{generate_dummy_client_with_data};
-
-		let client = generate_dummy_client_with_data(2, 2, &[1.into(), 1.into()]);
-		let receipts = client.block_receipts(BlockId::Latest).unwrap();
-
-		assert_eq!(receipts.len(), 2);
-		assert_eq!(receipts[0].transaction_index, 0);
-		assert_eq!(receipts[0].block_number, 2);
-		assert_eq!(receipts[0].cumulative_gas_used, 53_000.into());
-		assert_eq!(receipts[0].gas_used, 53_000.into());
-
-		assert_eq!(receipts[1].transaction_index, 1);
-		assert_eq!(receipts[1].block_number, 2);
-		assert_eq!(receipts[1].cumulative_gas_used, 106_000.into());
-		assert_eq!(receipts[1].gas_used, 53_000.into());
-
-
-		let receipt = client.transaction_receipt(TransactionId::Hash(receipts[0].transaction_hash));
-		assert_eq!(receipt, Some(receipts[0].clone()));
-
-		let receipt = client.transaction_receipt(TransactionId::Hash(receipts[1].transaction_hash));
-		assert_eq!(receipt, Some(receipts[1].clone()));
-	}
-
 	#[test]
 	fn should_return_correct_log_index() {
 		use hash::keccak;
@@ -2562,15 +2486,20 @@ mod tests {
 			topics: vec![],
 			data: vec![],
 		}];
-		let receipt = Receipt {
+		let receipts = vec![Receipt {
+			outcome: TransactionOutcome::StateRoot(state_root),
+			gas_used: 5.into(),
+			log_bloom: Default::default(),
+			logs: vec![logs[0].clone()],
+		}, Receipt {
 			outcome: TransactionOutcome::StateRoot(state_root),
 			gas_used: gas_used,
 			log_bloom: Default::default(),
 			logs: logs.clone(),
-		};
+		}];

 		// when
-		let receipt = transaction_receipt(&machine, transaction, receipt, 5.into(), 1);
+		let receipt = transaction_receipt(&machine, transaction, receipts);

 		// then
 		assert_eq!(receipt, LocalizedReceipt {
@@ -2584,7 +2513,7 @@ mod tests {
 			block_hash: block_hash,
 			block_number: block_number,
 			cumulative_gas_used: gas_used,
-			gas_used: gas_used - 5,
+			gas_used: gas_used - 5.into(),
 			contract_address: None,
 			logs: vec![LocalizedLogEntry {
 				entry: logs[0].clone(),
@@ -2609,6 +2538,21 @@ mod tests {
 	}
 }

+#[derive(Debug)]
+enum QueueError {
+	Channel(IoError),
+	Full(usize),
+}
+
+impl fmt::Display for QueueError {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		match *self {
+			QueueError::Channel(ref c) => fmt::Display::fmt(c, fmt),
+			QueueError::Full(limit) => write!(fmt, "The queue is full ({})", limit),
+		}
+	}
+}
+
 /// Queue some items to be processed by IO client.
 struct IoChannelQueue {
 	currently_queued: Arc<AtomicUsize>,
@@ -2627,7 +2571,7 @@ impl IoChannelQueue {
 		F: Fn(&Client) + Send + Sync + 'static,
 	{
 		let queue_size = self.currently_queued.load(AtomicOrdering::Relaxed);
-		ensure!(queue_size < self.limit, QueueErrorKind::Full(self.limit));
+		ensure!(queue_size < self.limit, QueueError::Full(self.limit));

 		let currently_queued = self.currently_queued.clone();
 		let result = channel.send(ClientIoMessage::execute(move |client| {
@@ -2640,7 +2584,7 @@ impl IoChannelQueue {
 				self.currently_queued.fetch_add(count, AtomicOrdering::SeqCst);
 				Ok(())
 			},
-			Err(e) => bail!(QueueErrorKind::Channel(e)),
+			Err(e) => Err(QueueError::Channel(e)),
 		}
 	}
 }
--- a/ethcore/src/client/config.rs
+++ b/ethcore/src/client/config.rs
@@ -19,7 +19,6 @@ use std::fmt::{Display, Formatter, Error as FmtError};

 use verification::{VerifierType, QueueConfig};
 use journaldb;
-use snapshot::SnapshotConfiguration;

 pub use std::time::Duration;
 pub use blockchain::Config as BlockChainConfig;
@@ -121,8 +120,6 @@ pub struct ClientConfig {
 	pub check_seal: bool,
 	/// Maximal number of transactions queued for verification in a separate thread.
 	pub transaction_verification_queue_size: usize,
-	/// Snapshot configuration
-	pub snapshot: SnapshotConfiguration,
 }

 impl Default for ClientConfig {
@@ -147,7 +144,6 @@ impl Default for ClientConfig {
 			history_mem: 32 * mb,
 			check_seal: true,
 			transaction_verification_queue_size: 8192,
-			snapshot: Default::default(),
 		}
 	}
 }
--- a/ethcore/src/client/evm_test_client.rs
+++ b/ethcore/src/client/evm_test_client.rs
@@ -60,7 +60,7 @@ impl fmt::Display for EvmTestError {
 }

 use ethereum;
-use ethjson::spec::ForkSpec;
+use ethjson::state::test::ForkSpec;

 /// Simplified, single-block EVM test client.
 pub struct EvmTestClient<'a> {
@@ -69,12 +69,12 @@ pub struct EvmTestClient<'a> {
 }

 impl<'a> fmt::Debug for EvmTestClient<'a> {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		fmt.debug_struct("EvmTestClient")
-			.field("state", &self.state)
-			.field("spec", &self.spec.name)
-			.finish()
-	}
+    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+        fmt.debug_struct("EvmTestClient")
+            .field("state", &self.state)
+            .field("spec", &self.spec.name)
+            .finish()
+    }
 }

 impl<'a> EvmTestClient<'a> {
@@ -86,9 +86,9 @@ impl<'a> EvmTestClient<'a> {
 			ForkSpec::EIP150 => Some(ethereum::new_eip150_test()),
 			ForkSpec::EIP158 => Some(ethereum::new_eip161_test()),
 			ForkSpec::Byzantium => Some(ethereum::new_byzantium_test()),
-			ForkSpec::Constantinople => Some(ethereum::new_constantinople_test()),
 			ForkSpec::EIP158ToByzantiumAt5 => Some(ethereum::new_transition_test()),
 			ForkSpec::FrontierToHomesteadAt5 | ForkSpec::HomesteadToDaoAt5 | ForkSpec::HomesteadToEIP150At5 => None,
+			_ => None,
 		}
 	}

@@ -182,19 +182,6 @@ impl<'a> EvmTestClient<'a> {
 			gas_used: 0.into(),
 			gas_limit: *genesis.gas_limit(),
 		};
-		self.call_envinfo(params, tracer, vm_tracer, info)
-	}
-
-	/// Execute the VM given envinfo, ActionParams and tracer.
-	/// Returns amount of gas left and the output.
-	pub fn call_envinfo<T: trace::Tracer, V: trace::VMTracer>(
-		&mut self,
-		params: ActionParams,
-		tracer: &mut T,
-		vm_tracer: &mut V,
-		info: client::EnvInfo,
-	) -> Result<FinalizationResult, EvmTestError>
-	{
 		let mut substate = state::Substate::new();
 		let machine = self.spec.engine.machine();
 		let schedule = machine.schedule(info.number);
@@ -218,7 +205,7 @@ impl<'a> EvmTestClient<'a> {
 	) -> TransactResult<T::Output, V::Output> {
 		let initial_gas = transaction.gas;
 		// Verify transaction
-		let is_ok = transaction.verify_basic(true, None, false);
+		let is_ok = transaction.verify_basic(true, None, env_info.number >= self.spec.engine.params().eip86_transition);
 		if let Err(error) = is_ok {
 			return TransactResult::Err {
 				state_root: *self.state.root(),
@@ -230,27 +217,9 @@ impl<'a> EvmTestClient<'a> {
 		let result = self.state.apply_with_tracing(&env_info, self.spec.engine.machine(), &transaction, tracer, vm_tracer);
 		let scheme = self.spec.engine.machine().create_address_scheme(env_info.number);

-		// Touch the coinbase at the end of the test to simulate
-		// miner reward.
-		// Details: https://github.com/paritytech/parity-ethereum/issues/9431
-		let schedule = self.spec.engine.machine().schedule(env_info.number);
-		self.state.add_balance(&env_info.author, &0.into(), if schedule.no_empty {
-			state::CleanupMode::NoEmpty
-		} else {
-			state::CleanupMode::ForceCreate
-		}).ok();
-		// Touching also means that we should remove the account if it's within eip161
-		// conditions.
-		self.state.kill_garbage(
-			&vec![env_info.author].into_iter().collect(),
-			schedule.kill_empty,
-			&None,
-			false
-		).ok();
-		self.state.commit().ok();
-
 		match result {
 			Ok(result) => {
+				self.state.commit().ok();
 				TransactResult::Ok {
 					state_root: *self.state.root(),
 					gas_left: initial_gas - result.receipt.gas_used,
--- a/ethcore/src/client/mod.rs
+++ b/ethcore/src/client/mod.rs
@@ -17,7 +17,6 @@
 //! Blockchain database client.

 mod ancient_import;
-mod bad_blocks;
 mod client;
 mod config;
 #[cfg(any(test, feature = "test-helpers"))]
@@ -37,7 +36,7 @@ pub use self::test_client::{TestBlockChainClient, EachBlockWith};
 pub use self::chain_notify::{ChainNotify, ChainRoute, ChainRouteType, ChainMessageType};
 pub use self::traits::{
    Nonce, Balance, ChainInfo, BlockInfo, ReopenBlock, PrepareOpenBlock, CallContract, TransactionInfo, RegistryInfo, ScheduleInfo, ImportSealedBlock, BroadcastProposalBlock, ImportBlock,
-    StateOrBlock, StateClient, Call, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter, BadBlocks,
+    StateOrBlock, StateClient, Call, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter
 };
 pub use state::StateInfo;
 pub use self::traits::{BlockChainClient, EngineClient, ProvingBlockChainClient, IoClient};
@@ -50,7 +49,7 @@ pub use types::call_analytics::CallAnalytics;
 pub use executive::{Executed, Executive, TransactOptions};
 pub use vm::{LastHashes, EnvInfo};

-pub use error::TransactionImportError;
+pub use error::{BlockImportError, BlockImportErrorKind, TransactionImportError};
 pub use verification::VerifierType;

 mod traits;
--- a/ethcore/src/client/test_client.rs
+++ b/ethcore/src/client/test_client.rs
@@ -37,17 +37,16 @@ use blockchain::{TreeRoute, BlockReceipts};
 use client::{
 	Nonce, Balance, ChainInfo, BlockInfo, ReopenBlock, CallContract, TransactionInfo, RegistryInfo,
 	PrepareOpenBlock, BlockChainClient, BlockChainInfo, BlockStatus, BlockId, Mode,
-	TransactionId, UncleId, TraceId, TraceFilter, LastHashes, CallAnalytics,
+	TransactionId, UncleId, TraceId, TraceFilter, LastHashes, CallAnalytics, BlockImportError,
 	ProvingBlockChainClient, ScheduleInfo, ImportSealedBlock, BroadcastProposalBlock, ImportBlock, StateOrBlock,
-	Call, StateClient, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter, IoClient,
-	BadBlocks,
+	Call, StateClient, EngineInfo, AccountData, BlockChain, BlockProducer, SealedBlockImporter, IoClient
 };
 use db::{NUM_COLUMNS, COL_STATE};
 use header::{Header as BlockHeader, BlockNumber};
 use filter::Filter;
 use log_entry::LocalizedLogEntry;
 use receipt::{Receipt, LocalizedReceipt, TransactionOutcome};
-use error::{Error, EthcoreResult};
+use error::{Error, ImportResult};
 use vm::Schedule;
 use miner::{self, Miner, MinerService};
 use spec::Spec;
@@ -416,7 +415,7 @@ impl ScheduleInfo for TestBlockChainClient {
 }

 impl ImportSealedBlock for TestBlockChainClient {
-	fn import_sealed_block(&self, _block: SealedBlock) -> EthcoreResult<H256> {
+	fn import_sealed_block(&self, _block: SealedBlock) -> ImportResult {
 		Ok(H256::default())
 	}
 }
@@ -523,7 +522,7 @@ impl RegistryInfo for TestBlockChainClient {
 }

 impl ImportBlock for TestBlockChainClient {
-	fn import_block(&self, unverified: Unverified) -> EthcoreResult<H256> {
+	fn import_block(&self, unverified: Unverified) -> Result<H256, BlockImportError> {
 		let header = unverified.header;
 		let h = header.hash();
 		let number: usize = header.number() as usize;
@@ -616,19 +615,6 @@ impl EngineInfo for TestBlockChainClient {
 	}
 }

-impl BadBlocks for TestBlockChainClient {
-	fn bad_blocks(&self) -> Vec<(Unverified, String)> {
-		vec![
-			(Unverified {
-				header: Default::default(),
-				transactions: vec![],
-				uncles: vec![],
-				bytes: vec![1, 2, 3],
-			}, "Invalid block".into())
-		]
-	}
-}
-
 impl BlockChainClient for TestBlockChainClient {
 	fn replay(&self, _id: TransactionId, _analytics: CallAnalytics) -> Result<Executed, CallError> {
 		self.execution_result.read().clone().unwrap()
@@ -687,10 +673,6 @@ impl BlockChainClient for TestBlockChainClient {
 		self.receipts.read().get(&id).cloned()
 	}

-	fn block_receipts(&self, _id: BlockId) -> Option<Vec<LocalizedReceipt>> {
-		Some(self.receipts.read().values().cloned().collect())
-	}
-
 	fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId> {
 		match self.error_on_logs.read().as_ref() {
 			Some(id) => return Err(id.clone()),
@@ -790,7 +772,7 @@ impl BlockChainClient for TestBlockChainClient {
 		None
 	}

-	fn encoded_block_receipts(&self, hash: &H256) -> Option<Bytes> {
+	fn block_receipts(&self, hash: &H256) -> Option<Bytes> {
 		// starts with 'f' ?
 		if *hash > H256::from("f000000000000000000000000000000000000000000000000000000000000000") {
 			let receipt = BlockReceipts::new(vec![Receipt::new(
@@ -878,6 +860,8 @@ impl BlockChainClient for TestBlockChainClient {
 	}

 	fn registrar_address(&self) -> Option<Address> { None }
+
+	fn eip86_transition(&self) -> u64 { u64::max_value() }
 }

 impl IoClient for TestBlockChainClient {
@@ -887,7 +871,7 @@ impl IoClient for TestBlockChainClient {
 		self.miner.import_external_transactions(self, txs);
 	}

-	fn queue_ancient_block(&self, unverified: Unverified, _r: Bytes) -> EthcoreResult<H256> {
+	fn queue_ancient_block(&self, unverified: Unverified, _r: Bytes) -> Result<H256, BlockImportError> {
 		self.import_block(unverified)
 	}

--- a/ethcore/src/client/traits.rs
+++ b/ethcore/src/client/traits.rs
@@ -24,7 +24,7 @@ use blockchain::TreeRoute;
 use client::Mode;
 use encoded;
 use vm::LastHashes;
-use error::{Error, CallError, EthcoreResult};
+use error::{Error, ImportResult, CallError, BlockImportError};
 use evm::Schedule;
 use executive::Executed;
 use filter::Filter;
@@ -168,7 +168,7 @@ pub trait RegistryInfo {
 /// Provides methods to import block into blockchain
 pub trait ImportBlock {
 	/// Import a block into the blockchain.
-	fn import_block(&self, block: Unverified) -> EthcoreResult<H256>;
+	fn import_block(&self, block: Unverified) -> Result<H256, BlockImportError>;
 }

 /// Provides `call_contract` method
@@ -205,21 +205,15 @@ pub trait IoClient: Sync + Send {
 	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: usize);

 	/// Queue block import with transaction receipts. Does no sealing and transaction validation.
-	fn queue_ancient_block(&self, block_bytes: Unverified, receipts_bytes: Bytes) -> EthcoreResult<H256>;
+	fn queue_ancient_block(&self, block_bytes: Unverified, receipts_bytes: Bytes) -> Result<H256, BlockImportError>;

 	/// Queue conensus engine message.
 	fn queue_consensus_message(&self, message: Bytes);
 }

-/// Provides recently seen bad blocks.
-pub trait BadBlocks {
-	/// Returns a list of blocks that were recently not imported because they were invalid.
-	fn bad_blocks(&self) -> Vec<(Unverified, String)>;
-}
-
 /// Blockchain database client. Owns and manages a blockchain and a block queue.
 pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContract + RegistryInfo + ImportBlock
-+ IoClient + BadBlocks {
+ IoClient {
 	/// Look up the block number for the given block ID.
 	fn block_number(&self, id: BlockId) -> Option<BlockNumber>;

@@ -281,9 +275,6 @@ pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContra
 	/// Get transaction receipt with given hash.
 	fn transaction_receipt(&self, id: TransactionId) -> Option<LocalizedReceipt>;

-	/// Get localized receipts for all transaction in given block.
-	fn block_receipts(&self, id: BlockId) -> Option<Vec<LocalizedReceipt>>;
-
 	/// Get a tree route between `from` and `to`.
 	/// See `BlockChain::tree_route`.
 	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute>;
@@ -295,7 +286,7 @@ pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContra
 	fn state_data(&self, hash: &H256) -> Option<Bytes>;

 	/// Get raw block receipts data by block header hash.
-	fn encoded_block_receipts(&self, hash: &H256) -> Option<Bytes>;
+	fn block_receipts(&self, hash: &H256) -> Option<Bytes>;

 	/// Get block queue information.
 	fn queue_info(&self) -> BlockQueueInfo;
@@ -387,6 +378,9 @@ pub trait BlockChainClient : Sync + Send + AccountData + BlockChain + CallContra

 	/// Get the address of the registry itself.
 	fn registrar_address(&self) -> Option<Address>;
+
+	/// Get the EIP-86 transition block number.
+	fn eip86_transition(&self) -> u64;
 }

 /// Provides `reopen_block` method
@@ -417,7 +411,7 @@ pub trait ScheduleInfo {
 ///Provides `import_sealed_block` method
 pub trait ImportSealedBlock {
 	/// Import sealed block. Skips all verifications.
-	fn import_sealed_block(&self, block: SealedBlock) -> EthcoreResult<H256>;
+	fn import_sealed_block(&self, block: SealedBlock) -> ImportResult;
 }

 /// Provides `broadcast_proposal_block` method
--- a/ethcore/src/engines/authority_round/mod.rs
+++ b/ethcore/src/engines/authority_round/mod.rs
@@ -100,11 +100,7 @@ impl From<ethjson::spec::AuthorityRoundParams> for AuthorityRoundParams {
 			immediate_transitions: p.immediate_transitions.unwrap_or(false),
 			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
 			block_reward_contract_transition: p.block_reward_contract_transition.map_or(0, Into::into),
-			block_reward_contract: match (p.block_reward_contract_code, p.block_reward_contract_address) {
-				(Some(code), _) => Some(BlockRewardContract::new_from_code(Arc::new(code.into()))),
-				(_, Some(address)) => Some(BlockRewardContract::new_from_address(address.into())),
-				(None, None) => None,
-			},
+			block_reward_contract: p.block_reward_contract_address.map(BlockRewardContract::new),
 			maximum_uncle_count_transition: p.maximum_uncle_count_transition.map_or(0, Into::into),
 			maximum_uncle_count: p.maximum_uncle_count.map_or(0, Into::into),
 			empty_steps_transition: p.empty_steps_transition.map_or(u64::max_value(), |n| ::std::cmp::max(n.into(), 1)),
@@ -988,10 +984,8 @@ impl Engine<EthereumMachine> for AuthorityRound {
 					self.clear_empty_steps(parent_step);

 					// report any skipped primaries between the parent block and
-					// the block we're sealing, unless we have empty steps enabled
-					if header.number() < self.empty_steps_transition {
-						self.report_skipped(header, step, u64::from(parent_step) as usize, &*validators, set_number);
-					}
+					// the block we're sealing
+					self.report_skipped(header, step, u64::from(parent_step) as usize, &*validators, set_number);

 					let mut fields = vec![
 						encode(&step).into_vec(),
@@ -1049,7 +1043,7 @@ impl Engine<EthereumMachine> for AuthorityRound {

 	/// Apply the block reward on finalisation of the block.
 	fn on_close_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
-		let mut beneficiaries = Vec::new();
+		let mut benefactors = Vec::new();
 		if block.header().number() >= self.empty_steps_transition {
 			let empty_steps = if block.header().seal().is_empty() {
 				// this is a new block, calculate rewards based on the empty steps messages we have accumulated
@@ -1075,22 +1069,32 @@ impl Engine<EthereumMachine> for AuthorityRound {

 			for empty_step in empty_steps {
 				let author = empty_step.author()?;
-				beneficiaries.push((author, RewardKind::EmptyStep));
+				benefactors.push((author, RewardKind::EmptyStep));
 			}
 		}

 		let author = *block.header().author();
-		beneficiaries.push((author, RewardKind::Author));
+		benefactors.push((author, RewardKind::Author));

 		let rewards: Vec<_> = match self.block_reward_contract {
 			Some(ref c) if block.header().number() >= self.block_reward_contract_transition => {
-				let mut call = super::default_system_or_code_call(&self.machine, block);
+				// NOTE: this logic should be moved to a function when another
+				//       engine needs support for block reward contract.
+				let mut call = |to, data| {
+					let result = self.machine.execute_as_system(
+						block,
+						to,
+						U256::max_value(), // unbounded gas? maybe make configurable.
+						Some(data),
+					);
+					result.map_err(|e| format!("{}", e))
+				};

-				let rewards = c.reward(&beneficiaries, &mut call)?;
+				let rewards = c.reward(&benefactors, &mut call)?;
 				rewards.into_iter().map(|(author, amount)| (author, RewardKind::External, amount)).collect()
 			},
 			_ => {
-				beneficiaries.into_iter().map(|(author, reward_kind)| (author, reward_kind, self.block_reward)).collect()
+				benefactors.into_iter().map(|(author, reward_kind)| (author, reward_kind, self.block_reward)).collect()
 			},
 		};

@@ -1921,7 +1925,7 @@ mod tests {
 		let b2 = b2.close_and_lock().unwrap();

 		// the spec sets the block reward to 10
-		assert_eq!(b2.block().state().balance(&addr1).unwrap(), addr1_balance + (10 * 2))
+		assert_eq!(b2.block().state().balance(&addr1).unwrap(), addr1_balance + (10 * 2).into())
 	}

 	#[test]
@@ -2069,7 +2073,7 @@ mod tests {
 		// the contract rewards (1000 + kind) for each benefactor/reward kind
 		assert_eq!(
 			b2.block().state().balance(&addr1).unwrap(),
-			addr1_balance + (1000 + 0) + (1000 + 2),
+			addr1_balance + (1000 + 0).into() + (1000 + 2).into(),
 		)
 	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
5chdn	8cbfe862df	Merge branch 'generate-json-rpc-doc' of https://github.com/cpurta/parity-ethereum into cpurta-generate-json-rpc-doc-03	2018-08-20 22:44:55 +02:00
Christopher Purta	4c5952dc99	Copy correct parity repo to jsonrpc folder Copy correct parity repo to jsonrpc folder before attempting to build docs since the CI runner clones the repo as parity and not parity-ethereum.	2018-07-31 08:10:05 -07:00
Denis S. Soldatov aka General-Beck	10c4e0cae7	Update gitlab-rpc-docs.sh	2018-07-27 16:42:25 +03:00
Christopher Purta	b970425425	Only apply jsonrpc docs update on tags	2018-07-26 13:42:42 -07:00
Denis S. Soldatov aka General-Beck	a162087128	fix gitlab ci lint	2018-07-26 00:10:57 +03:00
Chris Purta	8f9b64f075	Add update docs script to CI Added a script to CI that will use the jsonrpc tool to update rpc documentation then commit and push those to the wiki repo.	2018-07-25 13:49:19 -07:00