Backport Beta 2.2.1 (#9905 )

* Bump beta to version 2.2.1 * fix: Intermittent failing CI due to addr in use (#9885) Allow OS to set port at runtime * Use Weak reference in PubSubClient (#9886) * Fix json tracer overflow (#9873) * Fix json tracer overflow * Replace trace_executed with a direct trace push * Remove unused variable * Add test for 5a51 * Remove duplicate json! * Fix docker script (#9854) * Dockerfile: change source path of the newly added check_sync.sh (#9869) * Allow to seal work on latest block (#9876) * Allow to seal work on latest block. * Test from @todr to check sealing conditions. * gitlab-ci: make android release build succeed (#9743) * use docker cargo config file for android builds * make android build succeed * ethcore: use Machine::verify_transaction on parent block (#9900) * ethcore: use Machine::verify_transaction on parent block also fixes off-by-one activation of transaction permission contract * ethcore: clarify call to verify_transaction * foundation: #6692865, ropsten: #4417537, kovan: #9363457 * Remove rust-toolchain file (#9906) * EIP-712 implementation (#9631) * EIP-712 impl * added more tests * removed size parsing unwrap * corrected TYPE_REGEX to disallow zero sized fixed length arrays, replaced LinkedHashSet with IndexSet, added API spec to docs, fixed Type::Byte encoding branch * use Option<u64> instead of u64 for Type::Array::Length * replace `.iter()` with `.values()` Co-Authored-By: seunlanlege <seunlanlege@gmail.com> * tabify eip712.rs * use proper comments for docs * Cargo.lock: revert unrelated changes * tabify encode.rs * EIP 191 (#9701) * added sign_191 rpc method * fixed hash_structured_data return type * added ConfirmationPayload::SignMessage for non-prefixed signatures, added tests for sign191 * renamed WithValidator -> PresignedTransaction * rename applicationData to data in test * adds docs for EIP191Version, renamed SignRequest to EIP191SignRequest * light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure (#9824) * fix start_gas, handle OOG exceptions & NotEnoughGas * Change START_GAS: 50_000 -> 60_000 * When the `OutOfGas exception` is received then try to double the gas until it succeeds or block gas limit is reached * When `NotEnoughBasGas error` is received then use the required gas provided in the response * fix(light-fetch): ensure block_gas_limit is tried Try the `block_gas_limit` before regard the execution as an error * Update rpc/src/v1/helpers/light_fetch.rs Co-Authored-By: niklasad1 <niklasadolfsson1@gmail.com> * simplify cargo audit * Use block header for building finality (#9914) * ci: nuke the gitlab caches (#9855)
version: mark 2.2.0 beta (#9820 )
2018-11-14 15:23:44 +01:00 · 2018-11-02 10:02:46 +01:00
1107 changed files with 84146 additions and 122201 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/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,353 +4,149 @@ stages:
  - publish
  - optional

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

 variables:
-  GIT_STRATEGY:                    fetch
-  GIT_SUBMODULE_STRATEGY:          recursive
-  GIT_DEPTH:                       3
  CI_SERVER_NAME:                  "GitLab CI"
-  CARGO_HOME:                      "/ci-cache/${CI_PROJECT_NAME}/cargo/${CI_JOB_NAME}"
+  CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
  CARGO_TARGET:                    x86_64-unknown-linux-gnu
-  CARGO_INCREMENTAL:               0
-  REGISTRY:                        registry.parity.io/parity/infrastructure/scripts

 .releaseable_branches:             # list of git refs for building GitLab artifacts (think "pre-release binaries")
  only:                            &releaseable_branches
    - stable
+    - beta
    - tags
    - schedules

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

-.docker-cache-status:              &docker-cache-status
-  dependencies:                    []
-  interruptible:                   true
-  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 --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
+.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 "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" = "nightly" && VERSION="${VERSION}-${ID_SHORT}-${DATE_STR}"
+  - export VERSION
+  - echo "Version = ${VERSION}"

 test-linux:
-  stage:                           build
-  <<:                              *docker-cache-status
+  stage:                           test
+  variables:
+    RUN_TESTS:                     all
  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
+    - 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
-       (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
+
+build-android:
+  stage:                           optional
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/build-unix.sh
+  tags:
+    - rust-arm
+
+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
--- a/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,81 +2,73 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.7.2"
+version = "2.2.1"
 license = "GPL-3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-ansi_term = "0.11"
-atty = "0.2.8"
 blooms-db = { path = "util/blooms-db" }
+log = "0.4"
+env_logger = "0.5"
+rustc-hex = "1.0"
+docopt = "0.8"
 clap = "2"
-cli-signer= { path = "cli-signer" }
-client-traits = { path = "ethcore/client-traits" }
-common-types = { path = "ethcore/types" }
+term_size = "0.3"
+textwrap = "0.9"
+num_cpus = "1.2"
+number_prefix = "0.2"
+rpassword = "1.0"
+semver = "0.9"
+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"
+fdlimit = "0.1"
 ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-dir = { path = "util/dir" }
-docopt = "1.0"
-engine = { path = "ethcore/engine" }
-ethabi = { version = "9.0.1", optional = true }
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
 ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
-ethcore-blockchain = { path = "ethcore/blockchain" }
-ethcore-call-contract = { path = "ethcore/call-contract", optional = true }
-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-secretstore = { path = "secret-store", optional = true }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
-ethereum-types = "0.8.0"
-ethkey = { path = "accounts/ethkey" }
-ethstore = { path = "accounts/ethstore" }
-fdlimit = "0.1"
-futures = "0.1"
-journaldb = { path = "util/journaldb" }
-jsonrpc-core = "14.0.3"
-keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
-log = "0.4"
-migration-rocksdb = { path = "util/migration-rocksdb" }
-node-filter = { path = "ethcore/node-filter" }
-num_cpus = "1.2"
-number_prefix = "0.2"
-panic_hook = { path = "util/panic-hook" }
-parity-bytes = "0.1"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-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.3.0", 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-path = "0.1"
-parity-rpc = { path = "rpc" }
+parity-local-store = { path = "local-store" }
 parity-runtime = { path = "util/runtime" }
+parity-rpc = { path = "rpc" }
+parity-rpc-client = { path = "rpc_client" }
 parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.3.0", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
-parking_lot = "0.9"
-regex = "1.0"
-registrar = { path = "util/registrar" }
-rlp = "0.4.0"
-rpassword = "1.0"
-rustc-hex = "1.0"
-semver = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-snapshot = { path = "ethcore/snapshot" }
-spec = { path = "ethcore/spec" }
-term_size = "0.3"
-textwrap = "0.9"
-toml = "0.4"
-verification = { path = "ethcore/verification" }
+parity-whisper = { path = "whisper" }
+parity-path = "0.1"
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic_hook" }
+keccak-hash = "0.1"
+migration-rocksdb = { path = "util/migration-rocksdb" }
+kvdb = "0.1"
+kvdb-rocksdb = "0.1.3"
+journaldb = { path = "util/journaldb" }
+mem = { path = "util/mem" }
+
+ethcore-secretstore = { path = "secret_store", optional = true }
+
+registrar = { path = "registrar" }

 [build-dependencies]
 rustc_version = "0.2"
@@ -90,16 +82,18 @@ 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"]
+ci-skip-issue = ["ethcore/ci-skip-issue"]
 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", "accounts", "ethabi", "ethcore-call-contract"]
+secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 # to create a memory profile (requires nightly rust), use e.g.
@@ -121,18 +115,25 @@ 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",
 ]
--- 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.

@@ -42,13 +23,11 @@ By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a We

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

-Parity Ethereum's current beta-release is 2.6. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+Parity Ethereum's 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,230 +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
-  ```
-
-</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.
+- [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)
- [whisper](https://github.com/paritytech/whisper) - Parity Ethereum Whisper-v2 PoC Implementation.
-
-## 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)
@@ -374,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/SECURITY.md
+++ b/SECURITY.md
@@ -48,54 +48,33 @@ Our Bug Bounty Program allows us to recognise and reward members of the Parity c
 ```
 -----BEGIN PGP PUBLIC KEY BLOCK-----

-mQINBF0vHwQBEADKui4qAo4bzdzRhMm+uhUpYGf8jjjmET3zJ8kKQIpp6JTsV+HJ
-6m1We0QYeMRXoOYH1xVHBf2zNCuHS0nSQdUCQA7SHWsPB05STa2hvlR7fSdQnCCp
-gnLOJWXvvedlRDIAhvqI6cwLdUlXgVSKEwrwmrpiBhh4NxI3qX+LyIa+Ovkchu2S
-d/YCnE4GqojSGRfJYiGwe2N+sF7OfaoKhQuTrtdDExHrMU4cWnTXW2wyxTr4xkj9
-jS2WeLVZWflvkDHT8JD9N6jNxBVEF/Qvjk83zI0kCOzkhek8x+YUgfLq3/rHOYbX
-3pW21ccHYPacHjHWvKE+xRebjeEhJ4KxKHfCVjQcxybwDBqDka1AniZt4CQ7UORf
-MU/ue2oSZ9nNg0uMdb/0AbQPZ04OlMcYPAPWzFL08nVPox9wT9uqlL6JtcOeC90h
-oOeDmfgwmjMmdwWTRgt9qQjcbgXzVvuAzIGbzj1X3MdLspWdHs/d2+US4nji1TkN
-oYIW7vE+xkd3aB+NZunIlm9Rwd/0mSgDg+DaNa5KceOLhq0/qKgcXC/RRU29I8II
-tusRoR/oesGJGYTjh4k6PJkG+nvDPsoQrwYT44bhnniS1xYkxWYXF99JFI7LgMdD
-e1SgKeIDVpvm873k82E6arp5655Wod1XOjaXBggCwFp84eKcEZEN+1qEWwARAQAB
-tClQYXJpdHkgU2VjdXJpdHkgVGVhbSA8c2VjdXJpdHlAcGFyaXR5LmlvPokCVAQT
-AQoAPhYhBJ1LK264+XFW0ZZpqf8IEtSRuWeYBQJdLx8EAhsDBQkDwmcABQsJCAcC
-BhUKCQgLAgQWAgMBAh4BAheAAAoJEP8IEtSRuWeYL84QAI6NwnwS561DWYYRAd4y
-ocGPr3CnwFSt1GjkSkRy3B+tMhzexBg1y7EbLRUefIrO4LwOlywtRk8tTRGgEI4i
-5xRLHbOkeolfgCFSpOj5d8cMKCt5HEIv18hsv6dkrzlSYA5NLX/GRBEh3F/0sGny
-vCXapfxa1cx72sU7631JBK7t2Tf+MfwxdfyFZ9TI9WdtP5AfVjgTkIVkEDFcZPTc
-n3CYXqTYFIBCNUD8LP4iTi3xUt7pTGJQQoFT8l15nJCgzRYQ+tXpoTRlf+/LtXmw
-6iidPV87E06jHdK9666rBouIabAtx7i0/4kwo+bSZ8DiSKRUaehiHGd212HSEmdF
-jxquWE4pEzoUowYznhSIfR+WWIqRBHxEYarP4m98Hi+VXZ7Fw1ytzO8+BAKnLXnj
-2W2+T9qJks5gqVEoaWNnqpvya6JA11QZvZ0w7Om2carDc2ILNm2Xx9J0mRUye8P0
-KxcgqJuKNGFtugebQAsXagkxOKsdKna1PlDlxEfTf6AgI3ST8qSiMAwaaIMB/REF
-VKUapGoslQX4tOCjibI2pzEgE//D8NAaSVu2A9+BUcFERdZRxsI7fydIXNeZ2R46
-N2qfW+DP3YR/14QgdRxDItEavUoE1vByRXwIufKAkVemOZzIoFXKFsDeXwqTVW5i
-6CXu6OddZ3QHDiT9TEbRny4QuQINBF0vKCwBEACnP5J7LEGbpxNBrPvGdxZUo0YA
-U8RgeKDRPxJTvMo27V1IPZGaKRCRq8LBfg/eHhqZhQ7SLJBjBljd8kuT5dHDBTRe
-jE1UIOhmnlSlrEJjAmpVO08irlGpq1o+8mGcvkBsR0poCVjeNeSnwYfRnR+c3GK5
-Er6/JRqfN4mJvnEC9/Pbm6C7ql6YLKxC3yqzF97JL5brbbuozrW7nixY/yAI8619
-VlBIMP7PAUbGcnSQyuV5b/Wr2Sgr6NJclnNSLjh2U9/Du6w/0tDGlMBts8HjRnWJ
-BXbkTdQKCTaqgK68kTKSiN1/x+lynxHC2AavMpH/08Kopg2ZCzJowMKIgcB+4Z/I
-DJKZWHWKumhaZMGXcWgzgcByog9IpamuROEZFJNEUAFf7YIncEckPSif4looiOdS
-VurKZGvYXXaGSsZbGgHxI5CWu7ZxMdLBLvtOcCYmRQrG+g/h+PGU5BT0bNAfNTkm
-V3/n1B/TWbpWRmB3AwT2emQivXHkaubGI0VivhaO43AuI9JWoqiMqFtxbuTeoxwD
-xlu2Dzcp0v+AR4T5cIG9D5/+yiPc25aIY7cIKxuNFHIDL4td5fwSGC7vU6998PIG
-2Y48TGBnw7zpEfDfMayqAeBjX0YU6PTNsvS5O6bP3j4ojTOUYD7Z8QdCvgISDID3
-WMGAdmSwmCRvsQ/OJwARAQABiQI8BBgBCgAmFiEEnUsrbrj5cVbRlmmp/wgS1JG5
-Z5gFAl0vKCwCGwwFCQB2pwAACgkQ/wgS1JG5Z5hdbw//ZqR+JcWm59NUIHjauETJ
-sYDYhcAfa3txTacRn5uPz/TQiTd7wZ82+G8Et0ZnpEHy6eWyBqHpG0hiPhFBzxjY
-nhjHl8jJeyo2mQIVJhzkL58BHBZk8WM2TlaU7VxZ6TYOmP2y3qf6FD6mCcrQ4Fml
-E9f0lyVUoI/5Zs9oF0izRk8vkwaY3UvLM7XEY6nM8GnFG8kaiZMYmx26Zo7Uz31G
-7EGGZFsrVDXfNhSJyz79Gyn+Lx9jOTdoR0sH/THYIIosE83awMGE6jKeuDYTbVWu
-+ZtHQef+pRteki3wvNLJK+kC1y3BtHqDJS9Lqx0s8SCiVozlC+fZfC9hCtU7bXJK
-0UJZ4qjSvj6whzfaNgOZAqJpmwgOnd8W/3YJk1DwUeX98FcU38MR23SOkx2EDdDE
-77Kdu62vTs/tLmOTuyKBvYPaHaYulYjQTxurG+o8vhHtaL87ARvuq+83dj+nO5z3
-5O9vkcVJYWjOEnJe7ZvCTxeLJehpCmHIbyUuDx5P24MWVbyXOxIlxNxTqlub5GlW
-rQF6Qsa/0k9TRk7Htbct6fAA0/VahJS0g096MrTH8AxBXDNE8lIoNeGikVlaxK9Z
-S+aannlWYIJymZ4FygIPPaRlzhAoXBuJd8OaR5giC7dS1xquxKOiQEXTGsLeGFaI
-BZYiIhW7GG4ozvKDqyNm4eg=
-=yKcB
+mQENBFlyIAwBCACe0keNPjgYzZ1Oy/8t3zj/Qw9bHHqrzx7FWy8NbXnYBM19NqOZ
+DIP7Oe0DvCaf/uruBskCS0iVstHlEFQ2AYe0Ei0REt9lQdy61GylU/DEB3879IG+
+6FO0SnFeYeerv1/hFI2K6uv8v7PyyVDiiJSW0I1KIs2OBwJicTKmWxLAeQsRgx9G
+yRGalrVk4KP+6pWTA7k3DxmDZKZyfYV/Ej10NtuzmsemwDbv98HKeomp/kgFOfSy
+3AZjeCpctlsNqpjUuXa0/HudmH2WLxZ0fz8XeoRh8XM9UudNIecjrDqmAFrt/btQ
+/3guvlzhFCdhYPVGsUusKMECk/JG+Xx1/1ZjABEBAAG0LFBhcml0eSBTZWN1cml0
+eSBDb250YWN0IDxzZWN1cml0eUBwYXJpdHkuaW8+iQFUBBMBCAA+FiEE2uUVYCjP
+N6B8aTiDXQ8DAY0H3nMFAllyIAwCGwMFCQPCZwAFCwkIBwIGFQgJCgsCBBYCAwEC
+HgECF4AACgkQXQ8DAY0H3nM60wgAkS3A36Zc+upiaxU7tumcGv+an17j7gin0sif
+0ELSjVfrXInM6ovai+NhUdcLkJ7tCrKS90fvlaELK5Sg9CXBWCTFccKN4A/B7ey
+rOg2NPXUecnyBB/XqQgKYH7ujYlOlqBDXMfz6z8Hj6WToxg9PPMGGomyMGh8AWxM
+3yRPFs5RKt0VKgN++5N00oly5Y8ri5pgCidDvCLYMGTVDHFKwkuc9w6BlWlu1R1e
+/hXFWUFAP1ffTAul3QwyKhjPn2iotCdxXjvt48KaU8DN4iL7aMBN/ZBKqGS7yRdF
+D/JbJyaaJ0ZRvFSTSXy/sWY3z1B5mtCPBxco8hqqNfRkCwuZ6LkBDQRZciAMAQgA
+8BP8xrwe12TOUTqL/Vrbxv/FLdhKh53J6TrPKvC2TEEKOrTNo5ahRq+XOS5E7G2N
+x3b+fq8gR9BzFcldAx0XWUtGs/Wv++ulaSNqTBxj13J3G3WGsUfMKxRgj//piCUD
+bCFLQfGZdKk0M1o9QkPVARwwmvCNiNB/l++xGqPtfc44H5jWj3GoGvL2MkShPzrN
+yN/bJ+m+R5gtFGdInqa5KXBuxxuW25eDKJ+LzjbgUgeC76wNcfOiQHTdMkcupjdO
+bbGFwo10hcbRAOcZEv6//Zrlmk/6nPxEd2hN20St2bSN0+FqfZ267mWEu3ejsgF8
+ArdCpv5h4fBvJyNwiTZwIQARAQABiQE8BBgBCAAmFiEE2uUVYCjPN6B8aTiDXQ8D
+AY0H3nMFAllyIAwCGwwFCQPCZwAACgkQXQ8DAY0H3nNisggAl4fqhRlA34wIb190
+sqXHVxiCuzPaqS6krE9xAa1+gncX485OtcJNqnjugHm2rFE48lv7oasviuPXuInE
+/OgVFnXYv9d/Xx2JUeDs+bFTLouCDRY2Unh7KJZasfqnMcCHWcxHx5FvRNZRssaB
+WTZVo6sizPurGUtbpYe4/OLFhadBqAE0EUmVRFEUMc1YTnu4eLaRBzoWN4d2UWwi
+LN25RSrVSke7LTSFbgn9ntQrQ2smXSR+cdNkkfRCjFcpUaecvFl9HwIqoyVbT4Ym
+0hbpbbX/cJdc91tKa+psa29uMeGL/cgL9fAu19yNFRyOTMxjZnvql1X/WE1pLmoP
+ETBD1Q==
+=K9Qw
 -----END PGP PUBLIC KEY BLOCK-----
 ```
--- a/accounts/Cargo.toml
+++ b/accounts/Cargo.toml
@@ -1,22 +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"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parking_lot = "0.9"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-
-[dev-dependencies]
-ethereum-types = "0.8.0"
-tempdir = "0.3"
--- a/accounts/ethkey/Cargo.toml
+++ b/accounts/ethkey/Cargo.toml
@@ -1,13 +0,0 @@
-[package]
-description = "Parity Ethereum Keys Generator"
-name = "ethkey"
-version = "0.4.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-edit-distance = "2.0"
-log = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist = "1.3"
--- a/accounts/ethkey/src/lib.rs
+++ b/accounts/ethkey/src/lib.rs
@@ -1,40 +0,0 @@
-// Copyright 2015-2020 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)]
-
-extern crate edit_distance;
-extern crate parity_crypto;
-extern crate parity_wordlist;
-extern crate serde;
-
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate serde_derive;
-
-mod brain;
-mod brain_prefix;
-mod password;
-mod prefix;
-
-pub mod brain_recover;
-
-pub use self::parity_wordlist::Error as WordlistError;
-pub use self::brain::Brain;
-pub use self::brain_prefix::BrainPrefix;
-pub use self::password::Password;
-pub use self::prefix::Prefix;
--- a/accounts/ethstore/cli/Cargo.toml
+++ b/accounts/ethstore/cli/Cargo.toml
@@ -1,27 +0,0 @@
-[package]
-description = "Parity Ethereum Key Management CLI"
-name = "ethstore-cli"
-version = "0.1.1"
-authors = ["Parity Technologies <admin@parity.io>"]
-
-[dependencies]
-docopt = "1.0"
-env_logger = "0.5"
-num_cpus = "1.6"
-rustc-hex = "1.0"
-serde = "1.0"
-serde_derive = "1.0"
-parking_lot = "0.9"
-ethstore = { path = "../" }
-ethkey = { path = "../../ethkey" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-dir = { path = '../../../util/dir' }
-panic_hook = { path = "../../../util/panic-hook" }
-
-[[bin]]
-name = "ethstore"
-path = "src/main.rs"
-doc = false
-
-[dev-dependencies]
-tempdir = "0.3"
--- a/accounts/src/account_data.rs
+++ b/accounts/src/account_data.rs
@@ -1,74 +0,0 @@
-// Copyright 2015-2020 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 parity_crypto::publickey::Address;
-use ethkey::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-2020 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.8.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.4.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-2020 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/ethcore/pod/src/lib.rs
+++ b/ethcore/pod/src/lib.rs
@@ -1,23 +1,19 @@
-// Copyright 2015-2020 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 account;
-pub mod state;
+//! dev-tools

-pub use {
-	account::PodAccount,
-	state::PodState,
-};
+pub mod http_client;
--- a/docs/CHANGELOG-2.0.md
+++ b/docs/CHANGELOG-2.0.md
@@ -1,26 +1,3 @@
-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.
--- 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/docs/CHANGELOG-2.5.md
+++ b/docs/CHANGELOG-2.5.md
@@ -1,220 +0,0 @@
-## Parity-Ethereum [v2.5.13](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.13)
-
-Parity Ethereum v2.5.13-stable is a security release. Valid blocks with manipulated transactions (added/replaced) cause the client to stall.
-
-The full list of included changes:
-* Make sure to not mark block header hash as invalid if only the body is wrong (#11356)
-
-## Parity-Ethereum [v2.5.12](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.12)
-
-Parity Ethereum v2.5.12-stable is a patch release that adds Istanbul hardfork
-block numbers for POA and xDai networks, implements ECIP-1056 and implements
-EIP-2384/2387 - Muir Glacier.
-
-The full list of included changes:
-* Enable EIP-2384 for ice age hard fork (#11281)
-* ethcore/res: activate agharta on classic 9573000 (#11331)
-* Istanbul HF in xDai (2019-12-12) (#11299)
-* Istanbul HF in POA Core (2019-12-19) (#11298)
-* Istanbul HF in POA Sokol (2019-12-05) (#11282)
-* Activate ecip-1061 on kotti and mordor (#11338)
-* Enable basic verification of local transactions (#11332)
-* Disallow EIP-86 style null signatures for transactions outside tests (#11335)
-
-
-## Parity-Ethereum [v2.5.11](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.11)
-
-Parity Ethereum v2.5.11-stable 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
-
-The full list of included changes:
- [chainspec]: add `eip1344_transition` for istanbul (#11301)
-
-## Parity-Ethereum [v2.5.10](https://github.com/paritytech/parity-ethereum/releases/tag/2.5.10)
-
-Parity Ethereum v2.5.10-stable 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`.
-
-The full list of included changes:
-
-* ropsten #6631425 foundation #8798209 (#11201)
-* [stable] builtin, istanbul and mordor testnet backports (#11234)
-  * ethcore-builtin (#10850)
-  * [builtin]: support `multiple prices and activations` in chain spec (#11039)
-  * [chain specs]: activate `Istanbul` on mainnet (#11228)
-  * ethcore/res: add mordor testnet configuration (#11200)
-* Update list of bootnodes for xDai chain (#11236)
-* ethcore: remove `test-helper feat` from build (#11047)
-* Secret store: fix Instant::now() related race in net_keep_alive (#11155) (#11159)
-* [stable]: backport #10691 and #10683 (#11143)
-  * Fix compiler warning (that will become an error) (#10683)
-  * Refactor Clique stepping (#10691)
-* Add Constantinople eips to the dev (instant_seal) config (#10809)
-* Add cargo-remote dir to .gitignore (?)
-* Insert explicit warning into the panic hook (#11225)
-* Fix docker centos build (#11226)
-* Update MIX bootnodes. (#11203)
-* Use provided usd-per-eth value if an endpoint is specified (#11209)
-* Add new line after writing block to hex file. (#10984)
-* Type annotation for next_key() matching of json filter options (#11192) (but no `FilterOption` in 2.5 so…)
-* Upgrade jsonrpc to latest (#11206)
-* [CI] check evmbin build (#11096)
-* Correct EIP-712 encoding (#11092)
-* [client]: Fix for incorrectly dropped consensus messages (#11086)
-* Fix block detail updating (#11015)
-* Switching sccache from local to Redis (#10971)
-* Made ecrecover implementation trait public (#11188)
-* [dependencies]: jsonrpc `14.0.1` (#11183)
-* [receipt]: add `sender` & `receiver` to `RichReceipts` (#11179)
-* [ethcore/builtin]: do not panic in blake2pricer on short input (#11180)
-* 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)
-* Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127)
-* Cleanup stratum a bit (#11161)
-* Upgrade to jsonrpc v14 (#11151)
-* SecretStore: expose restore_key_public in HTTP API (#10241)
-
-## Parity-Ethereum [v2.5.9](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.9)
-
-Parity Ethereum v2.5.9-stable is a patch release that adds the block numbers for activating the Istanbul hardfork on test networks: Ropsten, Görli, Rinkeby and Kovan.
-
-The full list of included changes:
-
-* ethcore/res: activate Istanbul on Ropsten, Görli, Rinkeby, Kovan (#11068)
-* [json-spec] make blake2 pricing spec more readable (#11034)
-
-## Parity-Ethereum [v2.5.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.8)
-
-Parity Ethereum v2.5.8-stable is a patch release that improves security, stability and performance.
-
-* 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.
-
-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)
-* tx-pool: accept local tx with higher gas price when pool full (#10901)
-* Fix fork choice (#10837)
-* Cleanup unused vm dependencies (#10787)
-* 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.5.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.7)
-
-Parity Ethereum v2.5.7-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.5.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.6)
-
-Parity-Ethereum v2.5.6-stable is a bugfix release that improves stability.
-
-* Allow specifying hostnames for node URLs
-* Fix a bug where archive nodes were losing peers
-
-The full list of included changes:
-
-* 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) 
-* Do not drop the peer with None difficulty (#10772)
-* docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
-
-## Parity-Ethereum [v2.5.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.5)
-
-Parity-Ethereum v2.5.5-stable is a minor release that improves performance and stability.
-This release stabilises the 2.5 branch.
-
-As of today, Parity-Ethereum 2.4 reaches end of life and everyone is
-encouraged to upgrade.
-
-## Parity-Ethereum [v2.5.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.4)
-
-Parity Ethereum v2.5.4-beta is a security update that 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.5.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.3)
-
-Parity-Ethereum 2.5.3-beta is a bugfix release that improves performance and stability.
-
-* EthereumClassic: activate the Atlantis Hardfork
-* Clique: fix time overflow
-* State tests: treat empty accounts the same as non-existant accounts (EIP 1052)
-* 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))
-* fix: aura don't add `SystemTime::now()` ([#10720](https://github.com/paritytech/parity-ethereum/pull/10720))
-* Treat empty account the same as non-exist accounts in EIP-1052 ([#10775](https://github.com/paritytech/parity-ethereum/pull/10775))
-* 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))
-* Add a way to signal shutdown to snapshotting threads ([#10744](https://github.com/paritytech/parity-ethereum/pull/10744))
-
-## Parity-Ethereum [v2.5.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.2)
-
-Parity-Ethereum 2.5.2-beta 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))
-* Reset blockchain properly ([#10669](https://github.com/paritytech/parity-ethereum/pull/10669))
-* 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.5.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.1)
-
-Parity-Ethereum 2.5.1-beta 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.5.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.5.0)
-
-Parity-Ethereum 2.5.0-beta is a minor release that improves performance and stabilizes the 2.5 branch by marking it as beta release. 
-
- This release adds support for the Clique consensus engine ([#9981](https://github.com/paritytech/parity-ethereum/pull/9981))
-  - This enables Parity-Ethereum users to use the Görli, the Kotti Classic, and the legacy Rinkeby testnet. To get started try `parity --chain goerli`; note that light client support is currently not yet fully functional.
- This release removes the dead chain configs for Easthub and Ethereum Social ([#10531](https://github.com/paritytech/parity-ethereum/pull/10531))
-
-As of today, Parity-Ethereum 2.3 reaches end of life and everyone is encouraged to upgrade.
-
-The full list of included changes:
-
-* fix(light cull): poll light cull instead of timer ([#10559](https://github.com/paritytech/parity-ethereum/pull/10559))
-
--- a/docs/CHANGELOG-2.6.md
+++ b/docs/CHANGELOG-2.6.md
@@ -1,307 +0,0 @@
-## Parity-Ethereum [v2.6.8](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.8)
-
-Parity Ethereum v2.6.8-beta is a security release. Valid blocks with manipulated transactions (added/replaced) cause the client to stall.
-
-The full list of included changes:
-* Make sure to not mark block header hash as invalid if only the body is wrong (#11356)
-
-## Parity-Ethereum [v2.6.7](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.7)
-
-Parity Ethereum v2.6.7-beta is a patch release that adds Istanbul hardfork
-block numbers for POA and xDai networks, implements ECIP-1056 and implements
-EIP-2384/2387 - Muir Glacier.
-
-The full list of included changes:
-* Enable EIP-2384 for ice age hard fork (#11281)
-* ethcore/res: activate agharta on classic 9573000 (#11331)
-* Istanbul HF in xDai (2019-12-12) (#11299)
-* Istanbul HF in POA Core (2019-12-19) (#11298)
-* Istanbul HF in POA Sokol (2019-12-05) (#11282)
-* Activate ecip-1061 on kotti and mordor (#11338)
-* Enable basic verification of local transactions (#11332)
-* Disallow EIP-86 style null signatures for transactions outside tests (#11335)
-* SecretStore database migration to v4 (#11322) 
-
-## Parity-Ethereum [v2.6.6](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.6)
-
-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
-
-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.
-
-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)
-
-## Parity-Ethereum [v2.6.4](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.4)
-
-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.
-
-A full list of included changes:
-
-* 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)
-
-## Parity-Ethereum [v2.6.3](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.3)
-
-Parity Ethereum v2.6.3-stable is a patch release that improves security, stability and performance.
-
-* 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.
-
-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))
-
-## 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.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)
- [CHANGELOG-1.7](docs/CHANGELOG-1.7.md) (EOL: 2018-01-25)
- [CHANGELOG-1.6](docs/CHANGELOG-1.6.md) (EOL: 2017-10-15)
- [CHANGELOG-1.5](docs/CHANGELOG-1.5.md) (EOL: 2017-07-28)
- [CHANGELOG-1.4](docs/CHANGELOG-1.4.md) (EOL: 2017-03-13)
- [CHANGELOG-1.3](docs/CHANGELOG-1.3.md) (EOL: 2017-01-19)
- [CHANGELOG-1.2](docs/CHANGELOG-1.2.md) (EOL: 2016-11-07)
- [CHANGELOG-1.1](docs/CHANGELOG-1.1.md) (EOL: 2016-08-12)
- [CHANGELOG-1.0](docs/CHANGELOG-1.0.md) (EOL: 2016-06-24)
- [CHANGELOG-0.9](docs/CHANGELOG-0.9.md) (EOL: 2016-05-02)
--- a/ethash/Cargo.toml
+++ b/ethash/Cargo.toml
@@ -1,36 +1,20 @@
 [package]
-description = "Parity Ethereum Ethash & ProgPoW Implementations"
 name = "ethash"
 version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-common-types = { path = "../ethcore/types" }
+crunchy = "0.1.0"
 either = "1.0.0"
-ethereum-types = "0.8.0"
-keccak-hash = "0.4.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"
-static_assertions = "0.3.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
-required-features = ['bench']
-
-[[bench]]
-name = "progpow"
-harness = false
-required-features = ['bench']
+benches = []
--- a/ethash/benches/basic.rs
+++ b/ethash/benches/basic.rs
@@ -1,152 +0,0 @@
-// Copyright 2015-2020 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;
-extern crate common_types;
-
-use criterion::Criterion;
-use ethash::{NodeCacheBuilder, keccak};
-use common_types::engines::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 MIX_HASH: [u8; 32] = [
-	0x1f, 0xff, 0x04, 0xce, 0xc9, 0x41, 0x73, 0xfd,
-	0x59, 0x1e, 0x3d, 0x89, 0x60, 0xce, 0x6b, 0xdf,
-	0x8b, 0x19, 0x71, 0x04, 0x8c, 0x71, 0xff, 0x93,
-	0x7b, 0xb2, 0xd3, 0x2a, 0x64, 0x31, 0xab, 0x6d,
-];
-const NONCE: u64 = 0xd7b3ac70a301a249;
-
-criterion_group! {
-	name = basic;
-	config = dont_take_an_eternity_to_run();
-	targets = bench_keccak_512_inplace,
-		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,
-		bench_quick_get_difficulty,
-}
-criterion_main!(basic);
-
-fn dont_take_an_eternity_to_run() -> Criterion {
-	Criterion::default().nresamples(1_000)
-		.without_plots()
-		.sample_size(10)
-}
-
-fn bench_keccak_512_inplace(b: &mut Criterion) {
-	b.bench_function("bench_keccak_512_inplace", move |b| b.iter(|| {
-		let mut data = [4u8; 64];
-		keccak::keccak_512::inplace(&mut data);
-	}));
-}
-
-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_memory", 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_new_round_trip_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_new_round_trip_memory", 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_from_file_round_trip_memory", 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_from_file_round_trip_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());
-	}));
-}
-
-fn bench_quick_get_difficulty(b: &mut Criterion) {
-	b.bench_function("bench_quick_get_difficulty", move |b| b.iter(|| {
-		let d = ethash::quick_get_difficulty(&HASH, NONCE, &MIX_HASH, false);
-		let boundary_good = [
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x3e, 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_eq!(d[..], boundary_good[..]);
-	}));
-}
--- a/ethash/benches/progpow.rs
+++ b/ethash/benches/progpow.rs
@@ -1,88 +0,0 @@
-#[macro_use]
-extern crate criterion;
-extern crate ethash;
-extern crate rustc_hex;
-extern crate tempdir;
-extern crate common_types;
-
-use criterion::Criterion;
-use ethash::progpow;
-
-use tempdir::TempDir;
-use rustc_hex::FromHex;
-use ethash::NodeCacheBuilder;
-use ethash::compute::light_compute;
-use common_types::engines::OptimizeFor;
-
-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",
-    "f4ac202715ded4136e72887c39e63a4738331c57fd9eb79f6ec421c281aa8743",
-    "b3bad9ca6f7c566cf0377d1f8cce29d6516a96562c122d924626281ec948ef02"
-  ],
-  [
-    49,
-    "b3bad9ca6f7c566cf0377d1f8cce29d6516a96562c122d924626281ec948ef02",
-    "0000000006ff2c47",
-    "7730596f128f675ef9a6bb7281f268e4077d302f2b9078da1ece4349248561dd",
-    "0b9ed0c11157f1365143e329a6e1cea4248d9d6cb44b9c6daf492c7a076654a4"
-  ],
-  [
-    50,
-    "0b9ed0c11157f1365143e329a6e1cea4248d9d6cb44b9c6daf492c7a076654a4",
-    "00000000076e482e",
-    "829136d4a704eb8d06da773f1a90466e7b5ed12119c44526f045bbff4475d891",
-    "e2e881c5b893c2f1ef06b96a10cfcbcf7255b307f0818e7d30eb12b2edfc237b"
-  ],
-  [
-    99,
-    "e2e881c5b893c2f1ef06b96a10cfcbcf7255b307f0818e7d30eb12b2edfc237b",
-    "000000003917afab",
-    "deb3d8b45bdc596c56aa37a5eba456f478c82e60e5c028ce95f2e654e4bb7b57",
-    "9bdc2ad2286eaa051d6ca1f5196d2dd1c9a039f1d7ce3e1c856b793deed01778"
-  ],
-  [
-    29950,
-    "9bdc2ad2286eaa051d6ca1f5196d2dd1c9a039f1d7ce3e1c856b793deed01778",
-    "005d409dbc23a62a",
-    "c01e6d339cc687c77f653b81c74cb9de8b595554f2c5db671a7dde3846d2fa01",
-    "de0d693e597cf2fd70a4cfaa73f6baafc29e1eee695a81295b278c1116580b72"
-  ],
-  [
-    29999,
-    "de0d693e597cf2fd70a4cfaa73f6baafc29e1eee695a81295b278c1116580b72",
-    "005db5fa4c2a3d03",
-    "8b664cdbf396a7a185446c93dddd6611f5a736b11097381ae6bea45e802cec16",
-    "21ec5d1984a4fd4394b042aa96365085225d964727a45def245ceab326e28128"
-  ],
-  [
-    30000,
-    "21ec5d1984a4fd4394b042aa96365085225d964727a45def245ceab326e28128",
-    "005db8607994ff30",
-    "276951d89c1ed262bcac00df4fb9bf7af36991532744a2e287b0b758a56e15aa",
-    "dc070b76cc311cd82267f98936acbbbd3ec1c1ab25b55e2c885af6474e1e6841"
-  ],
-  [
-    30049,
-    "dc070b76cc311cd82267f98936acbbbd3ec1c1ab25b55e2c885af6474e1e6841",
-    "005e2e215a8ca2e7",
-    "6248ba0157d0f0592dacfe2963337948fffb37f67e7451a6862c1321d894cebe",
-    "6fdecf719e2547f585a6ee807d8237db8e9489f63d3f259ab5236451eaded433"
-  ],
-  [
-    30050,
-    "6fdecf719e2547f585a6ee807d8237db8e9489f63d3f259ab5236451eaded433",
-    "005e30899481055e",
-    "512d8f2bb0441fcfa1764c67e8dbed2afcbe9141de4bbebc5b51e0661dede550",
-    "cb1587a1c372642cbd9ce4c1ba2f433985d44c571a676a032bc1e8c1ad066e24"
-  ],
-  [
-    30099,
-    "cb1587a1c372642cbd9ce4c1ba2f433985d44c571a676a032bc1e8c1ad066e24",
-    "005ea6aef136f88b",
-    "be0e7d6afa6edd483ccc304afa9bf0abaca5e0f037a4f05bf5550b9309d1d12c",
-    "78be18f20569a834d839dad48e0e51d6df6b6537575f0ad29898c7cf357f12cb"
-  ],
-  [
-    59950,
-    "78be18f20569a834d839dad48e0e51d6df6b6537575f0ad29898c7cf357f12cb",
-    "02ebe0503bd7b1da",
-    "b85be51fce670aa437f28c02ea4fd7995fa8b6ac224e959b8dbfb5bdbc6f77ce",
-    "a68a620ba17e0cf2817bc4397cf4b85f5770983aa7b7931319a7f61bd6f905b1"
-  ],
-  [
-    59999,
-    "a68a620ba17e0cf2817bc4397cf4b85f5770983aa7b7931319a7f61bd6f905b1",
-    "02edb6275bd221e3",
-    "ffe745a932c21c0704291bb416fe8bffec76621cd3434861885beab42cec1734",
-    "9e6667a151ac6f5186a05cb20877a2b3df02317046256a762cb8ec2d96aa34f0"
-  ]
-]
--- a/ethash/src/cache.rs
+++ b/ethash/src/cache.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 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;
@@ -21,7 +21,7 @@ use memmap::MmapMut;
 use parking_lot::Mutex;
 use seed_compute::SeedHashCompute;

-use shared::{ETHASH_CACHE_ROUNDS, NODE_BYTES, Node, epoch, get_cache_size, to_hex};
+use shared::{ETHASH_CACHE_ROUNDS, NODE_BYTES, NODE_DWORDS, Node, epoch, get_cache_size, to_hex};

 use std::borrow::Cow;
 use std::fs;
@@ -30,10 +30,20 @@ use std::path::{Path, PathBuf};
 use std::slice;
 use std::sync::Arc;

-use common_types::engines::OptimizeFor;
-
 type Cache = Either<Vec<Node>, MmapMut>;

+#[derive(PartialEq, Eq, Debug, Clone, Copy)]
+pub enum OptimizeFor {
+	Cpu,
+	Memory,
+}
+
+impl Default for OptimizeFor {
+	fn default() -> Self {
+		OptimizeFor::Cpu
+	}
+}
+
 fn byte_size(cache: &Cache) -> usize {
 	use self::Either::{Left, Right};

@@ -59,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
@@ -73,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
 		}
 	}

@@ -317,6 +325,11 @@ unsafe fn initialize_memory(memory: *mut Node, num_nodes: usize, ident: &H256) {
 	// Now this is initialized, we can treat it as a slice.
 	let nodes: &mut [Node] = slice::from_raw_parts_mut(memory, num_nodes);

+	// For `unroll!`, see below. If the literal in `unroll!` is not the same as the RHS here then
+	// these have got out of sync! Don't let this happen!
+	debug_assert_eq!(NODE_DWORDS, 8);
+
+	// This _should_ get unrolled by the compiler, since it's not using the loop variable.
 	for _ in 0..ETHASH_CACHE_ROUNDS {
 		for i in 0..num_nodes {
 			let data_idx = (num_nodes - 1 + i) % num_nodes;
@@ -326,8 +339,11 @@ unsafe fn initialize_memory(memory: *mut Node, num_nodes: usize, ident: &H256) {
 				let mut data: Node = nodes.get_unchecked(data_idx).clone();
 				let rhs: &Node = nodes.get_unchecked(idx);

-				for (a, b) in data.as_dwords_mut().iter_mut().zip(rhs.as_dwords()) {
-					*a ^= *b;
+				unroll! {
+					for w in 0..8 {
+						*data.as_dwords_mut().get_unchecked_mut(w) ^=
+							*rhs.as_dwords().get_unchecked(w);
+					}
 				}

 				data
--- a/ethash/src/compute.rs
+++ b/ethash/src/compute.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 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,17 +21,16 @@

 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;

-use std::mem;
+use std::{mem, ptr};
 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,26 +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 {
-			let mut buf = [0u8; 64 + 32];
+		// 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();

-			let hash_len = header_hash.len();
-			buf[..hash_len].copy_from_slice(header_hash);
-			buf[hash_len..hash_len + mem::size_of::<u64>()].copy_from_slice(&nonce.to_ne_bytes());
+		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);
-			buf[64..].copy_from_slice(mix_hash);
+		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);

-			let mut hash = [0u8; 32];
-			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
 	}
 }

@@ -199,11 +170,17 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 	let mut buf: MixBuf = MixBuf {
 		half_mix: unsafe {
 			// Pack `header_hash` and `nonce` together
-			let mut out = [0u8; NODE_BYTES];
+			// We explicitly write the first 40 bytes, leaving the last 24 as uninitialized. Then
+			// `keccak_512` reads the first 40 bytes (4th parameter) and overwrites the entire array,
+			// leaving it fully initialized.
+			let mut out: [u8; NODE_BYTES] = mem::uninitialized();

-			let hash_len = header_hash.len();
-			out[..hash_len].copy_from_slice(header_hash);
-			out[hash_len..hash_len + mem::size_of::<u64>()].copy_from_slice(&nonce.to_ne_bytes());
+			ptr::copy_nonoverlapping(header_hash.as_ptr(), out.as_mut_ptr(), header_hash.len());
+			ptr::copy_nonoverlapping(
+				&nonce as *const u64 as *const u8,
+				out[header_hash.len()..].as_mut_ptr(),
+				mem::size_of::<u64>(),
+			);

 			// compute keccak-512 hash and replicate across mix
 			keccak_512::unchecked(
@@ -215,7 +192,8 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)

 			Node { bytes: out }
 		},
-		compress_bytes: [0u8; MIX_WORDS],
+		// This is fully initialized before being read, see `let mut compress = ...` below
+		compress_bytes: unsafe { mem::uninitialized() },
 	};

 	let mut mix: [_; MIX_NODES] = [buf.half_mix.clone(), buf.half_mix.clone()];
@@ -239,16 +217,24 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 			fnv_hash(first_val ^ i, mix_words[i as usize % MIX_WORDS]) % num_full_pages
 		};

-		// MIX_NODES
-		for n in 0..2 {
-			let tmp_node = calculate_dag_item(
-				index * MIX_NODES as u32 + n as u32,
-				cache,
-			);
+		unroll! {
+			// MIX_NODES
+			for n in 0..2 {
+				let tmp_node = calculate_dag_item(
+					index * MIX_NODES as u32 + n as u32,
+					cache,
+				);

-			// NODE_WORDS
-			for (a, b) in mix[n].as_words_mut().iter_mut().zip(tmp_node.as_words()) {
-				*a = fnv_hash(*a, *b);
+				unroll! {
+					// NODE_WORDS
+					for w in 0..16 {
+						mix[n].as_words_mut()[w] =
+							fnv_hash(
+								mix[n].as_words()[w],
+								tmp_node.as_words()[w],
+							);
+					}
+				}
 			}
 		}
 	}
@@ -256,27 +242,25 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 	let mix_words: [u32; MIX_WORDS] = unsafe { mem::transmute(mix) };

 	{
-		// We iterate precisely `compress.len()` times and set each index,
-		// leaving the array fully initialized. THIS ONLY WORKS ON LITTLE-ENDIAN MACHINES.
-		// See a future PR to make this and the rest of the code work correctly on
+		// This is an uninitialized buffer to begin with, but we iterate precisely `compress.len()`
+		// times and set each index, leaving the array fully initialized. THIS ONLY WORKS ON LITTLE-
+		// ENDIAN MACHINES. See a future PR to make this and the rest of the code work correctly on
 		// big-endian arches like mips.
 		let compress: &mut [u32; MIX_WORDS / 4] =
 			unsafe { make_const_array!(MIX_WORDS / 4, &mut buf.compress_bytes) };
-		#[cfg(target_endian = "big")]
-		{
-			compile_error!("parity-ethereum currently only supports little-endian targets");
-		}

 		// Compress mix
 		debug_assert_eq!(MIX_WORDS / 4, 8);
-		for i in 0..8 {
-			let w = i * 4;
+		unroll! {
+			for i in 0..8 {
+				let w = i * 4;

-			let mut reduction = mix_words[w + 0];
-			reduction = reduction.wrapping_mul(FNV_PRIME) ^ mix_words[w + 1];
-			reduction = reduction.wrapping_mul(FNV_PRIME) ^ mix_words[w + 2];
-			reduction = reduction.wrapping_mul(FNV_PRIME) ^ mix_words[w + 3];
-			compress[i] = reduction;
+				let mut reduction = mix_words[w + 0];
+				reduction = reduction.wrapping_mul(FNV_PRIME) ^ mix_words[w + 1];
+				reduction = reduction.wrapping_mul(FNV_PRIME) ^ mix_words[w + 2];
+				reduction = reduction.wrapping_mul(FNV_PRIME) ^ mix_words[w + 3];
+				compress[i] = reduction;
+			}
 		}
 	}

@@ -288,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(),
@@ -302,7 +286,8 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 	ProofOfWork { mix_hash: mix_hash, value: value }
 }

-pub fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
+// TODO: Use the `simd` crate
+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;
@@ -315,8 +300,10 @@ pub fn calculate_dag_item(node_index: u32, cache: &[Node]) -> Node {
 			num_parent_nodes as u32;
 		let parent = &cache[parent_index as usize];

-		for (a, b) in ret.as_words_mut().iter_mut().zip(parent.as_words()) {
-			*a = fnv_hash(*a, *b);
+		unroll! {
+			for w in 0..16 {
+				ret.as_words_mut()[w] = fnv_hash(ret.as_words()[w], parent.as_words()[w]);
+			}
 		}
 	}

@@ -374,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]
@@ -404,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[..]);
@@ -413,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-2020 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,20 +1,21 @@
-// Copyright 2015-2020 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 common_types;
 extern crate either;
 extern crate ethereum_types;
 extern crate memmap;
@@ -22,51 +23,30 @@ extern crate parking_lot;
 extern crate primal;

 #[macro_use]
-extern crate log;
+extern crate crunchy;
 #[macro_use]
-extern crate static_assertions;
-
-#[cfg(test)]
-extern crate rustc_hex;
-
-#[cfg(test)]
-extern crate serde_json;
+extern crate log;

 #[cfg(test)]
 extern crate tempdir;

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

-#[cfg(feature = "bench")]
-pub mod progpow;
-#[cfg(not(feature = "bench"))]
-mod progpow;
-
-pub use cache::NodeCacheBuilder;
+pub use cache::{NodeCacheBuilder, OptimizeFor};
 pub use compute::{ProofOfWork, quick_get_difficulty, slow_hash_block_number};
-pub use seed_compute::SeedHashCompute;
-pub use shared::ETHASH_EPOCH_LENGTH;
-
-use common_types::engines::OptimizeFor;
 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 {
@@ -81,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,
+			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default()),
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,
@@ -109,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(
@@ -162,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 {
@@ -184,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)
 	}
 }

@@ -194,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);
@@ -210,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());
@@ -227,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()));
 	}
 }

@@ -251,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,615 +0,0 @@
-// Copyright 2015-2020 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.
-//!
-//! We use ProgPoW 0.9.3 version as suggested on Specification
-//! https://github.com/ethereum/EIPs/blob/master/EIPS/eip-1057.md#specification
-
-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 = 11;
-const PROGPOW_CNT_MATH: usize = 18;
-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 = 10; // 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 common_types::engines::OptimizeFor;
-	use cache::NodeCacheBuilder;
-	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("b3bad9ca6f7c566cf0377d1f8cce29d6516a96562c122d924626281ec948ef02").unwrap();
-		let expected_result = FromHex::from_hex("f4ac202715ded4136e72887c39e63a4738331c57fd9eb79f6ec421c281aa8743").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-2020 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-2020 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;

@@ -69,7 +69,34 @@ pub type NodeBytes = [u8; NODE_BYTES];
 pub type NodeWords = [u32; NODE_WORDS];
 pub type NodeDwords = [u64; NODE_DWORDS];

-assert_eq_size!(node; Node, NodeBytes, NodeWords, NodeDwords);
+macro_rules! static_assert_size_eq {
+	(@inner $a:ty, $b:ty, $($rest:ty),*) => {
+		fn first() {
+			static_assert_size_eq!($a, $b);
+		}
+
+		fn second() {
+			static_assert_size_eq!($b, $($rest),*);
+		}
+	};
+	(@inner $a:ty, $b:ty) => {
+		unsafe {
+			let val: $b = ::std::mem::uninitialized();
+			let _: $a = ::std::mem::transmute(val);
+		}
+	};
+	($($rest:ty),*) => {
+		static_assert_size_eq!(size_eq: $($rest),*);
+	};
+	($name:ident : $($rest:ty),*) => {
+		#[allow(dead_code)]
+		fn $name() {
+			static_assert_size_eq!(@inner $($rest),*);
+		}
+	};
+}
+
+static_assert_size_eq!(Node, NodeBytes, NodeWords, NodeDwords);

 #[repr(C)]
 pub union Node {
--- 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,100 +7,85 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-account-state = { path = "account-state" }
-ansi_term = "0.11"
-basic-authority = { path = "./engines/basic-authority", optional = true} # used by test-helpers feature
-blooms-db = { path = "../util/blooms-db", optional = true }
-client-traits = { path = "./client-traits" }
-common-types = { path = "./types" }
-engine = { path = "./engine" }
-env_logger = { version = "0.5", optional = true }
-ethash = { path = "../ethash", optional = true }
-ethjson = { path = "../json", optional = true }
-ethcore-blockchain = { path = "./blockchain" }
-ethcore-call-contract = { path = "./call-contract" }
-ethcore-db = { path = "./db" }
-ethcore-io = { path = "../util/io" }
-ethcore-miner = { path = "../miner" }
-ethcore-stratum = { path = "../miner/stratum", optional = true }
-ethereum-types = "0.8.0"
-evm = { path = "evm" }
-executive-state = { path = "executive-state" }
-futures = "0.1"
-hash-db = "0.15.0"
-itertools = "0.5"
-journaldb = { path = "../util/journaldb" }
-keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-kvdb-memorydb = { version = "0.3.1", optional = true }
-kvdb-rocksdb = { version = "0.4.1", optional = true }
-lazy_static = { version = "1.3", optional = true }
-log = "0.4"
-macros = { path = "../util/macros", optional = true }
-machine = { path = "./machine" }
-memory-cache = { path = "../util/memory-cache" }
+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 = "0.3"
+ethash = { path = "../ethash" }
+ethcore-bloom-journal = { path = "../util/bloom" }
 parity-bytes = "0.1"
-parking_lot = "0.9"
-pod = { path = "pod", optional = true }
-trie-db = "0.18.0"
-parity-crypto = { version = "0.4.2", features = ["publickey"], optional = true }
+hashdb = "0.3.0"
+memorydb = "0.3.0"
+patricia-trie = "0.3.0"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-rand = "0.7"
-rand_xorshift = "0.2"
-rayon = "1.1"
-registrar = { path = "../util/registrar" }
-rlp = "0.4.0"
-rustc-hex = "2"
-scopeguard = "1.0.0"
-serde = "1.0"
-serde_derive = "1.0"
-snapshot = { path = "snapshot" }
-spec = { path = "spec" }
-state-db = { path = "state-db" }
-tempdir = { version = "0.3", optional = true }
-trace = { path = "trace" }
+parity-crypto = "0.2"
+error-chain = { version = "0.12", default-features = false }
+ethcore-io = { path = "../util/io" }
+ethcore-logger = { path = "../logger" }
+ethcore-miner = { path = "../miner" }
+ethcore-stratum = { path = "./stratum", optional = true }
+ethcore-transaction = { path = "./transaction" }
+ethereum-types = "0.4"
+memory-cache = { path = "../util/memory_cache" }
+ethabi = "6.0"
+ethabi-derive = "6.0"
+ethabi-contract = "6.0"
+ethjson = { path = "../json" }
+ethkey = { path = "../ethkey" }
+ethstore = { path = "../ethstore" }
+evm = { path = "evm" }
+heapsize = "0.4"
+itertools = "0.5"
+lazy_static = "1.0"
+log = "0.4"
+lru-cache = "0.1"
+num = { version = "0.1", default-features = false, features = ["bigint"] }
+num_cpus = "1.2"
+parity-machine = { path = "../machine" }
+parking_lot = "0.6"
+rayon = "1.0"
+rand = "0.4"
+rlp = { version = "0.3.0", 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"
+stop-guard = { path = "../util/stop-guard" }
+macros = { path = "../util/macros" }
+rustc-hex = "1.0"
+stats = { path = "../util/stats" }
 trace-time = "0.1"
-trie-vm-factories = { path = "trie-vm-factories" }
+using_queue = { path = "../util/using_queue" }
+vm = { path = "vm" }
+wasm = { path = "wasm" }
+keccak-hash = "0.1"
 triehash-ethereum = { version = "0.2",  path = "../util/triehash-ethereum" }
 unexpected = { path = "../util/unexpected" }
-using_queue = { path = "../miner/using-queue" }
-verification = { path = "./verification" }
-vm = { path = "vm" }
+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]
-account-db = { path = "account-db" }
-blooms-db = { path = "../util/blooms-db" }
-criterion = "0.3"
-engine = { path = "./engine", features = ["test-helpers"] }
-env_logger = "0.5"
-ethcore-accounts = { path = "../accounts" }
-ethcore-builtin = { path = "./builtin" }
-ethjson = { path = "../json", features = ["test-helpers"] }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-fetch = { path = "../util/fetch" }
-kvdb-memorydb = "0.3.1"
-kvdb-rocksdb = "0.4.1"
-lazy_static = "1.3"
-machine = { path = "./machine", features = ["test-helpers"] }
-macros = { path = "../util/macros" }
-parity-runtime = { path = "../util/runtime" }
-serde_json = "1.0"
-stats = { path = "../util/stats" }
-pod = { path = "pod" }
 tempdir = "0.3"
-trie-standardmap = "0.15.0"
+trie-standardmap = "0.1"

 [features]
-parity = ["work-notify", "price-info", "stratum", "macros"]
+parity = ["work-notify", "price-info", "stratum"]
 # Large optional features that are enabled by default for Parity,
 # but might be omitted for other dependent crates.
 work-notify = ["ethcore-miner/work-notify"]
 price-info = ["ethcore-miner/price-info"]
-stratum = [
-	"ethash",
-	"ethcore-stratum"
-]
-
+stratum = ["ethcore-stratum"]

 # Disables seal verification for mined blocks.
 # This allows you to submit any seal via RPC to test and benchmark
@@ -116,23 +101,12 @@ 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", "lazy_static", "machine/test-helpers", "common-types/test-helpers"]
+json-tests = ["ethcore-transaction/json-tests", "test-helpers", "tempdir"]
+# Skip JSON consensus tests with pending issues.
+ci-skip-issue = []
 # Run memory/cpu heavy tests.
 test-heavy = []
+# Compile benches
+benches = []
 # Compile test helpers
-# note[dvdplm]: "basic-authority/test-helpers" is needed so that `generate_dummy_client_with_spec` works
-test-helpers = [
-    "blooms-db",
-    "ethjson/test-helpers",
-    "parity-crypto",
-    "kvdb-memorydb",
-    "kvdb-rocksdb",
-    "macros",
-    "pod",
-    "tempdir",
-    "basic-authority/test-helpers"
- ]
-
-[[bench]]
-name = "builtin"
-harness = false
+test-helpers = ["tempdir"]
--- a/ethcore/account-db/Cargo.toml
+++ b/ethcore/account-db/Cargo.toml
@@ -1,15 +0,0 @@
-[package]
-name = "account-db"
-description = "DB backend wrapper for Account trie"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-ethereum-types = "0.8.0"
-hash-db = "0.15.0"
-keccak-hash = "0.4.0"
-keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
-rlp = "0.4"
--- a/ethcore/account-db/src/lib.rs
+++ b/ethcore/account-db/src/lib.rs
@@ -1,262 +0,0 @@
-// Copyright 2015-2020 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(NULL_RLP.to_vec());
-		}
-		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(NULL_RLP.to_vec());
-		}
-		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, value.to_vec());
-		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(NULL_RLP.to_vec());
-		}
-		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(NULL_RLP.to_vec());
-		}
-		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/account-state/Cargo.toml
+++ b/ethcore/account-state/Cargo.toml
@@ -1,35 +0,0 @@
-[package]
-name = "account-state"
-description = "Ethereum accounts, keeps track of changes to the code and storage"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
-version = "0.1.0"
-edition = "2018"
-
-[dependencies]
-common-types = { path = "../types"}
-derive_more = "0.15.0"
-ethereum-types = "0.8.0"
-ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
-trie-vm-factories = { path = "../trie-vm-factories" }
-hash-db = "0.15.0"
-journaldb = { path = "../../util/journaldb" }
-keccak-hash = "0.4.0"
-keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
-log = "0.4"
-lru-cache = "0.1.2"
-memory-db = "0.18.0"
-parity-bytes = "0.1.0"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
-pod = { path = "../pod" }
-rlp = "0.4.0"
-serde = { version = "1.0", features = ["derive"] }
-trie-db = "0.18.0"
-
-[dev-dependencies]
-account-db = { path = "../account-db" }
-journaldb = { path = "../../util/journaldb" }
-parity-bytes = "0.1.0"
-rlp_compress = { path = "../../util/rlp-compress" }
--- a/ethcore/account-state/src/lib.rs
+++ b/ethcore/account-state/src/lib.rs
@@ -1,33 +0,0 @@
-// Copyright 2015-2020 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 state
-//! This crate contains code used to create, convert, and update Accounts and the code and storage
-//! associated with it. It also defines the trait used to construct a backend to build a complete
-//! caching state database.
-//! Note: the code that needs access to `ethcore` types such as `Machine` and `Executive` is found in
-//! the `executive_state` module in `ethcore`. Most tests for the `State` module in this crate are
-//! also found in `executive_state` (for the same reason).
-
-pub mod account;
-pub mod backend;
-pub mod state;
-
-pub use {
-	account::Account,
-	backend::Backend,
-	state::{State, CleanupMode},
-};
--- a/ethcore/account-state/src/state.rs
+++ b/ethcore/account-state/src/state.rs
--- a/ethcore/benches/builtin.rs
+++ b/ethcore/benches/builtin.rs
@@ -1,42 +1,40 @@
-// Copyright 2015-2020 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 machine;
 extern crate ethcore;
-extern crate ethcore_builtin;
 extern crate ethereum_types;
 extern crate parity_bytes as bytes;
 extern crate rustc_hex;

-use criterion::{Criterion, Bencher};
 use bytes::BytesRef;
-use ethcore_builtin::Builtin;
-use ethereum_types::H160;
-use machine::Machine;
-use machine::test_helpers::new_byzantium_test_machine;
+use ethcore::builtin::Builtin;
+use ethcore::machine::EthereumMachine;
+use ethereum_types::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> {
@@ -48,9 +46,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();

@@ -59,6 +56,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()];

@@ -71,81 +72,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",
@@ -153,9 +93,9 @@ fn ecrecover(b: &mut Criterion) {
 	);
 }

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

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

-fn identity(b: &mut Criterion) {
+#[bench]
+fn identity(b: &mut Bencher) {
 	bench(
-		"identity",
 		"0000000000000000000000000000000000000004", // identity
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
 		"38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e000000000000000000000000000000000000000000000000000000000000001b38d18acb67d25c8bb9942764b62f18e17054f66a817bd4295423adf9ed98873e789d1dd423d25f0772d2748d60f7e4b81bb14d086eba8e8e8efb6dcff8a4ae02",
@@ -183,9 +123,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",
@@ -193,9 +133,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",
@@ -203,9 +143,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",
@@ -213,9 +153,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",
@@ -223,9 +163,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",
@@ -233,9 +173,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",
@@ -243,9 +183,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",
@@ -253,9 +194,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",
@@ -263,9 +204,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",
@@ -273,9 +214,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",
@@ -283,9 +224,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",
@@ -293,9 +234,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",
@@ -303,9 +244,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",
@@ -313,9 +254,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",
@@ -323,9 +264,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",
@@ -333,9 +274,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",
@@ -343,9 +284,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",
@@ -353,9 +295,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",
@@ -363,9 +305,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",
@@ -373,9 +315,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",
@@ -383,9 +325,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",
@@ -393,9 +335,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",
@@ -403,9 +345,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",
@@ -413,9 +355,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",
@@ -423,9 +365,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",
@@ -433,9 +375,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",
@@ -443,9 +385,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",
@@ -453,9 +395,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",
@@ -463,9 +405,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",
@@ -473,9 +415,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",
@@ -483,9 +425,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",
@@ -493,9 +435,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",
@@ -503,9 +445,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",
@@ -513,9 +455,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",
@@ -523,9 +465,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",
@@ -533,9 +475,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",
@@ -543,9 +485,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",
@@ -553,9 +495,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",
@@ -563,9 +505,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",
@@ -573,9 +515,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",
@@ -583,9 +525,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",
@@ -593,9 +535,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",
@@ -603,9 +545,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",
@@ -613,9 +555,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",
@@ -623,9 +565,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",
@@ -633,9 +575,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",
@@ -643,9 +585,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",
@@ -653,9 +595,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",
@@ -663,9 +605,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",
@@ -673,9 +615,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",
@@ -683,9 +625,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",
@@ -693,9 +635,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",
@@ -703,9 +645,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/block-gas-limit/Cargo.toml
+++ b/ethcore/block-gas-limit/Cargo.toml
@@ -1,20 +0,0 @@
-[package]
-description = "A crate to interact with the block gas limit contract"
-name = "block-gas-limit"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-client-traits = { path = "../client-traits" }
-common-types = { path = "../types" }
-ethabi = "9.0.1"
-ethabi-derive = "9.0.1"
-ethabi-contract = "9.0.0"
-ethereum-types = "0.8.0"
-log = "0.4"
-
-[dev-dependencies]
-ethcore = { path = "..", features = ["test-helpers"] }
-spec = { path = "../spec" }
--- a/ethcore/block-gas-limit/res/block_gas_limit.json
+++ b/ethcore/block-gas-limit/res/block_gas_limit.json
@@ -1,16 +0,0 @@
-[
-	{
-		"constant": true,
-		"inputs": [],
-		"name": "blockGasLimit",
-		"outputs": [
-			{
-				"name": "",
-				"type": "uint256"
-			}
-		],
-		"payable": false,
-		"stateMutability": "view",
-		"type": "function"
-	}
-]
--- a/ethcore/block-gas-limit/src/lib.rs
+++ b/ethcore/block-gas-limit/src/lib.rs
@@ -1,39 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! A client interface for interacting with the block gas limit contract.
-
-use client_traits::BlockChainClient;
-use common_types::{header::Header, ids::BlockId};
-use ethabi::FunctionOutputDecoder;
-use ethabi_contract::use_contract;
-use ethereum_types::{Address, U256};
-use log::{debug, error};
-
-use_contract!(contract, "res/block_gas_limit.json");
-
-pub fn block_gas_limit(full_client: &dyn BlockChainClient, header: &Header, address: Address) -> Option<U256> {
-	let (data, decoder) = contract::functions::block_gas_limit::call();
-	let value = full_client.call_contract(BlockId::Hash(*header.parent_hash()), address, data).map_err(|err| {
-		error!(target: "block_gas_limit", "Contract call failed. Not changing the block gas limit. {:?}", err);
-	}).ok()?;
-	if value.is_empty() {
-		debug!(target: "block_gas_limit", "Contract call returned nothing. Not changing the block gas limit.");
-		None
-	} else {
-		decoder.decode(&value).ok()
-	}
-}
--- a/ethcore/block-reward/Cargo.toml
+++ b/ethcore/block-reward/Cargo.toml
@@ -1,22 +0,0 @@
-[package]
-description = "A crate to interact with the block rewards contract."
-name = "block-reward"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-common-types = { path = "../types" }
-engine = { path = "../engine" }
-ethabi = "9.0.1"
-ethabi-derive = "9.0.1"
-ethabi-contract = "9.0.0"
-ethereum-types = "0.8.0"
-keccak-hash = "0.4.0"
-machine = { path = "../machine" }
-trace = { path = "../trace" }
-
-[dev-dependencies]
-ethcore = { path = "..", features = ["test-helpers"] }
-spec = { path = "../spec" }
--- 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.8.0"
-keccak-hash = "0.4.0"
-parity-util-mem = "0.3.0"
-itertools = "0.5"
-kvdb = "0.3.1"
-log = "0.4"
-parity-bytes = "0.1"
-rand = "0.7"
-parking_lot = "0.9"
-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"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-rustc-hex = "1.0"
-tempdir = "0.3"
-kvdb-memorydb = "0.3.1"
--- a/ethcore/blockchain/src/lib.rs
+++ b/ethcore/blockchain/src/lib.rs
@@ -1,40 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Blockchain database.
-
-#![warn(missing_docs)]
-
-extern crate parity_util_mem as util_mem;
-extern crate parity_util_mem as malloc_size_of;
-
-mod best_block;
-mod blockchain;
-mod cache;
-mod config;
-mod update;
-
-pub mod generator;
-
-pub use crate::{
-	blockchain::{BlockProvider, BlockChain, BlockChainDB, BlockChainDBHandler},
-	cache::CacheSize,
-	config::Config,
-	update::ExtrasInsert,
-};
-pub use ethcore_db::keys::{BlockReceipts, BlockDetails, TransactionAddress, BlockNumberKey};
-pub use common_types::tree_route::TreeRoute;
-
--- a/ethcore/builtin/Cargo.toml
+++ b/ethcore/builtin/Cargo.toml
@@ -1,23 +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 }
-byteorder = "1.3.2"
-common-types = { path = "../types" }
-eip-152 = { path = "../../util/EIP-152" }
-ethereum-types = "0.8.0"
-ethjson = { path = "../../json" }
-keccak-hash = "0.4.0"
-log = "0.4"
-num = { version = "0.1", default-features = false, features = ["bigint"] }
-parity-bytes = "0.1"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-
-[dev-dependencies]
-hex-literal = "0.2.1"
-macros = { path = "../../util/macros" }
--- 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.8.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,32 +0,0 @@
-// Copyright 2015-2020 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 trait
-
-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,
-		block_id: BlockId,
-		address: Address,
-		data: Bytes
-	) -> Result<Bytes, String>;
-}
--- a/ethcore/call-contract/src/lib.rs
+++ b/ethcore/call-contract/src/lib.rs
@@ -1,27 +0,0 @@
-// Copyright 2015-2020 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/client-traits/Cargo.toml
+++ b/ethcore/client-traits/Cargo.toml
@@ -1,22 +0,0 @@
-[package]
-description = "Trait definitions relative the ethereum client"
-name = "client-traits"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-account-state = { path = "../account-state" }
-blockchain = { package = "ethcore-blockchain", path = "../blockchain" }
-bytes = { package = "parity-bytes", version = "0.1.0" }
-call-contract = { package = "ethcore-call-contract", path = "../call-contract" }
-common-types = { path = "../types" }
-ethcore-db = { path = "../db" }
-ethcore-miner = { path = "../../miner" }
-ethereum-types = "0.8.0"
-kvdb = "0.3.1"
-registrar = { path = "../../util/registrar" }
-stats = { path = "../../util/stats" }
-trace = { path = "../trace" }
-vm = { path = "../vm" }
--- a/ethcore/client-traits/src/lib.rs
+++ b/ethcore/client-traits/src/lib.rs
@@ -1,578 +0,0 @@
-// Copyright 2015-2020 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 std::{
-	collections::BTreeMap,
-	sync::Arc,
-};
-
-use account_state::state::StateInfo;
-use blockchain::BlockProvider;
-use bytes::Bytes;
-use call_contract::CallContract;
-use registrar::RegistrarClient;
-use common_types::{
-	basic_account::BasicAccount,
-	block_status::BlockStatus,
-	blockchain_info::BlockChainInfo,
-	BlockNumber,
-	call_analytics::CallAnalytics,
-	chain_notify::{NewBlocks, ChainMessageType},
-	client_types::Mode,
-	encoded,
-	engines::{epoch::Transition as EpochTransition, machine::Executed},
-	errors::{EthcoreError, EthcoreResult},
-	filter::Filter,
-	header::Header,
-	ids::{BlockId, TransactionId, TraceId, UncleId},
-	log_entry::LocalizedLogEntry,
-	pruning_info::PruningInfo,
-	receipt::LocalizedReceipt,
-	trace_filter::Filter as TraceFilter,
-	transaction::{self, Action, LocalizedTransaction, CallError, SignedTransaction, UnverifiedTransaction},
-	tree_route::TreeRoute,
-	verification::{VerificationQueueInfo, Unverified},
-};
-use ethereum_types::{Address, H256, U256};
-use ethcore_db::keys::BlockReceipts;
-use ethcore_miner::pool::VerifiedTransaction;
-use kvdb::DBValue;
-use stats;
-use trace::{
-	FlatTrace,
-	localized::LocalizedTrace,
-	VMTrace,
-};
-use common_types::{
-	data_format::DataFormat,
-	client_types::StateResult
-};
-use vm::{LastHashes, Schedule};
-
-/// State information to be used during client query
-pub enum StateOrBlock {
-	/// State to be used, may be pending
-	State(Box<dyn StateInfo>),
-
-	/// Id of an existing block from a chain to get state from
-	Block(BlockId)
-}
-
-impl From<Box<dyn StateInfo>> for StateOrBlock {
-	fn from(info: Box<dyn StateInfo>) -> StateOrBlock {
-		StateOrBlock::State(info)
-	}
-}
-
-impl From<BlockId> for StateOrBlock {
-	fn from(id: BlockId) -> StateOrBlock {
-		StateOrBlock::Block(id)
-	}
-}
-
-/// Provides `nonce` and `latest_nonce` methods
-pub trait Nonce {
-	/// Attempt to get address nonce at given block.
-	/// May not fail on BlockId::Latest.
-	fn nonce(&self, address: &Address, id: BlockId) -> Option<U256>;
-
-	/// Get address nonce at the latest block's state.
-	fn latest_nonce(&self, address: &Address) -> U256 {
-		self.nonce(address, BlockId::Latest)
-			.expect("nonce will return Some when given BlockId::Latest. nonce was given BlockId::Latest. \
-			Therefore nonce has returned Some; qed")
-	}
-}
-
-/// Provides `balance` and `latest_balance` methods
-pub trait Balance {
-	/// Get address balance at the given block's state.
-	///
-	/// May not return None if given BlockId::Latest.
-	/// Returns None if and only if the block's root hash has been pruned from the DB.
-	fn balance(&self, address: &Address, state: StateOrBlock) -> Option<U256>;
-
-	/// Get address balance at the latest block's state.
-	fn latest_balance(&self, address: &Address) -> U256 {
-		self.balance(address, BlockId::Latest.into())
-			.expect("balance will return Some if given BlockId::Latest. balance was given BlockId::Latest \
-			Therefore balance has returned Some; qed")
-	}
-}
-
-/// Provides methods to access account info
-pub trait AccountData: Nonce + Balance {}
-
-/// Provides `chain_info` method
-pub trait ChainInfo {
-	/// Get blockchain information.
-	fn chain_info(&self) -> BlockChainInfo;
-}
-
-/// Provides various information on a block by it's ID
-pub trait BlockInfo: Send + Sync {
-	/// Get raw block header data by block id.
-	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
-
-	/// Get the best block header.
-	fn best_block_header(&self) -> Header;
-
-	/// Get raw block data by block header hash.
-	fn block(&self, id: BlockId) -> Option<encoded::Block>;
-
-	/// Get address code hash at given block's state.
-	fn code_hash(&self, address: &Address, id: BlockId) -> Option<H256>;
-}
-
-/// Provides various information on a transaction by it's ID
-pub trait TransactionInfo {
-	/// Get the hash of block that contains the transaction, if any.
-	fn transaction_block(&self, id: TransactionId) -> Option<H256>;
-}
-
-/// Provides various blockchain information, like block header, chain state etc.
-pub trait BlockChain: ChainInfo + BlockInfo + TransactionInfo {}
-
-/// Do we want to force update sealing?
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum ForceUpdateSealing {
-	/// Ideally you want to use `No` at all times as `Yes` skips `reseal_required` checks.
-	Yes,
-	/// Don't skip `reseal_required` checks
-	No
-}
-/// Client facilities used by internally sealing Engines.
-pub trait EngineClient: Sync + Send + ChainInfo {
-	/// Make a new block and seal it.
-	fn update_sealing(&self, force: ForceUpdateSealing);
-
-	/// Submit a seal for a block in the mining queue.
-	fn submit_seal(&self, block_hash: H256, seal: Vec<Bytes>);
-
-	/// Broadcast a consensus message to the network.
-	fn broadcast_consensus_message(&self, message: Bytes);
-
-	/// Get the transition to the epoch the given parent hash is part of
-	/// or transitions to.
-	/// This will give the epoch that any children of this parent belong to.
-	///
-	/// The block corresponding the the parent hash must be stored already.
-	fn epoch_transition_for(&self, parent_hash: H256) -> Option<EpochTransition>;
-
-	/// Attempt to cast the engine client to a full client.
-	fn as_full_client(&self) -> Option<&dyn BlockChainClient>;
-
-	/// Get a block number by ID.
-	fn block_number(&self, id: BlockId) -> Option<BlockNumber>;
-
-	/// Get raw block header data by block id.
-	fn block_header(&self, id: BlockId) -> Option<encoded::Header>;
-}
-
-/// Provides methods to import block into blockchain
-pub trait ImportBlock {
-	/// Import a block into the blockchain.
-	fn import_block(&self, block: Unverified) -> EthcoreResult<H256>;
-
-	/// Triggered by a message from a block queue when the block is ready for insertion.
-	/// Returns the number of blocks imported.
-	fn import_verified_blocks(&self) -> usize;
-}
-
-/// IO operations that should off-load heavy work to another thread.
-pub trait IoClient: Sync + Send {
-	/// Queue transactions for importing.
-	fn queue_transactions(&self, transactions: Vec<Bytes>, peer_id: usize);
-
-	/// Queue block import with transaction receipts. Does no sealing and transaction validation.
-	fn queue_ancient_block(&self, block_bytes: Unverified, receipts_bytes: Bytes) -> EthcoreResult<H256>;
-
-	/// Queue consensus engine message.
-	fn queue_consensus_message(&self, message: Bytes);
-}
-
-/// Implement this for clients that need logic to decide when/how to advance.
-pub trait Tick {
-	/// Tick the client
-	fn tick(&self, _prevent_sleep: bool) {}
-}
-
-impl Tick for () {}
-
-/// Provides recently seen bad blocks.
-pub trait BadBlocks {
-	/// Returns a list of blocks that were recently not imported because they were invalid.
-	fn bad_blocks(&self) -> Vec<(Unverified, String)>;
-}
-
-
-/// Blockchain database client. Owns and manages a blockchain and a block queue.
-pub trait BlockChainClient:
-	Sync + Send + AccountData + BlockChain + CallContract + RegistrarClient
-	+ ImportBlock + IoClient + BadBlocks
-{
-	/// Look up the block number for the given block ID.
-	fn block_number(&self, id: BlockId) -> Option<BlockNumber>;
-
-	/// Get raw block body data by block id.
-	/// Block body is an RLP list of two items: uncles and transactions.
-	fn block_body(&self, id: BlockId) -> Option<encoded::Body>;
-
-	/// Get block status by block header hash.
-	fn block_status(&self, id: BlockId) -> BlockStatus;
-
-	/// Get block total difficulty.
-	fn block_total_difficulty(&self, id: BlockId) -> Option<U256>;
-
-	/// Attempt to get address storage root at given block.
-	/// May not fail on BlockId::Latest.
-	fn storage_root(&self, address: &Address, id: BlockId) -> Option<H256>;
-
-	/// Get block hash.
-	fn block_hash(&self, id: BlockId) -> Option<H256>;
-
-	/// Get address code at given block's state.
-	fn code(&self, address: &Address, state: StateOrBlock) -> StateResult<Option<Bytes>>;
-
-	/// Get address code at the latest block's state.
-	fn latest_code(&self, address: &Address) -> Option<Bytes> {
-		match self.code(address, BlockId::Latest.into()) {
-			StateResult::Missing => panic!("code will return Some if given BlockId::Latest; qed"),
-			StateResult::Some(t) => t,
-		}
-	}
-
-	/// Get a reference to the `BlockProvider`.
-	fn chain(&self) -> Arc<dyn BlockProvider>;
-
-	/// Get block queue information.
-	fn queue_info(&self) -> VerificationQueueInfo;
-
-	/// Get address code hash at given block's state.
-
-	/// Get value of the storage at given position at the given block's state.
-	///
-	/// May not return None if given BlockId::Latest.
-	/// Returns None if and only if the block's root hash has been pruned from the DB.
-	fn storage_at(&self, address: &Address, position: &H256, state: StateOrBlock) -> Option<H256>;
-
-	/// Get value of the storage at given position at the latest block's state.
-	fn latest_storage_at(&self, address: &Address, position: &H256) -> H256 {
-		self.storage_at(address, position, BlockId::Latest.into())
-			.expect("storage_at will return Some if given BlockId::Latest. storage_at was given BlockId::Latest. \
-			Therefore storage_at has returned Some; qed")
-	}
-
-	/// Get a list of all accounts in the block `id`, if fat DB is in operation, otherwise `None`.
-	/// If `after` is set the list starts with the following item.
-	fn list_accounts(&self, id: BlockId, after: Option<&Address>, count: u64) -> Option<Vec<Address>>;
-
-	/// Get a list of all storage keys in the block `id`, if fat DB is in operation, otherwise `None`.
-	/// If `after` is set the list starts with the following item.
-	fn list_storage(&self, id: BlockId, account: &Address, after: Option<&H256>, count: Option<u64>) -> Option<Vec<H256>>;
-
-	/// Get transaction with given hash.
-	fn transaction(&self, id: TransactionId) -> Option<LocalizedTransaction>;
-
-	/// Get uncle with given id.
-	fn uncle(&self, id: UncleId) -> Option<encoded::Header>;
-
-	/// Get transaction receipt with given hash.
-	fn transaction_receipt(&self, id: TransactionId) -> Option<LocalizedReceipt>;
-
-	/// Get localized receipts for all transaction in given block.
-	fn localized_block_receipts(&self, id: BlockId) -> Option<Vec<LocalizedReceipt>>;
-
-	/// Get a tree route between `from` and `to`.
-	/// See `BlockChain::tree_route`.
-	fn tree_route(&self, from: &H256, to: &H256) -> Option<TreeRoute>;
-
-	/// Get all possible uncle hashes for a block.
-	fn find_uncles(&self, hash: &H256) -> Option<Vec<H256>>;
-
-	/// Get latest state node
-	fn state_data(&self, hash: &H256) -> Option<Bytes>;
-
-	/// Get block receipts data by block header hash.
-	fn block_receipts(&self, hash: &H256) -> Option<BlockReceipts>;
-
-	/// Returns true if block queue is empty.
-	fn is_queue_empty(&self) -> bool {
-		self.queue_info().is_empty()
-	}
-
-	/// Clear block queue and abort all import activity.
-	fn clear_queue(&self);
-
-	/// Returns logs matching given filter. If one of the filtering block cannot be found, returns the block id that caused the error.
-	fn logs(&self, filter: Filter) -> Result<Vec<LocalizedLogEntry>, BlockId>;
-
-	/// Replays a given transaction for inspection.
-	fn replay(&self, t: TransactionId, analytics: CallAnalytics) -> Result<Executed<FlatTrace, VMTrace>, CallError>;
-
-	/// Replays all the transactions in a given block for inspection.
-	fn replay_block_transactions(&self, block: BlockId, analytics: CallAnalytics) -> Result<Box<dyn Iterator<Item = (H256, Executed<FlatTrace, VMTrace>)>>, CallError>;
-
-	/// Returns traces matching given filter.
-	fn filter_traces(&self, filter: TraceFilter) -> Option<Vec<LocalizedTrace>>;
-
-	/// Returns trace with given id.
-	fn trace(&self, trace: TraceId) -> Option<LocalizedTrace>;
-
-	/// Returns traces created by transaction.
-	fn transaction_traces(&self, trace: TransactionId) -> Option<Vec<LocalizedTrace>>;
-
-	/// Returns traces created by transaction from block.
-	fn block_traces(&self, trace: BlockId) -> Option<Vec<LocalizedTrace>>;
-
-	/// Get last hashes starting from best block.
-	fn last_hashes(&self) -> LastHashes;
-
-	/// List all ready transactions that should be propagated to other peers.
-	fn transactions_to_propagate(&self) -> Vec<Arc<VerifiedTransaction>>;
-
-	/// Sorted list of transaction gas prices from at least last sample_size blocks.
-	fn gas_price_corpus(&self, sample_size: usize) -> stats::Corpus<U256> {
-		let mut h = self.chain_info().best_block_hash;
-		let mut corpus = Vec::new();
-		while corpus.is_empty() {
-			for _ in 0..sample_size {
-				let block = match self.block(BlockId::Hash(h)) {
-					Some(block) => block,
-					None => return corpus.into(),
-				};
-
-				if block.number() == 0 {
-					return corpus.into();
-				}
-				for t in block.transaction_views().iter() {
-					corpus.push( t.gas_price() )
-				}
-				h = block.parent_hash().clone();
-			}
-		}
-		corpus.into()
-	}
-
-	/// Get the preferred chain ID to sign on
-	fn signing_chain_id(&self) -> Option<u64>;
-
-	/// Get the mode.
-	fn mode(&self) -> Mode;
-
-	/// Set the mode.
-	fn set_mode(&self, mode: Mode);
-
-	/// Get the chain spec name.
-	fn spec_name(&self) -> String;
-
-	/// Set the chain via a spec name.
-	fn set_spec_name(&self, spec_name: String) -> Result<(), ()>;
-
-	/// Disable the client from importing blocks. This cannot be undone in this session and indicates
-	/// that a subsystem has reason to believe this executable incapable of syncing the chain.
-	fn disable(&self);
-
-	/// Returns engine-related extra info for `BlockId`.
-	fn block_extra_info(&self, id: BlockId) -> Option<BTreeMap<String, String>>;
-
-	/// Returns engine-related extra info for `UncleId`.
-	fn uncle_extra_info(&self, id: UncleId) -> Option<BTreeMap<String, String>>;
-
-	/// Returns information about pruning/data availability.
-	fn pruning_info(&self) -> PruningInfo;
-
-	/// Returns a transaction signed with the key configured in the engine signer.
-	fn create_transaction(&self, tx_request: TransactionRequest) -> Result<SignedTransaction, transaction::Error>;
-
-	/// Schedule state-altering transaction to be executed on the next pending
-	/// block with the given gas and nonce parameters.
-	fn transact(&self, tx_request: TransactionRequest) -> Result<(), transaction::Error>;
-}
-
-/// The data required for a `Client` to create a transaction.
-///
-/// Gas limit, gas price, or nonce can be set explicitly, e.g. to create service
-/// transactions with zero gas price, or sequences of transactions with consecutive nonces.
-pub struct TransactionRequest {
-	pub action: Action,
-	pub data: Bytes,
-	pub gas: Option<U256>,
-	pub gas_price: Option<U256>,
-	pub nonce: Option<U256>,
-}
-
-impl TransactionRequest {
-	/// Creates a request to call a contract at `address` with the specified call data.
-	pub fn call(address: Address, data: Bytes) -> TransactionRequest {
-		TransactionRequest {
-			action: Action::Call(address),
-			data,
-			gas: None,
-			gas_price: None,
-			nonce: None,
-		}
-	}
-
-	/// Creates a request to create a new contract, with the specified bytecode.
-	pub fn create(data: Bytes) -> TransactionRequest {
-		TransactionRequest {
-			action: Action::Create,
-			data,
-			gas: None,
-			gas_price: None,
-			nonce: None,
-		}
-	}
-
-	/// Sets a gas limit. If this is not specified, a sensible default is used.
-	pub fn gas(mut self, gas: U256) -> TransactionRequest {
-		self.gas = Some(gas);
-		self
-	}
-
-	/// Sets a gas price. If this is not specified, a sensible default is used.
-	pub fn gas_price(mut self, gas_price: U256) -> TransactionRequest {
-		self.gas_price = Some(gas_price);
-		self
-	}
-
-	/// Sets a nonce. If this is not specified, the appropriate latest nonce for the author is used.
-	pub fn nonce(mut self, nonce: U256) -> TransactionRequest {
-		self.nonce = Some(nonce);
-		self
-	}
-}
-
-/// resets the blockchain
-pub trait BlockChainReset {
-	/// reset to best_block - n
-	fn reset(&self, num: u32) -> Result<(), String>;
-
-	/// Number of eras kept in a journal before they are pruned
-	fn pruning_history(&self) -> u64;
-}
-
-
-/// Provides `latest_schedule` method
-pub trait ScheduleInfo {
-	/// Returns latest schedule.
-	fn latest_schedule(&self) -> Schedule;
-}
-
-/// Provides methods to access chain state
-pub trait StateClient {
-	/// Type representing chain state
-	type State: StateInfo;
-
-	/// Get a copy of the best block's state and header.
-	fn latest_state_and_header(&self) -> (Self::State, Header);
-
-	/// Attempt to get a copy of a specific block's final state.
-	///
-	/// This will not fail if given BlockId::Latest.
-	/// Otherwise, this can fail (but may not) if the DB prunes state or the block
-	/// is unknown.
-	fn state_at(&self, id: BlockId) -> Option<Self::State>;
-}
-
-/// Extended client interface for providing proofs of the state.
-pub trait ProvingBlockChainClient: BlockChainClient {
-	/// Prove account storage at a specific block id.
-	///
-	/// Both provided keys assume a secure trie.
-	/// Returns a vector of raw trie nodes (in order from the root) proving the storage query.
-	fn prove_storage(&self, key1: H256, key2: H256, id: BlockId) -> Option<(Vec<Bytes>, H256)>;
-
-	/// Prove account existence at a specific block id.
-	/// The key is the keccak hash of the account's address.
-	/// Returns a vector of raw trie nodes (in order from the root) proving the query.
-	fn prove_account(&self, key1: H256, id: BlockId) -> Option<(Vec<Bytes>, BasicAccount)>;
-
-	/// Prove execution of a transaction at the given block.
-	/// Returns the output of the call and a vector of database items necessary
-	/// to reproduce it.
-	fn prove_transaction(&self, transaction: SignedTransaction, id: BlockId) -> Option<(Bytes, Vec<DBValue>)>;
-
-	/// Get an epoch change signal by block hash.
-	fn epoch_signal(&self, hash: H256) -> Option<Vec<u8>>;
-}
-
-/// External database restoration handler
-pub trait DatabaseRestore: Send + Sync {
-	/// Restart with a new backend. Takes ownership of passed database and moves it to a new location.
-	fn restore_db(&self, new_db: &str) -> Result<(), EthcoreError>;
-}
-
-/// Represents what has to be handled by actor listening to chain events
-pub trait ChainNotify: Send + Sync {
-	/// fires when chain has new blocks.
-	fn new_blocks(&self, _new_blocks: NewBlocks) {
-		// does nothing by default
-	}
-
-	/// fires when chain achieves active mode
-	fn start(&self) {
-		// does nothing by default
-	}
-
-	/// fires when chain achieves passive mode
-	fn stop(&self) {
-		// does nothing by default
-	}
-
-	/// fires when chain broadcasts a message
-	fn broadcast(&self, _message_type: ChainMessageType) {
-		// does nothing by default
-	}
-
-	/// fires when new block is about to be imported
-	/// implementations should be light
-	fn block_pre_import(&self, _bytes: &Bytes, _hash: &H256, _difficulty: &U256) {
-		// does nothing by default
-	}
-
-	/// fires when new transactions are received from a peer
-	fn transactions_received(&self, _txs: &[UnverifiedTransaction], _peer_id: usize) {
-		// does nothing by default
-	}
-}
-
-/// Provides a method for importing/exporting blocks
-pub trait ImportExportBlocks {
-	/// Export blocks to destination, with the given from, to and format argument.
-	/// destination could be a file or stdout.
-	/// If the format is hex, each block is written on a new line.
-	/// For binary exports, all block data is written to the same line.
-	fn export_blocks<'a>(
-		&self,
-		destination: Box<dyn std::io::Write + 'a>,
-		from: BlockId,
-		to: BlockId,
-		format: Option<DataFormat>
-	) -> Result<(), String>;
-
-	/// Import blocks from destination, with the given format argument
-	/// Source could be a file or stdout.
-	/// For hex format imports, it attempts to read the blocks on a line by line basis.
-	/// For binary format imports, reads the 8 byte RLP header in order to decode the block
-	/// length to be read.
-	fn import_blocks<'a>(
-		&self,
-		source: Box<dyn std::io::Read + 'a>,
-		format: Option<DataFormat>
-	) -> Result<(), String>;
-}
--- 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.8.0"
-kvdb = "0.3.1"
-parity-util-mem = "0.3.0"
-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-2020 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/engine/Cargo.toml
+++ b/ethcore/engine/Cargo.toml
@@ -1,31 +0,0 @@
-[package]
-description = "Ethereum engine trait definition"
-name = "engine"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-blockchain = { package = "ethcore-blockchain", path = "../blockchain" }
-builtin = { path = "../builtin", package = "ethcore-builtin" }
-bytes = { package = "parity-bytes", version = "0.1.0" }
-client-traits = { path = "../client-traits" }
-common-types = { path = "../types" }
-ethereum-types = "0.8.0"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-machine = { path = "../machine" }
-vm = { path = "../vm" }
-
-# used from test-helpers
-accounts = { package = "ethcore-accounts", path = "../../accounts", optional = true }
-log = { version = "0.4.8", optional = true }
-ethkey = { path = "../../accounts/ethkey", optional = true }
-
-[dev-dependencies]
-accounts = { package = "ethcore-accounts", path = "../../accounts" }
-ethkey = { path = "../../accounts/ethkey" }
-log = "0.4.8"
-
-[features]
-test-helpers = ["accounts", "log", "ethkey"]
--- a/ethcore/engine/src/engine.rs
+++ b/ethcore/engine/src/engine.rs
@@ -1,435 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Consensus engine specification and basic implementations.
-
-use std::sync::{Weak, Arc};
-use std::collections::BTreeMap;
-
-use builtin::Builtin;
-use common_types::{
-	BlockNumber,
-	ancestry_action::AncestryAction,
-	header::{Header, ExtendedHeader},
-	engines::{
-		Seal, SealingState, Headers, PendingTransitionStore,
-		params::CommonParams,
-		machine as machine_types,
-		machine::{AuxiliaryData, AuxiliaryRequest},
-	},
-	errors::{EthcoreError as Error, EngineError},
-	snapshot::Snapshotting,
-	transaction::{self, SignedTransaction, UnverifiedTransaction},
-};
-use client_traits::EngineClient;
-
-use ethereum_types::{H256, U256, Address};
-use parity_crypto::publickey::Signature;
-use machine::{
-	Machine,
-	executed_block::ExecutedBlock,
-};
-use vm::{EnvInfo, Schedule, ActionType, ActionValue};
-
-use crate::signer::EngineSigner;
-
-/// A system-calling closure. Enacts calls on a block's state from the system address.
-pub type SystemCall<'a> = dyn FnMut(Address, Vec<u8>) -> Result<Vec<u8>, String> + 'a;
-
-/// A system-calling closure. Enacts calls on a block's state with code either from an on-chain contract, or hard-coded EVM or WASM (if enabled on-chain) codes.
-pub type SystemOrCodeCall<'a> = dyn FnMut(SystemOrCodeCallKind, Vec<u8>) -> Result<Vec<u8>, String> + 'a;
-
-/// Kind of SystemOrCodeCall, this is either an on-chain address, or code.
-#[derive(PartialEq, Debug, Clone)]
-pub enum SystemOrCodeCallKind {
-	/// On-chain address.
-	Address(Address),
-	/// Hard-coded code.
-	Code(Arc<Vec<u8>>, H256),
-}
-
-/// Default SystemOrCodeCall implementation.
-pub fn default_system_or_code_call<'a>(machine: &'a Machine, block: &'a mut ExecutedBlock) -> impl FnMut(SystemOrCodeCallKind, Vec<u8>) -> Result<Vec<u8>, String> + 'a {
-	move |to, data| {
-		let result = match to {
-			SystemOrCodeCallKind::Address(address) => {
-				machine.execute_as_system(
-					block,
-					address,
-					U256::max_value(),
-					Some(data),
-				)
-			},
-			SystemOrCodeCallKind::Code(code, code_hash) => {
-				machine.execute_code_as_system(
-					block,
-					None,
-					Some(code),
-					Some(code_hash),
-					Some(ActionValue::Apparent(U256::zero())),
-					U256::max_value(),
-					Some(data),
-					Some(ActionType::StaticCall),
-				)
-			},
-		};
-
-		result.map_err(|e| format!("{}", e))
-	}
-}
-
-/// Proof dependent on state.
-pub trait StateDependentProof: Send + Sync {
-	/// Generate a proof, given the state.
-	fn generate_proof<'a>(&self, state: &machine_types::Call) -> Result<Vec<u8>, String>;
-	/// Check a proof generated elsewhere (potentially by a peer).
-	// `engine` needed to check state proofs, while really this should
-	// just be state machine params.
-	fn check_proof(&self, machine: &Machine, proof: &[u8]) -> Result<(), String>;
-}
-
-/// Proof generated on epoch change.
-pub enum Proof {
-	/// Known proof (extracted from signal)
-	Known(Vec<u8>),
-	/// State dependent proof.
-	WithState(Arc<dyn StateDependentProof>),
-}
-
-/// Generated epoch verifier.
-pub enum ConstructedVerifier<'a> {
-	/// Fully trusted verifier.
-	Trusted(Box<dyn EpochVerifier>),
-	/// Verifier unconfirmed. Check whether given finality proof finalizes given hash
-	/// under previous epoch.
-	Unconfirmed(Box<dyn EpochVerifier>, &'a [u8], H256),
-	/// Error constructing verifier.
-	Err(Error),
-}
-
-impl<'a> ConstructedVerifier<'a> {
-	/// Convert to a result, indicating that any necessary confirmation has been done
-	/// already.
-	pub fn known_confirmed(self) -> Result<Box<dyn EpochVerifier>, Error> {
-		match self {
-			ConstructedVerifier::Trusted(v) | ConstructedVerifier::Unconfirmed(v, _, _) => Ok(v),
-			ConstructedVerifier::Err(e) => Err(e),
-		}
-	}
-}
-
-/// Results of a query of whether an epoch change occurred at the given block.
-pub enum EpochChange {
-	/// Cannot determine until more data is passed.
-	Unsure(AuxiliaryRequest),
-	/// No epoch change.
-	No,
-	/// The epoch will change, with proof.
-	Yes(Proof),
-}
-
-/// A consensus mechanism for the chain. Generally either proof-of-work or proof-of-stake-based.
-/// Provides hooks into each of the major parts of block import.
-pub trait Engine: Sync + Send {
-	/// The name of this engine.
-	fn name(&self) -> &str;
-
-	/// Get access to the underlying state machine.
-	// TODO: decouple.
-	fn machine(&self) -> &Machine;
-
-	/// The number of additional header fields required for this engine.
-	fn seal_fields(&self, _header: &Header) -> usize { 0 }
-
-	/// Additional engine-specific information for the user/developer concerning `header`.
-	fn extra_info(&self, _header: &Header) -> BTreeMap<String, String> { BTreeMap::new() }
-
-	/// Maximum number of uncles a block is allowed to declare.
-	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 0 }
-
-	/// Optional maximum gas limit.
-	fn maximum_gas_limit(&self) -> Option<U256> { None }
-
-	/// Block transformation functions, before the transactions.
-	/// `epoch_begin` set to true if this block kicks off an epoch.
-	fn on_new_block(
-		&self,
-		_block: &mut ExecutedBlock,
-		_epoch_begin: bool,
-	) -> Result<(), Error> {
-		Ok(())
-	}
-
-	/// Block transformation functions, after the transactions.
-	fn on_close_block(
-		&self,
-		_block: &mut ExecutedBlock,
-		_parent_header: &Header,
-	) -> Result<(), Error> {
-		Ok(())
-	}
-
-	/// Allow mutating the header during seal generation. Currently only used by Clique.
-	fn on_seal_block(&self, _block: &mut ExecutedBlock) -> Result<(), Error> { Ok(()) }
-
-	/// Returns a list of transactions for a new block if we are the author.
-	///
-	/// This is called when the miner prepares a new block that this node will author and seal. It returns a list of
-	/// transactions that will be added to the block before any other transactions from the queue.
-	fn generate_engine_transactions(&self, _block: &ExecutedBlock) -> Result<Vec<SignedTransaction>, Error> {
-		Ok(Vec::new())
-	}
-
-	/// Returns the engine's current sealing state.
-	fn sealing_state(&self) -> SealingState { SealingState::External }
-
-	/// Called in `miner.chain_new_blocks` if the engine wishes to `update_sealing`
-	/// after a block was recently sealed.
-	///
-	/// returns false by default
-	fn should_reseal_on_update(&self) -> bool {
-		false
-	}
-
-	/// Attempt to seal the block internally.
-	///
-	/// If `Some` is returned, then you get a valid seal.
-	///
-	/// This operation is synchronous and may (quite reasonably) not be available, in which None will
-	/// be returned.
-	///
-	/// It is fine to require access to state or a full client for this function, since
-	/// light clients do not generate seals.
-	fn generate_seal(&self, _block: &ExecutedBlock, _parent: &Header) -> Seal { Seal::None }
-
-	/// Verify a locally-generated seal of a header.
-	///
-	/// If this engine seals internally,
-	/// no checks have to be done here, since all internally generated seals
-	/// should be valid.
-	///
-	/// Externally-generated seals (e.g. PoW) will need to be checked for validity.
-	///
-	/// It is fine to require access to state or a full client for this function, since
-	/// light clients do not generate seals.
-	fn verify_local_seal(&self, header: &Header) -> Result<(), Error>;
-
-	/// Phase 1 quick block verification. Only does checks that are cheap. Returns either a null `Ok` or a general error detailing the problem with import.
-	/// The verification module can optionally avoid checking the seal (`check_seal`), if seal verification is disabled this method won't be called.
-	fn verify_block_basic(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
-
-	/// Phase 2 verification. Perform costly checks such as transaction signatures. Returns either a null `Ok` or a general error detailing the problem with import.
-	/// The verification module can optionally avoid checking the seal (`check_seal`), if seal verification is disabled this method won't be called.
-	fn verify_block_unordered(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
-
-	/// Phase 3 verification. Check block information against parent. Returns either a null `Ok` or a general error detailing the problem with import.
-	fn verify_block_family(&self, _header: &Header, _parent: &Header) -> Result<(), Error> { Ok(()) }
-
-	/// Phase 4 verification. Verify block header against potentially external data.
-	/// Should only be called when `register_client` has been called previously.
-	fn verify_block_external(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
-
-	/// Genesis epoch data.
-	fn genesis_epoch_data<'a>(&self, _header: &Header, _state: &machine_types::Call) -> Result<Vec<u8>, String> { Ok(Vec::new()) }
-
-	/// Whether an epoch change is signalled at the given header but will require finality.
-	/// If a change can be enacted immediately then return `No` from this function but
-	/// `Yes` from `is_epoch_end`.
-	///
-	/// If auxiliary data of the block is required, return an auxiliary request and the function will be
-	/// called again with them.
-	/// Return `Yes` or `No` when the answer is definitively known.
-	///
-	/// Should not interact with state.
-	fn signals_epoch_end<'a>(&self, _header: &Header, _aux: AuxiliaryData<'a>) -> EpochChange {
-		EpochChange::No
-	}
-
-	/// Whether a block is the end of an epoch.
-	///
-	/// This either means that an immediate transition occurs or a block signalling transition
-	/// has reached finality. The `Headers` given are not guaranteed to return any blocks
-	/// from any epoch other than the current. The client must keep track of finality and provide
-	/// the latest finalized headers to check against the transition store.
-	///
-	/// Return optional transition proof.
-	fn is_epoch_end(
-		&self,
-		_chain_head: &Header,
-		_finalized: &[H256],
-		_chain: &Headers<Header>,
-		_transition_store: &PendingTransitionStore,
-	) -> Option<Vec<u8>> {
-		None
-	}
-
-	/// Whether a block is the end of an epoch.
-	///
-	/// This either means that an immediate transition occurs or a block signalling transition
-	/// has reached finality. The `Headers` given are not guaranteed to return any blocks
-	/// from any epoch other than the current. This is a specialized method to use for light
-	/// clients since the light client doesn't track finality of all blocks, and therefore finality
-	/// for blocks in the current epoch is built inside this method by the engine.
-	///
-	/// Return optional transition proof.
-	fn is_epoch_end_light(
-		&self,
-		_chain_head: &Header,
-		_chain: &Headers<Header>,
-		_transition_store: &PendingTransitionStore,
-	) -> Option<Vec<u8>> {
-		None
-	}
-
-	/// Create an epoch verifier from validation proof and a flag indicating
-	/// whether finality is required.
-	fn epoch_verifier<'a>(&self, _header: &Header, _proof: &'a [u8]) -> ConstructedVerifier<'a> {
-		ConstructedVerifier::Trusted(Box::new(NoOp))
-	}
-
-	/// Populate a header's fields based on its parent's header.
-	/// Usually implements the chain scoring rule based on weight.
-	fn populate_from_parent(&self, _header: &mut Header, _parent: &Header) { }
-
-	/// Handle any potential consensus messages;
-	/// updating consensus state and potentially issuing a new one.
-	fn handle_message(&self, _message: &[u8]) -> Result<(), EngineError> { Err(EngineError::UnexpectedMessage) }
-
-	/// Register a component which signs consensus messages.
-	fn set_signer(&self, _signer: Option<Box<dyn EngineSigner>>) {}
-
-	/// Sign using the EngineSigner, to be used for consensus tx signing.
-	fn sign(&self, _hash: H256) -> Result<Signature, Error> { unimplemented!() }
-
-	/// Add Client which can be used for sealing, potentially querying the state and sending messages.
-	fn register_client(&self, _client: Weak<dyn EngineClient>) {}
-
-	/// Trigger next step of the consensus engine.
-	fn step(&self) {}
-
-	/// Snapshot mode for the engine: Unsupported, PoW or PoA
-	fn snapshot_mode(&self) -> Snapshotting { Snapshotting::Unsupported }
-
-	/// Return a new open block header timestamp based on the parent timestamp.
-	fn open_block_header_timestamp(&self, parent_timestamp: u64) -> u64 {
-		use std::{time, cmp};
-
-		let now = time::SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap_or_default();
-		cmp::max(now.as_secs() as u64, parent_timestamp + 1)
-	}
-
-	/// Check whether the parent timestamp is valid.
-	fn is_timestamp_valid(&self, header_timestamp: u64, parent_timestamp: u64) -> bool {
-		header_timestamp > parent_timestamp
-	}
-
-	/// Gather all ancestry actions. Called at the last stage when a block is committed. The Engine must guarantee that
-	/// the ancestry exists.
-	fn ancestry_actions(&self, _header: &Header, _ancestry: &mut dyn Iterator<Item = ExtendedHeader>) -> Vec<AncestryAction> {
-		Vec::new()
-	}
-
-	/// Returns author should used when executing tx's for this block.
-	fn executive_author(&self, header: &Header) -> Result<Address, Error> {
-		Ok(*header.author())
-	}
-
-	/// Overrides the block gas limit. Whenever this returns `Some` for a header, the next block's gas limit must be
-	/// exactly that value.
-	fn gas_limit_override(&self, _header: &Header) -> Option<U256> {
-		None
-	}
-
-	/// Get the general parameters of the chain.
-	fn params(&self) -> &CommonParams;
-
-	/// Get the EVM schedule for the given block number.
-	fn schedule(&self, block_number: BlockNumber) -> Schedule {
-		self.machine().schedule(block_number)
-	}
-
-	/// Builtin-contracts for the chain..
-	fn builtins(&self) -> &BTreeMap<Address, Builtin> {
-		self.machine().builtins()
-	}
-
-	/// Attempt to get a handle to a built-in contract.
-	/// Only returns references to activated built-ins.
-	fn builtin(&self, a: &Address, block_number: BlockNumber) -> Option<&Builtin> {
-		self.machine().builtin(a, block_number)
-	}
-
-	/// Some intrinsic operation parameters; by default they take their value from the `spec()`'s `engine_params`.
-	fn maximum_extra_data_size(&self) -> usize { self.params().maximum_extra_data_size }
-
-	/// The nonce with which accounts begin at given block.
-	fn account_start_nonce(&self, block: BlockNumber) -> U256 {
-		self.machine().account_start_nonce(block)
-	}
-
-	/// The network ID that transactions should be signed with.
-	fn signing_chain_id(&self, env_info: &EnvInfo) -> Option<u64> {
-		self.machine().signing_chain_id(env_info)
-	}
-
-	/// Perform basic/cheap transaction verification.
-	///
-	/// This should include all cheap checks that can be done before
-	/// actually checking the signature, like chain-replay protection.
-	///
-	/// NOTE This is done before the signature is recovered so avoid
-	/// doing any state-touching checks that might be expensive.
-	///
-	/// TODO: Add flags for which bits of the transaction to check.
-	/// TODO: consider including State in the params.
-	fn verify_transaction_basic(&self, t: &UnverifiedTransaction, header: &Header) -> Result<(), transaction::Error> {
-		self.machine().verify_transaction_basic(t, header)
-	}
-
-	/// Performs pre-validation of RLP decoded transaction before other processing
-	fn decode_transaction(&self, transaction: &[u8]) -> Result<UnverifiedTransaction, transaction::Error> {
-		self.machine().decode_transaction(transaction)
-	}
-
-	/// The configured minimum gas limit.
-	fn min_gas_limit(&self) -> U256 {
-		self.params().min_gas_limit
-	}
-}
-
-/// Verifier for all blocks within an epoch with self-contained state.
-pub trait EpochVerifier: Send + Sync {
-	/// Lightly verify the next block header.
-	/// This may not be a header belonging to a different epoch.
-	fn verify_light(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
-
-	/// Perform potentially heavier checks on the next block header.
-	fn verify_heavy(&self, header: &Header) -> Result<(), Error> {
-		self.verify_light(header)
-	}
-
-	/// Check a finality proof against this epoch verifier.
-	/// Returns `Some(hashes)` if the proof proves finality of these hashes.
-	/// Returns `None` if the proof doesn't prove anything.
-	fn check_finality_proof(&self, _proof: &[u8]) -> Option<Vec<H256>> {
-		None
-	}
-}
-
-/// Special "no-op" verifier for stateless, epoch-less engines.
-pub struct NoOp;
-
-impl EpochVerifier for NoOp {}
--- a/ethcore/engine/src/lib.rs
+++ b/ethcore/engine/src/lib.rs
@@ -1,36 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! This crate defines the Engine trait and related types.
-
-mod engine;
-pub mod signer;
-
-pub use crate::engine::{
-	Engine,
-	EpochVerifier,
-	StateDependentProof,
-	ConstructedVerifier,
-	EpochChange,
-	Proof,
-	SystemCall,
-	SystemOrCodeCall,
-	SystemOrCodeCallKind,
-	default_system_or_code_call,
-};
-
-#[cfg(any(test, feature = "test-helpers"))]
-pub mod test_helpers;
--- a/ethcore/engine/src/signer.rs
+++ b/ethcore/engine/src/signer.rs
@@ -1,60 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! A signer used by Engines which need to sign messages.
-
-use ethereum_types::{H256, Address};
-use parity_crypto::publickey::{ecies, Public, Signature, KeyPair, Error};
-
-/// Everything that an Engine needs to sign messages.
-pub trait EngineSigner: Send + Sync {
-	/// Sign a consensus message hash.
-	fn sign(&self, hash: H256) -> Result<Signature, Error>;
-
-	/// Signing address
-	fn address(&self) -> Address;
-
-	/// Decrypt a message that was encrypted to this signer's key.
-	fn decrypt(&self, auth_data: &[u8], cipher: &[u8]) -> Result<Vec<u8>, Error>;
-
-	/// The signer's public key, if available.
-	fn public(&self) -> Option<Public>;
-}
-
-/// Creates a new `EngineSigner` from given key pair.
-pub fn from_keypair(keypair: KeyPair) -> Box<dyn EngineSigner> {
-	Box::new(Signer(keypair))
-}
-
-struct Signer(KeyPair);
-
-impl EngineSigner for Signer {
-	fn sign(&self, hash: H256) -> Result<Signature, Error> {
-		parity_crypto::publickey::sign(self.0.secret(), &hash)
-	}
-
-	fn decrypt(&self, auth_data: &[u8], cipher: &[u8]) -> Result<Vec<u8>, Error> {
-		ecies::decrypt(self.0.secret(), auth_data, cipher)
-	}
-
-	fn address(&self) -> Address {
-		self.0.address()
-	}
-
-	fn public(&self) -> Option<Public> {
-		Some(*self.0.public())
-	}
-}
--- a/ethcore/engine/src/test_helpers.rs
+++ b/ethcore/engine/src/test_helpers.rs
@@ -1,61 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Test helpers for engine related tests
-
-use std::sync::Arc;
-
-use ethereum_types::{Address, H256};
-use ethkey::Password;
-use parity_crypto::publickey::{Public, Signature, Error};
-use log::warn;
-use accounts::{self, AccountProvider, SignError};
-
-use crate::signer::EngineSigner;
-
-impl EngineSigner for (Arc<AccountProvider>, Address, Password) {
-	fn sign(&self, hash: H256) -> Result<Signature, Error> {
-		match self.0.sign(self.1, Some(self.2.clone()), hash) {
-			Err(SignError::NotUnlocked) => unreachable!(),
-			Err(SignError::NotFound) => Err(Error::InvalidAddress),
-			Err(SignError::SStore(accounts::Error::EthCrypto(err))) => Err(Error::Custom(err.to_string())),
-			Err(SignError::SStore(accounts::Error::EthPublicKeyCrypto(err))) => {
-				warn!("Low level crypto error: {:?}", err);
-				Err(Error::InvalidSecretKey)
-			},
-			Err(SignError::SStore(err)) => {
-				warn!("Error signing for engine: {:?}", err);
-				Err(Error::InvalidSignature)
-			},
-			Ok(ok) => Ok(ok),
-		}
-	}
-
-	fn decrypt(&self, auth_data: &[u8], cipher: &[u8]) -> Result<Vec<u8>, Error> {
-		self.0.decrypt(self.1, None, auth_data, cipher).map_err(|e| {
-			warn!("Unable to decrypt message: {:?}", e);
-			Error::InvalidMessage
-		})
-	}
-
-	fn address(&self) -> Address {
-		self.1
-	}
-
-	fn public(&self) -> Option<Public> {
-		self.0.account_public(self.1, &self.2).ok()
-	}
-}
--- a/ethcore/engines/authority-round/Cargo.toml
+++ b/ethcore/engines/authority-round/Cargo.toml
@@ -1,46 +0,0 @@
-[package]
-description = "Non-instant BFT proof-of-authority blockchain engine"
-name = "authority-round"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-block-gas-limit = { path = "../../block-gas-limit" }
-block-reward = { path = "../../block-reward" }
-client-traits = { path = "../../client-traits" }
-common-types = { path = "../../types" }
-derive_more = "0.15.0"
-ethabi = "9.0.1"
-ethabi-contract = "9.0.0"
-ethabi-derive = "9.0.1"
-ethereum-types = "0.8.0"
-ethjson = { path = "../../../json" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-engine = { path = "../../engine" }
-io = { package = "ethcore-io", path = "../../../util/io" }
-itertools = "0.5"
-keccak-hash = "0.4.0"
-lazy_static = "1.3.0"
-log = "0.4"
-lru-cache = "0.1"
-machine = { path = "../../machine" }
-macros = { path = "../../../util/macros" }
-parity-bytes = "0.1"
-parking_lot = "0.9"
-rand = "0.7"
-rlp = "0.4.0"
-time-utils = { path = "../../../util/time-utils" }
-unexpected = { path = "../../../util/unexpected" }
-validator-set = { path = "../validator-set" }
-
-[dev-dependencies]
-accounts = { package = "ethcore-accounts", path = "../../../accounts" }
-engine = { path = "../../engine", features = ["test-helpers"] }
-env_logger = "0.6.2"
-ethcore = { path = "../..", features = ["test-helpers"] }
-spec = { path = "../../spec" }
-state-db = { path = "../../state-db" }
-validator-set = { path = "../validator-set", features = ["test-helpers"] }
-serde_json = "1"
--- a/ethcore/engines/authority-round/src/finality.rs
+++ b/ethcore/engines/authority-round/src/finality.rs
@@ -1,315 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Finality proof generation and checking.
-
-use std::collections::{VecDeque};
-use std::collections::hash_map::{HashMap, Entry};
-
-use common_types::BlockNumber;
-use ethereum_types::{H256, Address};
-use log::{trace, warn};
-use validator_set::SimpleList;
-
-/// Error indicating unknown validator.
-#[derive(Debug, PartialEq, Eq, Clone, Copy)]
-pub struct UnknownValidator;
-
-/// Rolling finality checker for authority round consensus.
-/// Stores a chain of unfinalized hashes that can be pushed onto.
-pub struct RollingFinality {
-	headers: VecDeque<(H256, BlockNumber, Vec<Address>)>,
-	signers: SimpleList,
-	sign_count: HashMap<Address, usize>,
-	last_pushed: Option<H256>,
-	/// First block for which a 2/3 quorum (instead of 1/2) is required.
-	two_thirds_majority_transition: BlockNumber,
-}
-
-impl RollingFinality {
-	/// Create a blank finality checker under the given validator set.
-	pub fn blank(signers: Vec<Address>, two_thirds_majority_transition: BlockNumber) -> Self {
-		trace!(target: "finality", "Instantiating blank RollingFinality with {} signers: {:?}", signers.len(), signers);
-		RollingFinality {
-			headers: VecDeque::new(),
-			signers: SimpleList::new(signers),
-			sign_count: HashMap::new(),
-			last_pushed: None,
-			two_thirds_majority_transition,
-		}
-	}
-
-	/// Extract unfinalized subchain from ancestry iterator.
-	/// Clears the current subchain.
-	///
-	/// Fails if any provided signature isn't part of the signers set.
-	pub fn build_ancestry_subchain<I>(&mut self, iterable: I) -> Result<(), UnknownValidator>
-		where I: IntoIterator<Item=(H256, BlockNumber, Vec<Address>)>,
-	{
-		self.clear();
-		for (hash, number, signers) in iterable {
-			if signers.iter().any(|s| !self.signers.contains(s)) { return Err(UnknownValidator) }
-			if self.last_pushed.is_none() { self.last_pushed = Some(hash) }
-			self.add_signers(&signers);
-			self.headers.push_front((hash, number, signers));
-			// break when we've got our first finalized block.
-			if self.is_finalized() {
-				let (hash, _, signers) = self.headers.pop_front().expect("we just pushed a block; qed");
-				self.remove_signers(&signers);
-				trace!(target: "finality", "Encountered already finalized block {}", hash);
-				break
-			}
-		}
-
-		trace!(target: "finality", "Rolling finality state: {:?}", self.headers);
-		Ok(())
-	}
-
-	/// Clears the finality status, but keeps the validator set.
-	pub fn clear(&mut self) {
-		self.headers.clear();
-		self.sign_count.clear();
-		self.last_pushed = None;
-	}
-
-	/// Returns the last pushed hash.
-	pub fn subchain_head(&self) -> Option<H256> {
-		self.last_pushed
-	}
-
-	/// Get an iterator over stored hashes in order.
-	#[cfg(test)]
-	pub fn unfinalized_hashes(&self) -> impl Iterator<Item=&H256> {
-		self.headers.iter().map(|(h, _, _)| h)
-	}
-
-	/// Get the validator set.
-	pub fn validators(&self) -> &SimpleList { &self.signers }
-
-	/// Push a hash onto the rolling finality checker (implying `subchain_head` == head.parent)
-	///
-	/// Fails if `signer` isn't a member of the active validator set.
-	/// Returns a list of all newly finalized headers.
-	// TODO: optimize with smallvec.
-	pub fn push_hash(&mut self, head: H256, number: BlockNumber, signers: Vec<Address>)
-		-> Result<Vec<H256>, UnknownValidator>
-	{
-		for their_signer in signers.iter() {
-			if !self.signers.contains(their_signer) {
-				warn!(target: "finality",  "Unknown validator: {}", their_signer);
-				return Err(UnknownValidator)
-			}
-		}
-
-		self.add_signers(&signers);
-		self.headers.push_back((head, number, signers));
-
-		let mut newly_finalized = Vec::new();
-
-		while self.is_finalized() {
-			let (hash, _, signers) = self.headers.pop_front()
-				.expect("headers length always greater than sign count length; qed");
-			self.remove_signers(&signers);
-			newly_finalized.push(hash);
-		}
-
-		trace!(target: "finality", "{} Blocks finalized by {:?}: {:?}", newly_finalized.len(), head, newly_finalized);
-
-		self.last_pushed = Some(head);
-		Ok(newly_finalized)
-	}
-
-	/// Returns the first block for which a 2/3 quorum (instead of 1/2) is required.
-	pub fn two_thirds_majority_transition(&self) -> BlockNumber {
-		self.two_thirds_majority_transition
-	}
-
-	/// Returns whether the first entry in `self.headers` is finalized.
-	fn is_finalized(&self) -> bool {
-		match self.headers.front() {
-			None => false,
-			Some((_, number, _)) if *number < self.two_thirds_majority_transition => {
-				self.sign_count.len() * 2 > self.signers.len()
-			}
-			Some((_, _, _)) => {
-				self.sign_count.len() * 3 > self.signers.len() * 2
-			}
-		}
-	}
-
-	/// Adds the signers to the sign count.
-	fn add_signers(&mut self, signers: &[Address]) {
-		for signer in signers {
-			*self.sign_count.entry(*signer).or_insert(0) += 1;
-		}
-	}
-
-	/// Removes the signers from the sign count.
-	fn remove_signers(&mut self, signers: &[Address]) {
-		for signer in signers {
-			match self.sign_count.entry(*signer) {
-				Entry::Occupied(mut entry) => {
-					// decrement count for this signer and purge on zero.
-					if *entry.get() <= 1 {
-						entry.remove();
-					} else {
-						*entry.get_mut() -= 1;
-					}
-				}
-				Entry::Vacant(_) => {
-					panic!("all hashes in `header` should have entries in `sign_count` for their signers; qed");
-				}
-			}
-		}
-	}
-}
-
-#[cfg(test)]
-mod tests {
-	use common_types::BlockNumber;
-	use ethereum_types::{H256, Address};
-	use super::RollingFinality;
-
-	#[test]
-	fn rejects_unknown_signers() {
-		let signers = (0..3).map(|_| Address::random()).collect::<Vec<_>>();
-		let mut finality = RollingFinality::blank(signers.clone(), BlockNumber::max_value());
-		assert!(finality.push_hash(H256::random(), 0, vec![signers[0], Address::random()]).is_err());
-	}
-
-	#[test]
-	fn finalize_multiple() {
-		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-
-		let mut finality = RollingFinality::blank(signers.clone(), BlockNumber::max_value());
-		let hashes: Vec<_> = (0..7).map(|_| H256::random()).collect();
-
-		// 3 / 6 signers is < 51% so no finality.
-		for (i, hash) in hashes.iter().take(6).cloned().enumerate() {
-			let i = i % 3;
-			assert!(finality.push_hash(hash, i as u64, vec![signers[i]]).unwrap().len() == 0);
-		}
-
-		// after pushing a block signed by a fourth validator, the first four
-		// blocks of the unverified chain become verified.
-		assert_eq!(finality.push_hash(hashes[6], 6, vec![signers[4]]).unwrap(),
-			vec![hashes[0], hashes[1], hashes[2], hashes[3]]);
-	}
-
-	#[test]
-	fn finalize_multiple_signers() {
-		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-		let mut finality = RollingFinality::blank(signers.clone(), BlockNumber::max_value());
-		let hash = H256::random();
-
-		// after pushing a block signed by four validators, it becomes verified right away.
-		assert_eq!(finality.push_hash(hash, 0, signers[0..4].to_vec()).unwrap(), vec![hash]);
-	}
-
-	#[test]
-	fn from_ancestry() {
-		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-		let hashes: Vec<_> = (0..12).map(|i| (H256::random(), i as u64, vec![signers[i % 6]])).collect();
-
-		let mut finality = RollingFinality::blank(signers.clone(), BlockNumber::max_value());
-		finality.build_ancestry_subchain(hashes.iter().rev().cloned()).unwrap();
-
-		assert_eq!(finality.unfinalized_hashes().count(), 3);
-		assert_eq!(finality.subchain_head(), Some(hashes[11].0));
-	}
-
-	#[test]
-	fn from_ancestry_multiple_signers() {
-		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-		let hashes: Vec<_> = (0..12).map(|i| {
-			(H256::random(), i as u64, vec![signers[i % 6], signers[(i + 1) % 6], signers[(i + 2) % 6]])
-		}).collect();
-
-		let mut finality = RollingFinality::blank(signers.clone(), BlockNumber::max_value());
-		finality.build_ancestry_subchain(hashes.iter().rev().cloned()).unwrap();
-
-		// only the last hash has < 51% of authorities' signatures
-		assert_eq!(finality.unfinalized_hashes().count(), 1);
-		assert_eq!(finality.unfinalized_hashes().next(), Some(&hashes[11].0));
-		assert_eq!(finality.subchain_head(), Some(hashes[11].0));
-	}
-
-	#[test]
-	fn rejects_unknown_signers_2_3() {
-		let signers = (0..3).map(|_| Address::random()).collect::<Vec<_>>();
-		let mut finality = RollingFinality::blank(signers.clone(), 0);
-		assert!(finality.push_hash(H256::random(), 0, vec![signers[0], Address::random()]).is_err());
-	}
-
-	#[test]
-	fn finalize_multiple_2_3() {
-		let signers: Vec<_> = (0..7).map(|_| Address::random()).collect();
-
-		let mut finality = RollingFinality::blank(signers.clone(), 0);
-		let hashes: Vec<_> = (0..9).map(|_| H256::random()).collect();
-
-		// 4 / 7 signers is < 67% so no finality.
-		for (i, hash) in hashes.iter().take(8).cloned().enumerate() {
-			let i = i % 4;
-			assert!(finality.push_hash(hash, i as u64, vec![signers[i]]).unwrap().len() == 0);
-		}
-
-		// after pushing a block signed by a fifth validator, the first five
-		// blocks of the unverified chain become verified.
-		assert_eq!(finality.push_hash(hashes[8], 8, vec![signers[4]]).unwrap(),
-			vec![hashes[0], hashes[1], hashes[2], hashes[3], hashes[4]]);
-	}
-
-	#[test]
-	fn finalize_multiple_signers_2_3() {
-		let signers: Vec<_> = (0..5).map(|_| Address::random()).collect();
-		let mut finality = RollingFinality::blank(signers.clone(), 0);
-		let hash = H256::random();
-
-		// after pushing a block signed by four validators, it becomes verified right away.
-		assert_eq!(finality.push_hash(hash, 0, signers[0..4].to_vec()).unwrap(), vec![hash]);
-	}
-
-	#[test]
-	fn from_ancestry_2_3() {
-		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-		let hashes: Vec<_> = (0..12).map(|i| (H256::random(), i as u64, vec![signers[i % 6]])).collect();
-
-		let mut finality = RollingFinality::blank(signers, 0);
-		finality.build_ancestry_subchain(hashes.iter().rev().cloned()).unwrap();
-
-		// The last four hashes, with index 11, 10, 9, and 8, have been pushed. 7 would have finalized a block.
-		assert_eq!(finality.unfinalized_hashes().count(), 4);
-		assert_eq!(finality.subchain_head(), Some(hashes[11].0));
-	}
-
-	#[test]
-	fn from_ancestry_multiple_signers_2_3() {
-		let signers: Vec<_> = (0..6).map(|_| Address::random()).collect();
-		let hashes: Vec<_> = (0..12).map(|i| {
-			let hash_signers = signers.iter().cycle().skip(i).take(4).cloned().collect();
-			(H256::random(), i as u64, hash_signers)
-		}).collect();
-
-		let mut finality = RollingFinality::blank(signers.clone(), 0);
-		finality.build_ancestry_subchain(hashes.iter().rev().cloned()).unwrap();
-
-		// only the last hash has < 67% of authorities' signatures
-		assert_eq!(finality.unfinalized_hashes().count(), 1);
-		assert_eq!(finality.unfinalized_hashes().next(), Some(&hashes[11].0));
-		assert_eq!(finality.subchain_head(), Some(hashes[11].0));
-	}
-}
--- a/ethcore/engines/authority-round/src/randomness.rs
+++ b/ethcore/engines/authority-round/src/randomness.rs
@@ -1,257 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! On-chain randomness generation for authority round
-//!
-//! This module contains the support code for the on-chain randomness generation used by AuRa. Its
-//! core is the finite state machine `RandomnessPhase`, which can be loaded from the blockchain
-//! state, then asked to perform potentially necessary transaction afterwards using the `advance()`
-//! method.
-//!
-//! No additional state is kept inside the `RandomnessPhase`, it must be passed in each time.
-//!
-//! The process of generating random numbers is a simple finite state machine:
-//!
-//! ```text
-//!                                                       +
-//!                                                       |
-//!                                                       |
-//!                                                       |
-//! +--------------+                              +-------v-------+
-//! |              |                              |               |
-//! | BeforeCommit <------------------------------+    Waiting    |
-//! |              |          enter commit phase  |               |
-//! +------+-------+                              +-------^-------+
-//!        |                                              |
-//!        |  call                                        |
-//!        |  `commitHash()`                              |  call
-//!        |                                              |  `revealNumber()`
-//!        |                                              |
-//! +------v-------+                              +-------+-------+
-//! |              |                              |               |
-//! |  Committed   +------------------------------>    Reveal     |
-//! |              |  enter reveal phase          |               |
-//! +--------------+                              +---------------+
-//! ```
-//!
-//! Phase transitions are performed by the smart contract and simply queried by the engine.
-//!
-//! Randomness generation works as follows:
-//! * During the commit phase, all validators locally generate a random number, and commit that number's hash to the
-//!   contract.
-//! * During the reveal phase, all validators reveal their local random number to the contract. The contract should
-//!   verify that it matches the committed hash.
-//! * Finally, the XOR of all revealed numbers is used as an on-chain random number.
-//!
-//! An adversary can only influence that number by either controlling _all_ validators who committed, or, to a lesser
-//! extent, by not revealing committed numbers.
-//! The length of the commit and reveal phases, as well as any penalties for failure to reveal, are defined by the
-//! contract.
-//!
-//! A typical case of using `RandomnessPhase` is:
-//!
-//! 1. `RandomnessPhase::load()` the phase from the blockchain data.
-//! 2. Call `RandomnessPhase::advance()`.
-//!
-//! A production implementation of a randomness contract can be found here:
-//! https://github.com/poanetwork/posdao-contracts/blob/4fddb108993d4962951717b49222327f3d94275b/contracts/RandomAuRa.sol
-
-use derive_more::Display;
-use ethabi::Hash;
-use ethabi_contract::use_contract;
-use ethereum_types::{Address, H256, U256};
-use keccak_hash::keccak;
-use log::{debug, error};
-use parity_crypto::publickey::{ecies, Error as CryptoError};
-use parity_bytes::Bytes;
-use rand::Rng;
-use engine::signer::EngineSigner;
-
-use crate::util::{BoundContract, CallError};
-
-/// Random number type expected by the contract: This is generated locally, kept secret during the commit phase, and
-/// published in the reveal phase.
-pub type RandNumber = H256;
-
-use_contract!(aura_random, "../../res/contracts/authority_round_random.json");
-
-/// Validated randomness phase state.
-#[derive(Debug)]
-pub enum RandomnessPhase {
-	// NOTE: Some states include information already gathered during `load` (e.g. `our_address`,
-	//       `round`) for efficiency reasons.
-	/// Waiting for the next phase.
-	///
-	/// This state indicates either the successful revelation in this round or having missed the
-	/// window to make a commitment, i.e. having failed to commit during the commit phase.
-	Waiting,
-	/// Indicates a commitment is possible, but still missing.
-	BeforeCommit,
-	/// Indicates a successful commitment, waiting for the commit phase to end.
-	Committed,
-	/// Indicates revealing is expected as the next step.
-	Reveal { our_address: Address, round: U256 },
-}
-
-/// Phase loading error for randomness generation state machine.
-///
-/// This error usually indicates a bug in either the smart contract, the phase loading function or
-/// some state being lost.
-///
-/// `BadRandNumber` will usually result in punishment by the contract or the other validators.
-#[derive(Debug, Display)]
-pub enum PhaseError {
-	/// The smart contract reported that we already revealed something while still being in the
-	/// commit phase.
-	#[display(fmt = "Revealed during commit phase")]
-	RevealedInCommit,
-	/// Failed to load contract information.
-	#[display(fmt = "Error loading randomness contract information: {:?}", _0)]
-	LoadFailed(CallError),
-	/// Failed to load the stored encrypted random number.
-	#[display(fmt = "Failed to load random number from the randomness contract")]
-	BadRandNumber,
-	/// Failed to encrypt random number.
-	#[display(fmt = "Failed to encrypt random number: {}", _0)]
-	Crypto(CryptoError),
-	/// Failed to get the engine signer's public key.
-	#[display(fmt = "Failed to get the engine signer's public key")]
-	MissingPublicKey,
-}
-
-impl From<CryptoError> for PhaseError {
-	fn from(err: CryptoError) -> PhaseError {
-		PhaseError::Crypto(err)
-	}
-}
-
-impl RandomnessPhase {
-	/// Determine randomness generation state from the contract.
-	///
-	/// Calls various constant contract functions to determine the precise state that needs to be
-	/// handled (that is, the phase and whether or not the current validator still needs to send
-	/// commitments or reveal random numbers).
-	pub fn load(
-		contract: &BoundContract,
-		our_address: Address,
-	) -> Result<RandomnessPhase, PhaseError> {
-		// Determine the current round and which phase we are in.
-		let round = contract
-			.call_const(aura_random::functions::current_collect_round::call())
-			.map_err(PhaseError::LoadFailed)?;
-		let is_commit_phase = contract
-			.call_const(aura_random::functions::is_commit_phase::call())
-			.map_err(PhaseError::LoadFailed)?;
-
-		// Ensure we are not committing or revealing twice.
-		let committed = contract
-			.call_const(aura_random::functions::is_committed::call(
-				round,
-				our_address,
-			))
-			.map_err(PhaseError::LoadFailed)?;
-		let revealed: bool = contract
-			.call_const(aura_random::functions::sent_reveal::call(
-				round,
-				our_address,
-			))
-			.map_err(PhaseError::LoadFailed)?;
-
-		// With all the information known, we can determine the actual state we are in.
-		if is_commit_phase {
-			if revealed {
-				return Err(PhaseError::RevealedInCommit);
-			}
-
-			if !committed {
-				Ok(RandomnessPhase::BeforeCommit)
-			} else {
-				Ok(RandomnessPhase::Committed)
-			}
-		} else {
-			if !committed {
-				// We apparently entered too late to make a commitment, wait until we get a chance again.
-				return Ok(RandomnessPhase::Waiting);
-			}
-
-			if !revealed {
-				Ok(RandomnessPhase::Reveal { our_address, round })
-			} else {
-				Ok(RandomnessPhase::Waiting)
-			}
-		}
-	}
-
-	/// Advance the random seed construction process as far as possible.
-	///
-	/// Returns the encoded contract call necessary to advance the randomness contract's state.
-	///
-	/// **Warning**: After calling the `advance()` function, wait until the returned transaction has been included in
-	/// a block before calling it again; otherwise spurious transactions resulting in punishments might be executed.
-	pub fn advance<R: Rng>(
-		self,
-		contract: &BoundContract,
-		rng: &mut R,
-		signer: &dyn EngineSigner,
-	) -> Result<Option<Bytes>, PhaseError> {
-		match self {
-			RandomnessPhase::Waiting | RandomnessPhase::Committed => Ok(None),
-			RandomnessPhase::BeforeCommit => {
-				// Generate a new random number, but don't reveal it yet. Instead, we publish its hash to the
-				// randomness contract, together with the number encrypted to ourselves. That way we will later be
-				// able to decrypt and reveal it, and other parties are able to verify it against the hash.
-				let number: RandNumber = rng.gen();
-				let number_hash: Hash = keccak(number.as_bytes());
-				let public = signer.public().ok_or(PhaseError::MissingPublicKey)?;
-				let cipher = ecies::encrypt(&public, &number_hash.0, number.as_bytes())?;
-
-				debug!(target: "engine", "Randomness contract: committing {}.", number_hash);
-				// Return the call data for the transaction that commits the hash and the encrypted number.
-				let (data, _decoder) = aura_random::functions::commit_hash::call(number_hash, cipher);
-				Ok(Some(data))
-			}
-			RandomnessPhase::Reveal { round, our_address } => {
-				// Load the hash and encrypted number that we stored in the commit phase.
-				let call = aura_random::functions::get_commit_and_cipher::call(round, our_address);
-				let (committed_hash, cipher) = contract
-					.call_const(call)
-					.map_err(PhaseError::LoadFailed)?;
-
-				// Decrypt the number and check against the hash.
-				let number_bytes = signer.decrypt(&committed_hash.0, &cipher)?;
-				let number = if number_bytes.len() == 32 {
-					RandNumber::from_slice(&number_bytes)
-				} else {
-					// This can only happen if there is a bug in the smart contract,
-					// or if the entire network goes awry.
-					error!(target: "engine", "Decrypted random number has the wrong length.");
-					return Err(PhaseError::BadRandNumber);
-				};
-				let number_hash: Hash = keccak(number.as_bytes());
-				if number_hash != committed_hash {
-					error!(target: "engine", "Decrypted random number doesn't agree with the hash.");
-					return Err(PhaseError::BadRandNumber);
-				}
-
-				debug!(target: "engine", "Randomness contract: scheduling tx to reveal our random number {} (round={}, our_address={}).", number_hash, round, our_address);
-				// We are now sure that we have the correct secret and can reveal it. So we return the call data for the
-				// transaction that stores the revealed random bytes on the contract.
-				let (data, _decoder) = aura_random::functions::reveal_number::call(number.as_bytes());
-				Ok(Some(data))
-			}
-		}
-	}
-}
--- a/ethcore/engines/authority-round/src/util.rs
+++ b/ethcore/engines/authority-round/src/util.rs
@@ -1,94 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Utility functions.
-//!
-//! Contains small functions used by the AuRa engine that are not strictly limited to that scope.
-
-use std::fmt;
-
-use client_traits::EngineClient;
-use common_types::ids::BlockId;
-use ethabi;
-use ethereum_types::Address;
-
-/// A contract bound to a client and block number.
-///
-/// A bound contract is a combination of a `Client` reference, a `BlockId` and a contract `Address`.
-/// These three parts are enough to call a contract's function; return values are automatically
-/// decoded.
-pub struct BoundContract<'a> {
-	client: &'a dyn EngineClient,
-	block_id: BlockId,
-	contract_addr: Address,
-}
-
-/// Contract call failed error.
-#[derive(Debug)]
-pub enum CallError {
-	/// The call itself failed.
-	CallFailed(String),
-	/// Decoding the return value failed or the decoded value was a failure.
-	DecodeFailed(ethabi::Error),
-	/// The passed in client reference could not be upgraded to a `BlockchainClient`.
-	NotFullClient,
-}
-
-impl<'a> fmt::Debug for BoundContract<'a> {
-	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-		fmt.debug_struct("BoundContract")
-			.field("client", &(self.client as *const dyn EngineClient))
-			.field("block_id", &self.block_id)
-			.field("contract_addr", &self.contract_addr)
-			.finish()
-	}
-}
-
-impl<'a> BoundContract<'a> {
-	/// Create a new `BoundContract`.
-	pub fn new(client: &dyn EngineClient, block_id: BlockId, contract_addr: Address) -> BoundContract {
-		BoundContract {
-			client,
-			block_id,
-			contract_addr,
-		}
-	}
-
-	/// Perform a function call to an Ethereum machine that doesn't create a transaction or change the state.
-	///
-	/// Runs a constant function call on `client`. The `call` value can be serialized by calling any
-	/// api function generated by the `use_contract!` macro. This does not create any transactions, it only produces a
-	/// result based on the state at the current block: It is constant in the sense that it does not alter the EVM
-	/// state.
-	pub fn call_const<D>(&self, call: (ethabi::Bytes, D)) -> Result<D::Output, CallError>
-	where
-		D: ethabi::FunctionOutputDecoder,
-	{
-		let (data, output_decoder) = call;
-
-		let call_return = self
-			.client
-			.as_full_client()
-			.ok_or(CallError::NotFullClient)?
-			.call_contract(self.block_id, self.contract_addr, data)
-			.map_err(CallError::CallFailed)?;
-
-		// Decode the result and return it.
-		output_decoder
-			.decode(call_return.as_slice())
-			.map_err(CallError::DecodeFailed)
-	}
-}
--- a/ethcore/engines/basic-authority/Cargo.toml
+++ b/ethcore/engines/basic-authority/Cargo.toml
@@ -1,31 +0,0 @@
-[package]
-description = "Basic PoA blockchain engine."
-name = "basic-authority"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-client-traits = { path = "../../client-traits" }
-common-types = { path = "../../types" }
-engine = { path = "../../engine" }
-ethereum-types = "0.8.0"
-ethjson = { path = "../../../json" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-log = "0.4.8"
-machine = { path = "../../machine" }
-parking_lot = "0.9"
-rlp = "0.4.2"
-validator-set = { path = "../validator-set" }
-
-[dev-dependencies]
-accounts = { package = "ethcore-accounts", path = "../../../accounts" }
-engine = { path = "../../engine", features = ["test-helpers"] }
-ethcore = { path = "../..", features = ["test-helpers"] }
-keccak-hash = "0.4.0"
-tempdir = "0.3"
-spec = { path = "../../spec" }
-
-[features]
-test-helpers = []
--- a/ethcore/engines/clique/Cargo.toml
+++ b/ethcore/engines/clique/Cargo.toml
@@ -1,31 +0,0 @@
-[package]
-description = "Clique consensus engine"
-name = "clique"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-client-traits = { path = "../../client-traits" }
-common-types = { path = "../../types" }
-ethereum-types = "0.8.0"
-ethjson = { path = "../../../json" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-engine = { path = "../../engine" }
-keccak-hash = "0.4.0"
-lazy_static = "1.3.0"
-log = "0.4"
-lru-cache = "0.1"
-machine = { path = "../../machine" }
-macros = { path = "../../../util/macros" }
-rand = "0.7"
-parking_lot = "0.9"
-rlp = "0.4.0"
-time-utils = { path = "../../../util/time-utils" }
-unexpected = { path = "../../../util/unexpected" }
-
-[dev-dependencies]
-ethcore = { path = "../..", features = ["test-helpers"] }
-spec = { path = "../../spec" }
-state-db = { path = "../../state-db" }
--- a/ethcore/engines/clique/src/block_state.rs
+++ b/ethcore/engines/clique/src/block_state.rs
@@ -1,374 +0,0 @@
-// Copyright 2015-2020 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 std::{
-	collections::{HashMap, BTreeSet, VecDeque},
-	fmt,
-	time::{Duration, SystemTime, UNIX_EPOCH},
-};
-
-use common_types::{
-	BlockNumber,
-	header::Header,
-	errors::{BlockError, EthcoreError as Error, EngineError},
-};
-use ethereum_types::{Address, H64};
-use log::{debug, trace};
-use rand::Rng;
-use time_utils::CheckedSystemTime;
-use unexpected::Mismatch;
-
-use crate::{
-	util::{extract_signers, recover_creator},
-	{VoteType, DIFF_INTURN, DIFF_NOTURN, NULL_AUTHOR, SIGNING_DELAY_NOTURN_MS},
-};
-
-/// Type that keeps track of the state for a given vote
-// Votes that go against the proposal aren't counted since it's equivalent to not voting
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
-pub struct VoteState {
-	kind: VoteType,
-	votes: u64,
-}
-
-/// Type that represent a vote
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
-pub struct Vote {
-	block_number: BlockNumber,
-	beneficiary: Address,
-	kind: VoteType,
-	signer: Address,
-	reverted: bool,
-}
-
-/// Type that represent a pending vote
-#[derive(Copy, Clone, Debug, Eq, Hash, PartialEq, PartialOrd)]
-pub struct PendingVote {
-	signer: Address,
-	beneficiary: Address,
-}
-
-/// Clique state for each block.
-#[cfg(not(test))]
-#[derive(Clone, Debug, Default)]
-pub struct CliqueBlockState {
-	/// Current votes for a beneficiary
-	votes: HashMap<PendingVote, VoteState>,
-	/// A list of all votes for the given epoch
-	votes_history: Vec<Vote>,
-	/// a list of all valid signer, sorted by ascending order.
-	signers: BTreeSet<Address>,
-	/// a deque of recent signer, new entry should be pushed front, apply() modifies this.
-	recent_signers: VecDeque<Address>,
-	/// inturn signing should wait until this time
-	pub next_timestamp_inturn: Option<SystemTime>,
-	/// noturn signing should wait until this time
-	pub next_timestamp_noturn: Option<SystemTime>,
-}
-
-#[cfg(test)]
-#[derive(Clone, Debug, Default)]
-pub struct CliqueBlockState {
-	/// All recorded votes for a given signer, `Vec<PendingVote>` is a stack of votes
-	pub votes: HashMap<PendingVote, VoteState>,
-	/// A list of all votes for the given epoch
-	pub votes_history: Vec<Vote>,
-	/// a list of all valid signer, sorted by ascending order.
-	pub signers: BTreeSet<Address>,
-	/// a deque of recent signer, new entry should be pushed front, apply() modifies this.
-	pub recent_signers: VecDeque<Address>,
-	/// inturn signing should wait until this time
-	pub next_timestamp_inturn: Option<SystemTime>,
-	/// noturn signing should wait until this time
-	pub next_timestamp_noturn: Option<SystemTime>,
-}
-
-impl fmt::Display for CliqueBlockState {
-	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-		let signers: Vec<String> = self.signers.iter()
-			.map(|s|
-				 format!("{} {:?}",
-					s,
-					self.votes.iter().map(|(v, s)| format!("[beneficiary {}, votes: {}]", v.beneficiary, s.votes))
-					.collect::<Vec<_>>()
-				)
-			)
-			.collect();
-
-		let recent_signers: Vec<String> = self.recent_signers.iter().map(|s| format!("{}", s)).collect();
-		let num_votes = self.votes_history.len();
-		let add_votes = self.votes_history.iter().filter(|v| v.kind == VoteType::Add).count();
-		let rm_votes = self.votes_history.iter().filter(|v| v.kind == VoteType::Remove).count();
-		let reverted_votes = self.votes_history.iter().filter(|v| v.reverted).count();
-
-		write!(f,
-			"Votes {{ \n signers: {:?} \n recent_signers: {:?} \n number of votes: {} \n number of add votes {}
-			\r number of remove votes {} \n number of reverted votes: {}}}",
-			signers, recent_signers, num_votes, add_votes, rm_votes, reverted_votes)
-	}
-}
-
-impl CliqueBlockState {
-	/// Create new state with given information, this is used creating new state from Checkpoint block.
-	pub fn new(signers: BTreeSet<Address>) -> Self {
-		CliqueBlockState {
-			signers,
-			..Default::default()
-		}
-	}
-
-	// see https://github.com/ethereum/go-ethereum/blob/master/consensus/clique/clique.go#L474
-	fn verify(&self, header: &Header) -> Result<Address, Error> {
-		let creator = recover_creator(header)?.clone();
-
-		// The signer is not authorized
-		if !self.signers.contains(&creator) {
-			trace!(target: "engine", "current state: {}", self);
-			Err(EngineError::NotAuthorized(creator))?
-		}
-
-		// The signer has signed a block too recently
-		if self.recent_signers.contains(&creator) {
-			trace!(target: "engine", "current state: {}", self);
-			Err(EngineError::CliqueTooRecentlySigned(creator))?
-		}
-
-		// Wrong difficulty
-		let inturn = self.is_inturn(header.number(), &creator);
-
-		if inturn && *header.difficulty() != DIFF_INTURN {
-			Err(BlockError::InvalidDifficulty(Mismatch {
-				expected: DIFF_INTURN,
-				found: *header.difficulty(),
-			}))?
-		}
-
-		if !inturn && *header.difficulty() != DIFF_NOTURN {
-			Err(BlockError::InvalidDifficulty(Mismatch {
-				expected: DIFF_NOTURN,
-				found: *header.difficulty(),
-			}))?
-		}
-
-		Ok(creator)
-	}
-
-	/// Verify and apply a new header to current state
-	pub fn apply(&mut self, header: &Header, is_checkpoint: bool) -> Result<Address, Error> {
-		let creator = self.verify(header)?;
-		self.recent_signers.push_front(creator);
-		self.rotate_recent_signers();
-
-		if is_checkpoint {
-			// checkpoint block should not affect previous tallying, so we check that.
-			let signers = extract_signers(header)?;
-			if self.signers != signers {
-				let invalid_signers: Vec<String> = signers.into_iter()
-					.filter(|s| !self.signers.contains(s))
-					.map(|s| format!("{}", s))
-					.collect();
-				Err(EngineError::CliqueFaultyRecoveredSigners(invalid_signers))?
-			};
-
-			// TODO(niklasad1): I'm not sure if we should shrink here because it is likely that next epoch
-			// will need some memory and might be better for allocation algorithm to decide whether to shrink or not
-			// (typically doubles or halves the allocted memory when necessary)
-			self.votes.clear();
-			self.votes_history.clear();
-			self.votes.shrink_to_fit();
-			self.votes_history.shrink_to_fit();
-		}
-
-		// Contains vote
-		if *header.author() != NULL_AUTHOR {
-			let decoded_seal = header.decode_seal::<Vec<_>>()?;
-			if decoded_seal.len() != 2 {
-				Err(BlockError::InvalidSealArity(Mismatch { expected: 2, found: decoded_seal.len() }))?
-			}
-
-			let nonce = H64::from_slice(decoded_seal[1]);
-			self.update_signers_on_vote(VoteType::from_nonce(nonce)?, creator, *header.author(), header.number())?;
-		}
-
-		Ok(creator)
-	}
-
-	fn update_signers_on_vote(
-		&mut self,
-		kind: VoteType,
-		signer: Address,
-		beneficiary: Address,
-		block_number: u64
-	) -> Result<(), Error> {
-
-		trace!(target: "engine", "Attempt vote {:?} {:?}", kind, beneficiary);
-
-		let pending_vote = PendingVote { signer, beneficiary };
-
-		let reverted = if self.is_valid_vote(&beneficiary, kind) {
-			self.add_vote(pending_vote, kind)
-		} else {
-			// This case only happens if a `signer` wants to revert their previous vote
-			// (does nothing if no previous vote was found)
-			self.revert_vote(pending_vote)
-		};
-
-		// Add all votes to the history
-		self.votes_history.push(
-			Vote {
-			block_number,
-			beneficiary,
-			kind,
-			signer,
-			reverted,
-		});
-
-		// If no vote was found for the beneficiary return `early` but don't propogate an error
-		let (votes, vote_kind) = match self.get_current_votes_and_kind(beneficiary) {
-			Some((v, k)) => (v, k),
-			None => return Ok(()),
-		};
-		let threshold = self.signers.len() / 2;
-
-		debug!(target: "engine", "{}/{} votes to have consensus", votes, threshold + 1);
-		trace!(target: "engine", "votes: {:?}", votes);
-
-		if votes > threshold {
-			match vote_kind {
-				VoteType::Add => {
-					if self.signers.insert(beneficiary) {
-						debug!(target: "engine", "added new signer: {}", beneficiary);
-					}
-				}
-				VoteType::Remove => {
-					if self.signers.remove(&beneficiary) {
-						debug!(target: "engine", "removed signer: {}", beneficiary);
-					}
-				}
-			}
-
-			self.rotate_recent_signers();
-			self.remove_all_votes_from(beneficiary);
-		}
-
-		Ok(())
-	}
-
-	/// Calculate the next timestamp for `inturn` and `noturn` fails if any of them can't be represented as
-	/// `SystemTime`
-	// TODO(niklasad1): refactor this method to be in constructor of `CliqueBlockState` instead.
-	// This is a quite bad API because we must mutate both variables even when already `inturn` fails
-	// That's why we can't return early and must have the `if-else` in the end
-	pub fn calc_next_timestamp(&mut self, timestamp: u64, period: u64) -> Result<(), Error> {
-		let inturn = CheckedSystemTime::checked_add(UNIX_EPOCH, Duration::from_secs(timestamp.saturating_add(period)));
-
-		self.next_timestamp_inturn = inturn;
-
-		let delay = Duration::from_millis(
-			rand::thread_rng().gen_range(0u64, (self.signers.len() as u64 / 2 + 1) * SIGNING_DELAY_NOTURN_MS));
-		self.next_timestamp_noturn = inturn.map(|inturn|  {
-			inturn + delay
-		});
-
-		if self.next_timestamp_inturn.is_some() && self.next_timestamp_noturn.is_some() {
-			Ok(())
-		} else {
-			Err(BlockError::TimestampOverflow)?
-		}
-	}
-
-	/// Returns true if the block difficulty should be `inturn`
-	pub fn is_inturn(&self, current_block_number: u64, author: &Address) -> bool {
-		if let Some(pos) = self.signers.iter().position(|x| *author == *x) {
-			return current_block_number % self.signers.len() as u64 == pos as u64;
-		}
-		false
-	}
-
-	/// Returns whether the signer is authorized to sign a block
-	pub fn is_authorized(&self, author: &Address) -> bool {
-		self.signers.contains(author) && !self.recent_signers.contains(author)
-	}
-
-	/// Returns whether it makes sense to cast the specified vote in the
-	/// current state (e.g. don't try to add an already authorized signer).
-	pub fn is_valid_vote(&self, address: &Address, vote_type: VoteType) -> bool {
-		let in_signer = self.signers.contains(address);
-		match vote_type {
-			VoteType::Add => !in_signer,
-			VoteType::Remove => in_signer,
-		}
-	}
-
-	/// Returns the list of current signers
-	pub fn signers(&self) -> &BTreeSet<Address> {
-		&self.signers
-	}
-
-	// Note this method will always return `true` but it is intended for a uniform `API`
-	fn add_vote(&mut self, pending_vote: PendingVote, kind: VoteType) -> bool {
-
-		self.votes.entry(pending_vote)
-			.and_modify(|state| {
-				state.votes = state.votes.saturating_add(1);
-			})
-			.or_insert_with(|| VoteState { kind, votes: 1 });
-		true
-	}
-
-	fn revert_vote(&mut self, pending_vote: PendingVote) -> bool {
-		let mut revert = false;
-		let mut remove = false;
-
-		self.votes.entry(pending_vote).and_modify(|state| {
-			if state.votes.saturating_sub(1) == 0 {
-				remove = true;
-			}
-			revert = true;
-		});
-
-		if remove {
-			self.votes.remove(&pending_vote);
-		}
-
-		revert
-	}
-
-	fn get_current_votes_and_kind(&self, beneficiary: Address) -> Option<(usize, VoteType)> {
-		let kind = self.votes.iter()
-			.find(|(v, _t)| v.beneficiary == beneficiary)
-			.map(|(_v, t)| t.kind)?;
-
-		let votes = self.votes.keys()
-			.filter(|vote| vote.beneficiary == beneficiary)
-			.count();
-
-		Some((votes, kind))
-	}
-
-	fn rotate_recent_signers(&mut self) {
-		if self.recent_signers.len() >= ( self.signers.len() / 2 ) + 1 {
-			self.recent_signers.pop_back();
-		}
-	}
-
-	fn remove_all_votes_from(&mut self, beneficiary: Address) {
-		self.votes = std::mem::replace(&mut self.votes, HashMap::new())
-			.into_iter()
-			.filter(|(v, _t)| v.signer != beneficiary && v.beneficiary != beneficiary)
-			.collect();
-	}
-}
--- a/ethcore/engines/clique/src/lib.rs
+++ b/ethcore/engines/clique/src/lib.rs
@@ -1,808 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Implementation of the Clique PoA Engine.
-//!
-//! File structure:
-//! - mod.rs -> Provides the engine API implementation, with additional block state tracking
-//! - block_state.rs -> Records the Clique state for given block.
-//! - params.rs -> Contains the parameters for the Clique engine.
-//! - step_service.rs -> An event loop to trigger sealing.
-//! - util.rs -> Various standalone utility functions.
-//! - tests.rs -> Consensus tests as defined in EIP-225.
-
-/// How syncing works:
-///
-/// 1. Client will call:
-///    - `Clique::verify_block_basic()`
-///    - `Clique::verify_block_unordered()`
-///    - `Clique::verify_block_family()`
-/// 2. Using `Clique::state()` we try and retrieve the parent state. If this isn't found
-///    we need to back-fill it from the last known checkpoint.
-/// 3. Once we have a good state, we can record it using `CliqueBlockState::apply()`.
-
-/// How sealing works:
-///
-/// 1. Set a signer using `Engine::set_signer()`. If a miner account was set up through
-///    a config file or CLI flag `MinerService::set_author()` will eventually set the signer
-/// 2. We check that the engine is ready for sealing through `Clique::sealing_state()`
-///    Note: This is always `SealingState::Ready` for Clique
-/// 3. Calling `Clique::new()` will spawn a `StepService` thread. This thread will call `Engine::step()`
-///    periodically. Internally, the Clique `step()` function calls `Client::update_sealing()`, which is
-///    what makes and seals a block.
-/// 4. `Clique::generate_seal()` will then be called by `miner`. This will return a `Seal` which
-///     is either a `Seal::None` or `Seal:Regular`. The following shows how a `Seal` variant is chosen:
-///       a. We return `Seal::None` if no signer is available or the signer is not authorized.
-///       b. If period == 0 and block has transactions, we return `Seal::Regular`, otherwise return `Seal::None`.
-///       c. If we're `INTURN`, wait for at least `period` since last block before trying to seal.
-///       d. If we're not `INTURN`, we wait for a random amount of time using the algorithm specified
-///          in EIP-225 before trying to seal again.
-/// 5. Miner will create new block, in process it will call several engine methods to do following:
-///   a. `Clique::open_block_header_timestamp()` must set timestamp correctly.
-///   b. `Clique::populate_from_parent()` must set difficulty to correct value.
-///       Note: `Clique::populate_from_parent()` is used in both the syncing and sealing code paths.
-/// 6. We call `Clique::on_seal_block()` which will allow us to modify the block header during seal generation.
-/// 7. Finally, `Clique::verify_local_seal()` is called. After this, the syncing code path will be followed
-///    in order to import the new block.
-
-use std::{
-	cmp,
-	collections::{HashMap, VecDeque, BTreeMap},
-	sync::{Arc, Weak},
-	thread,
-	time::{self, Instant, Duration, SystemTime, UNIX_EPOCH},
-};
-
-use client_traits::{EngineClient, ForceUpdateSealing};
-use engine::{
-	Engine,
-	signer::EngineSigner,
-};
-use ethereum_types::{Address, H64, H160, H256, U256};
-use parity_crypto::publickey::Signature;
-use keccak_hash::KECCAK_EMPTY_LIST_RLP;
-use log::{trace, warn};
-use lru_cache::LruCache;
-use machine::{
-	ExecutedBlock,
-	Machine,
-};
-use macros::map;
-use parking_lot::RwLock;
-use rand::Rng;
-use unexpected::{Mismatch, OutOfBounds};
-use time_utils::CheckedSystemTime;
-use common_types::{
-	BlockNumber,
-	ids::BlockId,
-	header::Header,
-	engines::{
-		EthashSeal,
-		Seal,
-		SealingState,
-		params::CommonParams,
-		machine::Call,
-	},
-	errors::{BlockError, EthcoreError as Error, EngineError},
-};
-
-use crate::{
-	util::{extract_signers, recover_creator},
-	block_state::CliqueBlockState,
-	params::CliqueParams,
-};
-
-
-mod params;
-mod block_state;
-mod util;
-
-// TODO(niklasad1): extract tester types into a separate mod to be shared in the code base
-#[cfg(test)]
-mod tests;
-
-// Protocol constants
-/// Fixed number of extra-data prefix bytes reserved for signer vanity
-pub const VANITY_LENGTH: usize = 32;
-/// Fixed number of extra-data suffix bytes reserved for signer signature
-pub const SIGNATURE_LENGTH: usize = 65;
-/// Address length of signer
-pub const ADDRESS_LENGTH: usize = 20;
-/// Nonce value for DROP vote
-pub const NONCE_DROP_VOTE: H64 = H64([0; 8]);
-/// Nonce value for AUTH vote
-pub const NONCE_AUTH_VOTE: H64 = H64([0xff; 8]);
-/// Difficulty for INTURN block
-pub const DIFF_INTURN: U256 = U256([2, 0, 0, 0]);
-/// Difficulty for NOTURN block
-pub const DIFF_NOTURN: U256 = U256([1, 0, 0, 0]);
-/// Default empty author field value
-pub const NULL_AUTHOR: Address = H160([0x00; 20]);
-/// Default empty nonce value
-pub const NULL_NONCE: H64 = NONCE_DROP_VOTE;
-/// Default value for mixhash
-pub const NULL_MIXHASH: H256 = H256([0; 32]);
-/// Default value for uncles hash
-pub const NULL_UNCLES_HASH: H256 = KECCAK_EMPTY_LIST_RLP;
-/// Default noturn block wiggle factor defined in spec.
-pub const SIGNING_DELAY_NOTURN_MS: u64 = 500;
-
-/// How many CliqueBlockState to cache in the memory.
-pub const STATE_CACHE_NUM: usize = 128;
-
-/// Vote to add or remove the beneficiary
-#[derive(Copy, Clone, Debug, PartialEq, PartialOrd)]
-pub enum VoteType {
-	Add,
-	Remove,
-}
-
-impl VoteType {
-	/// Try to construct a `Vote` from a nonce
-	pub fn from_nonce(nonce: H64) -> Result<Self, Error> {
-		if nonce == NONCE_AUTH_VOTE {
-			Ok(VoteType::Add)
-		} else if nonce == NONCE_DROP_VOTE {
-			Ok(VoteType::Remove)
-		} else {
-			Err(EngineError::CliqueInvalidNonce(nonce))?
-		}
-	}
-
-	/// Get the rlp encoding of the vote
-	pub fn as_rlp(&self) -> Vec<Vec<u8>> {
-		match self {
-			VoteType::Add => vec![rlp::encode(&NULL_MIXHASH), rlp::encode(&NONCE_AUTH_VOTE)],
-			VoteType::Remove => vec![rlp::encode(&NULL_MIXHASH), rlp::encode(&NONCE_DROP_VOTE)],
-		}
-	}
-}
-
-/// Clique Engine implementation
-// block_state_by_hash -> block state indexed by header hash.
-#[cfg(not(test))]
-pub struct Clique {
-	epoch_length: u64,
-	period: u64,
-	machine: Machine,
-	client: RwLock<Option<Weak<dyn EngineClient>>>,
-	block_state_by_hash: RwLock<LruCache<H256, CliqueBlockState>>,
-	proposals: RwLock<HashMap<Address, VoteType>>,
-	signer: RwLock<Option<Box<dyn EngineSigner>>>,
-}
-
-#[cfg(test)]
-/// Test version of `CliqueEngine` to make all fields public
-pub struct Clique {
-	pub epoch_length: u64,
-	pub period: u64,
-	pub machine: Machine,
-	pub client: RwLock<Option<Weak<dyn EngineClient>>>,
-	pub block_state_by_hash: RwLock<LruCache<H256, CliqueBlockState>>,
-	pub proposals: RwLock<HashMap<Address, VoteType>>,
-	pub signer: RwLock<Option<Box<dyn EngineSigner>>>,
-}
-
-impl Clique {
-	/// Initialize Clique engine from empty state.
-	pub fn new(params: CliqueParams, machine: Machine) -> Result<Arc<Self>, Error> {
-		/// Step Clique at most every 2 seconds
-		const SEALING_FREQ: Duration = Duration::from_secs(2);
-
-		let engine = Clique {
-			epoch_length: params.epoch,
-			period: params.period,
-			client: Default::default(),
-			block_state_by_hash: RwLock::new(LruCache::new(STATE_CACHE_NUM)),
-			proposals: Default::default(),
-			signer: Default::default(),
-			machine,
-		};
-		let engine = Arc::new(engine);
-		let weak_eng = Arc::downgrade(&engine);
-
-		thread::Builder::new().name("StepService".into())
-			.spawn(move || {
-				loop {
-					let next_step_at = Instant::now() + SEALING_FREQ;
-					trace!(target: "miner", "StepService: triggering sealing");
-					if let Some(eng) = weak_eng.upgrade() {
-						eng.step()
-					} else {
-						warn!(target: "shutdown", "StepService: engine is dropped; exiting.");
-						break;
-					}
-
-					let now = Instant::now();
-					if now < next_step_at {
-						thread::sleep(next_step_at - now);
-					}
-				}
-			})?;
-		Ok(engine)
-	}
-
-	#[cfg(test)]
-	/// Initialize test variant of `CliqueEngine`,
-	/// Note we need to `mock` the miner and it is introduced to test block verification to trigger new blocks
-	/// to mainly test consensus edge cases
-	pub fn with_test(epoch_length: u64, period: u64) -> Self {
-		Self {
-			epoch_length,
-			period,
-			client: Default::default(),
-			block_state_by_hash: RwLock::new(LruCache::new(STATE_CACHE_NUM)),
-			proposals: Default::default(),
-			signer: Default::default(),
-			machine: spec::new_test_machine(),
-		}
-	}
-
-	fn sign_header(&self, header: &Header) -> Result<(Signature, H256), Error> {
-
-		match self.signer.read().as_ref() {
-			None => {
-				Err(EngineError::RequiresSigner)?
-			}
-			Some(signer) => {
-				let digest = header.hash();
-				match signer.sign(digest) {
-					Ok(sig) => Ok((sig, digest)),
-					Err(e) => Err(EngineError::Custom(e.into()))?,
-				}
-			}
-		}
-	}
-
-	/// Construct an new state from given checkpoint header.
-	fn new_checkpoint_state(&self, header: &Header) -> Result<CliqueBlockState, Error> {
-		debug_assert_eq!(header.number() % self.epoch_length, 0);
-
-		let mut state = CliqueBlockState::new(extract_signers(header)?);
-
-		// TODO(niklasad1): refactor to perform this check in the `CliqueBlockState` constructor instead
-		state.calc_next_timestamp(header.timestamp(), self.period)?;
-
-		Ok(state)
-	}
-
-	fn state_no_backfill(&self, hash: &H256) -> Option<CliqueBlockState> {
-		self.block_state_by_hash.write().get_mut(hash).cloned()
-	}
-
-	/// Get `CliqueBlockState` for given header, backfill from last checkpoint if needed.
-	fn state(&self, header: &Header) -> Result<CliqueBlockState, Error> {
-		let mut block_state_by_hash = self.block_state_by_hash.write();
-		if let Some(state) = block_state_by_hash.get_mut(&header.hash()) {
-			return Ok(state.clone());
-		}
-		// If we are looking for an checkpoint block state, we can directly reconstruct it.
-		if header.number() % self.epoch_length == 0 {
-			let state = self.new_checkpoint_state(header)?;
-			block_state_by_hash.insert(header.hash(), state.clone());
-			return Ok(state);
-		}
-		// BlockState is not found in memory, which means we need to reconstruct state from last checkpoint.
-		match self.client.read().as_ref().and_then(|w| w.upgrade()) {
-			None => {
-				return Err(EngineError::RequiresClient)?;
-			}
-			Some(c) => {
-				let last_checkpoint_number = header.number() - header.number() % self.epoch_length as u64;
-				debug_assert_ne!(last_checkpoint_number, header.number());
-
-				// Catching up state, note that we don't really store block state for intermediary blocks,
-				// for speed.
-				let backfill_start = time::Instant::now();
-				trace!(target: "engine",
-						"Back-filling block state. last_checkpoint_number: {}, target: {}({}).",
-						last_checkpoint_number, header.number(), header.hash());
-
-				let mut chain = VecDeque::with_capacity((header.number() - last_checkpoint_number + 1) as usize);
-
-				// Put ourselves in.
-				chain.push_front(header.clone());
-
-				// populate chain to last checkpoint
-				loop {
-					let (last_parent_hash, last_num) = {
-						let l = chain.front().expect("chain has at least one element; qed");
-						(*l.parent_hash(), l.number())
-					};
-
-					if last_num == last_checkpoint_number + 1 {
-						break;
-					}
-					match c.block_header(BlockId::Hash(last_parent_hash)) {
-						None => {
-							return Err(BlockError::UnknownParent(last_parent_hash))?;
-						}
-						Some(next) => {
-							chain.push_front(next.decode()?);
-						}
-					}
-				}
-
-				// Get the state for last checkpoint.
-				let last_checkpoint_hash = *chain.front()
-					.expect("chain has at least one element; qed")
-					.parent_hash();
-
-				let last_checkpoint_header = match c.block_header(BlockId::Hash(last_checkpoint_hash)) {
-					None => return Err(EngineError::CliqueMissingCheckpoint(last_checkpoint_hash))?,
-					Some(header) => header.decode()?,
-				};
-
-				let last_checkpoint_state = match block_state_by_hash.get_mut(&last_checkpoint_hash) {
-					Some(state) => state.clone(),
-					None => self.new_checkpoint_state(&last_checkpoint_header)?,
-				};
-
-				block_state_by_hash.insert(last_checkpoint_header.hash(), last_checkpoint_state.clone());
-
-				// Backfill!
-				let mut new_state = last_checkpoint_state.clone();
-				for item in &chain {
-					new_state.apply(item, false)?;
-				}
-				new_state.calc_next_timestamp(header.timestamp(), self.period)?;
-				block_state_by_hash.insert(header.hash(), new_state.clone());
-
-				let elapsed = backfill_start.elapsed();
-				trace!(target: "engine", "Back-filling succeed, took {} ms.", elapsed.as_millis());
-				Ok(new_state)
-			}
-		}
-	}
-}
-
-impl Engine for Clique {
-	fn name(&self) -> &str { "Clique" }
-
-	fn machine(&self) -> &Machine { &self.machine }
-
-	// Clique use same fields, nonce + mixHash
-	fn seal_fields(&self, _header: &Header) -> usize { 2 }
-
-	fn extra_info(&self, header: &Header) -> BTreeMap<String, String> {
-		// clique engine seal fields are the same as ethash seal fields
-		match EthashSeal::parse_seal(header.seal()) {
-			Ok(seal) => map![
-				"nonce".to_owned() => format!("{:#x}", seal.nonce),
-				"mixHash".to_owned() => format!("{:#x}", seal.mix_hash)
-			],
-			_ => BTreeMap::default()
-		}
-	}
-
-	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 0 }
-
-	fn on_new_block(
-		&self,
-		_block: &mut ExecutedBlock,
-		_epoch_begin: bool,
-	) -> Result<(), Error> {
-		Ok(())
-	}
-
-	// Clique has no block reward.
-	fn on_close_block(
-		&self,
-		_block: &mut ExecutedBlock,
-		_parent_header: &Header
-	) -> Result<(), Error> {
-		Ok(())
-	}
-
-	fn on_seal_block(&self, block: &mut ExecutedBlock) -> Result<(), Error> {
-		trace!(target: "engine", "on_seal_block");
-
-		let header = &mut block.header;
-
-		let state = self.state_no_backfill(header.parent_hash())
-			.ok_or_else(|| BlockError::UnknownParent(*header.parent_hash()))?;
-
-		let is_checkpoint = header.number() % self.epoch_length == 0;
-
-		header.set_author(NULL_AUTHOR);
-
-		// Cast a random Vote if not checkpoint
-		if !is_checkpoint {
-			// TODO(niklasad1): this will always be false because `proposals` is never written to
-			let votes = self.proposals.read().iter()
-				.filter(|(address, vote_type)| state.is_valid_vote(*address, **vote_type))
-				.map(|(address, vote_type)| (*address, *vote_type))
-				.collect::<Vec<_>>();
-
-			if !votes.is_empty() {
-				// Pick a random vote.
-				let random_vote = rand::thread_rng().gen_range(0 as usize, votes.len());
-				let (beneficiary, vote_type) = votes[random_vote];
-
-				trace!(target: "engine", "Casting vote: beneficiary {}, type {:?} ", beneficiary, vote_type);
-
-				header.set_author(beneficiary);
-				header.set_seal(vote_type.as_rlp());
-			}
-		}
-
-		// Work on clique seal.
-
-		let mut seal: Vec<u8> = Vec::with_capacity(VANITY_LENGTH + SIGNATURE_LENGTH);
-
-		// At this point, extra_data should only contain miner vanity.
-		if header.extra_data().len() != VANITY_LENGTH {
-			Err(BlockError::ExtraDataOutOfBounds(OutOfBounds {
-				min: Some(VANITY_LENGTH),
-				max: Some(VANITY_LENGTH),
-				found: header.extra_data().len()
-			}))?;
-		}
-		// vanity
-		{
-			seal.extend_from_slice(&header.extra_data()[0..VANITY_LENGTH]);
-		}
-
-		// If we are building an checkpoint block, add all signers now.
-		if is_checkpoint {
-			seal.reserve(state.signers().len() * 20);
-			for signer in state.signers() {
-				seal.extend_from_slice(&signer[..]);
-			}
-		}
-
-		header.set_extra_data(seal.clone());
-
-		// append signature onto extra_data
-		let (sig, _msg) = self.sign_header(&header)?;
-		seal.extend_from_slice(&sig[..]);
-		header.set_extra_data(seal.clone());
-
-		header.compute_hash();
-
-		// locally sealed block don't go through valid_block_family(), so we have to record state here.
-		let mut new_state = state.clone();
-		new_state.apply(&header, is_checkpoint)?;
-		new_state.calc_next_timestamp(header.timestamp(), self.period)?;
-		self.block_state_by_hash.write().insert(header.hash(), new_state);
-
-		trace!(target: "engine", "on_seal_block: finished, final header: {:?}", header);
-
-		Ok(())
-	}
-
-	/// Clique doesn't require external work to seal, so we always return true here.
-	fn sealing_state(&self) -> SealingState {
-		SealingState::Ready
-	}
-
-	/// Returns if we are ready to seal, the real sealing (signing extra_data) is actually done in `on_seal_block()`.
-	fn generate_seal(&self, block: &ExecutedBlock, parent: &Header) -> Seal {
-		trace!(target: "engine", "tried to generate_seal");
-		let null_seal = util::null_seal();
-
-		if block.header.number() == 0 {
-			trace!(target: "engine", "attempted to seal genesis block");
-			return Seal::None;
-		}
-
-		// if sealing period is 0, and not an checkpoint block, refuse to seal
-		if self.period == 0 {
-			if block.transactions.is_empty() && block.header.number() % self.epoch_length != 0 {
-				return Seal::None;
-			}
-			return Seal::Regular(null_seal);
-		}
-
-		// Check we actually have authority to seal.
-		if let Some(author) = self.signer.read().as_ref().map(|x| x.address()) {
-
-			// ensure the voting state exists
-			match self.state(&parent) {
-				Err(e) => {
-					warn!(target: "engine", "generate_seal: can't get parent state(number: {}, hash: {}): {} ",
-						parent.number(), parent.hash(), e);
-					return Seal::None;
-				}
-				Ok(state) => {
-					// Are we authorized to seal?
-					if !state.is_authorized(&author) {
-						trace!(target: "engine", "generate_seal: Not authorized to sign right now.");
-						// wait for one third of period to try again.
-						thread::sleep(Duration::from_secs(self.period / 3 + 1));
-						return Seal::None;
-					}
-
-					let inturn = state.is_inturn(block.header.number(), &author);
-
-					let now = SystemTime::now();
-
-					let limit = match inturn {
-						true => state.next_timestamp_inturn.unwrap_or(now),
-						false => state.next_timestamp_noturn.unwrap_or(now),
-					};
-
-					// Wait for the right moment.
-					if now < limit {
-						trace!(target: "engine", "generate_seal: sleeping to sign: inturn: {}, now: {:?}, to: {:?}.",
-							inturn, now, limit);
-						match limit.duration_since(SystemTime::now()) {
-							Ok(duration) => {
-								thread::sleep(duration);
-							},
-							Err(e) => {
-								warn!(target:"engine", "generate_seal: unable to sleep, err: {}", e);
-								return Seal::None;
-							}
-						}
-					}
-
-					trace!(target: "engine", "generate_seal: seal ready for block {}, txs: {}.",
-						block.header.number(), block.transactions.len());
-					return Seal::Regular(null_seal);
-				}
-			}
-		}
-		Seal::None
-	}
-
-	fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> { Ok(()) }
-
-	fn verify_block_basic(&self, header: &Header) -> Result<(), Error> {
-		// Largely same as https://github.com/ethereum/go-ethereum/blob/master/consensus/clique/clique.go#L275
-
-		// Ignore genesis block.
-		if header.number() == 0 {
-			return Ok(());
-		}
-
-		// Don't waste time checking blocks from the future
-		{
-			let limit = CheckedSystemTime::checked_add(SystemTime::now(), Duration::from_secs(self.period))
-				.ok_or(BlockError::TimestampOverflow)?;
-
-			// This should succeed under the constraints that the system clock works
-			let limit_as_dur = limit.duration_since(UNIX_EPOCH).map_err(|e| {
-				Box::new(format!("Converting SystemTime to Duration failed: {}", e))
-			})?;
-
-			let hdr = Duration::from_secs(header.timestamp());
-			if hdr > limit_as_dur {
-				let found = CheckedSystemTime::checked_add(UNIX_EPOCH, hdr).ok_or(BlockError::TimestampOverflow)?;
-
-				Err(BlockError::TemporarilyInvalid(OutOfBounds {
-					min: None,
-					max: Some(limit),
-					found,
-				}.into()))?
-			}
-		}
-
-		let is_checkpoint = header.number() % self.epoch_length == 0;
-
-		if is_checkpoint && *header.author() != NULL_AUTHOR {
-			return Err(EngineError::CliqueWrongAuthorCheckpoint(Mismatch {
-				expected: H160::zero(),
-				found: *header.author(),
-			}))?;
-		}
-
-		let seal_fields = header.decode_seal::<Vec<_>>()?;
-		if seal_fields.len() != 2 {
-			Err(BlockError::InvalidSealArity(Mismatch {
-				expected: 2,
-				found: seal_fields.len(),
-			}))?
-		}
-
-		let mixhash = H256::from_slice(seal_fields[0]);
-		let nonce = H64::from_slice(seal_fields[1]);
-
-		// Nonce must be 0x00..0 or 0xff..f
-		if nonce != NONCE_DROP_VOTE && nonce != NONCE_AUTH_VOTE {
-			Err(EngineError::CliqueInvalidNonce(nonce))?;
-		}
-
-		if is_checkpoint && nonce != NULL_NONCE {
-			Err(EngineError::CliqueInvalidNonce(nonce))?;
-		}
-
-		// Ensure that the mix digest is zero as Clique don't have fork protection currently
-		if mixhash != NULL_MIXHASH {
-			Err(BlockError::MismatchedH256SealElement(Mismatch {
-				expected: NULL_MIXHASH,
-				found: mixhash,
-			}))?
-		}
-
-		let extra_data_len = header.extra_data().len();
-
-		if extra_data_len < VANITY_LENGTH {
-			Err(EngineError::CliqueMissingVanity)?
-		}
-
-		if extra_data_len < VANITY_LENGTH + SIGNATURE_LENGTH {
-			Err(EngineError::CliqueMissingSignature)?
-		}
-
-		let signers = extra_data_len - (VANITY_LENGTH + SIGNATURE_LENGTH);
-
-		// Checkpoint blocks must at least contain one signer
-		if is_checkpoint && signers == 0 {
-			Err(EngineError::CliqueCheckpointNoSigner)?
-		}
-
-		// Addresses must be be divisable by 20
-		if is_checkpoint && signers % ADDRESS_LENGTH != 0 {
-			Err(EngineError::CliqueCheckpointInvalidSigners(signers))?
-		}
-
-		// Ensure that the block doesn't contain any uncles which are meaningless in PoA
-		if *header.uncles_hash() != NULL_UNCLES_HASH {
-			Err(BlockError::InvalidUnclesHash(Mismatch {
-				expected: NULL_UNCLES_HASH,
-				found: *header.uncles_hash(),
-			}))?
-		}
-
-		// Ensure that the block's difficulty is meaningful (may not be correct at this point)
-		if *header.difficulty() != DIFF_INTURN && *header.difficulty() != DIFF_NOTURN {
-			Err(BlockError::DifficultyOutOfBounds(OutOfBounds {
-				min: Some(DIFF_NOTURN),
-				max: Some(DIFF_INTURN),
-				found: *header.difficulty(),
-			}))?
-		}
-
-		// All basic checks passed, continue to next phase
-		Ok(())
-	}
-
-	fn verify_block_unordered(&self, _header: &Header) -> Result<(), Error> {
-		// Nothing to check here.
-		Ok(())
-	}
-
-	/// Verify block family by looking up parent state (backfill if needed), then try to apply current header.
-	/// see https://github.com/ethereum/go-ethereum/blob/master/consensus/clique/clique.go#L338
-	fn verify_block_family(&self, header: &Header, parent: &Header) -> Result<(), Error> {
-		// Ignore genesis block.
-		if header.number() == 0 {
-			return Ok(());
-		}
-
-		// parent sanity check
-		if parent.hash() != *header.parent_hash() || header.number() != parent.number() + 1 {
-			Err(BlockError::UnknownParent(parent.hash()))?
-		}
-
-		// Ensure that the block's timestamp isn't too close to it's parent
-		let limit = parent.timestamp().saturating_add(self.period);
-		if limit > header.timestamp() {
-			let max = CheckedSystemTime::checked_add(UNIX_EPOCH, Duration::from_secs(header.timestamp()));
-			let found = CheckedSystemTime::checked_add(UNIX_EPOCH, Duration::from_secs(limit))
-				.ok_or(BlockError::TimestampOverflow)?;
-
-			Err(BlockError::InvalidTimestamp(OutOfBounds {
-				min: None,
-				max,
-				found,
-			}.into()))?
-		}
-
-		// Retrieve the parent state
-		let parent_state = self.state(&parent)?;
-		// Try to apply current state, apply() will further check signer and recent signer.
-		let mut new_state = parent_state.clone();
-		new_state.apply(header, header.number() % self.epoch_length == 0)?;
-		new_state.calc_next_timestamp(header.timestamp(), self.period)?;
-		self.block_state_by_hash.write().insert(header.hash(), new_state);
-
-		Ok(())
-	}
-
-	fn genesis_epoch_data(&self, header: &Header, _call: &Call) -> Result<Vec<u8>, String> {
-		let mut state = self.new_checkpoint_state(header).expect("Unable to parse genesis data.");
-		state.calc_next_timestamp(header.timestamp(), self.period).map_err(|e| format!("{}", e))?;
-		self.block_state_by_hash.write().insert(header.hash(), state);
-
-		// no proof.
-		Ok(Vec::new())
-	}
-
-	// Our task here is to set difficulty
-	fn populate_from_parent(&self, header: &mut Header, parent: &Header) {
-		// TODO(https://github.com/paritytech/parity-ethereum/issues/10410): this is a horrible hack,
-		// it is due to the fact that enact and miner both use OpenBlock::new() which will both call
-		// this function. more refactoring is definitely needed.
-		if header.extra_data().len() < VANITY_LENGTH + SIGNATURE_LENGTH {
-			trace!(target: "engine", "populate_from_parent in sealing");
-
-			// It's unclear how to prevent creating new blocks unless we are authorized, the best way (and geth does this too)
-			// it's just to ignore setting a correct difficulty here, we will check authorization in next step in generate_seal anyway.
-			if let Some(signer) = self.signer.read().as_ref() {
-				let state = match self.state(&parent) {
-					Err(e) => {
-						trace!(target: "engine", "populate_from_parent: Unable to find parent state: {}, ignored.", e);
-						return;
-					}
-					Ok(state) => state,
-				};
-
-				if state.is_authorized(&signer.address()) {
-					if state.is_inturn(header.number(), &signer.address()) {
-						header.set_difficulty(DIFF_INTURN);
-					} else {
-						header.set_difficulty(DIFF_NOTURN);
-					}
-				}
-
-				let zero_padding_len = VANITY_LENGTH.saturating_sub(header.extra_data().len());
-				if zero_padding_len > 0 {
-					let mut resized_extra_data = header.extra_data().clone();
-					resized_extra_data.resize(VANITY_LENGTH, 0);
-					header.set_extra_data(resized_extra_data);
-				}
-			} else {
-				trace!(target: "engine", "populate_from_parent: no signer registered");
-			}
-		}
-	}
-
-	fn set_signer(&self, signer: Option<Box<dyn EngineSigner>>) {
-		let mut current_signer = self.signer.write();
-		if let Some(signer) = signer.as_ref() {
-			trace!(target: "engine", "set_signer: {:?}", signer.address());
-		} else if let Some(signer) = &*current_signer {
-			trace!(target: "engine", "set_signer: cleared; previous signer: {:?})", signer.address());
-		}
-		*current_signer = signer;
-	}
-
-	fn register_client(&self, client: Weak<dyn EngineClient>) {
-		*self.client.write() = Some(client.clone());
-	}
-
-	fn step(&self) {
-		if self.signer.read().is_some() {
-			if let Some(ref weak) = *self.client.read() {
-				if let Some(c) = weak.upgrade() {
-					c.update_sealing(ForceUpdateSealing::No);
-				}
-			}
-		}
-	}
-
-	/// Clique timestamp is set to parent + period , or current time which ever is higher.
-	fn open_block_header_timestamp(&self, parent_timestamp: u64) -> u64 {
-		let now = time::SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap_or_default();
-		cmp::max(now.as_secs() as u64, parent_timestamp.saturating_add(self.period))
-	}
-
-	fn is_timestamp_valid(&self, header_timestamp: u64, parent_timestamp: u64) -> bool {
-		header_timestamp >= parent_timestamp.saturating_add(self.period)
-	}
-
-	// Clique uses the author field for voting, the real author is hidden in the `extra_data` field.
-	// So when executing tx's (like in `enact()`) we want to use the executive author
-	fn executive_author(&self, header: &Header) -> Result<Address, Error> {
-		recover_creator(header)
-	}
-
-	fn params(&self) -> &CommonParams {
-		self.machine.params()
-	}
-}
--- a/ethcore/engines/clique/src/params.rs
+++ b/ethcore/engines/clique/src/params.rs
@@ -1,41 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Clique specific parameters.
-
-use ethjson;
-
-/// `Clique` params.
-pub struct CliqueParams {
-	/// Period as defined in EIP
-	pub period: u64,
-	/// Epoch length as defined in EIP
-	pub epoch: u64,
-}
-
-impl From<ethjson::spec::CliqueParams> for CliqueParams {
-	fn from(p: ethjson::spec::CliqueParams) -> Self {
-		let period = p.period.map_or_else(|| 30000 as u64, Into::into);
-		let epoch =  p.epoch.map_or_else(|| 15 as u64, Into::into);
-
-		assert!(epoch > 0);
-
-		CliqueParams {
-			period,
-			epoch,
-		}
-	}
-}
--- a/ethcore/engines/clique/src/tests.rs
+++ b/ethcore/engines/clique/src/tests.rs
@@ -1,806 +0,0 @@
-// Copyright 2015-2020 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/>.
-
-//! Consensus tests for `PoA Clique Engine`, see http://eips.ethereum.org/EIPS/eip-225 for more information
-
-use std::sync::Arc;
-use std::collections::HashMap;
-
-use common_types::errors::{EthcoreError as Error, EngineError};
-use ethcore::{
-	block::*,
-	test_helpers::get_temp_state_db,
-};
-use engine::Engine;
-use ethereum_types::{Address, H256};
-use parity_crypto::publickey::{Secret, KeyPair};
-use state_db::StateDB;
-
-use super::*;
-
-/// Possible signers
-pub const SIGNER_TAGS: [char; 6] = ['A', 'B', 'C', 'D', 'E', 'F'];
-
-/// Clique block types
-pub enum CliqueBlockType {
-	/// Epoch transition block must contain list of signers
-	Checkpoint,
-	/// Block with no votes
-	Empty,
-	/// Vote
-	Vote(VoteType),
-}
-
-/// Clique tester
-pub struct CliqueTester {
-	/// Mocked Clique
-	pub clique: Clique,
-	/// Mocked genesis state
-	pub genesis: Header,
-	/// StateDB
-	pub db: StateDB,
-	/// List of signers
-	pub signers: HashMap<char, KeyPair>,
-}
-
-impl CliqueTester {
-	/// Create a `Clique` tester with settings
-	pub fn with(epoch: u64, period: u64, initial_signers: Vec<char>) -> Self {
-		assert_eq!(initial_signers.iter().all(|s| SIGNER_TAGS.contains(s)), true,
-				   "Not all the initial signers is in SIGNER_TAGS, possible keys are 'A' ..= 'F'");
-
-		let clique = Clique::with_test(epoch, period);
-		let mut genesis = Header::default();
-		let mut signers = HashMap::new();
-
-		let call = |_a, _b| {
-			unimplemented!("Clique doesn't use Engine::Call");
-		};
-
-		let mut extra_data = vec![0; VANITY_LENGTH];
-
-		for &signer in SIGNER_TAGS.iter() {
-			let secret = Secret::from(H256::from_low_u64_be(signer as u64));
-			let keypair = KeyPair::from_secret(secret).unwrap();
-			if initial_signers.contains(&signer) {
-				extra_data.extend(keypair.address().as_bytes());
-			}
-			signers.insert(signer, keypair);
-		}
-
-		// append dummy signature
-		extra_data.extend(std::iter::repeat(0).take(SIGNATURE_LENGTH));
-
-		genesis.set_extra_data(extra_data);
-		genesis.set_gas_limit(U256::from(0xa00000));
-		genesis.set_difficulty(U256::from(1));
-		genesis.set_seal(util::null_seal());
-
-		clique.genesis_epoch_data(&genesis, &call).expect("Create genesis failed");
-		Self {clique, genesis, db: get_temp_state_db(), signers}
-	}
-
-	/// Get difficulty for a given block
-	pub fn get_difficulty(&self, block_num: BlockNumber, header: &Header, signer: &Address) -> U256 {
-		let state = self.clique.state(header).unwrap();
-		if state.is_inturn(block_num, signer) {
-			DIFF_INTURN
-		} else {
-			DIFF_NOTURN
-		}
-	}
-
-	/// Get the state of a given block
-	// Note, this will read the cache and `will` not work with more than 128 blocks
-	pub fn get_state_at_block(&self, hash: &H256) -> CliqueBlockState {
-		self.clique.block_state_by_hash.write()
-			.get_mut(hash)
-			.expect("CliqueBlockState not found tested failed")
-			.clone()
-	}
-
-	/// Get signers after a certain state
-	// This is generally used to fetch the state after a test has been executed and checked against
-	// the initial list of signers provided in the test
-	pub fn clique_signers(&self, hash: &H256) -> impl Iterator<Item = Address> {
-		self.get_state_at_block(hash).signers().clone().into_iter()
-	}
-
-	/// Fetches all addresses at current `block` and converts them back to `tags (char)` and sorts them
-	/// Addresses are supposed sorted based on address but these tests are using `tags` just for simplicity
-	/// and the order is not important!
-	pub fn into_tags<T: Iterator<Item = Address>>(&self, addr: T) -> Vec<char> {
-		let mut tags: Vec<char> = addr.filter_map(|addr| {
-			for (t, kp) in self.signers.iter() {
-				if addr == kp.address() {
-					return Some(*t)
-				}
-			}
-			None
-		})
-		.collect();
-
-		tags.sort();
-		tags
-	}
-
-	/// Create a new `Clique` block and import
-	pub fn new_block_and_import(
-		&self,
-		block_type: CliqueBlockType,
-		last_header: &Header,
-		beneficary: Option<Address>,
-		signer: char,
-		) -> Result<Header, Error> {
-
-		let mut extra_data = vec![0; VANITY_LENGTH];
-		let mut seal = util::null_seal();
-		let last_hash = last_header.hash();
-
-		match block_type {
-			CliqueBlockType::Checkpoint => {
-				let signers = self.clique.state(&last_header).unwrap().signers().clone();
-				for signer in signers {
-					extra_data.extend(signer.as_bytes());
-				}
-			}
-			CliqueBlockType::Vote(v) => seal = v.as_rlp(),
-			CliqueBlockType::Empty => (),
-		};
-
-		let db = self.db.boxed_clone();
-
-		let mut block = OpenBlock::new(
-			&self.clique,
-			Default::default(),
-			false,
-			db,
-			&last_header.clone(),
-			Arc::new(vec![last_hash]),
-			beneficary.unwrap_or_default(),
-			(3141562.into(), 31415620.into()),
-			extra_data,
-			false,
-		).unwrap();
-
-		{
-			let difficulty = self.get_difficulty(block.header.number(), last_header, &self.signers[&signer].address());
-			let b = block.block_mut();
-			b.header.set_timestamp(last_header.timestamp() + self.clique.period);
-			b.header.set_difficulty(difficulty);
-			b.header.set_seal(seal);
-
-			let sign = parity_crypto::publickey::sign(self.signers[&signer].secret(), &b.header.hash()).unwrap();
-			let mut extra_data = b.header.extra_data().clone();
-			extra_data.extend_from_slice(&*sign);
-			b.header.set_extra_data(extra_data);
-		}
-
-		let current_header = &block.header;
-		self.clique.verify_block_basic(current_header)?;
-		self.clique.verify_block_family(current_header, &last_header)?;
-
-		Ok(current_header.clone())
-	}
-}
-
-#[test]
-fn one_signer_with_no_votes() {
-	let tester = CliqueTester::with(10, 1, vec!['A']);
-
-	let empty_block = tester.new_block_and_import(CliqueBlockType::Empty, &tester.genesis, None, 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&empty_block.hash()));
-	assert_eq!(&tags, &['A']);
-}
-
-#[test]
-fn one_signer_two_votes() {
-	let tester = CliqueTester::with(10, 1, vec!['A']);
-
-	// Add a vote for `B` signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &tester.genesis,
-										   Some(tester.signers[&'B'].address()), 'A').unwrap();
-	let tags = tester.into_tags(tester.clique_signers(&vote.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-
-	// Add a empty block signed by `B`
-	let empty = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'B').unwrap();
-
-	// Add vote for `C` signed by A but should not be accepted
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &empty,
-										   Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&vote.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn two_signers_six_votes_deny_last() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B']);
-
-	let mut prev_header = tester.genesis.clone();
-
-	// Add two votes for `C` signed by `A` and `B`
-	for &signer in SIGNER_TAGS.iter().take(2) {
-		let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &prev_header,
-											   Some(tester.signers[&'C'].address()), signer).unwrap();
-		prev_header = vote.clone();
-	}
-
-	// Add two votes for `D` signed by `A` and `B`
-	for &signer in SIGNER_TAGS.iter().take(2) {
-		let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &prev_header,
-											   Some(tester.signers[&'D'].address()), signer).unwrap();
-		prev_header = vote.clone();
-	}
-
-	// Add a empty block signed by `C`
-	let empty = tester.new_block_and_import(CliqueBlockType::Empty, &prev_header, None, 'C').unwrap();
-	prev_header = empty.clone();
-
-	// Add two votes for `E` signed by `A` and `B`
-	for &signer in SIGNER_TAGS.iter().take(2) {
-		let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &prev_header,
-											   Some(tester.signers[&'E'].address()), signer).unwrap();
-		prev_header = vote.clone();
-	}
-
-	let tags = tester.into_tags(tester.clique_signers(&prev_header.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C', 'D']);
-}
-
-#[test]
-fn one_signer_dropping_itself() {
-	let tester = CliqueTester::with(10, 1, vec!['A']);
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-										   Some(tester.signers[&'A'].address()), 'A').unwrap();
-	let signers = tester.clique_signers(&vote.hash());
-	assert!(signers.count() == 0);
-}
-
-#[test]
-fn two_signers_one_remove_vote_no_consensus() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B']);
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-										   Some(tester.signers[&'B'].address()), 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&vote.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn two_signers_consensus_remove_b() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B']);
-	let first_vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-												 Some(tester.signers[&'B'].address()), 'A').unwrap();
-	let second_vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &first_vote,
-												 Some(tester.signers[&'B'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&second_vote.hash()));
-	assert_eq!(&tags, &['A']);
-}
-
-#[test]
-fn three_signers_consensus_remove_c() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B', 'C']);
-	let first_vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-												 Some(tester.signers[&'C'].address()), 'A').unwrap();
-	let second_vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &first_vote,
-												 Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&second_vote.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn four_signers_half_no_consensus() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B', 'C', 'D']);
-	let first_vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-												 Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	let second_vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &first_vote,
-												  Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&second_vote.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C', 'D']);
-}
-
-#[test]
-fn four_signers_three_consensus_rm() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B', 'C', 'D']);
-
-	let mut prev_header = tester.genesis.clone();
-
-	// Three votes to remove `D` signed by ['A', 'B', 'C']
-	for signer in SIGNER_TAGS.iter().take(3) {
-		let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &prev_header,
-											   Some(tester.signers[&'D'].address()), *signer).unwrap();
-		prev_header = vote.clone();
-	}
-
-	let tags = tester.into_tags(tester.clique_signers(&prev_header.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C']);
-}
-
-#[test]
-fn vote_add_only_counted_once_per_signer() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B']);
-
-	// Add a vote for `C` signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &tester.genesis,
-										   Some(tester.signers[&'C'].address()), 'A').unwrap();
-	// Empty block signed by B`
-	let empty = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'B').unwrap();
-
-	// Add a vote for `C` signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &empty,
-										   Some(tester.signers[&'C'].address()), 'A').unwrap();
-	// Empty block signed by `B`
-	let empty = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'B').unwrap();
-
-	// Add a vote for `C` signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &empty,
-										   Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&vote.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn vote_add_concurrently_is_permitted() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B']);
-
-	// Add a vote for `C` signed by `A`
-	let b = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &tester.genesis,
-										   Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let b = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'B').unwrap();
-
-	// Add a vote for `D` signed by `A`
-	let b = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &b,
-										   Some(tester.signers[&'D'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let b = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'B').unwrap();
-
-	// Empty block signed by `A`
-	let b = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'A').unwrap();
-
-	// Add a vote for `D` signed by `B`
-	let b = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &b,
-										   Some(tester.signers[&'D'].address()), 'B').unwrap();
-
-	// Empty block signed by `A`
-	let b = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'A').unwrap();
-
-	// Add a vote for `C` signed by `B`
-	let b = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &b,
-										   Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&b.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C', 'D']);
-}
-
-#[test]
-fn vote_rm_only_counted_once_per_signer() {
-	let tester = CliqueTester::with(10, 1, vec!['A', 'B']);
-
-	let mut prev_header = tester.genesis.clone();
-
-	for _ in 0..2 {
-		// Vote to remove `B` signed by `A`
-		let b = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &prev_header,
-											   Some(tester.signers[&'B'].address()), 'A').unwrap();
-		// Empty block signed by `B`
-		let b = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'B').unwrap();
-
-		prev_header = b.clone();
-	}
-
-	// Add a vote for `B` signed by `A`
-	let b = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &prev_header,
-										   Some(tester.signers[&'B'].address()), 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&b.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn vote_rm_concurrently_is_permitted() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C', 'D']);
-
-	// Add a vote for `C` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Add a vote for `D` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-
-	// Add a vote for `D` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'B').unwrap();
-	// Add a vote for `D` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'C').unwrap();
-
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-	// Add a vote for `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn vote_to_rm_are_immediate_and_ensure_votes_are_rm() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C']);
-
-	// Vote to remove `B` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-											Some(tester.signers[&'B'].address()), 'C').unwrap();
-	// Vote to remove `C` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-	// Vote to remove `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-	// Vote to remove `B` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'B'].address()), 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn vote_to_rm_are_immediate_and_votes_should_be_dropped_from_kicked_signer() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C']);
-
-	// Vote to add `D` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &tester.genesis,
-											Some(tester.signers[&'D'].address()), 'C').unwrap();
-	// Vote to remove `C` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	// Vote to remove `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	// Vote to add `D` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &block,
-											Some(tester.signers[&'D'].address()), 'A').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn cascading_not_allowed() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C', 'D']);
-
-	// Vote against `C` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Vote against `D` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'A').unwrap();
-
-	// Vote against `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-
-	// Vote against `D` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'B').unwrap();
-
-	// Vote against `D` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'C').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C']);
-}
-
-#[test]
-fn consensus_out_of_bounds_consensus_execute_on_touch() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C', 'D']);
-
-	// Vote against `C` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Vote against `D` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'A').unwrap();
-
-	// Vote against `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-
-	// Vote against `D` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'B').unwrap();
-
-	// Vote against `D` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'C').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C'], "D should have been removed after 3/4 remove votes");
-
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-
-	// Vote for `C` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &block,
-											Some(tester.signers[&'C'].address()), 'C').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B']);
-}
-
-#[test]
-fn consensus_out_of_bounds_first_touch() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C', 'D']);
-
-	// Vote against `C` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &tester.genesis,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	// Empty block signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Vote against `D` signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'A').unwrap();
-
-	// Vote against `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	// Empty block signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'C').unwrap();
-
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-
-	// Vote against `D` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'B').unwrap();
-
-	// Vote against `D` signed by `C`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &block,
-											Some(tester.signers[&'D'].address()), 'C').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C']);
-
-	// Empty block signed by `A`
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap();
-
-	// Vote for `C` signed by `B`
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C']);
-}
-
-#[test]
-fn pending_votes_doesnt_survive_authorization_changes() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C', 'D', 'E']);
-
-	let mut prev_header = tester.genesis.clone();
-
-	// Vote for `F` from [`A`, `B`, `C`]
-	for sign in SIGNER_TAGS.iter().take(3) {
-		let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &prev_header,
-												Some(tester.signers[&'F'].address()), *sign).unwrap();
-		prev_header = block.clone();
-	}
-
-	let tags = tester.into_tags(tester.clique_signers(&prev_header.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C', 'D', 'E', 'F'], "F should have been added");
-
-	// Vote against `F` from [`D`, `E`, `B`, `C`]
-	for sign in SIGNER_TAGS.iter().skip(3).chain(SIGNER_TAGS.iter().skip(1).take(2)) {
-		let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &prev_header,
-												Some(tester.signers[&'F'].address()), *sign).unwrap();
-		prev_header = block.clone();
-	}
-
-	let tags = tester.into_tags(tester.clique_signers(&prev_header.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C', 'D', 'E'], "F should have been removed");
-
-	// Vote for `F` from [`D`, `E`]
-	for sign in SIGNER_TAGS.iter().skip(3).take(2) {
-		let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &prev_header,
-												Some(tester.signers[&'F'].address()), *sign).unwrap();
-		prev_header = block.clone();
-	}
-
-	// Vote against `A` from [`B`, `C`, `D`]
-	for sign in SIGNER_TAGS.iter().skip(1).take(3) {
-		let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Remove), &prev_header,
-												Some(tester.signers[&'A'].address()), *sign).unwrap();
-		prev_header = block.clone();
-	}
-
-	let tags = tester.into_tags(tester.clique_signers(&prev_header.hash()));
-	assert_eq!(&tags, &['B', 'C', 'D', 'E'], "A should have been removed");
-
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &prev_header,
-											Some(tester.signers[&'F'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['B', 'C', 'D', 'E', 'F'], "F should have been added again");
-}
-
-#[test]
-fn epoch_transition_reset_all_votes() {
-	let tester = CliqueTester::with(3, 1, vec!['A', 'B']);
-
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &tester.genesis,
-											Some(tester.signers[&'C'].address()), 'A').unwrap();
-
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-	let block = tester.new_block_and_import(CliqueBlockType::Checkpoint, &block, None, 'A').unwrap();
-
-	let block = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &block,
-											Some(tester.signers[&'C'].address()), 'B').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&block.hash()));
-	assert_eq!(&tags, &['A', 'B'], "Votes should have been reset after checkpoint");
-}
-
-#[test]
-fn unauthorized_signer_should_not_be_able_to_sign_block() {
-	let tester = CliqueTester::with(3, 1, vec!['A']);
-	let err = tester.new_block_and_import(CliqueBlockType::Empty, &tester.genesis, None, 'B').unwrap_err();
-
-	match err {
-		Error::Engine(EngineError::NotAuthorized(_)) => (),
-		_ => assert!(true == false, "Wrong error kind"),
-	}
-}
-
-#[test]
-fn signer_should_not_be_able_to_sign_two_consequtive_blocks() {
-	let tester = CliqueTester::with(3, 1, vec!['A', 'B']);
-	let b = tester.new_block_and_import(CliqueBlockType::Empty, &tester.genesis, None, 'A').unwrap();
-	let err = tester.new_block_and_import(CliqueBlockType::Empty, &b, None, 'A').unwrap_err();
-
-	match err {
-		Error::Engine(EngineError::CliqueTooRecentlySigned(_)) => (),
-		_ => assert!(true == false, "Wrong error kind"),
-	}
-}
-
-
-#[test]
-fn recent_signers_should_not_reset_on_checkpoint() {
-	let tester = CliqueTester::with(3, 1, vec!['A', 'B', 'C']);
-
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &tester.genesis, None, 'A').unwrap();
-	let block = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'B').unwrap();
-	let block = tester.new_block_and_import(CliqueBlockType::Checkpoint, &block, None, 'A').unwrap();
-
-	let err = tester.new_block_and_import(CliqueBlockType::Empty, &block, None, 'A').unwrap_err();
-
-	match err {
-		Error::Engine(EngineError::CliqueTooRecentlySigned(_)) => (),
-		_ => assert!(true == false, "Wrong error kind"),
-	}
-}
-
-// Not part of http://eips.ethereum.org/EIPS/eip-225
-#[test]
-fn bonus_consensus_should_keep_track_of_votes_before_latest_per_signer() {
-	let tester = CliqueTester::with(100, 1, vec!['A', 'B', 'C', 'D']);
-
-	// Add a vote for `E` signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &tester.genesis,
-										   Some(tester.signers[&'E'].address()), 'A').unwrap();
-	// Empty block signed by `B`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'B').unwrap();
-
-	// Empty block signed by `C`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'C').unwrap();
-
-	// Empty block signed by `D`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'D').unwrap();
-
-	// Add a vote for `F` signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &vote,
-										   Some(tester.signers[&'F'].address()), 'A').unwrap();
-	// Empty block signed by `C`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'C').unwrap();
-
-	// Empty block signed by `D`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'D').unwrap();
-
-	// Add a vote for `E` signed by `B`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &vote,
-										   Some(tester.signers[&'E'].address()), 'B').unwrap();
-	// Empty block signed by `A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'A').unwrap();
-
-	// Empty block signed by `C`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'C').unwrap();
-
-	// Empty block signed by `D`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'D').unwrap();
-
-	// Add a vote for `F` signed by `B`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &vote,
-										   Some(tester.signers[&'F'].address()), 'B').unwrap();
-
-	// Empty block signed by A`
-	let vote = tester.new_block_and_import(CliqueBlockType::Empty, &vote, None, 'A').unwrap();
-
-	// Add a vote for `E` signed by `C`
-	let vote = tester.new_block_and_import(CliqueBlockType::Vote(VoteType::Add), &vote,
-										   Some(tester.signers[&'E'].address()), 'C').unwrap();
-
-	let tags = tester.into_tags(tester.clique_signers(&vote.hash()));
-	assert_eq!(&tags, &['A', 'B', 'C', 'D', 'E']);
-}
--- a/ethcore/engines/clique/src/util.rs
+++ b/ethcore/engines/clique/src/util.rs
@@ -1,117 +0,0 @@
-// Copyright 2015-2020 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 std::collections::BTreeSet;
-
-use common_types::{
-	header::Header,
-	errors::{EthcoreError as Error, EngineError},
-};
-use ethereum_types::{Address, H256};
-use parity_crypto::publickey::{public_to_address, recover as ec_recover, Signature};
-use lazy_static::lazy_static;
-use lru_cache::LruCache;
-use parking_lot::RwLock;
-use rlp::encode;
-use crate::{ADDRESS_LENGTH, SIGNATURE_LENGTH, VANITY_LENGTH, NULL_NONCE, NULL_MIXHASH};
-
-/// How many recovered signature to cache in the memory.
-pub const CREATOR_CACHE_NUM: usize = 4096;
-lazy_static! {
-	/// key: header hash
-	/// value: creator address
-	static ref CREATOR_BY_HASH: RwLock<LruCache<H256, Address>> = RwLock::new(LruCache::new(CREATOR_CACHE_NUM));
-}
-
-/// Recover block creator from signature
-pub fn recover_creator(header: &Header) -> Result<Address, Error> {
-	// Initialization
-	let mut cache = CREATOR_BY_HASH.write();
-
-	if let Some(creator) = cache.get_mut(&header.hash()) {
-		return Ok(*creator);
-	}
-
-	let data = header.extra_data();
-	if data.len() < VANITY_LENGTH {
-		Err(EngineError::CliqueMissingVanity)?
-	}
-
-	if data.len() < VANITY_LENGTH + SIGNATURE_LENGTH {
-		Err(EngineError::CliqueMissingSignature)?
-	}
-
-	// Split `signed_extra data` and `signature`
-	let (signed_data_slice, signature_slice) = data.split_at(data.len() - SIGNATURE_LENGTH);
-
-	// convert `&[u8]` to `[u8; 65]`
-	let signature = {
-		let mut s = [0; SIGNATURE_LENGTH];
-		s.copy_from_slice(signature_slice);
-		s
-	};
-
-	// modify header and hash it
-	let unsigned_header = &mut header.clone();
-	unsigned_header.set_extra_data(signed_data_slice.to_vec());
-	let msg = unsigned_header.hash();
-
-	let pubkey = ec_recover(&Signature::from(signature), &msg)?;
-	let creator = public_to_address(&pubkey);
-
-	cache.insert(header.hash(), creator.clone());
-	Ok(creator)
-}
-
-/// Extract signer list from extra_data.
-///
-/// Layout of extra_data:
-/// ----
-/// VANITY: 32 bytes
-/// Signers: N * 32 bytes as hex encoded (20 characters)
-/// Signature: 65 bytes
-/// --
-pub fn extract_signers(header: &Header) -> Result<BTreeSet<Address>, Error> {
-	let data = header.extra_data();
-
-	if data.len() <= VANITY_LENGTH + SIGNATURE_LENGTH {
-		Err(EngineError::CliqueCheckpointNoSigner)?
-	}
-
-	// extract only the portion of extra_data which includes the signer list
-	let signers_raw = &data[(VANITY_LENGTH)..data.len() - (SIGNATURE_LENGTH)];
-
-	if signers_raw.len() % ADDRESS_LENGTH != 0 {
-		Err(EngineError::CliqueCheckpointInvalidSigners(signers_raw.len()))?
-	}
-
-	let num_signers = signers_raw.len() / 20;
-
-	let signers: BTreeSet<Address> = (0..num_signers)
-		.map(|i| {
-			let start = i * ADDRESS_LENGTH;
-			let end = start + ADDRESS_LENGTH;
-			Address::from_slice(&signers_raw[start..end])
-		})
-		.collect();
-
-	Ok(signers)
-}
-
-/// Retrieve `null_seal`
-pub fn null_seal() -> Vec<Vec<u8>> {
-	vec![encode(&NULL_MIXHASH.as_bytes().to_vec()), encode(&NULL_NONCE.as_bytes().to_vec())]
-}
--- a/ethcore/engines/ethash/Cargo.toml
+++ b/ethcore/engines/ethash/Cargo.toml
@@ -1,27 +0,0 @@
-[package]
-description = "Ethash PoW blockchain engine"
-name = "ethash-engine"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-block-reward = { path = "../../block-reward" }
-common-types = { path = "../../types" }
-engine = { path = "../../engine" }
-ethash= { path = "../../../ethash" }
-ethereum-types = "0.8.0"
-ethjson = { path = "../../../json" }
-keccak-hash = "0.4.0"
-log = "0.4.8"
-machine = { path = "../../machine" }
-macros = { path = "../../../util/macros" }
-unexpected = { path = "../../../util/unexpected" }
-
-[dev-dependencies]
-ethcore = { path = "../..", features = ["test-helpers"] }
-keccak-hash = "0.4.0"
-rlp = "0.4.2"
-spec = { path = "../../spec" }
-tempdir = "0.3"
--- a/ethcore/engines/instant-seal/Cargo.toml
+++ b/ethcore/engines/instant-seal/Cargo.toml
@@ -1,22 +0,0 @@
-[package]
-description = "Engine that seals instantly"
-name = "instant-seal"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-client-traits = { path = "../../client-traits" }
-common-types = { path = "../../types" }
-engine = { path = "../../engine" }
-ethjson = { path = "../../../json" }
-ethereum-types = "0.8.0"
-keccak-hash = "0.4.0"
-machine = { path = "../../machine" }
-trace = { path = "../../trace" }
-
-[dev-dependencies]
-ethcore = { path = "../..", features = ["test-helpers"] }
-spec = { path = "../../spec" }
-rlp = "0.4.2"
--- a/ethcore/engines/instant-seal/src/lib.rs
+++ b/ethcore/engines/instant-seal/src/lib.rs
@@ -1,165 +0,0 @@
-// Copyright 2015-2020 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 std::sync::atomic::{AtomicU64, Ordering};
-
-use common_types::{
-	header::Header,
-	engines::{
-		Seal,
-		SealingState,
-		params::CommonParams,
-	},
-	errors::EthcoreError as Error,
-};
-use engine::Engine;
-use ethjson;
-use machine::{
-	ExecutedBlock,
-	Machine
-};
-
-
-/// `InstantSeal` params.
-#[derive(Default, Debug, PartialEq)]
-pub struct InstantSealParams {
-	/// Whether to use millisecond timestamp
-	pub millisecond_timestamp: bool,
-}
-
-impl From<ethjson::spec::InstantSealParams> for InstantSealParams {
-	fn from(p: ethjson::spec::InstantSealParams) -> Self {
-		InstantSealParams {
-			millisecond_timestamp: p.millisecond_timestamp,
-		}
-	}
-}
-
-/// An engine which does not provide any consensus mechanism, just seals blocks internally.
-/// Only seals blocks which have transactions.
-pub struct InstantSeal {
-	params: InstantSealParams,
-	machine: Machine,
-	last_sealed_block: AtomicU64,
-}
-
-impl InstantSeal {
-	/// Returns new instance of InstantSeal over the given state machine.
-	pub fn new(params: InstantSealParams, machine: Machine) -> Self {
-		InstantSeal {
-			params,
-			machine,
-			last_sealed_block: AtomicU64::new(0),
-		}
-	}
-}
-
-impl Engine for InstantSeal {
-	fn name(&self) -> &str { "InstantSeal" }
-
-	fn machine(&self) -> &Machine { &self.machine }
-
-	fn sealing_state(&self) -> SealingState { SealingState::Ready }
-
-	fn should_reseal_on_update(&self) -> bool {
-		// We would like for the miner to `update_sealing` if there are local_pending_transactions
-		// in the pool to prevent transactions sent in parallel from stalling in the transaction
-		// pool. (see #9660)
-		true
-	}
-
-	fn generate_seal(&self, block: &ExecutedBlock, _parent: &Header) -> Seal {
-		if !block.transactions.is_empty() {
-			let block_number = block.header.number();
-			let last_sealed_block = self.last_sealed_block.load(Ordering::SeqCst);
-			// Return a regular seal if the given block is _higher_ than
-			// the last sealed one
-			if block_number > last_sealed_block {
-				let prev_last_sealed_block = self.last_sealed_block.compare_and_swap(last_sealed_block, block_number, Ordering::SeqCst);
-				if prev_last_sealed_block == last_sealed_block {
-					return Seal::Regular(Vec::new())
-				}
-			}
-		}
-		Seal::None
-	}
-
-	fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> {
-		Ok(())
-	}
-
-	fn open_block_header_timestamp(&self, parent_timestamp: u64) -> u64 {
-		use std::{time, cmp};
-
-		let dur = time::SystemTime::now().duration_since(time::UNIX_EPOCH).unwrap_or_default();
-		let mut now = dur.as_secs();
-		if self.params.millisecond_timestamp {
-			now = now * 1000 + dur.subsec_millis() as u64;
-		}
-		cmp::max(now, parent_timestamp)
-	}
-
-	fn is_timestamp_valid(&self, header_timestamp: u64, parent_timestamp: u64) -> bool {
-		header_timestamp >= parent_timestamp
-	}
-
-	fn params(&self) -> &CommonParams {
-		self.machine.params()
-	}
-
-}
-
-
-#[cfg(test)]
-mod tests {
-	use std::sync::Arc;
-	use common_types::{
-		header::Header,
-		engines::Seal,
-	};
-	use ethereum_types::{H520, Address};
-	use ethcore::{
-		test_helpers::get_temp_state_db,
-		block::*,
-	};
-	use spec;
-
-	#[test]
-	fn instant_can_seal() {
-		let spec = spec::new_instant();
-		let engine = &*spec.engine;
-		let db = spec.ensure_db_good(get_temp_state_db(), &Default::default()).unwrap();
-		let genesis_header = spec.genesis_header();
-		let last_hashes = Arc::new(vec![genesis_header.hash()]);
-		let b = OpenBlock::new(engine, Default::default(), false, db, &genesis_header, last_hashes, Address::zero(), (3141562.into(), 31415620.into()), vec![], false).unwrap();
-		let b = b.close_and_lock().unwrap();
-		if let Seal::Regular(seal) = engine.generate_seal(&b, &genesis_header) {
-			assert!(b.try_seal(engine, seal).is_ok());
-		}
-	}
-
-	#[test]
-	fn instant_cant_verify() {
-		let engine = spec::new_instant().engine;
-		let mut header: Header = Header::default();
-
-		assert!(engine.verify_block_basic(&header).is_ok());
-
-		header.set_seal(vec![rlp::encode(&H520::default())]);
-
-		assert!(engine.verify_block_unordered(&header).is_ok());
-	}
-}
--- a/ethcore/engines/null-engine/Cargo.toml
+++ b/ethcore/engines/null-engine/Cargo.toml
@@ -1,15 +0,0 @@
-[package]
-description = "An ethereum engine which does not provide any consensus mechanism and does not seal blocks."
-name = "null-engine"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-common-types = { path = "../../types" }
-block-reward = { path = "../../block-reward" }
-engine = { path = "../../engine" }
-ethjson = { path = "../../../json" }
-ethereum-types = "0.8.0"
-machine = { path = "../../machine" }
--- a/ethcore/engines/null-engine/src/lib.rs
+++ b/ethcore/engines/null-engine/src/lib.rs
@@ -1,127 +0,0 @@
-// Copyright 2015-2020 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 common_types::{
-	BlockNumber,
-	header::Header,
-	engines::params::CommonParams,
-	errors::EthcoreError as Error,
-};
-use engine::Engine;
-use block_reward::{self, RewardKind};
-use ethereum_types::U256;
-use machine::{
-	ExecutedBlock,
-	Machine,
-};
-use common_types::{
-	ancestry_action::AncestryAction,
-	header::ExtendedHeader,
-	snapshot::Snapshotting
-};
-
-/// Params for a null engine.
-#[derive(Clone, Default)]
-pub struct NullEngineParams {
-	/// base reward for a block.
-	pub block_reward: U256,
-	/// Immediate finalization.
-	pub immediate_finalization: bool
-}
-
-impl From<ethjson::spec::NullEngineParams> for NullEngineParams {
-	fn from(p: ethjson::spec::NullEngineParams) -> Self {
-		NullEngineParams {
-			block_reward: p.block_reward.map_or_else(Default::default, Into::into),
-			immediate_finalization: p.immediate_finalization.unwrap_or(false)
-		}
-	}
-}
-
-/// An engine which does not provide any consensus mechanism and does not seal blocks.
-pub struct NullEngine {
-	params: NullEngineParams,
-	machine: Machine,
-}
-
-impl NullEngine {
-	/// Returns new instance of NullEngine with default VM Factory
-	pub fn new(params: NullEngineParams, machine: Machine) -> Self {
-		NullEngine {
-			params,
-			machine,
-		}
-	}
-}
-impl Engine for NullEngine {
-	fn name(&self) -> &str { "NullEngine" }
-
-	fn machine(&self) -> &Machine { &self.machine }
-
-	fn maximum_uncle_count(&self, _block: BlockNumber) -> usize { 2 }
-
-	fn on_close_block(
-		&self,
-		block: &mut ExecutedBlock,
-		_parent_header: &Header
-	) -> Result<(), Error> {
-		use std::ops::Shr;
-
-		let author = *block.header.author();
-		let number = block.header.number();
-
-		let reward = self.params.block_reward;
-		if reward == U256::zero() { return Ok(()) }
-
-		let n_uncles = block.uncles.len();
-
-		let mut rewards = Vec::new();
-
-		// Bestow block reward
-		let result_block_reward = reward + reward.shr(5) * U256::from(n_uncles);
-		rewards.push((author, RewardKind::Author, result_block_reward));
-
-		// bestow uncle rewards.
-		for u in &block.uncles {
-			let uncle_author = u.author();
-			let result_uncle_reward = (reward * U256::from(8 + u.number() - number)).shr(3);
-			rewards.push((*uncle_author, RewardKind::uncle(number, u.number()), result_uncle_reward));
-		}
-
-		block_reward::apply_block_rewards(&rewards, block, &self.machine)
-	}
-
-	fn verify_local_seal(&self, _header: &Header) -> Result<(), Error> {
-		Ok(())
-	}
-
-	fn snapshot_mode(&self) -> Snapshotting {
-		Snapshotting::PoW { blocks: 10_000, max_restore_blocks: 10_000 }
-	}
-
-	fn params(&self) -> &CommonParams {
-		self.machine.params()
-	}
-
-	fn ancestry_actions(&self, _header: &Header, ancestry: &mut dyn Iterator<Item=ExtendedHeader>) -> Vec<AncestryAction> {
-		if self.params.immediate_finalization {
-			// always mark parent finalized
-			ancestry.take(1).map(|e| AncestryAction::MarkFinalized(e.header.hash())).collect()
-		} else {
-			Vec::new()
-		}
-	}
-}
--- a/ethcore/engines/validator-set/Cargo.toml
+++ b/ethcore/engines/validator-set/Cargo.toml
@@ -1,45 +0,0 @@
-[package]
-description = "Manage validators and sets of validators: creation, calling and validation of contracts, epoch management, proofs and proving"
-name = "validator-set"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-client-traits = { path = "../../client-traits" }
-common-types = { path = "../../types" }
-engine = { path = "../../engine" }
-ethabi = "9.0.1"
-ethabi-contract = "9.0.0"
-ethabi-derive = "9.0.1"
-ethereum-types = "0.8.0"
-ethjson = { path = "../../../json" }
-executive-state = { path = "../../executive-state" }
-keccak-hash = "0.4.0"
-kvdb = "0.3.1"
-lazy_static = "1.3.0"
-log = "0.4.8"
-machine = { path = "../../machine" }
-memory-cache = { path = "../../../util/memory-cache" }
-parity-bytes = "0.1.0"
-parity-util-mem = "0.3.0"
-parking_lot = "0.9"
-rlp = "0.4.2"
-triehash = { package = "triehash-ethereum", version = "0.2",  path = "../../../util/triehash-ethereum" }
-unexpected = { path = "../../../util/unexpected" }
-vm = { path = "../../vm" }
-
-[dev-dependencies]
-accounts = { package = "ethcore-accounts", path = "../../../accounts" }
-call-contract = { package = "ethcore-call-contract", path = "../../call-contract" }
-engine = { path = "../../engine", features = ["test-helpers"] }
-env_logger = "0.6.2"
-ethcore = { path = "../..", features = ["test-helpers"] }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-keccak-hash = "0.4.0"
-rustc-hex = "1.0"
-spec = { path = "../../spec" }
-
-[features]
-test-helpers = []
--- 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.8.0"
-parity-util-mem = "0.3.0"
+ethereum-types = "0.4"
+heapsize = "0.4"
 lazy_static = "1.0"
 log = "0.4"
 vm = { path = "../vm" }
