[beta] More backports for 2.1.2 (#9733 )

* produce portable binaries (#9725) * HF in POA Core (2018-10-22) (#9724) https://github.com/poanetwork/poa-chain-spec/pull/87 * Use static call and apparent value transfer for block reward contract code (#9603) * Verify block syncing responses against requests (#9670) * sync: Validate received BlockHeaders packets against stored request. * sync: Validate received BlockBodies and BlockReceipts. * sync: Fix broken tests. * sync: Unit tests for BlockDownloader::import_headers. * sync: Unit tests for import_{bodies,receipts}. * tests: Add missing method doc. * Fix ancient blocks sync (#9531) * Log block set in block_sync for easier debugging * logging macros * Match no args in sync logging macros * Add QueueFull error * Only allow importing headers if the first matches requested * WIP * Test for chain head gaps and log * Calc distance even with 2 heads * Revert previous commits, preparing simple fix This reverts commit 5f38aa885b22ebb0e3a1d60120cea69f9f322628. * Reject headers with no gaps when ChainHead * Reset block sync download when queue full * Simplify check for subchain heads * Add comment to explain subchain heads filter * Fix is_subchain_heads check and comment * Prevent premature round completion after restart This is a problem on mainnet where multiple stale peer requests will force many rounds to complete quickly, forcing the retraction. * Reset stale old blocks request after queue full * Revert "Reject headers with no gaps when ChainHead" This reverts commit 0eb865539e5dee37ab34f168f5fb643300de5ace. * Add BlockSet to BlockDownloader logging Currently it is difficult to debug this because there are two instances, one for OldBlocks and one for NewBlocks. This adds the BlockSet to all log messages for easy log filtering. * Reset OldBlocks download from last enqueued Previously when the ancient block queue was full it would restart the download from the last imported block, so the ones still in the queue would be redownloaded. Keeping the existing downloader instance and just resetting it will start again from the last enqueued block.:wq * Ignore expired Body and Receipt requests * Log when ancient block download being restarted * Only request old blocks from peers with >= difficulty https://github.com/paritytech/parity-ethereum/pull/9226 might be too permissive and causing the behaviour of the retraction soon after the fork block. With this change the peer difficulty has to be greater than or euqal to our syncing difficulty, so should still fix https://github.com/paritytech/parity-ethereum/issues/9225 * Some logging and clear stalled blocks head * Revert "Some logging and clear stalled blocks head" This reverts commit 757641d9b817ae8b63fec684759b0815af9c4d0e. * Reset stalled header if useless more than once * Store useless headers in HashSet * Add sync target to logging macro * Don't disable useless peer and fix log macro * Clear useless headers on reset and comments * Use custom error for collecting blocks Previously we resued BlockImportError, however only the Invalid case and this made little sense with the QueueFull error. * Remove blank line * Test for reset sync after consecutive useless headers * Don't reset after consecutive headers when chain head * Delete commented out imports * Return DownloadAction from collect_blocks instead of error * Don't reset after round complete, was causing test hangs * Add comment explaining reset after useless * Replace HashSet with counter for useless headers * Refactor sync reset on bad block/queue full * Add missing target for log message * Fix compiler errors and test after merge * ethcore: revert ethereum tests submodule update * Add hardcoded headers (#9730) * add foundation hardcoded header #6486017 * add ropsten hardcoded headers #4202497 * add kovan hardcoded headers #9023489 * gitlab ci: releasable_branches: change variables condition to schedule (#9729)
Backports for beta 2.1.2 (#9649 )
2018-10-10 18:55:55 +02:00 · 2018-10-09 15:04:30 +02:00 · 2018-09-21 14:38:28 +02:00 · 2018-09-20 17:19:42 +03:00 · 2018-09-19 20:31:26 +02:00 · 2018-09-18 15:32:05 +02:00
1004 changed files with 67043 additions and 106290 deletions
--- a/.cargo/config
+++ b/.cargo/config
@@ -1,27 +1,3 @@
-# NOTE: if you make changes here, remember to also update:
-#	scripts/test-linux.sh
-#	scripts/build-linux.sh
-#	scripts/build-windows.sh
-
-# Using 'cfg` is broken, see https://github.com/rust-lang/cargo/issues/6858
-#[target.'cfg(target_arch = "x86_64")']
-#rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-# …so instead we list all target triples (Tier 1 64-bit platforms)
-[target.x86_64-unknown-linux-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-pc-windows-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
 [target.x86_64-pc-windows-msvc]
-# Enables the aes-ni instructions for RustCrypto dependency.
 # Link the C runtime statically ; https://github.com/paritytech/parity-ethereum/issues/6643
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
-
-[target.x86_64-apple-darwin]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
+rustflags = ["-Ctarget-feature=+crt-static"]
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@@ -24,42 +24,7 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual

 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).

-### Labels & Milestones
-
-We use [labels](https://github.com/paritytech/parity-ethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/paritytech/parity-ethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/paritytech/parity-ethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/paritytech/parity-ethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
-
-### Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-* **No pushing directly to the master branch**.
-* **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
-* Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
-* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
-
-### Recommendations
-
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into Parity Ethereum [Projects](https://github.com/paritytech/parity-ethereum/projects).
-* **Remove stale branches periodically**
-
-### Preparing Pull Requests
-
-* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
-
-* Once a PR is ready for review please add the [`pleasereview`](https://github.com/paritytech/parity-ethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
-
-### Reviewing Pull Requests*:
-
-* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/paritytech/parity-ethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
-
-When doing a review, make sure to look for any:
-
-* Buggy behavior.
-* Undue maintenance burden.
-* Breaking with house coding style.
-* Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-* Breaking changes should be carefuly reviewed and tagged as such so they end up in the [changelog](../CHANGELOG.md).
-* Uselessness (i.e. it does not strictly add a feature or fix a known issue).
+Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.

 ## License.

--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,14 +1,10 @@
 _Before filing a new issue, please **provide the following information**._

-_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to security@parity.io instead; your submission might be eligible for our Bug Bounty._
-_You can find mode info on the reporting process in [SECURITY.md](https://github.com/paritytech/parity-ethereum/blob/master/SECURITY.md)_
-
-
 - **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 / goerli / ...
+- **Network**: ethereum / ropsten / kovan / ...
 - **Restarted**: no / yes

 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,21 +0,0 @@
-Thank you for your Pull Request!
-
-Before you submitting, please check that:
-
- [ ] You added a brief description of the PR, e.g.:
-  - What does it do?
-  - What important points reviewers should know?
-  - Is there something left for follow-up PRs?
- [ ] You labeled the PR with appropriate labels if you have permissions to do so.
- [ ] You mentioned a related issue if this PR related to it, e.g. `Fixes #228` or `Related #1337`.
- [ ] You asked any particular reviewers to review. If you aren't sure, start with GH suggestions.
- [ ] Your PR adheres [the style guide](https://wiki.parity.io/Coding-guide)
-  - In particular, mind the maximal line length.
-  - There is no commented code checked in unless necessary.
-  - Any panickers have a proof or removed.
- [ ] You updated any rustdocs which may have changed
-
-After you've read this notice feel free to remove it.
-Thank you!
-
-✄ -----------------------------------------------------------------------------
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,3 @@ parity-clib-examples/cpp/build/
 .vscode
 rls/
 /parity.*
-
-# cargo remote artifacts
-remote-target
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,15 +4,20 @@ stages:
  - publish
  - optional

-image:                             ${REGISTRY}/parity-ci-linux:latest
+image:                             parity/rust:gitlab-ci

 variables:
-  GIT_STRATEGY:                    fetch
-  GIT_SUBMODULE_STRATEGY:          recursive
  CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
+  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
+  BUILD_TARGET:                    ubuntu
+  BUILD_ARCH:                      amd64
  CARGO_TARGET:                    x86_64-unknown-linux-gnu
-  REGISTRY:                        registry.parity.io/parity/infrastructure/scripts
+
+cache:
+  key:                             "${CI_JOB_NAME}"
+  paths:
+    - ./target
+    - ./.cargo

 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
  only:                            &releaseable_branches
@@ -23,351 +28,154 @@ variables:

 .collect_artifacts:                &collect_artifacts
  artifacts:
-    name:                          "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
+    name:                          "${CI_JOB_NAME}_${CI_COMMIT_REF_NAME}"
    when:                          on_success
    expire_in:                     1 mos
    paths:
-      - artifacts/
-      - tools/
+    - artifacts/

-.docker-cache-status:              &docker-cache-status
-  variables:
-    CARGO_HOME:                    "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}"
-  dependencies:                    []
-  before_script:
-    - rustup show
-    - cargo --version
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
-  tags:
-    - linux-docker
-
-.build-on-linux:                   &build-on-linux
-  stage:                           build
-  <<:                              *docker-cache-status
-  <<:                              *collect_artifacts
-  script:
-    - scripts/gitlab/build-linux.sh
-  after_script:
-    - mkdir -p tools
-    - cp -r scripts/docker/hub/* ./tools
-    - cp scripts/gitlab/publish-snap.sh ./tools
-    - cp scripts/gitlab/publish-onchain.sh ./tools
-    - cp scripts/gitlab/safe-curl.sh ./tools
-    - echo v"$(sed -r -n '1,/^version/s/^version\s*=\s*"([^"]+)".*$/\1/p' Cargo.toml)" |
-      tee ./tools/VERSION
-    - echo "$(sed -r -n '1,/^track/s/^track\s*=\s*"([^"]+)".*$/\1/p' ./util/version/Cargo.toml)" |
-      tee ./tools/TRACK
-
-
-cargo-check 0 3:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
-    - sccache --show-stats
-
-cargo-check 1 3:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose --color=always
-    - sccache --show-stats
-
-cargo-check 2 3:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check --target $CARGO_TARGET --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose --color=always
-    - sccache --show-stats
-
-cargo-check-evmbin:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time cargo check -p evmbin --target $CARGO_TARGET --locked --verbose --color=always
-    - sccache --show-stats
-
-cargo-check-benches:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - time (
-        cargo check --all --benches --exclude ethash --target $CARGO_TARGET --locked --verbose --color=always;
-        (cd ethash; time cargo check --benches --features bench --target $CARGO_TARGET --locked --verbose --color=always)
-      )
-    - sccache --show-stats
-
-cargo-audit:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - cargo audit
-  allow_failure:                   true # failed cargo audit shouldn't prevent a PR from being merged
-
-validate-chainspecs:
-  stage:                           test
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/validate-chainspecs.sh
-
-test-cpp:
-  stage:                           build
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-cpp.sh
+.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:                           build
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-linux.sh stable
-
-test-linux-beta:
-  stage:                           build
-  only:                            *releaseable_branches
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-linux.sh beta
-
-test-linux-nightly:
-  stage:                           build
-  only:                            *releaseable_branches
-  <<:                              *docker-cache-status
-  script:
-    - ./scripts/gitlab/test-linux.sh nightly
-  allow_failure:                   true
-
-build-android:
-  <<:                              *build-on-linux
-  image:                           ${REGISTRY}/parity-ci-android:stretch
+  stage:                           test
  variables:
-    CARGO_TARGET:                  armv7-linux-androideabi
+    RUN_TESTS:                     all
+  script:
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-stable

 build-linux:
-  <<:                              *build-on-linux
+  stage:                           build
  only:                            *releaseable_branches
-
-build-linux-i386:
-  <<:                              *build-on-linux
-  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-i386:latest
  variables:
-    CARGO_TARGET:                  i686-unknown-linux-gnu
-
-build-linux-arm64:
-  <<:                              *build-on-linux
-  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-arm64:latest
-  variables:
-    CARGO_TARGET:                  aarch64-unknown-linux-gnu
-
-build-linux-armhf:
-  <<:                              *build-on-linux
-  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-armhf:latest
-  variables:
-    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
+    CARGO_TARGET:                  x86_64-unknown-linux-gnu
+  script:
+    - scripts/gitlab/build-unix.sh
+  <<:                              *collect_artifacts
+  tags:
+    - rust-stable

 build-darwin:
  stage:                           build
-  <<:                              *collect_artifacts
  only:                            *releaseable_branches
  variables:
    CARGO_TARGET:                  x86_64-apple-darwin
-    CARGO_HOME:                    "${CI_PROJECT_DIR}/.cargo"
    CC:                            gcc
    CXX:                           g++
  script:
-    - scripts/gitlab/build-linux.sh
+    - scripts/gitlab/build-unix.sh
  tags:
    - rust-osx
+  <<:                              *collect_artifacts

 build-windows:
  stage:                           build
-  <<:                              *collect_artifacts
  only:                            *releaseable_branches
  variables:
    CARGO_TARGET:                  x86_64-pc-windows-msvc
-    CARGO_HOME:                    "C:/ci-cache/parity-ethereum/cargo/$CI_JOB_NAME"
-    GIT_SUBMODULE_STRATEGY:        none
  script:
    - sh scripts/gitlab/build-windows.sh
  tags:
-    - rust-windows
+   - rust-windows
+  <<:                              *collect_artifacts

 publish-docker:
  stage:                           publish
  only:                            *releaseable_branches
-  except:
-    - nightly
-  when:                            manual
-  dependencies:
-    - build-linux
-  environment:
-    name: parity-build
-  cache:                           {}
-  image:                           docker:stable
-  services:
-    - docker:dind
-  variables:
-    GIT_STRATEGY:                  none
-    DOCKER_HOST:                   tcp://localhost:2375
-    DOCKER_DRIVER:                 overlay2
-    GIT_STRATEGY:                  none
-    # DOCKERFILE:                  tools/Dockerfile
-    # CONTAINER_IMAGE:             parity/parity
-  script:
-    - ./tools/publish-docker.sh
-  tags:
-    - kubernetes-parity-build
-
-publish-snap-nightly:              &publish-snap
-  stage:                           publish
-  only:
-    - nightly
-  image:                           snapcore/snapcraft
-  variables:
-    GIT_STRATEGY:                  none
-    BUILD_ARCH:                    amd64
-  cache:                           {}
+  cache: {}
  dependencies:
    - build-linux
  tags:
-    - linux-docker
+    - shell
  script:
-    - ./tools/publish-snap.sh
+    - scripts/gitlab/publish-docker.sh parity

-publish-snap-manually:
-  <<:                              *publish-snap
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-i386-nightly:         &publish-snap-i386
-  <<:                              *publish-snap
-  variables:
-    BUILD_ARCH:                    i386
-    CARGO_TARGET:                  i686-unknown-linux-gnu
-  dependencies:
-    - build-linux-i386
-
-publish-snap-i386-manually:
-  <<:                              *publish-snap-i386
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-arm64-nightly:        &publish-snap-arm64
-  <<:                              *publish-snap
-  variables:
-    BUILD_ARCH:                    arm64
-    CARGO_TARGET:                  aarch64-unknown-linux-gnu
-  dependencies:
-    - build-linux-arm64
-
-publish-snap-arm64-manually:
-  <<:                              *publish-snap-arm64
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-armhf-nightly:        &publish-snap-armhf
-  <<:                              *publish-snap
-  variables:
-    BUILD_ARCH:                    armhf
-    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
-  dependencies:
-    - build-linux-armhf
-
-publish-snap-armhf-manually:
-  <<:                              *publish-snap-armhf
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-onchain-nightly:           &publish-onchain
+publish-awss3:
  stage:                           publish
-  only:
-    - nightly
-  cache:                           {}
-  variables:
-    GIT_STRATEGY:                  none
+  only:                            *releaseable_branches
+  cache: {}
  dependencies:
    - build-linux
    - build-darwin
    - build-windows
+  before_script:                   *determine_version
  script:
-    - ./tools/publish-onchain.sh
+    - scripts/gitlab/publish-awss3.sh
  tags:
-    - linux-docker
+    - shell

-publish-onchain-manually:
-  <<:                              *publish-onchain
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-release-awss3-nightly:     &publish-release-awss3
-  image:                           ${REGISTRY}/awscli:latest
-  stage:                           publish
-  only:
-    - nightly
-  variables:
-    GIT_STRATEGY:                  none
-  cache:                           {}
-  dependencies:
-    - build-linux
-    - build-darwin
-    - build-windows
-  script:
-    - echo "__________Push binaries to AWS S3____________"
-    - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
-       (beta|stable|nightly)
-         export BUCKET=releases.parity.io/ethereum;
-         ;;
-       (*)
-         export BUCKET=builds-parity;
-         ;;
-     esac
-    - aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
-    - echo "__________Read from S3____________"
-    - aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} --recursive --human-readable --summarize
-  tags:
-    - linux-docker
-
-publish-release-awss3-manually:
-  <<:                              *publish-release-awss3
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-docs:
-  stage:                           publish
-  image:                           ${REGISTRY}/parity-ci-docs:latest
+docs-jsonrpc:
+  stage:                            optional
  only:
    - tags
  except:
    - nightly
-  when:                            manual
-  cache:                           {}
-  dependencies:                    []
+  cache: {}
  script:
-    - scripts/gitlab/publish-docs.sh
+    - scripts/gitlab/docs-jsonrpc.sh
  tags:
-    - linux-docker
-  allow_failure:                   true
+    - shell

-publish-av-whitelist:
-  stage:                          publish
-  variables:
-    GIT_STRATEGY:                  none
-  only:                           *releaseable_branches
-  except:
-    - nightly
-  when:                           manual
-  cache:                          {}
-  dependencies:
-    - build-windows
+cargo-audit:
+  stage:                           optional
  script:
-    - scripts/gitlab/publish-av-whitelists.sh
+    - scripts/gitlab/cargo-audit.sh
  tags:
-    - linux-docker
+    - rust-stable
+
+test-android:
+  stage:                           optional
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-arm
+
+test-darwin:
+  stage:                           optional
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CC:                            gcc
+    CXX:                           g++
+    RUN_TESTS:                     cargo
+  script:
+    - scripts/gitlab/test-all.sh stable
+  tags:
+    - rust-osx
+
+test-windows:
+  stage:                           optional
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    RUN_TESTS:                     cargo
+  script:
+    - sh scripts/gitlab/test-all.sh stable
+  tags:
+   - rust-windows
+
+test-beta:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     cargo
+  script:
+    - scripts/gitlab/test-all.sh beta
+  tags:
+    - rust-beta
+
+test-nightly:
+  stage:                           optional
+  variables:
+    RUN_TESTS:                     all
+  script:
+    - scripts/gitlab/test-all.sh nightly
+  tags:
+    - rust-nightly
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,274 +1,370 @@
-## Parity-Ethereum [v2.6.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.6)
+## Parity-Ethereum [v2.0.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.1) (2018-07-27)

-Parity Ethereum v2.6.6-beta is an emergency patch release that adds the missing
-eip1344_transition for mainnet - Users are advised to update as soon as possible
-to prevent any issues with the imminent Istanbul hardfork
+Parity-Ethereum 2.0.1-beta is a bug-fix release to improve performance and stability.

-The full list of included changes:
-* [chainspec]: add `eip1344_transition` for istanbul (#11301)
-
-## Parity-Ethereum [v2.6.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.5)
-
-Parity Ethereum v2.6.5-beta is a patch release that adds block numbers for activating the Istanbul hardfork on mainnet, as well as a large number of various bugfixes, QoL changes, some code cleanup/refactoring and other miscellaneous changes.
-
-This release removes legacy aliases for the mainnet. If you specify `--chain homestead`, `--chain frontier` or `--chain byzantium`, this will need to be changed to one of: `--chain eth`, `--chain ethereum`, `--chain foundation` or `--chain mainnet`.
-
-This release includes important changes to how snapshots are produced. The size of the Ethereum account state means that producing a snapshot takes a long while; most nodes today are not able to finish before the relevant state is pruned. Starting with v2.6.5, pruning is paused while a snapshot is underway, hopefully fixing the current dearth of recent snapshots. The downside to this is that memory usage goes up while a snapshot is produced.
+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:

-* [CI] check evmbin build (#11096)
-* Correct EIP-712 encoding (#11092)
-* [client]: Fix for incorrectly dropped consensus messages (#11082) (#11086)
-* Update hardcoded headers (foundation, classic, kovan, xdai, ewc, ...) (#11053)
-* Add cargo-remote dir to .gitignore (?)
-* Update light client headers: ropsten 6631425 foundation 8798209 (#11201)
-* Update list of bootnodes for xDai chain (#11236)
-* ethcore/res: add mordor testnet configuration (#11200)
-* [chain specs]: activate Istanbul on mainnet (#11228)
-* [builtin]: support multiple prices and activations in chain spec (#11039)
-* [receipt]: add sender & receiver to RichReceipts (#11179)
-* [ethcore/builtin]: do not panic in blake2pricer on short input (#11180)
-* Made ecrecover implementation trait public (#11188)
-* Fix docker centos build (#11226)
-* Update MIX bootnodes. (#11203)
-* Insert explicit warning into the panic hook (#11225)
-* Use provided usd-per-eth value if an endpoint is specified (#11209)
-* Cleanup stratum a bit (#11161)
-* Add Constantinople EIPs to the dev (instant_seal) config (#10809) (already backported)
-* util Host: fix a double Read Lock bug in fn Host::session_readable() (#11175)
-* ethcore client: fix a double Read Lock bug in fn Client::logs() (#11172)
-* Type annotation for next_key() matching of json filter options (#11192)
-* Upgrade jsonrpc to latest (#11206)
-* [dependencies]: jsonrpc 14.0.1 (#11183)
-* Upgrade to jsonrpc v14 (#11151)
-* Switching sccache from local to Redis (#10971)
-* Snapshot restoration overhaul (#11219)
-* Add new line after writing block to hex file. (#10984)
-* Pause pruning while snapshotting (#11178)
-* Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127)
-* Fix block detail updating (#11015)
-* Make InstantSeal Instant again #11186
-* Filter out some bad ropsten warp snapshots (#11247)
-* Allow default block parameter to be blockHash (#10932)
+- 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.6.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.4)
+## Parity-Ethereum [v2.0.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.0) "Ethereum" (2018-07-18)

-Parity Ethereum v2.6.4-stable is a patch release that adds the block numbers for activating the Istanbul hardfork on test networks: Ropsten, Görli, Rinkeby and Kovan.
+This is the Parity-Ethereum//v2.0.0-beta release, code-named "Ethereum", **YOLO!**

-A full list of included changes:
+Please note, Parity-Ethereum//v2.0.0 comes with some breaking changes that might be interrupting your usual workflows. Please mind them before upgrading:

-* ethcore/res: activate Istanbul on Ropsten, Görli, Rinkeby, Kovan (#11068)
-* cleanup json crate (#11027)
-* [json-spec] make blake2 pricing spec more readable (#11034)
-* Update JSON tests to d4f86ecf4aa7c (#11054)
+- 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)).

-## Parity-Ethereum [v2.6.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.3)
+Additional noteworthy changes to the client:

-Parity Ethereum v2.6.3-stable is a patch release that improves security, stability and performance.
+- 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)).

-* The most noteworthy improvement in this release is incorporating all the EIPs required for the Istanbul hard fork.
-* This release also fixes certain security and performance issues, one of which was suspected to be consensus-threatening but turned out to be benign. Thanks to Martin Holst Swende and Felix Lange from the Ethereum Foundation for bringing the suspicious issue to our attention.
+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:

-* add more tx tests (#11038)
-* Fix parallel transactions race-condition (#10995)
-* Add blake2_f precompile (#11017)
-* [trace] introduce trace failed to Ext (#11019)
-* Edit publish-onchain.sh to use https (#11016)
-* Fix deadlock in network-devp2p (#11013)
-* EIP 1108: Reduce alt_bn128 precompile gas costs (#11008)
-* xDai chain support and nodes list update (#10989)
-* EIP 2028: transaction gas lowered from 68 to 16 (#10987)
-* EIP-1344 Add CHAINID op-code (#10983)
-* manual publish jobs for releases, no changes for nightlies (#10977)
-* [blooms-db] Fix benchmarks (#10974)
-* Verify transaction against its block during import (#10954)
-* Better error message for rpc gas price errors (#10931)
-* Fix fork choice (#10837)
-* Fix compilation on recent nightlies (#10991)
-* Don't build rpc with ethcore test-helpers (#11048)
-* EIP 1884 Re-pricing of trie-size dependent operations  (#10992)
-* Implement EIP-1283 reenable transition, EIP-1706 and EIP-2200  (#10191)
-
-## Parity-Ethereum [v2.6.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.2)
-
-Parity Ethereum v2.6.2-stable is a bugfix release that fixes a potential DoS attack in the trace_call RPC method. This is a critical upgrade for anyone running Parity nodes with RPC exposed to the public internet (and highly recommended for anyone else). For details see this blog post.
-
-## Parity-Ethereum [v2.6.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.1)
-
-Parity-Ethereum 2.6.1-beta is a patch release that improves stability.
-
-This release includes:
-  * Allow specifying hostnames for node URLs
-  * Fix a bug where archive nodes were losing peers
-  * Add support for Energy Web Foundations new chains 'Volta' and 'EWC', and remove their deprecated 'Tobalaba' chain.
-
-The full list of included changes:
-  * Add support for Energy Web Foundation's new chains (#10957)
-  * Kaspersky AV whitelisting (#10919)
-  * Avast whitelist script (#10900)
-  * Docker images renaming (#10863)
-  * Remove excessive warning (#10831)
-  * Allow --nat extip:your.host.here.org (#10830)
-  * When updating the client or when called from RPC, sleep should mean sleep (#10814)
-  * added new ropsten-bootnode and removed old one (#10794)
-  * ethkey no longer uses byteorder (#10786)
-  * docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
-
-## Parity-Ethereum [v2.6.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.0)
-
-Parity-Ethereum 2.6.0-beta is a minor release that stabilizes the 2.6 branch by
-marking it as a beta release.
-
-This release includes:
-  * Major refactoring of the codebase
-  * Many bugfixes
-  * Significant improvements to logging, error and warning message clarity.
-  * SecretStore: remove support of old database formats (#10757)
-      * This is a potentially breaking change if you have not upgraded for
-          quite some time.
-
- As of today, Parity-Ethereum 2.4 reaches end of life, and everyone is
- encouraged to upgrade.
-
-The full list of included changes:
-* update jsonrpc to 12.0 ([#10841](https://github.com/paritytech/parity-ethereum/pull/10841))
-* Move more code into state-account ([#10840](https://github.com/paritytech/parity-ethereum/pull/10840))
-* Extract AccountDB to account-db ([#10839](https://github.com/paritytech/parity-ethereum/pull/10839))
-* Extricate PodAccount and state Account to own crates ([#10838](https://github.com/paritytech/parity-ethereum/pull/10838))
-* Fix fork choice ([#10837](https://github.com/paritytech/parity-ethereum/pull/10837))
-* tests: Relates to #10655: Test instructions for Readme ([#10835](https://github.com/paritytech/parity-ethereum/pull/10835))
-* idiomatic changes to PodState ([#10834](https://github.com/paritytech/parity-ethereum/pull/10834))
-* Break circular dependency between Client and Engine (part 1) ([#10833](https://github.com/paritytech/parity-ethereum/pull/10833))
-* Remove excessive warning ([#10831](https://github.com/paritytech/parity-ethereum/pull/10831))
-* Allow --nat extip:your.host.here.org ([#10830](https://github.com/paritytech/parity-ethereum/pull/10830))
-* ethcore does not use byteorder ([#10829](https://github.com/paritytech/parity-ethereum/pull/10829))
-* Fix typo in README.md ([#10828](https://github.com/paritytech/parity-ethereum/pull/10828))
-* Update wordlist to v1.3 ([#10823](https://github.com/paritytech/parity-ethereum/pull/10823))
-* bump `smallvec 0.6.10` to fix vulnerability ([#10822](https://github.com/paritytech/parity-ethereum/pull/10822))
-* removed additional_params method ([#10818](https://github.com/paritytech/parity-ethereum/pull/10818))
-* Improve logging when remote peer is unknown ([#10817](https://github.com/paritytech/parity-ethereum/pull/10817))
-* replace memzero with zeroize crate ([#10816](https://github.com/paritytech/parity-ethereum/pull/10816))
-* When updating the client or when called from RPC, sleep should mean sleep ([#10814](https://github.com/paritytech/parity-ethereum/pull/10814))
-* Don't reimplement the logic from the Default impl ([#10813](https://github.com/paritytech/parity-ethereum/pull/10813))
-* refactor: whisper: Add type aliases and update rustdocs in message.rs ([#10812](https://github.com/paritytech/parity-ethereum/pull/10812))
-* test: whisper/cli `add invalid pool size test depending on processor` ([#10811](https://github.com/paritytech/parity-ethereum/pull/10811))
-* Add Constantinople EIPs to the dev (instant_seal) config ([#10809](https://github.com/paritytech/parity-ethereum/pull/10809))
-* fix spurious test failure ([#10808](https://github.com/paritytech/parity-ethereum/pull/10808))
-* revert temp changes to .gitlab-ci.yml ([#10807](https://github.com/paritytech/parity-ethereum/pull/10807))
-* removed redundant fmt::Display implementations ([#10806](https://github.com/paritytech/parity-ethereum/pull/10806))
-* removed EthEngine alias ([#10805](https://github.com/paritytech/parity-ethereum/pull/10805))
-* ethcore-bloom-journal updated to 2018 ([#10804](https://github.com/paritytech/parity-ethereum/pull/10804))
-* Fix a few typos and unused warnings. ([#10803](https://github.com/paritytech/parity-ethereum/pull/10803))
-* updated price-info to edition 2018 ([#10801](https://github.com/paritytech/parity-ethereum/pull/10801))
-* updated parity-local-store to edition 2018 ([#10800](https://github.com/paritytech/parity-ethereum/pull/10800))
-* updated project to ansi_term 0.11 ([#10799](https://github.com/paritytech/parity-ethereum/pull/10799))
-* ethcore-light uses bincode 1.1 ([#10798](https://github.com/paritytech/parity-ethereum/pull/10798))
-* ethcore-network-devp2p uses igd 0.9 ([#10797](https://github.com/paritytech/parity-ethereum/pull/10797))
-* Better logging when backfilling ancient blocks fail ([#10796](https://github.com/paritytech/parity-ethereum/pull/10796))
-* added new ropsten-bootnode and removed old one ([#10794](https://github.com/paritytech/parity-ethereum/pull/10794))
-* Removed machine abstraction from ethcore ([#10791](https://github.com/paritytech/parity-ethereum/pull/10791))
-* Removed redundant ethcore-service error type ([#10788](https://github.com/paritytech/parity-ethereum/pull/10788))
-* Cleanup unused vm dependencies ([#10787](https://github.com/paritytech/parity-ethereum/pull/10787))
-* ethkey no longer uses byteorder ([#10786](https://github.com/paritytech/parity-ethereum/pull/10786))
-* Updated blooms-db to rust 2018 and removed redundant deps ([#10785](https://github.com/paritytech/parity-ethereum/pull/10785))
-* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
-* Do not drop the peer with None difficulty ([#10772](https://github.com/paritytech/parity-ethereum/pull/10772))
-* EIP-1702: Generalized Account Versioning Scheme ([#10771](https://github.com/paritytech/parity-ethereum/pull/10771))
-* Move Engine::register_client to be before other I/O handler registration ([#10767](https://github.com/paritytech/parity-ethereum/pull/10767))
-* ethcore/res: activate atlantis classic hf on block 8772000 ([#10766](https://github.com/paritytech/parity-ethereum/pull/10766))
-* Updated Bn128PairingImpl to use optimized batch pairing  ([#10765](https://github.com/paritytech/parity-ethereum/pull/10765))
-* Remove unused code ([#10762](https://github.com/paritytech/parity-ethereum/pull/10762))
-* Initialize private tx logger only if private tx functionality is enabled ([#10758](https://github.com/paritytech/parity-ethereum/pull/10758))
-* SecretStore: remove support of old database formats ([#10757](https://github.com/paritytech/parity-ethereum/pull/10757))
-* Enable aesni ([#10756](https://github.com/paritytech/parity-ethereum/pull/10756))
-* updater: fix static id hashes initialization ([#10755](https://github.com/paritytech/parity-ethereum/pull/10755))
-* Use fewer threads for snapshotting ([#10752](https://github.com/paritytech/parity-ethereum/pull/10752))
-* Die error_chain, die ([#10747](https://github.com/paritytech/parity-ethereum/pull/10747))
-* Fix deprectation warnings on nightly ([#10746](https://github.com/paritytech/parity-ethereum/pull/10746))
-* Improve logging and cleanup in miner around block sealing ([#10745](https://github.com/paritytech/parity-ethereum/pull/10745))
-* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
-* fix docker tags for publishing ([#10741](https://github.com/paritytech/parity-ethereum/pull/10741))
-* refactor: Fix indentation in ethjson ([#10740](https://github.com/paritytech/parity-ethereum/pull/10740))
-* Log validator set changes in EpochManager ([#10734](https://github.com/paritytech/parity-ethereum/pull/10734))
-* Print warnings when using dangerous settings for ValidatorSet ([#10733](https://github.com/paritytech/parity-ethereum/pull/10733))
-* ethcore: enable ECIP-1054 for classic ([#10731](https://github.com/paritytech/parity-ethereum/pull/10731))
-* Stop breaking out of loop if a non-canonical hash is found ([#10729](https://github.com/paritytech/parity-ethereum/pull/10729))
-* Removed secret_store folder ([#10722](https://github.com/paritytech/parity-ethereum/pull/10722))
-* Revert "enable lto for release builds (#10717)" ([#10721](https://github.com/paritytech/parity-ethereum/pull/10721))
-* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
-* Use RUSTFLAGS to set the optimization level ([#10719](https://github.com/paritytech/parity-ethereum/pull/10719))
-* enable lto for release builds ([#10717](https://github.com/paritytech/parity-ethereum/pull/10717))
-* [devp2p] Update to 2018 edition ([#10716](https://github.com/paritytech/parity-ethereum/pull/10716))
-* [devp2p] Don't use `rust-crypto` ([#10714](https://github.com/paritytech/parity-ethereum/pull/10714))
-* [devp2p] Fix warnings and re-org imports ([#10710](https://github.com/paritytech/parity-ethereum/pull/10710))
-* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet ([#10705](https://github.com/paritytech/parity-ethereum/pull/10705))
-* introduce MissingParent Error, fixes #10699 ([#10700](https://github.com/paritytech/parity-ethereum/pull/10700))
-* Refactor Clique stepping ([#10691](https://github.com/paritytech/parity-ethereum/pull/10691))
-* add_sync_notifier in EthPubSubClient holds on to a Client for too long ([#10689](https://github.com/paritytech/parity-ethereum/pull/10689))
-* Fix compiler warning (that will become an error) ([#10683](https://github.com/paritytech/parity-ethereum/pull/10683))
-* Don't panic if extra_data is longer than VANITY_LENGTH ([#10682](https://github.com/paritytech/parity-ethereum/pull/10682))
-* Remove annoying compiler warnings ([#10679](https://github.com/paritytech/parity-ethereum/pull/10679))
-* Remove support for hardware wallets ([#10678](https://github.com/paritytech/parity-ethereum/pull/10678))
-* [CI] allow cargo audit to fail ([#10676](https://github.com/paritytech/parity-ethereum/pull/10676))
-* new image ([#10673](https://github.com/paritytech/parity-ethereum/pull/10673))
-* Upgrade ethereum types ([#10670](https://github.com/paritytech/parity-ethereum/pull/10670))
-* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
-* fix: Move PR template into .github/ folder ([#10663](https://github.com/paritytech/parity-ethereum/pull/10663))
-* docs: evmbin - Update Rust docs ([#10658](https://github.com/paritytech/parity-ethereum/pull/10658))
-* refactor: Related #9459 - evmbin: replace untyped json! macro with fully typed serde serialization using Rust structs ([#10657](https://github.com/paritytech/parity-ethereum/pull/10657))
-* docs: Add PR template ([#10654](https://github.com/paritytech/parity-ethereum/pull/10654))
-* docs: Add ProgPoW Rust docs to ethash module ([#10653](https://github.com/paritytech/parity-ethereum/pull/10653))
-* docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions ([#10652](https://github.com/paritytech/parity-ethereum/pull/10652))
-* Upgrade to parity-crypto 0.4 ([#10650](https://github.com/paritytech/parity-ethereum/pull/10650))
-* fix(compilation warnings) ([#10649](https://github.com/paritytech/parity-ethereum/pull/10649))
-* [whisper] Move needed aes_gcm crypto in-crate ([#10647](https://github.com/paritytech/parity-ethereum/pull/10647))
-* Update publishing ([#10644](https://github.com/paritytech/parity-ethereum/pull/10644))
-* ci: publish docs debug ([#10638](https://github.com/paritytech/parity-ethereum/pull/10638))
-* Fix publish docs ([#10635](https://github.com/paritytech/parity-ethereum/pull/10635))
-* Fix rinkeby petersburg fork ([#10632](https://github.com/paritytech/parity-ethereum/pull/10632))
-* Update kovan.json to switch Kovan validator set to POA Consensus Contracts ([#10628](https://github.com/paritytech/parity-ethereum/pull/10628))
-* [ethcore] remove error_chain ([#10616](https://github.com/paritytech/parity-ethereum/pull/10616))
-* Remove unused import ([#10615](https://github.com/paritytech/parity-ethereum/pull/10615))
-* Adds parity_getRawBlockByNumber, parity_submitRawBlock ([#10609](https://github.com/paritytech/parity-ethereum/pull/10609))
-* adds rpc error message for --no-ancient-blocks ([#10608](https://github.com/paritytech/parity-ethereum/pull/10608))
-* Constantinople HF on POA Core ([#10606](https://github.com/paritytech/parity-ethereum/pull/10606))
-* Clique: zero-fill extradata when the supplied value is less than 32 bytes in length ([#10605](https://github.com/paritytech/parity-ethereum/pull/10605))
-* evm: add some mulmod benches ([#10600](https://github.com/paritytech/parity-ethereum/pull/10600))
-* sccache logs to stdout ([#10596](https://github.com/paritytech/parity-ethereum/pull/10596))
-* update bootnodes ([#10595](https://github.com/paritytech/parity-ethereum/pull/10595))
-* Merge `Notifier` and `TransactionsPoolNotifier` ([#10591](https://github.com/paritytech/parity-ethereum/pull/10591))
-* fix(whisper): change expiry `unix_time + ttl + work` ([#10587](https://github.com/paritytech/parity-ethereum/pull/10587))
-* fix(evmbin): make benches compile again ([#10586](https://github.com/paritytech/parity-ethereum/pull/10586))
-* fix issue with compilation when 'slow-blocks' feature enabled ([#10585](https://github.com/paritytech/parity-ethereum/pull/10585))
-* Allow CORS requests in Secret Store API ([#10584](https://github.com/paritytech/parity-ethereum/pull/10584))
-* CI improvements ([#10579](https://github.com/paritytech/parity-ethereum/pull/10579))
-* ethcore: improve timestamp handling ([#10574](https://github.com/paritytech/parity-ethereum/pull/10574))
-* Update Issue Template to direct security issue to email ([#10562](https://github.com/paritytech/parity-ethereum/pull/10562))
-* version: bump master to 2.6 ([#10560](https://github.com/paritytech/parity-ethereum/pull/10560))
-* fix(light cull): poll light cull instead of timer ([#10559](https://github.com/paritytech/parity-ethereum/pull/10559))
-* Watch transactions pool ([#10558](https://github.com/paritytech/parity-ethereum/pull/10558))
-* Add SealingState; don't prepare block when not ready. ([#10529](https://github.com/paritytech/parity-ethereum/pull/10529))
-* Explicitly enable or disable Stratum in config file (Issue 9785) ([#10521](https://github.com/paritytech/parity-ethereum/pull/10521))
-* Add filtering capability to `parity_pendingTransactions` (issue 8269) ([#10506](https://github.com/paritytech/parity-ethereum/pull/10506))
-* Remove calls to heapsize ([#10432](https://github.com/paritytech/parity-ethereum/pull/10432))
-* RPC: Implements eth_subscribe("syncing") ([#10311](https://github.com/paritytech/parity-ethereum/pull/10311))
-* SecretStore: non-blocking wait of session completion ([#10303](https://github.com/paritytech/parity-ethereum/pull/10303))
-* Node table limiting and cache for node filter ([#10288](https://github.com/paritytech/parity-ethereum/pull/10288))
-* SecretStore: expose restore_key_public in HTTP API ([#10241](https://github.com/paritytech/parity-ethereum/pull/10241))
-* Trivial journal for private transactions ([#10056](https://github.com/paritytech/parity-ethereum/pull/10056))
+- 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))

 ## Previous releases

- [CHANGELOG-2.5](docs/CHANGELOG-2.5.md) (_stable_)
- [CHANGELOG-2.4](docs/CHANGELOG-2.4.md) (EOL: 2019-07-08)
- [CHANGELOG-2.3](docs/CHANGELOG-2.3.md) (EOL: 2019-04-09)
- [CHANGELOG-2.2](docs/CHANGELOG-2.2.md) (EOL: 2019-02-25)
- [CHANGELOG-2.1](docs/CHANGELOG-2.1.md) (EOL: 2019-01-16)
- [CHANGELOG-2.0](docs/CHANGELOG-2.0.md) (EOL: 2018-11-15)
- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (EOL: 2018-09-19)
+- [CHANGELOG-1.11](docs/CHANGELOG-1.11.md) (_stable_)
 - [CHANGELOG-1.10](docs/CHANGELOG-1.10.md) (EOL: 2018-07-18)
 - [CHANGELOG-1.9](docs/CHANGELOG-1.9.md) (EOL: 2018-05-09)
 - [CHANGELOG-1.8](docs/CHANGELOG-1.8.md) (EOL: 2018-03-22)
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,15 +2,16 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.6.6"
+version = "2.1.2"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 blooms-db = { path = "util/blooms-db" }
 log = "0.4"
+env_logger = "0.5"
 rustc-hex = "1.0"
-docopt = "1.0"
+docopt = "0.8"
 clap = "2"
 term_size = "0.3"
 textwrap = "0.9"
@@ -18,62 +19,57 @@ num_cpus = "1.2"
 number_prefix = "0.2"
 rpassword = "1.0"
 semver = "0.9"
-ansi_term = "0.11"
-parking_lot = "0.9"
-regex = "1.0"
+ansi_term = "0.10"
+parking_lot = "0.6"
+regex = "0.2"
 atty = "0.2.8"
 toml = "0.4"
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
 futures = "0.1"
+futures-cpupool = "0.1"
 fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-jsonrpc-core = "14.0.3"
-parity-bytes = "0.1"
-common-types = { path = "ethcore/types" }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-1.11" }
 ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract"}
-ethcore-db = { path = "ethcore/db" }
+parity-bytes = "0.1"
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
-ethcore-logger = { path = "parity/logger" }
+ethcore-logger = { path = "logger" }
 ethcore-miner = { path = "miner" }
 ethcore-network = { path = "util/network" }
 ethcore-private-tx = { path = "ethcore/private-tx" }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
-ethereum-types = "0.6.0"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-node-filter = { path = "ethcore/node-filter" }
-rlp = "0.4.0"
-cli-signer= { path = "cli-signer" }
-parity-daemonize = "0.3"
-parity-hash-fetch = { path = "updater/hash-fetch" }
+ethcore-transaction = { path = "ethcore/transaction" }
+ethereum-types = "0.4"
+node-filter = { path = "ethcore/node_filter" }
+ethkey = { path = "ethkey" }
+rlp = { version = "0.2.4", features = ["ethereum"] }
+rpc-cli = { path = "rpc_cli" }
+parity-hash-fetch = { path = "hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
-parity-local-store = { path = "miner/local-store" }
-parity-runtime = { path = "util/runtime" }
+parity-local-store = { path = "local-store" }
+parity-reactor = { path = "util/reactor" }
 parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
 parity-version = { path = "util/version" }
 parity-whisper = { path = "whisper" }
 parity-path = "0.1"
 dir = { path = "util/dir" }
-panic_hook = { path = "util/panic-hook" }
-keccak-hash = "0.2.0"
+panic_hook = { path = "util/panic_hook" }
+keccak-hash = "0.1"
 migration-rocksdb = { path = "util/migration-rocksdb" }
 kvdb = "0.1"
-kvdb-rocksdb = "0.1.5"
+kvdb-rocksdb = "0.1.3"
 journaldb = { path = "util/journaldb" }
+mem = { path = "util/mem" }

-ethcore-secretstore = { path = "secret-store", optional = true }
+ethcore-secretstore = { path = "secret_store", optional = true }

-registrar = { path = "util/registrar" }
-
-parity-util-mem = { version = "0.1", features = ["jemalloc-global"] }
+registrar = { path = "registrar" }

 [build-dependencies]
 rustc_version = "0.2"
@@ -87,16 +83,17 @@ fake-fetch = { path = "util/fake-fetch" }
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }

+[target.'cfg(not(windows))'.dependencies]
+daemonize = { git = "https://github.com/paritytech/daemonize" }
+
 [features]
-default = ["accounts"]
-accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
+secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 # to create a memory profile (requires nightly rust), use e.g.
@@ -118,25 +115,28 @@ path = "parity/lib.rs"
 path = "parity/main.rs"
 name = "parity"

+[profile.dev]
+
 [profile.release]
 debug = false
-lto = true

 [workspace]
-# This should only list projects that are not
-# in the dependency tree in any other way
-# (i.e. pretty much only standalone CLI tools)
 members = [
-	"accounts/ethkey/cli",
-	"accounts/ethstore/cli",
 	"chainspec",
 	"ethcore/wasm/run",
+	"ethcore/types",
+	"ethkey/cli",
+	"ethstore/cli",
 	"evmbin",
+	"miner",
 	"parity-clib",
+	"whisper",
 	"whisper/cli",
 	"util/triehash-ethereum",
 	"util/keccak-hasher",
 	"util/patricia-trie-ethereum",
 	"util/fastmap",
-	"util/time-utils",
 ]
+
+[patch.crates-io]
+ring = { git = "https://github.com/paritytech/ring" }
--- a/README.md
+++ b/README.md
@@ -1,31 +1,12 @@
 ![Parity Ethereum](docs/logo-parity-ethereum.svg)

-<h2 align="center">The Fastest and most Advanced Ethereum Client.</h2>
+## The fastest and most advanced Ethereum client.

 <p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>

 <p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.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>

-## Table of Contents
-
-1. [Description](#chapter-001)
-2. [Technical Overview](#chapter-002)
-3. [Building](#chapter-003)<br>
-  3.1 [Building Dependencies](#chapter-0031)<br>
-  3.2 [Building from Source Code](#chapter-0032)<br>
-  3.3 [Simple One-Line Installer for Mac and Linux](#chapter-0033)<br>
-  3.4 [Starting Parity Ethereum](#chapter-0034)
-4. [Testing](#chapter-004)
-5. [Documentation](#chapter-005)
-6. [Toolchain](#chapter-006)
-7. [Community](#chapter-007)
-8. [Contributing](#chapter-008)
-9. [License](#chapter-009)
-
-
-## 1. Description <a id="chapter-001"></a>
-
 **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.

 - Clean, modular codebase for easy customisation
@@ -34,7 +15,7 @@
 - Synchronise in hours, not days with Warp Sync
 - Modular for light integration into your service or product

-## 2. Technical Overview <a id="chapter-002"></a>
+## Technical Overview

 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.

@@ -44,11 +25,9 @@ If you run into problems while using Parity Ethereum, check out the [wiki for do

 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.

-## 3. Building <a id="chapter-003"></a>
+## Build Dependencies

-### 3.1 Build Dependencies <a id="chapter-0031"></a>
-
-Parity Ethereum requires **latest stable Rust version** to build.
+Parity Ethereum requires **Rust version 1.29.x** 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:

@@ -57,7 +36,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
  $ curl https://sh.rustup.rs -sSf | sh
  ```

-  Parity Ethereum also requires `gcc`, `g++`, `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
@@ -66,7 +45,7 @@ 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:  
+- 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:
  ```bash
@@ -79,7 +58,7 @@ Once you have `rustup` installed, then you need to install:

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

-### 3.2 Build from Source Code <a id="chapter-0032"></a>
+## Build from Source Code

 ```bash
 # download Parity Ethereum code
@@ -116,7 +95,7 @@ or
 $ git checkout beta
 ```

-### 3.3 Simple One-Line Installer for Mac and Linux <a id="chapter-0033"></a>
+## Simple One-Line Installer for Mac and Linux

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

-### 3.4 Starting Parity Ethereum <a id="chapter-0034"></a>
+## Start Parity Ethereum

-#### Manually
+### Manually

 To start Parity Ethereum manually, just run

@@ -140,234 +119,25 @@ $ ./target/release/parity

 so Parity Ethereum begins syncing the Ethereum blockchain.

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

 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. Copy release to bin folder, write `sudo install ./target/release/parity /usr/bin/parity`
-3. 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.
+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.

-## 4. Testing <a id="chapter-004"></a>
-
-Download the required test files: `git submodule update --init --recursive`. You can run tests with the following commands:
-
-* **All** packages
-  ```
-  cargo test --all
-  ```
-
-* Specific package
-  ```
-  cargo test --package <spec>
-  ```
-
-Replace `<spec>` with one of the packages from the [package list](#package-list) (e.g. `cargo test --package evmbin`).
-
-You can show your logs in the test output by passing `--nocapture` (i.e. `cargo test --package evmbin -- --nocapture`)
-
-## 5. Documentation <a id="chapter-005"></a>
-
-Official website: https://parity.io
-
-Be sure to [check out our wiki](https://wiki.parity.io) for more information.
-
-### Viewing documentation for Parity Ethereum packages
-
-You can generate documentation for Parity Ethereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
-
-* **All** packages
-  ```
-  cargo doc --document-private-items --open
-  ```
-
-* Specific package
-  ```
-  cargo doc --package <spec> -- --document-private-items --open
-  ```
-
-Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies.
-
-Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package parity-ethereum --open`):
-
-<a id="package-list"></a>
-**Package List**
-<details><p>
-
-* Parity Ethereum (EthCore) Client Application
-  ```bash
-  parity-ethereum
-  ```
-* Parity Ethereum Account Management, Key Management Tool, and Keys Generator
-  ```bash
-  ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
-  ```
-* Parity Chain Specification
-  ```bash
-  chainspec
-  ```
-* Parity CLI Signer Tool & RPC Client
-  ```bash
-  cli-signer parity-rpc-client
-  ```
-* Parity Ethereum Ethash & ProgPoW Implementations
-  ```bash
-  ethash
-  ```
-* Parity (EthCore) Library
-  ```bash
-  ethcore
-  ```
-  * Parity Ethereum Blockchain Database, Test Generator, Configuration,
-Caching, Importing Blocks, and Block Information
-    ```bash
-    ethcore-blockchain
-    ```
-  * Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information
-    ```bash
-    ethcore-call-contract
-    ```
-  * Parity Ethereum (EthCore) Database Access & Utilities, Database Cache Manager
-    ```bash
-    ethcore-db
-    ```
-  * Parity Ethereum Virtual Machine (EVM) Rust Implementation
-    ```bash
-    evm
-    ```
-  * Parity Ethereum (EthCore) Light Client Implementation
-    ```bash
-    ethcore-light
-    ```
-  * Parity Smart Contract based Node Filter, Manage Permissions of Network Connections
-    ```bash
-    node-filter
-    ```
-  * Parity Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
-  * Parity Ethereum (EthCore) Client & Network Service Creation & Registration with the I/O Subsystem
-    ```bash
-    ethcore-service
-    ```
-  * Parity Ethereum (EthCore) Blockchain Synchronization
-    ```bash
-    ethcore-sync
-    ```
-  * Parity Ethereum Common Types
-    ```bash
-    common-types
-    ```
-  * Parity Ethereum Virtual Machines (VM) Support Library
-    ```bash
-    vm
-    ```
-  * Parity Ethereum WASM Interpreter
-    ```bash
-    wasm
-    ```
-  * Parity Ethereum WASM Test Runner
-    ```bash
-    pwasm-run-test
-    ```
-  * Parity EVM Implementation
-    ```bash
-    evmbin
-    ```
-  * Parity Ethereum IPFS-compatible API
-    ```bash
-    parity-ipfs-api
-    ```
-  * Parity Ethereum JSON Deserialization
-    ```bash
-    ethjson
-    ```
-  * Parity Ethereum State Machine Generalization for Consensus Engines
-    ```bash
-    parity-machine
-    ```
-* Parity Ethereum (EthCore) Miner Interface
-  ```bash
-  ethcore-miner parity-local-store price-info ethcore-stratum using_queue
-  ```
-* Parity Ethereum (EthCore) Logger Implementation
-  ```bash
-  ethcore-logger
-  ```
-* C bindings library for the Parity Ethereum client
-  ```bash
-  parity-clib
-  ```
-* Parity Ethereum JSON-RPC Servers
-  ```bash
-  parity-rpc
-  ```
-* Parity Ethereum (EthCore) Secret Store
-  ```bash
-  ethcore-secretstore
-  ```
-* Parity Updater Service
-  ```bash
-  parity-updater parity-hash-fetch
-  ```
-* Parity Core Libraries (Parity Util)
-  ```bash
-  ethcore-bloom-journal blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock macros memory-cache memzero
-  migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress rlp_derive parity-runtime stats
-  time-utils triehash-ethereum unexpected parity-version
-  ```
-* Parity Whisper Protocol Implementation
-  ```bash
-  parity-whisper whisper-cli
-  ```
-
-</p></details>
-
-### Contributing to documentation for Parity Ethereum packages
-
-[Document source code](https://doc.rust-lang.org/1.9.0/book/documentation.html) for Parity Ethereum packages by annotating the source code with documentation comments.
-
-Example (generic documentation comment):
-```markdown
-/// Summary
-///
-/// Description
-///
-/// # Panics
-///
-/// # Errors
-///
-/// # Safety
-///
-/// # Examples
-///
-/// Summary of Example 1
-///
-/// ```rust
-/// // insert example 1 code here for use with documentation as tests
-/// ```
-///
-```
-
-## 6. Toolchain <a id="chapter-006"></a>
+## Parity Ethereum toolchain

 In addition to the Parity Ethereum client, there are additional tools in this repository available:

- [evmbin](./evmbin) - Parity Ethereum EVM Implementation.
- [ethstore](./accounts/ethstore) - Parity Ethereum Key Management.
- [ethkey](./accounts/ethkey) - Parity Ethereum Keys Generator.
- [whisper](./whisper) - Parity Ethereum Whisper-v2 PoC Implementation.
+- [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.

-The following tool is available in a separate repository:
- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
-
-## 7. Community <a id="chapter-007"></a>
-
-### Join the chat!
+## 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)
@@ -378,14 +148,8 @@ Questions? Get in touch with us on Gitter:
 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)

-## 8. Contributing <a id="chapter-008"></a>
+## Documentation

-An introduction has been provided in the ["So You Want to be a Core Developer" presentation slides by Hernando Castano](http://tiny.cc/contrib-to-parity-eth). Additional guidelines are provided in [CONTRIBUTING](./.github/CONTRIBUTING.md).
+Official website: https://parity.io

-### Contributor Code of Conduct
-
-[CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
-
-## 9. License <a id="chapter-009"></a>
-
-[LICENSE](./LICENSE)
+Be sure to [check out our wiki](https://wiki.parity.io) for more information.
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "Parity Ethereum Account Management"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-accounts"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ethkey = { path = "ethkey" }
-ethstore = { path = "ethstore" }
-log = "0.4"
-parking_lot = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-
-[dev-dependencies]
-ethereum-types = "0.6.0"
-tempdir = "0.3"
--- a/accounts/src/account_data.rs
+++ b/accounts/src/account_data.rs
@@ -1,73 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Account Metadata
-
-use std::{
-	collections::HashMap,
-	time::Instant,
-};
-
-use ethkey::{Address, Password};
-use serde_derive::{Serialize, Deserialize};
-use serde_json;
-
-/// Type of unlock.
-#[derive(Clone, PartialEq)]
-pub enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	OneTime,
-	/// Account unlocked permanently can always sign message.
-	/// Use with caution.
-	Perm,
-	/// Account unlocked with a timeout
-	Timed(Instant),
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-pub struct AccountData {
-	pub unlock: Unlock,
-	pub password: Password,
-}
-
-/// Collected account metadata
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AccountMeta {
-	/// The name of the account.
-	pub name: String,
-	/// The rest of the metadata of the account.
-	pub meta: String,
-	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
-	pub uuid: Option<String>,
-}
-
-impl AccountMeta {
-	/// Read a hash map of Address -> AccountMeta
-	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
-		R: ::std::io::Read,
-	{
-		serde_json::from_reader(reader)
-	}
-
-	/// Write a hash map of Address -> AccountMeta
-	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
-		W: ::std::io::Write,
-	{
-		serde_json::to_writer(writer, m)
-	}
-}
-
--- a/chainspec/Cargo.toml
+++ b/chainspec/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
 authors = ["Marek Kotewicz <marek@parity.io>"]
@@ -7,3 +6,4 @@ authors = ["Marek Kotewicz <marek@parity.io>"]
 [dependencies]
 ethjson = { path = "../json" }
 serde_json = "1.0"
+serde_ignored = "0.0.4"
--- a/chainspec/src/main.rs
+++ b/chainspec/src/main.rs
@@ -1,22 +1,24 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 extern crate serde_json;
+extern crate serde_ignored;
 extern crate ethjson;

+use std::collections::BTreeSet;
 use std::{fs, env, process};
 use ethjson::spec::Spec;

@@ -39,11 +41,24 @@ fn main() {
 		Err(_) => quit(&format!("{} could not be opened", path)),
 	};

-	let spec: Result<Spec, _> = serde_json::from_reader(file);
+	let mut unused = BTreeSet::new();
+	let mut deserializer = serde_json::Deserializer::from_reader(file);
+
+	let spec: Result<Spec, _> = serde_ignored::deserialize(&mut deserializer, |field| {
+		unused.insert(field.to_string());
+	});

 	if let Err(err) = spec {
 		quit(&format!("{} {}", path, err.to_string()));
 	}

+	if !unused.is_empty() {
+		let err = unused.into_iter()
+			.map(|field| format!("{} unexpected field `{}`", path, field))
+			.collect::<Vec<_>>()
+			.join("\n");
+		quit(&err);
+	}
+
 	println!("{} is valid", path);
 }
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -1,21 +0,0 @@
-[package]
-description = "Parity Ethereum RPC Client"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "parity-rpc-client"
-version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
-
-[dependencies]
-ethereum-types = "0.6.0"
-futures = "0.1"
-log = "0.4"
-serde = "1.0"
-serde_json = "1.0"
-url = "2.1.0"
-matches = "0.1"
-parking_lot = "0.9"
-jsonrpc-core = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
-parity-rpc = { path = "../../rpc" }
-keccak-hash = "0.2.0"
--- a/devtools/Cargo.toml
+++ b/devtools/Cargo.toml
@@ -0,0 +1,7 @@
+[package]
+description = "Ethcore development/test/build tools"
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "ethcore-devtools"
+version = "1.12.0"
+authors = ["Parity Technologies <admin@parity.io>"]
--- a/rpc/src/tests/http_client.rs
+++ b/rpc/src/tests/http_client.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::thread;
 use std::time::Duration;
@@ -30,7 +30,7 @@ pub struct Response {
 impl Response {
 	pub fn assert_header(&self, header: &str, value: &str) {
 		let header = format!("{}: {}", header, value);
-		assert!(self.headers.iter().any(|h| h == &header), "Couldn't find header {} in {:?}", header, &self.headers)
+		assert!(self.headers.iter().find(|h| *h == &header).is_some(), "Couldn't find header {} in {:?}", header, &self.headers)
 	}

 	pub fn assert_status(&self, status: &str) {
@@ -98,35 +98,35 @@ pub fn request(address: &SocketAddr, request: &str) -> Response {
 	let mut lines = response.lines();
 	let status = lines.next().expect("Expected a response").to_owned();
 	let headers_raw = read_block(&mut lines, false);
-	let headers = headers_raw.split('\n').map(ToOwned::to_owned).collect();
+	let headers = headers_raw.split('\n').map(|v| v.to_owned()).collect();
 	let body = read_block(&mut lines, true);

 	Response {
-		status,
-		headers,
-		headers_raw,
-		body,
+		status: status,
+		headers: headers,
+		headers_raw: headers_raw,
+		body: body,
 	}
 }

 /// Check if all required security headers are present
 pub fn assert_security_headers_present(headers: &[String], port: Option<u16>) {
-	if port.is_none() {
+	if let None = port {
 		assert!(
-			headers.iter().any(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN"),
+			headers.iter().find(|header| header.as_str() == "X-Frame-Options: SAMEORIGIN").is_some(),
 			"X-Frame-Options: SAMEORIGIN missing: {:?}", headers
 		);
 	}
 	assert!(
-		headers.iter().any(|header| header.as_str() == "X-XSS-Protection: 1; mode=block"),
+		headers.iter().find(|header| header.as_str() == "X-XSS-Protection: 1; mode=block").is_some(),
 		"X-XSS-Protection missing: {:?}", headers
 	);
 	assert!(
-		headers.iter().any(|header|  header.as_str() == "X-Content-Type-Options: nosniff"),
+		headers.iter().find(|header|  header.as_str() == "X-Content-Type-Options: nosniff").is_some(),
 		"X-Content-Type-Options missing: {:?}", headers
 	);
 	assert!(
-		headers.iter().any(|header| header.starts_with("Content-Security-Policy: ")),
+		headers.iter().find(|header| header.starts_with("Content-Security-Policy: ")).is_some(),
 		"Content-Security-Policy missing: {:?}", headers
 	)
 }
--- a/devtools/src/lib.rs
+++ b/devtools/src/lib.rs
@@ -0,0 +1,19 @@
+// 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/>.
+
+//! dev-tools
+
+pub mod http_client;
--- 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,641 +0,0 @@
-Note: Parity Ethereum 2.0 reached End-of-Life on 2018-11-15 (EOL).
-
-## Parity-Ethereum [v2.0.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.9) (2018-10-29)
-
-Parity-Ethereum 2.0.9-stable is a bug-fix release to improve performance and stability.
-
-The full list of included changes:
-
- Backports: parity stable 2.0.9 ([#9786](https://github.com/paritytech/parity-ethereum/pull/9786))
-  - Version: bump parity stable to 2.0.9
-  - Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
-  - Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
-  - Update jsonrpc-core to a1b2bb742ce16d1168669ffb13ffe856e8131228 ([#9780](https://github.com/paritytech/parity-ethereum/pull/9780))
-  - Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
-    - Removed "rustup" & added new runner tag
-    - Exchanged tag "rust-windows" with "windows"
-    - Revert windows tag change
-  - Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
-    - Allow zero chain id in EIP155 signing process
-    - Rename test
-    - Fix test failure
-  - Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))
-
-## Parity-Ethereum [v2.0.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.8) (2018-10-16)
-
-Parity-Ethereum 2.0.8-stable is a release that fixes a consensus issue with the recent Constantinople release. Upgrading is mandatory whatever network you are connected to that plans enabling EIP-1283, e.g., Ropsten, Kovan, Ethereum.
-
-The full list of included changes:
-
- Stable release 2.0.8 backports ([#9748](https://github.com/paritytech/parity-ethereum/pull/9748))
-  - Parity-version: mark 2.0.8 stable as critical
-  - Use signed 256-bit integer for sstore gas refund substate ([#9746](https://github.com/paritytech/parity-ethereum/pull/9746))
-  - Add --force to cargo audit install script ([#9735](https://github.com/paritytech/parity-ethereum/pull/9735))
-  - Heads ref not present for branches beta and stable ([#9741](https://github.com/paritytech/parity-ethereum/pull/9741))
-  - Aura: fix panic on extra_info with unsealed block ([#9755](https://github.com/paritytech/parity-ethereum/pull/9755))
-
-
-## Parity-Ethereum [v2.0.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.0.7) (2018-10-11)
-
-Parity-Ethereum 2.0.7-stable is a release that introduces **Constantinople** to the Ethereum client. Upgrading is strongly recommended.
-
-The following hardforks are supported by this release:
-
- Ropsten testnet block `4_230_000` on October 14, 2018 (Constantinople).
- POA core mainnet block `5_329_160` on October 22, 2018 (CORE HF 2).
- Kovan testnet block `9_200_000` on October 25, 2018 (Constantinople, KIP-{4,6}).
-
-Running one of these networks, an upgrade to 2.0.7 or 2.1.2 is mandatory. More details can be found in Changelog below.
-
-Please note, the following deprecations in our distribution of binaries:
-
- `arm*` targets are no longer served by parity, please consider (cross-)compiling from source yourself.
- `i*86` targets are no longer served by parity, please consider upgrading your operating system.
- Snapcraft is no longer maintained. please use binaries directly or your distro's repositories.
-
-The full list of included changes:
-
- Stable Constantinople changes ([#9723](https://github.com/paritytech/parity-ethereum/pull/9723))
-  - Ethash: implement EIP-1234 ([#9187](https://github.com/paritytech/parity-ethereum/pull/9187))
-  - Implement EIP-1052 (EXTCODEHASH) and fix several issues in state account cache ([#9234](https://github.com/paritytech/parity-ethereum/pull/9234))
-  - Comply EIP-86 with the new definition ([#9140](https://github.com/paritytech/parity-ethereum/pull/9140))
-  - Implement KIP4: create2 for wasm ([#9277](https://github.com/paritytech/parity-ethereum/pull/9277))
-  - `gasleft` extern implemented for WASM runtime (kip-6) ([#9357](https://github.com/paritytech/parity-ethereum/pull/9357))
-  - Add EIP-1014 transition config flag ([#9268](https://github.com/paritytech/parity-ethereum/pull/9268))
-  - Eip 1283: Net gas metering for SSTORE without dirty maps ([#9319](https://github.com/paritytech/parity-ethereum/pull/9319))
-  - Update state tests execution model ([#9440](https://github.com/paritytech/parity-ethereum/pull/9440))
-  - Fix checkpointing when creating contract failed ([#9514](https://github.com/paritytech/parity-ethereum/pull/9514))
-  - In create memory calculation is the same for create2 because the additional parameter was popped before. ([#9522](https://github.com/paritytech/parity-ethereum/pull/9522))
-  - Enable all Constantinople hard fork changes in constantinople_test.json ([#9505](https://github.com/paritytech/parity-ethereum/pull/9505))
-  - Add constantinople conf to EvmTestClient. ([#9570](https://github.com/paritytech/parity-ethereum/pull/9570))
-  - Hardfork the testnets ([#9562](https://github.com/paritytech/parity-ethereum/pull/9562))
-  - Don't hash the init_code of CREATE. ([#9688](https://github.com/paritytech/parity-ethereum/pull/9688))
-  - Implement CREATE2 gas changes and fix some potential overflowing ([#9694](https://github.com/paritytech/parity-ethereum/pull/9694))
-  - Ethcore: delay ropsten hardfork ([#9704](https://github.com/paritytech/parity-ethereum/pull/9704))
-  - Add hardcoded headers ([#9730](https://github.com/paritytech/parity-ethereum/pull/9730))
-  - Gitlab ci: releasable_branches: change variables condition to schedule ([#9729](https://github.com/paritytech/parity-ethereum/pull/9729))
-  - Hf in POA Core (2018-10-22) ([#9724](https://github.com/paritytech/parity-ethereum/pull/9724))
- Backports for stable 2.0.7 ([#9648](https://github.com/paritytech/parity-ethereum/pull/9648))
-  - Parity-version: bump stable to 2.0.7
-  - Fix path to parity.h ([#9274](https://github.com/paritytech/parity-ethereum/pull/9274))
-  - Ethcore: fix detection of major import ([#9552](https://github.com/paritytech/parity-ethereum/pull/9552))
-  - Fix (light/provider) : Make `read_only executions` only read-only ([#9591](https://github.com/paritytech/parity-ethereum/pull/9591))
-  - Hf in POA Sokol (2018-09-19) ([#9607](https://github.com/paritytech/parity-ethereum/pull/9607))
-  - Fix failing node-table tests on mac os ([#9633](https://github.com/paritytech/parity-ethereum/pull/9633))
-  - Fix(light_fetch): avoid race with BlockNumber::Latest ([#9665](https://github.com/paritytech/parity-ethereum/pull/9665))
-  - Ci: Remove unnecessary pipes ([#9681](https://github.com/paritytech/parity-ethereum/pull/9681))
-  - Docker: run parity as normal user ([#9689](https://github.com/paritytech/parity-ethereum/pull/9689))
-  - Ci: Skip docs job for master and nightly ([#9693](https://github.com/paritytech/parity-ethereum/pull/9693))
-  - Ethcore-io retries failed work steal ([#9651](https://github.com/paritytech/parity-ethereum/pull/9651))
-
-## 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/CHANGELOG-2.1.md
+++ b/docs/CHANGELOG-2.1.md
--- a/docs/CHANGELOG-2.2.md
+++ b/docs/CHANGELOG-2.2.md
@@ -1,392 +0,0 @@
-Note: Parity Ethereum 2.2 reached End-of-Life on 2019-02-25 (EOL).
-
-## Parity-Ethereum [v2.2.11](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.11) (2019-02-21)
-
-Parity-Ethereum 2.2.11-stable is a maintenance release that fixes snap and docker installations.
-
-The full list of included changes:
-
- Stable: snap: release untagged versions from branches to the candidate ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357)) ([#10372](https://github.com/paritytech/parity-ethereum/pull/10372))
-  - Snap: release untagged versions from branches to the candidate snap channel ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357))
-  - Snap: add the removable-media plug ([#10377](https://github.com/paritytech/parity-ethereum/pull/10377))
-  - Exchanged old(azure) bootnodes with new(ovh) ones ([#10309](https://github.com/paritytech/parity-ethereum/pull/10309))
- Stable Backports ([#10353](https://github.com/paritytech/parity-ethereum/pull/10353))
-  - Version: bump stable to 2.2.11
-  - Snap: prefix version and populate candidate channel ([#10343](https://github.com/paritytech/parity-ethereum/pull/10343))
-  - Snap: populate candidate releases with beta snaps to avoid stale channel
-  - Snap: prefix version with v*
-  - No volumes are needed, just run -v volume:/path/in/the/container ([#10345](https://github.com/paritytech/parity-ethereum/pull/10345))
-
-## Parity-Ethereum [v2.2.10](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.10) (2019-02-13)
-
-Parity-Ethereum 2.2.10-stable is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/new-parity-ethereum-update-fixes-several-rpc-vulnerabilities/
-
-The full list of included changes:
-
-  Additional error for invalid gas ([#10327](https://github.com/paritytech/parity-ethereum/pull/10327)) ([#10329](https://github.com/paritytech/parity-ethereum/pull/10329))
-  Backports for Stable 2.2.10 ([#10332](https://github.com/paritytech/parity-ethereum/pull/10332))
-    - fix(docker-aarch64) : cross-compile config ([#9798](https://github.com/paritytech/parity-ethereum/pull/9798))
-    - import rpc transactions sequentially ([#10051](https://github.com/paritytech/parity-ethereum/pull/10051))
-    - fix(docker): fix not receives SIGINT ([#10059](https://github.com/paritytech/parity-ethereum/pull/10059))
-    - snap: official image / test ([#10168](https://github.com/paritytech/parity-ethereum/pull/10168))
-    - perform stripping during build ([#10208](https://github.com/paritytech/parity-ethereum/pull/10208))
-    - Additional tests for uint/hash/bytes deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279))
-    - Don't run the CPP example on CI ([#10285](https://github.com/paritytech/parity-ethereum/pull/10285))
-    - CI optimizations ([#10297](https://github.com/paritytech/parity-ethereum/pull/10297))
-    - fix publish job ([#10317](https://github.com/paritytech/parity-ethereum/pull/10317))
-    - Add Statetest support for Constantinople Fix ([#10323](https://github.com/paritytech/parity-ethereum/pull/10323))
-    - Add helper for Timestamp overflows ([#10330](https://github.com/paritytech/parity-ethereum/pull/10330))
-    - Don't add discovery initiators to the node table ([#10305](https://github.com/paritytech/parity-ethereum/pull/10305))
-    - change docker image based on debian instead of ubuntu due to the chan ([#10336](https://github.com/paritytech/parity-ethereum/pull/10336))
-    - role back docker build image and docker deploy image to ubuntu:xenial based ([#10338](https://github.com/paritytech/parity-ethereum/pull/10338))
-
-## Parity-Ethereum [v2.2.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.9) (2019-02-03)
-
-Parity-Ethereum 2.2.9-stable is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/security-alert-parity-ethereum-03-02/
-
-The full list of included changes:
-
-  Additional tests for uint deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279)) ([#10281](https://github.com/paritytech/parity-ethereum/pull/10281))
-  Version: bump stable to 2.2.9 ([#10282](https://github.com/paritytech/parity-ethereum/pull/10282))
-
-## Parity-Ethereum [v2.2.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.8) (2019-02-01)
-
-Parity-Ethereum 2.2.8-stable is a consensus-relevant release that enables _St. Petersfork_ on:
-
- Ethereum Block `7280000` (along with Constantinople)
- Kovan Block `10255201`
- Ropsten Block `4939394`
- POA Sokol Block `7026400`
-
-In addition to this, Constantinople is cancelled for the POA Core network. Upgrading is mandatory for clients on any of these chains.
-
-The full list of included changes:
-
- Backports for stable 2.2.8 ([#10224](https://github.com/paritytech/parity-ethereum/pull/10224))
-  - Update for Android cross-compilation. ([#10180](https://github.com/paritytech/parity-ethereum/pull/10180))
-  - Cancel Constantinople HF on POA Core ([#10198](https://github.com/paritytech/parity-ethereum/pull/10198))
-  - Add EIP-1283 disable transition ([#10214](https://github.com/paritytech/parity-ethereum/pull/10214))
-  - Enable St-Peters-Fork ("Constantinople Fix") ([#10223](https://github.com/paritytech/parity-ethereum/pull/10223))
- Stable: Macos heapsize force jemalloc ([#10234](https://github.com/paritytech/parity-ethereum/pull/10234)) ([#10258](https://github.com/paritytech/parity-ethereum/pull/10258))
-
-## Parity-Ethereum [v2.2.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.7) (2019-01-15)
-
-Parity-Ethereum 2.2.7-stable is a consensus-relevant security release that reverts Constantinople on the Ethereum network. Upgrading is mandatory for Ethereum, and strongly recommended for other networks.
-
- **Consensus** - Ethereum Network: Pull Constantinople protocol upgrade on Ethereum ([#10189](https://github.com/paritytech/parity-ethereum/pull/10189))
-  - Read more: [Security Alert: Ethereum Constantinople Postponement](https://blog.ethereum.org/2019/01/15/security-alert-ethereum-constantinople-postponement/)
- **Networking** - All networks: Ping nodes from discovery ([#10167](https://github.com/paritytech/parity-ethereum/pull/10167))
- **Wasm** - Kovan Network: Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
-
-_Note:_ This release marks Parity 2.2 as _stable_. All versions of Parity 2.1 now reached _end of life_.
-
-The full list of included changes:
-
- Backports for stable 2.2.7 ([#10163](https://github.com/paritytech/parity-ethereum/pull/10163))
-  - Version: bump stable to 2.2.7
-  - Version: mark 2.2 track stable
-  - Version: mark update critical on all networks
-  - Handle the case for contract creation on an empty but exist account with storage items ([#10065](https://github.com/paritytech/parity-ethereum/pull/10065))
-  - Fix _cannot recursively call into `Core`_ issue ([#10144](https://github.com/paritytech/parity-ethereum/pull/10144))
-  - Snap: fix path in script ([#10157](https://github.com/paritytech/parity-ethereum/pull/10157))
-  - Ping nodes from discovery ([#10167](https://github.com/paritytech/parity-ethereum/pull/10167))
-  - Version: bump fork blocks for kovan and foundation, mark releases non critical
-  - Pull constantinople on ethereum network ([#10189](https://github.com/paritytech/parity-ethereum/pull/10189))
-
-## Parity-Ethereum [v2.2.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.6) (2019-01-10)
-
-Parity-Ethereum 2.2.6-beta is a bugfix release that improves performance and stability.
-
-The full list of included changes:
-
- Beta backports v2.2.6 ([#10113](https://github.com/paritytech/parity-ethereum/pull/10113))
-  - Version: bump beta to v2.2.6
-  - Fill transaction hash on ethGetLog of light client. ([#9938](https://github.com/paritytech/parity-ethereum/pull/9938))
-  - Fix pubsub new_blocks notifications to include all blocks ([#9987](https://github.com/paritytech/parity-ethereum/pull/9987))
-  - Finality: dont require chain head to be in the chain ([#10054](https://github.com/paritytech/parity-ethereum/pull/10054))
-  - Handle the case for contract creation on an empty but exist account with storage items ([#10065](https://github.com/paritytech/parity-ethereum/pull/10065))
-  - Autogen docs for the "Configuring Parity Ethereum" wiki page. ([#10067](https://github.com/paritytech/parity-ethereum/pull/10067))
-  - HF in POA Sokol (2019-01-04) ([#10077](https://github.com/paritytech/parity-ethereum/pull/10077))
-  - Add --locked when running cargo ([#10107](https://github.com/paritytech/parity-ethereum/pull/10107))
-  - Ethcore: update hardcoded headers ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
-  - Identity fix ([#10128](https://github.com/paritytech/parity-ethereum/pull/10128))
-  - Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
-  - Make sure parent block is not in importing queue when importing ancient blocks ([#10138](https://github.com/paritytech/parity-ethereum/pull/10138))
-  - CI: re-enable snap publishing ([#10142](https://github.com/paritytech/parity-ethereum/pull/10142))
-  - HF in POA Core (2019-01-18) - Constantinople ([#10155](https://github.com/paritytech/parity-ethereum/pull/10155))
-  - Version: mark upgrade critical on kovan
-
-## Parity-Ethereum [v2.2.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.5) (2018-12-14)
-
-Parity-Ethereum 2.2.5-beta is an important release that introduces Constantinople fork at block 7080000 on Mainnet.
-This release also contains a fix for chains using AuRa + EmptySteps. Read carefully if this applies to you.
-If you have a chain with`empty_steps` already running, some blocks most likely contain non-strict entries (unordered or duplicated empty steps). In this release`strict_empty_steps_transition` **is enabled by default at block 0** for any chain with `empty_steps`.
-If your network uses `empty_steps` you **must**:
- plan a hard fork and change `strict_empty_steps_transition` to the desire fork block
- update the clients of the whole network to 2.2.5-beta / 2.1.10-stable.
-If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.
-
-The full list of included changes:
- Backports for beta 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
-	- Bump beta to 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
-	- Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
-		- Prevent sending empty step message twice
-		- Prevent sending empty step and then block in the same step
-		- Don't accept double empty steps
-		- Do basic validation of self-sealed blocks
-	- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
-		- Enables strict verification of empty steps - there can be no duplicates and empty steps should be ordered inside the seal.
-		- Note that authorities won't produce invalid seals after [#9939](https://github.com/paritytech/parity-ethereum/pull/9939), this PR just adds verification to the seal to prevent forging incorrect blocks and potentially causing consensus issues.
-		- This features is enabled by default so any AuRa + EmptySteps chain should set strict_empty_steps_transition fork block number in their spec and upgrade to v2.2.5-beta or v2.1.10-stable.
-	- ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
-		- ethcore: change blockreward to 2e18 for foundation after constantinople
-		- ethcore: delay diff bomb by 2e6 blocks for foundation after constantinople
-		- ethcore: enable eip-{145,1014,1052,1283} for foundation after constantinople
-	- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
-	- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
-
-## Parity-Ethereum [v2.2.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.2) (2018-11-29)
-
-Parity-Ethereum 2.2.2-beta is an exciting release. Among others, it improves sync performance, peering stability, block propagation, and transaction propagation times. Also, a warp-sync no longer removes existing blocks from the database, but rather reuses locally available information to decrease sync times and reduces required bandwidth.
-
-Before upgrading to 2.2.2, please also verify the validity of your chain specs. Parity Ethereum now denies unknown fields in the specification. To do this, use the chainspec tool:
-
-```
-cargo build --release -p chainspec
-./target/release/chainspec /path/to/spec.json
-```
-
-Last but not least, JSONRPC APIs which are not yet accepted as an EIP in the `eth`, `personal`, or `web3` namespace, are now considere experimental as their final specification might change in future. These APIs have to be manually enabled by explicitly running `--jsonrpc-experimental`.
-
-The full list of included changes:
-
- Backports For beta 2.2.2 ([#9976](https://github.com/paritytech/parity-ethereum/pull/9976))
-  - Version: bump beta to 2.2.2
-  - Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
-  - Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
-    - Rename db_restore => client
-    - First step: make it compile!
-    - Second step: working implementation!
-    - Refactoring
-    - Fix tests
-    - Migrate ancient blocks interacting backward
-    - Early return in block migration if snapshot is aborted
-    - Remove RwLock getter (PR Grumble I)
-    - Remove dependency on `Client`: only used Traits
-    - Add test for recovering aborted snapshot recovery
-    - Add test for migrating old blocks
-    - Release RwLock earlier
-    - Revert Cargo.lock
-    - Update _update ancient block_ logic: set local in `commit`
-    - Update typo in ethcore/src/snapshot/service.rs
-  - Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
-    - Pip Table Cost relative to average peers instead of max peers
-    - Add tracing in PIP new_cost_table
-    - Update stat peer_count
-    - Use number of leeching peers for Light serve costs
-    - Fix test::light_params_load_share_depends_on_max_peers (wrong type)
-    - Remove (now) useless test
-    - Remove `load_share` from LightParams.Config
-    - Add LEECHER_COUNT_FACTOR
-    - Pr Grumble: u64 to u32 for f64 casting
-    - Prevent u32 overflow for avg_peer_count
-    - Add tests for LightSync::Statistics
-  - Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
-    - Don't send empty step twice or empty step then block.
-    - Perform basic validation of locally sealed blocks.
-    - Don't include empty step twice.
-  - Prevent silent errors in daemon mode, closes [#9367](https://github.com/paritytech/parity-ethereum/issues/9367) ([#9946](https://github.com/paritytech/parity-ethereum/pull/9946))
-  - Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
-    - Update informant:
-      - Decimal in Mgas/s
-      - Print every 5s (not randomly between 5s and 10s)
-    - Fix dead-lock in `blockchain.rs`
-    - Update locks ordering
-  - Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
-    - Add `is_idle` to LightSync to check importing status
-    - Use SyncStateWrapper to make sure is_idle gets updates
-    - Update is_major_import to use verified queue size as well
-    - Add comment for `is_idle`
-    - Add Debug to `SyncStateWrapper`
-    - `fn get` -> `fn into_inner`
-  -  Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
-    - Ci: rearrange pipeline by logic
-    - Ci: rename docs script
-  - Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
-  - Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
-    - Add deny_unknown_fields to chainspec
-    - Add tests and fix existing one
-    - Remove serde_ignored dependency for chainspec
-    - Fix rpc test eth chain spec
-    - Fix starting_nonce_test spec
-  - Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
-    - Refactor sync to add priority tasks.
-    - Send priority tasks notifications.
-    - Propagate blocks, optimize transactions.
-    - Implement transaction propagation. Use sync_channel.
-    - Tone down info.
-    - Prevent deadlock by not waiting forever for sync lock.
-    - Fix lock order.
-    - Don't use sync_channel to prevent deadlocks.
-    - Fix tests.
-  - Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
-    - Don't sync all peers after each response
-    - Update formating
-    - Fix tests: add `continue_sync` to `Sync_step`
-    - Update ethcore/sync/src/chain/mod.rs
-    - Fix rpc middlewares
-  - Fix Cargo.lock
-  - Json: resolve merge in spec
-  - Rpc: fix starting_nonce_test
-  - Ci: allow nightl job to fail
-
-## Parity-Ethereum [v2.2.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.1) (2018-11-15)
-
-Parity-Ethereum 2.2.1-beta is the first v2.2 release, and might introduce features that break previous work flows, among others:
-
- Prevent zero network ID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763)) and drop support for Olympic testnet ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801)): The Olympic test net is dead for years and never used a chain ID but network ID zero. Parity Ethereum is now preventing the network ID to be zero, thus Olympic support is dropped. Make sure to chose positive non-zero network IDs in future.
- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239)): adds a CLI argument `--snapshot-threads` which specifies the number of threads. This helps improving the performance of full nodes that wish to provide warp-snapshots for the network. The gain in performance comes with a slight drawback in increased snapshot size.
- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439)): Parity Ethereum imports blocks in rounds. If at the end of any round, the queue is not empty, we consider it to be _importing_ and won't notify pubsub. On large re-orgs (10+ blocks), this is possible. The default `max_round_blocks_to_import` is increased to 12 and configurable via the `--max-round-blocks-to-import` CLI flag. With unstable network conditions, it is advised to increase the number. This shouldn't have any noticeable performance impact unless the number is set to really large.
- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564)): the default values for gas floor target are `8_000_000` and gas cap `10_000_000`, similar to Geth 1.8.15+.
- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725)): we now produce portable binaries, but it may incur some performance degradation. For ultimate performance it's now better to compile Parity Ethereum from source with `PORTABLE=OFF` environment variable.
- RPC: `parity_allTransactionHashes` ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745)): Get all pending transactions from the queue with the high performant `parity_allTransactionHashes` RPC method.
- Support `eth_chainId` RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783)): implements EIP-695 to get the chainID via RPC.
- AuRa: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692)): The AuRa engine was updated to emit ancestry actions to finalize blocks. The full client stores block finality in the database, the engine builds finality from an ancestry of `ExtendedHeader`; `is_epoch_end` was updated to take a vec of recently finalized headers; `is_epoch_end_light` was added which maintains the previous interface and is used by the light client since the client itself doesn't track finality.
-
-The full list of included changes:
-
- Backport to parity 2.2.1 beta ([#9905](https://github.com/paritytech/parity-ethereum/pull/9905))
-  - Bump version to 2.2.1
-  - Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
-  - Fix Parity not closing on Ctrl-C ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
-  - Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
-  - Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
-  - Add hardcoded headers for light client ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
-  - Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
-  - Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
-  - Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
-  - Light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure ([#9824](https://github.com/paritytech/parity-ethereum/pull/9824))
-  - Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
-  - Eip-191 implementation ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
-  - Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
-  - Fix performance issue importing Kovan blocks ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
-  - Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
- Backports to parity beta 2.2.0 ([#9820](https://github.com/paritytech/parity-ethereum/pull/9820))
-  - Ci: remove failing tests for android, windows, and macos ([#9788](https://github.com/paritytech/parity-ethereum/pull/9788))
-  - Implement NoProof for json tests and update tests reference ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
-  - Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
-  - Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
- Rpc: parity_allTransactionHashes ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745))
- Revert "prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))" ([#9815](https://github.com/paritytech/parity-ethereum/pull/9815))
- Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
- Add readiness check for docker container ([#9804](https://github.com/paritytech/parity-ethereum/pull/9804))
- Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))
- Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439))
- Aura: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692))
- Sync: retry different peer after empty subchain heads response ([#9753](https://github.com/paritytech/parity-ethereum/pull/9753))
- Fix(light-rpc/parity) : Remove unused client ([#9802](https://github.com/paritytech/parity-ethereum/pull/9802))
- Drops support for olympic testnet, closes [#9800](https://github.com/paritytech/parity-ethereum/issues/9800) ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801))
- Replace `tokio_core` with `tokio` (`ring` -> 0.13) ([#9657](https://github.com/paritytech/parity-ethereum/pull/9657))
- Support eth_chainId RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783))
- Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
- Docs: changelogs for 2.0.8 and 2.1.3 ([#9758](https://github.com/paritytech/parity-ethereum/pull/9758))
- Prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))
- Skip seal fields count check when --no-seal-check is used ([#9757](https://github.com/paritytech/parity-ethereum/pull/9757))
- Aura: fix panic on extra_info with unsealed block ([#9755](https://github.com/paritytech/parity-ethereum/pull/9755))
- Docs: update changelogs ([#9742](https://github.com/paritytech/parity-ethereum/pull/9742))
- Removed extra assert in generation_session_is_removed_when_succeeded ([#9738](https://github.com/paritytech/parity-ethereum/pull/9738))
- Make checkpoint_storage_at use plain loop instead of recursion ([#9734](https://github.com/paritytech/parity-ethereum/pull/9734))
- Use signed 256-bit integer for sstore gas refund substate ([#9746](https://github.com/paritytech/parity-ethereum/pull/9746))
- Heads ref not present for branches beta and stable ([#9741](https://github.com/paritytech/parity-ethereum/pull/9741))
- Add Callisto support ([#9534](https://github.com/paritytech/parity-ethereum/pull/9534))
- Add --force to cargo audit install script ([#9735](https://github.com/paritytech/parity-ethereum/pull/9735))
- Remove unused expired value from Handshake ([#9732](https://github.com/paritytech/parity-ethereum/pull/9732))
- Add hardcoded headers ([#9730](https://github.com/paritytech/parity-ethereum/pull/9730))
- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725))
- Gitlab ci: releasable_branches: change variables condition to schedule ([#9729](https://github.com/paritytech/parity-ethereum/pull/9729))
- Update a few parity-common dependencies ([#9663](https://github.com/paritytech/parity-ethereum/pull/9663))
- Hf in POA Core (2018-10-22) ([#9724](https://github.com/paritytech/parity-ethereum/pull/9724))
- Schedule nightly builds ([#9717](https://github.com/paritytech/parity-ethereum/pull/9717))
- Fix ancient blocks sync ([#9531](https://github.com/paritytech/parity-ethereum/pull/9531))
- Ci: Skip docs job for nightly ([#9693](https://github.com/paritytech/parity-ethereum/pull/9693))
- Fix (light/provider) : Make `read_only executions` read-only ([#9591](https://github.com/paritytech/parity-ethereum/pull/9591))
- Ethcore: fix detection of major import ([#9552](https://github.com/paritytech/parity-ethereum/pull/9552))
- Return 0 on error ([#9705](https://github.com/paritytech/parity-ethereum/pull/9705))
- Ethcore: delay ropsten hardfork ([#9704](https://github.com/paritytech/parity-ethereum/pull/9704))
- Make instantSeal engine backwards compatible, closes [#9696](https://github.com/paritytech/parity-ethereum/issues/9696) ([#9700](https://github.com/paritytech/parity-ethereum/pull/9700))
- Implement CREATE2 gas changes and fix some potential overflowing ([#9694](https://github.com/paritytech/parity-ethereum/pull/9694))
- Don't hash the init_code of CREATE. ([#9688](https://github.com/paritytech/parity-ethereum/pull/9688))
- Ethcore: minor optimization of modexp by using LR exponentiation ([#9697](https://github.com/paritytech/parity-ethereum/pull/9697))
- Removed redundant clone before each block import ([#9683](https://github.com/paritytech/parity-ethereum/pull/9683))
- Add Foundation Bootnodes ([#9666](https://github.com/paritytech/parity-ethereum/pull/9666))
- Docker: run as parity user ([#9689](https://github.com/paritytech/parity-ethereum/pull/9689))
- Ethcore: mcip3 block reward contract ([#9605](https://github.com/paritytech/parity-ethereum/pull/9605))
- Verify block syncing responses against requests ([#9670](https://github.com/paritytech/parity-ethereum/pull/9670))
- Add a new RPC `parity_submitWorkDetail` similar `eth_submitWork` but return block hash ([#9404](https://github.com/paritytech/parity-ethereum/pull/9404))
- Resumable EVM and heap-allocated callstack ([#9360](https://github.com/paritytech/parity-ethereum/pull/9360))
- Update parity-wordlist library ([#9682](https://github.com/paritytech/parity-ethereum/pull/9682))
- Ci: Remove unnecessary pipes ([#9681](https://github.com/paritytech/parity-ethereum/pull/9681))
- Test.sh: use cargo --target for platforms other than linux, win or mac ([#9650](https://github.com/paritytech/parity-ethereum/pull/9650))
- Ci: fix push script ([#9679](https://github.com/paritytech/parity-ethereum/pull/9679))
- Hardfork the testnets ([#9562](https://github.com/paritytech/parity-ethereum/pull/9562))
- Calculate sha3 instead of sha256 for push-release. ([#9673](https://github.com/paritytech/parity-ethereum/pull/9673))
- Ethcore-io retries failed work steal ([#9651](https://github.com/paritytech/parity-ethereum/pull/9651))
- Fix(light_fetch): avoid race with BlockNumber::Latest ([#9665](https://github.com/paritytech/parity-ethereum/pull/9665))
- Test fix for windows cache name... ([#9658](https://github.com/paritytech/parity-ethereum/pull/9658))
- Refactor(fetch) : light use only one `DNS` thread ([#9647](https://github.com/paritytech/parity-ethereum/pull/9647))
- Ethereum libfuzzer integration small change ([#9547](https://github.com/paritytech/parity-ethereum/pull/9547))
- Cli: remove reference to --no-ui in --unlock flag help ([#9616](https://github.com/paritytech/parity-ethereum/pull/9616))
- Remove master from releasable branches ([#9655](https://github.com/paritytech/parity-ethereum/pull/9655))
- Ethcore/VerificationQueue don't spawn up extra `worker-threads` when explictly specified not to ([#9620](https://github.com/paritytech/parity-ethereum/pull/9620))
- Rpc: parity_getBlockReceipts ([#9527](https://github.com/paritytech/parity-ethereum/pull/9527))
- Remove unused dependencies ([#9589](https://github.com/paritytech/parity-ethereum/pull/9589))
- Ignore key_server_cluster randomly failing tests ([#9639](https://github.com/paritytech/parity-ethereum/pull/9639))
- Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
- Fix bad-block reporting no reason ([#9638](https://github.com/paritytech/parity-ethereum/pull/9638))
- Use static call and apparent value transfer for block reward contract code ([#9603](https://github.com/paritytech/parity-ethereum/pull/9603))
- Hf in POA Sokol (2018-09-19) ([#9607](https://github.com/paritytech/parity-ethereum/pull/9607))
- Bump smallvec to 0.6 in ethcore-light, ethstore and whisper ([#9588](https://github.com/paritytech/parity-ethereum/pull/9588))
- Add constantinople conf to EvmTestClient. ([#9570](https://github.com/paritytech/parity-ethereum/pull/9570))
- Fix(network): don't disconnect reserved peers ([#9608](https://github.com/paritytech/parity-ethereum/pull/9608))
- Fix failing node-table tests on mac os, closes [#9632](https://github.com/paritytech/parity-ethereum/issues/9632) ([#9633](https://github.com/paritytech/parity-ethereum/pull/9633))
- Update ropsten.json ([#9602](https://github.com/paritytech/parity-ethereum/pull/9602))
- Simplify ethcore errors by removing BlockImportError ([#9593](https://github.com/paritytech/parity-ethereum/pull/9593))
- Fix windows compilation, replaces [#9561](https://github.com/paritytech/parity-ethereum/issues/9561) ([#9621](https://github.com/paritytech/parity-ethereum/pull/9621))
- Master: rpc-docs set github token ([#9610](https://github.com/paritytech/parity-ethereum/pull/9610))
- Docs: add changelogs for 1.11.10, 1.11.11, 2.0.3, 2.0.4, 2.0.5, 2.0.6, 2.1.0, and 2.1.1 ([#9554](https://github.com/paritytech/parity-ethereum/pull/9554))
- Docs(rpc): annotate tag with the provided message ([#9601](https://github.com/paritytech/parity-ethereum/pull/9601))
- Ci: fix regex roll_eyes ([#9597](https://github.com/paritytech/parity-ethereum/pull/9597))
- Remove snapcraft clean ([#9585](https://github.com/paritytech/parity-ethereum/pull/9585))
- Add snapcraft package image (master) ([#9584](https://github.com/paritytech/parity-ethereum/pull/9584))
- Docs(rpc): push the branch along with tags ([#9578](https://github.com/paritytech/parity-ethereum/pull/9578))
- Fix typo for jsonrpc-threads flag ([#9574](https://github.com/paritytech/parity-ethereum/pull/9574))
- Fix informant compile ([#9571](https://github.com/paritytech/parity-ethereum/pull/9571))
- Added ropsten bootnodes ([#9569](https://github.com/paritytech/parity-ethereum/pull/9569))
- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564))
- While working on the platform tests make them non-breaking ([#9563](https://github.com/paritytech/parity-ethereum/pull/9563))
- Improve P2P discovery ([#9526](https://github.com/paritytech/parity-ethereum/pull/9526))
- Move dockerfile for android build container to scripts repo ([#9560](https://github.com/paritytech/parity-ethereum/pull/9560))
- Simultaneous platform tests WIP ([#9557](https://github.com/paritytech/parity-ethereum/pull/9557))
- Update ethabi-derive, serde, serde_json, serde_derive, syn && quote ([#9553](https://github.com/paritytech/parity-ethereum/pull/9553))
- Ci: fix rpc docs generation 2 ([#9550](https://github.com/paritytech/parity-ethereum/pull/9550))
- Ci: always run build pipelines for win, mac, linux, and android ([#9537](https://github.com/paritytech/parity-ethereum/pull/9537))
- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239))
- New ethabi ([#9511](https://github.com/paritytech/parity-ethereum/pull/9511))
- Remove initial token for WS. ([#9545](https://github.com/paritytech/parity-ethereum/pull/9545))
- Net_version caches network_id to avoid redundant aquire of sync readlock ([#9544](https://github.com/paritytech/parity-ethereum/pull/9544))
- Correct before_script for nightly build versions ([#9543](https://github.com/paritytech/parity-ethereum/pull/9543))
- Deps: bump kvdb-rocksdb to 0.1.4 ([#9539](https://github.com/paritytech/parity-ethereum/pull/9539))
- State: test when contract creation fails, old storage values should re-appear ([#9532](https://github.com/paritytech/parity-ethereum/pull/9532))
- Allow dropping light client RPC query with no results ([#9318](https://github.com/paritytech/parity-ethereum/pull/9318))
- Bump master to 2.2.0 ([#9517](https://github.com/paritytech/parity-ethereum/pull/9517))
- Enable all Constantinople hard fork changes in constantinople_test.json ([#9505](https://github.com/paritytech/parity-ethereum/pull/9505))
- [Light] Validate `account balance` before importing transactions ([#9417](https://github.com/paritytech/parity-ethereum/pull/9417))
- In create memory calculation is the same for create2 because the additional parameter was popped before. ([#9522](https://github.com/paritytech/parity-ethereum/pull/9522))
- Update patricia trie to 0.2.2 ([#9525](https://github.com/paritytech/parity-ethereum/pull/9525))
- Replace hardcoded JSON with serde json! macro ([#9489](https://github.com/paritytech/parity-ethereum/pull/9489))
- Fix typo in version string ([#9516](https://github.com/paritytech/parity-ethereum/pull/9516))
--- a/docs/CHANGELOG-2.3.md
+++ b/docs/CHANGELOG-2.3.md
@@ -1,288 +0,0 @@
-## Parity-Ethereum [v2.3.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.8) (2019-03-22)
-
-Parity-Ethereum 2.3.8-stable is a bugfix release that improves performance and stability. This patch release contains a critical bug fix where serving light clients previously led to client crashes. Upgrading is highly recommended.
-
-The full list of included changes:
- 2.3.8 stable backports ([#10507](https://github.com/paritytech/parity-ethereum/pull/10507))
-  - Version: bump stable
-  - Add additional request tests ([#10503](https://github.com/paritytech/parity-ethereum/pull/10503))
-
-## Parity-Ethereum [v2.3.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.7) (2019-03-20)
-
-Parity-Ethereum 2.3.7-stable is a bugfix release that improves performance and stability.
-
-The full list of included changes:
- 2.3.7 stable backports ([#10487](https://github.com/paritytech/parity-ethereum/pull/10487))
-  - Version: bump stable
-  - Сaching through docker volume ([#10477](https://github.com/paritytech/parity-ethereum/pull/10477))
-  - fix win&mac build ([#10486](https://github.com/paritytech/parity-ethereum/pull/10486))
-  - fix(extract `timestamp_checked_add` as lib) ([#10383](https://github.com/paritytech/parity-ethereum/pull/10383))
-
-## Parity-Ethereum [v2.3.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.6) (2019-03-19)
-
-Parity-Ethereum 2.3.6-stable is a bugfix release that improves performance and stability.
-
-The full list of included changes:
- 2.3.6 stable backports ([#10470](https://github.com/paritytech/parity-ethereum/pull/10470))
-  - Version: bump stable
-  - CI publish to aws ([#10446](https://github.com/paritytech/parity-ethereum/pull/10446))
-  - Ensure static validator set changes are recognized ([#10467](https://github.com/paritytech/parity-ethereum/pull/10467))
-  - CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))
-  - Revert "CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))" ([#10456](https://github.com/paritytech/parity-ethereum/pull/10456))
-  - Tests parallelized ([#10452](https://github.com/paritytech/parity-ethereum/pull/10452))
-
-## Parity-Ethereum [v2.3.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.5) (2019-02-25)
-
-Parity-Ethereum 2.3.5-stable is a bugfix release that improves performance and stability.
-
-Note, all 2.2 releases and older are now unsupported and upgrading is recommended.
-
-The full list of included changes:
-
- More Backports for Stable 2.3.5 ([#10430](https://github.com/paritytech/parity-ethereum/pull/10430))
-  - Revert some changes, could be buggy ([#10399](https://github.com/paritytech/parity-ethereum/pull/10399))
-  - Ci: clean up gitlab-ci.yml leftovers from previous merge ([#10429](https://github.com/paritytech/parity-ethereum/pull/10429))
-  - 10000 > 5000 ([#10422](https://github.com/paritytech/parity-ethereum/pull/10422))
-  - Fix underflow in pip, closes [#10419](https://github.com/paritytech/parity-ethereum/pull/10419) ([#10423](https://github.com/paritytech/parity-ethereum/pull/10423))
-  - Fix panic when logging directory does not exist, closes [#10420](https://github.com/paritytech/parity-ethereum/pull/10420) ([#10424](https://github.com/paritytech/parity-ethereum/pull/10424))
-  - Update hardcoded headers for Foundation, Ropsten, Kovan and Classic ([#10417](https://github.com/paritytech/parity-ethereum/pull/10417))
- Backports for Stable 2.3.5 ([#10414](https://github.com/paritytech/parity-ethereum/pull/10414))
-  - No-git for publish jobs, empty artifacts dir ([#10393](https://github.com/paritytech/parity-ethereum/pull/10393))
-  - Snap: reenable i386, arm64, armhf architecture publishing ([#10386](https://github.com/paritytech/parity-ethereum/pull/10386))
-  - Tx pool: always accept local transactions ([#10375](https://github.com/paritytech/parity-ethereum/pull/10375))
-  - Fix to_pod storage trie value decoding ([#10368)](https://github.com/paritytech/parity-ethereum/pull/10368))
- Version: mark 2.3.5 as stable
-
-## Parity-Ethereum [v2.3.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.4) (2019-02-21)
-
-Parity-Ethereum 2.3.4-beta is a maintenance release that fixes snap and docker installations.
-
-The full list of included changes:
- Beta: snap: release untagged versions from branches to the candidate ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357)) ([#10373](https://github.com/paritytech/parity-ethereum/pull/10373))
-  - Snap: release untagged versions from branches to the candidate snap channel ([#10357](https://github.com/paritytech/parity-ethereum/pull/10357))
-  - Snap: add the removable-media plug ([#10377](https://github.com/paritytech/parity-ethereum/pull/10377))
-  - Exchanged old(azure) bootnodes with new(ovh) ones ([#10309](https://github.com/paritytech/parity-ethereum/pull/10309))
- Beta Backports ([#10354](https://github.com/paritytech/parity-ethereum/pull/10354))
-  - Version: bump beta to 2.3.4
-  - Snap: prefix version and populate candidate channel ([#10343](https://github.com/paritytech/parity-ethereum/pull/10343))
-  - Snap: populate candidate releases with beta snaps to avoid stale channel
-  - Snap: prefix version with v*
-  - No volumes are needed, just run -v volume:/path/in/the/container ([#10345](https://github.com/paritytech/parity-ethereum/pull/10345))
-
-## Parity-Ethereum [v2.3.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.3) (2019-02-13)
-
-Parity-Ethereum 2.3.3-beta is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/new-parity-ethereum-update-fixes-several-rpc-vulnerabilities/
-
-The full list of included changes:
-
- Additional error for invalid gas ([#10327](https://github.com/paritytech/parity-ethereum/pull/10327)) ([#10328](https://github.com/paritytech/parity-ethereum/pull/10328))
- Backports for Beta 2.3.3 ([#10333](https://github.com/paritytech/parity-ethereum/pull/10333))
-    - Properly handle check_epoch_end_signal errors ([#10015](https://github.com/paritytech/parity-ethereum/pull/10015))
-    - import rpc transactions sequentially ([#10051](https://github.com/paritytech/parity-ethereum/pull/10051))
-    - fix(docker): fix not receives SIGINT ([#10059](https://github.com/paritytech/parity-ethereum/pull/10059))
-    - snap: official image / test ([#10168](https://github.com/paritytech/parity-ethereum/pull/10168))
-    - Extract CallContract and RegistryInfo traits into their own crate ([#10178](https://github.com/paritytech/parity-ethereum/pull/10178))
-    - perform stripping during build ([#10208](https://github.com/paritytech/parity-ethereum/pull/10208))
-    - Remove CallContract and RegistryInfo re-exports from `ethcore/client` ([#10205](https://github.com/paritytech/parity-ethereum/pull/10205))
-    - fixed: types::transaction::SignedTransaction; ([#10229](https://github.com/paritytech/parity-ethereum/pull/10229))
-    - Additional tests for uint/hash/bytes deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279))
-    - Fix Windows build ([#10284](https://github.com/paritytech/parity-ethereum/pull/10284))
-    - Don't run the CPP example on CI ([#10285](https://github.com/paritytech/parity-ethereum/pull/10285))
-    - CI optimizations ([#10297](https://github.com/paritytech/parity-ethereum/pull/10297))
-    - fix publish job ([#10317](https://github.com/paritytech/parity-ethereum/pull/10317))
-    - Add Statetest support for Constantinople Fix ([#10323](https://github.com/paritytech/parity-ethereum/pull/10323))
-    - Add helper for Timestamp overflows ([#10330](https://github.com/paritytech/parity-ethereum/pull/10330))
-    - Don't add discovery initiators to the node table ([#10305](https://github.com/paritytech/parity-ethereum/pull/10305))
-    - change docker image based on debian instead of ubuntu due to the chan ([#10336](https://github.com/paritytech/parity-ethereum/pull/10336))
-    - role back docker build image and docker deploy image to ubuntu:xenial based ([#10338](https://github.com/paritytech/parity-ethereum/pull/10338))
-
-## Parity-Ethereum [v2.3.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.2) (2019-02-03)
-
-Parity-Ethereum 2.3.2-stable is a security-relevant release. A bug in the JSONRPC-deserialization module can cause crashes of all versions of Parity Ethereum nodes if an attacker is able to submit a specially-crafted RPC to certain publicly available endpoints.
-
- https://www.parity.io/security-alert-parity-ethereum-03-02/
-
-The full list of included changes:
- Version: bump beta to 2.3.2 ([#10283](https://github.com/paritytech/parity-ethereum/pull/10283))
- Additional tests for uint deserialization. ([#10279](https://github.com/paritytech/parity-ethereum/pull/10279)) ([#10280](https://github.com/paritytech/parity-ethereum/pull/10280))
- Backport [#10285](https://github.com/paritytech/parity-ethereum/pull/10285) to beta ([#10286](https://github.com/paritytech/parity-ethereum/pull/10286))
-
-## Parity-Ethereum [v2.3.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.1) (2019-02-01)
-
-Parity-Ethereum 2.3.1-beta is a consensus-relevant release that enables _St. Petersfork_ on:
-
- Ethereum Block `7280000` (along with Constantinople)
- Kovan Block `10255201`
- Ropsten Block `4939394`
- POA Sokol Block `7026400`
-
-In addition to this, Constantinople is cancelled for the POA Core network. Upgrading is mandatory for clients on any of these chains.
-
-The full list of included changes:
-
- Backports for beta 2.3.1 ([#10225](https://github.com/paritytech/parity-ethereum/pull/10225))
-  - Fix _cannot recursively call into `Core`_ issue ([#10144](https://github.com/paritytech/parity-ethereum/pull/10144))
-  - Update for Android cross-compilation. ([#10180](https://github.com/paritytech/parity-ethereum/pull/10180))
-  - Fix _cannot recursively call into `Core`_ - Part 2 ([#10195](https://github.com/paritytech/parity-ethereum/pull/10195))
-  - Cancel Constantinople HF on POA Core ([#10198](https://github.com/paritytech/parity-ethereum/pull/10198))
-  - Add EIP-1283 disable transition ([#10214](https://github.com/paritytech/parity-ethereum/pull/10214))
-  - Enable St-Peters-Fork ("Constantinople Fix") ([#10223](https://github.com/paritytech/parity-ethereum/pull/10223))
- Beta: Macos heapsize force jemalloc ([#10234](https://github.com/paritytech/parity-ethereum/pull/10234)) ([#10259](https://github.com/paritytech/parity-ethereum/pull/10259))
-
-## Parity-Ethereum [v2.3.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.3.0) (2019-01-16)
-
-Parity-Ethereum 2.3.0-beta is a consensus-relevant security release that reverts Constantinople on the Ethereum network. Upgrading is mandatory for Ethereum, and strongly recommended for other networks.
-
- **Consensus** - Ethereum Network: Pull Constantinople protocol upgrade on Ethereum ([#10189](https://github.com/paritytech/parity-ethereum/pull/10189))
-  - Read more: [Security Alert: Ethereum Constantinople Postponement](https://blog.ethereum.org/2019/01/15/security-alert-ethereum-constantinople-postponement/)
- **Networking** - All networks: Ping nodes from discovery ([#10167](https://github.com/paritytech/parity-ethereum/pull/10167))
- **Wasm** - Kovan Network: Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
-
-Other notable changes:
-
- Existing blocks in the database are now kept when restoring a Snapshot. ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
- Block and transaction propagation is improved significantly. ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
- The ERC-191 Signed Data Standard is now supported by `personal_sign191`. ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
- Add support for ERC-191/712 `eth_signTypedData` as a standard for machine-verifiable and human-readable typed data signing with Ethereum keys. ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
- Add support for ERC-1186 `eth_getProof` ([#9001](https://github.com/paritytech/parity-ethereum/pull/9001))
- Add experimental RPCs flag to enable ERC-191, ERC-712, and ERC-1186 APIs via `--jsonrpc-experimental` ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
- Make `CALLCODE` to trace value to be the code address. ([#9881](https://github.com/paritytech/parity-ethereum/pull/9881))
-
-Configuration changes:
-
- The EIP-98 transition is now disabled by default. If you previously had no `eip98transition` specified in your chain specification, you would enable this now manually on block `0x0`. ([#9955](https://github.com/paritytech/parity-ethereum/pull/9955))
- Also, unknown fields in chain specs are now rejected. ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
- The Tendermint engine was removed from Parity Ethereum and is no longer available and maintained. ([#9980](https://github.com/paritytech/parity-ethereum/pull/9980))
- Ropsten testnet data and keys moved from `test/` to `ropsten/` subdir. To reuse your old keys and data either copy or symlink them to the new location.  ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
-  - If you have a chain with`empty_steps` already running, some blocks most likely contain non-strict entries (unordered or duplicated empty steps). In this release `strict_empty_steps_transition` is enabled by default at block `0x0` for any chain with `empty_steps`.
-  - If your network uses `empty_steps` you **must** (A) plan a hard fork and change `strict_empty_steps_transition` to the desired fork block and (B) update the clients of the whole network to 2.2.7-stable / 2.3.0-beta. If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.
-
-_Note:_ This release marks Parity 2.3 as _beta_. All versions of Parity 2.2 are now considered _stable_.
-
-The full list of included changes:
-
- Backports for 2.3.0 beta ([#10164](https://github.com/paritytech/parity-ethereum/pull/10164))
- Snap: fix path in script ([#10157](https://github.com/paritytech/parity-ethereum/pull/10157))
- Make sure parent block is not in importing queue when importing ancient blocks ([#10138](https://github.com/paritytech/parity-ethereum/pull/10138))
- Ci: re-enable snap publishing ([#10142](https://github.com/paritytech/parity-ethereum/pull/10142))
- Hf in POA Core (2019-01-18) - Constantinople ([#10155](https://github.com/paritytech/parity-ethereum/pull/10155))
- Update EWF's tobalaba chainspec ([#10152](https://github.com/paritytech/parity-ethereum/pull/10152))
- Replace ethcore-logger with env-logger. ([#10102](https://github.com/paritytech/parity-ethereum/pull/10102))
- Finality: dont require chain head to be in the chain ([#10054](https://github.com/paritytech/parity-ethereum/pull/10054))
- Remove caching for node connections ([#10143](https://github.com/paritytech/parity-ethereum/pull/10143))
- Blooms file iterator empty on out of range position. ([#10145](https://github.com/paritytech/parity-ethereum/pull/10145))
- Autogen docs for the "Configuring Parity Ethereum" wiki page. ([#10067](https://github.com/paritytech/parity-ethereum/pull/10067))
- Misc: bump license header to 2019 ([#10135](https://github.com/paritytech/parity-ethereum/pull/10135))
- Hide most of the logs from cpp example. ([#10139](https://github.com/paritytech/parity-ethereum/pull/10139))
- Don't try to send oversized packets ([#10042](https://github.com/paritytech/parity-ethereum/pull/10042))
- Private tx enabled flag added into STATUS packet ([#9999](https://github.com/paritytech/parity-ethereum/pull/9999))
- Update pwasm-utils to 0.6.1 ([#10134](https://github.com/paritytech/parity-ethereum/pull/10134))
- Extract blockchain from ethcore ([#10114](https://github.com/paritytech/parity-ethereum/pull/10114))
- Ethcore: update hardcoded headers ([#10123](https://github.com/paritytech/parity-ethereum/pull/10123))
- Identity fix ([#10128](https://github.com/paritytech/parity-ethereum/pull/10128))
- Use LenCachingMutex to optimize verification. ([#10117](https://github.com/paritytech/parity-ethereum/pull/10117))
- Pyethereum keystore support ([#9710](https://github.com/paritytech/parity-ethereum/pull/9710))
- Bump rocksdb-sys to 0.5.5 ([#10124](https://github.com/paritytech/parity-ethereum/pull/10124))
- Parity-clib: `async C bindings to RPC requests` + `subscribe/unsubscribe to websocket events` ([#9920](https://github.com/paritytech/parity-ethereum/pull/9920))
- Refactor (hardware wallet) : reduce the number of threads ([#9644](https://github.com/paritytech/parity-ethereum/pull/9644))
- Hf in POA Sokol (2019-01-04) ([#10077](https://github.com/paritytech/parity-ethereum/pull/10077))
- Fix broken links ([#10119](https://github.com/paritytech/parity-ethereum/pull/10119))
- Follow-up to [#10105](https://github.com/paritytech/parity-ethereum/issues/10105) ([#10107](https://github.com/paritytech/parity-ethereum/pull/10107))
- Move EIP-712 crate back to parity-ethereum ([#10106](https://github.com/paritytech/parity-ethereum/pull/10106))
- Move a bunch of stuff around ([#10101](https://github.com/paritytech/parity-ethereum/pull/10101))
- Revert "Add --frozen when running cargo ([#10081](https://github.com/paritytech/parity-ethereum/pull/10081))" ([#10105](https://github.com/paritytech/parity-ethereum/pull/10105))
- Fix left over small grumbles on whitespaces ([#10084](https://github.com/paritytech/parity-ethereum/pull/10084))
- Add --frozen when running cargo ([#10081](https://github.com/paritytech/parity-ethereum/pull/10081))
- Fix pubsub new_blocks notifications to include all blocks ([#9987](https://github.com/paritytech/parity-ethereum/pull/9987))
- Update some dependencies for compilation with pc-windows-gnu ([#10082](https://github.com/paritytech/parity-ethereum/pull/10082))
- Fill transaction hash on ethGetLog of light client. ([#9938](https://github.com/paritytech/parity-ethereum/pull/9938))
- Update changelog update for 2.2.5-beta and 2.1.10-stable ([#10064](https://github.com/paritytech/parity-ethereum/pull/10064))
- Implement len caching for parking_lot RwLock ([#10032](https://github.com/paritytech/parity-ethereum/pull/10032))
- Update parking_lot to 0.7 ([#10050](https://github.com/paritytech/parity-ethereum/pull/10050))
- Bump crossbeam. ([#10048](https://github.com/paritytech/parity-ethereum/pull/10048))
- Ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
- Center the Subtitle, use some CAPS ([#10034](https://github.com/paritytech/parity-ethereum/pull/10034))
- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
- Sort the storage for private state ([#10018](https://github.com/paritytech/parity-ethereum/pull/10018))
- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
- Ci: move future releases to ethereum subdir on s3 ([#10017](https://github.com/paritytech/parity-ethereum/pull/10017))
- Light(on_demand): decrease default time window to 10 secs ([#10016](https://github.com/paritytech/parity-ethereum/pull/10016))
- Light client : failsafe crate (circuit breaker) ([#9790](https://github.com/paritytech/parity-ethereum/pull/9790))
- Lencachingmutex ([#9988](https://github.com/paritytech/parity-ethereum/pull/9988))
- Version and notification for private contract wrapper added ([#9761](https://github.com/paritytech/parity-ethereum/pull/9761))
- Handle failing case for update account cache in require ([#9989](https://github.com/paritytech/parity-ethereum/pull/9989))
- Add tokio runtime to ethcore io worker ([#9979](https://github.com/paritytech/parity-ethereum/pull/9979))
- Move daemonize before creating account provider ([#10003](https://github.com/paritytech/parity-ethereum/pull/10003))
- Docs: update changelogs ([#9990](https://github.com/paritytech/parity-ethereum/pull/9990))
- Fix daemonize ([#10000](https://github.com/paritytech/parity-ethereum/pull/10000))
- Fix Bloom migration ([#9992](https://github.com/paritytech/parity-ethereum/pull/9992))
- Remove tendermint engine support ([#9980](https://github.com/paritytech/parity-ethereum/pull/9980))
- Calculate gas for deployment transaction ([#9840](https://github.com/paritytech/parity-ethereum/pull/9840))
- Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
- Adds parity_verifySignature RPC method ([#9507](https://github.com/paritytech/parity-ethereum/pull/9507))
- Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
- Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
- Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
- Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
- Add changelogs for 2.0.9, 2.1.4, 2.1.6, and 2.2.1 ([#9963](https://github.com/paritytech/parity-ethereum/pull/9963))
- Add Error message when sync is still in progress. ([#9475](https://github.com/paritytech/parity-ethereum/pull/9475))
- Make CALLCODE to trace value to be the code address ([#9881](https://github.com/paritytech/parity-ethereum/pull/9881))
- Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
- Add a optional json dump state to evm-bin ([#9706](https://github.com/paritytech/parity-ethereum/pull/9706))
- Disable EIP-98 transition by default ([#9955](https://github.com/paritytech/parity-ethereum/pull/9955))
- Remove secret_store runtimes. ([#9888](https://github.com/paritytech/parity-ethereum/pull/9888))
- Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
- Chore(eip712): remove unused `failure-derive` ([#9958](https://github.com/paritytech/parity-ethereum/pull/9958))
- Do not use the home directory as the working dir in docker ([#9834](https://github.com/paritytech/parity-ethereum/pull/9834))
- Prevent silent errors in daemon mode, closes [#9367](https://github.com/paritytech/parity-ethereum/issues/9367) ([#9946](https://github.com/paritytech/parity-ethereum/pull/9946))
- Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
- Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
- Eip-1186: add `eth_getProof` RPC-Method ([#9001](https://github.com/paritytech/parity-ethereum/pull/9001))
- Missing blocks in filter_changes RPC ([#9947](https://github.com/paritytech/parity-ethereum/pull/9947))
- Allow rust-nightly builds fail in nightly builds ([#9944](https://github.com/paritytech/parity-ethereum/pull/9944))
- Update eth-secp256k1 to include fix for BSDs ([#9935](https://github.com/paritytech/parity-ethereum/pull/9935))
- Unbreak build on rust -stable ([#9934](https://github.com/paritytech/parity-ethereum/pull/9934))
- Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
- Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
- Clarify poll lifetime ([#9922](https://github.com/paritytech/parity-ethereum/pull/9922))
- Docs(require rust 1.30) ([#9923](https://github.com/paritytech/parity-ethereum/pull/9923))
- Use block header for building finality ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
- Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
- Light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure ([#9824](https://github.com/paritytech/parity-ethereum/pull/9824))
- Eip 191 ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
- Fix(logger): `reqwest` no longer a dependency ([#9908](https://github.com/paritytech/parity-ethereum/pull/9908))
- Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
- Foundation: 6692865, ropsten: 4417537, kovan: 9363457 ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
- Ethcore: use Machine::verify_transaction on parent block ([#9900](https://github.com/paritytech/parity-ethereum/pull/9900))
- Chore(rpc-tests): remove unused rand ([#9896](https://github.com/paritytech/parity-ethereum/pull/9896))
- Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
- Chore(bump docopt): 0.8 -> 1.0 ([#9889](https://github.com/paritytech/parity-ethereum/pull/9889))
- Use expect ([#9883](https://github.com/paritytech/parity-ethereum/pull/9883))
- Use Weak reference in PubSubClient ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
- Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
- Remove unused code ([#9884](https://github.com/paritytech/parity-ethereum/pull/9884))
- Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
- Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
- Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
- Health endpoint ([#9847](https://github.com/paritytech/parity-ethereum/pull/9847))
- Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
- Clean up existing benchmarks ([#9839](https://github.com/paritytech/parity-ethereum/pull/9839))
- Update Callisto block reward code to support HF1 ([#9811](https://github.com/paritytech/parity-ethereum/pull/9811))
- Option to disable keep alive for JSON-RPC http transport ([#9848](https://github.com/paritytech/parity-ethereum/pull/9848))
- Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
- Support MIX. ([#9767](https://github.com/paritytech/parity-ethereum/pull/9767))
- Ci: remove failing tests for android, windows, and macos ([#9788](https://github.com/paritytech/parity-ethereum/pull/9788))
- Implement NoProof for json tests and update tests reference (replaces [#9744](https://github.com/paritytech/parity-ethereum/issues/9744)) ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
- Chore(bump regex) ([#9842](https://github.com/paritytech/parity-ethereum/pull/9842))
- Ignore global cache for patched accounts ([#9752](https://github.com/paritytech/parity-ethereum/pull/9752))
- Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
- Fix(docker-aarch64) : cross-compile config ([#9798](https://github.com/paritytech/parity-ethereum/pull/9798))
- Version: bump nightly to 2.3.0 ([#9819](https://github.com/paritytech/parity-ethereum/pull/9819))
- Tests modification for windows CI ([#9671](https://github.com/paritytech/parity-ethereum/pull/9671))
- Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
- Fix typo ([#9826](https://github.com/paritytech/parity-ethereum/pull/9826))
- Clean up serde rename and use rename_all = camelCase when possible ([#9823](https://github.com/paritytech/parity-ethereum/pull/9823))
--- a/docs/CHANGELOG-2.4.md
+++ b/docs/CHANGELOG-2.4.md
@@ -1,128 +0,0 @@
-## Parity-Ethereum [v2.4.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.9)
-
-Parity Ethereum v2.4.9-stable is a security update which addresses servo/rust-smallvec#148
-
-The full list of included changes:
-
-* cargo update -p smallvec ([#10822](https://github.com/paritytech/parity-ethereum/pull/10822))
-
-## Parity-Ethereum [v2.4.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.8)
-
-Parity-Ethereum 2.4.8-stable is a bugfix release that improves performance and stability.
-
-* Blockchain: fix reset chain
-* State tests: treat empty accounts the same as non-existant accounts (EIP 1052)
-* Aura: fix Timestamp Overflow
-* Networking: support discovery-only peers (geth bootnodes)
-* Snapshotting: fix unclean shutdown while snappshotting is under way
-
-The full list of included changes:
-
-* ethcore/res: activate atlantis classic hf on block 8772000 ([#10766](https://github.com/paritytech/parity-ethereum/pull/10766))
-* fix docker tags for publishing ([#10741](https://github.com/paritytech/parity-ethereum/pull/10741))
-* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
-* adds rpc error message for --no-ancient-blocks ([#10608](https://github.com/paritytech/parity-ethereum/pull/10608))
-* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
-* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
-* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet ([#10705](https://github.com/paritytech/parity-ethereum/pull/10705))
-* Revert "fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))"
-* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
-
-## Parity-Ethereum [v2.4.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.7)
-
-Parity-Ethereum 2.4.7-stable is a bugfix release that improves performance and stability.
-
-Among others, it enables the _Atlantis_ hardfork on **Morden** and **Kotti** Classic networks.
-
-The full list of included changes:
-
-* [CI] allow cargo audit to fail ([#10676](https://github.com/paritytech/parity-ethereum/pull/10676))
-* new image ([#10673](https://github.com/paritytech/parity-ethereum/pull/10673))
-* Update publishing ([#10644](https://github.com/paritytech/parity-ethereum/pull/10644))
-* enable lto for release builds ([#10717](https://github.com/paritytech/parity-ethereum/pull/10717))
-* Use RUSTFLAGS to set the optimization level ([#10719](https://github.com/paritytech/parity-ethereum/pull/10719))
-* ethcore: enable ECIP-1054 for classic ([#10731](https://github.com/paritytech/parity-ethereum/pull/10731))
-
-## Parity-Ethereum [v2.4.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.6)
-
-Parity-Ethereum 2.4.6-stable is a bugfix release that improves performance and stability.
-
-Among others, it enables the Petersburg hardfork on **Rinkeby** and **POA-Core** Network, as well as the **Kovan** Network community hardfork.
-
-The full list of included changes:
-
-* ci: publish docs debug ([#10638](https://github.com/paritytech/parity-ethereum/pull/10638))
-
-## Parity-Ethereum [v2.4.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.5)
-
-Parity-Ethereum 2.4.5-stable is a bugfix release that improves performance and stability. This release improves memory optimizations around timestamp handling and stabilizes the 2.4 release branch.
-
-As of today, Parity-Ethereum 2.3 reaches end of life and everyone is encouraged to upgrade.
-
-## Parity-Ethereum [v2.4.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.4)
-
-Parity-Ethereum 2.4.4-beta is a bugfix release that improves performance and stability. This patch release removes the dead chain configs for Easthub and Ethereum Social.
-
-The full list of included changes:
-
-* fix(rpc-types): replace uint and hash with `ethereum_types v0.4` ([#10217](https://github.com/paritytech/parity-ethereum/pull/10217))
-* chore(bump ethereum-types) ([#10396](https://github.com/paritytech/parity-ethereum/pull/10396))
-* fix(light eth_gasPrice): ask network if not in cache ([#10535](https://github.com/paritytech/parity-ethereum/pull/10535))
-* fix(light account response): update `tx_queue` ([#10545](https://github.com/paritytech/parity-ethereum/pull/10545))
-* fix(bump dependencies) ([#10540](https://github.com/paritytech/parity-ethereum/pull/10540))
-* tx-pool: check transaction readiness before replacing ([#10526](https://github.com/paritytech/parity-ethereum/pull/10526))
-* fix #10390 ([#10391](https://github.com/paritytech/parity-ethereum/pull/10391))
-* private-tx: replace error_chain ([#10510](https://github.com/paritytech/parity-ethereum/pull/10510))
-
-## Parity-Ethereum [v2.4.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.3)
-
-Parity-Ethereum 2.4.3-beta is a bugfix release that improves performance and stability. This patch release contains a critical bug fix where serving light clients previously led to client crashes. Upgrading is highly recommended.
-
-The full list of included changes:
-
-* Add additional request tests ([#10503](https://github.com/paritytech/parity-ethereum/pull/10503))
-
-## Parity-Ethereum [v2.4.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.2)
-
-Parity-Ethereum 2.4.2-beta is a bugfix release that improves performance and stability.
-
-The full list of included changes:
-
-* Сaching through docker volume ([#10477](https://github.com/paritytech/parity-ethereum/pull/10477))
-* fix win&mac build ([#10486](https://github.com/paritytech/parity-ethereum/pull/10486))
-* fix(extract `timestamp_checked_add` as lib) ([#10383](https://github.com/paritytech/parity-ethereum/pull/10383))
-
-## Parity-Ethereum [v2.4.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.1)
-
-Parity-Ethereum 2.4.1-beta is a bugfix release that improves performance and stability.
-
-The full list of included changes:
-
-* Implement parity_versionInfo & parity_setChain on LC; fix parity_setChain ([#10312](https://github.com/paritytech/parity-ethereum/pull/10312))
-* CI publish to aws ([#10446](https://github.com/paritytech/parity-ethereum/pull/10446))
-* CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))
-* Revert "CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))" (#10456)
-* Revert "CI aws git checkout ([#10451](https://github.com/paritytech/parity-ethereum/pull/10451))"
-* Tests parallelized ([#10452](https://github.com/paritytech/parity-ethereum/pull/10452))
-* Ensure static validator set changes are recognized ([#10467](https://github.com/paritytech/parity-ethereum/pull/10467))
-
-## Parity-Ethereum [v2.4.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.4.0)
-
-Parity-Ethereum 2.4.0-beta is our trifortnightly minor version release coming with a lot of new features as well as bugfixes and performance improvements.
-
-Notable changes:
- Account management is now deprecated ([#10213](https://github.com/paritytech/parity-ethereum/pull/10213))
- Local accounts can now be specified via CLI ([#9960](https://github.com/paritytech/parity-ethereum/pull/9960))
- Chains can now be reset to a particular block via CLI ([#9782](https://github.com/paritytech/parity-ethereum/pull/9782))
- Ethash now additionally implements ProgPoW ([#9762](https://github.com/paritytech/parity-ethereum/pull/9762)) 
- The `eip1283DisableTransition` flag was added to revert EIP-1283 ([#10214](https://github.com/paritytech/parity-ethereum/pull/10214))
-
-The full list of included changes:
-
-* revert some changes, could be buggy ([#10399](https://github.com/paritytech/parity-ethereum/pull/10399))
-* 10000 > 5000 ([#10422](https://github.com/paritytech/parity-ethereum/pull/10422))
-* fix panic when logging directory does not exist, closes #10420 ([#10424](https://github.com/paritytech/parity-ethereum/pull/10424))
-* fix underflow in pip, closes #10419 ([#10423](https://github.com/paritytech/parity-ethereum/pull/10423))
-* ci: clean up gitlab-ci.yml leftovers from previous merge ([#10429](https://github.com/paritytech/parity-ethereum/pull/10429))
-* Update hardcoded headers for Foundation, Ropsten, Kovan and Classic ([#10417](https://github.com/paritytech/parity-ethereum/pull/10417))
-
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Ethash & ProgPoW Implementations"
 name = "ethash"
 version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -7,27 +6,15 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 crunchy = "0.1.0"
 either = "1.0.0"
-ethereum-types = "0.6.0"
-keccak-hash = "0.2.0"
+ethereum-types = "0.4"
+keccak-hash = "0.1"
 log = "0.4"
 memmap = "0.6"
-parking_lot = "0.9"
+parking_lot = "0.6"
 primal = "0.2.3"

 [dev-dependencies]
-criterion = "0.3"
-rustc-hex = "1.0"
-serde_json = "1.0"
 tempdir = "0.3"

 [features]
-default = []
-bench = []
-
-[[bench]]
-name = "basic"
-harness = false
-
-[[bench]]
-name = "progpow"
-harness = false
+benches = []
--- a/ethash/benches/basic.rs
+++ b/ethash/benches/basic.rs
@@ -1,113 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#[macro_use]
-extern crate criterion;
-extern crate ethash;
-
-use criterion::Criterion;
-use ethash::{NodeCacheBuilder, OptimizeFor};
-
-const HASH: [u8; 32] = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe,
-	                    0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f,
-	                    0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
-const NONCE: u64 = 0xd7b3ac70a301a249;
-
-criterion_group!(
-	basic,
-	bench_light_compute_memmap,
-	bench_light_compute_memory,
-	bench_light_new_round_trip_memmap,
-	bench_light_new_round_trip_memory,
-	bench_light_from_file_round_trip_memory,
-	bench_light_from_file_round_trip_memmap
-);
-criterion_main!(basic);
-
-fn bench_light_compute_memmap(b: &mut Criterion) {
-	use std::env;
-
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let light = builder.light(&env::temp_dir(), 486382);
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
-}
-
-fn bench_light_compute_memory(b: &mut Criterion) {
-	use std::env;
-
-	let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-	let light = builder.light(&env::temp_dir(), 486382);
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
-}
-
-fn bench_light_new_round_trip_memmap(b: &mut Criterion) {
-	use std::env;
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let light = builder.light(&env::temp_dir(), 486382);
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
-
-fn bench_light_new_round_trip_memory(b: &mut Criterion) {
-	use std::env;
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-		let light = builder.light(&env::temp_dir(), 486382);
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
-
-fn bench_light_from_file_round_trip_memory(b: &mut Criterion) {
-	use std::env;
-
-	let dir = env::temp_dir();
-	let height = 486382;
-	{
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-		let mut dummy = builder.light(&dir, height);
-		dummy.to_file().unwrap();
-	}
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
-		let light = builder.light_from_file(&dir, 486382).unwrap();
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
-
-fn bench_light_from_file_round_trip_memmap(b: &mut Criterion) {
-	use std::env;
-
-	let dir = env::temp_dir();
-	let height = 486382;
-
-	{
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let mut dummy = builder.light(&dir, height);
-		dummy.to_file().unwrap();
-	}
-
-	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let light = builder.light_from_file(&dir, 486382).unwrap();
-		light.compute(&HASH, NONCE, u64::max_value());
-	}));
-}
--- a/ethash/benches/progpow.rs
+++ b/ethash/benches/progpow.rs
@@ -1,86 +0,0 @@
-#[macro_use]
-extern crate criterion;
-extern crate ethash;
-extern crate rustc_hex;
-extern crate tempdir;
-
-use criterion::Criterion;
-use ethash::progpow;
-
-use tempdir::TempDir;
-use rustc_hex::FromHex;
-use ethash::{NodeCacheBuilder, OptimizeFor};
-use ethash::compute::light_compute;
-
-fn bench_hashimoto_light(c: &mut Criterion) {
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let tempdir = TempDir::new("").unwrap();
-	let light = builder.light(&tempdir.path(), 1);
-	let h = FromHex::from_hex("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f").unwrap();
-	let mut hash = [0; 32];
-	hash.copy_from_slice(&h);
-
-	c.bench_function("hashimoto_light", move |b| {
-		b.iter(|| light_compute(&light, &hash, 0))
-	});
-}
-
-fn bench_progpow_light(c: &mut Criterion) {
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let tempdir = TempDir::new("").unwrap();
-	let cache = builder.new_cache(tempdir.into_path(), 0);
-
-	let h = FromHex::from_hex("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f").unwrap();
-	let mut hash = [0; 32];
-	hash.copy_from_slice(&h);
-
-	c.bench_function("progpow_light", move |b| {
-		b.iter(|| {
-			let c_dag = progpow::generate_cdag(cache.as_ref());
-			progpow::progpow(
-				hash,
-				0,
-				0,
-				cache.as_ref(),
-				&c_dag,
-			);
-		})
-	});
-}
-
-fn bench_progpow_optimal_light(c: &mut Criterion) {
-	let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-	let tempdir = TempDir::new("").unwrap();
-	let cache = builder.new_cache(tempdir.into_path(), 0);
-	let c_dag = progpow::generate_cdag(cache.as_ref());
-
-	let h = FromHex::from_hex("c9149cc0386e689d789a1c2f3d5d169a61a6218ed30e74414dc736e442ef3d1f").unwrap();
-	let mut hash = [0; 32];
-	hash.copy_from_slice(&h);
-
-	c.bench_function("progpow_optimal_light", move |b| {
-		b.iter(|| {
-			progpow::progpow(
-				hash,
-				0,
-				0,
-				cache.as_ref(),
-				&c_dag,
-			);
-		})
-	});
-}
-
-fn bench_keccak_f800_long(c: &mut Criterion) {
-	c.bench_function("keccak_f800_long(0, 0, 0)", |b| {
-		b.iter(|| progpow::keccak_f800_long([0; 32], 0, [0; 8]))
-	});
-}
-
-criterion_group!(benches,
-	bench_hashimoto_light,
-	bench_progpow_light,
-	bench_progpow_optimal_light,
-	bench_keccak_f800_long,
-);
-criterion_main!(benches);
--- a/ethash/res/progpow_testvectors.json
+++ b/ethash/res/progpow_testvectors.json
@@ -1,86 +0,0 @@
-[
-  [
-    0,
-    "0000000000000000000000000000000000000000000000000000000000000000",
-    "0000000000000000",
-    "faeb1be51075b03a4ff44b335067951ead07a3b078539ace76fd56fc410557a3",
-    "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b"
-  ],
-  [
-    49,
-    "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b",
-    "0000000006ff2c47",
-    "c789c1180f890ec555ff42042913465481e8e6bc512cb981e1c1108dc3f2227d",
-    "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922"
-  ],
-  [
-    50,
-    "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922",
-    "00000000076e482e",
-    "c7340542c2a06b3a7dc7222635f7cd402abf8b528ae971ddac6bbe2b0c7cb518",
-    "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d"
-  ],
-  [
-    99,
-    "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d",
-    "000000003917afab",
-    "f5e60b2c5bfddd136167a30cbc3c8dbdbd15a512257dee7964e0bc6daa9f8ba7",
-    "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce"
-  ],
-  [
-    29950,
-    "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce",
-    "005d409dbc23a62a",
-    "07393d15805eb08ee6fc6cb3ad4ad1010533bd0ff92d6006850246829f18fd6e",
-    "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5"
-  ],
-  [
-    29999,
-    "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5",
-    "005db5fa4c2a3d03",
-    "7551bddf977491da2f6cfc1679299544b23483e8f8ee0931c4c16a796558a0b8",
-    "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454"
-  ],
-  [
-    30000,
-    "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454",
-    "005db8607994ff30",
-    "f1c2c7c32266af9635462e6ce1c98ebe4e7e3ecab7a38aaabfbf2e731e0fbff4",
-    "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64"
-  ],
-  [
-    30049,
-    "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64",
-    "005e2e215a8ca2e7",
-    "57fe6a9fbf920b4e91deeb66cb0efa971e08229d1a160330e08da54af0689add",
-    "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047"
-  ],
-  [
-    30050,
-    "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047",
-    "005e30899481055e",
-    "ba30c61cc5a2c74a5ecaf505965140a08f24a296d687e78720f0b48baf712f2d",
-    "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71"
-  ],
-  [
-    30099,
-    "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71",
-    "005ea6aef136f88b",
-    "cfd5e46048cd133d40f261fe8704e51d3f497fc14203ac6a9ef6a0841780b1cd",
-    "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6"
-  ],
-  [
-    59950,
-    "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6",
-    "02ebe0503bd7b1da",
-    "21511fbaa31fb9f5fc4998a754e97b3083a866f4de86fa7500a633346f56d773",
-    "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf"
-  ],
-  [
-    59999,
-    "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf",
-    "02edb6275bd221e3",
-    "653eda37d337e39d311d22be9bbd3458d3abee4e643bee4a7280a6d08106ef98",
-    "341562d10d4afb706ec2c8d5537cb0c810de02b4ebb0a0eea5ae335af6fb2e88"
-  ]
-]
--- a/ethash/src/cache.rs
+++ b/ethash/src/cache.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use compute::Light;
 use either::Either;
@@ -69,7 +69,6 @@ pub struct NodeCacheBuilder {
 	// TODO: Remove this locking and just use an `Rc`?
 	seedhash: Arc<Mutex<SeedHashCompute>>,
 	optimize_for: OptimizeFor,
-	progpow_transition: u64,
 }

 // TODO: Abstract the "optimize for" logic
@@ -83,18 +82,17 @@ pub struct NodeCache {

 impl NodeCacheBuilder {
 	pub fn light(&self, cache_dir: &Path, block_number: u64) -> Light {
-		Light::new_with_builder(self, cache_dir, block_number, self.progpow_transition)
+		Light::new_with_builder(self, cache_dir, block_number)
 	}

 	pub fn light_from_file(&self, cache_dir: &Path, block_number: u64) -> io::Result<Light> {
-		Light::from_file_with_builder(self, cache_dir, block_number, self.progpow_transition)
+		Light::from_file_with_builder(self, cache_dir, block_number)
 	}

-	pub fn new<T: Into<Option<OptimizeFor>>>(optimize_for: T, progpow_transition: u64) -> Self {
+	pub fn new<T: Into<Option<OptimizeFor>>>(optimize_for: T) -> Self {
 		NodeCacheBuilder {
 			seedhash: Arc::new(Mutex::new(SeedHashCompute::default())),
 			optimize_for: optimize_for.into().unwrap_or_default(),
-			progpow_transition
 		}
 	}

--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Ethash implementation
 //! See https://github.com/ethereum/wiki/wiki/Ethash
@@ -21,7 +21,6 @@

 use keccak::{keccak_512, keccak_256, H256};
 use cache::{NodeCache, NodeCacheBuilder};
-use progpow::{CDag, generate_cdag, progpow, keccak_f800_short, keccak_f800_long};
 use seed_compute::SeedHashCompute;
 use shared::*;
 use std::io;
@@ -31,7 +30,7 @@ use std::path::Path;

 const MIX_WORDS: usize = ETHASH_MIX_BYTES / 4;
 const MIX_NODES: usize = MIX_WORDS / NODE_WORDS;
-pub const FNV_PRIME: u32 = 0x01000193;
+const FNV_PRIME: u32 = 0x01000193;

 /// Computation result
 pub struct ProofOfWork {
@@ -41,15 +40,9 @@ pub struct ProofOfWork {
 	pub mix_hash: H256,
 }

-enum Algorithm {
-	Hashimoto,
-	Progpow(Box<CDag>),
-}
-
 pub struct Light {
 	block_number: u64,
 	cache: NodeCache,
-	algorithm: Algorithm,
 }

 /// Light cache structure
@@ -58,55 +51,32 @@ impl Light {
 		builder: &NodeCacheBuilder,
 		cache_dir: &Path,
 		block_number: u64,
-		progpow_transition: u64,
 	) -> Self {
 		let cache = builder.new_cache(cache_dir.to_path_buf(), block_number);

-		let algorithm = if block_number >= progpow_transition {
-			Algorithm::Progpow(Box::new(generate_cdag(cache.as_ref())))
-		} else {
-			Algorithm::Hashimoto
-		};
-
-		Light { block_number, cache, algorithm }
+		Light {
+			block_number: block_number,
+			cache: cache,
+		}
 	}

 	/// Calculate the light boundary data
 	/// `header_hash` - The header hash to pack into the mix
 	/// `nonce` - The nonce to pack into the mix
-	pub fn compute(&self, header_hash: &H256, nonce: u64, block_number: u64) -> ProofOfWork {
-		match self.algorithm {
-			Algorithm::Progpow(ref c_dag) => {
-				let (value, mix_hash) = progpow(
-					*header_hash,
-					nonce,
-					block_number,
-					self.cache.as_ref(),
-					c_dag,
-				);
-
-				ProofOfWork { value, mix_hash }
-			},
-			Algorithm::Hashimoto => light_compute(self, header_hash, nonce),
-		}
-
+	pub fn compute(&self, header_hash: &H256, nonce: u64) -> ProofOfWork {
+		light_compute(self, header_hash, nonce)
 	}

 	pub fn from_file_with_builder(
 		builder: &NodeCacheBuilder,
 		cache_dir: &Path,
 		block_number: u64,
-		progpow_transition: u64,
 	) -> io::Result<Self> {
 		let cache = builder.from_file(cache_dir.to_path_buf(), block_number)?;
-
-		let algorithm = if block_number >= progpow_transition {
-			Algorithm::Progpow(Box::new(generate_cdag(cache.as_ref())))
-		} else {
-			Algorithm::Hashimoto
-		};
-
-		Ok(Light { block_number, cache, algorithm })
+		Ok(Light {
+			block_number: block_number,
+			cache: cache,
+		})
 	}

 	pub fn to_file(&mut self) -> io::Result<&Path> {
@@ -129,32 +99,27 @@ fn fnv_hash(x: u32, y: u32) -> u32 {
 /// `nonce`            The block's nonce
 /// `mix_hash`         The mix digest hash
 /// Boundary recovered from mix hash
-pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256, progpow: bool) -> H256 {
+pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256) -> H256 {
 	unsafe {
-		if progpow {
-			let seed = keccak_f800_short(*header_hash, nonce, [0u32; 8]);
-			keccak_f800_long(*header_hash, seed, mem::transmute(*mix_hash))
-		} else {
-			// This is safe - the `keccak_512` call below reads the first 40 bytes (which we explicitly set
-			// with two `copy_nonoverlapping` calls) but writes the first 64, and then we explicitly write
-			// the next 32 bytes before we read the whole thing with `keccak_256`.
-			//
-			// This cannot be elided by the compiler as it doesn't know the implementation of
-			// `keccak_512`.
-			let mut buf: [u8; 64 + 32] = mem::uninitialized();
+		// This is safe - the `keccak_512` call below reads the first 40 bytes (which we explicitly set
+		// with two `copy_nonoverlapping` calls) but writes the first 64, and then we explicitly write
+		// the next 32 bytes before we read the whole thing with `keccak_256`.
+		//
+		// This cannot be elided by the compiler as it doesn't know the implementation of
+		// `keccak_512`.
+		let mut buf: [u8; 64 + 32] = mem::uninitialized();

-			ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
-			ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);
+		ptr::copy_nonoverlapping(header_hash.as_ptr(), buf.as_mut_ptr(), 32);
+		ptr::copy_nonoverlapping(&nonce as *const u64 as *const u8, buf[32..].as_mut_ptr(), 8);

-			keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
-			ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);
+		keccak_512::unchecked(buf.as_mut_ptr(), 64, buf.as_ptr(), 40);
+		ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);

-			// This is initialized in `keccak_256`
-			let mut hash: [u8; 32] = mem::uninitialized();
-			keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());
+		// This is initialized in `keccak_256`
+		let mut hash: [u8; 32] = mem::uninitialized();
+		keccak_256::unchecked(hash.as_mut_ptr(), hash.len(), buf.as_ptr(), buf.len());

-			hash
-		}
+		hash
 	}
 }

@@ -307,7 +272,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 		// We overwrite the second half since `keccak_256` has an internal buffer and so allows
 		// overlapping arrays as input.
 		let write_ptr: *mut u8 = &mut buf.compress_bytes as *mut [u8; 32] as *mut u8;
-		unsafe {
+		unsafe { 
 			keccak_256::unchecked(
 				write_ptr,
 				buf.compress_bytes.len(),
@@ -322,7 +287,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 }

 // TODO: Use the `simd` crate
-pub fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
+fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 	let num_parent_nodes = cache.len();
 	let mut ret = cache[node_index as usize % num_parent_nodes].clone();
 	ret.as_words_mut()[0] ^= node_index;
@@ -396,13 +361,13 @@ mod test {
 			0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a,
 			0xe9, 0x7e, 0x53, 0x84,
 		];
-		assert_eq!(quick_get_difficulty(&hash, nonce, &mix_hash, false)[..], boundary_good[..]);
+		assert_eq!(quick_get_difficulty(&hash, nonce, &mix_hash)[..], boundary_good[..]);
 		let boundary_bad = [
 			0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3a, 0x9b, 0x6c, 0x69, 0xbc, 0x2c, 0xe2, 0xa2,
 			0x4a, 0x8e, 0x95, 0x69, 0xef, 0xc7, 0xd7, 0x1b, 0x33, 0x35, 0xdf, 0x36, 0x8c, 0x9a,
 			0xe9, 0x7e, 0x53, 0x84,
 		];
-		assert!(quick_get_difficulty(&hash, nonce, &mix_hash, false)[..] != boundary_bad[..]);
+		assert!(quick_get_difficulty(&hash, nonce, &mix_hash)[..] != boundary_bad[..]);
 	}

 	#[test]
@@ -426,7 +391,7 @@ mod test {

 		let tempdir = TempDir::new("").unwrap();
 		// difficulty = 0x085657254bd9u64;
-		let light = NodeCacheBuilder::new(None, u64::max_value()).light(tempdir.path(), 486382);
+		let light = NodeCacheBuilder::new(None).light(tempdir.path(), 486382);
 		let result = light_compute(&light, &hash, nonce);
 		assert_eq!(result.mix_hash[..], mix_hash[..]);
 		assert_eq!(result.value[..], boundary[..]);
@@ -435,7 +400,7 @@ mod test {
 	#[test]
 	fn test_drop_old_data() {
 		let tempdir = TempDir::new("").unwrap();
-		let builder = NodeCacheBuilder::new(None, u64::max_value());
+		let builder = NodeCacheBuilder::new(None);
 		let first = builder.light(tempdir.path(), 0).to_file().unwrap().to_owned();

 		let second = builder.light(tempdir.path(), ETHASH_EPOCH_LENGTH).to_file().unwrap().to_owned();
--- a/ethash/src/keccak.rs
+++ b/ethash/src/keccak.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 extern crate keccak_hash as hash;

--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -1,18 +1,20 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.
+
+#![cfg_attr(feature = "benches", feature(test))]

 extern crate either;
 extern crate ethereum_types;
@@ -25,41 +27,26 @@ extern crate crunchy;
 #[macro_use]
 extern crate log;

-#[cfg(test)]
-extern crate rustc_hex;
-
-#[cfg(test)]
-extern crate serde_json;
-
 #[cfg(test)]
 extern crate tempdir;

-#[cfg(feature = "bench")]
-pub mod compute;
-#[cfg(not(feature = "bench"))]
 mod compute;
-
 mod seed_compute;
 mod cache;
 mod keccak;
 mod shared;

-#[cfg(feature = "bench")]
-pub mod progpow;
-#[cfg(not(feature = "bench"))]
-mod progpow;
-
 pub use cache::{NodeCacheBuilder, OptimizeFor};
 pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};
 use compute::Light;
-use ethereum_types::{BigEndianHash, U256, U512};
+use ethereum_types::{U256, U512};
 use keccak::H256;
 use parking_lot::Mutex;
 pub use seed_compute::SeedHashCompute;
 pub use shared::ETHASH_EPOCH_LENGTH;
 use std::mem;
 use std::path::{Path, PathBuf};
-use std::convert::TryFrom;
+
 use std::sync::Arc;

 struct LightCache {
@@ -74,16 +61,14 @@ pub struct EthashManager {
 	nodecache_builder: NodeCacheBuilder,
 	cache: Mutex<LightCache>,
 	cache_dir: PathBuf,
-	progpow_transition: u64,
 }

 impl EthashManager {
 	/// Create a new new instance of ethash manager
-	pub fn new<T: Into<Option<OptimizeFor>>>(cache_dir: &Path, optimize_for: T, progpow_transition: u64) -> EthashManager {
+	pub fn new<T: Into<Option<OptimizeFor>>>(cache_dir: &Path, optimize_for: T) -> EthashManager {
 		EthashManager {
 			cache_dir: cache_dir.to_path_buf(),
-			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default(), progpow_transition),
-			progpow_transition: progpow_transition,
+			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default()),
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,
@@ -102,33 +87,27 @@ impl EthashManager {
 		let epoch = block_number / ETHASH_EPOCH_LENGTH;
 		let light = {
 			let mut lights = self.cache.lock();
-			let light = if block_number == self.progpow_transition {
-				// we need to regenerate the cache to trigger algorithm change to progpow inside `Light`
-				None
-			} else {
-				match lights.recent_epoch.clone() {
-					Some(ref e) if *e == epoch => lights.recent.clone(),
-					_ => match lights.prev_epoch.clone() {
-						Some(e) if e == epoch => {
-							// don't swap if recent is newer.
-							if lights.recent_epoch > lights.prev_epoch {
-								None
-							} else {
-								// swap
-								let t = lights.prev_epoch;
-								lights.prev_epoch = lights.recent_epoch;
-								lights.recent_epoch = t;
-								let t = lights.prev.clone();
-								lights.prev = lights.recent.clone();
-								lights.recent = t;
-								lights.recent.clone()
-							}
+			let light = match lights.recent_epoch.clone() {
+				Some(ref e) if *e == epoch => lights.recent.clone(),
+				_ => match lights.prev_epoch.clone() {
+					Some(e) if e == epoch => {
+						// don't swap if recent is newer.
+						if lights.recent_epoch > lights.prev_epoch {
+							None
+						} else {
+							// swap
+							let t = lights.prev_epoch;
+							lights.prev_epoch = lights.recent_epoch;
+							lights.recent_epoch = t;
+							let t = lights.prev.clone();
+							lights.prev = lights.recent.clone();
+							lights.recent = t;
+							lights.recent.clone()
 						}
-						_ => None,
-					},
-				}
+					}
+					_ => None,
+				},
 			};
-
 			match light {
 				None => {
 					let light = match self.nodecache_builder.light_from_file(
@@ -155,18 +134,18 @@ impl EthashManager {
 				Some(light) => light,
 			}
 		};
-		light.compute(header_hash, nonce, block_number)
+		light.compute(header_hash, nonce)
 	}
 }

 /// Convert an Ethash boundary to its original difficulty. Basically just `f(x) = 2^256 / x`.
 pub fn boundary_to_difficulty(boundary: &ethereum_types::H256) -> U256 {
-	difficulty_to_boundary_aux(&boundary.into_uint())
+	difficulty_to_boundary_aux(&**boundary)
 }

 /// Convert an Ethash difficulty to the target boundary. Basically just `f(x) = 2^256 / x`.
 pub fn difficulty_to_boundary(difficulty: &U256) -> ethereum_types::H256 {
-	BigEndianHash::from_uint(&difficulty_to_boundary_aux(difficulty))
+	difficulty_to_boundary_aux(difficulty).into()
 }

 fn difficulty_to_boundary_aux<T: Into<U512>>(difficulty: T) -> ethereum_types::U256 {
@@ -177,8 +156,8 @@ fn difficulty_to_boundary_aux<T: Into<U512>>(difficulty: T) -> ethereum_types::U
 	if difficulty == U512::one() {
 		U256::max_value()
 	} else {
-		const PROOF: &str = "difficulty > 1, so result never overflows 256 bits; qed";
-		U256::try_from((U512::one() << 256) / difficulty).expect(PROOF)
+		// difficulty > 1, so result should never overflow 256 bits
+		U256::from((U512::one() << 256) / difficulty)
 	}
 }

@@ -187,7 +166,7 @@ fn test_lru() {
 	use tempdir::TempDir;

 	let tempdir = TempDir::new("").unwrap();
-	let ethash = EthashManager::new(tempdir.path(), None, u64::max_value());
+	let ethash = EthashManager::new(tempdir.path(), None);
 	let hash = [0u8; 32];
 	ethash.compute_light(1, &hash, 1);
 	ethash.compute_light(50000, &hash, 1);
@@ -203,10 +182,10 @@ fn test_lru() {

 #[test]
 fn test_difficulty_to_boundary() {
-	use ethereum_types::{H256, BigEndianHash};
+	use ethereum_types::H256;
 	use std::str::FromStr;

-	assert_eq!(difficulty_to_boundary(&U256::from(1)), BigEndianHash::from_uint(&U256::max_value()));
+	assert_eq!(difficulty_to_boundary(&U256::from(1)), H256::from(U256::max_value()));
 	assert_eq!(difficulty_to_boundary(&U256::from(2)), H256::from_str("8000000000000000000000000000000000000000000000000000000000000000").unwrap());
 	assert_eq!(difficulty_to_boundary(&U256::from(4)), H256::from_str("4000000000000000000000000000000000000000000000000000000000000000").unwrap());
 	assert_eq!(difficulty_to_boundary(&U256::from(32)), H256::from_str("0800000000000000000000000000000000000000000000000000000000000000").unwrap());
@@ -220,18 +199,9 @@ fn test_difficulty_to_boundary_regression() {
 	// https://github.com/paritytech/parity-ethereum/issues/8397
 	for difficulty in 1..9 {
 		assert_eq!(U256::from(difficulty), boundary_to_difficulty(&difficulty_to_boundary(&difficulty.into())));
-		assert_eq!(
-			H256::from_low_u64_be(difficulty),
-			difficulty_to_boundary(&boundary_to_difficulty(&H256::from_low_u64_be(difficulty))),
-		);
-		assert_eq!(
-			U256::from(difficulty),
-			boundary_to_difficulty(&BigEndianHash::from_uint(&boundary_to_difficulty(&H256::from_low_u64_be(difficulty)))),
-		);
-		assert_eq!(
-			H256::from_low_u64_be(difficulty),
-			difficulty_to_boundary(&difficulty_to_boundary(&difficulty.into()).into_uint()),
-		);
+		assert_eq!(H256::from(difficulty), difficulty_to_boundary(&boundary_to_difficulty(&difficulty.into())));
+		assert_eq!(U256::from(difficulty), boundary_to_difficulty(&boundary_to_difficulty(&difficulty.into()).into()));
+		assert_eq!(H256::from(difficulty), difficulty_to_boundary(&difficulty_to_boundary(&difficulty.into()).into()));
 	}
 }

@@ -244,5 +214,102 @@ fn test_difficulty_to_boundary_panics_on_zero() {
 #[test]
 #[should_panic]
 fn test_boundary_to_difficulty_panics_on_zero() {
-	boundary_to_difficulty(&ethereum_types::H256::zero());
+	boundary_to_difficulty(&ethereum_types::H256::from(0));
+}
+
+#[cfg(feature = "benches")]
+mod benchmarks {
+	extern crate test;
+
+	use self::test::Bencher;
+	use cache::{NodeCacheBuilder, OptimizeFor};
+	use compute::{Light, light_compute};
+
+	const HASH: [u8; 32] = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe,
+	                        0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f,
+	                        0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
+	const NONCE: u64 = 0xd7b3ac70a301a249;
+
+	#[bench]
+	fn bench_light_compute_memmap(b: &mut Bencher) {
+		use std::env;
+
+		let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+		let light = builder.light(&env::temp_dir(), 486382);
+
+		b.iter(|| light_compute(&light, &HASH, NONCE));
+	}
+
+	#[bench]
+	fn bench_light_compute_memory(b: &mut Bencher) {
+		use std::env;
+
+		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+		let light = builder.light(&env::temp_dir(), 486382);
+
+		b.iter(|| light_compute(&light, &HASH, NONCE));
+	}
+
+	#[bench]
+	#[ignore]
+	fn bench_light_new_round_trip_memmap(b: &mut Bencher) {
+		use std::env;
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let light = builder.light(&env::temp_dir(), 486382);
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	#[ignore]
+	fn bench_light_new_round_trip_memory(b: &mut Bencher) {
+		use std::env;
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let light = builder.light(&env::temp_dir(), 486382);
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	fn bench_light_from_file_round_trip_memory(b: &mut Bencher) {
+		use std::env;
+
+		let dir = env::temp_dir();
+		let height = 486382;
+		{
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let mut dummy = builder.light(&dir, height);
+			dummy.to_file().unwrap();
+		}
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Cpu);
+			let light = builder.light_from_file(&dir, 486382).unwrap();
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
+
+	#[bench]
+	fn bench_light_from_file_round_trip_memmap(b: &mut Bencher) {
+		use std::env;
+
+		let dir = env::temp_dir();
+		let height = 486382;
+
+		{
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let mut dummy = builder.light(&dir, height);
+			dummy.to_file().unwrap();
+		}
+
+		b.iter(|| {
+			let builder = NodeCacheBuilder::new(OptimizeFor::Memory);
+			let light = builder.light_from_file(&dir, 486382).unwrap();
+			light_compute(&light, &HASH, NONCE);
+		});
+	}
 }
--- a/ethash/src/progpow.rs
+++ b/ethash/src/progpow.rs
@@ -1,611 +0,0 @@
-// Copyright 2015-2019 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/>.
-
-//! ProgPoW (Programmatic Proof-of-Work) is the Ethereum network's proposed new Application-Specific Integrated
-//! Circuit (ASIC) resistant Proof-of-Work mining algorithm.
-//!
-//! ProgPoW's aim is to reduce the efficiencies of specialized mining devices known as ASIC chips
-//! (and accelerated GPU-based setups), and to maximize the performance of General Purpose Hardware (GPUs) to enable
-//! more users to compete for new cryptocurrency awarded by the protocol.
-//!
-//! ASIC chips are those that are tailored to efficiently mining cryptocurrency based on a specific hashing algorithm.
-//!
-//! GPU mining setups are less specialised are struggle to compete for mining rewards.
-//!
-//! It would be a change from Ethereum's current PoW mining algorithm known as Ethash.
-//!
-//! ProgPoW audits have been proposed to analyse the efficiency of a ProgPoW ASICs over
-//! GPUs and analysis of the economic impact on the Ethereum protocol.
-
-use compute::{FNV_PRIME, calculate_dag_item};
-use keccak::H256;
-use shared::{ETHASH_ACCESSES, ETHASH_MIX_BYTES, Node, get_data_size};
-
-const PROGPOW_CACHE_BYTES: usize = 16 * 1024;
-const PROGPOW_CACHE_WORDS: usize = PROGPOW_CACHE_BYTES / 4;
-const PROGPOW_CNT_CACHE: usize = 12;
-const PROGPOW_CNT_MATH: usize = 20;
-const PROGPOW_CNT_DAG: usize = ETHASH_ACCESSES;
-const PROGPOW_DAG_LOADS: usize = 4;
-const PROGPOW_MIX_BYTES: usize = 2 * ETHASH_MIX_BYTES;
-const PROGPOW_PERIOD_LENGTH: usize = 50; // blocks per progpow epoch (N)
-const PROGPOW_LANES: usize = 16;
-const PROGPOW_REGS: usize = 32;
-
-const FNV_HASH: u32 = 0x811c9dc5;
-
-const KECCAKF_RNDC: [u32; 24] = [
-	0x00000001, 0x00008082, 0x0000808a, 0x80008000, 0x0000808b, 0x80000001,
-	0x80008081, 0x00008009, 0x0000008a, 0x00000088, 0x80008009, 0x8000000a,
-	0x8000808b, 0x0000008b, 0x00008089, 0x00008003, 0x00008002, 0x00000080,
-	0x0000800a, 0x8000000a, 0x80008081, 0x00008080, 0x80000001, 0x80008008
-];
-
-const KECCAKF_ROTC: [u32; 24] = [
-	1,  3,  6,  10, 15, 21, 28, 36, 45, 55, 2,  14,
-	27, 41, 56, 8,  25, 43, 62, 18, 39, 61, 20, 44
-];
-
-const KECCAKF_PILN: [usize; 24] = [
-	10, 7,  11, 17, 18, 3, 5,  16, 8,  21, 24, 4,
-	15, 23, 19, 13, 12, 2, 20, 14, 22, 9,  6,  1
-];
-
-fn keccak_f800_round(st: &mut [u32; 25], r: usize) {
-	// Theta
-	let mut bc = [0u32; 5];
-	for i in 0..bc.len() {
-		bc[i] = st[i] ^ st[i + 5] ^ st[i + 10] ^ st[i + 15] ^ st[i + 20];
-	}
-
-	for i in 0..bc.len() {
-		let t = bc[(i + 4) % 5] ^ bc[(i + 1) % 5].rotate_left(1);
-		for j in (0..st.len()).step_by(5) {
-			st[j + i] ^= t;
-		}
-	}
-
-	// Rho Pi
-	let mut t = st[1];
-
-	debug_assert_eq!(KECCAKF_ROTC.len(), 24);
-	for i in 0..24 {
-		let j = KECCAKF_PILN[i];
-		bc[0] = st[j];
-		st[j] = t.rotate_left(KECCAKF_ROTC[i]);
-		t = bc[0];
-	}
-
-	// Chi
-	for j in (0..st.len()).step_by(5) {
-		for i in 0..bc.len() {
-			bc[i] = st[j + i];
-		}
-		for i in 0..bc.len() {
-			st[j + i] ^= (!bc[(i + 1) % 5]) & bc[(i + 2) % 5];
-		}
-	}
-
-	// Iota
-	debug_assert!(r < KECCAKF_RNDC.len());
-	st[0] ^= KECCAKF_RNDC[r];
-}
-
-fn keccak_f800(header_hash: H256, nonce: u64, result: [u32; 8], st: &mut [u32; 25]) {
-	for i in 0..8 {
-		st[i] = (header_hash[4 * i] as u32) +
-			((header_hash[4 * i + 1] as u32) << 8) +
-			((header_hash[4 * i + 2] as u32) << 16) +
-			((header_hash[4 * i + 3] as u32) << 24);
-	}
-
-	st[8] = nonce as u32;
-	st[9] = (nonce >> 32) as u32;
-
-	for i in 0..8 {
-		st[10 + i] = result[i];
-	}
-
-	for r in 0..22 {
-		keccak_f800_round(st, r);
-	}
-}
-
-pub fn keccak_f800_short(header_hash: H256, nonce: u64, result: [u32; 8]) -> u64 {
-	let mut st = [0u32; 25];
-	keccak_f800(header_hash, nonce, result, &mut st);
-	(st[0].swap_bytes() as u64) << 32 | st[1].swap_bytes() as u64
-}
-
-pub fn keccak_f800_long(header_hash: H256, nonce: u64, result: [u32; 8]) -> H256 {
-	let mut st = [0u32; 25];
-	keccak_f800(header_hash, nonce, result, &mut st);
-
-	// NOTE: transmute from `[u32; 8]` to `[u8; 32]`
-	unsafe {
-		std::mem::transmute(
-			[st[0], st[1], st[2], st[3], st[4], st[5], st[6], st[7]]
-		)
-	}
-}
-
-#[inline]
-fn fnv1a_hash(h: u32, d: u32) -> u32 {
-	(h ^ d).wrapping_mul(FNV_PRIME)
-}
-
-#[derive(Clone)]
-struct Kiss99 {
-	z: u32,
-	w: u32,
-	jsr: u32,
-	jcong: u32,
-}
-
-impl Kiss99 {
-	fn new(z: u32, w: u32, jsr: u32, jcong: u32) -> Kiss99 {
-		Kiss99 { z, w, jsr, jcong }
-	}
-
-	#[inline]
-	fn next_u32(&mut self) -> u32 {
-		self.z = 36969u32.wrapping_mul(self.z & 65535).wrapping_add(self.z >> 16);
-		self.w = 18000u32.wrapping_mul(self.w & 65535).wrapping_add(self.w >> 16);
-		let mwc = (self.z << 16).wrapping_add(self.w);
-		self.jsr ^= self.jsr << 17;
-		self.jsr ^= self.jsr >> 13;
-		self.jsr ^= self.jsr << 5;
-		self.jcong = 69069u32.wrapping_mul(self.jcong).wrapping_add(1234567);
-
-		(mwc ^ self.jcong).wrapping_add(self.jsr)
-	}
-}
-
-fn fill_mix(seed: u64, lane_id: u32) -> [u32; PROGPOW_REGS] {
-	// Use FNV to expand the per-warp seed to per-lane
-	// Use KISS to expand the per-lane seed to fill mix
-	let z = fnv1a_hash(FNV_HASH, seed as u32);
-	let w = fnv1a_hash(z, (seed >> 32) as u32);
-	let jsr = fnv1a_hash(w, lane_id);
-	let jcong = fnv1a_hash(jsr, lane_id);
-
-	let mut rnd = Kiss99::new(z, w, jsr, jcong);
-
-	let mut mix = [0; PROGPOW_REGS];
-
-	debug_assert_eq!(PROGPOW_REGS, 32);
-	for i in 0..32 {
-		mix[i] = rnd.next_u32();
-	}
-
-	mix
-}
-
-// Merge new data from b into the value in a. Assuming A has high entropy only
-// do ops that retain entropy even if B is low entropy (IE don't do A&B)
-fn merge(a: u32, b: u32, r: u32) -> u32 {
-	match r % 4 {
-		0 => a.wrapping_mul(33).wrapping_add(b),
-		1 => (a ^ b).wrapping_mul(33),
-		2 => a.rotate_left(((r >> 16) % 31) + 1) ^ b,
-		_ => a.rotate_right(((r >> 16) % 31) + 1) ^ b,
-	}
-}
-
-fn math(a: u32, b: u32, r: u32) -> u32 {
-	match r % 11 {
-		0 => a.wrapping_add(b),
-		1 => a.wrapping_mul(b),
-		2 => ((a as u64).wrapping_mul(b as u64) >> 32) as u32,
-		3 => a.min(b),
-		4 => a.rotate_left(b),
-		5 => a.rotate_right(b),
-		6 => a & b,
-		7 => a | b,
-		8 => a ^ b,
-		9 => a.leading_zeros() + b.leading_zeros(),
-		_ => a.count_ones() + b.count_ones(),
-	}
-}
-
-fn progpow_init(seed: u64) -> (Kiss99, [u32; PROGPOW_REGS], [u32; PROGPOW_REGS]) {
-	let z = fnv1a_hash(FNV_HASH, seed as u32);
-	let w = fnv1a_hash(z, (seed >> 32) as u32);
-	let jsr = fnv1a_hash(w, seed as u32);
-	let jcong = fnv1a_hash(jsr, (seed >> 32) as u32);
-
-	let mut rnd = Kiss99::new(z, w, jsr, jcong);
-
-	// Create a random sequence of mix destinations for merge() and mix sources
-	// for cache reads guarantees every destination merged once and guarantees
-	// no duplicate cache reads, which could be optimized away. Uses
-	// Fisher-Yates shuffle.
-	let mut mix_seq_dst = [0u32; PROGPOW_REGS];
-	let mut mix_seq_cache = [0u32; PROGPOW_REGS];
-	for i in 0..mix_seq_dst.len() {
-		mix_seq_dst[i] = i as u32;
-		mix_seq_cache[i] = i as u32;
-	}
-
-	for i in (1..mix_seq_dst.len()).rev() {
-		let j = rnd.next_u32() as usize % (i + 1);
-		mix_seq_dst.swap(i, j);
-
-		let j = rnd.next_u32() as usize % (i + 1);
-		mix_seq_cache.swap(i, j);
-	}
-
-	(rnd, mix_seq_dst, mix_seq_cache)
-}
-
-pub type CDag = [u32; PROGPOW_CACHE_WORDS];
-
-fn progpow_loop(
-	seed: u64,
-	loop_: usize,
-	mix: &mut [[u32; PROGPOW_REGS]; PROGPOW_LANES],
-	cache: &[Node],
-	c_dag: &CDag,
-	data_size: usize,
-) {
-	// All lanes share a base address for the global load. Global offset uses
-	// mix[0] to guarantee it depends on the load result.
-	let g_offset = mix[loop_ % PROGPOW_LANES][0] as usize %
-		(64 * data_size / (PROGPOW_LANES * PROGPOW_DAG_LOADS));
-
-	// 256 bytes of dag data
-	let mut dag_item = [0u32; 64];
-
-	// Fetch DAG nodes (64 bytes each)
-	for l in 0..PROGPOW_DAG_LOADS {
-		let index = g_offset * PROGPOW_LANES * PROGPOW_DAG_LOADS + l * 16;
-		let node = calculate_dag_item(index as u32 / 16, cache);
-		dag_item[l * 16..(l + 1) * 16].clone_from_slice(node.as_words());
-	}
-
-	let (rnd, mix_seq_dst, mix_seq_cache) = progpow_init(seed);
-
-	// Lanes can execute in parallel and will be convergent
-	for l in 0..mix.len() {
-		let mut rnd = rnd.clone();
-
-		// Initialize the seed and mix destination sequence
-		let mut mix_seq_dst_cnt = 0;
-		let mut mix_seq_cache_cnt = 0;
-
-		let mut mix_dst = || {
-			let res = mix_seq_dst[mix_seq_dst_cnt % PROGPOW_REGS] as usize;
-			mix_seq_dst_cnt += 1;
-			res
-		};
-		let mut mix_cache = || {
-			let res = mix_seq_cache[mix_seq_cache_cnt % PROGPOW_REGS] as usize;
-			mix_seq_cache_cnt += 1;
-			res
-		};
-
-		for i in 0..PROGPOW_CNT_CACHE.max(PROGPOW_CNT_MATH) {
-			if i < PROGPOW_CNT_CACHE {
-				// Cached memory access, lanes access random 32-bit locations
-				// within the first portion of the DAG
-				let offset = mix[l][mix_cache()] as usize % PROGPOW_CACHE_WORDS;
-				let data = c_dag[offset];
-				let dst = mix_dst();
-
-				mix[l][dst] = merge(mix[l][dst], data, rnd.next_u32());
-			}
-
-			if i < PROGPOW_CNT_MATH {
-				// Random math
-				// Generate 2 unique sources
-				let src_rnd = rnd.next_u32() % (PROGPOW_REGS * (PROGPOW_REGS - 1)) as u32;
-				let src1 = src_rnd % PROGPOW_REGS as u32; // 0 <= src1 < PROGPOW_REGS
-				let mut src2 = src_rnd / PROGPOW_REGS as u32; // 0 <= src2 < PROGPOW_REGS - 1
-				if src2 >= src1 {
-					src2 += 1; // src2 is now any reg other than src1
-				}
-
-				let data = math(mix[l][src1 as usize], mix[l][src2 as usize], rnd.next_u32());
-				let dst = mix_dst();
-
-				mix[l][dst] = merge(mix[l][dst], data, rnd.next_u32());
-			}
-		}
-
-		// Global load to sequential locations
-		let mut data_g = [0u32; PROGPOW_DAG_LOADS];
-		let index = ((l ^ loop_) % PROGPOW_LANES) * PROGPOW_DAG_LOADS;
-		for i in 0..PROGPOW_DAG_LOADS {
-			data_g[i] = dag_item[index + i];
-		}
-
-		// Consume the global load data at the very end of the loop to allow
-		// full latency hiding. Always merge into `mix[0]` to feed the offset
-		// calculation.
-		mix[l][0] = merge(mix[l][0], data_g[0], rnd.next_u32());
-		for i in 1..PROGPOW_DAG_LOADS {
-			let dst = mix_dst();
-			mix[l][dst] = merge(mix[l][dst], data_g[i], rnd.next_u32());
-		}
-	}
-}
-
-pub fn progpow(
-	header_hash: H256,
-	nonce: u64,
-	block_number: u64,
-	cache: &[Node],
-	c_dag: &CDag,
-) -> (H256, H256) {
-	let mut mix = [[0u32; PROGPOW_REGS]; PROGPOW_LANES];
-	let mut lane_results = [0u32; PROGPOW_LANES];
-	let mut result = [0u32; 8];
-
-	let data_size = get_data_size(block_number) / PROGPOW_MIX_BYTES;
-
-	// NOTE: This assert is required to aid the optimizer elide the non-zero
-	// remainder check in `progpow_loop`.
-	assert!(data_size > 0);
-
-	// Initialize mix for all lanes
-	let seed = keccak_f800_short(header_hash, nonce, result);
-
-	for l in 0..mix.len() {
-		mix[l] = fill_mix(seed, l as u32);
-	}
-
-	// Execute the randomly generated inner loop
-	let period = block_number / PROGPOW_PERIOD_LENGTH as u64;
-	for i in 0..PROGPOW_CNT_DAG {
-		progpow_loop(
-			period,
-			i,
-			&mut mix,
-			cache,
-			c_dag,
-			data_size,
-		);
-	}
-
-	// Reduce mix data to a single per-lane result
-	for l in 0..lane_results.len() {
-		lane_results[l] = FNV_HASH;
-		for i in 0..PROGPOW_REGS {
-			lane_results[l] = fnv1a_hash(lane_results[l], mix[l][i]);
-		}
-	}
-
-	// Reduce all lanes to a single 128-bit result
-	result = [FNV_HASH; 8];
-	for l in 0..PROGPOW_LANES {
-		result[l % 8] = fnv1a_hash(result[l % 8], lane_results[l]);
-	}
-
-	let digest = keccak_f800_long(header_hash, seed, result);
-
-	// NOTE: transmute from `[u32; 8]` to `[u8; 32]`
-	let result = unsafe { ::std::mem::transmute(result) };
-
-	(digest, result)
-}
-
-pub fn generate_cdag(cache: &[Node]) -> CDag {
-	let mut c_dag = [0u32; PROGPOW_CACHE_WORDS];
-
-	for i in 0..PROGPOW_CACHE_WORDS / 16 {
-		let node = calculate_dag_item(i as u32, cache);
-		for j in 0..16 {
-			c_dag[i * 16 + j] = node.as_words()[j];
-		}
-	}
-
-	c_dag
-}
-
-#[cfg(test)]
-mod test {
-	use tempdir::TempDir;
-
-	use cache::{NodeCacheBuilder, OptimizeFor};
-	use keccak::H256;
-	use rustc_hex::FromHex;
-	use serde_json::{self, Value};
-	use std::collections::VecDeque;
-	use super::*;
-
-	fn h256(hex: &str) -> H256 {
-		let bytes = FromHex::from_hex(hex).unwrap();
-		let mut res = [0; 32];
-		res.copy_from_slice(&bytes);
-		res
-	}
-
-	#[test]
-	fn test_cdag() {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let tempdir = TempDir::new("").unwrap();
-		let cache = builder.new_cache(tempdir.into_path(), 0);
-
-		let c_dag = generate_cdag(cache.as_ref());
-
-		let expected = vec![
-			690150178u32, 1181503948, 2248155602, 2118233073, 2193871115,
-			1791778428, 1067701239, 724807309, 530799275, 3480325829, 3899029234,
-			1998124059, 2541974622, 1100859971, 1297211151, 3268320000, 2217813733,
-			2690422980, 3172863319, 2651064309
-		];
-
-		assert_eq!(
-			c_dag.iter().take(20).cloned().collect::<Vec<_>>(),
-			expected,
-		);
-	}
-
-	#[test]
-	fn test_random_merge() {
-		let tests = [
-			(1000000u32, 101u32, 33000101u32),
-			(2000000, 102, 66003366),
-			(3000000, 103, 6000103),
-			(4000000, 104, 2000104),
-			(1000000, 0, 33000000),
-			(2000000, 0, 66000000),
-			(3000000, 0, 6000000),
-			(4000000, 0, 2000000),
-		];
-
-		for (i, &(a, b, expected)) in tests.iter().enumerate() {
-			assert_eq!(
-				merge(a, b, i as u32),
-				expected,
-			);
-		}
-	}
-
-	#[test]
-	fn test_random_math() {
-		let tests = [
-			(20u32, 22u32, 42u32),
-			(70000, 80000, 1305032704),
-			(70000, 80000, 1),
-			(1, 2, 1),
-			(3, 10000, 196608),
-			(3, 0, 3),
-			(3, 6, 2),
-			(3, 6, 7),
-			(3, 6, 5),
-			(0, 0xffffffff, 32),
-			(3 << 13, 1 << 5, 3),
-			(22, 20, 42),
-			(80000, 70000, 1305032704),
-			(80000, 70000, 1),
-			(2, 1, 1),
-			(10000, 3, 80000),
-			(0, 3, 0),
-			(6, 3, 2),
-			(6, 3, 7),
-			(6, 3, 5),
-			(0, 0xffffffff, 32),
-			(3 << 13, 1 << 5, 3),
-		];
-
-		for (i, &(a, b, expected)) in tests.iter().enumerate() {
-			assert_eq!(
-				math(a, b, i as u32),
-				expected,
-			);
-		}
-	}
-
-	#[test]
-	fn test_keccak_256() {
-		let expected = "5dd431e5fbc604f499bfa0232f45f8f142d0ff5178f539e5a7800bf0643697af";
-		assert_eq!(
-			keccak_f800_long([0; 32], 0, [0; 8]),
-			h256(expected),
-		);
-	}
-
-	#[test]
-	fn test_keccak_64() {
-		let expected: u64 = 0x5dd431e5fbc604f4;
-		assert_eq!(
-			keccak_f800_short([0; 32], 0, [0; 8]),
-			expected,
-		);
-	}
-
-	#[test]
-	fn test_progpow_hash() {
-		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-		let tempdir = TempDir::new("").unwrap();
-		let cache = builder.new_cache(tempdir.into_path(), 0);
-		let c_dag = generate_cdag(cache.as_ref());
-
-		let header_hash = [0; 32];
-
-		let (digest, result) = progpow(
-			header_hash,
-			0,
-			0,
-			cache.as_ref(),
-			&c_dag,
-		);
-
-		let expected_digest = FromHex::from_hex("63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b").unwrap();
-		let expected_result = FromHex::from_hex("faeb1be51075b03a4ff44b335067951ead07a3b078539ace76fd56fc410557a3").unwrap();
-
-		assert_eq!(
-			digest.to_vec(),
-			expected_digest,
-		);
-
-		assert_eq!(
-			result.to_vec(),
-			expected_result,
-		);
-	}
-
-	#[test]
-	fn test_progpow_testvectors() {
-		struct ProgpowTest {
-			block_number: u64,
-			header_hash: H256,
-			nonce: u64,
-			mix_hash: H256,
-			final_hash: H256,
-		}
-
-		let tests: Vec<VecDeque<Value>> =
-			serde_json::from_slice(include_bytes!("../res/progpow_testvectors.json")).unwrap();
-
-		let tests: Vec<ProgpowTest> = tests.into_iter().map(|mut test: VecDeque<Value>| {
-			assert!(test.len() == 5);
-
-			let block_number: u64 = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let header_hash: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let nonce: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let mix_hash: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-			let final_hash: String = serde_json::from_value(test.pop_front().unwrap()).unwrap();
-
-			ProgpowTest {
-				block_number,
-				header_hash: h256(&header_hash),
-				nonce: u64::from_str_radix(&nonce, 16).unwrap(),
-				mix_hash: h256(&mix_hash),
-				final_hash: h256(&final_hash),
-			}
-		}).collect();
-
-		for test in tests {
-			let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
-			let tempdir = TempDir::new("").unwrap();
-			let cache = builder.new_cache(tempdir.path().to_owned(), test.block_number);
-			let c_dag = generate_cdag(cache.as_ref());
-
-			let (digest, result) = progpow(
-				test.header_hash,
-				test.nonce,
-				test.block_number,
-				cache.as_ref(),
-				&c_dag,
-			);
-
-			assert_eq!(digest, test.final_hash);
-			assert_eq!(result, test.mix_hash);
-		}
-	}
-}
--- a/ethash/src/seed_compute.rs
+++ b/ethash/src/seed_compute.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use shared;
 use keccak::{keccak_256, H256};
--- a/ethash/src/shared.rs
+++ b/ethash/src/shared.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use primal::is_prime;

--- a/ethcore/Cargo.toml
+++ b/ethcore/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Ethereum (EthCore) Library"
+description = "Ethcore library"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore"
@@ -7,87 +7,77 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-account-db = { path = "account-db" }
-ansi_term = "0.11"
-blooms-db = { path = "../util/blooms-db", optional = true }
+ansi_term = "0.10"
+blooms-db = { path = "../util/blooms-db" }
+bn = { git = "https://github.com/paritytech/bn", default-features = false }
+byteorder = "1.0"
 common-types = { path = "types" }
-crossbeam-utils = "0.6"
-derive_more = "0.14.0"
-env_logger = { version = "0.5", optional = true }
-ethabi = "8.0"
-ethabi-contract = "8.0"
-ethabi-derive = "8.0"
+crossbeam = "0.3"
 ethash = { path = "../ethash" }
-ethcore-blockchain = { path = "./blockchain" }
 ethcore-bloom-journal = { path = "../util/bloom" }
-ethcore-builtin = { path = "./builtin" }
-ethcore-call-contract = { path = "./call-contract" }
-ethcore-db = { path = "./db" }
+parity-bytes = "0.1"
+hashdb = "0.2.1"
+memorydb = "0.2.1"
+patricia-trie = "0.2"
+patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
+parity-crypto = "0.1"
+error-chain = { version = "0.12", default-features = false }
 ethcore-io = { path = "../util/io" }
+ethcore-logger = { path = "../logger" }
 ethcore-miner = { path = "../miner" }
-ethcore-stratum = { path = "../miner/stratum", optional = true }
-ethereum-types = "0.6.0"
+ethcore-stratum = { path = "./stratum", optional = true }
+ethcore-transaction = { path = "./transaction" }
+ethereum-types = "0.4"
+memory-cache = { path = "../util/memory_cache" }
+ethabi = "5.1.2"
+ethabi-derive = "5.1.3"
+ethabi-contract = "5.1.1"
 ethjson = { path = "../json" }
-ethkey = { path = "../accounts/ethkey" }
+ethkey = { path = "../ethkey" }
+ethstore = { path = "../ethstore" }
 evm = { path = "evm" }
-futures = "0.1"
-hash-db = "0.12.4"
-parity-util-mem = "0.1"
+heapsize = "0.4"
 itertools = "0.5"
-journaldb = { path = "../util/journaldb" }
-keccak-hash = "0.2.0"
-keccak-hasher = { path = "../util/keccak-hasher" }
-kvdb = "0.1"
-kvdb-memorydb = "0.1"
-kvdb-rocksdb = { version = "0.1.5", optional = true }
-lazy_static = "1.2.0"
-len-caching-lock = { path = "../util/len-caching-lock" }
+lazy_static = "1.0"
 log = "0.4"
 lru-cache = "0.1"
-macros = { path = "../util/macros" }
-memory-cache = { path = "../util/memory-cache" }
-memory-db = "0.12.4"
+num = { version = "0.1", default-features = false, features = ["bigint"] }
 num_cpus = "1.2"
-parity-bytes = "0.1"
+parity-machine = { path = "../machine" }
+parking_lot = "0.6"
+rayon = "1.0"
+rand = "0.4"
+rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp_compress = { path = "../util/rlp_compress" }
+rlp_derive = { path = "../util/rlp_derive" }
+kvdb = "0.1"
+kvdb-memorydb = "0.1"
 parity-snappy = "0.1"
-parking_lot = "0.9"
-pod-account = { path = "pod-account" }
-trie-db = "0.12.4"
-patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-rand = "0.6"
-rayon = "1.1"
-rlp = "0.4.0"
-rlp_derive = { path = "../util/rlp-derive" }
-rustc-hex = "1"
-scopeguard = "1.0.0"
-serde = "1.0"
-serde_derive = "1.0"
-state-account = { path = "state-account" }
+stop-guard = { path = "../util/stop-guard" }
+macros = { path = "../util/macros" }
+rustc-hex = "1.0"
 stats = { path = "../util/stats" }
-tempdir = { version = "0.3", optional = true }
-time-utils = { path = "../util/time-utils" }
 trace-time = "0.1"
-triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
-unexpected = { path = "../util/unexpected" }
-using_queue = { path = "../miner/using-queue" }
+using_queue = { path = "../util/using_queue" }
 vm = { path = "vm" }
 wasm = { path = "wasm" }
-rand_xorshift = "0.1.1"
+keccak-hash = "0.1"
+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"
+tempdir = {version="0.3", optional = true}
+
+[target.'cfg(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android"))'.dependencies]
+hardware-wallet = { path = "../hw" }
+
+[target.'cfg(not(any(target_os = "linux", target_os = "macos", target_os = "windows", target_os = "android")))'.dependencies]
+fake-hardware-wallet = { path = "../util/fake-hardware-wallet" }

 [dev-dependencies]
-blooms-db = { path = "../util/blooms-db" }
-criterion = "0.3"
-env_logger = "0.5"
-ethcore-accounts = { path = "../accounts" }
-ethjson = { path = "../json", features = ["test-helpers"] }
-ethkey = { path = "../accounts/ethkey" }
-fetch = { path = "../util/fetch" }
-kvdb-rocksdb = "0.1.5"
-parity-runtime = { path = "../util/runtime" }
-rlp_compress = { path = "../util/rlp-compress" }
-serde_json = "1.0"
 tempdir = "0.3"
-trie-standardmap = "0.12.4"
+trie-standardmap = "0.1"

 [features]
 parity = ["work-notify", "price-info", "stratum"]
@@ -111,14 +101,10 @@ evm-debug-tests = ["evm-debug", "evm/evm-debug-tests"]
 # EVM debug traces are printed.
 slow-blocks = []
 # Run JSON consensus tests.
-json-tests = ["env_logger", "test-helpers", "to-pod-full"]
+json-tests = ["ethcore-transaction/json-tests", "test-helpers", "tempdir"]
 # Run memory/cpu heavy tests.
 test-heavy = []
+# Compile benches
+benches = []
 # Compile test helpers
-test-helpers = ["tempdir", "kvdb-rocksdb", "blooms-db"]
-# Enables slow 'to-pod-full' method for use in tests and evmbin.
-to-pod-full = []
-
-[[bench]]
-name = "builtin"
-harness = false
+test-helpers = ["tempdir"]
--- a/ethcore/account-db/Cargo.toml
+++ b/ethcore/account-db/Cargo.toml
@@ -1,14 +0,0 @@
-[package]
-description = "DB backend wrapper for Account trie"
-name = "account-db"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ethereum-types = "0.6"
-hash-db = "0.12.4"
-keccak-hash = "0.2.0"
-keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.1"
-rlp = "0.4"
--- a/ethcore/account-db/src/lib.rs
+++ b/ethcore/account-db/src/lib.rs
@@ -1,262 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! DB backend wrapper for Account trie
-use ethereum_types::H256;
-use keccak_hash::{KECCAK_NULL_RLP, keccak};
-use hash_db::{HashDB, AsHashDB, Prefix};
-use keccak_hasher::KeccakHasher;
-use kvdb::DBValue;
-use rlp::NULL_RLP;
-
-// Combines a key with an address hash to ensure uniqueness.
-// leaves the first 96 bits untouched in order to support partial key lookup.
-#[inline]
-fn combine_key<'a>(address_hash: &'a H256, key: &'a H256) -> H256 {
-	let mut dst = key.clone();
-	{
-		let last_src: &[u8] = address_hash.as_bytes();
-		let last_dst: &mut [u8] = dst.as_bytes_mut();
-		for (k, a) in last_dst[12..].iter_mut().zip(&last_src[12..]) {
-			*k ^= *a
-		}
-	}
-
-	dst
-}
-
-/// A factory for different kinds of account dbs.
-#[derive(Debug, Clone)]
-pub enum Factory {
-	/// Mangle hashes based on address. This is the default.
-	Mangled,
-	/// Don't mangle hashes.
-	Plain,
-}
-
-impl Default for Factory {
-	fn default() -> Self { Factory::Mangled }
-}
-
-impl Factory {
-	/// Create a read-only accountdb.
-	/// This will panic when write operations are called.
-	pub fn readonly<'db>(&self, db: &'db dyn HashDB<KeccakHasher, DBValue>, address_hash: H256) -> Box<dyn HashDB<KeccakHasher, DBValue> + 'db> {
-		match *self {
-			Factory::Mangled => Box::new(AccountDB::from_hash(db, address_hash)),
-			Factory::Plain => Box::new(Wrapping(db)),
-		}
-	}
-
-	/// Create a new mutable hashdb.
-	pub fn create<'db>(&self, db: &'db mut dyn HashDB<KeccakHasher, DBValue>, address_hash: H256) -> Box<dyn HashDB<KeccakHasher, DBValue> + 'db> {
-		match *self {
-			Factory::Mangled => Box::new(AccountDBMut::from_hash(db, address_hash)),
-			Factory::Plain => Box::new(WrappingMut(db)),
-		}
-	}
-}
-
-// TODO: introduce HashDBMut?
-/// DB backend wrapper for Account trie
-/// Transforms trie node keys for the database
-pub struct AccountDB<'db> {
-	db: &'db dyn HashDB<KeccakHasher, DBValue>,
-	address_hash: H256,
-}
-
-impl<'db> AccountDB<'db> {
-	/// Create a new AccountDB from an address' hash.
-	pub fn from_hash(db: &'db dyn HashDB<KeccakHasher, DBValue>, address_hash: H256) -> Self {
-		AccountDB { db, address_hash }
-	}
-}
-
-impl<'db> AsHashDB<KeccakHasher, DBValue> for AccountDB<'db> {
-	fn as_hash_db(&self) -> &dyn HashDB<KeccakHasher, DBValue> { self }
-	fn as_hash_db_mut(&mut self) -> &mut dyn HashDB<KeccakHasher, DBValue> { self }
-}
-
-impl<'db> HashDB<KeccakHasher, DBValue> for AccountDB<'db> {
-	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
-		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
-		}
-		self.db.get(&combine_key(&self.address_hash, key), prefix)
-	}
-
-	fn contains(&self, key: &H256, prefix: Prefix) -> bool {
-		if key == &KECCAK_NULL_RLP {
-			return true;
-		}
-		self.db.contains(&combine_key(&self.address_hash, key), prefix)
-	}
-
-	fn insert(&mut self, _prefix: Prefix, _value: &[u8]) -> H256 {
-		unimplemented!()
-	}
-
-	fn emplace(&mut self, _key: H256, _prefix: Prefix, _value: DBValue) {
-		unimplemented!()
-	}
-
-	fn remove(&mut self, _key: &H256, _prefix: Prefix) {
-		unimplemented!()
-	}
-}
-
-/// DB backend wrapper for Account trie
-pub struct AccountDBMut<'db> {
-	db: &'db mut dyn HashDB<KeccakHasher, DBValue>,
-	address_hash: H256,
-}
-
-impl<'db> AccountDBMut<'db> {
-	/// Create a new `AccountDBMut` from an address' hash.
-	pub fn from_hash(db: &'db mut dyn HashDB<KeccakHasher, DBValue>, address_hash: H256) -> Self {
-		AccountDBMut { db, address_hash }
-	}
-
-	/// Create an `AccountDB` from an `AccountDBMut` (used in tests).
-	pub fn immutable(&'db self) -> AccountDB<'db> {
-		AccountDB { db: self.db, address_hash: self.address_hash.clone() }
-	}
-}
-
-impl<'db> HashDB<KeccakHasher, DBValue> for AccountDBMut<'db>{
-	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
-		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
-		}
-		self.db.get(&combine_key(&self.address_hash, key), prefix)
-	}
-
-	fn contains(&self, key: &H256, prefix: Prefix) -> bool {
-		if key == &KECCAK_NULL_RLP {
-			return true;
-		}
-		self.db.contains(&combine_key(&self.address_hash, key), prefix)
-	}
-
-	fn insert(&mut self, prefix: Prefix, value: &[u8]) -> H256 {
-		if value == &NULL_RLP {
-			return KECCAK_NULL_RLP.clone();
-		}
-		let k = keccak(value);
-		let ak = combine_key(&self.address_hash, &k);
-		self.db.emplace(ak, prefix, DBValue::from_slice(value));
-		k
-	}
-
-	fn emplace(&mut self, key: H256, prefix: Prefix, value: DBValue) {
-		if key == KECCAK_NULL_RLP {
-			return;
-		}
-		let key = combine_key(&self.address_hash, &key);
-		self.db.emplace(key, prefix, value)
-	}
-
-	fn remove(&mut self, key: &H256, prefix: Prefix) {
-		if key == &KECCAK_NULL_RLP {
-			return;
-		}
-		let key = combine_key(&self.address_hash, key);
-		self.db.remove(&key, prefix)
-	}
-}
-
-impl<'db> AsHashDB<KeccakHasher, DBValue> for AccountDBMut<'db> {
-	fn as_hash_db(&self) -> &dyn HashDB<KeccakHasher, DBValue> { self }
-	fn as_hash_db_mut(&mut self) -> &mut dyn HashDB<KeccakHasher, DBValue> { self }
-}
-
-struct Wrapping<'db>(&'db dyn HashDB<KeccakHasher, DBValue>);
-
-impl<'db> AsHashDB<KeccakHasher, DBValue> for Wrapping<'db> {
-	fn as_hash_db(&self) -> &dyn HashDB<KeccakHasher, DBValue> { self }
-	fn as_hash_db_mut(&mut self) -> &mut dyn HashDB<KeccakHasher, DBValue> { self }
-}
-
-impl<'db> HashDB<KeccakHasher, DBValue> for Wrapping<'db> {
-	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
-		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
-		}
-		self.0.get(key, prefix)
-	}
-
-	fn contains(&self, key: &H256, prefix: Prefix) -> bool {
-		if key == &KECCAK_NULL_RLP {
-			return true;
-		}
-		self.0.contains(key, prefix)
-	}
-
-	fn insert(&mut self, _prefix: Prefix, _value: &[u8]) -> H256 {
-		unimplemented!()
-	}
-
-	fn emplace(&mut self, _key: H256, _prefix: Prefix, _value: DBValue) {
-		unimplemented!()
-	}
-
-	fn remove(&mut self, _key: &H256, _prefix: Prefix) {
-		unimplemented!()
-	}
-}
-
-struct WrappingMut<'db>(&'db mut dyn HashDB<KeccakHasher, DBValue>);
-impl<'db> AsHashDB<KeccakHasher, DBValue> for WrappingMut<'db> {
-	fn as_hash_db(&self) -> &dyn HashDB<KeccakHasher, DBValue> { self }
-	fn as_hash_db_mut(&mut self) -> &mut dyn HashDB<KeccakHasher, DBValue> { self }
-}
-
-impl<'db> HashDB<KeccakHasher, DBValue> for WrappingMut<'db>{
-	fn get(&self, key: &H256, prefix: Prefix) -> Option<DBValue> {
-		if key == &KECCAK_NULL_RLP {
-			return Some(DBValue::from_slice(&NULL_RLP));
-		}
-		self.0.get(key, prefix)
-	}
-
-	fn contains(&self, key: &H256, prefix: Prefix) -> bool {
-		if key == &KECCAK_NULL_RLP {
-			return true;
-		}
-		self.0.contains(key, prefix)
-	}
-
-	fn insert(&mut self, prefix: Prefix, value: &[u8]) -> H256 {
-		if value == &NULL_RLP {
-			return KECCAK_NULL_RLP.clone();
-		}
-		self.0.insert(prefix, value)
-	}
-
-	fn emplace(&mut self, key: H256, prefix: Prefix, value: DBValue) {
-		if key == KECCAK_NULL_RLP {
-			return;
-		}
-		self.0.emplace(key, prefix, value)
-	}
-
-	fn remove(&mut self, key: &H256, prefix: Prefix) {
-		if key == &KECCAK_NULL_RLP {
-			return;
-		}
-		self.0.remove(key, prefix)
-	}
-}
--- a/ethcore/benches/builtin.rs
+++ b/ethcore/benches/builtin.rs
@@ -1,41 +1,42 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-#[macro_use]
-extern crate criterion;
+#![feature(test)]
+extern crate test;

 #[macro_use]
 extern crate lazy_static;

 extern crate ethcore;
-extern crate ethcore_builtin as builtin;
 extern crate ethereum_types;
 extern crate parity_bytes as bytes;
 extern crate rustc_hex;

-use criterion::{Criterion, Bencher};
+use std::collections::BTreeMap;
+
 use bytes::BytesRef;
-use builtin::Builtin;
-use ethcore::machine::Machine;
-use ethereum_types::H160;
+use ethcore::builtin::Builtin;
+use ethcore::machine::EthereumMachine;
+use ethereum_types::{Address, U256};
 use ethcore::ethereum::new_byzantium_test_machine;
 use rustc_hex::FromHex;
+use self::test::Bencher;

 lazy_static! {
-	static ref BYZANTIUM_MACHINE: Machine = new_byzantium_test_machine();
+	static ref BYZANTIUM_MACHINE: EthereumMachine = new_byzantium_test_machine();
 }

 struct BuiltinBenchmark<'a> {
@@ -47,9 +48,8 @@ struct BuiltinBenchmark<'a> {
 impl<'a> BuiltinBenchmark<'a> {
 	fn new(builtin_address: &'static str, input: &str, expected: &str) -> BuiltinBenchmark<'a> {
 		let builtins = BYZANTIUM_MACHINE.builtins();
-		use std::str::FromStr;
-		let addr = H160::from_str(builtin_address).unwrap();
-		let builtin = builtins.get(&addr).unwrap().clone();
+
+		let builtin = builtins.get(&builtin_address.into()).unwrap().clone();
 		let input = FromHex::from_hex(input).unwrap();
 		let expected = FromHex::from_hex(expected).unwrap();

@@ -58,6 +58,10 @@ impl<'a> BuiltinBenchmark<'a> {
 		}
 	}

+	fn gas_cost(&self) -> U256 {
+		self.builtin.cost(&self.input)
+	}
+
 	fn run(&self, b: &mut Bencher) {
 		let mut output = vec![0; self.expected.len()];

@@ -70,81 +74,20 @@ impl<'a> BuiltinBenchmark<'a> {
 }

 fn bench(
-	id: &str,
 	builtin_address: &'static str,
 	input: &str,
 	expected: &str,
-	b: &mut Criterion,
+	b: &mut Bencher,
 ) {
 	let bench = BuiltinBenchmark::new(builtin_address, input, expected);
-	b.bench_function(id, move |b| bench.run(b));
+
+	println!("gas cost: {}", bench.gas_cost());
+	bench.run(b);
 }

-criterion_group!(
-	builtin,
-	ecrecover,
-	sha256,
-	ripemd,
-	identity,
-	modexp_eip_example1,
-	modexp_eip_example2,
-	modexp_nagydani_1_square,
-	modexp_nagydani_1_qube,
-	modexp_nagydani_1_pow0x10001,
-	modexp_nagydani_2_square,
-	modexp_nagydani_2_qube,
-	modexp_nagydani_2_pow0x10001,
-	modexp_nagydani_3_square,
-	modexp_nagydani_3_qube,
-	modexp_nagydani_3_pow0x10001,
-	modexp_nagydani_4_square,
-	modexp_nagydani_4_qube,
-	modexp_nagydani_4_pow0x10001,
-	modexp_nagydani_5_square,
-	modexp_nagydani_5_qube,
-	modexp_nagydani_5_pow0x10001,
-	alt_bn128_add_chfast1,
-	alt_bn128_add_chfast2,
-	alt_bn128_add_cdetrio1,
-	alt_bn128_add_cdetrio2,
-	alt_bn128_add_cdetrio3,
-	alt_bn128_add_cdetrio4,
-	alt_bn128_add_cdetrio5,
-	alt_bn128_add_cdetrio6,
-	alt_bn128_add_cdetrio7,
-	alt_bn128_add_cdetrio8,
-	alt_bn128_add_cdetrio9,
-	alt_bn128_add_cdetrio10,
-	alt_bn128_add_cdetrio11,
-	alt_bn128_add_cdetrio12,
-	alt_bn128_add_cdetrio13,
-	alt_bn128_add_cdetrio14,
-	alt_bn128_mul_chfast1,
-	alt_bn128_mul_chfast2,
-	alt_bn128_mul_chfast3,
-	alt_bn128_mul_cdetrio1,
-	alt_bn128_mul_cdetrio6,
-	alt_bn128_mul_cdetrio11,
-	alt_bn128_pairing_jeff1,
-	alt_bn128_pairing_jeff2,
-	alt_bn128_pairing_jeff3,
-	alt_bn128_pairing_jeff4,
-	alt_bn128_pairing_jeff5,
-	alt_bn128_pairing_jeff6,
-	alt_bn128_pairing_empty_data,
-	alt_bn128_pairing_one_point,
-	alt_bn128_pairing_two_point_match_2,
-	alt_bn128_pairing_two_point_match_3,
-	alt_bn128_pairing_two_point_match_4,
-	alt_bn128_pairing_ten_point_match_1,
-	alt_bn128_pairing_ten_point_match_2,
-	alt_bn128_pairing_ten_point_match_3
-);
-criterion_main!(builtin);
-
-fn ecrecover(b: &mut Criterion) {
+#[bench]
+fn ecrecover(b: &mut Bencher) {
 	bench(
-		"ecrecover",
 		"0000000000000000000000000000000000000001", // ecrecover
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"000000000000000000000000ceaccac640adf55b2028469bd36ba501f28b699d",
@@ -152,9 +95,9 @@ fn ecrecover(b: &mut Criterion) {
 	);
 }

-fn sha256(b: &mut Criterion) {
+#[bench]
+fn sha256(b: &mut Bencher) {
 	bench(
-		"sha256",
 		"0000000000000000000000000000000000000002", // sha256
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"811c7003375852fabd0d362e40e68607a12bdabae61a7d068fe5fdd1dbbf2a5d",
@@ -162,9 +105,9 @@ fn sha256(b: &mut Criterion) {
 	);
 }

-fn ripemd(b: &mut Criterion) {
+#[bench]
+fn ripemd(b: &mut Bencher) {
 	bench(
-		"ripemd",
 		"0000000000000000000000000000000000000003", // ripemd
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"0000000000000000000000009215b8d9882ff46f0dfde6684d78e831467f65e6",
@@ -172,9 +115,9 @@ fn ripemd(b: &mut Criterion) {
 	);
 }

-fn identity(b: &mut Criterion) {
+#[bench]
+fn identity(b: &mut Bencher) {
 	bench(
-		"identity",
 		"0000000000000000000000000000000000000004", // identity
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
@@ -182,9 +125,9 @@ fn identity(b: &mut Criterion) {
 	);
 }

-fn modexp_eip_example1(b: &mut Criterion) {
+#[bench]
+fn modexp_eip_example1(b: &mut Bencher) {
 	bench(
-		"modexp_eip_example1",
 		"0000000000000000000000000000000000000005", // modexp
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002003fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -192,9 +135,9 @@ fn modexp_eip_example1(b: &mut Criterion) {
 	);
 }

-fn modexp_eip_example2(b: &mut Criterion) {
+#[bench]
+fn modexp_eip_example2(b: &mut Bencher) {
 	bench(
-		"modexp_eip_example2",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000020fffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2efffffffffffffffffffffffffffffffffffffffffffffffffffffffefffffc2f",
 		"0000000000000000000000000000000000000000000000000000000000000000",
@@ -202,9 +145,9 @@ fn modexp_eip_example2(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_1_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_1_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_1_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb502fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
 		"60008f1614cc01dcfb6bfb09c625cf90b47d4468db81b5f8b7a39d42f332eab9b2da8f2d95311648a8f243f4bb13cfb3d8f7f2a3c014122ebb3ed41b02783adc",
@@ -212,9 +155,9 @@ fn modexp_nagydani_1_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_1_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_1_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_1_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb503fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
 		"4834a46ba565db27903b1c720c9d593e84e4cbd6ad2e64b31885d944f68cd801f92225a8961c952ddf2797fa4701b330c85c4b363798100b921a1a22a46a7fec",
@@ -222,9 +165,9 @@ fn modexp_nagydani_1_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_1_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_1_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_1_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000040e09ad9675465c53a109fac66a445c91b292d2bb2c5268addb30cd82f80fcb0033ff97c80a5fc6f39193ae969c6ede6710a6b7ac27078a06d90ef1c72e5c85fb5010001fc9e1f6beb81516545975218075ec2af118cd8798df6e08a147c60fd6095ac2bb02c2908cf4dd7c81f11c289e4bce98f3553768f392a80ce22bf5c4f4a248c6b",
 		"c36d804180c35d4426b57b50c5bfcca5c01856d104564cd513b461d3c8b8409128a5573e416d0ebe38f5f736766d9dc27143e4da981dfa4d67f7dc474cbee6d2",
@@ -232,9 +175,9 @@ fn modexp_nagydani_1_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_2_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_2_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_2_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5102e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
 		"981dd99c3b113fae3e3eaa9435c0dc96779a23c12a53d1084b4f67b0b053a27560f627b873e3f16ad78f28c94f14b6392def26e4d8896c5e3c984e50fa0b3aa44f1da78b913187c6128baa9340b1e9c9a0fd02cb78885e72576da4a8f7e5a113e173a7a2889fde9d407bd9f06eb05bc8fc7b4229377a32941a02bf4edcc06d70",
@@ -242,9 +185,10 @@ fn modexp_nagydani_2_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_2_qube(b: &mut Criterion) {
+
+#[bench]
+fn modexp_nagydani_2_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_2_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf5103e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
 		"d89ceb68c32da4f6364978d62aaa40d7b09b59ec61eb3c0159c87ec3a91037f7dc6967594e530a69d049b64adfa39c8fa208ea970cfe4b7bcd359d345744405afe1cbf761647e32b3184c7fbe87cee8c6c7ff3b378faba6c68b83b6889cb40f1603ee68c56b4c03d48c595c826c041112dc941878f8c5be828154afd4a16311f",
@@ -252,9 +196,9 @@ fn modexp_nagydani_2_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_2_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_2_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_2_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000080cad7d991a00047dd54d3399b6b0b937c718abddef7917c75b6681f40cc15e2be0003657d8d4c34167b2f0bbbca0ccaa407c2a6a07d50f1517a8f22979ce12a81dcaf707cc0cebfc0ce2ee84ee7f77c38b9281b9822a8d3de62784c089c9b18dcb9a2a5eecbede90ea788a862a9ddd9d609c2c52972d63e289e28f6a590ffbf51010001e6d893b80aeed5e6e9ce9afa8a5d5675c93a32ac05554cb20e9951b2c140e3ef4e433068cf0fb73bc9f33af1853f64aa27a0028cbf570d7ac9048eae5dc7b28c87c31e5810f1e7fa2cda6adf9f1076dbc1ec1238560071e7efc4e9565c49be9e7656951985860a558a754594115830bcdb421f741408346dd5997bb01c287087",
 		"ad85e8ef13fd1dd46eae44af8b91ad1ccae5b7a1c92944f92a19f21b0b658139e0cabe9c1f679507c2de354bf2c91ebd965d1e633978a830d517d2f6f8dd5fd58065d58559de7e2334a878f8ec6992d9b9e77430d4764e863d77c0f87beede8f2f7f2ab2e7222f85cc9d98b8467f4bb72e87ef2882423ebdb6daf02dddac6db2",
@@ -262,9 +206,9 @@ fn modexp_nagydani_2_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_3_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_3_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_3_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb02d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
 		"affc7507ea6d84751ec6b3f0d7b99dbcc263f33330e450d1b3ff0bc3d0874320bf4edd57debd587306988157958cb3cfd369cc0c9c198706f635c9e0f15d047df5cb44d03e2727f26b083c4ad8485080e1293f171c1ed52aef5993a5815c35108e848c951cf1e334490b4a539a139e57b68f44fee583306f5b85ffa57206b3ee5660458858534e5386b9584af3c7f67806e84c189d695e5eb96e1272d06ec2df5dc5fabc6e94b793718c60c36be0a4d031fc84cd658aa72294b2e16fc240aef70cb9e591248e38bd49c5a554d1afa01f38dab72733092f7555334bbef6c8c430119840492380aa95fa025dcf699f0a39669d812b0c6946b6091e6e235337b6f8",
@@ -272,9 +216,9 @@ fn modexp_nagydani_3_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_3_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_3_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_3_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb03d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
 		"1b280ecd6a6bf906b806d527c2a831e23b238f89da48449003a88ac3ac7150d6a5e9e6b3be4054c7da11dd1e470ec29a606f5115801b5bf53bc1900271d7c3ff3cd5ed790d1c219a9800437a689f2388ba1a11d68f6a8e5b74e9a3b1fac6ee85fc6afbac599f93c391f5dc82a759e3c6c0ab45ce3f5d25d9b0c1bf94cf701ea6466fc9a478dacc5754e593172b5111eeba88557048bceae401337cd4c1182ad9f700852bc8c99933a193f0b94cf1aedbefc48be3bc93ef5cb276d7c2d5462ac8bb0c8fe8923a1db2afe1c6b90d59c534994a6a633f0ead1d638fdc293486bb634ff2c8ec9e7297c04241a61c37e3ae95b11d53343d4ba2b4cc33d2cfa7eb705e",
@@ -282,9 +226,9 @@ fn modexp_nagydani_3_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_3_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_3_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_3_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000100c9130579f243e12451760976261416413742bd7c91d39ae087f46794062b8c239f2a74abf3918605a0e046a7890e049475ba7fbb78f5de6490bd22a710cc04d30088179a919d86c2da62cf37f59d8f258d2310d94c24891be2d7eeafaa32a8cb4b0cfe5f475ed778f45907dc8916a73f03635f233f7a77a00a3ec9ca6761a5bbd558a2318ecd0caa1c5016691523e7e1fa267dd35e70c66e84380bdcf7c0582f540174e572c41f81e93da0b757dff0b0fe23eb03aa19af0bdec3afb474216febaacb8d0381e631802683182b0fe72c28392539850650b70509f54980241dc175191a35d967288b532a7a8223ce2440d010615f70df269501944d4ec16fe4a3cb010001d7a85909174757835187cb52e71934e6c07ef43b4c46fc30bbcd0bc72913068267c54a4aabebb493922492820babdeb7dc9b1558fcf7bd82c37c82d3147e455b623ab0efa752fe0b3a67ca6e4d126639e645a0bf417568adbb2a6a4eef62fa1fa29b2a5a43bebea1f82193a7dd98eb483d09bb595af1fa9c97c7f41f5649d976aee3e5e59e2329b43b13bea228d4a93f16ba139ccb511de521ffe747aa2eca664f7c9e33da59075cc335afcd2bf3ae09765f01ab5a7c3e3938ec168b74724b5074247d200d9970382f683d6059b94dbc336603d1dfee714e4b447ac2fa1d99ecb4961da2854e03795ed758220312d101e1e3d87d5313a6d052aebde75110363d",
 		"37843d7c67920b5f177372fa56e2a09117df585f81df8b300fba245b1175f488c99476019857198ed459ed8d9799c377330e49f4180c4bf8e8f66240c64f65ede93d601f957b95b83efdee1e1bfde74169ff77002eaf078c71815a9220c80b2e3b3ff22c2f358111d816ebf83c2999026b6de50bfc711ff68705d2f40b753424aefc9f70f08d908b5a20276ad613b4ab4309a3ea72f0c17ea9df6b3367d44fb3acab11c333909e02e81ea2ed404a712d3ea96bba87461720e2d98723e7acd0520ac1a5212dbedcd8dc0c1abf61d4719e319ff4758a774790b8d463cdfe131d1b2dcfee52d002694e98e720cb6ae7ccea353bc503269ba35f0f63bf8d7b672a76",
@@ -292,9 +236,9 @@ fn modexp_nagydani_3_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_4_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_4_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_4_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8102df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
 		"8a5aea5f50dcc03dc7a7a272b5aeebc040554dbc1ffe36753c4fc75f7ed5f6c2cc0de3a922bf96c78bf0643a73025ad21f45a4a5cadd717612c511ab2bff1190fe5f1ae05ba9f8fe3624de1de2a817da6072ddcdb933b50216811dbe6a9ca79d3a3c6b3a476b079fd0d05f04fb154e2dd3e5cb83b148a006f2bcbf0042efb2ae7b916ea81b27aac25c3bf9a8b6d35440062ad8eae34a83f3ffa2cc7b40346b62174a4422584f72f95316f6b2bee9ff232ba9739301c97c99a9ded26c45d72676eb856ad6ecc81d36a6de36d7f9dafafee11baa43a4b0d5e4ecffa7b9b7dcefd58c397dd373e6db4acd2b2c02717712e6289bed7c813b670c4a0c6735aa7f3b0f1ce556eae9fcc94b501b2c8781ba50a8c6220e8246371c3c7359fe4ef9da786ca7d98256754ca4e496be0a9174bedbecb384bdf470779186d6a833f068d2838a88d90ef3ad48ff963b67c39cc5a3ee123baf7bf3125f64e77af7f30e105d72c4b9b5b237ed251e4c122c6d8c1405e736299c3afd6db16a28c6a9cfa68241e53de4cd388271fe534a6a9b0dbea6171d170db1b89858468885d08fecbd54c8e471c3e25d48e97ba450b96d0d87e00ac732aaa0d3ce4309c1064bd8a4c0808a97e0143e43a24cfa847635125cd41c13e0574487963e9d725c01375db99c31da67b4cf65eff555f0c0ac416c727ff8d438ad7c42030551d68c2e7adda0abb1ca7c10",
@@ -302,9 +246,9 @@ fn modexp_nagydani_4_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_4_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_4_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_4_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b8103df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
 		"5a2664252aba2d6e19d9600da582cdd1f09d7a890ac48e6b8da15ae7c6ff1856fc67a841ac2314d283ffa3ca81a0ecf7c27d89ef91a5a893297928f5da0245c99645676b481b7e20a566ee6a4f2481942bee191deec5544600bb2441fd0fb19e2ee7d801ad8911c6b7750affec367a4b29a22942c0f5f4744a4e77a8b654da2a82571037099e9c6d930794efe5cdca73c7b6c0844e386bdca8ea01b3d7807146bb81365e2cdc6475f8c23e0ff84463126189dc9789f72bbce2e3d2d114d728a272f1345122de23df54c922ec7a16e5c2a8f84da8871482bd258c20a7c09bbcd64c7a96a51029bbfe848736a6ba7bf9d931a9b7de0bcaf3635034d4958b20ae9ab3a95a147b0421dd5f7ebff46c971010ebfc4adbbe0ad94d5498c853e7142c450d8c71de4b2f84edbf8acd2e16d00c8115b150b1c30e553dbb82635e781379fe2a56360420ff7e9f70cc64c00aba7e26ed13c7c19622865ae07248daced36416080f35f8cc157a857ed70ea4f347f17d1bee80fa038abd6e39b1ba06b97264388b21364f7c56e192d4b62d9b161405f32ab1e2594e86243e56fcf2cb30d21adef15b9940f91af681da24328c883d892670c6aa47940867a81830a82b82716895db810df1b834640abefb7db2092dd92912cb9a735175bc447be40a503cf22dfe565b4ed7a3293ca0dfd63a507430b323ee248ec82e843b673c97ad730728cebc",
@@ -312,9 +256,9 @@ fn modexp_nagydani_4_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_4_pow0x10001(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_4_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_4_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000200db34d0e438249c0ed685c949cc28776a05094e1c48691dc3f2dca5fc3356d2a0663bd376e4712839917eb9a19c670407e2c377a2de385a3ff3b52104f7f1f4e0c7bf7717fb913896693dc5edbb65b760ef1b00e42e9d8f9af17352385e1cd742c9b006c0f669995cb0bb21d28c0aced2892267637b6470d8cee0ab27fc5d42658f6e88240c31d6774aa60a7ebd25cd48b56d0da11209f1928e61005c6eb709f3e8e0aaf8d9b10f7d7e296d772264dc76897ccdddadc91efa91c1903b7232a9e4c3b941917b99a3bc0c26497dedc897c25750af60237aa67934a26a2bc491db3dcc677491944bc1f51d3e5d76b8d846a62db03dedd61ff508f91a56d71028125035c3a44cbb041497c83bf3e4ae2a9613a401cc721c547a2afa3b16a2969933d3626ed6d8a7428648f74122fd3f2a02a20758f7f693892c8fd798b39abac01d18506c45e71432639e9f9505719ee822f62ccbf47f6850f096ff77b5afaf4be7d772025791717dbe5abf9b3f40cff7d7aab6f67e38f62faf510747276e20a42127e7500c444f9ed92baf65ade9e836845e39c4316d9dce5f8e2c8083e2c0acbb95296e05e51aab13b6b8f53f06c9c4276e12b0671133218cc3ea907da3bd9a367096d9202128d14846cc2e20d56fc8473ecb07cecbfb8086919f3971926e7045b853d85a69d026195c70f9f7a823536e2a8f4b3e12e94d9b53a934353451094b81010001df3143a0057457d75e8c708b6337a6f5a4fd1a06727acf9fb93e2993c62f3378b37d56c85e7b1e00f0145ebf8e4095bd723166293c60b6ac1252291ef65823c9e040ddad14969b3b340a4ef714db093a587c37766d68b8d6b5016e741587e7e6bf7e763b44f0247e64bae30f994d248bfd20541a333e5b225ef6a61199e301738b1e688f70ec1d7fb892c183c95dc543c3e12adf8a5e8b9ca9d04f9445cced3ab256f29e998e69efaa633a7b60e1db5a867924ccab0a171d9d6e1098dfa15acde9553de599eaa56490c8f411e4985111f3d40bddfc5e301edb01547b01a886550a61158f7e2033c59707789bf7c854181d0c2e2a42a93cf09209747d7082e147eb8544de25c3eb14f2e35559ea0c0f5877f2f3fc92132c0ae9da4e45b2f6c866a224ea6d1f28c05320e287750fbc647368d41116e528014cc1852e5531d53e4af938374daba6cee4baa821ed07117253bb3601ddd00d59a3d7fb2ef1f5a2fbba7c429f0cf9a5b3462410fd833a69118f8be9c559b1000cc608fd877fb43f8e65c2d1302622b944462579056874b387208d90623fcdaf93920ca7a9e4ba64ea208758222ad868501cc2c345e2d3a5ea2a17e5069248138c8a79c0251185d29ee73e5afab5354769142d2bf0cb6712727aa6bf84a6245fcdae66e4938d84d1b9dd09a884818622080ff5f98942fb20acd7e0c916c2d5ea7ce6f7e173315384518f",
 		"bed8b970c4a34849fc6926b08e40e20b21c15ed68d18f228904878d4370b56322d0da5789da0318768a374758e6375bfe4641fca5285ec7171828922160f48f5ca7efbfee4d5148612c38ad683ae4e3c3a053d2b7c098cf2b34f2cb19146eadd53c86b2d7ccf3d83b2c370bfb840913ee3879b1057a6b4e07e110b6bcd5e958bc71a14798c91d518cc70abee264b0d25a4110962a764b364ac0b0dd1ee8abc8426d775ec0f22b7e47b32576afaf1b5a48f64573ed1c5c29f50ab412188d9685307323d990802b81dacc06c6e05a1e901830ba9fcc67688dc29c5e27bde0a6e845ca925f5454b6fb3747edfaa2a5820838fb759eadf57f7cb5cec57fc213ddd8a4298fa079c3c0f472b07fb15aa6a7f0a3780bd296ff6a62e58ef443870b02260bd4fd2bbc98255674b8e1f1f9f8d33c7170b0ebbea4523b695911abbf26e41885344823bd0587115fdd83b721a4e8457a31c9a84b3d3520a07e0e35df7f48e5a9d534d0ec7feef1ff74de6a11e7f93eab95175b6ce22c68d78a642ad642837897ec11349205d8593ac19300207572c38d29ca5dfa03bc14cdbc32153c80e5cc3e739403d34c75915e49beb43094cc6dcafb3665b305ddec9286934ae66ec6b777ca528728c851318eb0f207b39f1caaf96db6eeead6b55ed08f451939314577d42bcc9f97c0b52d0234f88fd07e4c1d7780fdebc025cfffcb572cb27a8c33963",
@@ -322,9 +266,9 @@ fn modexp_nagydani_4_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_5_square(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_5_square(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_5_square",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf02e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
 		"d61fe4e3f32ac260915b5b03b78a86d11bfc41d973fce5b0cc59035cf8289a8a2e3878ea15fa46565b0d806e2f85b53873ea20ed653869b688adf83f3ef444535bf91598ff7e80f334fb782539b92f39f55310cc4b35349ab7b278346eda9bc37c0d8acd3557fae38197f412f8d9e57ce6a76b7205c23564cab06e5615be7c6f05c3d05ec690cba91da5e89d55b152ff8dd2157dc5458190025cf94b1ad98f7cbe64e9482faba95e6b33844afc640892872b44a9932096508f4a782a4805323808f23e54b6ff9b841dbfa87db3505ae4f687972c18ea0f0d0af89d36c1c2a5b14560c153c3fee406f5cf15cfd1c0bb45d767426d465f2f14c158495069d0c5955a00150707862ecaae30624ebacdd8ac33e4e6aab3ff90b6ba445a84689386b9e945d01823a65874444316e83767290fcff630d2477f49d5d8ffdd200e08ee1274270f86ed14c687895f6caf5ce528bd970c20d2408a9ba66216324c6a011ac4999098362dbd98a038129a2d40c8da6ab88318aa3046cb660327cc44236d9e5d2163bd0959062195c51ed93d0088b6f92051fc99050ece2538749165976233697ab4b610385366e5ce0b02ad6b61c168ecfbedcdf74278a38de340fd7a5fead8e588e294795f9b011e2e60377a89e25c90e145397cdeabc60fd32444a6b7642a611a83c464d8b8976666351b4865c37b02e6dc21dbcdf5f930341707b618cc0f03c3122646b3385c9df9f2ec730eec9d49e7dfc9153b6e6289da8c4f0ebea9ccc1b751948e3bb7171c9e4d57423b0eeeb79095c030cb52677b3f7e0b45c30f645391f3f9c957afa549c4e0b2465b03c67993cd200b1af01035962edbc4c9e89b31c82ac121987d6529dafdeef67a132dc04b6dc68e77f22862040b75e2ceb9ff16da0fca534e6db7bd12fa7b7f51b6c08c1e23dfcdb7acbd2da0b51c87ffbced065a612e9b1c8bba9b7e2d8d7a2f04fcc4aaf355b60d764879a76b5e16762d5f2f55d585d0c8e82df6940960cddfb72c91dfa71f6b4e1c6ca25dfc39a878e998a663c04fe29d5e83b9586d047b4d7ff70a9f0d44f127e7d741685ca75f11629128d916a0ffef4be586a30c4b70389cc746e84ebf177c01ee8a4511cfbb9d1ecf7f7b33c7dd8177896e10bbc82f838dcd6db7ac67de62bf46b6a640fb580c5d1d2708f3862e3d2b645d0d18e49ef088053e3a220adc0e033c2afcfe61c90e32151152eb3caaf746c5e377d541cafc6cbb0cc0fa48b5caf1728f2e1957f5addfc234f1a9d89e40d49356c9172d0561a695fce6dab1d412321bbf407f63766ffd7b6b3d79bcfa07991c5a9709849c1008689e3b47c50d613980bec239fb64185249d055b30375ccb4354d71fe4d05648fbf6c80634dfc3575f2f24abb714c1e4c95e8896763bf4316e954c7ad19e5780ab7a040ca6fb9271f90a8b22ae738daf6cb",
@@ -332,9 +276,9 @@ fn modexp_nagydani_5_square(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_5_qube(b: &mut Criterion) {
+#[bench]
+fn modexp_nagydani_5_qube(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_5_qube",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf03e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
 		"5f9c70ec884926a89461056ad20ac4c30155e817f807e4d3f5bb743d789c83386762435c3627773fa77da5144451f2a8aad8adba88e0b669f5377c5e9bad70e45c86fe952b613f015a9953b8a5de5eaee4566acf98d41e327d93a35bd5cef4607d025e58951167957df4ff9b1627649d3943805472e5e293d3efb687cfd1e503faafeb2840a3e3b3f85d016051a58e1c9498aab72e63b748d834b31eb05d85dcde65e27834e266b85c75cc4ec0135135e0601cb93eeeb6e0010c8ceb65c4c319623c5e573a2c8c9fbbf7df68a930beb412d3f4dfd146175484f45d7afaa0d2e60684af9b34730f7c8438465ad3e1d0c3237336722f2aa51095bd5759f4b8ab4dda111b684aa3dac62a761722e7ae43495b7709933512c81c4e3c9133a51f7ce9f2b51fcec064f65779666960b4e45df3900f54311f5613e8012dd1b8efd359eda31a778264c72aa8bb419d862734d769076bce2810011989a45374e5c5d8729fec21427f0bf397eacbb4220f603cf463a4b0c94efd858ffd9768cd60d6ce68d755e0fbad007ce5c2223d70c7018345a102e4ab3c60a13a9e7794303156d4c2063e919f2153c13961fb324c80b240742f47773a7a8e25b3e3fb19b00ce839346c6eb3c732fbc6b888df0b1fe0a3d07b053a2e9402c267b2d62f794d8a2840526e3ade15ce2264496ccd7519571dfde47f7a4bb16292241c20b2be59f3f8fb4f6383f232d838c5a22d8c95b6834d9d2ca493f5a505ebe8899503b0e8f9b19e6e2dd81c1628b80016d02097e0134de51054c4e7674824d4d758760fc52377d2cad145e259aa2ffaf54139e1a66b1e0c1c191e32ac59474c6b526f5b3ba07d3e5ec286eddf531fcd5292869be58c9f22ef91026159f7cf9d05ef66b4299f4da48cc1635bf2243051d342d378a22c83390553e873713c0454ce5f3234397111ac3fe3207b86f0ed9fc025c81903e1748103692074f83824fda6341be4f95ff00b0a9a208c267e12fa01825054cc0513629bf3dbb56dc5b90d4316f87654a8be18227978ea0a8a522760cad620d0d14fd38920fb7321314062914275a5f99f677145a6979b156bd82ecd36f23f8e1273cc2759ecc0b2c69d94dad5211d1bed939dd87ed9e07b91d49713a6e16ade0a98aea789f04994e318e4ff2c8a188cd8d43aeb52c6daa3bc29b4af50ea82a247c5cd67b573b34cbadcc0a376d3bbd530d50367b42705d870f2e27a8197ef46070528bfe408360faa2ebb8bf76e9f388572842bcb119f4d84ee34ae31f5cc594f23705a49197b181fb78ed1ec99499c690f843a4d0cf2e226d118e9372271054fbabdcc5c92ae9fefaef0589cd0e722eaf30c1703ec4289c7fd81beaa8a455ccee5298e31e2080c10c366a6fcf56f7d13582ad0bcad037c612b710fc595b70fbefaaca23623b60c6c39b11beb8e5843b6b3dac60f",
@@ -342,9 +286,10 @@ fn modexp_nagydani_5_qube(b: &mut Criterion) {
 	);
 }

-fn modexp_nagydani_5_pow0x10001(b: &mut Criterion) {
+
+#[bench]
+fn modexp_nagydani_5_pow0x10001(b: &mut Bencher) {
 	bench(
-		"modexp_nagydani_5_pow0x10001",
 		"0000000000000000000000000000000000000005", // modexp
 		"000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000400c5a1611f8be90071a43db23cc2fe01871cc4c0e8ab5743f6378e4fef77f7f6db0095c0727e20225beb665645403453e325ad5f9aeb9ba99bf3c148f63f9c07cf4fe8847ad5242d6b7d4499f93bd47056ddab8f7dee878fc2314f344dbee2a7c41a5d3db91eff372c730c2fdd3a141a4b61999e36d549b9870cf2f4e632c4d5df5f024f81c028000073a0ed8847cfb0593d36a47142f578f05ccbe28c0c06aeb1b1da027794c48db880278f79ba78ae64eedfea3c07d10e0562668d839749dc95f40467d15cf65b9cfc52c7c4bcef1cda3596dd52631aac942f146c7cebd46065131699ce8385b0db1874336747ee020a5698a3d1a1082665721e769567f579830f9d259cec1a836845109c21cf6b25da572512bf3c42fd4b96e43895589042ab60dd41f497db96aec102087fe784165bb45f942859268fd2ff6c012d9d00c02ba83eace047cc5f7b2c392c2955c58a49f0338d6fc58749c9db2155522ac17914ec216ad87f12e0ee95574613942fa615898c4d9e8a3be68cd6afa4e7a003dedbdf8edfee31162b174f965b20ae752ad89c967b3068b6f722c16b354456ba8e280f987c08e0a52d40a2e8f3a59b94d590aeef01879eb7a90b3ee7d772c839c85519cbeaddc0c193ec4874a463b53fcaea3271d80ebfb39b33489365fc039ae549a17a9ff898eea2f4cb27b8dbee4c17b998438575b2b8d107e4a0d66ba7fca85b41a58a8d51f191a35c856dfbe8aef2b00048a694bbccff832d23c8ca7a7ff0b6c0b3011d00b97c86c0628444d267c951d9e4fb8f83e154b8f74fb51aa16535e498235c5597dac9606ed0be3173a3836baa4e7d756ffe1e2879b415d3846bccd538c05b847785699aefde3e305decb600cd8fb0e7d8de5efc26971a6ad4e6d7a2d91474f1023a0ac4b78dc937da0ce607a45974d2cac1c33a2631ff7fe6144a3b2e5cf98b531a9627dea92c1dc82204d09db0439b6a11dd64b484e1263aa45fd9539b6020b55e3baece3986a8bffc1003406348f5c61265099ed43a766ee4f93f5f9c5abbc32a0fd3ac2b35b87f9ec26037d88275bd7dd0a54474995ee34ed3727f3f97c48db544b1980193a4b76a8a3ddab3591ce527f16d91882e67f0103b5cda53f7da54d489fc4ac08b6ab358a5a04aa9daa16219d50bd672a7cb804ed769d218807544e5993f1c27427104b349906a0b654df0bf69328afd3013fbe430155339c39f236df5557bf92f1ded7ff609a8502f49064ec3d1dbfb6c15d3a4c11a4f8acd12278cbf68acd5709463d12e3338a6eddb8c112f199645e23154a8e60879d2a654e3ed9296aa28f134168619691cd2c6b9e2eba4438381676173fc63c2588a3c5910dc149cf3760f0aa9fa9c3f5faa9162b0bf1aac9dd32b706a60ef53cbdb394b6b40222b5bc80eea82ba8958386672564cae3794f977871ab62337cf010001e30049201ec12937e7ce79d0f55d9c810e20acf52212aca1d3888949e0e4830aad88d804161230eb89d4d329cc83570fe257217d2119134048dd2ed167646975fc7d77136919a049ea74cf08ddd2b896890bb24a0ba18094a22baa351bf29ad96c66bbb1a598f2ca391749620e62d61c3561a7d3653ccc8892c7b99baaf76bf836e2991cb06d6bc0514568ff0d1ec8bb4b3d6984f5eaefb17d3ea2893722375d3ddb8e389a8eef7d7d198f8e687d6a513983df906099f9a2d23f4f9dec6f8ef2f11fc0a21fac45353b94e00486f5e17d386af42502d09db33cf0cf28310e049c07e88682aeeb00cb833c5174266e62407a57583f1f88b304b7c6e0c84bbe1c0fd423072d37a5bd0aacf764229e5c7cd02473460ba3645cd8e8ae144065bf02d0dd238593d8e230354f67e0b2f23012c23274f80e3ee31e35e2606a4a3f31d94ab755e6d163cff52cbb36b6d0cc67ffc512aeed1dce4d7a0d70ce82f2baba12e8d514dc92a056f994adfb17b5b9712bd5186f27a2fda1f7039c5df2c8587fdc62f5627580c13234b55be4df3056050e2d1ef3218f0dd66cb05265fe1acfb0989d8213f2c19d1735a7cf3fa65d88dad5af52dc2bba22b7abf46c3bc77b5091baab9e8f0ddc4d5e581037de91a9f8dcbc69309be29cc815cf19a20a7585b8b3073edf51fc9baeb3e509b97fa4ecfd621e0fd57bd61cac1b895c03248ff12bdbc57509250df3517e8a3fe1d776836b34ab352b973d932ef708b14f7418f9eceb1d87667e61e3e758649cb083f01b133d37ab2f5afa96d6c84bcacf4efc3851ad308c1e7d9113624fce29fab460ab9d2a48d92cdb281103a5250ad44cb2ff6e67ac670c02fdafb3e0f1353953d6d7d5646ca1568dea55275a050ec501b7c6250444f7219f1ba7521ba3b93d089727ca5f3bbe0d6c1300b423377004954c5628fdb65770b18ced5c9b23a4a5a6d6ef25fe01b4ce278de0bcc4ed86e28a0a68818ffa40970128cf2c38740e80037984428c1bd5113f40ff47512ee6f4e4d8f9b8e8e1b3040d2928d003bd1c1329dc885302fbce9fa81c23b4dc49c7c82d29b52957847898676c89aa5d32b5b0e1c0d5a2b79a19d67562f407f19425687971a957375879d90c5f57c857136c17106c9ab1b99d80e69c8c954ed386493368884b55c939b8d64d26f643e800c56f90c01079d7c534e3b2b7ae352cefd3016da55f6a85eb803b85e2304915fd2001f77c74e28746293c46e4f5f0fd49cf988aafd0026b8e7a3bab2da5cdce1ea26c2e29ec03f4807fac432662b2d6c060be1c7be0e5489de69d0a6e03a4b9117f9244b34a0f1ecba89884f781c6320412413a00c4980287409a2a78c2cd7e65cecebbe4ec1c28cac4dd95f6998e78fc6f1392384331c9436aa10e10e2bf8ad2c4eafbcf276aa7bae64b74428911b3269c749338b0fc5075ad",
 		"5a0eb2bdf0ac1cae8e586689fa16cd4b07dfdedaec8a110ea1fdb059dd5253231b6132987598dfc6e11f86780428982d50cf68f67ae452622c3b336b537ef3298ca645e8f89ee39a26758206a5a3f6409afc709582f95274b57b71fae5c6b74619ae6f089a5393c5b79235d9caf699d23d88fb873f78379690ad8405e34c19f5257d596580c7a6a7206a3712825afe630c76b31cdb4a23e7f0632e10f14f4e282c81a66451a26f8df2a352b5b9f607a7198449d1b926e27036810368e691a74b91c61afa73d9d3b99453e7c8b50fd4f09c039a2f2feb5c419206694c31b92df1d9586140cb3417b38d0c503c7b508cc2ed12e813a1c795e9829eb39ee78eeaf360a169b491a1d4e419574e712402de9d48d54c1ae5e03739b7156615e8267e1fb0a897f067afd11fb33f6e24182d7aaaaa18fe5bc1982f20d6b871e5a398f0f6f718181d31ec225cfa9a0a70124ed9a70031bdf0c1c7829f708b6e17d50419ef361cf77d99c85f44607186c8d683106b8bd38a49b5d0fb503b397a83388c5678dcfcc737499d84512690701ed621a6f0172aecf037184ddf0f2453e4053024018e5ab2e30d6d5363b56e8b41509317c99042f517247474ab3abc848e00a07f69c254f46f2a05cf6ed84e5cc906a518fdcfdf2c61ce731f24c5264f1a25fc04934dc28aec112134dd523f70115074ca34e3807aa4cb925147f3a0ce152d323bd8c675ace446d0fd1ae30c4b57f0eb2c23884bc18f0964c0114796c5b6d080c3d89175665fbf63a6381a6a9da39ad070b645c8bb1779506da14439a9f5b5d481954764ea114fac688930bc68534d403cff4210673b6a6ff7ae416b7cd41404c3d3f282fcd193b86d0f54d0006c2a503b40d5c3930da980565b8f9630e9493a79d1c03e74e5f93ac8e4dc1a901ec5e3b3e57049124c7b72ea345aa359e782285d9e6a5c144a378111dd02c40855ff9c2be9b48425cb0b2fd62dc8678fd151121cf26a65e917d65d8e0dacfae108eb5508b601fb8ffa370be1f9a8b749a2d12eeab81f41079de87e2d777994fa4d28188c579ad327f9957fb7bdecec5c680844dd43cb57cf87aeb763c003e65011f73f8c63442df39a92b946a6bd968a1c1e4d5fa7d88476a68bd8e20e5b70a99259c7d3f85fb1b65cd2e93972e6264e74ebf289b8b6979b9b68a85cd5b360c1987f87235c3c845d62489e33acf85d53fa3561fe3a3aee18924588d9c6eba4edb7a4d106b31173e42929f6f0c48c80ce6a72d54eca7c0fe870068b7a7c89c63cdda593f5b32d3cb4ea8a32c39f00ab449155757172d66763ed9527019d6de6c9f2416aa6203f4d11c9ebee1e1d3845099e55504446448027212616167eb36035726daa7698b075286f5379cd3e93cb3e0cf4f9cb8d017facbb5550ed32d5ec5400ae57e47e2bf78d1eaeff9480cc765ceff39db500",
@@ -352,9 +297,9 @@ fn modexp_nagydani_5_pow0x10001(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_chfast1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_chfast1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_chfast1",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"18b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f3726607c2b7f58a84bd6145f00c9c2bc0bb1a187f20ff2c92963a88019e7c6a014eed06614e20c147e940f2d70da3f74c9a17df361706a4485c742bd6788478fa17d7",
 		"2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c915",
@@ -362,9 +307,9 @@ fn alt_bn128_add_chfast1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_chfast2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_chfast2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_chfast2",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"2243525c5efd4b9c3d3c45ac0ca3fe4dd85e830a4ce6b65fa1eeaee202839703301d1d33be6da8e509df21cc35964723180eed7532537db9ae5e7d48f195c91518b18acfb4c2c30276db5411368e7185b311dd124691610c5d3b74034e093dc9063c909c4720840cb5134cb9f59fa749755796819658d32efc0d288198f37266",
 		"2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb204",
@@ -372,9 +317,9 @@ fn alt_bn128_add_chfast2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio1",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -382,9 +327,9 @@ fn alt_bn128_add_cdetrio1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio2",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -392,9 +337,9 @@ fn alt_bn128_add_cdetrio2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio3",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -402,9 +347,9 @@ fn alt_bn128_add_cdetrio3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio4(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio4(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio4",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -412,9 +357,9 @@ fn alt_bn128_add_cdetrio4(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio5(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio5(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio5",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -422,9 +367,9 @@ fn alt_bn128_add_cdetrio5(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio6(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio6(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio6",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -432,9 +377,9 @@ fn alt_bn128_add_cdetrio6(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio7(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio7(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio7",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -442,9 +387,9 @@ fn alt_bn128_add_cdetrio7(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio8(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio8(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio8",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -452,9 +397,9 @@ fn alt_bn128_add_cdetrio8(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio9(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio9(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio9",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -462,9 +407,9 @@ fn alt_bn128_add_cdetrio9(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio10(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio10(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio10",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
@@ -472,9 +417,9 @@ fn alt_bn128_add_cdetrio10(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio11(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio11(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio11",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002",
 		"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
@@ -482,9 +427,9 @@ fn alt_bn128_add_cdetrio11(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio12(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio12(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio12",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd315ed738c0e0a7c92e7845f96b2ae9c0a68a6a449e3538fc7ff3ebf7a5a18a2c4",
@@ -492,9 +437,9 @@ fn alt_bn128_add_cdetrio12(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio13(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio13(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio13",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c039730ea8dff1254c0fee9c0ea777d29a9c710b7e616683f194f18c43b43b869073a5ffcc6fc7a28c30723d6e58ce577356982d65b833a5a5c15bf9024b43d98",
 		"15bf2bb17880144b5d1cd2b1f46eff9d617bffd1ca57c37fb5a49bd84e53cf66049c797f9ce0d17083deb32b5e36f2ea2a212ee036598dd7624c168993d1355f",
@@ -502,9 +447,9 @@ fn alt_bn128_add_cdetrio13(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_add_cdetrio14(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_add_cdetrio14(b: &mut Bencher) {
 	bench(
-		"alt_bn128_add_cdetrio14",
 		"0000000000000000000000000000000000000006", // alt_bn128_add
 		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7c17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa92e83f8d734803fc370eba25ed1f6b8768bd6d83887b87165fc2434fe11a830cb00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
 		"00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
@@ -512,9 +457,9 @@ fn alt_bn128_add_cdetrio14(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_chfast1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_chfast1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_chfast1",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"2bd3e6d0f3b142924f5ca7b49ce5b9d54c4703d7ae5648e61d02268b1a0a9fb721611ce0a6af85915e2f1d70300909ce2e49dfad4a4619c8390cae66cefdb20400000000000000000000000000000000000000000000000011138ce750fa15c2",
 		"070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc",
@@ -522,9 +467,9 @@ fn alt_bn128_mul_chfast1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_chfast2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_chfast2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_chfast2",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"070a8d6a982153cae4be29d434e8faef8a47b274a053f5a4ee2a6c9c13c31e5c031b8ce914eba3a9ffb989f9cdd5b0f01943074bf4f0f315690ec3cec6981afc30644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd46",
 		"025a6f4181d2b4ea8b724290ffb40156eb0adb514c688556eb79cdea0752c2bb2eff3f31dea215f1eb86023a133a996eb6300b44da664d64251d05381bb8a02e",
@@ -532,9 +477,9 @@ fn alt_bn128_mul_chfast2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_chfast3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_chfast3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_chfast3",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"025a6f4181d2b4ea8b724290ffb40156eb0adb514c688556eb79cdea0752c2bb2eff3f31dea215f1eb86023a133a996eb6300b44da664d64251d05381bb8a02e183227397098d014dc2822db40c0ac2ecbc0b548b438e5469e10460b6c3e7ea3",
 		"14789d0d4a730b354403b5fac948113739e276c23e0258d8596ee72f9cd9d3230af18a63153e0ec25ff9f2951dd3fa90ed0197bfef6e2a1a62b5095b9d2b4a27",
@@ -542,9 +487,9 @@ fn alt_bn128_mul_chfast3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_cdetrio1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_cdetrio1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_cdetrio1",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"1a87b0584ce92f4593d161480614f2989035225609f08058ccfa3d0f940febe31a2f3c951f6dadcc7ee9007dff81504b0fcd6d7cf59996efdc33d92bf7f9f8f6ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
 		"2cde5879ba6f13c0b5aa4ef627f159a3347df9722efce88a9afbb20b763b4c411aa7e43076f6aee272755a7f9b84832e71559ba0d2e0b17d5f9f01755e5b0d11",
@@ -552,9 +497,9 @@ fn alt_bn128_mul_cdetrio1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_cdetrio6(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_cdetrio6(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_cdetrio6",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"17c139df0efee0f766bc0204762b774362e4ded88953a39ce849a8a7fa163fa901e0559bacb160664764a357af8a9fe70baa9258e0b959273ffc5718c6d4cc7cffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
 		"29e587aadd7c06722aabba753017c093f70ba7eb1f1c0104ec0564e7e3e21f6022b1143f6a41008e7755c71c3d00b6b915d386de21783ef590486d8afa8453b1",
@@ -562,9 +507,9 @@ fn alt_bn128_mul_cdetrio6(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_mul_cdetrio11(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_mul_cdetrio11(b: &mut Bencher) {
 	bench(
-		"alt_bn128_mul_cdetrio11",
 		"0000000000000000000000000000000000000007", // alt_bn128_mul
 		"039730ea8dff1254c0fee9c0ea777d29a9c710b7e616683f194f18c43b43b869073a5ffcc6fc7a28c30723d6e58ce577356982d65b833a5a5c15bf9024b43d98ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
 		"00a1a234d08efaa2616607e31eca1980128b00b415c845ff25bba3afcb81dc00242077290ed33906aeb8e42fd98c41bcb9057ba03421af3f2d08cfc441186024",
@@ -572,9 +517,9 @@ fn alt_bn128_mul_cdetrio11(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff1",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c2032c61a830e3c17286de9462bf242fca2883585b93870a73853face6a6bf411198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -582,9 +527,9 @@ fn alt_bn128_pairing_jeff1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff2",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"2eca0c7238bf16e83e7a1e6c5d49540685ff51380f309842a98561558019fc0203d3260361bb8451de5ff5ecd17f010ff22f5c31cdf184e9020b06fa5997db841213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f06967a1237ebfeca9aaae0d6d0bab8e28c198c5a339ef8a2407e31cdac516db922160fa257a5fd5b280642ff47b65eca77e626cb685c84fa6d3b6882a283ddd1198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -592,9 +537,9 @@ fn alt_bn128_pairing_jeff2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff3",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"0f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd216da2f5cb6be7a0aa72c440c53c9bbdfec6c36c7d515536431b3a865468acbba2e89718ad33c8bed92e210e81d1853435399a271913a6520736a4729cf0d51eb01a9e2ffa2e92599b68e44de5bcf354fa2642bd4f26b259daa6f7ce3ed57aeb314a9a87b789a58af499b314e13c3d65bede56c07ea2d418d6874857b70763713178fb49a2d6cd347dc58973ff49613a20757d0fcc22079f9abd10c3baee245901b9e027bd5cfc2cb5db82d4dc9677ac795ec500ecd47deee3b5da006d6d049b811d7511c78158de484232fc68daf8a45cf217d1c2fae693ff5871e8752d73b21198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -602,9 +547,9 @@ fn alt_bn128_pairing_jeff3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff4(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff4(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff4",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"2f2ea0b3da1e8ef11914acf8b2e1b32d99df51f5f4f206fc6b947eae860eddb6068134ddb33dc888ef446b648d72338684d678d2eb2371c61a50734d78da4b7225f83c8b6ab9de74e7da488ef02645c5a16a6652c3c71a15dc37fe3a5dcb7cb122acdedd6308e3bb230d226d16a105295f523a8a02bfc5e8bd2da135ac4c245d065bbad92e7c4e31bf3757f1fe7362a63fbfee50e7dc68da116e67d600d9bf6806d302580dc0661002994e7cd3a7f224e7ddc27802777486bf80f40e4ca3cfdb186bac5188a98c45e6016873d107f5cd131f3a3e339d0375e58bd6219347b008122ae2b09e539e152ec5364e7e2204b03d11d3caa038bfc7cd499f8176aacbee1f39e4e4afc4bc74790a4a028aff2c3d2538731fb755edefd8cb48d6ea589b5e283f150794b6736f670d6a1033f9b46c6f5204f50813eb85c8dc4b59db1c5d39140d97ee4d2b36d99bc49974d18ecca3e7ad51011956051b464d9e27d46cc25e0764bb98575bd466d32db7b15f582b2d5c452b36aa394b789366e5e3ca5aabd415794ab061441e51d01e94640b7e3084a07e02c78cf3103c542bc5b298669f211b88da1679b0b64a63b7e0e7bfe52aae524f73a55be7fe70c7e9bfc94b4cf0da1213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -612,9 +557,9 @@ fn alt_bn128_pairing_jeff4(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff5(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff5(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff5",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"20a754d2071d4d53903e3b31a7e98ad6882d58aec240ef981fdf0a9d22c5926a29c853fcea789887315916bbeb89ca37edb355b4f980c9a12a94f30deeed30211213d2149b006137fcfb23036606f848d638d576a120ca981b5b1a5f9300b3ee2276cf730cf493cd95d64677bbb75fc42db72513a4c1e387b476d056f80aa75f21ee6226d31426322afcda621464d0611d226783262e21bb3bc86b537e986237096df1f82dff337dd5972e32a8ad43e28a78a96a823ef1cd4debe12b6552ea5f1abb4a25eb9379ae96c84fff9f0540abcfc0a0d11aeda02d4f37e4baf74cb0c11073b3ff2cdbb38755f8691ea59e9606696b3ff278acfc098fa8226470d03869217cee0a9ad79a4493b5253e2e4e3a39fc2df38419f230d341f60cb064a0ac290a3d76f140db8418ba512272381446eb73958670f00cf46f1d9e64cba057b53c26f64a8ec70387a13e41430ed3ee4a7db2059cc5fc13c067194bcc0cb49a98552fd72bd9edb657346127da132e5b82ab908f5816c826acb499e22f2412d1a2d70f25929bcb43d5a57391564615c9e70a992b10eafa4db109709649cf48c50dd2198a1f162a73261f112401aa2db79c7dab1533c9935c77290a6ce3b191f2318d198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -622,9 +567,9 @@ fn alt_bn128_pairing_jeff5(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_jeff6(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_jeff6(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_jeff6",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"1c76476f4def4bb94541d57ebba1193381ffa7aa76ada664dd31c16024c43f593034dd2920f673e204fee2811c678745fc819b55d3e9d294e45c9b03a76aef41209dd15ebff5d46c4bd888e51a93cf99a7329636c63514396b4a452003a35bf704bf11ca01483bfa8b34b43561848d28905960114c8ac04049af4b6315a416782bb8324af6cfc93537a2ad1a445cfd0ca2a71acd7ac41fadbf933c2a51be344d120a2a4cf30c1bf9845f20c6fe39e07ea2cce61f0c9bb048165fe5e4de877550111e129f1cf1097710d41c4ac70fcdfa5ba2023c6ff1cbeac322de49d1b6df7c103188585e2364128fe25c70558f1560f4f9350baf3959e603cc91486e110936198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000000",
@@ -632,9 +577,9 @@ fn alt_bn128_pairing_jeff6(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_empty_data(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_empty_data(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_empty_data",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -642,9 +587,9 @@ fn alt_bn128_pairing_empty_data(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_one_point(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_one_point(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_one_point",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000000",
@@ -652,9 +597,9 @@ fn alt_bn128_pairing_one_point(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_two_point_match_2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_two_point_match_2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_two_point_match_2",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -662,9 +607,9 @@ fn alt_bn128_pairing_two_point_match_2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_two_point_match_3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_two_point_match_3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_two_point_match_3",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -672,9 +617,9 @@ fn alt_bn128_pairing_two_point_match_3(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_two_point_match_4(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_two_point_match_4(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_two_point_match_4",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -682,9 +627,9 @@ fn alt_bn128_pairing_two_point_match_4(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_ten_point_match_1(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_ten_point_match_1(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_ten_point_match_1",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed275dc4a288d1afb3cbb1ac09187524c7db36395df7be3b99e673b13a075a65ec1d9befcd05a5323e6da4d435f3b617cdb3af83285c2df711ef39c01571827f9d",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -692,9 +637,9 @@ fn alt_bn128_pairing_ten_point_match_1(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_ten_point_match_2(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_ten_point_match_2(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_ten_point_match_2",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002203e205db4f19b37b60121b83a7333706db86431c6d835849957ed8c3928ad7927dc7234fd11d3e8c36c59277c3e6f149d5cd3cfa9a62aee49f8130962b4b3b9195e8aa5b7827463722b8c153931579d3505566b4edf48d498e185f0509de15204bb53b8977e5f92a0bc372742c4830944a59b4fe6b1c0466e2a6dad122b5d2e030644e72e131a029b85045b68181585d97816a916871ca8d3c208c16d87cfd31a76dae6d3272396d0cbe61fced2bc532edac647851e3ac53ce1cc9c7e645a83198e9393920d483a7260bfb731fb5d25f1aa493335a9e71297e485b7aef312c21800deef121f1e76426a00665e5c4479674322d4f75edadd46debd5cd992f6ed090689d0585ff075ec9e99ad690c3395bc4b313370b38ef355acdadcd122975b12c85ea5db8c6deb4aab71808dcb408fe3d1e7690c43d37b4ce6cc0166fa7daa",
 		"0000000000000000000000000000000000000000000000000000000000000001",
@@ -702,9 +647,9 @@ fn alt_bn128_pairing_ten_point_match_2(b: &mut Criterion) {
 	);
 }

-fn alt_bn128_pairing_ten_point_match_3(b: &mut Criterion) {
+#[bench]
+fn alt_bn128_pairing_ten_point_match_3(b: &mut Bencher) {
 	bench(
-		"alt_bn128_pairing_ten_point_match_3",
 		"0000000000000000000000000000000000000008", // alt_bn128_pairing
 		"105456a333e6d636854f987ea7bb713dfd0ae8371a72aea313ae0c32c0bf10160cf031d41b41557f3e7e3ba0c51bebe5da8e6ecd855ec50fc87efcdeac168bcc0476be093a6d2b4bbf907172049874af11e1b6267606e00804d3ff0037ec57fd3010c68cb50161b7d1d96bb71edfec9880171954e56871abf3d93cc94d745fa114c059d74e5b6c4ec14ae5864ebe23a71781d86c29fb8fb6cce94f70d3de7a2101b33461f39d9e887dbb100f170a2345dde3c07e256d1dfa2b657ba5cd030427000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000021a2c3013d2ea92e13c800cde68ef56a294b883f6ac35d25f587c09b1b3c635f7290158a80cd3d66530f74dc94c94adb88f5cdb481acca997b6e60071f08a115f2f997f3dbd66a7afe07fe7862ce239edba9e05c5afff7f8a1259c9733b2dfbb929d1691530ca701b4a106054688728c9972c8512e9789e9567aae23e302ccd75",
 		"0000000000000000000000000000000000000000000000000000000000000001",
--- a/ethcore/benches/builtin_contract.rs
+++ b/ethcore/benches/builtin_contract.rs
@@ -1,149 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Benchmarking of calling builtin contract
-
-use std::str::FromStr;
-
-use account_state::State;
-use parity_bytes::Bytes;
-use ethcore::test_helpers::get_temp_state_db;
-use ethereum_types::{H160, U256};
-use criterion::{black_box, criterion_main, criterion_group, Criterion};
-use machine::{test_helpers, Machine};
-use machine::executive::CallCreateExecutive;
-use machine::substate::Substate;
-use trace::{NoopTracer, NoopVMTracer};
-use trie_vm_factories::VmFactory;
-use vm::{ActionParams, EnvInfo, Schedule};
-
-const ECRECOVER: &str = "0000000000000000000000000000000000000001";
-const SHA256: &str = "0000000000000000000000000000000000000002";
-const SIGNED_DATA: &str = "hash000000000001v000000000000002r000000000000003s000000000000004";
-
-fn single_builtin_pricing() -> Machine {
-	test_helpers::load_machine(include_bytes!("../../res/ethereum/builtin_one_activation_bench.json"))
-}
-
-fn multiple_builtin_pricing() -> Machine {
-	test_helpers::load_machine(include_bytes!("../../res/ethereum/builtin_multi_bench.json"))
-}
-
-fn builtin_params(address: H160, execute: bool) -> ActionParams {
-	let mut params = ActionParams::default();
-	params.code_address = address;
-	params.gas = u64::max_value().into();
-	if execute {
-		params.data = Some(SIGNED_DATA.bytes().collect::<Bytes>());
-	}
-	params
-}
-
-fn single_activation(c: &mut Criterion) {
-	let contract = H160::from_str(ECRECOVER).unwrap();
-	let params = builtin_params(contract, false);
-
-	let env_info = EnvInfo::default();
-	let machine = single_builtin_pricing();
-	let schedule = Schedule::default();
-	let factory = VmFactory::default();
-	let depth = 0;
-	let stack_depth = 0;
-	let parent_static_flag = false;
-
-	let db = get_temp_state_db();
-	let mut state = State::new(db, U256::from(0), Default::default());
-	let mut substate = Substate::new();
-
-    c.bench_function("single activation", move |b| {
-        b.iter(|| black_box(CallCreateExecutive::new_call_raw(
-				params.clone(),
-				&env_info,
-				&machine,
-				&schedule,
-				&factory,
-				depth,
-				stack_depth,
-				parent_static_flag,
-			).exec(&mut state, &mut substate, &mut NoopTracer, &mut NoopVMTracer))
-		)
-    });
-}
-
-fn ten_multiple_activations(c: &mut Criterion) {
-	let contract = H160::from_str(ECRECOVER).unwrap();
-	let params = builtin_params(contract, false);
-
-	let env_info = EnvInfo::default();
-	let machine = multiple_builtin_pricing();
-	let schedule = Schedule::default();
-	let factory = VmFactory::default();
-	let depth = 0;
-	let stack_depth = 0;
-	let parent_static_flag = false;
-
-	let db = get_temp_state_db();
-	let mut state = State::new(db, U256::from(0), Default::default());
-	let mut substate = Substate::new();
-
-    c.bench_function("ten activations", move |b| {
-        b.iter(|| black_box(CallCreateExecutive::new_call_raw(
-				params.clone(),
-				&env_info,
-				&machine,
-				&schedule,
-				&factory,
-				depth,
-				stack_depth,
-				parent_static_flag,
-			).exec(&mut state, &mut substate, &mut NoopTracer, &mut NoopVMTracer))
-		)
-    });
-}
-
-fn fourty_multiple_activations(c: &mut Criterion) {
-	let contract = H160::from_str(SHA256).unwrap();
-	let params = builtin_params(contract, false);
-
-	let env_info = EnvInfo::default();
-	let machine = multiple_builtin_pricing();
-	let schedule = Schedule::default();
-	let factory = VmFactory::default();
-	let depth = 0;
-	let stack_depth = 0;
-	let parent_static_flag = false;
-
-	let db = get_temp_state_db();
-	let mut state = State::new(db, U256::from(0), Default::default());
-	let mut substate = Substate::new();
-
-    c.bench_function("fourty activations", move |b| {
-        b.iter(|| black_box(CallCreateExecutive::new_call_raw(
-				params.clone(),
-				&env_info,
-				&machine,
-				&schedule,
-				&factory,
-				depth,
-				stack_depth,
-				parent_static_flag,
-			).exec(&mut state, &mut substate, &mut NoopTracer, &mut NoopVMTracer))
-		)
-    });
-}
-
-criterion_group!(benches, single_activation, ten_multiple_activations, fourty_multiple_activations);
-criterion_main!(benches);
--- a/ethcore/blockchain/Cargo.toml
+++ b/ethcore/blockchain/Cargo.toml
@@ -1,35 +0,0 @@
-[package]
-description = "Parity Ethereum Blockchain Database, Test Generator, Configuration, Caching, Importing Blocks, and Block Information"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-blockchain"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ansi_term = "0.11"
-blooms-db = { path = "../../util/blooms-db" }
-common-types = { path = "../types" }
-ethcore-db = { path = "../db" }
-ethereum-types = "0.6.0"
-keccak-hash = "0.2.0"
-parity-util-mem = "0.1"
-itertools = "0.5"
-kvdb = "0.1"
-log = "0.4"
-parity-bytes = "0.1"
-parking_lot = "0.9"
-rand = "0.6"
-rayon = "1.0"
-rlp = "0.4.0"
-rlp_compress = { path = "../../util/rlp-compress" }
-rlp_derive = { path = "../../util/rlp-derive" }
-triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
-
-[dev-dependencies]
-env_logger = "0.5"
-ethkey = { path = "../../accounts/ethkey" }
-rustc-hex = "1.0"
-tempdir = "0.3"
-kvdb-memorydb = "0.1"
--- a/ethcore/builtin/Cargo.toml
+++ b/ethcore/builtin/Cargo.toml
@@ -1,25 +0,0 @@
-[package]
-description = "ethereum vm builtin"
-name = "ethcore-builtin"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-bn = { git = "https://github.com/paritytech/bn", default-features = false }
-ethereum-types = "0.6.0"
-byteorder = "1.3.2"
-common-types = { path = "../types" }
-eip-152 = { path = "../../util/EIP-152" }
-ethjson = { path = "../../json" }
-ethkey = { path = "../../accounts/ethkey" }
-keccak-hash = "0.2.0"
-log = "0.4"
-macros = { path = "../../util/macros" }
-num = { version = "0.1", default-features = false, features = ["bigint"] }
-parity-bytes = "0.1"
-parity-crypto = "0.4.0"
-
-[dev-dependencies]
-hex-literal = "0.2.1"
-parity-crypto = "0.4.0"
--- a/ethcore/builtin/src/lib.rs
+++ b/ethcore/builtin/src/lib.rs
--- a/ethcore/call-contract/Cargo.toml
+++ b/ethcore/call-contract/Cargo.toml
@@ -1,12 +0,0 @@
-[package]
-description = "Parity Ethereum (EthCore) Contract Calls and Blockchain Service & Registry Information"
-name = "ethcore-call-contract"
-version = "0.1.0"
-license = "GPL-3.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-types = { path = "../types", package = "common-types" }
-ethereum-types = "0.6.0"
-bytes = { version = "0.1", package = "parity-bytes" }
--- a/ethcore/call-contract/src/call_contract.rs
+++ b/ethcore/call-contract/src/call_contract.rs
@@ -1,33 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Provides CallContract and RegistryInfo traits
-
-use bytes::Bytes;
-use ethereum_types::Address;
-use types::ids::BlockId;
-
-/// Provides `call_contract` method
-pub trait CallContract {
-	/// Like `call`, but with various defaults. Designed to be used for calling contracts.
-	fn call_contract(&self, id: BlockId, address: Address, data: Bytes) -> Result<Bytes, String>;
-}
-
-/// Provides information on a blockchain service and it's registry
-pub trait RegistryInfo {
-	/// Get the address of a particular blockchain service, if available.
-	fn registry_address(&self, name: String, block: BlockId) -> Option<Address>;
-}
--- a/ethcore/call-contract/src/lib.rs
+++ b/ethcore/call-contract/src/lib.rs
@@ -1,27 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-#![warn(missing_docs)]
-
-//! Call Contract module
-//! 
-//! This crate exposes traits required to call contracts at particular block.
-//! All utilities that depend on on-chain data should use those traits to access it.
-
-pub mod call_contract;
-
-// Re-export
-pub use self::call_contract::*;
--- a/ethcore/db/Cargo.toml
+++ b/ethcore/db/Cargo.toml
@@ -1,17 +0,0 @@
-[package]
-description = "Ethcore DB access utilities"
-homepage = "http://parity.io"
-license = "GPL-3.0"
-name = "ethcore-db"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-common-types = { path = "../types" }
-ethereum-types = "0.6.0"
-kvdb = "0.1"
-parity-util-mem = "0.1"
-parking_lot = "0.9"
-rlp = "0.4.0"
-rlp_derive = { path = "../../util/rlp-derive" }
--- a/ethcore/db/src/lib.rs
+++ b/ethcore/db/src/lib.rs
@@ -1,29 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Parity Ethereum database access utilities.
-
-#![warn(missing_docs)]
-
-extern crate parity_util_mem as mem;
-extern crate parity_util_mem as malloc_size_of;
-
-mod db;
-
-pub mod keys;
-pub mod cache_manager;
-
-pub use self::db::*;
--- a/ethcore/evm/Cargo.toml
+++ b/ethcore/evm/Cargo.toml
@@ -1,5 +1,4 @@
 [package]
-description = "Parity Ethereum Virtual Machine (EVM) Rust Implementation"
 name = "evm"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -7,24 +6,18 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 bit-set = "0.4"
 parity-bytes = "0.1"
-ethereum-types = "0.6.0"
-parity-util-mem = "0.1"
+ethereum-types = "0.4"
+heapsize = "0.4"
 lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }
-keccak-hash = "0.2.0"
-parking_lot = "0.9"
-memory-cache = { path = "../../util/memory-cache" }
+keccak-hash = "0.1"
+parking_lot = "0.6"
+memory-cache = { path = "../../util/memory_cache" }

 [dev-dependencies]
 rustc-hex = "1.0"
-criterion = "0.3"
-hex-literal = "0.2.0"

 [features]
 evm-debug = []
 evm-debug-tests = ["evm-debug"]
-
-[[bench]]
-name = "basic"
-harness = false
--- a/ethcore/evm/benches/basic.rs
+++ b/ethcore/evm/benches/basic.rs
@@ -1,209 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! benchmarking for EVM
-
-#[macro_use]
-extern crate criterion;
-extern crate bit_set;
-extern crate ethereum_types;
-extern crate parking_lot;
-extern crate parity_util_mem as mem;
-extern crate vm;
-extern crate evm;
-extern crate keccak_hash as hash;
-extern crate memory_cache;
-extern crate parity_bytes as bytes;
-extern crate rustc_hex;
-
-use criterion::{Criterion, Bencher, black_box};
-use std::str::FromStr;
-use std::sync::Arc;
-use ethereum_types::{U256, Address};
-use vm::{ActionParams, Result, GasLeft, Ext};
-use vm::tests::FakeExt;
-use evm::Factory;
-use rustc_hex::FromHex;
-
-criterion_group!(
-	basic,
-	simple_loop_log0_usize,
-	simple_loop_log0_u256,
-	mem_gas_calculation_same_usize,
-	mem_gas_calculation_same_u256,
-	mem_gas_calculation_increasing_usize,
-	mem_gas_calculation_increasing_u256,
-	blockhash_mulmod_small,
-	blockhash_mulmod_large,
-);
-criterion_main!(basic);
-
-fn simple_loop_log0_usize(b: &mut Criterion) {
-	b.bench_function("simple_loop_log0_usize", |b| {
-		simple_loop_log0(U256::from(::std::usize::MAX), b);
-	});
-}
-
-fn simple_loop_log0_u256(b: &mut Criterion) {
-	b.bench_function("simple_loop_log0_u256", |b| {
-		simple_loop_log0(!U256::zero(), b);
-	});
-}
-
-fn simple_loop_log0(gas: U256, b: &mut Bencher) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-
-	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-	let code = black_box(
-		"62ffffff5b600190036000600fa0600357".from_hex().unwrap()
-	);
-
-	b.iter(|| {
-		let mut params = ActionParams::default();
-		params.address = address.clone();
-		params.gas = gas;
-		params.code = Some(Arc::new(code.clone()));
-
-		let vm = factory.create(params, ext.schedule(), 0);
-
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-fn mem_gas_calculation_same_usize(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_same_usize", |b| {
-		mem_gas_calculation_same(U256::from(::std::usize::MAX), b);
-	});
-}
-
-fn mem_gas_calculation_same_u256(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_same_u256", |b| {
-		mem_gas_calculation_same(!U256::zero(), b);
-	});
-}
-
-fn mem_gas_calculation_same(gas: U256, b: &mut Bencher) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-
-	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-	b.iter(|| {
-		let code = black_box(
-			"6110006001556001546000555b610fff805560016000540380600055600c57".from_hex().unwrap()
-		);
-
-		let mut params = ActionParams::default();
-		params.address = address.clone();
-		params.gas = gas;
-		params.code = Some(Arc::new(code.clone()));
-
-		let vm = factory.create(params, ext.schedule(), 0);
-
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-fn mem_gas_calculation_increasing_usize(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_increasing_usize", |b| {
-		mem_gas_calculation_increasing(U256::from(::std::usize::MAX), b);
-	});
-}
-
-fn mem_gas_calculation_increasing_u256(b: &mut Criterion) {
-	b.bench_function("mem_gas_calculation_increasing_u256", |b| {
-		mem_gas_calculation_increasing(!U256::zero(), b);
-	});
-}
-
-fn mem_gas_calculation_increasing(gas: U256, b: &mut Bencher) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-
-	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-	b.iter(|| {
-		let code = black_box(
-			"6110006001556001546000555b610fff60005401805560016000540380600055600c57".from_hex().unwrap()
-		);
-
-		let mut params = ActionParams::default();
-		params.address = address.clone();
-		params.gas = gas;
-		params.code = Some(Arc::new(code.clone()));
-
-		let vm = factory.create(params, ext.schedule(), 0);
-
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-fn blockhash_mulmod_small(b: &mut Criterion) {
-	b.bench_function("blockhash_mulmod_small", |b| {
-		let factory = Factory::default();
-		let mut ext = FakeExt::new();
-
-		let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-		b.iter(|| {
-			let code = black_box(
-				"6080604052348015600f57600080fd5b5060005a90505b60c881111560de5760017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095060017effffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff8009505a90506016565b506035806100ed6000396000f3fe6080604052600080fdfea165627a7a72305820bde4a0ac6d0fac28fc879244baf8a6a0eda514bc95fb7ecbcaaebf2556e2687c0029".from_hex().unwrap()
-			);
-
-			let mut params = ActionParams::default();
-			params.address = address.clone();
-			params.gas = U256::from(4_000u64);
-			params.code = Some(Arc::new(code.clone()));
-
-			let vm = factory.create(params, ext.schedule(), 0);
-
-			result(vm.exec(&mut ext).ok().unwrap())
-		});
-	});
-}
-
-fn blockhash_mulmod_large(b: &mut Criterion) {
-	b.bench_function("blockhash_mulmod_large", |b| {
-		let factory = Factory::default();
-		let mut ext = FakeExt::new();
-
-		let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-
-		b.iter(|| {
-			let code = black_box(
-				"608060405234801561001057600080fd5b5060005a90505b60c8811115610177577efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009507efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff17efffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff08009505a9050610017565b506035806101866000396000f3fe6080604052600080fdfea165627a7a72305820dcaec306f67bb96f3044fff25c9af2ec66f01d0954d0656964f046f42f2780670029".from_hex().unwrap()
-			);
-
-			let mut params = ActionParams::default();
-			params.address = address.clone();
-			params.gas = U256::from(4_000u64);
-			params.code = Some(Arc::new(code.clone()));
-
-			let vm = factory.create(params, ext.schedule(), 0);
-
-			result(vm.exec(&mut ext).ok().unwrap())
-		});
-	});
-}
-
-fn result(r: Result<evm::GasLeft>) -> U256 {
-	match r {
-		Ok(GasLeft::Known(gas_left)) => gas_left,
-		Ok(GasLeft::NeedsReturn { gas_left,  .. }) => gas_left,
-		_ => U256::zero(),
-	}
-}
--- a/ethcore/evm/src/benches/mod.rs
+++ b/ethcore/evm/src/benches/mod.rs
@@ -0,0 +1,129 @@
+// 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/>.
+
+//! benchmarking for EVM
+//! should be started with:
+//! ```bash
+//! multirust run nightly cargo bench
+//! ```
+
+extern crate test;
+
+use self::test::{Bencher, black_box};
+
+use bigint::prelude::U256;
+use bigint::hash::H256;
+use util::*;
+use vm::ActionParams;
+use evm::{self, Factory, VMType};
+use evm::tests::FakeExt;
+
+#[bench]
+fn simple_loop_log0_usize(b: &mut Bencher) {
+	simple_loop_log0(U256::from(::std::usize::MAX), b)
+}
+
+#[bench]
+fn simple_loop_log0_u256(b: &mut Bencher) {
+	simple_loop_log0(!U256::zero(), b)
+}
+
+fn simple_loop_log0(gas: U256, b: &mut Bencher) {
+	let mut vm = Factory::new(VMType::Interpreter).create(gas);
+	let mut ext = FakeExt::new();
+
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+	let code = black_box(
+		"62ffffff5b600190036000600fa0600357".from_hex().unwrap()
+	);
+
+	b.iter(|| {
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.gas = gas;
+		params.code = Some(code.clone());
+
+		result(vm.exec(params, &mut ext))
+	});
+}
+
+#[bench]
+fn mem_gas_calculation_same_usize(b: &mut Bencher) {
+	mem_gas_calculation_same(U256::from(::std::usize::MAX), b)
+}
+
+#[bench]
+fn mem_gas_calculation_same_u256(b: &mut Bencher) {
+	mem_gas_calculation_same(!U256::zero(), b)
+}
+
+fn mem_gas_calculation_same(gas: U256, b: &mut Bencher) {
+	let mut vm = Factory::new(VMType::Interpreter).create(gas);
+	let mut ext = FakeExt::new();
+
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+
+	b.iter(|| {
+		let code = black_box(
+			"6110006001556001546000555b610fff805560016000540380600055600c57".from_hex().unwrap()
+		);
+
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.gas = gas;
+		params.code = Some(code.clone());
+
+		result(vm.exec(params, &mut ext))
+	});
+}
+
+#[bench]
+fn mem_gas_calculation_increasing_usize(b: &mut Bencher) {
+	mem_gas_calculation_increasing(U256::from(::std::usize::MAX), b)
+}
+
+#[bench]
+fn mem_gas_calculation_increasing_u256(b: &mut Bencher) {
+	mem_gas_calculation_increasing(!U256::zero(), b)
+}
+
+fn mem_gas_calculation_increasing(gas: U256, b: &mut Bencher) {
+	let mut vm = Factory::new(VMType::Interpreter).create(gas);
+	let mut ext = FakeExt::new();
+
+	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
+
+	b.iter(|| {
+		let code = black_box(
+			"6110006001556001546000555b610fff60005401805560016000540380600055600c57".from_hex().unwrap()
+		);
+
+		let mut params = ActionParams::default();
+		params.address = address.clone();
+		params.gas = gas;
+		params.code = Some(code.clone());
+
+		result(vm.exec(params, &mut ext))
+	});
+}
+
+fn result(r: evm::Result<evm::GasLeft>) -> U256 {
+	match r {
+		Ok(evm::GasLeft::Known(v)) => v,
+		Ok(evm::GasLeft::NeedsReturn(v, _)) => v,
+		_ => U256::zero(),
+	}
+}
--- a/ethcore/evm/src/evm.rs
+++ b/ethcore/evm/src/evm.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Evm interface.

@@ -44,18 +44,12 @@ pub trait Finalize {
 impl Finalize for Result<GasLeft> {
 	fn finalize<E: Ext>(self, ext: E) -> Result<FinalizationResult> {
 		match self {
-			Ok(GasLeft::Known(gas_left)) => {
-				Ok(FinalizationResult {
-					gas_left,
-					apply_state: true,
-					return_data: ReturnData::empty()
-				})
-			},
-			Ok(GasLeft::NeedsReturn { gas_left, data, apply_state }) => {
-				ext.ret(&gas_left, &data, apply_state).map(|gas_left|
-					FinalizationResult { gas_left, apply_state, return_data: data }
-				)
-			},
+			Ok(GasLeft::Known(gas_left)) => Ok(FinalizationResult { gas_left: gas_left, apply_state: true, return_data: ReturnData::empty() }),
+			Ok(GasLeft::NeedsReturn { gas_left, data, apply_state }) => ext.ret(&gas_left, &data, apply_state).map(|gas_left| FinalizationResult {
+				gas_left: gas_left,
+				apply_state: apply_state,
+				return_data: data,
+			}),
 			Err(err) => Err(err),
 		}
 	}
@@ -68,8 +62,8 @@ impl Finalize for Error {
 }

 /// Cost calculation type. For low-gas usage we calculate costs using usize instead of U256
-pub trait CostType: Sized + From<usize> + Copy + Send
-	+ ops::Mul<Output=Self> + ops::Div<Output=Self> + ops::Add<Output=Self> + ops::Sub<Output=Self>
+pub trait CostType: Sized + From<usize> + Copy
+	+ ops::Mul<Output=Self> + ops::Div<Output=Self> + ops::Add<Output=Self> +ops::Sub<Output=Self>
 	+ ops::Shr<usize, Output=Self> + ops::Shl<usize, Output=Self>
 	+ cmp::Ord + fmt::Debug {
 	/// Converts this cost into `U256`
--- a/ethcore/evm/src/factory.rs
+++ b/ethcore/evm/src/factory.rs
@@ -1,23 +1,23 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Evm factory.
 //!
 use std::sync::Arc;
-use vm::{Exec, Schedule};
+use vm::{Vm, Schedule};
 use ethereum_types::U256;
 use super::vm::ActionParams;
 use super::interpreter::SharedCache;
@@ -33,7 +33,7 @@ pub struct Factory {
 impl Factory {
 	/// Create fresh instance of VM
 	/// Might choose implementation depending on supplied gas.
-	pub fn create(&self, params: ActionParams, schedule: &Schedule, depth: usize) -> Box<Exec> {
+	pub fn create(&self, params: ActionParams, schedule: &Schedule, depth: usize) -> Box<Vm> {
 		match self.evm {
 			VMType::Interpreter => if Self::can_fit_in_usize(&params.gas) {
 				Box::new(super::interpreter::Interpreter::<usize>::new(params, self.evm_cache.clone(), schedule, depth))
@@ -47,7 +47,7 @@ impl Factory {
 	/// for caching jump destinations.
 	pub fn new(evm: VMType, cache_size: usize) -> Self {
 		Factory {
-			evm,
+			evm: evm,
 			evm_cache: Arc::new(SharedCache::new(cache_size)),
 		}
 	}
--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! VM Instructions list and utility functions

@@ -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,
@@ -149,10 +149,6 @@ enum_with_from_u8! {
 		DIFFICULTY = 0x44,
 		#[doc = "get the block's gas limit"]
 		GASLIMIT = 0x45,
-		#[doc = "get chain ID"]
-		CHAINID = 0x46,
-		#[doc = "get balance of own account"]
-		SELFBALANCE = 0x47,

 		#[doc = "remove item from stack"]
 		POP = 0x50,
@@ -358,6 +354,7 @@ impl Instruction {
 		}
 	}

+
 	/// Returns stack position of item to duplicate
 	/// DUP1 -> 0
 	pub fn dup_position(&self) -> Option<usize> {
@@ -368,6 +365,7 @@ impl Instruction {
 		}
 	}

+
 	/// Returns stack position of item to SWAP top with
 	/// SWAP1 -> 1
 	pub fn swap_position(&self) -> Option<usize> {
@@ -446,7 +444,12 @@ pub struct InstructionInfo {
 impl InstructionInfo {
 	/// Create new instruction info.
 	pub fn new(name: &'static str, args: usize, ret: usize, tier: GasPriceTier) -> Self {
-		InstructionInfo { name, args, ret, tier }
+		InstructionInfo {
+			name: name,
+			args: args,
+			ret: ret,
+			tier: tier
+		}
 	}
 }

@@ -503,8 +506,6 @@ lazy_static! {
 		arr[NUMBER as usize] = Some(InstructionInfo::new("NUMBER", 0, 1, GasPriceTier::Base));
 		arr[DIFFICULTY as usize] = Some(InstructionInfo::new("DIFFICULTY", 0, 1, GasPriceTier::Base));
 		arr[GASLIMIT as usize] = Some(InstructionInfo::new("GASLIMIT", 0, 1, GasPriceTier::Base));
-		arr[CHAINID as usize] = Some(InstructionInfo::new("CHAINID", 0, 1, GasPriceTier::Base));
-		arr[SELFBALANCE as usize] = Some(InstructionInfo::new("SELFBALANCE", 0, 1, GasPriceTier::Low));
 		arr[POP as usize] = Some(InstructionInfo::new("POP", 1, 0, GasPriceTier::Base));
 		arr[MLOAD as usize] = Some(InstructionInfo::new("MLOAD", 1, 1, GasPriceTier::VeryLow));
 		arr[MSTORE as usize] = Some(InstructionInfo::new("MSTORE", 2, 0, GasPriceTier::VeryLow));
--- a/ethcore/evm/src/interpreter/gasometer.rs
+++ b/ethcore/evm/src/interpreter/gasometer.rs
@@ -1,21 +1,21 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::cmp;
-use ethereum_types::{BigEndianHash, U256};
+use ethereum_types::{U256, H256};
 use super::u256_to_address;

 use {evm, vm};
@@ -121,16 +121,12 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 				Request::Gas(Gas::from(1))
 			},
 			instructions::SSTORE => {
-				if schedule.eip1706 && self.current_gas <= Gas::from(schedule.call_stipend) {
-					return Err(vm::Error::OutOfGas);
-				}
-
-				let address = BigEndianHash::from_uint(stack.peek(0));
+				let address = H256::from(stack.peek(0));
 				let newval = stack.peek(1);
-				let val = ext.storage_at(&address)?.into_uint();
+				let val = U256::from(&*ext.storage_at(&address)?);

 				let gas = if schedule.eip1283 {
-					let orig = ext.initial_storage_at(&address)?.into_uint();
+					let orig = U256::from(&*ext.initial_storage_at(&address)?);
 					calculate_eip1283_sstore_gas(schedule, &orig, &val, &newval)
 				} else {
 					if val.is_zero() && !newval.is_zero() {
@@ -407,7 +403,7 @@ fn calculate_eip1283_sstore_gas<Gas: evm::CostType>(schedule: &Schedule, origina
 }

 pub fn handle_eip1283_sstore_clears_refund(ext: &mut vm::Ext, original: &U256, current: &U256, new: &U256) {
-	let sstore_clears_schedule = ext.schedule().sstore_refund_gas;
+	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.
@@ -442,11 +438,11 @@ pub fn handle_eip1283_sstore_clears_refund(ext: &mut vm::Ext, original: &U256, c
 				// 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 = ext.schedule().sstore_set_gas - ext.schedule().sload_gas;
+					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 = ext.schedule().sstore_reset_gas - ext.schedule().sload_gas;
+					let refund = U256::from(ext.schedule().sstore_reset_gas - ext.schedule().sload_gas);
 					ext.add_sstore_refund(refund);
 				}
 			}
--- a/ethcore/evm/src/interpreter/informant.rs
+++ b/ethcore/evm/src/interpreter/informant.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 pub use self::inner::*;

@@ -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/memory.rs
+++ b/ethcore/evm/src/interpreter/memory.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use ethereum_types::U256;
 use vm::ReturnData;
@@ -38,6 +38,7 @@ pub trait Memory {
 	fn read_slice(&self, offset: U256, size: U256) -> &[u8];
 	/// Retrieve writeable part of memory
 	fn writeable_slice(&mut self, offset: U256, size: U256) -> &mut[u8];
+	fn dump(&self);
 	/// Convert memory into return data.
 	fn into_return_data(self, offset: U256, size: U256) -> ReturnData;
 }
@@ -50,6 +51,14 @@ pub fn is_valid_range(off: usize, size: usize)  -> bool {
 }

 impl Memory for Vec<u8> {
+	fn dump(&self) {
+		println!("MemoryDump:");
+		for i in self.iter() {
+			println!("{:02x} ", i);
+		}
+		println!("");
+	}
+
 	fn size(&self) -> usize {
 		self.len()
 	}
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Rust VM implementation

@@ -26,16 +26,13 @@ mod shared_cache;
 use std::marker::PhantomData;
 use std::{cmp, mem};
 use std::sync::Arc;
-use std::convert::TryFrom;
 use hash::keccak;
 use bytes::Bytes;
-use ethereum_types::{U256, U512, H256, Address, BigEndianHash};
-
+use ethereum_types::{U256, U512, H256, Address};

 use vm::{
 	self, ActionParams, ParamsType, ActionValue, CallType, MessageCallResult,
-	ContractCreateResult, CreateContractAddress, ReturnData, GasLeft, Schedule,
-	TrapKind, TrapError
+	ContractCreateResult, CreateContractAddress, ReturnData, GasLeft, Schedule
 };

 use evm::CostType;
@@ -106,9 +103,10 @@ enum InstructionResult<Gas> {
 		apply: bool,
 	},
 	StopExecution,
-	Trap(TrapKind),
 }

+enum Never {}
+
 /// ActionParams without code, so that it can be feed into CodeReader.
 #[derive(Debug)]
 struct InterpreterParams {
@@ -163,7 +161,12 @@ pub enum InterpreterResult {
 	Done(vm::Result<GasLeft>),
 	/// The VM can continue to run.
 	Continue,
-	Trap(TrapKind),
+}
+
+impl From<vm::Error> for InterpreterResult {
+	fn from(error: vm::Error) -> InterpreterResult {
+		InterpreterResult::Done(Err(error))
+	}
 }

 /// Intepreter EVM implementation
@@ -179,89 +182,22 @@ pub struct Interpreter<Cost: CostType> {
 	valid_jump_destinations: Option<Arc<BitSet>>,
 	gasometer: Option<Gasometer<Cost>>,
 	stack: VecStack<U256>,
-	resume_output_range: Option<(U256, U256)>,
-	resume_result: Option<InstructionResult<Cost>>,
-	last_stack_ret_len: usize,
 	_type: PhantomData<Cost>,
 }

-impl<Cost: 'static + CostType> vm::Exec for Interpreter<Cost> {
-	fn exec(mut self: Box<Self>, ext: &mut vm::Ext) -> vm::ExecTrapResult<GasLeft> {
+impl<Cost: CostType> vm::Vm for Interpreter<Cost> {
+	fn exec(&mut self, ext: &mut vm::Ext) -> vm::Result<GasLeft> {
 		loop {
 			let result = self.step(ext);
 			match result {
 				InterpreterResult::Continue => {},
-				InterpreterResult::Done(value) => return Ok(value),
-				InterpreterResult::Trap(trap) => match trap {
-					TrapKind::Call(params) => {
-						return Err(TrapError::Call(params, self));
-					},
-					TrapKind::Create(params, address) => {
-						return Err(TrapError::Create(params, address, self));
-					},
-				},
+				InterpreterResult::Done(value) => return value,
 				InterpreterResult::Stopped => panic!("Attempted to execute an already stopped VM.")
 			}
 		}
 	}
 }

-impl<Cost: 'static + CostType> vm::ResumeCall for Interpreter<Cost> {
-	fn resume_call(mut self: Box<Self>, result: MessageCallResult) -> Box<vm::Exec> {
-		{
-			let this = &mut *self;
-			let (out_off, out_size) = this.resume_output_range.take().expect("Box<ResumeCall> is obtained from a call opcode; resume_output_range is always set after those opcodes are executed; qed");
-
-			match result {
-				MessageCallResult::Success(gas_left, data) => {
-					let output = this.mem.writeable_slice(out_off, out_size);
-					let len = cmp::min(output.len(), data.len());
-					(&mut output[..len]).copy_from_slice(&data[..len]);
-
-					this.return_data = data;
-					this.stack.push(U256::one());
-					this.resume_result = Some(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")));
-				},
-				MessageCallResult::Reverted(gas_left, data) => {
-					let output = this.mem.writeable_slice(out_off, out_size);
-					let len = cmp::min(output.len(), data.len());
-					(&mut output[..len]).copy_from_slice(&data[..len]);
-
-					this.return_data = data;
-					this.stack.push(U256::zero());
-					this.resume_result = Some(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")));
-				},
-				MessageCallResult::Failed => {
-					this.stack.push(U256::zero());
-					this.resume_result = Some(InstructionResult::Ok);
-				},
-			}
-		}
-		self
-	}
-}
-
-impl<Cost: 'static + CostType> vm::ResumeCreate for Interpreter<Cost> {
-	fn resume_create(mut self: Box<Self>, result: ContractCreateResult) -> Box<vm::Exec> {
-		match result {
-			ContractCreateResult::Created(address, gas_left) => {
-				self.stack.push(address_to_u256(address));
-				self.resume_result = Some(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater.")));
-			},
-			ContractCreateResult::Reverted(gas_left, return_data) => {
-				self.stack.push(U256::zero());
-				self.return_data = return_data;
-				self.resume_result = Some(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater.")));
-			},
-			ContractCreateResult::Failed => {
-				self.stack.push(U256::zero());
-				self.resume_result = Some(InstructionResult::Ok);
-			},
-		}
-		self
-	}
-}
-
 impl<Cost: CostType> Interpreter<Cost> {
 	/// Create a new `Interpreter` instance with shared cache.
 	pub fn new(mut params: ActionParams, cache: Arc<SharedCache>, schedule: &Schedule, depth: usize) -> Interpreter<Cost> {
@@ -276,14 +212,9 @@ impl<Cost: CostType> Interpreter<Cost> {
 			cache, params, reader, informant,
 			valid_jump_destinations, gasometer, stack,
 			done: false,
-			// Overridden in `step_inner` based on
-			// the result of `ext.trace_next_instruction`.
 			do_trace: true,
 			mem: Vec::new(),
 			return_data: ReturnData::empty(),
-			last_stack_ret_len: 0,
-			resume_output_range: None,
-			resume_result: None,
 			_type: PhantomData,
 		}
 	}
@@ -298,93 +229,66 @@ impl<Cost: CostType> Interpreter<Cost> {
 		let result = if self.gasometer.is_none() {
 			InterpreterResult::Done(Err(vm::Error::OutOfGas))
 		} else if self.reader.len() == 0 {
-			let current_gas = self.gasometer
-				.as_ref()
-				.expect("Gasometer None case is checked above; qed")
-				.current_gas
-				.as_u256();
-			InterpreterResult::Done(Ok(GasLeft::Known(current_gas)))
+			InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_ref().expect("Gasometer None case is checked above; qed").current_gas.as_u256())))
 		} else {
-			self.step_inner(ext)
+			self.step_inner(ext).err().expect("step_inner never returns Ok(()); qed")
 		};

 		if let &InterpreterResult::Done(_) = &result {
 			self.done = true;
 			self.informant.done();
 		}
-		result
+		return result;
 	}

 	/// Inner helper function for step.
 	#[inline(always)]
-	fn step_inner(&mut self, ext: &mut dyn vm::Ext) -> InterpreterResult {
-		let result = match self.resume_result.take() {
-			Some(result) => result,
-			None => {
-				let opcode = self.reader.code[self.reader.position];
-				let instruction = Instruction::from_u8(opcode);
-				self.reader.position += 1;
+	fn step_inner(&mut self, ext: &mut vm::Ext) -> Result<Never, InterpreterResult> {
+		let opcode = self.reader.code[self.reader.position];
+		let instruction = Instruction::from_u8(opcode);
+		self.reader.position += 1;

-				// TODO: make compile-time removable if too much of a performance hit.
-				self.do_trace = self.do_trace && ext.trace_next_instruction(
-					self.reader.position - 1, opcode, self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256(),
-				);
+		// TODO: make compile-time removable if too much of a performance hit.
+		self.do_trace = self.do_trace && ext.trace_next_instruction(
+			self.reader.position - 1, opcode, self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256(),
+		);

-				let instruction = match instruction {
-					Some(i) => i,
-					None => return InterpreterResult::Done(Err(vm::Error::BadInstruction {
-						instruction: opcode
-					})),
-				};
-
-				let info = instruction.info();
-				self.last_stack_ret_len = info.ret;
-				if let Err(e) = self.verify_instruction(ext, instruction, info) {
-					return InterpreterResult::Done(Err(e));
-				};
-
-				// Calculate gas cost
-				let requirements = match self.gasometer.as_mut().expect(GASOMETER_PROOF).requirements(ext, instruction, info, &self.stack, self.mem.size()) {
-					Ok(t) => t,
-					Err(e) => return InterpreterResult::Done(Err(e)),
-				};
-				if self.do_trace {
-					ext.trace_prepare_execute(self.reader.position - 1, opcode, requirements.gas_cost.as_u256(), Self::mem_written(instruction, &self.stack), Self::store_written(instruction, &self.stack));
-				}
-				if let Err(e) = self.gasometer.as_mut().expect(GASOMETER_PROOF).verify_gas(&requirements.gas_cost) {
-					if self.do_trace {
-						ext.trace_failed();
-					}
-					return InterpreterResult::Done(Err(e));
-				}
-				self.mem.expand(requirements.memory_required_size);
-				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) });
-
-				// Execute instruction
-				let current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas;
-				let result = match self.exec_instruction(
-					current_gas, ext, instruction, requirements.provide_gas
-				) {
-					Err(x) => {
-						if self.do_trace {
-							ext.trace_failed();
-						}
-						return InterpreterResult::Done(Err(x));
-					},
-					Ok(x) => x,
-				};
-				evm_debug!({ self.informant.after_instruction(instruction) });
-				result
-			},
+		let instruction = match instruction {
+			Some(i) => i,
+			None => return Err(InterpreterResult::Done(Err(vm::Error::BadInstruction {
+				instruction: opcode
+			}))),
 		};

-		if let InstructionResult::Trap(trap) = result {
-			return InterpreterResult::Trap(trap);
+		let info = instruction.info();
+		self.verify_instruction(ext, instruction, info)?;
+
+		// Calculate gas cost
+		let requirements = self.gasometer.as_mut().expect(GASOMETER_PROOF).requirements(ext, instruction, info, &self.stack, self.mem.size())?;
+		if self.do_trace {
+			ext.trace_prepare_execute(self.reader.position - 1, opcode, requirements.gas_cost.as_u256());
 		}

+		self.gasometer.as_mut().expect(GASOMETER_PROOF).verify_gas(&requirements.gas_cost)?;
+		self.mem.expand(requirements.memory_required_size);
+		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!({ 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)),
+			false => (None, None),
+		};
+
+		// Execute instruction
+		let current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas;
+		let result = self.exec_instruction(
+			current_gas, ext, instruction, requirements.provide_gas
+		)?;
+
+		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;
 		}
@@ -392,8 +296,9 @@ impl<Cost: CostType> Interpreter<Cost> {
 		if self.do_trace {
 			ext.trace_executed(
 				self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256(),
-				self.stack.peek_top(self.last_stack_ret_len),
-				&self.mem,
+				self.stack.peek_top(info.ret),
+				mem_written.map(|(o, s)| (o, &(self.mem[o..o+s]))),
+				store_written,
 			);
 		}

@@ -404,31 +309,28 @@ impl<Cost: CostType> Interpreter<Cost> {
 					self.valid_jump_destinations = Some(self.cache.jump_destinations(&self.params.code_hash, &self.reader.code));
 				}
 				let jump_destinations = self.valid_jump_destinations.as_ref().expect("jump_destinations are initialized on first jump; qed");
-				let pos = match self.verify_jump(position, jump_destinations) {
-					Ok(x) => x,
-					Err(e) => return InterpreterResult::Done(Err(e))
-				};
+				let pos = self.verify_jump(position, jump_destinations)?;
 				self.reader.position = pos;
 			},
 			InstructionResult::StopExecutionNeedsReturn {gas, init_off, init_size, apply} => {
 				let mem = mem::replace(&mut self.mem, Vec::new());
-				return InterpreterResult::Done(Ok(GasLeft::NeedsReturn {
+				return Err(InterpreterResult::Done(Ok(GasLeft::NeedsReturn {
 					gas_left: gas.as_u256(),
 					data: mem.into_return_data(init_off, init_size),
 					apply_state: apply
-				}));
+				})));
 			},
 			InstructionResult::StopExecution => {
-				return InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256())));
+				return Err(InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256()))));
 			},
 			_ => {},
 		}

 		if self.reader.position >= self.reader.len() {
-			return InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256())));
+			return Err(InterpreterResult::Done(Ok(GasLeft::Known(self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas.as_u256()))));
 		}

-		InterpreterResult::Continue
+		Err(InterpreterResult::Continue)
 	}

 	fn verify_instruction(&self, ext: &vm::Ext, instruction: Instruction, info: &InstructionInfo) -> vm::Result<()> {
@@ -440,9 +342,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 			((instruction == instructions::RETURNDATACOPY || instruction == instructions::RETURNDATASIZE) && !schedule.have_return_data) ||
 			(instruction == instructions::REVERT && !schedule.have_revert) ||
 			((instruction == instructions::SHL || instruction == instructions::SHR || instruction == instructions::SAR) && !schedule.have_bitwise_shifting) ||
-			(instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash) ||
-			(instruction == instructions::CHAINID && !schedule.have_chain_id) ||
-			(instruction == instructions::SELFBALANCE && !schedule.have_selfbalance)
+			(instruction == instructions::EXTCODEHASH && !schedule.have_extcodehash)
 		{
 			return Err(vm::Error::BadInstruction {
 				instruction: instruction as u8
@@ -529,7 +429,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let init_size = self.stack.pop_back();
 				let address_scheme = match instruction {
 					instructions::CREATE => CreateContractAddress::FromSenderAndNonce,
-					instructions::CREATE2 => CreateContractAddress::FromSenderSaltAndCodeHash(BigEndianHash::from_uint(&self.stack.pop_back())),
+					instructions::CREATE2 => CreateContractAddress::FromSenderSaltAndCodeHash(self.stack.pop_back().into()),
 					_ => unreachable!("instruction can only be CREATE/CREATE2 checked above; qed"),
 				};

@@ -550,24 +450,21 @@ impl<Cost: CostType> Interpreter<Cost> {

 				let contract_code = self.mem.read_slice(init_off, init_size);

-				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme, true);
+				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme);
 				return match create_result {
-					Ok(ContractCreateResult::Created(address, gas_left)) => {
+					ContractCreateResult::Created(address, gas_left) => {
 						self.stack.push(address_to_u256(address));
 						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater.")))
 					},
-					Ok(ContractCreateResult::Reverted(gas_left, return_data)) => {
+					ContractCreateResult::Reverted(gas_left, return_data) => {
 						self.stack.push(U256::zero());
 						self.return_data = return_data;
 						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater.")))
 					},
-					Ok(ContractCreateResult::Failed) => {
+					ContractCreateResult::Failed => {
 						self.stack.push(U256::zero());
 						Ok(InstructionResult::Ok)
 					},
-					Err(trap) => {
-						Ok(InstructionResult::Trap(trap))
-					},
 				};
 			},
 			instructions::CALL | instructions::CALLCODE | instructions::DELEGATECALL | instructions::STATICCALL => {
@@ -592,10 +489,10 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let out_size = self.stack.pop_back();

 				// Add stipend (only CALL|CALLCODE when value > 0)
-				let call_gas = call_gas.overflow_add(value.map_or_else(|| Cost::from(0), |val| match val.is_zero() {
+				let call_gas = call_gas + value.map_or_else(|| Cost::from(0), |val| match val.is_zero() {
 					false => Cost::from(ext.schedule().call_stipend),
 					true => Cost::from(0),
-				})).0;
+				});

 				// Get sender & receive addresses, check if we have balance
 				let (sender_address, receive_address, has_balance, call_type) = match instruction {
@@ -626,14 +523,13 @@ impl<Cost: CostType> Interpreter<Cost> {

 				let call_result = {
 					let input = self.mem.read_slice(in_off, in_size);
-					ext.call(&call_gas.as_u256(), sender_address, receive_address, value, input, &code_address, call_type, true)
+					ext.call(&call_gas.as_u256(), sender_address, receive_address, value, input, &code_address, call_type)
 				};

-				self.resume_output_range = Some((out_off, out_size));
+				let output = self.mem.writeable_slice(out_off, out_size);

 				return match call_result {
-					Ok(MessageCallResult::Success(gas_left, data)) => {
-						let output = self.mem.writeable_slice(out_off, out_size);
+					MessageCallResult::Success(gas_left, data) => {
 						let len = cmp::min(output.len(), data.len());
 						(&mut output[..len]).copy_from_slice(&data[..len]);

@@ -641,8 +537,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 						self.return_data = data;
 						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")))
 					},
-					Ok(MessageCallResult::Reverted(gas_left, data)) => {
-						let output = self.mem.writeable_slice(out_off, out_size);
+					MessageCallResult::Reverted(gas_left, data) => {
 						let len = cmp::min(output.len(), data.len());
 						(&mut output[..len]).copy_from_slice(&data[..len]);

@@ -650,13 +545,10 @@ impl<Cost: CostType> Interpreter<Cost> {
 						self.return_data = data;
 						Ok(InstructionResult::UnusedGas(Cost::from_u256(gas_left).expect("Gas left cannot be greater than current one")))
 					},
-					Ok(MessageCallResult::Failed) => {
+					MessageCallResult::Failed  => {
 						self.stack.push(U256::zero());
 						Ok(InstructionResult::Ok)
 					},
-					Err(trap) => {
-						Ok(InstructionResult::Trap(trap))
-					},
 				};
 			},
 			instructions::RETURN => {
@@ -686,7 +578,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let size = self.stack.pop_back();
 				let topics = self.stack.pop_n(no_of_topics)
 					.iter()
-					.map(BigEndianHash::from_uint)
+					.map(H256::from)
 					.collect();
 				ext.log(topics, self.mem.read_slice(offset, size))?;
 			},
@@ -723,29 +615,29 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let offset = self.stack.pop_back();
 				let size = self.stack.pop_back();
 				let k = keccak(self.mem.read_slice(offset, size));
-				self.stack.push(k.into_uint());
+				self.stack.push(U256::from(&*k));
 			},
 			instructions::SLOAD => {
-				let key = BigEndianHash::from_uint(&self.stack.pop_back());
-				let word = ext.storage_at(&key)?.into_uint();
+				let key = H256::from(&self.stack.pop_back());
+				let word = U256::from(&*ext.storage_at(&key)?);
 				self.stack.push(word);
 			},
 			instructions::SSTORE => {
-				let address = BigEndianHash::from_uint(&self.stack.pop_back());
+				let address = H256::from(&self.stack.pop_back());
 				let val = self.stack.pop_back();

-				let current_val = ext.storage_at(&address)?.into_uint();
+				let current_val = U256::from(&*ext.storage_at(&address)?);
 				// Increase refund for clear
 				if ext.schedule().eip1283 {
-					let original_val = ext.initial_storage_at(&address)?.into_uint();
+					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 = ext.schedule().sstore_refund_gas;
+						let sstore_clears_schedule = U256::from(ext.schedule().sstore_refund_gas);
 						ext.add_sstore_refund(sstore_clears_schedule);
 					}
 				}
-				ext.set_storage(address, BigEndianHash::from_uint(&val))?;
+				ext.set_storage(address, H256::from(&val))?;
 			},
 			instructions::PC => {
 				self.stack.push(U256::from(self.reader.position - 1));
@@ -806,7 +698,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::EXTCODEHASH => {
 				let address = u256_to_address(&self.stack.pop_back());
 				let hash = ext.extcodehash(&address)?.unwrap_or_else(H256::zero);
-				self.stack.push(hash.into_uint());
+				self.stack.push(U256::from(hash));
 			},
 			instructions::CALLDATACOPY => {
 				Self::copy_data_to_memory(&mut self.mem, &mut self.stack, &self.params.data.as_ref().map_or_else(|| &[] as &[u8], |d| &*d as &[u8]));
@@ -840,7 +732,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::BLOCKHASH => {
 				let block_number = self.stack.pop_back();
 				let block_hash = ext.blockhash(&block_number);
-				self.stack.push(block_hash.into_uint());
+				self.stack.push(U256::from(&*block_hash));
 			},
 			instructions::COINBASE => {
 				self.stack.push(address_to_u256(ext.env_info().author.clone()));
@@ -857,12 +749,6 @@ impl<Cost: CostType> Interpreter<Cost> {
 			instructions::GASLIMIT => {
 				self.stack.push(ext.env_info().gas_limit.clone());
 			},
-			instructions::CHAINID => {
-				self.stack.push(ext.chain_id().into())
-			},
-			instructions::SELFBALANCE => {
-				self.stack.push(ext.balance(&self.params.address)?);
-			}

 			// Stack instructions

@@ -1036,12 +922,11 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let c = self.stack.pop_back();

 				self.stack.push(if !c.is_zero() {
-					let a_512 = U512::from(a);
-					let b_512 = U512::from(b);
-					let c_512 = U512::from(c);
-					let res = a_512 + b_512;
-					let x = res % c_512;
-					U256::try_from(x).expect("U512 % U256 fits U256; qed")
+					// upcast to 512
+					let a5 = U512::from(a);
+					let res = a5.overflowing_add(U512::from(b)).0;
+					let x = res % U512::from(c);
+					U256::from(x)
 				} else {
 					U256::zero()
 				});
@@ -1052,12 +937,10 @@ impl<Cost: CostType> Interpreter<Cost> {
 				let c = self.stack.pop_back();

 				self.stack.push(if !c.is_zero() {
-					let a_512 = U512::from(a);
-					let b_512 = U512::from(b);
-					let c_512 = U512::from(c);
-					let res = a_512 * b_512;
-					let x = res % c_512;
-					U256::try_from(x).expect("U512 % U256 fits U256; qed")
+					let a5 = U512::from(a);
+					let res = a5.overflowing_mul(U512::from(b)).0;
+					let x = res % U512::from(c);
+					U256::from(x)
 				} else {
 					U256::zero()
 				});
@@ -1197,13 +1080,12 @@ fn set_sign(value: U256, sign: bool) -> U256 {

 #[inline]
 fn u256_to_address(value: &U256) -> Address {
-	let addr: H256 = BigEndianHash::from_uint(value);
-	Address::from(addr)
+	Address::from(H256::from(value))
 }

 #[inline]
 fn address_to_u256(value: Address) -> U256 {
-	H256::from(value).into_uint()
+	U256::from(&*H256::from(value))
 }

 #[cfg(test)]
@@ -1212,11 +1094,10 @@ mod tests {
 	use rustc_hex::FromHex;
 	use vmtype::VMType;
 	use factory::Factory;
-	use vm::{self, Exec, ActionParams, ActionValue};
+	use vm::{self, Vm, ActionParams, ActionValue};
 	use vm::tests::{FakeExt, test_finalize};
-	use ethereum_types::Address;

-	fn interpreter(params: ActionParams, ext: &vm::Ext) -> Box<Exec> {
+	fn interpreter(params: ActionParams, ext: &vm::Ext) -> Box<Vm> {
 		Factory::new(VMType::Interpreter, 1).create(params, ext.schedule(), ext.depth())
 	}

@@ -1225,18 +1106,18 @@ mod tests {
 		let code = "7feeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff006000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa6020526000620f120660406000601773945304eb96065b2a98b57a48a06ae28d285a71b56101f4f1600055".from_hex().unwrap();

 		let mut params = ActionParams::default();
-		params.address = Address::from_low_u64_be(5);
+		params.address = 5.into();
 		params.gas = 300_000.into();
 		params.gas_price = 1.into();
 		params.value = ActionValue::Transfer(100_000.into());
 		params.code = Some(Arc::new(code));
 		let mut ext = FakeExt::new();
-		ext.balances.insert(Address::from_low_u64_be(5), 1_000_000_000.into());
+		ext.balances.insert(5.into(), 1_000_000_000.into());
 		ext.tracing = true;

 		let gas_left = {
 			let mut vm = interpreter(params, &ext);
-			test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+			test_finalize(vm.exec(&mut ext)).unwrap()
 		};

 		assert_eq!(ext.calls.len(), 1);
@@ -1248,17 +1129,17 @@ mod tests {
 		let code = "6001600160000360003e00".from_hex().unwrap();

 		let mut params = ActionParams::default();
-		params.address = Address::from_low_u64_be(5);
+		params.address = 5.into();
 		params.gas = 300_000.into();
 		params.gas_price = 1.into();
 		params.code = Some(Arc::new(code));
 		let mut ext = FakeExt::new_byzantium();
-		ext.balances.insert(Address::from_low_u64_be(5), 1_000_000_000.into());
+		ext.balances.insert(5.into(), 1_000_000_000.into());
 		ext.tracing = true;

 		let err = {
 			let mut vm = interpreter(params, &ext);
-			test_finalize(vm.exec(&mut ext).ok().unwrap()).err().unwrap()
+			test_finalize(vm.exec(&mut ext)).err().unwrap()
 		};

 		assert_eq!(err, ::vm::Error::OutOfBounds);
--- a/ethcore/evm/src/interpreter/shared_cache.rs
+++ b/ethcore/evm/src/interpreter/shared_cache.rs
@@ -1,22 +1,22 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::sync::Arc;
 use hash::KECCAK_EMPTY;
-use parity_util_mem::{MallocSizeOf, MallocSizeOfOps};
+use heapsize::HeapSizeOf;
 use ethereum_types::H256;
 use parking_lot::Mutex;
 use memory_cache::MemoryLruCache;
@@ -25,12 +25,11 @@ use super::super::instructions::{self, Instruction};

 const DEFAULT_CACHE_SIZE: usize = 4 * 1024 * 1024;

-/// Stub for a sharing `BitSet` data in cache (reference counted)
-/// and implementing MallocSizeOf on it.
+// stub for a HeapSizeOf implementation.
 struct Bits(Arc<BitSet>);

-impl MallocSizeOf for Bits {
-	fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+impl HeapSizeOf for Bits {
+	fn heap_size_of_children(&self) -> usize {
 		// dealing in bits here
 		self.0.capacity() * 8
 	}
--- a/ethcore/evm/src/interpreter/stack.rs
+++ b/ethcore/evm/src/interpreter/stack.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::fmt;
 use instructions;
@@ -66,7 +66,11 @@ impl<S : fmt::Display> Stack<S> for VecStack<S> {
 	}

 	fn pop_back(&mut self) -> S {
-		self.stack.pop().expect("instruction validation prevents from popping too many items; qed")
+		let val = self.stack.pop();
+		match val {
+			Some(x) => x,
+			None => panic!("Tried to pop from empty stack.")
+		}
 	}

 	fn pop_n(&mut self, no_of_elems: usize) -> &[S] {
--- a/ethcore/evm/src/lib.rs
+++ b/ethcore/evm/src/lib.rs
@@ -1,25 +1,25 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Ethereum virtual machine.

 extern crate bit_set;
 extern crate ethereum_types;
 extern crate parking_lot;
-extern crate parity_util_mem;
+extern crate heapsize;
 extern crate vm;
 extern crate keccak_hash as hash;
 extern crate memory_cache;
@@ -33,8 +33,6 @@ extern crate log;

 #[cfg(test)]
 extern crate rustc_hex;
-#[cfg(test)]
-extern crate hex_literal;

 pub mod evm;
 pub mod interpreter;
@@ -46,6 +44,8 @@ mod instructions;

 #[cfg(test)]
 mod tests;
+#[cfg(all(feature = "benches", test))]
+mod benches;

 pub use vm::{
    Schedule, CleanDustMode, EnvInfo, CallType, ActionParams, Ext,
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::fmt::Debug;
 use std::str::FromStr;
@@ -25,7 +25,6 @@ use vm::{self, ActionParams, ActionValue, Ext};
 use vm::tests::{FakeExt, FakeCall, FakeCallType, test_finalize};
 use factory::Factory;
 use vmtype::VMType;
-use hex_literal::hex;

 evm_test!{test_add: test_add_int}
 fn test_add(factory: super::Factory) {
@@ -40,7 +39,7 @@ fn test_add(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_988));
@@ -60,7 +59,7 @@ fn test_sha3(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_961));
@@ -80,7 +79,7 @@ fn test_address(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
@@ -102,39 +101,13 @@ fn test_origin(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
 	assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
 }

-evm_test!{test_selfbalance: test_selfbalance_int}
-fn test_selfbalance(factory: super::Factory) {
-	let own_addr = Address::from_str("1337000000000000000000000000000000000000").unwrap();
-	// 47       SELFBALANCE
-	// 60 ff    PUSH ff
-	// 55       SSTORE
-	let code = hex!("47 60 ff 55").to_vec();
-
-	let mut params = ActionParams::default();
-	params.address = own_addr.clone();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new_istanbul();
-	ext.balances = {
-		let mut x = HashMap::new();
-		x.insert(own_addr, U256::from(1_025)); // 0x401
-		x
-	};
-	let gas_left = {
-		let vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
-	};
-	assert_eq!(gas_left, U256::from(79_992)); // TODO[dvdplm]: do the sums here, SELFBALANCE-5 + PUSH1-3 + ONEBYTE-4 + SSTORE-?? = 100_000 - 79_992
-	assert_store(&ext, 0xff, "0000000000000000000000000000000000000000000000000000000000000401");
-}
-
 evm_test!{test_sender: test_sender_int}
 fn test_sender(factory: super::Factory) {
 	let address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
@@ -150,34 +123,13 @@ fn test_sender(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
 	assert_store(&ext, 0, "000000000000000000000000cd1722f2947def4cf144679da39c4c32bdc35681");
 }

-evm_test!{test_chain_id: test_chain_id_int}
-fn test_chain_id(factory: super::Factory) {
-	// 46       CHAINID
-	// 60 00    PUSH 0
-	// 55       SSTORE
-	let code = hex!("46 60 00 55").to_vec();
-
-	let mut params = ActionParams::default();
-	params.gas = U256::from(100_000);
-	params.code = Some(Arc::new(code));
-	let mut ext = FakeExt::new_istanbul().with_chain_id(9);
-
-	let gas_left = {
-		let vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
-	};
-
-	assert_eq!(gas_left, U256::from(79_995));
-	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000009");
-}
-
 evm_test!{test_extcodecopy: test_extcodecopy_int}
 fn test_extcodecopy(factory: super::Factory) {
 		// 33 - sender
@@ -206,7 +158,7 @@ fn test_extcodecopy(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_935));
@@ -226,7 +178,7 @@ fn test_log_empty(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(99_619));
@@ -258,7 +210,7 @@ fn test_log_sender(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(98_974));
@@ -283,11 +235,11 @@ fn test_blockhash(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_974));
-	assert_eq!(ext.store.get(&H256::zero()).unwrap(), &blockhash);
+	assert_eq!(ext.store.get(&H256::new()).unwrap(), &blockhash);
 }

 evm_test!{test_calldataload: test_calldataload_int}
@@ -305,11 +257,12 @@ fn test_calldataload(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_991));
 	assert_store(&ext, 0, "23ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff23");
+
 }

 evm_test!{test_author: test_author_int}
@@ -325,7 +278,7 @@ fn test_author(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
@@ -345,7 +298,7 @@ fn test_timestamp(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
@@ -365,7 +318,7 @@ fn test_number(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
@@ -385,7 +338,7 @@ fn test_difficulty(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
@@ -405,7 +358,7 @@ fn test_gas_limit(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_eq!(gas_left, U256::from(79_995));
@@ -423,7 +376,7 @@ fn test_mul(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "000000000000000000000000000000000000000000000000734349397b853383");
@@ -441,7 +394,7 @@ fn test_sub(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000012364ad0302");
@@ -459,7 +412,7 @@ fn test_div(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "000000000000000000000000000000000000000000000000000000000002e0ac");
@@ -477,7 +430,7 @@ fn test_div_zero(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -495,7 +448,7 @@ fn test_mod(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000076b4b");
@@ -514,7 +467,7 @@ fn test_smod(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000076b4b");
@@ -533,7 +486,7 @@ fn test_sdiv(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "000000000000000000000000000000000000000000000000000000000002e0ac");
@@ -552,7 +505,7 @@ fn test_exp(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "90fd23767b60204c3d6fc8aec9e70a42a3f127140879c133a20129a597ed0c59");
@@ -572,7 +525,7 @@ fn test_comparison(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -593,7 +546,7 @@ fn test_signed_comparison(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -614,7 +567,7 @@ fn test_bitops(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "00000000000000000000000000000000000000000000000000000000000000f0");
@@ -637,7 +590,7 @@ fn test_addmod_mulmod(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000001");
@@ -658,7 +611,7 @@ fn test_byte(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000");
@@ -677,7 +630,7 @@ fn test_signextend(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000fff");
@@ -697,7 +650,7 @@ fn test_badinstruction_int() {

 	let err = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap_err()
+		test_finalize(vm.exec(&mut ext)).unwrap_err()
 	};

 	match err {
@@ -717,7 +670,7 @@ fn test_pop(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "00000000000000000000000000000000000000000000000000000000000000f0");
@@ -737,7 +690,7 @@ fn test_extops(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000004"); // PC / CALLDATASIZE
@@ -760,10 +713,10 @@ fn test_jumps(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

-	assert_eq!(ext.sstore_clears, ext.schedule().sstore_refund_gas as i128);
+	assert_eq!(ext.sstore_clears, U256::from(ext.schedule().sstore_refund_gas));
 	assert_store(&ext, 0, "0000000000000000000000000000000000000000000000000000000000000000"); // 5!
 	assert_store(&ext, 1, "0000000000000000000000000000000000000000000000000000000000000078"); // 5!
 	assert_eq!(gas_left, U256::from(54_117));
@@ -773,8 +726,8 @@ evm_test!{test_calls: test_calls_int}
 fn test_calls(factory: super::Factory) {
 	let code = "600054602d57600160005560006000600060006050610998610100f160006000600060006050610998610100f25b".from_hex().unwrap();

-	let address = Address::from_low_u64_be(0x155);
-	let code_address = Address::from_low_u64_be(0x998);
+	let address = Address::from(0x155);
+	let code_address = Address::from(0x998);
 	let mut params = ActionParams::default();
 	params.gas = U256::from(150_000);
 	params.code = Some(Arc::new(code));
@@ -788,7 +741,7 @@ fn test_calls(factory: super::Factory) {

 	let gas_left = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_set_contains(&ext.calls, &FakeCall {
@@ -819,7 +772,7 @@ evm_test!{test_create_in_staticcall: test_create_in_staticcall_int}
 fn test_create_in_staticcall(factory: super::Factory) {
 	let code = "600060006064f000".from_hex().unwrap();

-	let address = Address::from_low_u64_be(0x155);
+	let address = Address::from(0x155);
 	let mut params = ActionParams::default();
 	params.gas = U256::from(100_000);
 	params.code = Some(Arc::new(code));
@@ -829,7 +782,7 @@ fn test_create_in_staticcall(factory: super::Factory) {

 	let err = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap_err()
+		test_finalize(vm.exec(&mut ext)).unwrap_err()
 	};

 	assert_eq!(err, vm::Error::MutableCallInStaticContext);
@@ -1097,7 +1050,7 @@ fn push_two_pop_one_constantinople_test(factory: &super::Factory, opcode: u8, pu

 	let _ = {
 		let mut vm = factory.create(params, ext.schedule(), ext.depth());
-		test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
+		test_finalize(vm.exec(&mut ext)).unwrap()
 	};

 	assert_store(&ext, 0, result);
@@ -1113,5 +1066,5 @@ fn assert_set_contains<T : Debug + Eq + PartialEq + Hash>(set: &HashSet<T>, val:
 }

 fn assert_store(ext: &FakeExt, pos: u64, val: &str) {
-	assert_eq!(ext.store.get(&H256::from_low_u64_be(pos)).unwrap(), &H256::from_str(val).unwrap());
+	assert_eq!(ext.store.get(&H256::from(pos)).unwrap(), &H256::from_str(val).unwrap());
 }
--- a/ethcore/evm/src/vmtype.rs
+++ b/ethcore/evm/src/vmtype.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 use std::fmt;

--- a/ethcore/light/Cargo.toml
+++ b/ethcore/light/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Ethereum (EthCore) Light Client Implementation (Block Import IO Service, Blockchain Data Fetching, Light Client Header Chain Storage, Parity Light Protocol (PLP) Provider, Light Transaction Queue, CHT Definitions, Light Client Data Cache), Parity Light Protocol (PLP) Implementation, P2P Network I/O and Event Context Generalization, Peer Error Handling & Punishment, Request Load Timer & Distribution Manager, Pending Request Set Storage, Request Credit Management, Light Client Request Types, Request Chain Builder Utility, On-demand Chain Request Service over LES (for RPCs), ResponseGuard Implementation)"
+description = "Parity Light Client Implementation"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "ethcore-light"
@@ -8,42 +8,36 @@ authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 log = "0.4"
-parity-bytes = "0.1"
-common-types = { path = "../types" }
-derive_more = "0.14.0"
 ethcore = { path = ".."}
-ethcore-db = { path = "../db" }
-ethcore-blockchain = { path = "../blockchain" }
-ethereum-types = "0.6.0"
-memory-db = "0.12.4"
-trie-db = "0.12.4"
+parity-bytes = "0.1"
+ethcore-transaction = { path = "../transaction" }
+ethereum-types = "0.4"
+memorydb = "0.2.1"
+patricia-trie = "0.2"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 ethcore-network = { path = "../../util/network" }
-ethcore-miner = { path = "../../miner" }
 ethcore-io = { path = "../../util/io" }
-hash-db = "0.12.4"
-parity-util-mem = "0.1"
+hashdb = "0.2.1"
+heapsize = "0.4"
 vm = { path = "../vm" }
 fastmap = { path = "../../util/fastmap" }
-failsafe = { version = "0.3.0", default-features = false, features = ["parking_lot_mutex"] }
-rlp = "0.4.0"
-rlp_derive = { path = "../../util/rlp-derive" }
-smallvec = "0.6"
+rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp_derive = { path = "../../util/rlp_derive" }
+smallvec = "0.4"
 futures = "0.1"
-rand = "0.6"
+rand = "0.4"
 itertools = "0.5"
-bincode = "1.1"
+bincode = "0.8.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.9"
+parking_lot = "0.6"
 stats = { path = "../../util/stats" }
-keccak-hash = "0.2.0"
+keccak-hash = "0.1"
 keccak-hasher = { path = "../../util/keccak-hasher" }
 triehash-ethereum = { version = "0.2",  path = "../../util/triehash-ethereum" }
 kvdb = "0.1"
-memory-cache = { path = "../../util/memory-cache" }
+memory-cache = { path = "../../util/memory_cache" }
 error-chain = { version = "0.12", default-features = false }
-journaldb = { path = "../../util/journaldb" }

 [dev-dependencies]
 ethcore = { path = "..", features = ["test-helpers"] }
--- a/ethcore/light/src/cache.rs
+++ b/ethcore/light/src/cache.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Cache for data fetched from the network.
 //!
@@ -20,15 +20,15 @@
 //! Furthermore, stores a "gas price corpus" of relative recency, which is a sorted
 //! vector of all gas prices from a recent range of blocks.

-use std::time::{Instant, Duration};
-use parity_util_mem::{MallocSizeOf, MallocSizeOfOps, MallocSizeOfExt};
+use ethcore::encoded;
+use ethcore::header::BlockNumber;
+use ethcore::receipt::Receipt;

-use common_types::encoded;
-use common_types::BlockNumber;
-use common_types::receipt::Receipt;
+use stats::Corpus;
+use std::time::{Instant, Duration};
+use heapsize::HeapSizeOf;
 use ethereum_types::{H256, U256};
 use memory_cache::MemoryLruCache;
-use stats::Corpus;

 /// Configuration for how much data to cache.
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -157,20 +157,18 @@ impl Cache {

 	/// Get the memory used.
 	pub fn mem_used(&self) -> usize {
-		self.malloc_size_of()
+		self.heap_size_of_children()
 	}
 }

-
-// This is fast method: it is possible to have a more exhaustive implementation
-impl MallocSizeOf for Cache {
-	fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+impl HeapSizeOf for Cache {
+	fn heap_size_of_children(&self) -> usize {
 		self.headers.current_size()
 			+ self.canon_hashes.current_size()
 			+ self.bodies.current_size()
 			+ self.receipts.current_size()
 			+ self.chain_score.current_size()
-			// `self.corpus` is skipped
+			// TODO: + corpus
 	}
 }

@@ -181,15 +179,14 @@ mod tests {

 	#[test]
 	fn corpus_inaccessible() {
-		let duration = Duration::from_secs(20);
-		let mut cache = Cache::new(Default::default(), duration.clone());
+		let mut cache = Cache::new(Default::default(), Duration::from_secs(5 * 3600));

 		cache.set_gas_price_corpus(vec![].into());
 		assert_eq!(cache.gas_price_corpus(), Some(vec![].into()));

 		{
 			let corpus_time = &mut cache.corpus.as_mut().unwrap().1;
-			*corpus_time = *corpus_time - duration;
+			*corpus_time = *corpus_time - Duration::from_secs(6 * 3600);
 		}
 		assert!(cache.gas_price_corpus().is_none());
 	}
--- a/ethcore/light/src/cht.rs
+++ b/ethcore/light/src/cht.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Canonical hash trie definitions and helper functions.
 //!
@@ -23,13 +23,11 @@
 //! root has. A correct proof implies that the claimed block is identical to the one
 //! we discarded.

-use common_types::ids::BlockId;
+use ethcore::ids::BlockId;
 use ethereum_types::{H256, U256};
-use hash_db::HashDB;
+use hashdb::HashDB;
 use keccak_hasher::KeccakHasher;
-use kvdb::DBValue;
-use memory_db::MemoryDB;
-use journaldb::new_memory_db;
+use memorydb::MemoryDB;
 use bytes::Bytes;
 use trie::{TrieMut, Trie, Recorder};
 use ethtrie::{self, TrieDB, TrieDBMut};
@@ -54,13 +52,13 @@ pub const SIZE: u64 = 2048;
 /// A canonical hash trie. This is generic over any database it can query.
 /// See module docs for more details.
 #[derive(Debug, Clone)]
-pub struct CHT<DB: HashDB<KeccakHasher, DBValue>> {
+pub struct CHT<DB: HashDB<KeccakHasher>> {
 	db: DB,
 	root: H256, // the root of this CHT.
 	number: u64,
 }

-impl<DB: HashDB<KeccakHasher, DBValue>> CHT<DB> {
+impl<DB: HashDB<KeccakHasher>> CHT<DB> {
 	/// Query the root of the CHT.
 	pub fn root(&self) -> H256 { self.root }

@@ -74,8 +72,7 @@ impl<DB: HashDB<KeccakHasher, DBValue>> CHT<DB> {
 		if block_to_cht_number(num) != Some(self.number) { return Ok(None) }

 		let mut recorder = Recorder::with_depth(from_level);
-		let db: &HashDB<_,_> = &self.db;
-		let t = TrieDB::new(&db, &self.root)?;
+		let t = TrieDB::new(&self.db, &self.root)?;
 		t.get_with(&key!(num), &mut recorder)?;

 		Ok(Some(recorder.drain().into_iter().map(|x| x.data).collect()))
@@ -95,17 +92,16 @@ 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, memory_db::HashKey<KeccakHasher>, DBValue>>>
+pub fn build<F>(cht_num: u64, mut fetcher: F) -> Option<CHT<MemoryDB<KeccakHasher>>>
 	where F: FnMut(BlockId) -> Option<BlockInfo>
 {
-	let mut db = new_memory_db();
+	let mut db = MemoryDB::<KeccakHasher>::new();

 	// start from the last block by number and work backwards.
 	let last_num = start_number(cht_num + 1) - 1;
 	let mut id = BlockId::Number(last_num);

-	let mut root = H256::zero();
+	let mut root = H256::default();

 	{
 		let mut t = TrieDBMut::new(&mut db, &mut root);
@@ -138,7 +134,7 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 	let start_num = start_number(cht_num) as usize;

 	for (i, (h, td)) in iterable.into_iter().take(SIZE as usize).enumerate() {
-		v.push((key!(i + start_num), val!(h, td)))
+		v.push((key!(i + start_num).into_vec(), val!(h, td).into_vec()))
 	}

 	if v.len() == SIZE as usize {
@@ -153,9 +149,9 @@ pub fn compute_root<I>(cht_num: u64, iterable: I) -> Option<H256>
 /// verify the given trie branch and extract the canonical hash and total difficulty.
 // TODO: better support for partially-checked queries.
 pub fn check_proof(proof: &[Bytes], num: u64, root: H256) -> Option<(H256, U256)> {
-	let mut db = new_memory_db();
+	let mut db = MemoryDB::<KeccakHasher>::new();

-	for node in proof { db.insert(hash_db::EMPTY_PREFIX, &node[..]); }
+	for node in proof { db.insert(&node[..]); }
 	let res = match TrieDB::new(&db, &root) {
 		Err(_) => return None,
 		Ok(trie) => trie.get_with(&key!(num), |val: &[u8]| {
--- a/ethcore/light/src/client/fetch.rs
+++ b/ethcore/light/src/client/fetch.rs
@@ -1,29 +1,30 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Trait for fetching chain data.

 use std::sync::Arc;

-use common_types::encoded;
-use common_types::header::Header;
-use common_types::receipt::Receipt;
-use ethcore::engines::{Engine, StateDependentProof};
-use ethereum_types::H256;
+use ethcore::encoded;
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::machine::EthereumMachine;
+use ethcore::header::Header;
+use ethcore::receipt::Receipt;
 use futures::future::IntoFuture;
+use ethereum_types::H256;

 /// Provides full chain data.
 pub trait ChainDataFetcher: Send + Sync + 'static {
@@ -47,8 +48,8 @@ pub trait ChainDataFetcher: Send + Sync + 'static {
 	fn epoch_transition(
 		&self,
 		_hash: H256,
-		_engine: Arc<Engine>,
-		_checker: Arc<StateDependentProof>
+		_engine: Arc<EthEngine>,
+		_checker: Arc<StateDependentProof<EthereumMachine>>
 	) -> Self::Transition;
 }

@@ -76,8 +77,8 @@ impl ChainDataFetcher for Unavailable {
 	fn epoch_transition(
 		&self,
 		_hash: H256,
-		_engine: Arc<Engine>,
-		_checker: Arc<StateDependentProof>
+		_engine: Arc<EthEngine>,
+		_checker: Arc<StateDependentProof<EthereumMachine>>
 	) -> Self::Transition {
 		Err("fetching epoch transition proofs unavailable")
 	}
--- a/ethcore/light/src/client/header_chain.rs
+++ b/ethcore/light/src/client/header_chain.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light client header chain.
 //!
@@ -30,15 +30,15 @@ use std::sync::Arc;

 use cache::Cache;
 use cht;
-use common_types::block_status::BlockStatus;
-use common_types::encoded;
-use common_types::header::Header;
-use common_types::ids::BlockId;
+use ethcore::block_status::BlockStatus;
+use ethcore::encoded;
 use ethcore::engines::epoch::{Transition as EpochTransition, PendingTransition as PendingEpochTransition};
-use ethcore::error::{Error, EthcoreResult, BlockError};
+use ethcore::error::{Error, BlockImportError, BlockImportErrorKind, BlockError};
+use ethcore::header::Header;
+use ethcore::ids::BlockId;
 use ethcore::spec::{Spec, SpecHardcodedSync};
 use ethereum_types::{H256, H264, U256};
-use parity_util_mem::{MallocSizeOf, MallocSizeOfOps};
+use heapsize::HeapSizeOf;
 use kvdb::{DBTransaction, KeyValueDB};
 use parking_lot::{Mutex, RwLock};
 use fastmap::H256FastMap;
@@ -95,8 +95,8 @@ struct Entry {
 	canonical_hash: H256,
 }

-impl MallocSizeOf for Entry {
-	fn size_of(&self, _ops: &mut MallocSizeOfOps) -> usize {
+impl HeapSizeOf for Entry {
+	fn heap_size_of_children(&self) -> usize {
 		if self.candidates.spilled() {
 			self.candidates.capacity() * ::std::mem::size_of::<Candidate>()
 		} else {
@@ -154,11 +154,8 @@ fn pending_transition_key(block_hash: H256) -> H264 {

 	let mut key = H264::default();

-	{
-		let bytes = key.as_bytes_mut();
-		bytes[0] = LEADING;
-		bytes[1..].copy_from_slice(block_hash.as_bytes());
-	}
+	key[0] = LEADING;
+	key.0[1..].copy_from_slice(&block_hash.0[..]);

 	key
 }
@@ -168,11 +165,8 @@ fn transition_key(block_hash: H256) -> H264 {

 	let mut key = H264::default();

-	{
-		let bytes = key.as_bytes_mut();
-		bytes[0] = LEADING;
-		bytes[1..].copy_from_slice(block_hash.as_bytes());
-	}
+	key[0] = LEADING;
+	key.0[1..].copy_from_slice(&block_hash.0[..]);

 	key
 }
@@ -202,21 +196,14 @@ pub enum HardcodedSync {
 	Deny,
 }

-#[derive(MallocSizeOf)]
 /// Header chain. See module docs for more details.
 pub struct HeaderChain {
-	#[ignore_malloc_size_of = "ignored for performance reason"]
 	genesis_header: encoded::Header, // special-case the genesis.
 	candidates: RwLock<BTreeMap<u64, Entry>>,
-	#[ignore_malloc_size_of = "ignored for performance reason"]
 	best_block: RwLock<BlockDescriptor>,
-	#[ignore_malloc_size_of = "ignored for performance reason"]
 	live_epoch_proofs: RwLock<H256FastMap<EpochTransition>>,
-	#[ignore_malloc_size_of = "ignored for performance reason"]
 	db: Arc<KeyValueDB>,
-	#[ignore_malloc_size_of = "ignored for performance reason"]
 	col: Option<u32>,
-	#[ignore_malloc_size_of = "ignored for performance reason"]
 	cache: Arc<Mutex<Cache>>,
 }

@@ -231,7 +218,7 @@ impl HeaderChain {
 	) -> Result<Self, Error> {
 		let mut live_epoch_proofs = ::std::collections::HashMap::default();

-		let genesis = ::rlp::encode(&spec.genesis_header());
+		let genesis = ::rlp::encode(&spec.genesis_header()).into_vec();
 		let decoded_header = spec.genesis_header();

 		let chain = if let Some(current) = db.get(col, CURRENT_KEY)? {
@@ -250,7 +237,7 @@ impl HeaderChain {
 				for c in &entry.candidates {
 					let key = transition_key(c.hash);

-					if let Some(proof) = db.get(col, key.as_bytes())? {
+					if let Some(proof) = db.get(col, &*key)? {
 						live_epoch_proofs.insert(c.hash, EpochTransition {
 							block_hash: c.hash,
 							block_number: cur_number,
@@ -267,7 +254,7 @@ impl HeaderChain {
 			let best_block = {
 				let era = match candidates.get(&curr.best_num) {
 					Some(era) => era,
-					None => return Err("Database corrupt: highest block referenced but no data.".into()),
+					None => bail!("Database corrupt: highest block referenced but no data."),
 				};

 				let best = &era.candidates[0];
@@ -364,7 +351,7 @@ impl HeaderChain {
 		transaction: &mut DBTransaction,
 		header: &Header,
 		transition_proof: Option<Vec<u8>>,
-	) -> EthcoreResult<PendingChanges> {
+	) -> Result<PendingChanges, BlockImportError> {
 		self.insert_inner(transaction, header, None, transition_proof)
 	}

@@ -377,7 +364,7 @@ impl HeaderChain {
 		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)
 	}

@@ -387,7 +374,7 @@ impl HeaderChain {
 		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();
@@ -416,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(Error::Block)?
+							.map_err(BlockImportErrorKind::Block)?
 					};

 				parent_td + *header.difficulty()
@@ -444,7 +431,7 @@ impl HeaderChain {
 		}

 		if let Some(transition) = transition {
-			transaction.put(self.col, transition_key(hash).as_bytes(), &transition.proof);
+			transaction.put(self.col, &*transition_key(hash), &transition.proof);
 			self.live_epoch_proofs.write().insert(hash, transition);
 		}

@@ -521,10 +508,10 @@ impl HeaderChain {
 						for ancient in &era_entry.candidates {
 							let maybe_transition = live_epoch_proofs.remove(&ancient.hash);
 							if let Some(epoch_transition) = maybe_transition {
-								transaction.delete(self.col, transition_key(ancient.hash).as_bytes());
+								transaction.delete(self.col, &*transition_key(ancient.hash));

 								if ancient.hash == era_entry.canonical_hash {
-									last_canonical_transition = match self.db.get(self.col, ancient.hash.as_bytes()) {
+									last_canonical_transition = match self.db.get(self.col, &ancient.hash) {
 										Err(e) => {
 											warn!(target: "chain", "Error reading from DB: {}\n
 												", e);
@@ -539,7 +526,7 @@ impl HeaderChain {
 								}
 							}

-							transaction.delete(self.col, ancient.hash.as_bytes());
+							transaction.delete(self.col, &ancient.hash);
 						}

 						let canon = &era_entry.candidates[0];
@@ -589,7 +576,7 @@ impl HeaderChain {
 					} else {
 						let msg = format!("header of block #{} not found in DB ; database in an \
 											inconsistent state", h_num);
-						return Err(msg.into());
+						bail!(msg);
 					};

 					let decoded = header.decode().expect("decoding db value failed");
@@ -660,7 +647,7 @@ impl HeaderChain {
 			match cache.block_header(&hash) {
 				Some(header) => Some(header),
 				None => {
-					match self.db.get(self.col, hash.as_bytes()) {
+					match self.db.get(self.col, &hash) {
 						Ok(db_value) => {
 							db_value.map(|x| x.into_vec()).map(encoded::Header::new)
 								.and_then(|header| {
@@ -785,7 +772,7 @@ impl HeaderChain {

 	/// Get block status.
 	pub fn status(&self, hash: &H256) -> BlockStatus {
-		if self.db.get(self.col, hash.as_bytes()).ok().map_or(false, |x| x.is_some()) {
+		if self.db.get(self.col, hash).ok().map_or(false, |x| x.is_some()) {
 			BlockStatus::InChain
 		} else {
 			BlockStatus::Unknown
@@ -795,13 +782,13 @@ impl HeaderChain {
 	/// Insert a pending transition.
 	pub fn insert_pending_transition(&self, batch: &mut DBTransaction, hash: H256, t: &PendingEpochTransition) {
 		let key = pending_transition_key(hash);
-		batch.put(self.col, key.as_bytes(), &*::rlp::encode(t));
+		batch.put(self.col, &*key, &*::rlp::encode(t));
 	}

 	/// Get pending transition for a specific block hash.
 	pub fn pending_transition(&self, hash: H256) -> Option<PendingEpochTransition> {
 		let key = pending_transition_key(hash);
-		match self.db.get(self.col, key.as_bytes()) {
+		match self.db.get(self.col, &*key) {
 			Ok(db_fetch) => db_fetch.map(|bytes| ::rlp::decode(&bytes).expect("decoding value from db failed")),
 			Err(e) => {
 				warn!(target: "chain", "Error reading from database: {}", e);
@@ -845,6 +832,12 @@ impl HeaderChain {
 	}
 }

+impl HeapSizeOf for HeaderChain {
+	fn heap_size_of_children(&self) -> usize {
+		self.candidates.read().heap_size_of_children()
+	}
+}
+
 /// Iterator over a block's ancestry.
 pub struct AncestryIter<'a> {
 	next: Option<encoded::Header>,
@@ -869,11 +862,11 @@ mod tests {
 	use super::{HeaderChain, HardcodedSync};
 	use std::sync::Arc;

-	use cache::Cache;
-	use common_types::header::Header;
-	use common_types::ids::BlockId;
-	use ethcore::spec::Spec;
 	use ethereum_types::U256;
+	use ethcore::ids::BlockId;
+	use ethcore::header::Header;
+	use ethcore::spec::Spec;
+	use cache::Cache;
 	use kvdb::KeyValueDB;
 	use kvdb_memorydb;

--- a/ethcore/light/src/client/mod.rs
+++ b/ethcore/light/src/client/mod.rs
@@ -1,39 +1,38 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light client implementation. Stores data from light sync

 use std::sync::{Weak, Arc};

-use ethcore::client::{ClientReport, EnvInfo, EngineClient, ClientIoMessage, ForceUpdateSealing};
-use ethcore::engines::{epoch, Engine, EpochChange, EpochTransition, Proof};
-use ethcore::error::{Error, EthcoreResult};
+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, BlockImportError};
+use ethcore::ids::BlockId;
+use ethcore::header::{BlockNumber, Header};
 use ethcore::verification::queue::{self, HeaderQueue};
+use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::spec::{Spec, SpecHardcodedSync};
+use ethcore::encoded;
 use io::IoChannel;
 use parking_lot::{Mutex, RwLock};
 use ethereum_types::{H256, U256};
 use futures::{IntoFuture, Future};
-use common_types::BlockNumber;
-use common_types::block_status::BlockStatus;
-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::header::Header;
-use common_types::ids::BlockId;
-use common_types::verification_queue_info::VerificationQueueInfo as BlockQueueInfo;

 use kvdb::KeyValueDB;

@@ -86,14 +85,11 @@ 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>;

-	/// Get block queue information.
-	fn queue_info(&self) -> BlockQueueInfo;
-
 	/// Attempt to get block header by block id.
 	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;

@@ -114,20 +110,20 @@ pub trait LightChainClient: Send + Sync {
 	fn env_info(&self, id: BlockId) -> Option<EnvInfo>;

 	/// Get a handle to the consensus engine.
-	fn engine(&self) -> &Arc<Engine>;
+	fn engine(&self) -> &Arc<EthEngine>;

 	/// Query whether a block is known.
 	fn is_known(&self, hash: &H256) -> bool;

-	/// Set the chain via a spec name.
-	fn set_spec_name(&self, new_spec_name: String) -> Result<(), ()>;
-
 	/// Clear the queue.
 	fn clear_queue(&self);

 	/// Flush the queue.
 	fn flush_queue(&self);

+	/// Get queue info.
+	fn queue_info(&self) -> queue::QueueInfo;
+
 	/// Get the `i`th CHT root.
 	fn cht_root(&self, i: usize) -> Option<H256>;

@@ -159,7 +155,7 @@ impl<T: LightChainClient> AsLightClient for T {
 /// Light client implementation.
 pub struct Client<T> {
 	queue: HeaderQueue,
-	engine: Arc<Engine>,
+	engine: Arc<EthEngine>,
 	chain: HeaderChain,
 	report: RwLock<ClientReport>,
 	import_lock: Mutex<()>,
@@ -167,8 +163,6 @@ pub struct Client<T> {
 	listeners: RwLock<Vec<Weak<LightChainNotify>>>,
 	fetcher: T,
 	verify_full: bool,
-	/// A closure to call when we want to restart the client
-	exit_handler: Mutex<Option<Box<Fn(String) + 'static + Send>>>,
 }

 impl<T: ChainDataFetcher> Client<T> {
@@ -195,7 +189,6 @@ impl<T: ChainDataFetcher> Client<T> {
 			listeners: RwLock::new(vec![]),
 			fetcher,
 			verify_full: config.verify_full,
-			exit_handler: Mutex::new(None),
 		})
 	}

@@ -213,8 +206,8 @@ impl<T: ChainDataFetcher> Client<T> {
 	}

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

 	/// Inquire about the status of a given header.
@@ -320,7 +313,7 @@ impl<T: ChainDataFetcher> Client<T> {
 					The node may not be able to synchronize further.", e);
 			}

-			let epoch_proof = self.engine.is_epoch_end_light(
+			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),
@@ -361,21 +354,13 @@ impl<T: ChainDataFetcher> Client<T> {

 	/// Get blockchain mem usage in bytes.
 	pub fn chain_mem_used(&self) -> usize {
-		use parity_util_mem::MallocSizeOfExt;
+		use heapsize::HeapSizeOf;

-		self.chain.malloc_size_of()
-	}
-
-	/// Set a closure to call when the client wants to be restarted.
-	///
-	/// The parameter passed to the callback is the name of the new chain spec to use after
-	/// the restart.
-	pub fn set_exit_handler<F>(&self, f: F) where F: Fn(String) + 'static + Send {
-		*self.exit_handler.lock() = Some(Box::new(f));
+		self.chain.heap_size_of_children()
 	}

 	/// Get a handle to the verification engine.
-	pub fn engine(&self) -> &Arc<Engine> {
+	pub fn engine(&self) -> &Arc<EthEngine> {
 		&self.engine
 	}

@@ -467,7 +452,7 @@ impl<T: ChainDataFetcher> Client<T> {
 		true
 	}

-	fn check_epoch_signal(&self, verified_header: &Header) -> Result<Option<Proof>, T::Error> {
+	fn check_epoch_signal(&self, verified_header: &Header) -> Result<Option<Proof<EthereumMachine>>, T::Error> {
 		use ethcore::machine::{AuxiliaryRequest, AuxiliaryData};

 		let mut block: Option<Vec<u8>> = None;
@@ -513,7 +498,7 @@ impl<T: ChainDataFetcher> Client<T> {
 	}

 	// attempts to fetch the epoch proof from the network until successful.
-	fn write_pending_proof(&self, header: &Header, proof: Proof) -> Result<(), T::Error> {
+	fn write_pending_proof(&self, header: &Header, proof: Proof<EthereumMachine>) -> Result<(), T::Error> {
 		let proof = match proof {
 			Proof::Known(known) => known,
 			Proof::WithState(state_dependent) => {
@@ -534,7 +519,6 @@ impl<T: ChainDataFetcher> Client<T> {
 	}
 }

-
 impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 	fn add_listener(&self, listener: Weak<LightChainNotify>) {
 		Client::add_listener(self, listener)
@@ -542,11 +526,7 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {

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

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

@@ -578,21 +558,10 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::env_info(self, id)
 	}

-	fn engine(&self) -> &Arc<Engine> {
+	fn engine(&self) -> &Arc<EthEngine> {
 		Client::engine(self)
 	}

-	fn set_spec_name(&self, new_spec_name: String) -> Result<(), ()> {
-		trace!(target: "mode", "Client::set_spec_name({:?})", new_spec_name);
-		if let Some(ref h) = *self.exit_handler.lock() {
-			(*h)(new_spec_name);
-			Ok(())
-		} else {
-			warn!("Not hypervised; cannot change chain.");
-			Err(())
-		}
-	}
-
 	fn is_known(&self, hash: &H256) -> bool {
 		self.status(hash) == BlockStatus::InChain
 	}
@@ -605,6 +574,10 @@ impl<T: ChainDataFetcher> LightChainClient for Client<T> {
 		Client::flush_queue(self);
 	}

+	fn queue_info(&self) -> queue::QueueInfo {
+		self.queue.queue_info()
+	}
+
 	fn cht_root(&self, i: usize) -> Option<H256> {
 		Client::cht_root(self, i)
 	}
@@ -620,8 +593,8 @@ impl<T: ChainDataFetcher> ::ethcore::client::ChainInfo for Client<T> {
 	}
 }

-impl<T: ChainDataFetcher> EngineClient for Client<T> {
-	fn update_sealing(&self, _force: ForceUpdateSealing) {}
+impl<T: ChainDataFetcher> ::ethcore::client::EngineClient for Client<T> {
+	fn update_sealing(&self) { }
 	fn submit_seal(&self, _block_hash: H256, _seal: Vec<Vec<u8>>) { }
 	fn broadcast_consensus_message(&self, _message: Vec<u8>) { }

--- a/ethcore/light/src/client/service.rs
+++ b/ethcore/light/src/client/service.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Minimal IO service for light client.
 //! Just handles block import messages and passes them to the client.
@@ -20,9 +20,8 @@
 use std::fmt;
 use std::sync::Arc;

-use ethcore_db as db;
-use ethcore_blockchain::BlockChainDB;
 use ethcore::client::ClientIoMessage;
+use ethcore::{db, BlockChainDB};
 use ethcore::error::Error as CoreError;
 use ethcore::spec::Spec;
 use io::{IoContext, IoError, IoHandler, IoService};
@@ -75,8 +74,9 @@ impl<T: ChainDataFetcher> Service<T> {
 			io_service.channel(),
 			cache,
 		)?);
-		spec.engine.register_client(Arc::downgrade(&client) as _);
+
 		io_service.register_handler(Arc::new(ImportBlocks(client.clone()))).map_err(Error::Io)?;
+		spec.engine.register_client(Arc::downgrade(&client) as _);

 		Ok(Service {
 			client,
--- a/ethcore/light/src/lib.rs
+++ b/ethcore/light/src/lib.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light client logic and implementation.
 //!
@@ -54,25 +54,19 @@ extern crate serde_derive;
 extern crate log;

 extern crate bincode;
-extern crate common_types;
-extern crate ethcore_blockchain;
-extern crate ethcore_db;
 extern crate ethcore_io as io;
 extern crate ethcore_network as network;
 extern crate parity_bytes as bytes;
+extern crate ethcore_transaction as transaction;
 extern crate ethereum_types;
-extern crate ethcore_miner as miner;
 extern crate ethcore;
-extern crate hash_db;
-extern crate parity_util_mem;
-extern crate parity_util_mem as mem;
-extern crate parity_util_mem as malloc_size_of;
-extern crate failsafe;
+extern crate hashdb;
+extern crate heapsize;
 extern crate futures;
 extern crate itertools;
 extern crate keccak_hasher;
-extern crate memory_db;
-extern crate trie_db as trie;
+extern crate memorydb;
+extern crate patricia_trie as trie;
 extern crate patricia_trie_ethereum as ethtrie;
 extern crate fastmap;
 extern crate rand;
@@ -88,10 +82,10 @@ extern crate keccak_hash as hash;
 extern crate triehash_ethereum as triehash;
 extern crate kvdb;
 extern crate memory_cache;
-extern crate derive_more;
+#[macro_use]
+extern crate error_chain;

 #[cfg(test)]
 extern crate kvdb_memorydb;
 #[cfg(test)]
 extern crate tempdir;
-extern crate journaldb;
--- a/ethcore/light/src/net/context.rs
+++ b/ethcore/light/src/net/context.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! I/O and event context generalizations.

--- a/ethcore/light/src/net/error.rs
+++ b/ethcore/light/src/net/error.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Defines error types and levels of punishment to use upon
 //! encountering.
--- a/ethcore/light/src/net/load_timer.rs
+++ b/ethcore/light/src/net/load_timer.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request load timer and distribution manager.
 //!
@@ -199,15 +199,15 @@ pub struct FileStore(pub PathBuf);
 impl SampleStore for FileStore {
 	fn load(&self) -> HashMap<Kind, VecDeque<u64>> {
 		File::open(&self.0)
-			.map_err(|e| Box::new(bincode::ErrorKind::Io(e)))
-			.and_then(|mut file| bincode::deserialize_from(&mut file))
+			.map_err(|e| Box::new(bincode::ErrorKind::IoError(e)))
+			.and_then(|mut file| bincode::deserialize_from(&mut file, bincode::Infinite))
 			.unwrap_or_else(|_| HashMap::new())
 	}

 	fn store(&self, samples: &HashMap<Kind, VecDeque<u64>>) {
 		let res = File::create(&self.0)
-			.map_err(|e| Box::new(bincode::ErrorKind::Io(e)))
-			.and_then(|mut file| bincode::serialize_into(&mut file, samples));
+			.map_err(|e| Box::new(bincode::ErrorKind::IoError(e)))
+			.and_then(|mut file| bincode::serialize_into(&mut file, samples, bincode::Infinite));

 		if let Err(e) = res {
 			warn!(target: "pip", "Error writing light request timing samples to file: {}", e);
--- a/ethcore/light/src/net/mod.rs
+++ b/ethcore/light/src/net/mod.rs
@@ -1,24 +1,25 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! PLP Protocol Version 1 implementation.
 //!
 //! This uses a "Provider" to answer requests.

-use common_types::transaction::UnverifiedTransaction;
+use transaction::UnverifiedTransaction;
+
 use ethereum_types::{H256, U256};
 use io::TimerToken;
 use kvdb::DBValue;
@@ -27,7 +28,7 @@ use parking_lot::{Mutex, RwLock};
 use provider::Provider;
 use request::{Request, NetworkRequests as Requests, Response};
 use rlp::{RlpStream, Rlp};
-use std::collections::{HashMap, HashSet, VecDeque};
+use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::ops::{BitOr, BitAnd, Not};
 use std::sync::Arc;
@@ -37,7 +38,7 @@ use std::time::{Duration, Instant};
 use self::request_credits::{Credits, FlowParams};
 use self::context::{Ctx, TickCtx};
 use self::error::Punishment;
-use self::load_timer::{LoadDistribution, NullStore, MOVING_SAMPLE_SIZE};
+use self::load_timer::{LoadDistribution, NullStore};
 use self::request_set::RequestSet;
 use self::id_guard::IdGuard;

@@ -69,16 +70,6 @@ const PROPAGATE_TIMEOUT_INTERVAL: Duration = Duration::from_secs(5);
 const RECALCULATE_COSTS_TIMEOUT: TimerToken = 3;
 const RECALCULATE_COSTS_INTERVAL: Duration = Duration::from_secs(60 * 60);

-const STATISTICS_TIMEOUT: TimerToken = 4;
-const STATISTICS_INTERVAL: Duration = Duration::from_secs(15);
-
-/// Maximum load share for the light server
-pub const MAX_LIGHTSERV_LOAD: f64 = 0.5;
-
-/// Factor to multiply leecher count to cater for
-/// extra sudden connections (should be >= 1.0)
-pub const LEECHER_COUNT_FACTOR: f64 = 1.25;
-
 // minimum interval between updates.
 const UPDATE_INTERVAL: Duration = Duration::from_millis(5000);

@@ -265,18 +256,18 @@ pub trait Handler: Send + Sync {
 pub struct Config {
 	/// How many stored seconds of credits peers should be able to accumulate.
 	pub max_stored_seconds: u64,
-	/// The network config median peers (used as default peer count)
-	pub median_peers: f64,
+	/// How much of the total load capacity each peer should be allowed to take.
+	pub load_share: f64,
 }

 impl Default for Config {
 	fn default() -> Self {
-		const MEDIAN_PEERS: f64 = 25.0;
+		const LOAD_SHARE: f64 = 1.0 / 25.0;
 		const MAX_ACCUMULATED: u64 = 60 * 5; // only charge for 5 minutes.

 		Config {
 			max_stored_seconds: MAX_ACCUMULATED,
-			median_peers: MEDIAN_PEERS,
+			load_share: LOAD_SHARE,
 		}
 	}
 }
@@ -344,42 +335,6 @@ mod id_guard {
 	}
 }

-/// Provides various statistics that could
-/// be used to compute costs
-pub struct Statistics {
-	/// Samples of peer count
-	peer_counts: VecDeque<usize>,
-}
-
-impl Statistics {
-	/// Create a new Statistics instance
-	pub fn new() -> Self {
-		Statistics {
-			peer_counts: VecDeque::with_capacity(MOVING_SAMPLE_SIZE),
-		}
-	}
-
-	/// Add a new peer_count sample
-	pub fn add_peer_count(&mut self, peer_count: usize) {
-		while self.peer_counts.len() >= MOVING_SAMPLE_SIZE {
-			self.peer_counts.pop_front();
-		}
-		self.peer_counts.push_back(peer_count);
-	}
-
-	/// Get the average peer count from previous samples. Is always >= 1.0
-	pub fn avg_peer_count(&self) -> f64 {
-		let len = self.peer_counts.len();
-		if len == 0 {
-			return 1.0;
-		}
-		let avg = self.peer_counts.iter()
-			.fold(0, |sum: u32, &v| sum.saturating_add(v as u32)) as f64
-			/ len as f64;
-		avg.max(1.0)
-	}
-}
-
 /// This is an implementation of the light ethereum network protocol, abstracted
 /// over a `Provider` of data and a p2p network.
 ///
@@ -404,7 +359,6 @@ pub struct LightProtocol {
 	req_id: AtomicUsize,
 	sample_store: Box<SampleStore>,
 	load_distribution: LoadDistribution,
-	statistics: RwLock<Statistics>,
 }

 impl LightProtocol {
@@ -415,11 +369,9 @@ impl LightProtocol {
 		let genesis_hash = provider.chain_info().genesis_hash;
 		let sample_store = params.sample_store.unwrap_or_else(|| Box::new(NullStore));
 		let load_distribution = LoadDistribution::load(&*sample_store);
-		// Default load share relative to median peers
-		let load_share = MAX_LIGHTSERV_LOAD / params.config.median_peers;
 		let flow_params = FlowParams::from_request_times(
 			|kind| load_distribution.expected_time(kind),
-			load_share,
+			params.config.load_share,
 			Duration::from_secs(params.config.max_stored_seconds),
 		);

@@ -437,7 +389,6 @@ impl LightProtocol {
 			req_id: AtomicUsize::new(0),
 			sample_store,
 			load_distribution,
-			statistics: RwLock::new(Statistics::new()),
 		}
 	}

@@ -457,16 +408,6 @@ impl LightProtocol {
 		)
 	}

-	/// Get the number of active light peers downloading from the
-	/// node
-	pub fn leecher_count(&self) -> usize {
-		let credit_limit = *self.flow_params.read().limit();
-		// Count the number of peers that used some credit
-		self.peers.read().iter()
-			.filter(|(_, p)| p.lock().local_credits.current() < credit_limit)
-			.count()
-	}
-
 	/// Make a request to a peer.
 	///
 	/// Fails on: nonexistent peer, network error, peer not server,
@@ -533,9 +474,6 @@ impl LightProtocol {
 			// 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 ||
-				// fix for underflow reported in
-				// https://github.com/paritytech/parity-ethereum/issues/10419
-				now < peer_info.last_update ||
 				now - peer_info.last_update < UPDATE_INTERVAL {
 				continue
 			}
@@ -834,16 +772,12 @@ impl LightProtocol {
 	fn begin_new_cost_period(&self, io: &IoContext) {
 		self.load_distribution.end_period(&*self.sample_store);

-		let avg_peer_count = self.statistics.read().avg_peer_count();
-		// Load share relative to average peer count +LEECHER_COUNT_FACTOR%
-		let load_share = MAX_LIGHTSERV_LOAD / (avg_peer_count * LEECHER_COUNT_FACTOR);
 		let new_params = Arc::new(FlowParams::from_request_times(
 			|kind| self.load_distribution.expected_time(kind),
-			load_share,
+			self.config.load_share,
 			Duration::from_secs(self.config.max_stored_seconds),
 		));
 		*self.flow_params.write() = new_params.clone();
-		trace!(target: "pip", "New cost period: avg_peers={} ; cost_table:{:?}", avg_peer_count, new_params.cost_table());

 		let peers = self.peers.read();
 		let now = Instant::now();
@@ -863,11 +797,6 @@ impl LightProtocol {
 			peer_info.awaiting_acknowledge = Some((now, new_params.clone()));
 		}
 	}
-
-	fn tick_statistics(&self) {
-		let leecher_count = self.leecher_count();
-		self.statistics.write().add_peer_count(leecher_count);
-	}
 }

 impl LightProtocol {
@@ -1170,8 +1099,6 @@ impl NetworkProtocolHandler for LightProtocol {
 			.expect("Error registering sync timer.");
 		io.register_timer(RECALCULATE_COSTS_TIMEOUT, RECALCULATE_COSTS_INTERVAL)
 			.expect("Error registering request timer interval token.");
-		io.register_timer(STATISTICS_TIMEOUT, STATISTICS_INTERVAL)
-			.expect("Error registering statistics timer.");
 	}

 	fn read(&self, io: &NetworkContext, peer: &PeerId, packet_id: u8, data: &[u8]) {
@@ -1192,7 +1119,6 @@ impl NetworkProtocolHandler for LightProtocol {
 			TICK_TIMEOUT => self.tick_handlers(&io),
 			PROPAGATE_TIMEOUT => self.propagate_transactions(&io),
 			RECALCULATE_COSTS_TIMEOUT => self.begin_new_cost_period(&io),
-			STATISTICS_TIMEOUT => self.tick_statistics(),
 			_ => warn!(target: "pip", "received timeout on unknown token {}", timer),
 		}
 	}
--- a/ethcore/light/src/net/request_credits.rs
+++ b/ethcore/light/src/net/request_credits.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request credit management.
 //!
--- a/ethcore/light/src/net/request_set.rs
+++ b/ethcore/light/src/net/request_set.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Pending request set.
 //!
--- a/ethcore/light/src/net/status.rs
+++ b/ethcore/light/src/net/status.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Peer status and capabilities.

@@ -382,7 +382,7 @@ mod tests {
 			protocol_version: 1,
 			network_id: 1,
 			head_td: U256::default(),
-			head_hash: H256::zero(),
+			head_hash: H256::default(),
 			head_num: 10,
 			genesis_hash: H256::zero(),
 			last_head: None,
@@ -417,7 +417,7 @@ mod tests {
 			protocol_version: 1,
 			network_id: 1,
 			head_td: U256::default(),
-			head_hash: H256::zero(),
+			head_hash: H256::default(),
 			head_num: 10,
 			genesis_hash: H256::zero(),
 			last_head: None,
@@ -452,7 +452,7 @@ mod tests {
 			protocol_version: 1,
 			network_id: 1,
 			head_td: U256::default(),
-			head_hash: H256::zero(),
+			head_hash: H256::default(),
 			head_num: 10,
 			genesis_hash: H256::zero(),
 			last_head: None,
@@ -550,7 +550,7 @@ mod tests {
 			protocol_version: 1,
 			network_id: 1,
 			head_td: U256::default(),
-			head_hash: H256::zero(),
+			head_hash: H256::default(),
 			head_num: 10,
 			genesis_hash: H256::zero(),
 			last_head: None,
--- a/ethcore/light/src/net/tests/mod.rs
+++ b/ethcore/light/src/net/tests/mod.rs
@@ -1,37 +1,36 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Tests for the `LightProtocol` implementation.
 //! These don't test of the higher level logic on top of

-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::ids::BlockId;
-use common_types::transaction::{Action, PendingTransaction};
+use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{EachBlockWith, TestBlockChainClient};
-use ethereum_types::{H256, U256, Address, BigEndianHash};
+use ethcore::encoded;
+use ethcore::ids::BlockId;
+use ethereum_types::{H256, U256, Address};
+use net::{LightProtocol, Params, packet, Peer};
 use net::context::IoContext;
-use net::load_timer::MOVING_SAMPLE_SIZE;
 use net::status::{Capabilities, Status};
-use net::{LightProtocol, Params, packet, Peer, Statistics};
 use network::{PeerId, NodeId};
 use provider::Provider;
-use request::*;
 use request;
+use request::*;
 use rlp::{Rlp, RlpStream};
+use transaction::{Action, PendingTransaction};

 use std::sync::Arc;
 use std::time::Instant;
@@ -151,14 +150,14 @@ impl Provider for TestProvider {

 	fn storage_proof(&self, req: request::CompleteStorageRequest) -> Option<request::StorageResponse> {
 		Some(StorageResponse {
-			proof: vec![::rlp::encode(&req.key_hash)],
+			proof: vec![::rlp::encode(&req.key_hash).into_vec()],
 			value: req.key_hash | req.address_hash,
 		})
 	}

 	fn contract_code(&self, req: request::CompleteCodeRequest) -> Option<request::CodeResponse> {
 		Some(CodeResponse {
-			code: req.block_hash.as_bytes().iter().chain(req.code_hash.as_bytes().iter()).cloned().collect(),
+			code: req.block_hash.iter().chain(req.code_hash.iter()).cloned().collect(),
 		})
 	}

@@ -261,7 +260,7 @@ fn genesis_mismatch() {
 	let (provider, proto) = setup(capabilities);

 	let mut status = status(provider.client.chain_info());
-	status.genesis_hash = H256::zero();
+	status.genesis_hash = H256::default();

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

@@ -472,16 +471,16 @@ fn get_state_proofs() {
 	}

 	let req_id = 112;
-	let key1: H256 = BigEndianHash::from_uint(&U256::from(11223344));
-	let key2: H256 = BigEndianHash::from_uint(&U256::from(99988887));
+	let key1: H256 = U256::from(11223344).into();
+	let key2: H256 = U256::from(99988887).into();

 	let mut builder = Builder::default();
 	builder.push(Request::Account(IncompleteAccountRequest {
-		block_hash: H256::zero().into(),
+		block_hash: H256::default().into(),
 		address_hash: key1.into(),
 	})).unwrap();
 	builder.push(Request::Storage(IncompleteStorageRequest {
-		block_hash: H256::zero().into(),
+		block_hash: H256::default().into(),
 		address_hash: key1.into(),
 		key_hash: key2.into(),
 	})).unwrap();
@@ -492,11 +491,11 @@ fn get_state_proofs() {
 	let response = {
 		let responses = vec![
 			Response::Account(provider.account_proof(CompleteAccountRequest {
-				block_hash: H256::zero(),
+				block_hash: H256::default(),
 				address_hash: key1,
 			}).unwrap()),
 			Response::Storage(provider.storage_proof(CompleteStorageRequest {
-				block_hash: H256::zero(),
+				block_hash: H256::default(),
 				address_hash: key1,
 				key_hash: key2,
 			}).unwrap()),
@@ -529,8 +528,8 @@ fn get_contract_code() {
 	}

 	let req_id = 112;
-	let key1: H256 = BigEndianHash::from_uint(&U256::from(11223344));
-	let key2: H256 = BigEndianHash::from_uint(&U256::from(99988887));
+	let key1: H256 = U256::from(11223344).into();
+	let key2: H256 = U256::from(99988887).into();

 	let request = Request::Code(IncompleteCodeRequest {
 		block_hash: key1.into(),
@@ -541,7 +540,7 @@ fn get_contract_code() {
 	let request_body = make_packet(req_id, &requests);
 	let response = {
 		let response = vec![Response::Code(CodeResponse {
-			code: key1.as_bytes().iter().chain(key2.as_bytes().iter()).cloned().collect(),
+			code: key1.iter().chain(key2.iter()).cloned().collect(),
 		})];

 		let new_creds = *flow_params.limit() - flow_params.compute_cost_multi(requests.requests()).unwrap();
@@ -616,9 +615,9 @@ fn proof_of_execution() {

 	let req_id = 112;
 	let mut request = Request::Execution(request::IncompleteExecutionRequest {
-		block_hash: H256::zero().into(),
-		from: Address::zero(),
-		action: Action::Call(Address::zero()),
+		block_hash: H256::default().into(),
+		from: Address::default(),
+		action: Action::Call(Address::default()),
 		gas: 100.into(),
 		gas_price: 0.into(),
 		value: 0.into(),
@@ -755,7 +754,7 @@ fn get_transaction_index() {
 	}

 	let req_id = 112;
-	let key1: H256 = BigEndianHash::from_uint(&U256::from(11223344));
+	let key1: H256 = U256::from(11223344).into();

 	let request = Request::TransactionIndex(IncompleteTransactionIndexRequest {
 		hash: key1.into(),
@@ -781,34 +780,3 @@ fn get_transaction_index() {
 	let expected = Expect::Respond(packet::RESPONSE, response);
 	proto.handle_packet(&expected, 1, packet::REQUEST, &request_body);
 }
-
-#[test]
-fn sync_statistics() {
-	let mut stats = Statistics::new();
-
-	// Empty set should return 1.0
-	assert_eq!(stats.avg_peer_count(), 1.0);
-
-	// Average < 1.0 should return 1.0
-	stats.add_peer_count(0);
-	assert_eq!(stats.avg_peer_count(), 1.0);
-
-	stats = Statistics::new();
-
-	const N: f64 = 50.0;
-
-	for i in 1..(N as usize + 1) {
-		stats.add_peer_count(i);
-	}
-
-	// Compute the average for the sum 1..N
-	assert_eq!(stats.avg_peer_count(), N * (N + 1.0) / 2.0 / N);
-
-	for _ in 1..(MOVING_SAMPLE_SIZE + 1) {
-		stats.add_peer_count(40);
-	}
-
-	// Test that it returns the average of the last
-	// `MOVING_SAMPLE_SIZE` values
-	assert_eq!(stats.avg_peer_count(), 40.0);
-}
--- a/ethcore/light/src/on_demand/mod.rs
+++ b/ethcore/light/src/on_demand/mod.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! On-demand chain requests over LES. This is a major building block for RPCs.
 //! The request service is implemented using Futures. Higher level request handlers
@@ -22,97 +22,34 @@ use std::cmp;
 use std::collections::HashMap;
 use std::marker::PhantomData;
 use std::sync::Arc;
-use std::time::Duration;

-use futures::{Poll, Future, Async};
-use futures::sync::oneshot::{self, Receiver};
+use ethcore::executed::{Executed, ExecutionError};
+
+use futures::{Poll, Future};
+use futures::sync::oneshot::{self, Receiver, Canceled};
 use network::PeerId;
 use parking_lot::{RwLock, Mutex};
 use rand;
-use rand::Rng;

 use net::{
-	Handler, PeerStatus, Status, Capabilities,
+	self, Handler, PeerStatus, Status, Capabilities,
 	Announcement, EventContext, BasicContext, ReqId,
 };
-
 use cache::Cache;
 use request::{self as basic_request, Request as NetworkRequest};
 use self::request::CheckedRequest;

-pub use ethcore::executed::ExecutionResult;
-pub use self::request::{Request, Response, HeaderRef, Error as ValidityError};
-pub use self::request_guard::{RequestGuard, Error as RequestError};
-pub use self::response_guard::{ResponseGuard, Error as ResponseGuardError, Inner as ResponseGuardInner};
-pub use types::request::ResponseError;
+pub use self::request::{Request, Response, HeaderRef};

 #[cfg(test)]
 mod tests;

 pub mod request;
-mod request_guard;
-mod response_guard;
-
-/// The initial backoff interval for OnDemand queries
-pub const DEFAULT_REQUEST_MIN_BACKOFF_DURATION: Duration = Duration::from_secs(10);
-/// The maximum request interval for OnDemand queries
-pub const DEFAULT_REQUEST_MAX_BACKOFF_DURATION: Duration = Duration::from_secs(100);
-/// The default window length a response is evaluated
-pub const DEFAULT_RESPONSE_TIME_TO_LIVE: Duration = Duration::from_secs(10);
-/// The default number of maximum backoff iterations
-pub const DEFAULT_MAX_REQUEST_BACKOFF_ROUNDS: usize = 10;
-/// The default number failed request to be regarded as failure
-pub const DEFAULT_NUM_CONSECUTIVE_FAILED_REQUESTS: usize = 1;
-
-/// OnDemand related errors
-pub mod error {
-	use futures::sync::oneshot::Canceled;
-
-	/// OnDemand Error
-	#[derive(Debug, derive_more::Display, derive_more::From)]
-	pub enum Error {
-		/// Canceled oneshot channel
-		ChannelCanceled(Canceled),
-		/// Timeout bad response
-		BadResponse(String),
-		/// OnDemand requests limit exceeded
-		#[display(fmt = "OnDemand request maximum backoff iterations exceeded")]
-		RequestLimit,
-	}
-
-	impl std::error::Error for Error {
-		fn source(&self) -> Option<&(std::error::Error + 'static)> {
-			match self {
-				Error::ChannelCanceled(err) => Some(err),
-				_ => None,
-			}
-		}
-	}
-
-	/// OnDemand Result
-	pub type Result<T> = std::result::Result<T, Error>;
-}
-
-/// Public interface for performing network requests `OnDemand`
-pub trait OnDemandRequester: Send + Sync {
-	/// Submit a strongly-typed batch of requests.
-	///
-	/// Fails if back-reference are not coherent.
-	fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
-	where
-		T: request::RequestAdapter;
-
-	/// Submit a vector of requests to be processed together.
-	///
-	/// Fails if back-references are not coherent.
-	/// The returned vector of responses will correspond to the requests exactly.
-	fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
-		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>;
-}

+/// The result of execution
+pub type ExecutionResult = Result<Executed, ExecutionError>;

 // relevant peer info.
-#[derive(Debug, Clone, PartialEq, Eq)]
 struct Peer {
 	status: Status,
 	capabilities: Capabilities,
@@ -137,18 +74,13 @@ impl Peer {
 	}
 }

-/// 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>,
-	request_guard: RequestGuard,
-	response_guard: ResponseGuard,
+	sender: oneshot::Sender<Vec<Response>>,
 }

 impl Pending {
@@ -210,9 +142,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 request");
-			}
+			let _ = self.sender.send(self.responses);
 			None
 		} else {
 			Some(self)
@@ -247,43 +177,6 @@ impl Pending {
 		self.net_requests = builder.build();
 		self.required_capabilities = capabilities;
 	}
-
-	// received too many empty responses, may be away to indicate a faulty request
-	fn bad_response(self, response_err: ResponseGuardError) {
-		let reqs: Vec<&str> = self.requests.requests().iter().map(|req| {
-			match req {
-				CheckedRequest::HeaderProof(_, _) => "HeaderProof",
-				CheckedRequest::HeaderByHash(_, _) => "HeaderByHash",
-				CheckedRequest::HeaderWithAncestors(_, _) => "HeaderWithAncestors",
-				CheckedRequest::TransactionIndex(_, _) => "TransactionIndex",
-				CheckedRequest::Receipts(_, _) => "Receipts",
-				CheckedRequest::Body(_, _) => "Body",
-				CheckedRequest::Account(_, _) => "Account",
-				CheckedRequest::Code(_, _) => "Code",
-				CheckedRequest::Execution(_, _) => "Execution",
-				CheckedRequest::Signal(_, _) => "Signal",
-			}
-		}).collect();
-
-		let err = format!("Bad response on {}: [ {} ]. {}",
-			if reqs.len() > 1 { "requests" } else { "request" },
-			reqs.join(", "),
-			response_err
-		);
-
-		let err = self::error::Error::BadResponse(err);
-		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 request_limit_reached(self) {
-		let err = self::error::Error::RequestLimit;
-		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.
@@ -337,21 +230,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))
 	}
 }

@@ -365,20 +253,40 @@ pub struct OnDemand {
 	in_transit: RwLock<HashMap<ReqId, Pending>>,
 	cache: Arc<Mutex<Cache>>,
 	no_immediate_dispatch: bool,
-	response_time_window: Duration,
-	request_backoff_start: Duration,
-	request_backoff_max: Duration,
-	request_backoff_rounds_max: usize,
-	request_number_of_consecutive_errors: usize
 }

-impl OnDemandRequester for OnDemand {
-	fn request_raw(&self, ctx: &BasicContext, requests: Vec<Request>)
-		-> Result<Receiver<PendingResponse>, basic_request::NoSuchOutput>
+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,
+			no_immediate_dispatch: false,
+		}
+	}
+
+	// make a test version: this doesn't dispatch pending requests
+	// until you trigger it manually.
+	#[cfg(test)]
+	fn new_test(cache: Arc<Mutex<Cache>>) -> Self {
+		let mut me = OnDemand::new(cache);
+		me.no_immediate_dispatch = true;
+
+		me
+	}
+
+	/// Submit a vector of requests to be processed together.
+	///
+	/// 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<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);
 		}

@@ -417,19 +325,15 @@ impl OnDemandRequester for OnDemand {
 			required_capabilities: capabilities,
 			responses,
 			sender,
-			request_guard: RequestGuard::new(
-				self.request_number_of_consecutive_errors as u32,
-				self.request_backoff_rounds_max,
-				self.request_backoff_start,
-				self.request_backoff_max,
-			),
-			response_guard: ResponseGuard::new(self.response_time_window),
 		});

 		Ok(receiver)
 	}

-	fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
+	/// Submit a strongly-typed batch of requests.
+	///
+	/// Fails if back-reference are not coherent.
+	pub fn request<T>(&self, ctx: &BasicContext, requests: T) -> Result<OnResponses<T>, basic_request::NoSuchOutput>
 		where T: request::RequestAdapter
 	{
 		self.request_raw(ctx, requests.make_requests()).map(|recv| OnResponses {
@@ -438,69 +342,6 @@ impl OnDemandRequester for OnDemand {
 		})
 	}

-}
-
-impl OnDemand {
-
-	/// Create a new `OnDemand` service with the given cache.
-	pub fn new(
-		cache: Arc<Mutex<Cache>>,
-		response_time_window: Duration,
-		request_backoff_start: Duration,
-		request_backoff_max: Duration,
-		request_backoff_rounds_max: usize,
-		request_number_of_consecutive_errors: usize,
-	) -> Self {
-
-		Self {
-			pending: RwLock::new(Vec::new()),
-			peers: RwLock::new(HashMap::new()),
-			in_transit: RwLock::new(HashMap::new()),
-			cache,
-			no_immediate_dispatch: false,
-			response_time_window: Self::sanitize_circuit_breaker_input(response_time_window, "Response time window"),
-			request_backoff_start: Self::sanitize_circuit_breaker_input(request_backoff_start, "Request initial backoff time window"),
-			request_backoff_max: Self::sanitize_circuit_breaker_input(request_backoff_max, "Request maximum backoff time window"),
-			request_backoff_rounds_max,
-			request_number_of_consecutive_errors,
-		}
-	}
-
-	fn sanitize_circuit_breaker_input(dur: Duration, name: &'static str) -> Duration {
-		if dur.as_secs() < 1 {
-			warn!(target: "on_demand",
-				"{} is too short must be at least 1 second, configuring it to 1 second", name);
-			Duration::from_secs(1)
-		} else {
-			dur
-		}
-	}
-
-	// make a test version: this doesn't dispatch pending requests
-	// until you trigger it manually.
-	#[cfg(test)]
-	fn new_test(
-		cache: Arc<Mutex<Cache>>,
-		request_ttl: Duration,
-		request_backoff_start: Duration,
-		request_backoff_max: Duration,
-		request_backoff_rounds_max: usize,
-		request_number_of_consecutive_errors: usize,
-	) -> Self {
-		let mut me = OnDemand::new(
-			cache,
-			request_ttl,
-			request_backoff_start,
-			request_backoff_max,
-			request_backoff_rounds_max,
-			request_number_of_consecutive_errors,
-		);
-		me.no_immediate_dispatch = true;
-
-		me
-	}
-
-
 	// maybe dispatch pending requests.
 	// sometimes
 	fn attempt_dispatch(&self, ctx: &BasicContext) {
@@ -512,56 +353,44 @@ impl OnDemand {
 	// dispatch pending requests, and discard those for which the corresponding
 	// receiver has been dropped.
 	fn dispatch_pending(&self, ctx: &BasicContext) {
-		if self.pending.read().is_empty() {
-			return
-		}
-
+		if self.pending.read().is_empty() { return }
 		let mut pending = self.pending.write();

+		debug!(target: "on_demand", "Attempting to dispatch {} pending requests", pending.len());
+
 		// iterate over all pending requests, and check them for hang-up.
 		// then, try and find a peer who can serve it.
 		let peers = self.peers.read();
-
-		*pending = ::std::mem::replace(&mut *pending, Vec::new())
-			.into_iter()
+		*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();
-				// The first peer to dispatch the request is chosen at random
-				let rand = rand::thread_rng().gen_range(0, cmp::max(1, num_peers));
-
-				for (peer_id, peer) in peers
-					.iter()
-					.cycle()
-					.skip(rand)
-					.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 !peer.can_fulfill(&pending.required_capabilities) {
-						trace!(target: "on_demand", "Peer {} without required capabilities, skipping", peer_id);
 						continue
 					}

-					if pending.request_guard.is_call_permitted() {
-						if let Ok(req_id) = ctx.request_from(*peer_id, pending.net_requests.clone()) {
+					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;
+							return None
 						}
+						Err(net::Error::NoCredits) | Err(net::Error::NotServer) => {}
+						Err(e) => debug!(target: "on_demand", "Error dispatching request to peer: {}", e),
 					}
 				}

-				// Register that the request round failed
-				if let RequestError::ReachedLimit = pending.request_guard.register_error() {
-					pending.request_limit_reached();
-					None
-				} else {
-					Some(pending)
-				}
-		})
-		.collect(); // `pending` now contains all requests we couldn't dispatch
+				// TODO: maximum number of failures _when we have peers_.
+				Some(pending)
+			})
+			.collect(); // `pending` now contains all requests we couldn't dispatch.

-		trace!(target: "on_demand", "Was unable to dispatch {} requests.", pending.len());
+		debug!(target: "on_demand", "Was unable to dispatch {} requests.", pending.len());
 	}

 	// submit a pending request set. attempts to answer from cache before
@@ -572,11 +401,8 @@ impl OnDemand {

 		pending.answer_from_cache(&*self.cache);
 		if let Some(mut pending) = pending.try_complete() {
-			// update cached requests
 			pending.update_net_requests();
-			// push into `pending` buffer
 			self.pending.write().push(pending);
-			// try to dispatch
 			self.attempt_dispatch(ctx);
 		}
 	}
@@ -632,14 +458,6 @@ impl Handler for OnDemand {
 			None => return,
 		};

-		if responses.is_empty() {
-			// Max number of `bad` responses reached, drop the request
-			if let Err(e) = pending.response_guard.register_error(&ResponseError::Validity(ValidityError::Empty)) {
-				pending.bad_response(e);
-				return;
-			}
-		}
-
 		// for each incoming response
 		//   1. ensure verification data filled.
 		//   2. pending.requests.supply_response
@@ -650,11 +468,7 @@ impl Handler for OnDemand {
 				debug!(target: "on_demand", "Peer {} gave bad response: {:?}", peer, e);
 				ctx.disable_peer(peer);

-				// Max number of `bad` responses reached, drop the request
-				if let Err(err) = pending.response_guard.register_error(&e) {
-					pending.bad_response(err);
-					return;
-				}
+				break;
 			}
 		}

--- a/ethcore/light/src/on_demand/request.rs
+++ b/ethcore/light/src/on_demand/request.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

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

@@ -20,20 +20,22 @@ use std::cmp;
 use std::sync::Arc;

 use bytes::Bytes;
-use common_types::basic_account::BasicAccount;
-use common_types::encoded;
-use common_types::receipt::Receipt;
-use common_types::transaction::SignedTransaction;
-use ethcore::engines::{Engine, StateDependentProof};
+use ethcore::basic_account::BasicAccount;
+use ethcore::encoded;
+use ethcore::engines::{EthEngine, StateDependentProof};
+use ethcore::machine::EthereumMachine;
+use ethcore::receipt::Receipt;
 use ethcore::state::{self, ProvedExecution};
 use ethereum_types::{H256, U256, Address};
 use ethtrie::{TrieError, TrieDB};
 use hash::{KECCAK_NULL_RLP, KECCAK_EMPTY, KECCAK_EMPTY_LIST_RLP, keccak};
-use hash_db::HashDB;
+use hashdb::HashDB;
 use kvdb::DBValue;
+use memorydb::MemoryDB;
 use parking_lot::Mutex;
 use request::{self as net_request, IncompleteRequest, CompleteRequest, Output, OutputKind, Field};
 use rlp::{RlpStream, Rlp};
+use transaction::SignedTransaction;
 use trie::Trie;
 use vm::EnvInfo;

@@ -979,10 +981,10 @@ impl Account {
 		let header = self.header.as_ref()?;
 		let state_root = header.state_root();

-		let mut db = journaldb::new_memory_db();
-		for node in proof { db.insert(hash_db::EMPTY_PREFIX, &node[..]); }
+		let mut db = MemoryDB::new();
+		for node in proof { db.insert(&node[..]); }

-		match TrieDB::new(&db, &state_root).and_then(|t| t.get(keccak(&self.address).as_bytes()))? {
+		match TrieDB::new(&db, &state_root).and_then(|t| t.get(&keccak(&self.address)))? {
 			Some(val) => {
 				let rlp = Rlp::new(&val);
 				Ok(Some(BasicAccount {
@@ -1037,7 +1039,7 @@ pub struct TransactionProof {
 	// TODO: it's not really possible to provide this if the header is unknown.
 	pub env_info: EnvInfo,
 	/// Consensus engine.
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 }

 impl TransactionProof {
@@ -1080,9 +1082,9 @@ pub struct Signal {
 	/// Block hash and number to fetch proof for.
 	pub hash: H256,
 	/// Consensus engine, used to check the proof.
-	pub engine: Arc<Engine>,
+	pub engine: Arc<EthEngine>,
 	/// Special checker for the proof.
-	pub proof_check: Arc<StateDependentProof>,
+	pub proof_check: Arc<StateDependentProof<EthereumMachine>>,
 }

 impl Signal {
@@ -1099,16 +1101,17 @@ mod tests {
 	use super::*;
 	use std::time::Duration;
 	use ethereum_types::{H256, Address};
+	use memorydb::MemoryDB;
 	use parking_lot::Mutex;
 	use trie::{Trie, TrieMut};
 	use ethtrie::{SecTrieDB, SecTrieDBMut};
 	use trie::Recorder;
 	use hash::keccak;

-	use ethcore::client::{BlockChainClient, BlockInfo, TestBlockChainClient, EachBlockWith};
-	use common_types::header::Header;
-	use common_types::encoded;
-	use common_types::receipt::{Receipt, TransactionOutcome};
+	use ::ethcore::client::{BlockChainClient, BlockInfo, TestBlockChainClient, EachBlockWith};
+	use ethcore::header::Header;
+	use ethcore::encoded;
+	use ethcore::receipt::{Receipt, TransactionOutcome};

 	fn make_cache() -> ::cache::Cache {
 		::cache::Cache::new(Default::default(), Duration::from_secs(1))
@@ -1153,7 +1156,7 @@ mod tests {
 		header.set_number(10_000);
 		header.set_extra_data(b"test_header".to_vec());
 		let hash = header.hash();
-		let raw_header = encoded::Header::new(::rlp::encode(&header));
+		let raw_header = encoded::Header::new(::rlp::encode(&header).into_vec());

 		let cache = Mutex::new(make_cache());
 		assert!(HeaderByHash(hash.into()).check_response(&cache, &hash.into(), &[raw_header]).is_ok())
@@ -1161,7 +1164,7 @@ mod tests {

 	#[test]
 	fn check_header_with_ancestors() {
-		let mut last_header_hash = H256::zero();
+		let mut last_header_hash = H256::default();
 		let mut headers = (0..11).map(|num| {
 			let mut header = Header::new();
 			header.set_number(num);
@@ -1174,14 +1177,14 @@ mod tests {
 		headers.reverse();  // because responses are in reverse order

 		let raw_headers = headers.iter()
-			.map(|hdr| encoded::Header::new(::rlp::encode(hdr)))
+			.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));
+		let raw_invalid_successor = encoded::Header::new(::rlp::encode(&invalid_successor).into_vec());

 		let cache = Mutex::new(make_cache());

@@ -1244,10 +1247,10 @@ mod tests {
 		let mut body_stream = RlpStream::new_list(2);
 		body_stream.begin_list(0).begin_list(0);

-		let req = Body(encoded::Header::new(::rlp::encode(&header)).into());
+		let req = Body(encoded::Header::new(::rlp::encode(&header).into_vec()).into());

 		let cache = Mutex::new(make_cache());
-		let response = encoded::Body::new(body_stream.drain());
+		let response = encoded::Body::new(body_stream.drain().into_vec());
 		assert!(req.check_response(&cache, &response).is_ok())
 	}

@@ -1267,7 +1270,7 @@ mod tests {

 		header.set_receipts_root(receipts_root);

-		let req = BlockReceipts(encoded::Header::new(::rlp::encode(&header)).into());
+		let req = BlockReceipts(encoded::Header::new(::rlp::encode(&header).into_vec()).into());

 		let cache = Mutex::new(make_cache());
 		assert!(req.check_response(&cache, &receipts).is_ok())
@@ -1277,8 +1280,8 @@ mod tests {
 	fn check_state_proof() {
 		use rlp::RlpStream;

-		let mut root = H256::zero();
-		let mut db = journaldb::new_memory_db();
+		let mut root = H256::default();
+		let mut db = MemoryDB::new();
 		let mut header = Header::new();
 		header.set_number(123_456);
 		header.set_extra_data(b"test_header".to_vec());
@@ -1297,17 +1300,17 @@ mod tests {
 			let mut trie = SecTrieDBMut::new(&mut db, &mut root);
 			for _ in 0..100 {
 				let address = Address::random();
-				trie.insert(address.as_bytes(), &rand_acc()).unwrap();
+				trie.insert(&*address, &rand_acc()).unwrap();
 			}

-			trie.insert(addr.as_bytes(), &rand_acc()).unwrap();
+			trie.insert(&*addr, &rand_acc()).unwrap();
 		}

 		let proof = {
 			let trie = SecTrieDB::new(&db, &root).unwrap();
 			let mut recorder = Recorder::new();

-			trie.get_with(addr.as_bytes(), &mut recorder).unwrap().unwrap();
+			trie.get_with(&*addr, &mut recorder).unwrap().unwrap();

 			recorder.drain().into_iter().map(|r| r.data).collect::<Vec<_>>()
 		};
@@ -1315,7 +1318,7 @@ mod tests {
 		header.set_state_root(root.clone());

 		let req = Account {
-			header: encoded::Header::new(::rlp::encode(&header)).into(),
+			header: encoded::Header::new(::rlp::encode(&header).into_vec()).into(),
 			address: addr,
 		};

@@ -1329,7 +1332,7 @@ mod tests {
 		let code_hash = keccak(&code);
 		let header = Header::new();
 		let req = Code {
-			header: encoded::Header::new(::rlp::encode(&header)).into(),
+			header: encoded::Header::new(::rlp::encode(&header).into_vec()).into(),
 			code_hash: code_hash.into(),
 		};

--- a/ethcore/light/src/on_demand/request_guard.rs
+++ b/ethcore/light/src/on_demand/request_guard.rs
@@ -1,123 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use failsafe;
-use std::time::Duration;
-
-type RequestPolicy = failsafe::failure_policy::ConsecutiveFailures<failsafe::backoff::Exponential>;
-
-/// Error wrapped on-top of `FailsafeError`
-#[derive(Debug, PartialEq)]
-pub enum Error {
-	/// The call is let through
-	LetThrough,
-	/// The call rejected by the guard
-	Rejected,
-	/// The request reached the maximum of backoff iterations
-	ReachedLimit,
-}
-
-/// Handle and register requests that can fail
-#[derive(Debug)]
-pub struct RequestGuard {
-	backoff_round: usize,
-	max_backoff_rounds: usize,
-	state: failsafe::StateMachine<RequestPolicy, ()>,
-}
-
-impl RequestGuard {
-	/// Constructor
-	pub fn new(
-		consecutive_failures: u32,
-		max_backoff_rounds: usize,
-		start_backoff: Duration,
-		max_backoff: Duration,
-	) -> Self {
-		let backoff = failsafe::backoff::exponential(start_backoff, max_backoff);
-		// success_rate not used because only errors are registered
-		let policy = failsafe::failure_policy::consecutive_failures(consecutive_failures as u32, backoff);
-
-		Self {
-			backoff_round: 0,
-			max_backoff_rounds,
-			state: failsafe::StateMachine::new(policy, ()),
-		}
-	}
-
-	/// Update the state after a `faulty` call
-	pub fn register_error(&mut self) -> Error {
-		trace!(target: "circuit_breaker", "RequestGuard; backoff_round: {}/{}, state {:?}",
-			   self.backoff_round, self.max_backoff_rounds, self.state);
-
-		if self.backoff_round >= self.max_backoff_rounds {
-			Error::ReachedLimit
-		} else if self.state.is_call_permitted() {
-			self.state.on_error();
-			if self.state.is_call_permitted() {
-				Error::LetThrough
-			} else {
-				self.backoff_round += 1;
-				Error::Rejected
-			}
-		} else {
-			Error::Rejected
-		}
-	}
-
-	/// Poll the circuit breaker, to check if the call is permitted
-	pub fn is_call_permitted(&self) -> bool {
-		self.state.is_call_permitted()
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::iter;
-	use std::time::Instant;
-	use super::*;
-
-	#[test]
-	fn one_consecutive_failure_with_10_backoffs() {
-		// 1, 2, 4, 5, 5 .... 5
-		let binary_exp_backoff = vec![1_u64, 2, 4].into_iter().chain(iter::repeat(5_u64).take(7));
-		let mut guard = RequestGuard::new(1, 10, Duration::from_secs(1), Duration::from_secs(5));
-		for backoff in binary_exp_backoff {
-			assert_eq!(guard.register_error(), Error::Rejected);
-			let now = Instant::now();
-			while now.elapsed() <= Duration::from_secs(backoff) {}
-		}
-		assert_eq!(guard.register_error(), Error::ReachedLimit, "10 backoffs should be error");
-	}
-
-	#[test]
-	fn five_consecutive_failures_with_3_backoffs() {
-		let mut guard = RequestGuard::new(5, 3, Duration::from_secs(1), Duration::from_secs(30));
-
-		// register five errors
-		for _ in 0..4 {
-			assert_eq!(guard.register_error(), Error::LetThrough);
-		}
-
-		let binary_exp_backoff = [1, 2, 4];
-		for backoff in &binary_exp_backoff {
-			assert_eq!(guard.register_error(), Error::Rejected);
-			let now = Instant::now();
-			while now.elapsed() <= Duration::from_secs(*backoff) {}
-		}
-
-		assert_eq!(guard.register_error(), Error::ReachedLimit, "3 backoffs should be an error");
-	}
-}
--- a/ethcore/light/src/on_demand/response_guard.rs
+++ b/ethcore/light/src/on_demand/response_guard.rs
@@ -1,173 +0,0 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
-
-// Parity Ethereum 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 Ethereum 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! ResponseGuard implementation.
-//! It is responsible for the receiving end of `Pending Request` (see `OnDemand` module docs for more information)
-//! The major functionality is the following:
-//!    1) Register non-successful responses which will reported back if it fails
-//!    2) A timeout mechanism that will wait for successful response at most t seconds
-
-use std::time::{Duration, Instant};
-use std::collections::HashMap;
-use std::fmt;
-
-use super::{ResponseError, ValidityError};
-
-/// Response guard error type
-#[derive(Debug, Eq, PartialEq)]
-pub enum Error {
-	/// No majority, the error reason can't be determined
-	NoMajority(usize),
-	/// Majority, with the error reason
-	Majority(Inner, usize, usize),
-}
-
-impl fmt::Display for Error {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		match self {
-			Error::Majority(err, majority, total) => {
-				write!(f, "Error cause was {:?}, (majority count: {} / total: {})",
-					err, majority, total)
-			}
-			Error::NoMajority(total) => {
-				write!(f, "Error cause couldn't be determined, the total number of responses was {}", total)
-			}
-		}
-	}
-}
-
-/// Dummy type to convert a generic type with no trait bounds
-#[derive(Copy, Clone, Debug, Hash, Eq, PartialEq, PartialOrd, Ord)]
-pub enum Inner {
-	/// Bad execution proof
-	BadProof,
-	/// RLP decoding
-	Decoder,
-	/// Empty response
-	EmptyResponse,
-	/// Wrong header sequence
-	HeaderByNumber,
-	/// Too few results
-	TooFewResults,
-	/// Too many results
-	TooManyResults,
-	/// Trie error
-	Trie,
-	/// Unresolved header
-	UnresolvedHeader,
-	/// No responses expected.
-	Unexpected,
-	/// Wrong hash
-	WrongHash,
-	/// Wrong Header sequence
-	WrongHeaderSequence,
-	/// Wrong response kind
-	WrongKind,
-	/// Wrong number
-	WrongNumber,
-	/// Wrong Trie Root
-	WrongTrieRoot,
-}
-
-/// Handle and register responses that can fail
-#[derive(Debug)]
-pub struct ResponseGuard {
-	request_start: Instant,
-	time_to_live: Duration,
-	responses: HashMap<Inner, usize>,
-	number_responses: usize,
-}
-
-impl ResponseGuard {
-	/// Constructor
-	pub fn new(time_to_live: Duration) -> Self {
-		Self {
-			request_start: Instant::now(),
-			time_to_live,
-			responses: HashMap::new(),
-			number_responses: 0,
-		}
-	}
-
-	fn into_reason(&self, err: &ResponseError<super::request::Error>) -> Inner {
-		match err {
-			ResponseError::Unexpected => Inner::Unexpected,
-			ResponseError::Validity(ValidityError::BadProof) => Inner::BadProof,
-			ResponseError::Validity(ValidityError::Decoder(_)) => Inner::Decoder,
-			ResponseError::Validity(ValidityError::Empty) => Inner::EmptyResponse,
-			ResponseError::Validity(ValidityError::HeaderByNumber) => Inner::HeaderByNumber,
-			ResponseError::Validity(ValidityError::TooFewResults(_, _)) => Inner::TooFewResults,
-			ResponseError::Validity(ValidityError::TooManyResults(_, _)) => Inner::TooManyResults,
-			ResponseError::Validity(ValidityError::Trie(_)) => Inner::Trie,
-			ResponseError::Validity(ValidityError::UnresolvedHeader(_)) => Inner::UnresolvedHeader,
-			ResponseError::Validity(ValidityError::WrongHash(_, _)) => Inner::WrongHash,
-			ResponseError::Validity(ValidityError::WrongHeaderSequence) => Inner::WrongHeaderSequence,
-			ResponseError::Validity(ValidityError::WrongKind) => Inner::WrongKind,
-			ResponseError::Validity(ValidityError::WrongNumber(_, _)) => Inner::WrongNumber,
-			ResponseError::Validity(ValidityError::WrongTrieRoot(_, _)) => Inner::WrongTrieRoot,
-		}
-	}
-
-	/// Update the state after a `faulty` call
-	pub fn register_error(&mut self, err: &ResponseError<super::request::Error>) -> Result<(), Error> {
-		let err = self.into_reason(err);
-		*self.responses.entry(err).or_insert(0) += 1;
-		self.number_responses = self.number_responses.saturating_add(1);
-		trace!(target: "circuit_breaker", "ResponseGuard: {:?}", self.responses);
-		// The request has exceeded its timeout
-		if self.request_start.elapsed() >= self.time_to_live {
-			let (&err, &max_count) = self.responses.iter().max_by_key(|(_k, v)| *v).expect("got at least one element; qed");
-			let majority = self.responses.values().filter(|v| **v == max_count).count() == 1;
-			if majority {
-				Err(Error::Majority(err, max_count, self.number_responses))
-			} else {
-				Err(Error::NoMajority(self.number_responses))
-			}
-		} else {
-			Ok(())
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use std::thread;
-	use super::*;
-
-	#[test]
-	fn test_basic_by_majority() {
-		let mut guard = ResponseGuard::new(Duration::from_secs(5));
-		guard.register_error(&ResponseError::Validity(ValidityError::Empty)).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		thread::sleep(Duration::from_secs(5));
-
-		assert_eq!(guard.register_error(&ResponseError::Validity(ValidityError::WrongKind)), Err(Error::Majority(Inner::Unexpected, 3, 5)));
-	}
-
-	#[test]
-	fn test_no_majority() {
-		let mut guard = ResponseGuard::new(Duration::from_secs(5));
-		guard.register_error(&ResponseError::Validity(ValidityError::Empty)).unwrap();
-		guard.register_error(&ResponseError::Validity(ValidityError::Empty)).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		guard.register_error(&ResponseError::Unexpected).unwrap();
-		thread::sleep(Duration::from_secs(5));
-
-		assert_eq!(guard.register_error(&ResponseError::Validity(ValidityError::WrongKind)), Err(Error::NoMajority(5)));
-	}
-}
--- a/ethcore/light/src/on_demand/tests.rs
+++ b/ethcore/light/src/on_demand/tests.rs
@@ -1,35 +1,34 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Tests for the on-demand service.

 use cache::Cache;
+use ethcore::header::Header;
 use futures::Future;
 use network::{PeerId, NodeId};
 use net::*;
-use common_types::header::Header;
 use ethereum_types::H256;
 use parking_lot::Mutex;
-use request::{self as basic_request, Response};
+use std::time::Duration;
+use ::request::{self as basic_request, Response};

 use std::sync::Arc;
-use std::time::{Duration, Instant};
-use std::thread;

-use super::{request, OnDemand, OnDemandRequester, Peer, HeaderRef};
+use super::{request, OnDemand, Peer, HeaderRef};

 // useful contexts to give the service.
 enum Context {
@@ -37,7 +36,6 @@ enum Context {
 	WithPeer(PeerId),
 	RequestFrom(PeerId, ReqId),
 	Punish(PeerId),
-	FaultyRequest,
 }

 impl EventContext for Context {
@@ -46,7 +44,6 @@ impl EventContext for Context {
 			Context::WithPeer(id)
 			| Context::RequestFrom(id, _)
 			| Context::Punish(id) => id,
-			| Context::FaultyRequest => 0,
 			_ => panic!("didn't expect to have peer queried."),
 		}
 	}
@@ -63,7 +60,6 @@ impl BasicContext for Context {
 	fn request_from(&self, peer_id: PeerId, _: ::request::NetworkRequests) -> Result<ReqId, Error> {
 		match *self {
 			Context::RequestFrom(id, req_id) => if peer_id == id { Ok(req_id) } else { Err(Error::NoCredits) },
-			Context::FaultyRequest => Err(Error::NoCredits),
 			_ => panic!("didn't expect to have requests dispatched."),
 		}
 	}
@@ -93,17 +89,7 @@ impl Harness {
 	fn create() -> Self {
 		let cache = Arc::new(Mutex::new(Cache::new(Default::default(), Duration::from_secs(60))));
 		Harness {
-			service: OnDemand::new_test(
-				cache,
-				// Response `time_to_live`
-				Duration::from_secs(5),
-				// Request start backoff
-				Duration::from_secs(1),
-				// Request max backoff
-				Duration::from_secs(20),
-				super::DEFAULT_MAX_REQUEST_BACKOFF_ROUNDS,
-				super::DEFAULT_NUM_CONSECUTIVE_FAILED_REQUESTS
-			)
+			service: OnDemand::new_test(cache),
 		}
 	}

@@ -117,9 +103,9 @@ fn dummy_status() -> Status {
 		protocol_version: 1,
 		network_id: 999,
 		head_td: 1.into(),
-		head_hash: H256::zero(),
+		head_hash: H256::default(),
 		head_num: 1359,
-		genesis_hash: H256::zero(),
+		genesis_hash: H256::default(),
 		last_head: None,
 	}
 }
@@ -138,7 +124,7 @@ fn detects_hangup() {
 	let on_demand = Harness::create().service;
 	let result = on_demand.request_raw(
 		&Context::NoOp,
-		vec![request::HeaderByHash(H256::zero().into()).into()],
+		vec![request::HeaderByHash(H256::default().into()).into()],
 	);

 	assert_eq!(on_demand.pending.read().len(), 1);
@@ -199,7 +185,7 @@ fn no_capabilities() {

 	let _recv = harness.service.request_raw(
 		&Context::NoOp,
-		vec![request::HeaderByHash(H256::zero().into()).into()]
+		vec![request::HeaderByHash(H256::default().into()).into()]
 	).unwrap();

 	assert_eq!(harness.service.pending.read().len(), 1);
@@ -395,7 +381,7 @@ fn wrong_kind() {

 	let _recv = harness.service.request_raw(
 		&Context::NoOp,
-		vec![request::HeaderByHash(H256::zero().into()).into()]
+		vec![request::HeaderByHash(H256::default().into()).into()]
 	).unwrap();

 	assert_eq!(harness.service.pending.read().len(), 1);
@@ -509,90 +495,3 @@ fn fill_from_cache() {

 	assert!(recv.wait().is_ok());
 }
-
-#[test]
-fn request_without_response_should_backoff_and_then_be_dropped() {
-	let harness = Harness::create();
-	let peer_id = 0;
-	let req_id = ReqId(13);
-
-	harness.inject_peer(
-		peer_id,
-		Peer {
-			status: dummy_status(),
-			capabilities: dummy_capabilities(),
-		}
-	);
-
-	let binary_exp_backoff: Vec<u64> = vec![1, 2, 4, 8, 16, 20, 20, 20, 20, 20];
-
-	let _recv = harness.service.request_raw(
-		&Context::RequestFrom(peer_id, req_id),
-		vec![request::HeaderByHash(Header::default().encoded().hash().into()).into()],
-	).unwrap();
-	assert_eq!(harness.service.pending.read().len(), 1);
-
-	for backoff in &binary_exp_backoff {
-		harness.service.dispatch_pending(&Context::FaultyRequest);
-		assert_eq!(harness.service.pending.read().len(), 1, "Request should not be dropped");
-		let now = Instant::now();
-		while now.elapsed() < Duration::from_secs(*backoff) {}
-	}
-
-	harness.service.dispatch_pending(&Context::FaultyRequest);
-	assert_eq!(harness.service.pending.read().len(), 0, "Request exceeded the 10 backoff rounds should be dropped");
-}
-
-#[test]
-fn empty_responses_exceeds_limit_should_be_dropped() {
-	let harness = Harness::create();
-	let peer_id = 0;
-	let req_id = ReqId(13);
-
-	harness.inject_peer(
-		peer_id,
-		Peer {
-			status: dummy_status(),
-			capabilities: dummy_capabilities(),
-		}
-	);
-
-	let _recv = harness.service.request_raw(
-		&Context::RequestFrom(peer_id, req_id),
-		vec![request::HeaderByHash(Header::default().encoded().hash().into()).into()],
-	).unwrap();
-
-	harness.service.dispatch_pending(&Context::RequestFrom(peer_id, req_id));
-
-	assert_eq!(harness.service.pending.read().len(), 0);
-	assert_eq!(harness.service.in_transit.read().len(), 1);
-
-	let now = Instant::now();
-
-	// Send `empty responses` in the current time window
-	// Use only half of the `time_window` because we can't be sure exactly
-	// when the window started and the clock accurancy
-	while now.elapsed() < harness.service.response_time_window / 2 {
-		harness.service.on_responses(
-			&Context::RequestFrom(13, req_id),
-			req_id,
-			&[]
-		);
-		assert!(harness.service.pending.read().len() != 0);
-		let pending = harness.service.pending.write().remove(0);
-		harness.service.in_transit.write().insert(req_id, pending);
-	}
-
-	// Make sure we passed the first `time window`
-	thread::sleep(Duration::from_secs(5));
-
-	// Now, response is in failure state but need another response to be `polled`
-	harness.service.on_responses(
-			&Context::RequestFrom(13, req_id),
-			req_id,
-			&[]
-	);
-
-	assert!(harness.service.in_transit.read().is_empty());
-	assert!(harness.service.pending.read().is_empty());
-}
--- a/ethcore/light/src/provider.rs
+++ b/ethcore/light/src/provider.rs
@@ -1,31 +1,31 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! A provider for the PIP protocol. This is typically a full node, who can
 //! give as much data as necessary to its peers.

 use std::sync::Arc;

-use common_types::blockchain_info::BlockChainInfo;
-use common_types::encoded;
-use common_types::ids::BlockId;
-use common_types::transaction::PendingTransaction;
+use ethcore::blockchain_info::BlockChainInfo;
 use ethcore::client::{BlockChainClient, ProvingBlockChainClient, ChainInfo, BlockInfo as ClientBlockInfo};
+use ethcore::ids::BlockId;
+use ethcore::encoded;
 use ethereum_types::H256;
 use parking_lot::RwLock;
+use transaction::PendingTransaction;

 use cht::{self, BlockInfo};
 use client::{LightChainClient, AsLightClient};
@@ -161,7 +161,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	fn transaction_index(&self, req: request::CompleteTransactionIndexRequest)
 		-> Option<request::TransactionIndexResponse>
 	{
-		use common_types::ids::TransactionId;
+		use ethcore::ids::TransactionId;

 		self.transaction_receipt(TransactionId::Hash(req.hash)).map(|receipt| request::TransactionIndexResponse {
 			num: receipt.block_number,
@@ -177,7 +177,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {

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

 	fn account_proof(&self, req: request::CompleteAccountRequest) -> Option<request::AccountResponse> {
@@ -265,7 +265,7 @@ impl<T: ProvingBlockChainClient + ?Sized> Provider for T {
 	}

 	fn transaction_proof(&self, req: request::CompleteExecutionRequest) -> Option<request::ExecutionResponse> {
-		use common_types::transaction::Transaction;
+		use transaction::Transaction;

 		let id = BlockId::Hash(req.block_hash);
 		let nonce = match self.nonce(&req.from, id) {
--- a/ethcore/light/src/transaction_queue.rs
+++ b/ethcore/light/src/transaction_queue.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light Transaction Queue.
 //!
@@ -24,15 +24,12 @@
 //! address-wise manner.

 use std::fmt;
-use std::sync::Arc;
 use std::collections::{BTreeMap, HashMap};
 use std::collections::hash_map::Entry;

-use common_types::transaction::{self, Condition, PendingTransaction, SignedTransaction};
+use transaction::{self, Condition, PendingTransaction, SignedTransaction};
 use ethereum_types::{H256, U256, Address};
 use fastmap::H256FastMap;
-use futures::sync::mpsc;
-use miner::pool::TxStatus;

 // Knowledge of an account's current nonce.
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -98,7 +95,7 @@ impl AccountTransactions {
 	}

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

@@ -110,7 +107,7 @@ impl AccountTransactions {
 		while let Some(tx) = self.future.remove(&next_nonce) {
 			promoted.push(tx.hash);
 			self.current.push(tx);
-			next_nonce = next_nonce.saturating_add(1.into());
+			next_nonce = next_nonce + 1;
 		}

 		promoted
@@ -129,13 +126,14 @@ pub enum ImportDestination {
 	Future,
 }

+type Listener = Box<Fn(&[H256]) + Send + Sync>;
+
 /// Light transaction queue. See module docs for more details.
 #[derive(Default)]
 pub struct TransactionQueue {
 	by_account: HashMap<Address, AccountTransactions>,
 	by_hash: H256FastMap<PendingTransaction>,
-	pending_listeners: Vec<mpsc::UnboundedSender<Arc<Vec<H256>>>>,
-	full_listeners: Vec<mpsc::UnboundedSender<Arc<Vec<(H256, TxStatus)>>>>,
+	listeners: Vec<Listener>,
 }

 impl fmt::Debug for TransactionQueue {
@@ -143,8 +141,7 @@ impl fmt::Debug for TransactionQueue {
 		fmt.debug_struct("TransactionQueue")
 			.field("by_account", &self.by_account)
 			.field("by_hash", &self.by_hash)
-			.field("pending_listeners", &self.pending_listeners.len())
-			.field("full_listeners", &self.pending_listeners.len())
+			.field("listeners", &self.listeners.len())
 			.finish()
 	}
 }
@@ -234,7 +231,7 @@ impl TransactionQueue {
 		};

 		self.by_hash.insert(hash, tx);
-		self.notify(&promoted, TxStatus::Added);
+		self.notify(&promoted);
 		Ok(res)
 	}

@@ -346,8 +343,6 @@ impl TransactionQueue {
 		trace!(target: "txqueue", "Culled {} old transactions from sender {} (nonce={})",
 			removed_hashes.len(), address, cur_nonce);

-		self.notify(&removed_hashes, TxStatus::Culled);
-
 		for hash in removed_hashes {
 			self.by_hash.remove(&hash);
 		}
@@ -359,40 +354,15 @@ impl TransactionQueue {
 	}

 	/// Add a transaction queue listener.
-	pub fn pending_transactions_receiver(&mut self) -> mpsc::UnboundedReceiver<Arc<Vec<H256>>> {
-		let (sender, receiver) = mpsc::unbounded();
-		self.pending_listeners.push(sender);
-		receiver
-	}
-
-	/// Add a transaction queue listener.
-	pub fn full_transactions_receiver(&mut self) -> mpsc::UnboundedReceiver<Arc<Vec<(H256, TxStatus)>>> {
-		let (sender, receiver) = mpsc::unbounded();
-		self.full_listeners.push(sender);
-		receiver
+	pub fn add_listener(&mut self, f: Listener) {
+		self.listeners.push(f);
 	}

 	/// Notifies all listeners about new pending transaction.
-	fn notify(&mut self, hashes: &[H256], status: TxStatus) {
-		if status == TxStatus::Added {
-			let to_pending_send: Arc<Vec<H256>> = Arc::new(
-				hashes
-					.into_iter()
-					.map(|hash| hash.clone())
-					.collect()
-			);
-			self.pending_listeners.retain(|listener| listener.unbounded_send(to_pending_send.clone()).is_ok());
-
+	fn notify(&self, hashes: &[H256]) {
+		for listener in &self.listeners {
+			listener(hashes)
 		}
-
-		let to_full_send: Arc<Vec<(H256, TxStatus)>> = Arc::new(
-			hashes
-				.into_iter()
-				.map(|hash| (hash.clone(), status))
-				.collect()
-		);
-
-		self.full_listeners.retain(|listener| listener.unbounded_send(to_full_send.clone()).is_ok());
 	}
 }

@@ -400,11 +370,11 @@ impl TransactionQueue {
 mod tests {
 	use super::TransactionQueue;
 	use ethereum_types::Address;
-	use common_types::transaction::{Transaction, PendingTransaction, Condition};
+	use transaction::{Transaction, PendingTransaction, Condition};

 	#[test]
 	fn queued_senders() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();
 		let tx = Transaction::default().fake_sign(sender);

@@ -420,7 +390,7 @@ mod tests {

 	#[test]
 	fn next_nonce() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();

 		for i in (0..5).chain(10..15) {
@@ -451,7 +421,7 @@ mod tests {

 	#[test]
 	fn current_to_future() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();

 		for i in 5..10 {
@@ -494,7 +464,7 @@ mod tests {
 	#[test]
 	fn conditional() {
 		let mut txq = TransactionQueue::default();
-		let sender = Address::zero();
+		let sender = Address::default();

 		for i in 0..5 {
 			let mut tx = Transaction::default();
@@ -516,7 +486,7 @@ mod tests {

 	#[test]
 	fn cull_from_future() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();

 		for i in (0..1).chain(3..10) {
@@ -536,7 +506,7 @@ mod tests {

 	#[test]
 	fn import_old() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();

 		let mut tx_a = Transaction::default();
@@ -553,7 +523,7 @@ mod tests {

 	#[test]
 	fn replace_is_removed() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();

 		let tx_b: PendingTransaction = Transaction::default().fake_sign(sender).into();
@@ -573,7 +543,7 @@ mod tests {

 	#[test]
 	fn future_transactions() {
-		let sender = Address::zero();
+		let sender = Address::default();
 		let mut txq = TransactionQueue::default();

 		for i in (0..1).chain(3..10) {
--- a/ethcore/light/src/types/mod.rs
+++ b/ethcore/light/src/types/mod.rs
@@ -1,17 +1,17 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 pub mod request;
--- a/ethcore/light/src/types/request/batch.rs
+++ b/ethcore/light/src/types/request/batch.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Request chain builder utility.
 //! Push requests with `push`. Back-references and data required to verify responses must be
@@ -220,7 +220,7 @@ mod tests {
 			num: 100.into(),
 		})).unwrap();
 		builder.push(Request::Receipts(IncompleteReceiptsRequest {
-			hash: H256::zero().into(),
+			hash: H256::default().into(),
 		})).unwrap();
 	}

@@ -255,63 +255,4 @@ mod tests {
 			hash: Field::BackReference(0, 0),
 		})).unwrap();
 	}
-
-	#[test]
-	fn batch_tx_index_backreference() {
-		let mut builder = Builder::default();
-		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
-			num: 100.into(), // header proof puts hash at output 0.
-		})).unwrap();
-		builder.push(Request::TransactionIndex(IncompleteTransactionIndexRequest {
-			hash: Field::BackReference(0, 0),
-		})).unwrap();
-
-		let mut batch = builder.build();
-		batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Hash(H256::from_low_u64_be(42))));
-
-		assert!(batch.next_complete().is_some());
-		batch.answered += 1;
-		assert!(batch.next_complete().is_some());
-	}
-
-	#[test]
-	fn batch_tx_index_backreference_public_api() {
-		let mut builder = Builder::default();
-		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
-			num: 100.into(), // header proof puts hash at output 0.
-		})).unwrap();
-		builder.push(Request::TransactionIndex(IncompleteTransactionIndexRequest {
-			hash: Field::BackReference(0, 0),
-		})).unwrap();
-
-		let mut batch = builder.build();
-
-		assert!(batch.next_complete().is_some());
-		let hdr_proof_res = header_proof::Response {
-			proof: vec![],
-			hash: H256::from_low_u64_be(12),
-			td: 21.into(),
-		};
-		batch.supply_response_unchecked(&hdr_proof_res);
-
-		assert!(batch.next_complete().is_some());
-	}
-
-	#[test]
-	fn batch_receipts_backreference() {
-		let mut builder = Builder::default();
-		builder.push(Request::HeaderProof(IncompleteHeaderProofRequest {
-			num: 100.into(), // header proof puts hash at output 0.
-		})).unwrap();
-		builder.push(Request::Receipts(IncompleteReceiptsRequest {
-			hash: Field::BackReference(0, 0),
-		})).unwrap();
-
-		let mut batch = builder.build();
-		batch.requests[1].fill(|_req_idx, _out_idx| Ok(Output::Hash(H256::from_low_u64_be(42))));
-
-		assert!(batch.next_complete().is_some());
-		batch.answered += 1;
-		assert!(batch.next_complete().is_some());
-	}
 }
--- a/ethcore/light/src/types/request/mod.rs
+++ b/ethcore/light/src/types/request/mod.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Light protocol request types.

@@ -670,7 +670,7 @@ pub trait ResponseLike {
 /// Header request.
 pub mod header {
 	use super::{Field, HashOrNumber, NoSuchOutput, OutputKind, Output};
-	use common_types::encoded;
+	use ethcore::encoded;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};

 	/// Potentially incomplete headers request.
@@ -753,7 +753,7 @@ pub mod header {

 	impl Decodable for Response {
 		fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
-			use common_types::header::Header as FullHeader;
+			use ethcore::header::Header as FullHeader;

 			let mut headers = Vec::new();

@@ -907,7 +907,7 @@ pub mod transaction_index {
 		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.into()),
+					Ok(Output::Number(hash)) => Field::Scalar(hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -954,7 +954,7 @@ pub mod transaction_index {
 /// Request and response for block receipts
 pub mod block_receipts {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use common_types::receipt::Receipt;
+	use ethcore::receipt::Receipt;
 	use ethereum_types::H256;

 	/// Potentially incomplete block receipts request.
@@ -982,7 +982,7 @@ pub mod block_receipts {
 		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.into()),
+					Ok(Output::Number(hash)) => Field::Scalar(hash.into()),
 					_ => Field::BackReference(req, idx),
 				}
 			}
@@ -1022,7 +1022,7 @@ pub mod block_receipts {
 /// Request and response for a block body
 pub mod block_body {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use common_types::encoded;
+	use ethcore::encoded;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};
 	use ethereum_types::H256;

@@ -1089,8 +1089,8 @@ pub mod block_body {

 	impl Decodable for Response {
 		fn decode(rlp: &Rlp) -> Result<Self, DecoderError> {
-			use common_types::header::Header as FullHeader;
-			use common_types::transaction::UnverifiedTransaction;
+			use ethcore::header::Header as FullHeader;
+			use transaction::UnverifiedTransaction;

 			// check body validity.
 			let _: Vec<UnverifiedTransaction> = rlp.list_at(0)?;
@@ -1406,7 +1406,7 @@ pub mod contract_code {
 /// A request for proof of execution.
 pub mod execution {
 	use super::{Field, NoSuchOutput, OutputKind, Output};
-	use common_types::transaction::Action;
+	use transaction::Action;
 	use rlp::{Encodable, Decodable, DecoderError, RlpStream, Rlp};
 	use ethereum_types::{H256, U256, Address};
 	use kvdb::DBValue;
@@ -1629,7 +1629,7 @@ pub mod epoch_signal {
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use common_types::header::Header;
+	use ethcore::header::Header;

 	fn check_roundtrip<T>(val: T)
 		where T: ::rlp::Encodable + ::rlp::Decodable + PartialEq + ::std::fmt::Debug
@@ -1648,7 +1648,7 @@ mod tests {

 	#[test]
 	fn hash_or_number_roundtrip() {
-		let hash = HashOrNumber::Hash(H256::zero());
+		let hash = HashOrNumber::Hash(H256::default());
 		let number = HashOrNumber::Number(5);

 		check_roundtrip(hash);
@@ -1676,7 +1676,7 @@ mod tests {
 		let full_req = Request::Headers(req.clone());
 		let res = HeadersResponse {
 			headers: vec![
-				::common_types::encoded::Header::new(::rlp::encode(&Header::default()))
+				::ethcore::encoded::Header::new(::rlp::encode(&Header::default()).into_vec())
 			]
 		};
 		let full_res = Response::Headers(res.clone());
@@ -1729,7 +1729,7 @@ mod tests {

 	#[test]
 	fn receipts_roundtrip() {
-		use common_types::receipt::{Receipt, TransactionOutcome};
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let req = IncompleteReceiptsRequest {
 			hash: Field::Scalar(Default::default()),
 		};
@@ -1749,7 +1749,7 @@ mod tests {

 	#[test]
 	fn body_roundtrip() {
-		use common_types::transaction::{Transaction, UnverifiedTransaction};
+		use transaction::{Transaction, UnverifiedTransaction};
 		let req = IncompleteBodyRequest {
 			hash: Field::Scalar(Default::default()),
 		};
@@ -1757,13 +1757,13 @@ mod tests {
 		let full_req = Request::Body(req.clone());
 		let res = BodyResponse {
 			body: {
-				let header = ::common_types::header::Header::default();
+				let header = ::ethcore::header::Header::default();
 				let tx = UnverifiedTransaction::from(Transaction::default().fake_sign(Default::default()));
 				let mut stream = RlpStream::new_list(2);
 				stream.begin_list(2).append(&tx).append(&tx)
 					.begin_list(1).append(&header);

-				::common_types::encoded::Body::new(stream.out())
+				::ethcore::encoded::Body::new(stream.out())
 			},
 		};
 		let full_res = Response::Body(res.clone());
@@ -1808,7 +1808,7 @@ mod tests {
 		let full_req = Request::Storage(req.clone());
 		let res = StorageResponse {
 			proof: vec![vec![1, 2, 3], vec![4, 5, 6]],
-			value: H256::zero(),
+			value: H256::default(),
 		};
 		let full_res = Response::Storage(res.clone());

@@ -1844,7 +1844,7 @@ mod tests {
 		let req = IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::common_types::transaction::Action::Create,
+			action: ::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1874,7 +1874,7 @@ mod tests {
 		let reqs: Vec<_> = (0..10).map(|_| IncompleteExecutionRequest {
 			block_hash: Field::Scalar(Default::default()),
 			from: Default::default(),
-			action: ::common_types::transaction::Action::Create,
+			action: ::transaction::Action::Create,
 			gas: 100_000.into(),
 			gas_price: 0.into(),
 			value: 100_000_001.into(),
@@ -1892,11 +1892,11 @@ mod tests {

 	#[test]
 	fn responses_vec() {
-		use common_types::receipt::{Receipt, TransactionOutcome};
+		use ethcore::receipt::{Receipt, TransactionOutcome};
 		let mut stream = RlpStream::new_list(2);
 				stream.begin_list(0).begin_list(0);

-		let body = ::common_types::encoded::Body::new(stream.out());
+		let body = ::ethcore::encoded::Body::new(stream.out());
 		let reqs = vec![
 			Response::Headers(HeadersResponse { headers: vec![] }),
 			Response::HeaderProof(HeaderProofResponse { proof: vec![], hash: Default::default(), td: 100.into()}),
@@ -1909,7 +1909,7 @@ mod tests {
 				code_hash: Default::default(),
 				storage_root: Default::default()
 			}),
-			Response::Storage(StorageResponse { proof: vec![], value: H256::zero() }),
+			Response::Storage(StorageResponse { proof: vec![], value: H256::default() }),
 			Response::Code(CodeResponse { code: vec![1, 2, 3, 4, 5] }),
 			Response::Execution(ExecutionResponse { items: vec![] }),
 		];
--- a/ethcore/node_filter/Cargo.toml
+++ b/ethcore/node_filter/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-description = "Parity Smart Contract based Node Filter, Manage Permissions of Network Connections"
+description = "Parity smart network connections"
 homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "node-filter"
@@ -10,12 +10,12 @@ authors = ["Parity Technologies <admin@parity.io>"]
 ethcore = { path = ".."}
 ethcore-network = { path = "../../util/network" }
 ethcore-network-devp2p = { path = "../../util/network-devp2p" }
-ethereum-types = "0.6.0"
+ethereum-types = "0.4"
 log = "0.4"
-parking_lot = "0.9"
-ethabi = "8.0"
-ethabi-derive = "8.0"
-ethabi-contract = "8.0"
+parking_lot = "0.6"
+ethabi = "5.1.2"
+ethabi-derive = "5.1.3"
+ethabi-contract = "5.1.1"
 lru-cache = "0.1"

 [dev-dependencies]
--- a/ethcore/node_filter/res/node_filter.json
+++ b/ethcore/node_filter/res/node_filter.json
--- a/ethcore/node_filter/res/peer_set.json
+++ b/ethcore/node_filter/res/peer_set.json
--- a/ethcore/node_filter/src/lib.rs
+++ b/ethcore/node_filter/src/lib.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Smart contract based node filter.

@@ -37,45 +37,36 @@ extern crate tempdir;
 #[macro_use]
 extern crate log;

-use std::collections::{HashMap, VecDeque};
 use std::sync::Weak;

-use ethcore::client::{BlockChainClient, BlockId, ChainNotify, NewBlocks};
+use lru_cache::LruCache;
+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 devp2p::MAX_NODES_IN_TABLE;
-use parking_lot::RwLock;

-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,
-	cache: RwLock<Cache>
+	permission_cache: Mutex<LruCache<(H256, NodeId), bool>>,
 }

-struct Cache {
-	cache: HashMap<NodeId, bool>,
-	order: VecDeque<NodeId>
-}
-
-// Increase cache size due to possible reserved peers, which do not count in the node table size
-pub const CACHE_SIZE: usize = MAX_NODES_IN_TABLE + 1024;
-
 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,
-			cache: RwLock::new(Cache{
-				cache: HashMap::with_capacity(CACHE_SIZE),
-				order: VecDeque::with_capacity(CACHE_SIZE)
-			})
+			permission_cache: Mutex::new(LruCache::new(MAX_CACHE_SIZE)),
 		}
 	}
 }
@@ -87,8 +78,16 @@ impl ConnectionFilter for NodeFilter {
 			None => return false,
 		};

-		if let Some(allowed) = self.cache.read().cache.get(connecting_id) {
-			return *allowed;
+		let block_hash = match client.block_hash(BlockId::Latest) {
+			Some(block_hash) => block_hash,
+			None => return false,
+		};
+
+		let key = (block_hash, *connecting_id);
+
+		let mut cache = self.permission_cache.lock();
+		if let Some(res) = cache.get_mut(&key) {
+			return *res;
 		}

 		let address = self.contract_address;
@@ -97,30 +96,16 @@ 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
 			});
-		let mut cache = self.cache.write();
-		if cache.cache.len() == CACHE_SIZE {
-			let popped = cache.order.pop_front().expect("the cache is full so there's at least one item we can pop; qed");
-			cache.cache.remove(&popped);
-		};
-		if cache.cache.insert(*connecting_id, allowed).is_none() {
-			cache.order.push_back(*connecting_id);
-		}
-		allowed
-	}
-}

-impl ChainNotify for NodeFilter {
-	fn new_blocks(&self, _new_blocks: NewBlocks)	{
-		let mut cache = self.cache.write();
-		cache.cache.clear();
-		cache.order.clear();
+		cache.insert(key, allowed);
+		allowed
 	}
 }

@@ -135,13 +120,11 @@ mod test {
 	use io::IoChannel;
 	use super::NodeFilter;
 	use tempdir::TempDir;
-	use ethereum_types::Address;
-	use std::str::FromStr;

 	/// Contract code: https://gist.github.com/arkpar/467dbcc73cbb85b0997a7a10ffa0695f
 	#[test]
 	fn node_filter() {
-		let contract_addr = Address::from_str("0000000000000000000000000000000000000005").unwrap();
+		let contract_addr = "0000000000000000000000000000000000000005".into();
 		let data = include_bytes!("../res/node_filter.json");
 		let tempdir = TempDir::new("").unwrap();
 		let spec = Spec::load(&tempdir.path(), &data[..]).unwrap();
@@ -155,11 +138,11 @@ mod test {
 			IoChannel::disconnected(),
 		).unwrap();
 		let filter = NodeFilter::new(Arc::downgrade(&client) as Weak<BlockChainClient>, contract_addr);
-		let self1 = NodeId::from_str("00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002").unwrap();
-		let self2 = NodeId::from_str("00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003").unwrap();
-		let node1 = NodeId::from_str("00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000012").unwrap();
-		let node2 = NodeId::from_str("00000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000022").unwrap();
-		let nodex = NodeId::from_str("77000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000").unwrap();
+		let self1: NodeId = "00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002".into();
+		let self2: NodeId = "00000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000003".into();
+		let node1: NodeId = "00000000000000000000000000000000000000000000000000000000000000110000000000000000000000000000000000000000000000000000000000000012".into();
+		let node2: NodeId = "00000000000000000000000000000000000000000000000000000000000000210000000000000000000000000000000000000000000000000000000000000022".into();
+		let nodex: NodeId = "77000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".into();

 		assert!(filter.connection_allowed(&self1, &node1, ConnectionDirection::Inbound));
 		assert!(filter.connection_allowed(&self1, &nodex, ConnectionDirection::Inbound));
--- a/ethcore/pod-account/Cargo.toml
+++ b/ethcore/pod-account/Cargo.toml
@@ -1,27 +0,0 @@
-[package]
-description = "Account system expressed in Plain Old Data."
-name = "pod-account"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-common-types = { path = "../types" }
-ethereum-types = "0.6"
-ethjson = { path = "../../json" }
-ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
-hash-db = "0.12"
-itertools = "0.8"
-keccak-hash = "0.2.0"
-keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.1"
-log = "0.4"
-parity-bytes = "0.1.0"
-rlp = "0.4"
-rustc-hex = "1"
-serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.12.4"
-triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../util/triehash-ethereum" }
-
-[dev-dependencies]
-macros = { path = "../../util/macros" }
--- a/ethcore/private-tx/Cargo.toml
+++ b/ethcore/private-tx/Cargo.toml
@@ -6,40 +6,38 @@ license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-common-types = { path = "../types" }
-derive_more = "0.14.0"
-ethabi = "8.0"
-ethabi-contract = "8.0"
-ethabi-derive = "8.0"
+error-chain = { version = "0.12", default-features = false }
+ethabi = "5.1.2"
+ethabi-derive = "5.1.3"
+ethabi-contract = "5.1.1"
 ethcore = { path = ".." }
-ethcore-call-contract = { path = "../call-contract" }
+parity-bytes = "0.1"
+parity-crypto = "0.1"
 ethcore-io = { path = "../../util/io" }
+ethcore-logger = { path = "../../logger" }
 ethcore-miner = { path = "../../miner" }
-ethereum-types = "0.6.0"
+ethcore-transaction = { path = "../transaction" }
+ethereum-types = "0.4"
 ethjson = { path = "../../json" }
-ethkey = { path = "../../accounts/ethkey" }
+ethkey = { path = "../../ethkey" }
 fetch = { path = "../../util/fetch" }
 futures = "0.1"
-parity-util-mem = "0.1"
-keccak-hash = "0.2.0"
+heapsize = "0.4"
+keccak-hash = "0.1.2"
 log = "0.4"
-parity-bytes = "0.1"
-parity-crypto = "0.4.0"
-parking_lot = "0.9"
-trie-db = "0.12.4"
+parking_lot = "0.6"
+patricia-trie = "0.2"
 patricia-trie-ethereum = { path = "../../util/patricia-trie-ethereum" }
 rand = "0.3"
-rlp = "0.4.0"
-rlp_derive = { path = "../../util/rlp-derive" }
+rlp = { version = "0.2.4", features = ["ethereum"] }
+rlp_derive = { path = "../../util/rlp_derive" }
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-time-utils = { path = "../../util/time-utils" }
 tiny-keccak = "1.4"
-transaction-pool = "2.0.1"
-url = "2.1.0"
+transaction-pool = "1.13.2"
+url = "1"

 [dev-dependencies]
-env_logger = "0.5"
 ethcore = { path = "..", features = ["test-helpers"] }
--- a/ethcore/private-tx/res/keys_acl.json
+++ b/ethcore/private-tx/res/keys_acl.json
@@ -1,43 +0,0 @@
-[
-	{
-		"constant": true,
-		"inputs": [
-			{
-				"name":"user",
-				"type":"address"
-			}
-		],
-		"name": "availableKeys",
-		"outputs": [
-			{
-				"name": "",
-				"type": "bytes32[]"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant":true,
-		"inputs": [
-			{
-				"name":"user",
-				"type":"address"
-			},
-			{
-				"name":"document",
-				"type":"bytes32"
-			}
-		],
-		"name":"checkPermissions",
-		"outputs": [
-			{
-				"name":"",
-				"type":"bool"
-			}
-		],
-		"payable":false,
-		"type":"function"
-	}
-]
--- a/ethcore/private-tx/res/private.evm
+++ b/ethcore/private-tx/res/private.evm
--- a/ethcore/private-tx/res/private.json
+++ b/ethcore/private-tx/res/private.json
@@ -1,171 +1 @@
-[
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "getVersion",
-		"outputs": [
-			{
-				"name": "",
-				"type": "uint8"
-			}
-		],
-		"payable": false,
-		"stateMutability": "pure",
-		"type": "function"
-	},
-	{
-		"constant": false,
-		"inputs": [
-			{
-				"name": "newState",
-				"type": "bytes"
-			},
-			{
-				"name": "v",
-				"type": "uint8[]"
-			},
-			{
-				"name": "r",
-				"type": "bytes32[]"
-			},
-			{
-				"name": "s",
-				"type": "bytes32[]"
-			}
-		],
-		"name": "setState",
-		"outputs": [],
-		"payable": false,
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "code",
-		"outputs": [
-			{
-				"name": "",
-				"type": "bytes"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [
-			{
-				"name": "",
-				"type": "uint256"
-			}
-		],
-		"name": "validators",
-		"outputs": [
-			{
-				"name": "",
-				"type": "address"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": false,
-		"inputs": [
-			{
-				"name": "changesOriginator",
-				"type": "address"
-			},
-			{
-				"name": "originalTransactionHash",
-				"type": "bytes"
-			}
-		],
-		"name": "notifyChanges",
-		"outputs": [],
-		"payable": false,
-		"stateMutability": "nonpayable",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "nonce",
-		"outputs": [
-			{
-				"name": "",
-				"type": "uint256"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "getValidators",
-		"outputs": [
-			{
-				"name": "",
-				"type": "address[]"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "state",
-		"outputs": [
-			{
-				"name": "",
-				"type": "bytes"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	},
-	{
-		"inputs": [
-			{
-				"name": "initialValidators",
-				"type": "address[]"
-			},
-			{
-				"name": "initialCode",
-				"type": "bytes"
-			},
-			{
-				"name": "initialState",
-				"type": "bytes"
-			}
-		],
-		"payable": false,
-		"stateMutability": "nonpayable",
-		"type": "constructor"
-	},
-	{
-		"anonymous": false,
-		"inputs": [
-			{
-				"indexed": false,
-				"name": "changesOriginator",
-				"type": "address"
-			},
-			{
-				"indexed": false,
-				"name": "originalTransactionHash",
-				"type": "bytes"
-			}
-		],
-		"name": "PrivateStateChanged",
-		"type": "event"
-	}
-]
+[{"constant": false,"inputs": [{"name": "newState","type": "bytes"},{"name": "v","type": "uint8[]"},{"name": "r","type": "bytes32[]"},{"name": "s","type": "bytes32[]"}],"name": "setState","outputs": [],"payable": false,"stateMutability": "nonpayable","type": "function"},{"constant": true,"inputs": [],"name": "code","outputs": [{"name": "","type": "bytes"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [{"name": "","type": "uint256"}],"name": "validators","outputs": [{"name": "","type": "address"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [],"name": "nonce","outputs": [{"name": "","type": "uint256"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [],"name": "getValidators","outputs": [{"name": "","type": "address[]"}],"payable": false,"stateMutability": "view","type": "function"},{"constant": true,"inputs": [],"name": "state","outputs": [{"name": "","type": "bytes"}],"payable": false,"stateMutability": "view","type": "function"},{"inputs": [{"name": "initialValidators","type": "address[]"},{"name": "initialCode","type": "bytes"},{"name": "initialState","type": "bytes"}],"payable": false,"stateMutability": "nonpayable","type": "constructor"}]
--- a/ethcore/private-tx/src/encryptor.rs
+++ b/ethcore/private-tx/src/encryptor.rs
@@ -1,40 +1,39 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

 //! Encryption providers.

 use std::io::Read;
 use std::str::FromStr;
-use std::sync::Arc;
 use std::iter::repeat;
 use std::time::{Instant, Duration};
 use std::collections::HashMap;
 use std::collections::hash_map::Entry;
 use parking_lot::Mutex;
+use ethcore::account_provider::AccountProvider;
 use ethereum_types::{H128, H256, Address};
 use ethjson;
-use ethkey::{Signature, Public};
+use ethkey::{Signature, Password, Public};
 use crypto;
 use futures::Future;
 use fetch::{Fetch, Client as FetchClient, Method, BodyReader, Request};
 use bytes::{Bytes, ToPretty};
-use error::Error;
+use error::{Error, ErrorKind};
 use url::Url;
-use super::Signer;
-use super::key_server_keys::address_to_key;
+use super::find_account_password;

 /// Initialization vector length.
 const INIT_VEC_LEN: usize = 16;
@@ -48,6 +47,7 @@ pub trait Encryptor: Send + Sync + 'static {
 	fn encrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		initialisation_vector: &H128,
 		plain_data: &[u8],
 	) -> Result<Bytes, Error>;
@@ -56,11 +56,12 @@ pub trait Encryptor: Send + Sync + 'static {
 	fn decrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		cypher: &[u8],
 	) -> Result<Bytes, Error>;
 }

-/// Configuration for key server encryptor
+/// Configurtion for key server encryptor
 #[derive(Default, PartialEq, Debug, Clone)]
 pub struct EncryptorConfig {
 	/// URL to key server
@@ -69,6 +70,8 @@ pub struct EncryptorConfig {
 	pub threshold: u32,
 	/// Account used for signing requests to key server
 	pub key_server_account: Option<Address>,
+	/// Passwords used to unlock accounts
+	pub passwords: Vec<Password>,
 }

 struct EncryptionSession {
@@ -81,20 +84,14 @@ pub struct SecretStoreEncryptor {
 	config: EncryptorConfig,
 	client: FetchClient,
 	sessions: Mutex<HashMap<Address, EncryptionSession>>,
-	signer: Arc<Signer>,
 }

 impl SecretStoreEncryptor {
 	/// Create new encryptor
-	pub fn new(
-		config: EncryptorConfig,
-		client: FetchClient,
-		signer: Arc<Signer>,
-	) -> Result<Self, Error> {
+	pub fn new(config: EncryptorConfig, client: FetchClient) -> Result<Self, Error> {
 		Ok(SecretStoreEncryptor {
 			config,
 			client,
-			signer,
 			sessions: Mutex::default(),
 		})
 	}
@@ -105,17 +102,18 @@ impl SecretStoreEncryptor {
 		url_suffix: &str,
 		use_post: bool,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 	) -> Result<Bytes, Error> {
 		// check if the key was already cached
 		if let Some(key) = self.obtained_key(contract_address) {
 			return Ok(key);
 		}
-		let contract_address_signature = self.sign_contract_address(contract_address)?;
-		let requester = self.config.key_server_account.ok_or_else(|| Error::KeyServerAccountNotSet)?;
+		let contract_address_signature = self.sign_contract_address(contract_address, accounts)?;
+		let requester = self.config.key_server_account.ok_or_else(|| ErrorKind::KeyServerAccountNotSet)?;

 		// key id in SS is H256 && we have H160 here => expand with assitional zeros
-		let contract_address_extended: H256 = (*contract_address).into();
-		let base_url = self.config.base_url.clone().ok_or_else(|| Error::KeyServerNotSet)?;
+		let contract_address_extended: H256 = contract_address.into();
+		let base_url = self.config.base_url.clone().ok_or_else(|| ErrorKind::KeyServerNotSet)?;

 		// prepare request url
 		let url = format!("{}/{}/{}{}",
@@ -127,21 +125,21 @@ impl SecretStoreEncryptor {

 		// send HTTP request
 		let method = if use_post {
-			Method::POST
+			Method::Post
 		} else {
-			Method::GET
+			Method::Get
 		};

-		let url = Url::from_str(&url).map_err(|e| Error::Encrypt(e.to_string()))?;
+		let url = Url::from_str(&url).map_err(|e| ErrorKind::Encrypt(e.to_string()))?;
 		let response = self.client.fetch(Request::new(url, method), Default::default()).wait()
-			.map_err(|e| Error::Encrypt(e.to_string()))?;
+			.map_err(|e| ErrorKind::Encrypt(e.to_string()))?;

 		if response.is_not_found() {
-			return Err(Error::EncryptionKeyNotFound(*contract_address));
+			bail!(ErrorKind::EncryptionKeyNotFound(*contract_address));
 		}

 		if !response.is_success() {
-			return Err(Error::Encrypt(response.status().canonical_reason().unwrap_or("unknown").into()));
+			bail!(ErrorKind::Encrypt(response.status().canonical_reason().unwrap_or("unknown").into()));
 		}

 		// read HTTP response
@@ -149,14 +147,15 @@ impl SecretStoreEncryptor {
 		BodyReader::new(response).read_to_string(&mut result)?;

 		// response is JSON string (which is, in turn, hex-encoded, encrypted Public)
-		let encrypted_bytes: ethjson::bytes::Bytes = result.trim_matches('\"').parse().map_err(|e| Error::Encrypt(e))?;
+		let encrypted_bytes: ethjson::bytes::Bytes = result.trim_matches('\"').parse().map_err(|e| ErrorKind::Encrypt(e))?;
+		let password = find_account_password(&self.config.passwords, &*accounts, &requester);

 		// decrypt Public
-		let decrypted_bytes = self.signer.decrypt(requester, &crypto::DEFAULT_MAC, &encrypted_bytes)?;
+		let decrypted_bytes = accounts.decrypt(requester, password, &crypto::DEFAULT_MAC, &encrypted_bytes)?;
 		let decrypted_key = Public::from_slice(&decrypted_bytes);

 		// and now take x coordinate of Public as a key
-		let key: Bytes = decrypted_key.as_bytes()[..INIT_VEC_LEN].into();
+		let key: Bytes = (*decrypted_key)[..INIT_VEC_LEN].into();

 		// cache the key in the session and clear expired sessions
 		self.sessions.lock().insert(*contract_address, EncryptionSession{
@@ -188,9 +187,12 @@ impl SecretStoreEncryptor {
 		}
 	}

-	fn sign_contract_address(&self, contract_address: &Address) -> Result<Signature, Error> {
-		let key_server_account = self.config.key_server_account.ok_or_else(|| Error::KeyServerAccountNotSet)?;
-		Ok(self.signer.sign(key_server_account, address_to_key(contract_address))?)
+	fn sign_contract_address(&self, contract_address: &Address, accounts: &AccountProvider) -> Result<Signature, Error> {
+		// key id in SS is H256 && we have H160 here => expand with assitional zeros
+		let contract_address_extended: H256 = contract_address.into();
+		let key_server_account = self.config.key_server_account.ok_or_else(|| ErrorKind::KeyServerAccountNotSet)?;
+		let password = find_account_password(&self.config.passwords, accounts, &key_server_account);
+		Ok(accounts.sign(key_server_account, password, H256::from_slice(&contract_address_extended))?)
 	}
 }

@@ -198,25 +200,26 @@ impl Encryptor for SecretStoreEncryptor {
 	fn encrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		initialisation_vector: &H128,
 		plain_data: &[u8],
 	) -> Result<Bytes, Error> {
 		// retrieve the key, try to generate it if it doesn't exist yet
-		let key = match self.retrieve_key("", false, contract_address) {
+		let key = match self.retrieve_key("", false, contract_address, &*accounts) {
 			Ok(key) => Ok(key),
-			Err(Error::EncryptionKeyNotFound(_)) => {
+			Err(Error(ErrorKind::EncryptionKeyNotFound(_), _)) => {
 				trace!(target: "privatetx", "Key for account wasnt found in sstore. Creating. Address: {:?}", contract_address);
-				self.retrieve_key(&format!("/{}", self.config.threshold), true, contract_address)
+				self.retrieve_key(&format!("/{}", self.config.threshold), true, contract_address, &*accounts)
 			}
 			Err(err) => Err(err),
 		}?;

 		// encrypt data
-		let mut cypher = Vec::with_capacity(plain_data.len() + initialisation_vector.as_bytes().len());
+		let mut cypher = Vec::with_capacity(plain_data.len() + initialisation_vector.len());
 		cypher.extend(repeat(0).take(plain_data.len()));
-		crypto::aes::encrypt_128_ctr(&key, initialisation_vector.as_bytes(), plain_data, &mut cypher)
-			.map_err(|e| Error::Encrypt(e.to_string()))?;
-		cypher.extend_from_slice(&initialisation_vector.as_bytes());
+		crypto::aes::encrypt_128_ctr(&key, initialisation_vector, plain_data, &mut cypher)
+			.map_err(|e| ErrorKind::Encrypt(e.to_string()))?;
+		cypher.extend_from_slice(&initialisation_vector);

 		Ok(cypher)
 	}
@@ -225,23 +228,24 @@ impl Encryptor for SecretStoreEncryptor {
 	fn decrypt(
 		&self,
 		contract_address: &Address,
+		accounts: &AccountProvider,
 		cypher: &[u8],
 	) -> Result<Bytes, Error> {
 		// initialization vector takes INIT_VEC_LEN bytes
 		let cypher_len = cypher.len();
 		if cypher_len < INIT_VEC_LEN {
-			return Err(Error::Decrypt("Invalid cypher".into()));
+			bail!(ErrorKind::Decrypt("Invalid cypher".into()));
 		}

 		// retrieve existing key
-		let key = self.retrieve_key("", false, contract_address)?;
+		let key = self.retrieve_key("", false, contract_address, accounts)?;

 		// use symmetric decryption to decrypt document
 		let (cypher, iv) = cypher.split_at(cypher_len - INIT_VEC_LEN);
 		let mut plain_data = Vec::with_capacity(cypher_len - INIT_VEC_LEN);
 		plain_data.extend(repeat(0).take(cypher_len - INIT_VEC_LEN));
 		crypto::aes::decrypt_128_ctr(&key, &iv, cypher, &mut plain_data)
-			.map_err(|e| Error::Decrypt(e.to_string()))?;
+			.map_err(|e| ErrorKind::Decrypt(e.to_string()))?;
 		Ok(plain_data)
 	}
 }
@@ -254,6 +258,7 @@ impl Encryptor for NoopEncryptor {
 	fn encrypt(
 		&self,
 		_contract_address: &Address,
+		_accounts: &AccountProvider,
 		_initialisation_vector: &H128,
 		data: &[u8],
 	) -> Result<Bytes, Error> {
@@ -263,6 +268,7 @@ impl Encryptor for NoopEncryptor {
 	fn decrypt(
 		&self,
 		_contract_address: &Address,
+		_accounts: &AccountProvider,
 		data: &[u8],
 	) -> Result<Bytes, Error> {
 		Ok(data.to_vec())
--- a/ethcore/private-tx/src/error.rs
+++ b/ethcore/private-tx/src/error.rs
@@ -1,215 +1,204 @@
-// Copyright 2015-2019 Parity Technologies (UK) Ltd.
-// This file is part of Parity Ethereum.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
+// This file is part of Parity.

-// Parity Ethereum is free software: you can redistribute it and/or modify
+// 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 Ethereum is distributed in the hope that it will be useful,
+// 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 Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity.  If not, see <http://www.gnu.org/licenses/>.

-use std::error;
-use derive_more::Display;
 use ethereum_types::Address;
 use rlp::DecoderError;
 use ethtrie::TrieError;
+use ethcore::account_provider::SignError;
 use ethcore::error::{Error as EthcoreError, ExecutionError};
-use types::transaction::Error as TransactionError;
+use transaction::Error as TransactionError;
 use ethkey::Error as KeyError;
-use ethkey::crypto::Error as CryptoError;
-use txpool::VerifiedTransaction;
-use private_transactions::VerifiedPrivateTransaction;
-use serde_json::{Error as SerdeError};
+use txpool::Error as TxPoolError;

-type TxPoolError = txpool::Error<<VerifiedPrivateTransaction as VerifiedTransaction>::Hash>;
+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."];
+	}

-#[derive(Debug, Display)]
-pub enum Error {
-	/// Error concerning the Rust standard library's IO subsystem.
-	#[display(fmt = "Io Error: {}", _0)]
-	Io(::std::io::Error),
-	/// RLP decoding error.
-	#[display(fmt = "Decoder Error: {}", _0)]
-	Decoder(DecoderError),
-	/// Error concerning TrieDBs.
-	#[display(fmt = "Trie Error: {}", _0)]
-	Trie(TrieError),
-	/// Transaction pool error.
-	#[display(fmt = "Transaction Pool Error: {}", _0)]
-	TxPool(TxPoolError),
-	/// Crypto error.
-	#[display(fmt = "Crypto Error {}", _0)]
-	Crypto(CryptoError),
-	/// Serialization error.
-	#[display(fmt = "Serialization Error {}", _0)]
-	Json(SerdeError),
-	/// Encryption error.
-	#[display(fmt = "Encryption error. ({})", _0)]
-	Encrypt(String),
-	/// Decryption error.
-	#[display(fmt = "Decryption error. ({})", _0)]
-	Decrypt(String),
-	/// Address not authorized.
-	#[display(fmt = "Private transaction execution is not authorised for {}", _0)]
-	NotAuthorised(Address),
-	/// Transaction creates more than one contract.
-	#[display(fmt = "Private transaction created too many contracts")]
-	TooManyContracts,
-	/// Contract call error.
-	#[display(fmt = "Contract call error. ({})", _0)]
-	Call(String),
-	/// State is not available.
-	#[display(fmt = "State is not available")]
-	StatePruned,
-	/// State is incorrect.
-	#[display(fmt = "State is incorrect")]
-	StateIncorrect,
-	/// Wrong private transaction type.
-	#[display(fmt = "Wrong private transaction type")]
-	BadTransactionType,
-	/// Contract does not exist or was not created.
-	#[display(fmt = "Contract does not exist or was not created")]
-	ContractDoesNotExist,
-	/// Reference to the client is corrupted.
-	#[display(fmt = "Reference to the client is corrupted")]
-	ClientIsMalformed,
-	/// Queue of private transactions for verification is full.
-	#[display(fmt = "Queue of private transactions for verification is full")]
-	QueueIsFull,
-	/// The transaction already exists in queue of private transactions.
-	#[display(fmt = "The transaction already exists in queue of private transactions.")]
-	PrivateTransactionAlreadyImported,
-	/// The information about private transaction is not found in the store.
-	#[display(fmt = "The information about private transaction is not found in the store.")]
-	PrivateTransactionNotFound,
-	/// Account for signing public transactions not set.
-	#[display(fmt = "Account for signing public transactions not set.")]
-	SignerAccountNotSet,
-	/// Account for validating private transactions not set.
-	#[display(fmt = "Account for validating private transactions not set.")]
-	ValidatorAccountNotSet,
-	/// Account for signing requests to key server not set.
-	#[display(fmt = "Account for signing requests to key server not set.")]
-	KeyServerAccountNotSet,
-	/// Encryption key is not found on key server.
-	#[display(fmt = "Encryption key is not found on key server for {}", _0)]
-	EncryptionKeyNotFound(Address),
-	/// Key server URL is not set.
-	#[display(fmt = "Key server URL is not set.")]
-	KeyServerNotSet,
-	/// Transaction not found in logs.
-	#[display(fmt = "Private transaction not found in logs.")]
-	TxNotFoundInLog,
-	/// Path for logging not set.
-	#[display(fmt = "Path for logging not set.")]
-	LoggingPathNotSet,
-	/// Timestamp overflow error.
-	#[display(fmt = "Timestamp overflow error.")]
-	TimestampOverflow,
-	/// VM execution error.
-	#[display(fmt = "VM execution error {}", _0)]
-	Execution(ExecutionError),
-	/// General signing error.
-	#[display(fmt = "General signing error {}", _0)]
-	Key(KeyError),
-	/// Error of transactions processing.
-	#[display(fmt = "Error of transactions processing {}", _0)]
-	Transaction(TransactionError),
-	/// General ethcore error.
-	#[display(fmt = "General ethcore error {}", _0)]
-	Ethcore(EthcoreError),
-	/// A convenient variant for String.
-	#[display(fmt = "{}", _0)]
-	Msg(String),
-}
+	errors {
+		#[doc = "Encryption error."]
+		Encrypt(err: String) {
+			description("Encryption error"),
+			display("Encryption error. ({})", err),
+		}

-impl error::Error for Error {
-	fn source(&self) -> Option<&(error::Error + 'static)> {
-		match self {
-			Error::Io(e) => Some(e),
-			Error::Decoder(e) => Some(e),
-			Error::Trie(e) => Some(e),
-			Error::TxPool(e) => Some(e),
-			Error::Json(e) => Some(e),
-			Error::Crypto(e) => Some(e),
-			Error::Execution(e) => Some(e),
-			Error::Key(e) => Some(e),
-			Error::Transaction(e) => Some(e),
-			Error::Ethcore(e) => Some(e),
-			_ => None,
+		#[doc = "Decryption error."]
+		Decrypt(err: String) {
+			description("Decryption error"),
+			display("Decryption error. ({})", err),
+		}
+
+		#[doc = "Address not authorized."]
+		NotAuthorised(address: Address) {
+			description("Address not authorized"),
+			display("Private transaction execution is not authorised for {}", address),
+		}
+
+		#[doc = "Transaction creates more than one contract."]
+		TooManyContracts {
+			description("Transaction creates more than one contract."),
+			display("Private transaction created too many contracts"),
+		}
+
+		#[doc = "Contract call error."]
+		Call(err: String) {
+			description("Contract call error."),
+			display("Contract call error. ({})", err),
+		}
+
+		#[doc = "State is not available."]
+		StatePruned {
+			description("State is not available."),
+			display("State is not available"),
+		}
+
+		#[doc = "State is incorrect."]
+		StateIncorrect {
+			description("State is incorrect."),
+			display("State is incorrect"),
+		}
+
+		#[doc = "Wrong private transaction type."]
+		BadTransactonType {
+			description("Wrong private transaction type."),
+			display("Wrong private transaction type"),
+		}
+
+		#[doc = "Contract does not exist or was not created."]
+		ContractDoesNotExist {
+			description("Contract does not exist or was not created."),
+			display("Contract does not exist or was not created"),
+		}
+
+		#[doc = "Reference to the client is corrupted."]
+		ClientIsMalformed {
+			description("Reference to the client is corrupted."),
+			display("Reference to the client is corrupted"),
+		}
+
+		#[doc = "Queue of private transactions for verification is full."]
+		QueueIsFull {
+			description("Queue of private transactions for verification is full."),
+			display("Queue of private transactions for verification is full"),
+		}
+
+		#[doc = "The transaction already exists in queue of private transactions."]
+		PrivateTransactionAlreadyImported {
+			description("The transaction already exists in queue of private transactions."),
+			display("The transaction already exists in queue of private transactions."),
+		}
+
+		#[doc = "The information about private transaction is not found in the store."]
+		PrivateTransactionNotFound {
+			description("The information about private transaction is not found in the store."),
+			display("The information about private transaction is not found in the store."),
+		}
+
+		#[doc = "Account for signing public transactions not set."]
+		SignerAccountNotSet {
+			description("Account for signing public transactions not set."),
+			display("Account for signing public transactions not set."),
+		}
+
+		#[doc = "Account for validating private transactions not set."]
+		ValidatorAccountNotSet {
+			description("Account for validating private transactions not set."),
+			display("Account for validating private transactions not set."),
+		}
+
+		#[doc = "Account for signing requests to key server not set."]
+		KeyServerAccountNotSet {
+			description("Account for signing requests to key server not set."),
+			display("Account for signing requests to key server not set."),
+		}
+
+		#[doc = "Encryption key is not found on key server."]
+		EncryptionKeyNotFound(address: Address) {
+			description("Encryption key is not found on key server"),
+			display("Encryption key is not found on key server for {}", address),
+		}
+
+		#[doc = "Key server URL is not set."]
+		KeyServerNotSet {
+			description("Key server URL is not set."),
+			display("Key server URL is not set."),
+		}
+
+		#[doc = "VM execution error."]
+		Execution(err: ExecutionError) {
+			description("VM execution error."),
+			display("VM execution error {}", err),
+		}
+
+		#[doc = "General signing error."]
+		Key(err: KeyError) {
+			description("General signing error."),
+			display("General signing error {}", err),
+		}
+
+		#[doc = "Account provider signing error."]
+		Sign(err: SignError) {
+			description("Account provider signing error."),
+			display("Account provider signing error {}", err),
+		}
+
+		#[doc = "Error of transactions processing."]
+		Transaction(err: TransactionError) {
+			description("Error of transactions processing."),
+			display("Error of transactions processing {}", err),
+		}
+
+		#[doc = "General ethcore error."]
+		Ethcore(err: EthcoreError) {
+			description("General ethcore error."),
+			display("General ethcore error {}", err),
 		}
 	}
 }

-impl From<String> for Error {
-	fn from(s: String) -> Self {
-		Error::Msg(s)
-	}
-}
-
-impl From<std::io::Error> for Error {
-	fn from(err: std::io::Error) -> Self {
-		Error::Io(err).into()
+impl From<SignError> for Error {
+	fn from(err: SignError) -> Self {
+		ErrorKind::Sign(err).into()
 	}
 }

 impl From<KeyError> for Error {
 	fn from(err: KeyError) -> Self {
-		Error::Key(err).into()
-	}
-}
-
-impl From<CryptoError> for Error {
-	fn from(err: CryptoError) -> Self {
-		Error::Crypto(err).into()
-	}
-}
-
-impl From<DecoderError> for Error {
-	fn from(err: DecoderError) -> Self {
-		Error::Decoder(err).into()
+		ErrorKind::Key(err).into()
 	}
 }

 impl From<ExecutionError> for Error {
 	fn from(err: ExecutionError) -> Self {
-		Error::Execution(err).into()
+		ErrorKind::Execution(err).into()
 	}
 }

 impl From<TransactionError> for Error {
 	fn from(err: TransactionError) -> Self {
-		Error::Transaction(err).into()
-	}
-}
-
-impl From<TrieError> for Error {
-	fn from(err: TrieError) -> Self {
-		Error::Trie(err).into()
-	}
-}
-
-impl From<TxPoolError> for Error {
-	fn from(err: TxPoolError) -> Self {
-		Error::TxPool(err).into()
-	}
-}
-
-impl From<SerdeError> for Error {
-	fn from(err: SerdeError) -> Self {
-		Error::Json(err).into()
+		ErrorKind::Transaction(err).into()
 	}
 }

 impl From<EthcoreError> for Error {
 	fn from(err: EthcoreError) -> Self {
-		Error::Ethcore(err).into()
+		ErrorKind::Ethcore(err).into()
 	}
 }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
André Silva	d35f4c1f0d	[beta] More backports for 2.1.2 (#9733 ) * produce portable binaries (#9725) * HF in POA Core (2018-10-22) (#9724) https://github.com/poanetwork/poa-chain-spec/pull/87 * Use static call and apparent value transfer for block reward contract code (#9603) * Verify block syncing responses against requests (#9670) * sync: Validate received BlockHeaders packets against stored request. * sync: Validate received BlockBodies and BlockReceipts. * sync: Fix broken tests. * sync: Unit tests for BlockDownloader::import_headers. * sync: Unit tests for import_{bodies,receipts}. * tests: Add missing method doc. * Fix ancient blocks sync (#9531) * Log block set in block_sync for easier debugging * logging macros * Match no args in sync logging macros * Add QueueFull error * Only allow importing headers if the first matches requested * WIP * Test for chain head gaps and log * Calc distance even with 2 heads * Revert previous commits, preparing simple fix This reverts commit 5f38aa885b22ebb0e3a1d60120cea69f9f322628. * Reject headers with no gaps when ChainHead * Reset block sync download when queue full * Simplify check for subchain heads * Add comment to explain subchain heads filter * Fix is_subchain_heads check and comment * Prevent premature round completion after restart This is a problem on mainnet where multiple stale peer requests will force many rounds to complete quickly, forcing the retraction. * Reset stale old blocks request after queue full * Revert "Reject headers with no gaps when ChainHead" This reverts commit 0eb865539e5dee37ab34f168f5fb643300de5ace. * Add BlockSet to BlockDownloader logging Currently it is difficult to debug this because there are two instances, one for OldBlocks and one for NewBlocks. This adds the BlockSet to all log messages for easy log filtering. * Reset OldBlocks download from last enqueued Previously when the ancient block queue was full it would restart the download from the last imported block, so the ones still in the queue would be redownloaded. Keeping the existing downloader instance and just resetting it will start again from the last enqueued block.:wq * Ignore expired Body and Receipt requests * Log when ancient block download being restarted * Only request old blocks from peers with >= difficulty https://github.com/paritytech/parity-ethereum/pull/9226 might be too permissive and causing the behaviour of the retraction soon after the fork block. With this change the peer difficulty has to be greater than or euqal to our syncing difficulty, so should still fix https://github.com/paritytech/parity-ethereum/issues/9225 * Some logging and clear stalled blocks head * Revert "Some logging and clear stalled blocks head" This reverts commit 757641d9b817ae8b63fec684759b0815af9c4d0e. * Reset stalled header if useless more than once * Store useless headers in HashSet * Add sync target to logging macro * Don't disable useless peer and fix log macro * Clear useless headers on reset and comments * Use custom error for collecting blocks Previously we resued BlockImportError, however only the Invalid case and this made little sense with the QueueFull error. * Remove blank line * Test for reset sync after consecutive useless headers * Don't reset after consecutive headers when chain head * Delete commented out imports * Return DownloadAction from collect_blocks instead of error * Don't reset after round complete, was causing test hangs * Add comment explaining reset after useless * Replace HashSet with counter for useless headers * Refactor sync reset on bad block/queue full * Add missing target for log message * Fix compiler errors and test after merge * ethcore: revert ethereum tests submodule update * Add hardcoded headers (#9730) * add foundation hardcoded header #6486017 * add ropsten hardcoded headers #4202497 * add kovan hardcoded headers #9023489 * gitlab ci: releasable_branches: change variables condition to schedule (#9729)	2018-10-10 18:55:55 +02:00
Afri Schoedon	52fe28a052	Backports for beta 2.1.2 (#9649 ) * parity-version: bump beta to 2.1.2 * docs(rpc): push the branch along with tags (#9578) * docs(rpc): push the branch along with tags * ci: remove old rpc docs script * Remove snapcraft clean (#9585) * Revert " add snapcraft package image (master) (#9584)" This reverts commit `ceaedbbd7f`. * Update package-snap.sh * Update .gitlab-ci.yml * ci: fix regex 🙄 (#9597) * docs(rpc): annotate tag with the provided message (#9601) * Update ropsten.json (#9602) * HF in POA Sokol (2018-09-19) (#9607) https://github.com/poanetwork/poa-chain-spec/pull/86 * fix(network): don't disconnect reserved peers (#9608) The priority of && and \|\| was borked. * fix failing node-table tests on mac os, closes #9632 (#9633) * ethcore-io retries failed work steal (#9651) * ethcore-io uses newer version of crossbeam && retries failed work steal * ethcore-io non-mio service uses newer crossbeam * remove master from releasable branches (#9655) * remove master from releasable branches need backporting in beta fix https://gitlab.parity.io/parity/parity-ethereum/-/jobs/101065 etc * add except for snap packages for master * Test fix for windows cache name... (#9658) * Test fix for windows cache name... * Fix variable name. * fix(light_fetch): avoid race with BlockNumber::Latest (#9665) * Calculate sha3 instead of sha256 for push-release. (#9673) * Calculate sha3 instead of sha256 for push-release. * Add pushes to the script. * Hardfork the testnets (#9562) * ethcore: propose hardfork block number 4230000 for ropsten * ethcore: propose hardfork block number 9000000 for kovan * ethcore: enable kip-4 and kip-6 on kovan * etcore: bump kovan hardfork to block 9.2M * ethcore: fix ropsten constantinople block number to 4.2M * ethcore: disable difficulty_test_ropsten until ethereum/tests are updated upstream * ci: fix push script (#9679) * ci: fix push script * Fix copying & running on windows. * CI: Remove unnecessary pipes (#9681) * ci: reduce gitlab pipelines significantly * ci: build pipeline for PR * ci: remove dead weight * ci: remove github release script * ci: remove forever broken aura tests * ci: add random stuff to the end of the pipes * ci: add wind and mac to the end of the pipe * ci: remove snap artifacts * ci: (re)move dockerfiles * ci: clarify job names * ci: add cargo audit job * ci: make audit script executable * ci: ignore snap and docker files for rust check * ci: simplify audit script * ci: rename misc to optional * ci: add publish script to releaseable branches * ci: more verbose cp command for windows build * ci: fix weird binary checksum logic in push script * ci: fix regex in push script for windows * ci: simplify gitlab caching * docs: align README with ci changes * ci: specify default cargo target dir * ci: print verbose environment * ci: proper naming of scripts * ci: restore docker files * ci: use docker hub file * ci: use cargo home instead of cargo target dir * ci: touch random rust file to trigger real builds * ci: set cargo target dir for audit script * ci: remove temp file * ci: don't export the cargo target dir in the audit script * ci: fix windows unbound variable * docs: fix gitlab badge path * rename deprecated gitlab ci variables https://docs.gitlab.com/ee/ci/variables/#9-0-renaming * ci: fix git compare for nightly builds * test: skip c++ example for all platforms but linux * ci: add random rust file to trigger tests * ci: remove random rust file * disable cpp lib test for mac, win and beta (#9686) * cleanup ci merge * ci: fix tests * fix bad-block reporting no reason (#9638) * ethcore: fix detection of major import (#9552) * sync: set state to idle after sync is completed * sync: refactor sync reset * Don't hash the init_code of CREATE. (#9688) * Docker: run as parity user (#9689) * Implement CREATE2 gas changes and fix some potential overflowing (#9694) * Implement CREATE2 gas changes and fix some potential overflowing * Ignore create2 state tests * Split CREATE and CREATE2 in gasometer * Generalize rounding (x + 31) / 32 to to_word_size * make instantSeal engine backwards compatible, closes #9696 (#9700) * ethcore: delay ropsten hardfork (#9704) * fix (light/provider) : Make `read_only executions` read-only (#9591) * `ExecutionsRequest` from light-clients as read-only This changes so all `ExecutionRequests` from light-clients are executed as read-only which the `virtual``flag == true ensures. This boost up the current transaction to always succeed Note, this only affects `eth_estimateGas` and `eth_call` AFAIK. * grumbles(revert renaming) : TransactionProof * grumbles(trace) : remove incorrect trace * grumbles(state/prove_tx) : explicit `virt` Remove the boolean flag to determine that a `state::prove_transaction` whether it should be executed in a virtual context or not. Because of that also rename the function to `state::prove_transction_virtual` to make more clear * CI: Skip docs job for nightly (#9693) * ci: force-tag wiki changes * ci: force-tag wiki changes * ci: skip docs job for master and nightly * ci: revert docs job checking for nightly tag * ci: exclude docs job from nightly builds in gitlab script	2018-10-09 15:04:30 +02:00
gabriel klawitter	8e347b2602	rpc-docs should push the branch (#9611 )	2018-09-21 14:38:28 +02:00
gabriel klawitter	a5dcaf7d21	beta: rpc-docs set github token (#9609 )	2018-09-20 17:19:42 +03:00
Afri Schoedon	cb09330cb3	Backports for 2.1.1 beta (#9599 ) * parity: bump version to 2.1.1 beta * ci: fix regex 🙄 * docs(rpc): annotate tag with the provided message	2018-09-19 20:31:26 +02:00
Denis S. Soldatov aka General-Beck	363ad10906	add snapcraft package image (#9583 ) * add snapcraft package image * Update .gitlab-ci.yml * remove snapcraft clean	2018-09-18 15:32:05 +02:00
Afri Schoedon	d147700046	Backports for 2.1.0 beta (#9518 ) * parity-version: mark 2.1.0 track beta * ci: update branch version references * docker: release master to latest * Fix checkpointing when creating contract failed (#9514) * ci: fix json docs generation (#9515) * fix typo in version string (#9516) * Update patricia trie to 0.2.2 crates. Default dependencies on minor version only. * Putting back ethereum tests to the right commit * Enable all Constantinople hard fork changes in constantinople_test.json (#9505) * Enable all Constantinople hard fork changes in constantinople_test.json * Address grumbles * Remove EIP-210 activation * 8m -> 5m * Temporarily add back eip210 transition so we can get test passed * Add eip210_test and remove eip210 transition from const_test * In create memory calculation is the same for create2 because the additional parameter was popped before. (#9522) * deps: bump fs-swap and kvdb-rocksdb * Multithreaded snapshot creation (#9239) * Add Progress to Snapshot Secondary chunks creation * Use half of CPUs to multithread snapshot creation * Use env var to define number of threads * info to debug logs * Add Snapshot threads as CLI option * Randomize chunks per thread * Remove randomness, add debugging * Add warning * Add tracing * Use parity-common fix seek branch * Fix log * Fix tests * Fix tests * PR Grumbles * PR Grumble II * Update Cargo.lock * PR Grumbles * Default snapshot threads to half number of CPUs * Fix default snapshot threads // min 1 * correct before_script for nightly build versions (#9543) - fix gitlab array of strings syntax error - get proper commit id - avoid colon in stings * Remove initial token for WS. (#9545) * version: mark release critical * ci: fix rpc docs generation 2 (#9550) * Improve P2P discovery (#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 aquire of sync read lock (#9544) * net_version caches network_id to avoid redundant aquire of sync read lock, #8746 * use lower_hex display formatting for net_peerCount rpc method * Increase Gas-floor-target and Gas Cap (#9564) + Gas-floor-target increased to 8M by default + Gas-cap increased to 10M by default * Revert to old parity-tokio-ipc. * Downgrade named pipes.	2018-09-17 19:22:30 +02:00