-keccak-hash = "0.4.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,417 +0,0 @@
-// Copyright 2015-2020 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 bytes::Bytes;
-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,
-	mul500,
-	mul1000,
-	div500,
-	div1000,
-	sdiv500,
-	sdiv1000,
-	mod500,
-	mod1000,
-	smod500,
-	smod1000,
-	addmod500,
-	addmod1000,
-	mulmod500,
-	mulmod1000,
-	mulmod1_500,
-	mulmod1_1000,
-	mulmod5_500,
-	mulmod5_1000,
-	mulmod11_500,
-	mulmod11_1000,
-	mulmod_big_500,
-	mulmod_big_1000,
-	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(),
-	}
-}
-
-/// Runs a given EVM bytecode.
-fn run_code(b: &mut Bencher, code: Bytes) {
-	let factory = Factory::default();
-	let mut ext = FakeExt::new();
-	b.iter(|| {
-		let mut params = ActionParams::default();
-		params.address = Address::from_str("0f572e5295c57f15886f9b263e2f6d2d6c7b5ec6").unwrap();
-		params.gas = U256::MAX;
-		params.code = Some(Arc::new(black_box(code.clone())));
-		let vm = factory.create(params, ext.schedule(), 0);
-		result(vm.exec(&mut ext).ok().unwrap())
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 1) 500 times.
-fn mulmod1_500(b: &mut Criterion) {
-	b.bench_function("mulmod modulo 1, 500 times", |b| {
-		run_code(b, "6101f45b6001900360017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 1) 1000 times.
-fn mulmod1_1000(b: &mut Criterion) {
-	b.bench_function("mulmod modulo 1, 1000 times", |b| {
-		run_code(b, "6103e85b6001900360017fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 5) 500 times.
-fn mulmod5_500(b: &mut Criterion) {
-	b.bench_function("mulmod modulo 5, 500 times", |b| {
-		run_code(b, "6101f45b6001900360057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 5) 1000 times.
-fn mulmod5_1000(b: &mut Criterion) {
-	b.bench_function("mulmod modulo 5, 1000 times", |b| {
-		run_code(b, "6103e85b6001900360057fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 11) 500 times.
-fn mulmod11_500(b: &mut Criterion) {
-	b.bench_function("mulmod modulo 11, 500 times", |b| {
-		run_code(b, "6101f45b60019003600b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 11) 1000 times.
-fn mulmod11_1000(b: &mut Criterion) {
-	b.bench_function("mulmod modulo 11, 1000 times", |b| {
-		run_code(b, "6103e85b60019003600b7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 0x58bca9711298bc76cd73f173352c8bc1d1640f977c1ec9a849dfde6fdbfbd591) 500 times.
-fn mulmod_big_500(b: &mut Criterion) {
-	b.bench_function("mulmod modulo random 256-bit number, 500 times", |b| {
-		run_code(b, "6101f45b600190037f58bca9711298bc76cd73f173352c8bc1d1640f977c1ec9a849dfde6fdbfbd5917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(U256::MAX, U256::MAX, 0x58bca9711298bc76cd73f173352c8bc1d1640f977c1ec9a849dfde6fdbfbd591) 1000 times.
-fn mulmod_big_1000(b: &mut Criterion) {
-	b.bench_function("mulmod modulo random 256-bit number, 1000 times", |b| {
-		run_code(b, "6103e85b600190037f58bca9711298bc76cd73f173352c8bc1d1640f977c1ec9a849dfde6fdbfbd5917fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff80095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(a, b, c) for random 256-bit a, b and c. Iterate 500 times.
-///
-/// Source:
-/// ```
-/// PUSH2 0x01F4
-/// JUMPDEST
-/// PUSH1 0x01
-/// SWAP1
-/// SUB
-/// PUSH32 0x5ed6db9489224124a1a4110ec8bec8b01369c8b549a4b8c4388a1796dc35a937
-/// PUSH32 0xb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db
-/// PUSH32 0xcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca
-/// MULMOD
-/// POP
-/// DUP1
-/// PUSH1 0x03
-/// JUMPI
-/// ```
-fn mulmod500(b: &mut Criterion) {
-	b.bench_function("mulmod randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037f5ed6db9489224124a1a4110ec8bec8b01369c8b549a4b8c4388a1796dc35a9377fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mulmod(a, b, c) for random 256-bit a, b and c. Iterate 1000 times.
-fn mulmod1000(b: &mut Criterion) {
-	b.bench_function("mulmod randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037f5ed6db9489224124a1a4110ec8bec8b01369c8b549a4b8c4388a1796dc35a9377fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca095080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute addmod(a, b, c) for random 256-bit a, b and c. Iterate 500 times.
-fn addmod500(b: &mut Criterion) {
-	b.bench_function("addmod randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037f5ed6db9489224124a1a4110ec8bec8b01369c8b549a4b8c4388a1796dc35a9377fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca085080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute addmod(a, b, c) for random 256-bit a, b and c. Iterate 1000 times.
-fn addmod1000(b: &mut Criterion) {
-	b.bench_function("addmod randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037f5ed6db9489224124a1a4110ec8bec8b01369c8b549a4b8c4388a1796dc35a9377fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca085080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mul(a, b) for random 256-bit a and b. Iterate 500 times.
-fn mul500(b: &mut Criterion) {
-	b.bench_function("mul randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca025080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mul(a, b) for random 256-bit a and b. Iterate 1000 times.
-fn mul1000(b: &mut Criterion) {
-	b.bench_function("mul randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca025080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute div(a, b) for random 256-bit a and b. Iterate 500 times.
-fn div500(b: &mut Criterion) {
-	b.bench_function("div randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca045080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute div(a, b) for random 256-bit a and b. Iterate 1000 times.
-fn div1000(b: &mut Criterion) {
-	b.bench_function("div randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca045080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute sdiv(a, b) for random 256-bit a and b. Iterate 500 times.
-fn sdiv500(b: &mut Criterion) {
-	b.bench_function("sdiv randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca055080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute sdiv(a, b) for random 256-bit a and b. Iterate 1000 times.
-fn sdiv1000(b: &mut Criterion) {
-	b.bench_function("sdiv randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca055080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mod(a, b) for random 256-bit a and b. Iterate 500 times.
-fn mod500(b: &mut Criterion) {
-	b.bench_function("mod randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca065080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute mod(a, b) for random 256-bit a and b. Iterate 1000 times.
-fn mod1000(b: &mut Criterion) {
-	b.bench_function("mod randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca065080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute smod(a, b) for random 256-bit a and b. Iterate 500 times.
-fn smod500(b: &mut Criterion) {
-	b.bench_function("smod randomly generated ints, 500 times", |b| {
-		run_code(b, "6101f45b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca075080600357".from_hex().unwrap());
-	});
-}
-
-/// Compute smod(a, b) for random 256-bit a and b. Iterate 1000 times.
-fn smod1000(b: &mut Criterion) {
-	b.bench_function("smod randomly generated ints, 1000 times", |b| {
-		run_code(b, "6103e85b600190037fb8e0a2b6b1587398c28bf9e9d34ea24ba34df308eec2acedca363b2fce2c25db7fcc2de1f8ec6cc9a24ed2c48b856637f9e45f0a5feee21a196aa42a290ef454ca075080600357".from_hex().unwrap());
-	});
-}
--- 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-2020 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),
 		}
 	}
--- a/ethcore/evm/src/factory.rs
+++ b/ethcore/evm/src/factory.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 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.
 //!
@@ -21,28 +21,33 @@ use vm::{Exec, Schedule};
 use ethereum_types::U256;
 use super::vm::ActionParams;
 use super::interpreter::SharedCache;
+use super::vmtype::VMType;

 /// Evm factory. Creates appropriate Evm.
 #[derive(Clone)]
 pub struct Factory {
+	evm: VMType,
 	evm_cache: Arc<SharedCache>,
 }

 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<dyn Exec> {
-		if Self::can_fit_in_usize(&params.gas) {
-			Box::new(super::interpreter::Interpreter::<usize>::new(params, self.evm_cache.clone(), schedule, depth))
-		} else {
-			Box::new(super::interpreter::Interpreter::<U256>::new(params, self.evm_cache.clone(), schedule, depth))
+	pub fn create(&self, params: ActionParams, schedule: &Schedule, depth: usize) -> Box<Exec> {
+		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))
+			} else {
+				Box::new(super::interpreter::Interpreter::<U256>::new(params, self.evm_cache.clone(), schedule, depth))
+			}
 		}
 	}

-	/// Create new instance of a factory, with a size in bytes
+	/// Create new instance of specific `VMType` factory, with a size in bytes
 	/// for caching jump destinations.
-	pub fn new(cache_size: usize) -> Self {
+	pub fn new(evm: VMType, cache_size: usize) -> Self {
 		Factory {
+			evm: evm,
 			evm_cache: Arc::new(SharedCache::new(cache_size)),
 		}
 	}
@@ -56,6 +61,7 @@ impl Default for Factory {
 	/// Returns native rust evm factory
 	fn default() -> Factory {
 		Factory {
+			evm: VMType::Interpreter,
 			evm_cache: Arc::new(SharedCache::default()),
 		}
 	}
@@ -79,7 +85,7 @@ macro_rules! evm_test(
 	($name_test: ident: $name_int: ident) => {
 		#[test]
 		fn $name_int() {
-			$name_test(Factory::new(1024 * 32));
+			$name_test(Factory::new(VMType::Interpreter, 1024 * 32));
 		}
 	}
 );
@@ -92,7 +98,7 @@ macro_rules! evm_test_ignore(
 		#[ignore]
 		#[cfg(feature = "ignored-tests")]
 		fn $name_int() {
-			$name_test(Factory::new(1024 * 32));
+			$name_test(Factory::new(VMType::Interpreter, 1024 * 32));
 		}
 	}
 );
--- a/ethcore/evm/src/instructions.rs
+++ b/ethcore/evm/src/instructions.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 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

@@ -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-2020 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};
@@ -106,10 +106,10 @@ impl<Gas: evm::CostType> Gasometer<Gas> {
 	/// it will be the amount of gas that the current context provides to the child context.
 	pub fn requirements(
 		&mut self,
-		ext: &dyn vm::Ext,
+		ext: &vm::Ext,
 		instruction: Instruction,
 		info: &InstructionInfo,
-		stack: &dyn Stack<U256>,
+		stack: &Stack<U256>,
 		current_mem_size: usize,
 	) -> vm::Result<InstructionRequirements<Gas>> {
 		let schedule = ext.schedule();
@@ -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() {
@@ -375,79 +371,65 @@ fn to_word_size<Gas: evm::CostType>(value: Gas) -> (Gas, bool) {
 fn calculate_eip1283_sstore_gas<Gas: evm::CostType>(schedule: &Schedule, original: &U256, current: &U256, new: &U256) -> Gas {
 	Gas::from(
 		if current == new {
-			// 1. If current value equals new value (this is a no-op), `SSTORE_DIRTY_GAS`
-			// (or if not set, `SLOAD_GAS`) is deducted.
-			schedule.sstore_dirty_gas.unwrap_or(schedule.sload_gas)
+			// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
+			schedule.sload_gas
 		} else {
 			// 2. If current value does not equal new value
 			if original == current {
-				// 2.1. If original value equals current value (this storage slot has not
-				// been changed by the current execution context)
+				// 2.1. If original value equals current value (this storage slot has not been changed by the current execution context)
 				if original.is_zero() {
-					// 2.1.1. If original value is 0, `SSTORE_SET_GAS` is deducted.
+					// 2.1.1. If original value is 0, 20000 gas is deducted.
 					schedule.sstore_set_gas
 				} else {
-					// 2.1.2. Otherwise, `SSTORE_RESET_GAS` gas is deducted.
+					// 2.1.2. Otherwise, 5000 gas is deducted.
 					schedule.sstore_reset_gas

-					// 2.1.2.1. If new value is 0, add `SSTORE_CLEARS_SCHEDULE` to refund counter.
+					// 2.1.2.1. If new value is 0, add 15000 gas to refund counter.
 				}
 			} else {
-				// 2.2. If original value does not equal current value (this storage slot is
-				// dirty), `SSTORE_DIRTY_GAS` (or if not set, `SLOAD_GAS`) is deducted.
-				// Apply both of the following clauses.
-				schedule.sstore_dirty_gas.unwrap_or(schedule.sload_gas)
+				// 2.2. If original value does not equal current value (this storage slot is dirty), 200 gas is deducted. Apply both of the following clauses.
+				schedule.sload_gas

 				// 2.2.1. If original value is not 0
-				// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove
-				// `SSTORE_SET_GAS - SSTORE_DIRTY_GAS` from refund counter.
-				// 2.2.1.2. If new value is 0 (also means that current value is not 0), add
-				// `SSTORE_CLEARS_SCHEDULE` to refund counter.
+				// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove 15000 gas from refund counter. We can prove that refund counter will never go below 0.
+				// 2.2.1.2. If new value is 0 (also means that current value is not 0), add 15000 gas to refund counter.

 				// 2.2.2. If original value equals new value (this storage slot is reset)
-				// 2.2.2.1. If original value is 0, add `SSTORE_SET_GAS - SSTORE_DIRTY_GAS`
-				// to refund counter.
-				// 2.2.2.2. Otherwise, add `SSTORE_RESET_GAS - SSTORE_DIRTY_GAS`
-				// to refund counter.
+				// 2.2.2.1. If original value is 0, add 19800 gas to refund counter.
+				// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
 			}
 		}
 	)
 }

-pub fn handle_eip1283_sstore_clears_refund(ext: &mut dyn vm::Ext, original: &U256, current: &U256, new: &U256) {
+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;

 	if current == new {
-		// 1. If current value equals new value (this is a no-op), `SSTORE_DIRTY_GAS`
-		// (or if not set, `SLOAD_GAS`) is deducted.
+		// 1. If current value equals new value (this is a no-op), 200 gas is deducted.
 	} else {
 		// 2. If current value does not equal new value
 		if original == current {
-			// 2.1. If original value equals current value (this storage slot has not
-			// been changed by the current execution context)
+			// 2.1. If original value equals current value (this storage slot has not been changed by the current execution context)
 			if original.is_zero() {
-				// 2.1.1. If original value is 0, `SSTORE_SET_GAS` is deducted.
+				// 2.1.1. If original value is 0, 20000 gas is deducted.
 			} else {
-				// 2.1.2. Otherwise, `SSTORE_RESET_GAS` gas is deducted.
+				// 2.1.2. Otherwise, 5000 gas is deducted.
 				if new.is_zero() {
-					// 2.1.2.1. If new value is 0, add `SSTORE_CLEARS_SCHEDULE` to refund counter.
+					// 2.1.2.1. If new value is 0, add 15000 gas to refund counter.
 					ext.add_sstore_refund(sstore_clears_schedule);
 				}
 			}
 		} else {
-			// 2.2. If original value does not equal current value (this storage slot is
-			// dirty), `SSTORE_DIRTY_GAS` (or if not set, `SLOAD_GAS`) is deducted.
-			// Apply both of the following clauses.
+			// 2.2. If original value does not equal current value (this storage slot is dirty), 200 gas is deducted. Apply both of the following clauses.

 			if !original.is_zero() {
 				// 2.2.1. If original value is not 0
 				if current.is_zero() {
-					// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove
-					// `SSTORE_SET_GAS - SSTORE_DIRTY_GAS` from refund counter.
+					// 2.2.1.1. If current value is 0 (also means that new value is not 0), remove 15000 gas from refund counter. We can prove that refund counter will never go below 0.
 					ext.sub_sstore_refund(sstore_clears_schedule);
 				} else if new.is_zero() {
-					// 2.2.1.2. If new value is 0 (also means that current value is not 0), add
-					// `SSTORE_CLEARS_SCHEDULE` to refund counter.
+					// 2.2.1.2. If new value is 0 (also means that current value is not 0), add 15000 gas to refund counter.
 					ext.add_sstore_refund(sstore_clears_schedule);
 				}
 			}
@@ -455,16 +437,12 @@ pub fn handle_eip1283_sstore_clears_refund(ext: &mut dyn vm::Ext, original: &U25
 			if original == new {
 				// 2.2.2. If original value equals new value (this storage slot is reset)
 				if original.is_zero() {
-					// 2.2.2.1. If original value is 0, add `SSTORE_SET_GAS - SSTORE_DIRTY_GAS`
-					// to refund counter.
-					let refund = ext.schedule().sstore_set_gas
-						- ext.schedule().sstore_dirty_gas.unwrap_or(ext.schedule().sload_gas);
+					// 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;
 					ext.add_sstore_refund(refund);
 				} else {
-					// 2.2.2.2. Otherwise, add `SSTORE_RESET_GAS - SSTORE_DIRTY_GAS`
-					// to refund counter.
-					let refund = ext.schedule().sstore_reset_gas
-						- ext.schedule().sstore_dirty_gas.unwrap_or(ext.schedule().sload_gas);
+					// 2.2.2.2. Otherwise, add 4800 gas to refund counter.
+					let refund = 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-2020 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::*;

--- a/ethcore/evm/src/interpreter/memory.rs
+++ b/ethcore/evm/src/interpreter/memory.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 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()
 	}
@@ -136,7 +145,7 @@ mod tests {
 	#[test]
 	fn test_memory_read_and_write() {
 		// given
-		let mem: &mut dyn Memory = &mut vec![];
+		let mem: &mut Memory = &mut vec![];
 		mem.resize(0x80 + 32);

 		// when
@@ -149,7 +158,7 @@ mod tests {
 	#[test]
 	fn test_memory_read_and_write_byte() {
 		// given
-		let mem: &mut dyn Memory = &mut vec![];
+		let mem: &mut Memory = &mut vec![];
 		mem.resize(32);

 		// when
@@ -163,7 +172,7 @@ mod tests {

 	#[test]
 	fn test_memory_read_slice_and_write_slice() {
-		let mem: &mut dyn Memory = &mut vec![];
+		let mem: &mut Memory = &mut vec![];
 		mem.resize(32);

 		{
--- a/ethcore/evm/src/interpreter/mod.rs
+++ b/ethcore/evm/src/interpreter/mod.rs
@@ -1,18 +1,18 @@
-// Copyright 2015-2020 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,14 +26,12 @@ 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, ActionType, MessageCallResult,
+	self, ActionParams, ParamsType, ActionValue, CallType, MessageCallResult,
 	ContractCreateResult, CreateContractAddress, ReturnData, GasLeft, Schedule,
 	TrapKind, TrapError
 };
@@ -109,6 +107,8 @@ enum InstructionResult<Gas> {
 	Trap(TrapKind),
 }

+enum Never {}
+
 /// ActionParams without code, so that it can be feed into CodeReader.
 #[derive(Debug)]
 struct InterpreterParams {
@@ -116,8 +116,6 @@ struct InterpreterParams {
 	pub code_address: Address,
 	/// Hash of currently executed code.
 	pub code_hash: Option<H256>,
-	/// Code version.
-	pub code_version: U256,
 	/// Receive address. Usually equal to code_address,
 	/// except when called using CALLCODE.
 	pub address: Address,
@@ -133,8 +131,8 @@ struct InterpreterParams {
 	pub value: ActionValue,
 	/// Input data.
 	pub data: Option<Bytes>,
-	/// Type of action
-	pub action_type: ActionType,
+	/// Type of call
+	pub call_type: CallType,
 	/// Param types encoding
 	pub params_type: ParamsType,
 }
@@ -144,7 +142,6 @@ impl From<ActionParams> for InterpreterParams {
 		InterpreterParams {
 			code_address: params.code_address,
 			code_hash: params.code_hash,
-			code_version: params.code_version,
 			address: params.address,
 			sender: params.sender,
 			origin: params.origin,
@@ -152,7 +149,7 @@ impl From<ActionParams> for InterpreterParams {
 			gas_price: params.gas_price,
 			value: params.value,
 			data: params.data,
-			action_type: params.action_type,
+			call_type: params.call_type,
 			params_type: params.params_type,
 		}
 	}
@@ -169,6 +166,12 @@ pub enum InterpreterResult {
 	Trap(TrapKind),
 }

+impl From<vm::Error> for InterpreterResult {
+	fn from(error: vm::Error) -> InterpreterResult {
+		InterpreterResult::Done(Err(error))
+	}
+}
+
 /// Intepreter EVM implementation
 pub struct Interpreter<Cost: CostType> {
 	mem: Vec<u8>,
@@ -189,7 +192,7 @@ pub struct Interpreter<Cost: CostType> {
 }

 impl<Cost: 'static + CostType> vm::Exec for Interpreter<Cost> {
-	fn exec(mut self: Box<Self>, ext: &mut dyn vm::Ext) -> vm::ExecTrapResult<GasLeft> {
+	fn exec(mut self: Box<Self>, ext: &mut vm::Ext) -> vm::ExecTrapResult<GasLeft> {
 		loop {
 			let result = self.step(ext);
 			match result {
@@ -210,7 +213,7 @@ impl<Cost: 'static + CostType> vm::Exec for Interpreter<Cost> {
 }

 impl<Cost: 'static + CostType> vm::ResumeCall for Interpreter<Cost> {
-	fn resume_call(mut self: Box<Self>, result: MessageCallResult) -> Box<dyn vm::Exec> {
+	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");
@@ -245,7 +248,7 @@ impl<Cost: 'static + CostType> vm::ResumeCall for Interpreter<Cost> {
 }

 impl<Cost: 'static + CostType> vm::ResumeCreate for Interpreter<Cost> {
-	fn resume_create(mut self: Box<Self>, result: ContractCreateResult) -> Box<dyn vm::Exec> {
+	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));
@@ -279,8 +282,6 @@ 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(),
@@ -293,7 +294,7 @@ impl<Cost: CostType> Interpreter<Cost> {

 	/// Execute a single step on the VM.
 	#[inline(always)]
-	pub fn step(&mut self, ext: &mut dyn vm::Ext) -> InterpreterResult {
+	pub fn step(&mut self, ext: &mut vm::Ext) -> InterpreterResult {
 		if self.done {
 			return InterpreterResult::Stopped;
 		}
@@ -301,26 +302,21 @@ 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 {
+	fn step_inner(&mut self, ext: &mut vm::Ext) -> Result<Never, InterpreterResult> {
 		let result = match self.resume_result.take() {
 			Some(result) => result,
 			None => {
@@ -335,31 +331,22 @@ impl<Cost: CostType> Interpreter<Cost> {

 				let instruction = match instruction {
 					Some(i) => i,
-					None => return InterpreterResult::Done(Err(vm::Error::BadInstruction {
+					None => return Err(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));
-				};
+				self.verify_instruction(ext, instruction, info)?;

 				// 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)),
-				};
+				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::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.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;
@@ -368,24 +355,18 @@ impl<Cost: CostType> Interpreter<Cost> {

 				// Execute instruction
 				let current_gas = self.gasometer.as_mut().expect(GASOMETER_PROOF).current_gas;
-				let result = match self.exec_instruction(
+				let result = 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
 			},
 		};

 		if let InstructionResult::Trap(trap) = result {
-			return InterpreterResult::Trap(trap);
+			return Err(InterpreterResult::Trap(trap));
 		}

 		if let InstructionResult::UnusedGas(ref gas) = result {
@@ -407,34 +388,31 @@ 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: &dyn vm::Ext, instruction: Instruction, info: &InstructionInfo) -> vm::Result<()> {
+	fn verify_instruction(&self, ext: &vm::Ext, instruction: Instruction, info: &InstructionInfo) -> vm::Result<()> {
 		let schedule = ext.schedule();

 		if (instruction == instructions::DELEGATECALL && !schedule.have_delegate_call) ||
@@ -443,9 +421,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
@@ -471,7 +447,7 @@ impl<Cost: CostType> Interpreter<Cost> {

 	fn mem_written(
 		instruction: Instruction,
-		stack: &dyn Stack<U256>
+		stack: &Stack<U256>
 	) -> Option<(usize, usize)> {
 		let read = |pos| stack.peek(pos).low_u64() as usize;
 		let written = match instruction {
@@ -492,7 +468,7 @@ impl<Cost: CostType> Interpreter<Cost> {

 	fn store_written(
 		instruction: Instruction,
-		stack: &dyn Stack<U256>
+		stack: &Stack<U256>
 	) -> Option<(U256, U256)> {
 		match instruction {
 			instructions::SSTORE => Some((stack.peek(0).clone(), stack.peek(1).clone())),
@@ -503,7 +479,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 	fn exec_instruction(
 		&mut self,
 		gas: Cost,
-		ext: &mut dyn vm::Ext,
+		ext: &mut vm::Ext,
 		instruction: Instruction,
 		provided: Option<Cost>
 	) -> vm::Result<InstructionResult<Cost>> {
@@ -532,9 +508,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"),
 				};

@@ -555,14 +529,7 @@ 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, 
-					&self.params.code_version, 
-					address_scheme, 
-					true,
-				);
+				let create_result = ext.create(&create_gas.as_u256(), &endowment, contract_code, address_scheme, true);
 				return match create_result {
 					Ok(ContractCreateResult::Created(address, gas_left)) => {
 						self.stack.push(address_to_u256(address));
@@ -604,10 +571,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 {
@@ -616,14 +583,14 @@ impl<Cost: CostType> Interpreter<Cost> {
 							return Err(vm::Error::MutableCallInStaticContext);
 						}
 						let has_balance = ext.balance(&self.params.address)? >= value.expect("value set for all but delegate call; qed");
-						(&self.params.address, &code_address, has_balance, ActionType::Call)
+						(&self.params.address, &code_address, has_balance, CallType::Call)
 					},
 					instructions::CALLCODE => {
 						let has_balance = ext.balance(&self.params.address)? >= value.expect("value set for all but delegate call; qed");
-						(&self.params.address, &self.params.address, has_balance, ActionType::CallCode)
+						(&self.params.address, &self.params.address, has_balance, CallType::CallCode)
 					},
-					instructions::DELEGATECALL => (&self.params.sender, &self.params.address, true, ActionType::DelegateCall),
-					instructions::STATICCALL => (&self.params.address, &code_address, true, ActionType::StaticCall),
+					instructions::DELEGATECALL => (&self.params.sender, &self.params.address, true, CallType::DelegateCall),
+					instructions::STATICCALL => (&self.params.address, &code_address, true, CallType::StaticCall),
 					_ => panic!(format!("Unexpected instruction {:?} in CALL branch.", instruction))
 				};

@@ -698,7 +665,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))?;
 			},
@@ -735,21 +702,21 @@ 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() {
@@ -757,7 +724,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 						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));
@@ -818,7 +785,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]));
@@ -852,7 +819,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()));
@@ -869,12 +836,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

@@ -1048,12 +1009,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()
 				});
@@ -1064,12 +1024,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()
 				});
@@ -1145,7 +1103,7 @@ impl<Cost: CostType> Interpreter<Cost> {
 		Ok(InstructionResult::Ok)
 	}

-	fn copy_data_to_memory(mem: &mut Vec<u8>, stack: &mut dyn Stack<U256>, source: &[u8]) {
+	fn copy_data_to_memory(mem: &mut Vec<u8>, stack: &mut Stack<U256>, source: &[u8]) {
 		let dest_offset = stack.pop_back();
 		let source_offset = stack.pop_back();
 		let size = stack.pop_back();
@@ -1209,26 +1167,25 @@ 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)]
 mod tests {
 	use std::sync::Arc;
 	use rustc_hex::FromHex;
+	use vmtype::VMType;
 	use factory::Factory;
 	use vm::{self, Exec, ActionParams, ActionValue};
 	use vm::tests::{FakeExt, test_finalize};
-	use ethereum_types::Address;

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

 	#[test]
@@ -1236,17 +1193,17 @@ 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 vm = interpreter(params, &ext);
+			let mut vm = interpreter(params, &ext);
 			test_finalize(vm.exec(&mut ext).ok().unwrap()).unwrap()
 		};

@@ -1259,16 +1216,16 @@ 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 vm = interpreter(params, &ext);
+			let mut vm = interpreter(params, &ext);
 			test_finalize(vm.exec(&mut ext).ok().unwrap()).err().unwrap()
 		};

--- a/ethcore/evm/src/interpreter/shared_cache.rs
+++ b/ethcore/evm/src/interpreter/shared_cache.rs
@@ -1,22 +1,22 @@
-// Copyright 2015-2020 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-2020 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-2020 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,24 +33,26 @@ extern crate log;

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

 pub mod evm;
 pub mod interpreter;

 #[macro_use]
 pub mod factory;
+mod vmtype;
 mod instructions;

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

 pub use vm::{
-    Schedule, CleanDustMode, EnvInfo, ActionType, ActionParams, Ext,
+    Schedule, CleanDustMode, EnvInfo, CallType, ActionParams, Ext,
    ContractCreateResult, MessageCallResult, CreateContractAddress,
    GasLeft, ReturnData
 };
 pub use self::evm::{Finalize, FinalizationResult, CostType};
 pub use self::instructions::{InstructionInfo, Instruction};
+pub use self::vmtype::VMType;
 pub use self::factory::Factory;
--- a/ethcore/evm/src/tests.rs
+++ b/ethcore/evm/src/tests.rs
--- a/ethcore/evm/src/vmtype.rs
+++ b/ethcore/evm/src/vmtype.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2018 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -16,31 +16,30 @@

 use std::fmt;

-use ethstore::{Error as SSError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level error from store
-	SStore(SSError),
+/// Type of EVM to use.
+#[derive(Debug, PartialEq, Clone)]
+pub enum VMType {
+	/// RUST EVM
+	Interpreter
 }

-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
+impl fmt::Display for VMType {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		write!(f, "{}", match *self {
+			VMType::Interpreter => "INT"
+		})
 	}
 }

-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
+impl Default for VMType {
+	fn default() -> Self {
+		VMType::Interpreter
+	}
+}
+
+impl VMType {
+	/// Return all possible VMs (Interpreter)
+	pub fn all() -> Vec<VMType> {
+		vec![VMType::Interpreter]
 	}
 }
--- a/ethcore/executive-state/Cargo.toml
+++ b/ethcore/executive-state/Cargo.toml
@@ -1,34 +0,0 @@
-[package]
-description = "Execute transactions producing a receipt and an optional trace."
-name = "executive-state"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-license = "GPL-3.0"
-
-[dependencies]
-account-db = { path = "../account-db" }
-account-state = { path = "../account-state" }
-bytes = { package = "parity-bytes", version = "0.1.0" }
-common-types = { path = "../types" }
-ethereum-types = "0.8.0"
-hash-db = "0.15.0"
-keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
-log = "0.4.8"
-machine = { path = "../machine" }
-trace = { path = "../trace" }
-trie-vm-factories = { path = "../trie-vm-factories" }
-vm = { path = "../vm" }
-
-[dev-dependencies]
-env_logger = "0.5"
-ethcore = { path = "..", features = ["test-helpers"] }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-evm = { path = "../evm" }
-keccak-hash = "0.4.0"
-pod = { path = "../pod" }
-rustc-hex = "1.0"
-spec = { path = "../spec" }
-trie-db = "0.18.0"
-ethtrie = { package = "patricia-trie-ethereum", path = "../../util/patricia-trie-ethereum" }
--- a/ethcore/executive-state/src/lib.rs
+++ b/ethcore/executive-state/src/lib.rs
--- a/Show More
+++ b/Show More