2.6.1-beta (#10973 )

* 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)
version: betalise v2.6 (#10859 )
2019-08-14 18:29:48 +02:00 · 2019-07-08 13:24:25 +02:00
979 changed files with 29724 additions and 55646 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,21 +4,24 @@ stages:
  - publish
  - optional

-image:                             ${REGISTRY}/parity-ci-linux:latest
-
+image:                             parity/parity-ci-linux:latest
 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}"
+  SCCACHE_DIR:                     "/ci-cache/${CI_PROJECT_NAME}/sccache"
  CARGO_TARGET:                    x86_64-unknown-linux-gnu
-  CARGO_INCREMENTAL:               0
-  REGISTRY:                        registry.parity.io/parity/infrastructure/scripts
+
+.no_git:                           &no_git # disable git strategy
+  variables:
+    GIT_STRATEGY:                  none
+    GIT_SUBMODULE_STRATEGY:        none

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

@@ -32,17 +35,28 @@ variables:
      - tools/

 .docker-cache-status:              &docker-cache-status
+  variables:
+    CARGO_HOME:                    "/ci-cache/parity-ethereum/cargo/${CI_JOB_NAME}"
  dependencies:                    []
-  interruptible:                   true
  before_script:
    - rustup show
    - cargo --version
-  retry:
-    max: 2
-    when:
-      - runner_system_failure
-      - unknown_failure
-      - api_failure
+    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_debug.log
+        RUST_LOG=sccache=debug
+        sccache --start-server
+    - sccache -s
+  after_script:
+    # sccache debug info 
+    - if test -e sccache_debug.log;
+      then
+        echo "_____All crate-types:_____";
+        grep 'parse_arguments.*--crate-type' sccache_debug.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c;
+        echo "_____Non-cacheable reasons:_____";
+        grep CannotCache sccache_debug.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c;
+      else
+        echo "_____No logs from sccache_____";
+        exit 0;
+      fi
  tags:
    - linux-docker

@@ -52,6 +66,7 @@ variables:
  <<:                              *collect_artifacts
  script:
    - scripts/gitlab/build-linux.sh
+    - sccache -s
  after_script:
    - mkdir -p tools
    - cp -r scripts/docker/hub/* ./tools
@@ -69,35 +84,21 @@ cargo-check 0 3:
  <<:                              *docker-cache-status
  script:
    - time cargo check --target $CARGO_TARGET --locked --no-default-features --verbose --color=always
-    - sccache --show-stats
+    - sccache -s

 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
+    - sccache -s

 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
+    - sccache -s

 cargo-audit:
  stage:                           test
@@ -111,12 +112,21 @@ validate-chainspecs:
  <<:                              *docker-cache-status
  script:
    - ./scripts/gitlab/validate-chainspecs.sh
+    - sccache -s
+
+test-cpp:
+  stage:                           build
+  <<:                              *docker-cache-status
+  script:
+    - ./scripts/gitlab/test-cpp.sh
+    - sccache -s

 test-linux:
  stage:                           build
  <<:                              *docker-cache-status
  script:
    - ./scripts/gitlab/test-linux.sh stable
+    - sccache -s

 test-linux-beta:
  stage:                           build
@@ -124,6 +134,7 @@ test-linux-beta:
  <<:                              *docker-cache-status
  script:
    - ./scripts/gitlab/test-linux.sh beta
+    - sccache -s

 test-linux-nightly:
  stage:                           build
@@ -131,8 +142,15 @@ test-linux-nightly:
  <<:                              *docker-cache-status
  script:
    - ./scripts/gitlab/test-linux.sh nightly
+    - sccache -s
  allow_failure:                   true

+build-android:
+  <<:                              *build-on-linux
+  image:                           parity/parity-ci-android:stretch
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+
 build-linux:
  <<:                              *build-on-linux
  only:                            *releaseable_branches
@@ -140,21 +158,21 @@ build-linux:
 build-linux-i386:
  <<:                              *build-on-linux
  only:                            *releaseable_branches
-  image:                           ${REGISTRY}/parity-ci-i386:latest
+  image:                           parity/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
+  image:                           parity/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
+  image:                           parity/parity-ci-armhf:latest
  variables:
    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf

@@ -165,6 +183,8 @@ build-darwin:
  variables:
    CARGO_TARGET:                  x86_64-apple-darwin
    CARGO_HOME:                    "${CI_PROJECT_DIR}/.cargo"
+    CC:                            gcc
+    CXX:                           g++
  script:
    - scripts/gitlab/build-linux.sh
  tags:
@@ -185,10 +205,11 @@ build-windows:

 publish-docker:
  stage:                           publish
+  <<:                              *no_git
  only:                            *releaseable_branches
  except:
-    - nightly
-  when:                            manual
+    variables:
+      - $SCHEDULE_TAG == "nightly"
  dependencies:
    - build-linux
  environment:
@@ -198,24 +219,23 @@ publish-docker:
  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
+    # CONTAINER_IMAGE:             parity/parity 
  script:
+    # we stopped pushing nightlies to dockerhub, will push to own registry prb.
    - ./tools/publish-docker.sh
  tags:
    - kubernetes-parity-build

-publish-snap-nightly:              &publish-snap
+publish-snap:                      &publish-snap
  stage:                           publish
-  only:
-    - nightly
+  <<:                              *no_git
+  only:                            *releaseable_branches
  image:                           snapcore/snapcraft
  variables:
-    GIT_STRATEGY:                  none
    BUILD_ARCH:                    amd64
  cache:                           {}
  dependencies:
@@ -225,12 +245,7 @@ publish-snap-nightly:              &publish-snap
  script:
    - ./tools/publish-snap.sh

-publish-snap-manually:
-  <<:                              *publish-snap
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-snap-i386-nightly:         &publish-snap-i386
+publish-snap-i386:
  <<:                              *publish-snap
  variables:
    BUILD_ARCH:                    i386
@@ -238,12 +253,7 @@ publish-snap-i386-nightly:         &publish-snap-i386
  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-arm64:
  <<:                              *publish-snap
  variables:
    BUILD_ARCH:                    arm64
@@ -251,12 +261,7 @@ publish-snap-arm64-nightly:        &publish-snap-arm64
  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-armhf:
  <<:                              *publish-snap
  variables:
    BUILD_ARCH:                    armhf
@@ -264,18 +269,11 @@ publish-snap-armhf-nightly:        &publish-snap-armhf
  dependencies:
    - build-linux-armhf

-publish-snap-armhf-manually:
-  <<:                              *publish-snap-armhf
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-onchain-nightly:           &publish-onchain
+publish-onchain:
  stage:                           publish
-  only:
-    - nightly
+  <<:                              *no_git
+  only:                            *releaseable_branches
  cache:                           {}
-  variables:
-    GIT_STRATEGY:                  none
  dependencies:
    - build-linux
    - build-darwin
@@ -285,18 +283,11 @@ publish-onchain-nightly:           &publish-onchain
  tags:
    - linux-docker

-publish-onchain-manually:
-  <<:                              *publish-onchain
-  only:                            *releaseable_branches
-  when:                            manual
-
-publish-release-awss3-nightly:     &publish-release-awss3
-  image:                           ${REGISTRY}/awscli:latest
+publish-awss3-release:
+  image:                           parity/awscli:latest
  stage:                           publish
-  only:
-    - nightly
-  variables:
-    GIT_STRATEGY:                  none
+  only:                            *releaseable_branches
+  <<:                              *no_git
  cache:                           {}
  dependencies:
    - build-linux
@@ -305,7 +296,7 @@ publish-release-awss3-nightly:     &publish-release-awss3
  script:
    - echo "__________Push binaries to AWS S3____________"
    - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
-       (stable|nightly)
+       (beta|stable|nightly)
         export BUCKET=releases.parity.io/ethereum;
         ;;
       (*)
@@ -318,19 +309,13 @@ publish-release-awss3-nightly:     &publish-release-awss3
  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
+  image:                           parity/parity-ci-docs:latest
  only:
    - tags
  except:
    - nightly
-  when:                            manual
  cache:                           {}
  dependencies:                    []
  script:
@@ -341,12 +326,11 @@ publish-docs:

 publish-av-whitelist:
  stage:                          publish
-  variables:
-    GIT_STRATEGY:                  none
+  <<:                             *no_git
  only:                           *releaseable_branches
  except:
-    - nightly
-  when:                           manual
+    variables:
+      - $SCHEDULE_TAG == "nightly"
  cache:                          {}
  dependencies:
    - build-windows
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,397 +1,185 @@
-## Parity-Ethereum [v2.7.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.7.1)
-Parity Ethereum v2.7.2-stable is a patch version release of parity-ethereum. 
-Starting in the 2.7.x series of releases, parity-ethereum is switching to a single `stable` release
-track. As a result, any clients that currently receive updates from the `beta`
-track should switch to the `stable` track.
-Due to database format changes, upgrading from 2.5.x or 2.6.x is one-way only. 
+## 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)

-* backwards compatible call_type creation_method (#11450 + #11455) 
-* chore: remove unused dependencies (#11432)
-* Cargo.lock: new lockfile format (#11448)
-* rlp_derive: cleanup (#11446)
-* Avoid long state queries when serving GetNodeData requests (#11444)
-* update kvdb-rocksdb to 0.4 (#11442)
-* Remove dead bootnodes, add new geth bootnodes (#11441)
-* goerli: replace foundation bootnode (#11433)
-* fix: export hardcoded sync format (#11416)
-* verification: fix race same block + misc (#11400)
-* update classic testnet bootnodes (#11398)
-* gcc to clang (#11453) 
+## Parity-Ethereum [v2.6.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.6.0)

-## Parity-Ethereum [v2.7.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.7.1)
-Parity Ethereum v2.7.1-stable is a patch version release of parity-ethereum. 
-Starting in the 2.7.x series of releases, parity-ethereum is switching to a single `stable` release
-track. As a result, any clients that currently receive updates from the `beta`
-track should switch to the `stable` track.
-Due to database format changes, upgrading from 2.5.x or 2.6.x is one-way only. 
+Parity-Ethereum 2.6.0-beta is a minor release that stabilizes the 2.6 branch by
+marking it as a beta release.

-The full list of included changes from `v2.7.0` to `v2.7.1`:
+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.

-* Revert "Distinguish between `create` and `create2` (#11311)" (#11427)
+ As of today, Parity-Ethereum 2.4 reaches end of life, and everyone is
+ encouraged to upgrade.

-## Parity-Ethereum [v2.7.0](https://github.com/paritytech/parity-ethereum/releases/tag/v2.7.0)
+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))

-Parity Ethereum v2.7.0-stable is a minor version release of parity-ethereum. As
-of this release, parity-ethereum is switching to a single `stable` release
-track. As a result, any clients that currently receive updates from the `beta`
-track should switch to the `stable` track.
+## Previous releases

-The full list of included changes from `v2.5-stable` to `v2.7-stable` (the
-`v2.6-beta` branch will already include some of these changes):
-
-* Update POA bootnodes (#11411)
-* Update ProgPoW to 0.9.3 (#11407)
-* Add EtherCore support (#11402)
-* json-tests: Fix compile error (#11384)
-* ethcore/res: fix ethereum classic chainspec blake2_f activation block num (#11391)
-* Switching to stable-track (#11377)
-* Update copyright notice 2020 (#11386)
-* miner: fix deprecation warning Error::description (#11380)
-* Fix Aztlan hard fork issues (#11347)
-* authority_round: Fix next_step_time_duration. (#11379)
-* Set the block gas limit to the value returned by a contract call (#10928)
-* [Trace] Distinguish between `create` and `create2` (#11311)
-* fix cargo audit (#11378)
-* Fix esoteric test config variable (#11292)
-* Rip out the C and Java bindings (#11346)
-* Encapsulate access to the client for secret store (#11232)
-* Forward-port #11356 (#11359)
-* Fix error message typo (#11363)
-* [util/migration]: remove needless `static` bounds (#11348)
-* Replace stale boot nodes with latest list (#11351)
-* Update to latest `kvdb-*`: no default column, DBValue is Vec (#11312)
-* we do not profit from incremental now (#11302)
-* update autoupdate fork blocks for nightly (#11308)
-* Add Nat PMP method to P2P module (#11210)
-* Add randomness contract support to AuthorityRound. (#10946)
-* ethcore/res: activate ecip-1061 on kotti and mordor (#11338)
-* tx-q: enable basic verification of local transactions (#11332)
-* remove null signatures (#11335)
-* ethcore/res: activate agharta on classic 9573000 (#11331)
-* [secretstore] migrate to version 4 (#11322)
-* Enable EIP-2384 for ice age hard fork (#11281)
-* Fix atomicity violation in network-devp2p (#11277)
-* Istanbul activation on xDai (#11299)
-* Istanbul activation on POA Core (#11298)
-* Adds support for ipc socket permissions (#11273)
-* Add check for deserialising hex values over U256 limit (#11309)
-* validate-chainspecs: check istanbul eips are in the foundation spec (#11305)
-* [chainspec]: add `eip1344_transition` for istanbul (#11301)
-* only add transactions to signing-queue if it is enabled (#11272)
-* Use upstream rocksdb (#11248)
-* Treat only blocks in queue as synced (#11264)
-* add support for evan.network chains (#11289)
-* Add benchmarks and tests for RlpNodeCodec decoding (#11287)
-* upgrade vergen to 3.0 (#11293)
-* interruptible test and build jobs (#11294)
-* Istanbul HF on POA Sokol (#11282)
-* [ethcore]: apply filter when `PendingSet::AlwaysQueue` in `ready_transactions_filtered` (#11227)
-* Update lib.rs (#11286)
-* Don't prune ancient state when instantiating a Client (#11270)
-* fixed verify_uncles error type (#11276)
-* ethcore: fix rlp deprecation warnings (#11280)
-* Upgrade trie-db to 0.16.0. (#11274)
-* Clarify what first_block `None` means (#11269)
-* removed redundant VMType enum with one variant (#11266)
-* Ensure jsonrpc threading settings are sane (#11267)
-* Return Ok(None) when the registrar contract returns empty slice (#11257)
-* Add a benchmark for snapshot::account::to_fat_rlps() (#11185)
-* Fix misc compile warnings (#11258)
-* simplify verification (#11249)
-* update ropsten forkCanonHash, forkBlock (#11247)
-* Make InstantSeal Instant again (#11186)
-* 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)
-* Insert explicit warning into the panic hook (#11225)
-* Snapshot restoration overhaul (#11219)
-* Fix docker centos build (#11226)
-* retry on gitlab system failures (#11222)
-* Update bootnodes. (#11203)
-* Use provided usd-per-eth value if an endpoint is specified (#11209)
-* Use a lock instead of atomics for snapshot Progress (#11197)
-* [informant]: `MillisecondDuration` -> `as_millis()` (#11211)
-* Step duration map configuration parameter ported from the POA Network fork (#10902)
-* Upgrade jsonrpc to latest (#11206)
-* [export hardcoded sync]: use debug for `H256` (#11204)
-* Pause pruning while snapshotting (#11178)
-* Type annotation for next_key() matching of json filter options (#11192)
-* Crypto primitives removed from ethkey (#11174)
-* Made ecrecover implementation trait public (#11188)
-* Remove unused macro_use. (#11191)
-* [dependencies]: jsonrpc `14.0.1` (#11183)
-* [receipt]: add `sender` & `receiver` to `RichReceipts` (#11179)
-* [dependencies] bump rand 0.7 (#11022)
-* [ethcore/builtin]: do not panic in blake2pricer on short input (#11180)
-* TxPermissions ver 3: gas price & data (#11170)
-* [ethash] chainspec validate `ecip1017EraRounds` non-zero (#11123)
-* 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)
-* Aura: Report malice on sibling blocks from the same validator (#11160)
-* Change how RPCs eth_call and eth_estimateGas handle "Pending" (#11127)
-* Cleanup stratum a bit (#11161)
-* [keccak-hasher]: rust2018 (#11163)
-* Upgrade to jsonrpc v14 (#11151)
-* Secret store: fix Instant::now() related race in net_keep_alive (#11155)
-* RPC method for clearing the engine signer (#10920)
-* Use TryFrom instead of From+panic for Builtin (#11140)
-* Fix sccache statistics (#11145)
-* Update ethereum types to 0.8.0 version (#11139)
-* [json]: add docs to `hardfork specification` (#11138)
-* ServiceTransactionChecker::refresh_cache: allow registrar unavailable (#11126)
-* Fix some random typos, formatting/whitespace (#11128)
-* Refactor parity_listStorageKeys with count parameter optional (#11124)
-* Make EIP712Domain Fields Optional (#11103)
-* EIP-712: bump version in prep for publishing (#11106)
-* move StateResult to `common-types` (#11121)
-* Deduplicate registrar contract & calling logic (#11110)
-* Refactor return type of `BlockChainClient::code` #7098 (#11102)
-* Switching sccache from local to Redis (#10971)
-* SIMD Implementation for EIP-152 (#11056)
-* Fix deprecated trait objects without an explicit `dyn` (#11112)
-* [spec] fix rinkeby spec (#11108)
-* Update to latest jsonrpc (#11111)
-* use images from our registry (#11105)
-* Correct EIP-712 encoding (#11092)
-* [CI] check evmbin build (#11096)
-* Update `kvdb`, `kvdb-rocksdb` and `h2` (#11091)
-* [client]: Fix for incorrectly dropped consensus messages (#11082) (#11086)
-* Update JSON tests to d4f86ecf4aa7c (#11054)
-* fix(network): typo (#11088)
-* [ethash] remove manual unrolling  (#11069)
-* ethcore/res: activate Istanbul on Ropsten, Görli, Rinkeby, Kovan (#11068)
-* [sync]: rust 2018 (#11067)
-* [ethcore]: move client test types to test-helpers (#11062)
-* [sync]: remove unused dependencies or make dev (#11061)
-* [ethcore]: reduce re-exports (#11059)
-* [evmbin] fix time formatting (#11060)
-* Update hardcoded headers (foundation, classic, kovan,  xdai, ewc, ...) (#11053)
-* cargo update -p eth-secp256k1 (#11052)
-* ethcore: remove `test-helper feat` from build (#11047)
-* Include test-helpers from ethjson (#11045)
-* [ethcore]: cleanup dependencies (#11043)
-* add more tx tests (#11038)
-* Fix parallel transactions race-condition (#10995)
-* [ethcore]: make it compile without `test-helpers` feature (#11036)
-* Benchmarks for block verification (#11035)
-* Move snapshot related traits to their proper place (#11012)
-* cleanup json crate (#11027)
-* [spec] add istanbul test spec (#11033)
-* [json-spec] make blake2 pricing spec more readable (#11034)
-* Add blake2_f precompile (#11017)
-* Add new line after writing block to hex file. (#10984)
-* fix: remove unused error-chain (#11028)
-* fix: remove needless use of itertools (#11029)
-* Convert `std::test` benchmarks to use Criterion (#10999)
-* Fix block detail updating (#11015)
-* [trace] introduce trace failed to Ext (#11019)
-* cli: update usage and version headers (#10924)
-* [private-tx] remove unused rand (#11024)
-* Extract snapshot to own crate (#11010)
-* Edit publish-onchain.sh to use https (#11016)
-* EIP 1108: Reduce alt_bn128 precompile gas costs (#11008)
-* Fix deadlock in `network-devp2p` (#11013)
-* Implement EIP-1283 reenable transition, EIP-1706 and EIP-2200 (#10191)
-* EIP 1884 Re-pricing of trie-size dependent operations (#10992)
-* xDai chain support and nodes list update (#10989)
-* [trace] check mem diff within range (#11002)
-* EIP-1344 Add CHAINID op-code (#10983)
-* Make ClientIoMessage generic over the Client (#10981)
-* bump spin to 0.5.2 (#10996)
-* fix compile warnings (#10993)
-* Fix compilation on recent nightlies (#10991)
-* [ipfs] Convert to edition 2018 (#10979)
-* Extract spec to own crate (#10978)
-* EIP 2028: transaction gas lowered from 68 to 16 (#10987)
-* Extract engines to own crates (#10966)
-* Configuration map of block reward contract addresses (#10875)
-* Add a 2/3 quorum option to Authority Round. (#10909)
-* Fix rlp decode for inline trie nodes. (#10980)
-* Private contract migration and offchain state sync (#10748)
-* manual publish jobs for releases, no changes for nightlies (#10977)
-* Extract the Engine trait (#10958)
-* Better error message for rpc gas price errors (#10931)
-* [.gitlab.yml] cargo check ethcore benches (#10965)
-* Verify transaction against its block during import (#10954)
-* [evmbin] fix compilation (#10976)
-* Update to latest trie version. (#10972)
-* [blooms-db] Fix benchmarks (#10974)
-* Fix ethcore/benches build. (#10964)
-* tx-pool: accept local tx with higher gas price when pool full (#10901)
-* Disable unsyncable expanse chain (#10926)
-* Extract Machine from ethcore (#10949)
-* removed redundant state_root function from spec, improve spec error types (#10955)
-* Add support for Energy Web Foundation's new chains (#10957)
-* [evmbin] add more tests to main.rs (#10956)
-* Fix compiler warnings in util/io and upgrade to edition 2018 Upgrade mio to latest (#10953)
-* unify loading spec && further spec cleanups (#10948)
-* refactor: Refactor evmbin CLI (#10742)
-* journaldb changes (#10929)
-* Allow default block parameter to be blockHash (#10932)
-* Enable sealing when engine is ready (#10938)
-* Fix some warnings and typos. (#10941)
-* Updated security@parity.io key (#10939)
-* Change the return type of step_inner function. (#10940)
-* get rid of hidden mutability of Spec (#10904)
-* simplify BlockReward::reward implementation (#10906)
-* Kaspersky AV whitelisting (#10919)
-* additional arithmetic EVM opcode benchmarks (#10916)
-* [Cargo.lock] cargo update -p crossbeam-epoch (#10921)
-* Fixes incorrect comment. (#10913)
-* Add file path to disk map write/read warnings (#10911)
-* remove verify_transaction_unordered from engine (#10891)
-* Avast whitelist script (#10900)
-* cleanup ethcore ethereum module (#10899)
-* Move more types out of ethcore (#10880)
-* return block nonce when engine is clique (#10892)
-* TransactionQueue::import accepts iterator (#10889)
-* rename is_pruned to is_prunable (#10888)
-* simplify create_address_scheme (#10890)
-* Move DatabaseExtras back to trace (#10868)
-* Update README.md and Changelogs (#10866)
-* whisper is no longer a part of parity-ethereum repo (#10855)
-* [ethash] remove mem::uninitialized (#10861)
-* Docker images renaming (#10863)
-* Move the substate module into ethcore/executive (#10867)
-* Run cargo fix on a few of the worst offenders (#10854)
-* removed redundant fork choice abstraction (#10849)
-* Extract state-db from ethcore (#10858)
-* Fix fork choice (#10837)
-* Move more code into state-account (#10840)
-* Remove compiler warning (#10865)
-* [ethash] use static_assertions crate (#10860)
-* EIP-1702: Generalized Account Versioning Scheme (#10771)
-* ethcore-builtin (#10850)
-* removed QueueError type (#10852)
-* removed unused macros (#10851)
-* bump crossbeam (#10848)
-* removed unused trait PrivateNotify and unused Error types (#10847)
-* make fn submit_seal more idiomatic (#10843)
-* update parking-lot to 0.8 (#10845)
-* Update version to 2.7.0 (#10846)
-* update jsonrpc to 12.0 (#10841)
-* Improve logging and cleanup in miner around block sealing (#10745)
-* Extract AccountDB to account-db (#10839)
-* test: Update Whisper test for invalid pool size (#10811)
-* Extricate PodAccount and state Account to own crates (#10838)
-* logs (#10817)
-* refactor: whisper: Add type aliases and update rustdocs in message.rs (#10812)
-* Break circular dependency between Client and Engine (part 1) (#10833)
-* tests: Relates to #10655: Test instructions for Readme (#10835)
-* refactor: Related #9459 - evmbin: replace untyped json! macro with fully typed serde serialization using Rust structs (#10657)
-* idiomatic changes to PodState (#10834)
-* Allow --nat extip:your.host.here.org (#10830)
-* When updating the client or when called from RPC, sleep should mean sleep (#10814)
-* Remove excessive warning (#10831)
-* Fix typo in README.md (#10828)
-* ethcore does not use byteorder (#10829)
-* Better logging when backfilling ancient blocks fail (#10796)
-* depends: Update wordlist to v1.3 (#10823)
-* cargo update -p smallvec (#10822)
-* replace memzero with zeroize crate (#10816)
-* Don't repeat the logic from Default impl (#10813)
-* removed additional_params method (#10818)
-* Add Constantinople eips to the dev (instant_seal) config (#10809)
-* removed redundant fmt::Display implementations (#10806)
-* revert changes to .gitlab-ci.yml (#10807)
-* Add filtering capability to `parity_pendingTransactions` (issue 8269) (#10506)
-* removed EthEngine alias (#10805)
-* wait a bit longer in should_check_status_of_request_when_its_resolved (#10808)
-* Do not drop the peer with None difficulty (#10772)
-* ethcore-bloom-journal updated to 2018 (#10804)
-* ethcore-light uses bincode 1.1 (#10798)
-* Fix a few typos and unused warnings. (#10803)
-* updated project to ansi_term 0.11 (#10799)
-* added new ropsten-bootnode and removed old one (#10794)
-* updated price-info to edition 2018 (#10801)
-* ethcore-network-devp2p uses igd 0.9 (#10797)
-* updated parity-local-store to edition 2018 and removed redundant Error type (#10800)
-* Cleanup unused vm dependencies (#10787)
-* Removed redundant ethcore-service error type (#10788)
-* Removed machine abstraction from ethcore (#10791)
-* Updated blooms-db to rust 2018 and removed redundant deps (#10785)
-* ethkey no longer uses byteorder (#10786)
-* Log validator set changes in EpochManager (#10734)
-* Treat empty account the same as non-exist accounts in EIP-1052 (#10775)
-* docs: Update Readme with TOC, Contributor Guideline. Update Cargo package descriptions (#10652)
-* Move Engine::register_client to be before other I/O handler registration (#10767)
-* Print warnings when using dangerous settings for ValidatorSet (#10733)
-* ethcore/res: activate atlantis classic hf on block 8772000 (#10766)
-* refactor: Fix indentation (#10740)
-* Updated Bn128PairingImpl to use optimized batch pairing  (#10765)
-* fix: aura don't add `SystemTime::now()` (#10720)
-* Initialize private tx logger only if private tx functionality is enabled (#10758)
-* Remove unused code (#10762)
-* Remove calls to heapsize (#10432)
-* [devp2p] Update to 2018 edition (#10716)
-* Add a way to signal shutdown to snapshotting threads (#10744)
-* Enable aesni (#10756)
-* remove support of old SS db formats (#10757)
-* [devp2p] Don't use `rust-crypto` (#10714)
-* updater: fix static id hashes initialization (#10755)
-* Use fewer threads for snapshotting (#10752)
-* Die error_chain, die (#10747)
-* Fix deprectation warnings on nightly (#10746)
-* fix docker tags for publishing (#10741)
-* DevP2p: Get node IP address and udp port from Socket, if not included in PING packet (#10705)
-* ethcore: enable ECIP-1054 for classic (#10731)
-* Stop breaking out of loop if a non-canonical hash is found (#10729)
-* Refactor Clique stepping (#10691)
-* Use RUSTFLAGS to set the optimization level (#10719)
-* SecretStore: non-blocking wait of session completion (#10303)
-* removed secret_store folder (#10722)
-* SecretStore: expose restore_key_public in HTTP API (#10241)
-* Revert "enable lto for release builds (#10717)" (#10721)
-* enable lto for release builds (#10717)
-* Merge `Notifier` and `TransactionsPoolNotifier` (#10591)
-* [devp2p] Fix warnings and re-org imports (#10710)
-* Upgrade ethereum types (#10670)
-* introduce MissingParent Error, fixes #10699 (#10700)
-* Update publishing (#10644)
-* Upgrade to parity-crypto 0.4 (#10650)
-* new image (#10673)
-* Add SealingState; don't prepare block when not ready. (#10529)
-* Fix compiler warning (that will become an error) (#10683)
-* add_sync_notifier in EthPubSubClient holds on to a Client for too long (#10689)
-* Don't panic if extra_data is longer than VANITY_LENGTH (#10682)
-* docs: evmbin - Update Rust docs (#10658)
-* Remove annoying compiler warnings (#10679)
-* Reset blockchain properly (#10669)
-* Remove support for hardware wallets (#10678)
-* [CI] allow cargo audit to fail (#10676)
-* docs: Add ProgPoW Rust docs to ethash module (#10653)
-* fix: Move PR template into .github/ folder (#10663)
-* docs: Add PR template (#10654)
-* Trivial journal for private transactions (#10056)
-* fix(compilation warnings) (#10649)
-* [whisper] Move needed aes_gcm crypto in-crate (#10647)
-* Adds parity_getRawBlockByNumber, parity_submitRawBlock (#10609)
-* Fix rinkeby petersburg fork (#10632)
-* ci: publish docs debug (#10638)
-* Fix publish docs (#10635)
-* Update kovan.json to switch validator set to POA Consensus Contracts (#10628)
-* [ethcore] remove error_chain (#10616)
-* Remove unused import (#10615)
-* evm: add some mulmod benches (#10600)
-* Clique: zero-fill extradata when the supplied value is less than 32 bytes in length (#10605)
-* Constantinople HF on POA Core (#10606)
-* adds rpc error message for --no-ancient-blocks (#10608)
-* Allow CORS requests in Secret Store API (#10584)
-* update bootnodes (#10595)
-* sccache logs to stdout (#10596)
-* fix(whisper expiry): current time + work + ttl (#10587)
-* CI improvements (#10579)
-* Watch transactions pool (#10558)
-* fix(evmbin): make benches compile again (#10586)
-* fix issue with compilation when 'slow-blocks' feature enabled (#10585)
-* Reject crazy timestamps instead of truncating. (#10574)
-* Node table limiting and cache for node filter (#10288)
-* fix(light cull): poll light cull instead of timer (#10559)
-* Update Issue Template to direct security issue to email (#10562)
-* RPC: Implements eth_subscribe("syncing") (#10311)
-* Explicitly enable or disable Stratum in config file (Issue 9785) (#10521)
-* version: bump master to 2.6 (#10560)
+- [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/Cargo.lock
+++ b/Cargo.lock
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,27 +2,40 @@
 description = "Parity Ethereum client"
 name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "2.7.2"
+version = "2.6.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" }
-clap = "2"
-cli-signer= { path = "cli-signer" }
-client-traits = { path = "ethcore/client-traits" }
-common-types = { path = "ethcore/types" }
-ctrlc = { git = "https://github.com/paritytech/rust-ctrlc.git" }
-dir = { path = "util/dir" }
+log = "0.4"
+rustc-hex = "1.0"
 docopt = "1.0"
-engine = { path = "ethcore/engine" }
-ethabi = { version = "9.0.1", optional = true }
+clap = "2"
+term_size = "0.3"
+textwrap = "0.9"
+num_cpus = "1.2"
+number_prefix = "0.2"
+rpassword = "1.0"
+semver = "0.9"
+ansi_term = "0.11"
+parking_lot = "0.7"
+regex = "1.0"
+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" }
+jsonrpc-core = "12.0.0"
+parity-bytes = "0.1"
+common-types = { path = "ethcore/types" }
 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-call-contract = { path = "ethcore/call-contract"}
 ethcore-db = { path = "ethcore/db" }
 ethcore-io = { path = "util/io" }
 ethcore-light = { path = "ethcore/light" }
@@ -30,53 +43,37 @@ ethcore-logger = { path = "parity/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"
+ethereum-types = "0.6.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"] }
+rlp = "0.4.0"
+cli-signer= { path = "cli-signer" }
 parity-daemonize = "0.3"
 parity-hash-fetch = { path = "updater/hash-fetch" }
 parity-ipfs-api = { path = "ipfs" }
 parity-local-store = { path = "miner/local-store" }
-parity-path = "0.1"
-parity-rpc = { path = "rpc" }
 parity-runtime = { path = "util/runtime" }
+parity-rpc = { path = "rpc" }
 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"
+parity-whisper = { path = "whisper" }
+parity-path = "0.1"
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic-hook" }
+keccak-hash = "0.2.0"
+migration-rocksdb = { path = "util/migration-rocksdb" }
+kvdb = "0.1"
+kvdb-rocksdb = "0.1.3"
+journaldb = { path = "util/journaldb" }
+
+ethcore-secretstore = { path = "secret-store", optional = true }
+
 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-util-mem = { version = "0.1", features = ["jemalloc-global"] }

 [build-dependencies]
 rustc_version = "0.2"
@@ -95,11 +92,12 @@ default = ["accounts"]
 accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
+ci-skip-tests = ["ethcore/ci-skip-tests"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["ethcore-secretstore", "accounts", "ethabi", "ethcore-call-contract"]
+secretstore = ["ethcore-secretstore", "ethcore-secretstore/accounts"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
 # to create a memory profile (requires nightly rust), use e.g.
@@ -135,4 +133,11 @@ members = [
 	"chainspec",
 	"ethcore/wasm/run",
 	"evmbin",
+	"parity-clib",
+	"whisper/cli",
+	"util/triehash-ethereum",
+	"util/keccak-hasher",
+	"util/patricia-trie-ethereum",
+	"util/fastmap",
+	"util/time-utils",
 ]
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ 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>

@@ -66,7 +66,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
@@ -151,7 +151,7 @@ To start Parity Ethereum as a regular user using `systemd` init:

 ## 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:
+You can run tests with the following commands:

 * **All** packages
  ```
@@ -320,6 +320,10 @@ Caching, Importing Blocks, and Block Information
  patricia-trie-ethereum registrar rlp_compress rlp_derive parity-runtime stats
  time-utils triehash-ethereum unexpected parity-version
  ```
+* Parity Whisper Protocol Implementation
+  ```bash
+  parity-whisper whisper-cli
+  ```

 </p></details>

@@ -356,10 +360,10 @@ In addition to the Parity Ethereum client, there are additional tools in this re
 - [evmbin](./evmbin) - Parity Ethereum EVM Implementation.
 - [ethstore](./accounts/ethstore) - Parity Ethereum Key Management.
 - [ethkey](./accounts/ethkey) - Parity Ethereum Keys Generator.
+- [whisper](./whisper) - Parity Ethereum Whisper-v2 PoC Implementation.

 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>

--- 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
@@ -11,12 +11,11 @@ edition = "2018"
 ethkey = { path = "ethkey" }
 ethstore = { path = "ethstore" }
 log = "0.4"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parking_lot = "0.9"
+parking_lot = "0.7"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"

 [dev-dependencies]
-ethereum-types = "0.8.0"
+ethereum-types = "0.6.0"
 tempdir = "0.3"
--- a/accounts/ethkey/Cargo.toml
+++ b/accounts/ethkey/Cargo.toml
@@ -1,13 +1,21 @@
 [package]
 description = "Parity Ethereum Keys Generator"
 name = "ethkey"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
 edit-distance = "2.0"
+parity-crypto = "0.4.0"
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
+ethereum-types = "0.6.0"
+lazy_static = "1.0"
 log = "0.4"
+parity-wordlist = "1.3"
+quick-error = "1.2.2"
+rand = "0.6"
+rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-parity-wordlist = "1.3"
+tiny-keccak = "1.4"
+zeroize = "0.9.1"
--- a/accounts/ethkey/README.md
+++ b/accounts/ethkey/README.md
@@ -6,7 +6,7 @@ Parity Ethereum keys generator.

 ```
 Parity Ethereum Keys Generator.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.

 Usage:
    ethkey info <secret-or-phrase> [options]
@@ -218,4 +218,4 @@ _This project is a part of the Parity Ethereum toolchain._
 - [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
 - [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
 - [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
- [whisper](https://github.com/paritytech/whisper) - Implementation of Whisper-v2 PoC.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
--- a/accounts/ethkey/cli/Cargo.toml
+++ b/accounts/ethkey/cli/Cargo.toml
@@ -9,7 +9,6 @@ docopt = "1.0"
 env_logger = "0.5"
 ethkey = { path = "../" }
 panic_hook = { path = "../../../util/panic-hook" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
 parity-wordlist="1.2"
 rustc-hex = "1.0"
 serde = "1.0"
--- a/accounts/ethkey/cli/src/main.rs
+++ b/accounts/ethkey/cli/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -19,7 +19,6 @@ extern crate env_logger;
 extern crate ethkey;
 extern crate panic_hook;
 extern crate parity_wordlist;
-extern crate parity_crypto;
 extern crate rustc_hex;
 extern crate serde;
 extern crate threadpool;
@@ -31,13 +30,12 @@ use std::num::ParseIntError;
 use std::{env, fmt, process, io, sync};

 use docopt::Docopt;
-use ethkey::{Brain, BrainPrefix, Prefix, brain_recover};
-use parity_crypto::publickey::{KeyPair, Random, Error as EthkeyError, Generator, sign, verify_public, verify_address};
+use ethkey::{KeyPair, Random, Brain, BrainPrefix, Prefix, Error as EthkeyError, Generator, sign, verify_public, verify_address, brain_recover};
 use rustc_hex::{FromHex, FromHexError};

 const USAGE: &'static str = r#"
 Parity Ethereum keys generator.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.

 Usage:
    ethkey info <secret-or-phrase> [options]
@@ -202,7 +200,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 			let keypair = Brain::new(phrase).generate().expect("Brain wallet generator is infallible; qed");
 			(keypair, Some(phrase_info))
 		} else {
-			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecretKey)?;
+			let secret = args.arg_secret_or_phrase.parse().map_err(|_| EthkeyError::InvalidSecret)?;
 			(KeyPair::from_secret(secret)?, None)
 		};
 		Ok(display(result, display_mode))
@@ -243,7 +241,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		};
 		Ok(display(result, display_mode))
 	} else if args.cmd_sign {
-		let secret = args.arg_secret.parse().map_err(|_| EthkeyError::InvalidSecretKey)?;
+		let secret = args.arg_secret.parse().map_err(|_| EthkeyError::InvalidSecret)?;
 		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
 		let signature = sign(&secret, &message)?;
 		Ok(format!("{}", signature))
@@ -251,7 +249,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		let signature = args.arg_signature.parse().map_err(|_| EthkeyError::InvalidSignature)?;
 		let message = args.arg_message.parse().map_err(|_| EthkeyError::InvalidMessage)?;
 		let ok = if args.cmd_public {
-			let public = args.arg_public.parse().map_err(|_| EthkeyError::InvalidPublicKey)?;
+			let public = args.arg_public.parse().map_err(|_| EthkeyError::InvalidPublic)?;
 			verify_public(&public, &signature, &message)?
 		} else if args.cmd_address {
 			let address = args.arg_address.parse().map_err(|_| EthkeyError::InvalidAddress)?;
--- a/accounts/ethkey/src/brain.rs
+++ b/accounts/ethkey/src/brain.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -14,9 +14,8 @@
 // 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::convert::Infallible;
-use parity_crypto::publickey::{KeyPair, Generator, Secret};
-use parity_crypto::Keccak256;
+use keccak::Keccak256;
+use super::{KeyPair, Generator, Secret};
 use parity_wordlist;

 /// Simple brainwallet.
@@ -33,7 +32,7 @@ impl Brain {
 }

 impl Generator for Brain {
-	type Error = Infallible;
+    type Error = ::Void;

 	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
 		let seed = self.0.clone();
@@ -46,7 +45,7 @@ impl Generator for Brain {
 			match i > 16384 {
 				false => i += 1,
 				true => {
-					if let Ok(pair) = Secret::import_key(&secret)
+					if let Ok(pair) = Secret::from_unsafe_slice(&secret)
 						.and_then(KeyPair::from_secret)
 					{
 						if pair.address()[0] == 0 {
@@ -62,8 +61,7 @@ impl Generator for Brain {

 #[cfg(test)]
 mod tests {
-	use Brain;
-	use parity_crypto::publickey::Generator;
+	use {Brain, Generator};

 	#[test]
 	fn test_brain() {
--- a/accounts/ethkey/src/brain_prefix.rs
+++ b/accounts/ethkey/src/brain_prefix.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -14,8 +14,7 @@
 // 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 super::Brain;
-use parity_crypto::publickey::{Generator, KeyPair, Error};
+use super::{Generator, KeyPair, Error, Brain};
 use parity_wordlist as wordlist;

 /// Tries to find brain-seed keypair with address starting with given prefix.
@@ -60,8 +59,7 @@ impl Generator for BrainPrefix {

 #[cfg(test)]
 mod tests {
-	use BrainPrefix;
-	use parity_crypto::publickey::Generator;
+	use {Generator, BrainPrefix};

 	#[test]
 	fn prefix_generator() {
--- a/accounts/ethkey/src/brain_recover.rs
+++ b/accounts/ethkey/src/brain_recover.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -19,8 +19,7 @@ use std::collections::HashSet;
 use edit_distance::edit_distance;
 use parity_wordlist;

-use super::Brain;
-use parity_crypto::publickey::{Address, Generator};
+use super::{Address, Brain, Generator};

 /// Tries to find a phrase for address, given the number
 /// of expected words and a partial phrase.
--- a/accounts/ethkey/src/crypto.rs
+++ b/accounts/ethkey/src/crypto.rs
@@ -0,0 +1,189 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use secp256k1;
+use std::io;
+use parity_crypto::error::SymmError;
+
+quick_error! {
+	#[derive(Debug)]
+	pub enum Error {
+		Secp(e: secp256k1::Error) {
+			display("secp256k1 error: {}", e)
+			cause(e)
+			from()
+		}
+		Io(e: io::Error) {
+			display("i/o error: {}", e)
+			cause(e)
+			from()
+		}
+		InvalidMessage {
+			display("invalid message")
+		}
+		Symm(e: SymmError) {
+			cause(e)
+			from()
+		}
+	}
+}
+
+/// ECDH functions
+pub mod ecdh {
+	use secp256k1::{self, ecdh, key};
+	use super::Error;
+	use {Secret, Public, SECP256K1};
+
+	/// Agree on a shared secret
+	pub fn agree(secret: &Secret, public: &Public) -> Result<Secret, Error> {
+		let context = &SECP256K1;
+		let pdata = {
+			let mut temp = [4u8; 65];
+			(&mut temp[1..65]).copy_from_slice(&public[0..64]);
+			temp
+		};
+
+		let publ = key::PublicKey::from_slice(context, &pdata)?;
+		let sec = key::SecretKey::from_slice(context, secret.as_bytes())?;
+		let shared = ecdh::SharedSecret::new_raw(context, &publ, &sec);
+
+		Secret::from_unsafe_slice(&shared[0..32])
+			.map_err(|_| Error::Secp(secp256k1::Error::InvalidSecretKey))
+	}
+}
+
+/// ECIES function
+pub mod ecies {
+	use parity_crypto::{aes, digest, hmac, is_equal};
+	use ethereum_types::H128;
+	use super::{ecdh, Error};
+	use {Random, Generator, Public, Secret};
+
+	/// Encrypt a message with a public key, writing an HMAC covering both
+	/// the plaintext and authenticated data.
+	///
+	/// Authenticated data may be empty.
+	pub fn encrypt(public: &Public, auth_data: &[u8], plain: &[u8]) -> Result<Vec<u8>, Error> {
+		let r = Random.generate()?;
+		let z = ecdh::agree(r.secret(), public)?;
+		let mut key = [0u8; 32];
+		kdf(&z, &[0u8; 0], &mut key);
+
+		let ekey = &key[0..16];
+		let mkey = hmac::SigKey::sha256(&digest::sha256(&key[16..32]));
+
+		let mut msg = vec![0u8; 1 + 64 + 16 + plain.len() + 32];
+		msg[0] = 0x04u8;
+		{
+			let msgd = &mut msg[1..];
+			msgd[0..64].copy_from_slice(r.public().as_bytes());
+			let iv = H128::random();
+			msgd[64..80].copy_from_slice(iv.as_bytes());
+			{
+				let cipher = &mut msgd[(64 + 16)..(64 + 16 + plain.len())];
+				aes::encrypt_128_ctr(ekey, iv.as_bytes(), plain, cipher)?;
+			}
+			let mut hmac = hmac::Signer::with(&mkey);
+			{
+				let cipher_iv = &msgd[64..(64 + 16 + plain.len())];
+				hmac.update(cipher_iv);
+			}
+			hmac.update(auth_data);
+			let sig = hmac.sign();
+			msgd[(64 + 16 + plain.len())..].copy_from_slice(&sig);
+		}
+		Ok(msg)
+	}
+
+	/// Decrypt a message with a secret key, checking HMAC for ciphertext
+	/// and authenticated data validity.
+	pub fn decrypt(secret: &Secret, auth_data: &[u8], encrypted: &[u8]) -> Result<Vec<u8>, Error> {
+		let meta_len = 1 + 64 + 16 + 32;
+		if encrypted.len() < meta_len  || encrypted[0] < 2 || encrypted[0] > 4 {
+			return Err(Error::InvalidMessage); //invalid message: publickey
+		}
+
+		let e = &encrypted[1..];
+		let p = Public::from_slice(&e[0..64]);
+		let z = ecdh::agree(secret, &p)?;
+		let mut key = [0u8; 32];
+		kdf(&z, &[0u8; 0], &mut key);
+
+		let ekey = &key[0..16];
+		let mkey = hmac::SigKey::sha256(&digest::sha256(&key[16..32]));
+
+		let clen = encrypted.len() - meta_len;
+		let cipher_with_iv = &e[64..(64+16+clen)];
+		let cipher_iv = &cipher_with_iv[0..16];
+		let cipher_no_iv = &cipher_with_iv[16..];
+		let msg_mac = &e[(64+16+clen)..];
+
+		// Verify tag
+		let mut hmac = hmac::Signer::with(&mkey);
+		hmac.update(cipher_with_iv);
+		hmac.update(auth_data);
+		let mac = hmac.sign();
+
+		if !is_equal(&mac.as_ref()[..], msg_mac) {
+			return Err(Error::InvalidMessage);
+		}
+
+		let mut msg = vec![0u8; clen];
+		aes::decrypt_128_ctr(ekey, cipher_iv, cipher_no_iv, &mut msg[..])?;
+		Ok(msg)
+	}
+
+	fn kdf(secret: &Secret, s1: &[u8], dest: &mut [u8]) {
+		// SEC/ISO/Shoup specify counter size SHOULD be equivalent
+		// to size of hash output, however, it also notes that
+		// the 4 bytes is okay. NIST specifies 4 bytes.
+		let mut ctr = 1u32;
+		let mut written = 0usize;
+		while written < dest.len() {
+			let mut hasher = digest::Hasher::sha256();
+			let ctrs = [(ctr >> 24) as u8, (ctr >> 16) as u8, (ctr >> 8) as u8, ctr as u8];
+			hasher.update(&ctrs);
+			hasher.update(secret.as_bytes());
+			hasher.update(s1);
+			let d = hasher.finish();
+			&mut dest[written..(written + 32)].copy_from_slice(&d);
+			written += 32;
+			ctr += 1;
+		}
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::ecies;
+	use {Random, Generator};
+
+	#[test]
+	fn ecies_shared() {
+		let kp = Random.generate().unwrap();
+		let message = b"So many books, so little time";
+
+		let shared = b"shared";
+		let wrong_shared = b"incorrect";
+		let encrypted = ecies::encrypt(kp.public(), shared, message).unwrap();
+		assert!(encrypted[..] != message[..]);
+		assert_eq!(encrypted[0], 0x04);
+
+		assert!(ecies::decrypt(kp.secret(), wrong_shared, &encrypted).is_err());
+		let decrypted = ecies::decrypt(kp.secret(), shared, &encrypted).unwrap();
+		assert_eq!(decrypted[..message.len()], message[..]);
+	}
+}
--- a/accounts/ethkey/src/error.rs
+++ b/accounts/ethkey/src/error.rs
@@ -0,0 +1,81 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::{fmt, error};
+
+#[derive(Debug)]
+/// Crypto error
+pub enum Error {
+	/// Invalid secret key
+	InvalidSecret,
+	/// Invalid public key
+	InvalidPublic,
+	/// Invalid address
+	InvalidAddress,
+	/// Invalid EC signature
+	InvalidSignature,
+	/// Invalid AES message
+	InvalidMessage,
+	/// IO Error
+	Io(::std::io::Error),
+	/// Custom
+	Custom(String),
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		let msg = match *self {
+			Error::InvalidSecret => "Invalid secret".into(),
+			Error::InvalidPublic => "Invalid public".into(),
+			Error::InvalidAddress => "Invalid address".into(),
+			Error::InvalidSignature => "Invalid EC signature".into(),
+			Error::InvalidMessage => "Invalid AES message".into(),
+			Error::Io(ref err) => format!("I/O error: {}", err),
+			Error::Custom(ref s) => s.clone(),
+		};
+
+		f.write_fmt(format_args!("Crypto error ({})", msg))
+	}
+}
+
+impl error::Error for Error {
+	fn description(&self) -> &str {
+		"Crypto error"
+	}
+}
+
+impl Into<String> for Error {
+	fn into(self) -> String {
+		format!("{}", self)
+	}
+}
+
+impl From<::secp256k1::Error> for Error {
+	fn from(e: ::secp256k1::Error) -> Error {
+		match e {
+			::secp256k1::Error::InvalidMessage => Error::InvalidMessage,
+			::secp256k1::Error::InvalidPublicKey => Error::InvalidPublic,
+			::secp256k1::Error::InvalidSecretKey => Error::InvalidSecret,
+			_ => Error::InvalidSignature,
+		}
+	}
+}
+
+impl From<::std::io::Error> for Error {
+	fn from(err: ::std::io::Error) -> Error {
+		Error::Io(err)
+	}
+}
--- a/accounts/ethkey/src/extended.rs
+++ b/accounts/ethkey/src/extended.rs
@@ -0,0 +1,517 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Extended keys
+
+use secret::Secret;
+use Public;
+use ethereum_types::H256;
+pub use self::derivation::Error as DerivationError;
+
+/// Represents label that can be stored as a part of key derivation
+pub trait Label {
+	/// Length of the data that label occupies
+	fn len() -> usize;
+
+	/// Store label data to the key derivation sequence
+	/// Must not use more than `len()` bytes from slice
+	fn store(&self, target: &mut [u8]);
+}
+
+impl Label for u32 {
+	fn len() -> usize { 4 }
+
+	fn store(&self, target: &mut [u8]) {
+		let bytes = self.to_be_bytes();
+		target[0..4].copy_from_slice(&bytes);
+	}
+}
+
+/// Key derivation over generic label `T`
+pub enum Derivation<T: Label> {
+	/// Soft key derivation (allow proof of parent)
+	Soft(T),
+	/// Hard key derivation (does not allow proof of parent)
+	Hard(T),
+}
+
+impl From<u32> for Derivation<u32> {
+	fn from(index: u32) -> Self {
+		if index < (2 << 30) {
+			Derivation::Soft(index)
+		}
+		else {
+			Derivation::Hard(index)
+		}
+	}
+}
+
+impl Label for H256 {
+	fn len() -> usize { 32 }
+
+	fn store(&self, target: &mut [u8]) {
+		(&mut target[0..32]).copy_from_slice(self.as_bytes());
+	}
+}
+
+/// Extended secret key, allows deterministic derivation of subsequent keys.
+pub struct ExtendedSecret {
+	secret: Secret,
+	chain_code: H256,
+}
+
+impl ExtendedSecret {
+	/// New extended key from given secret and chain code.
+	pub fn with_code(secret: Secret, chain_code: H256) -> ExtendedSecret {
+		ExtendedSecret {
+			secret: secret,
+			chain_code: chain_code,
+		}
+	}
+
+	/// New extended key from given secret with the random chain code.
+	pub fn new_random(secret: Secret) -> ExtendedSecret {
+		ExtendedSecret::with_code(secret, H256::random())
+	}
+
+	/// New extended key from given secret.
+	/// Chain code will be derived from the secret itself (in a deterministic way).
+	pub fn new(secret: Secret) -> ExtendedSecret {
+		let chain_code = derivation::chain_code(*secret);
+		ExtendedSecret::with_code(secret, chain_code)
+	}
+
+	/// Derive new private key
+	pub fn derive<T>(&self, index: Derivation<T>) -> ExtendedSecret where T: Label {
+		let (derived_key, next_chain_code) = derivation::private(*self.secret, self.chain_code, index);
+
+		let derived_secret = Secret::from(derived_key.0);
+
+		ExtendedSecret::with_code(derived_secret, next_chain_code)
+	}
+
+	/// Private key component of the extended key.
+	pub fn as_raw(&self) -> &Secret {
+		&self.secret
+	}
+}
+
+/// Extended public key, allows deterministic derivation of subsequent keys.
+pub struct ExtendedPublic {
+	public: Public,
+	chain_code: H256,
+}
+
+impl ExtendedPublic {
+	/// New extended public key from known parent and chain code
+	pub fn new(public: Public, chain_code: H256) -> Self {
+		ExtendedPublic { public: public, chain_code: chain_code }
+	}
+
+	/// Create new extended public key from known secret
+	pub fn from_secret(secret: &ExtendedSecret) -> Result<Self, DerivationError> {
+		Ok(
+			ExtendedPublic::new(
+				derivation::point(**secret.as_raw())?,
+				secret.chain_code.clone(),
+			)
+		)
+	}
+
+	/// Derive new public key
+	/// Operation is defined only for index belongs [0..2^31)
+	pub fn derive<T>(&self, index: Derivation<T>) -> Result<Self, DerivationError> where T: Label {
+		let (derived_key, next_chain_code) = derivation::public(self.public, self.chain_code, index)?;
+		Ok(ExtendedPublic::new(derived_key, next_chain_code))
+	}
+
+	pub fn public(&self) -> &Public {
+		&self.public
+	}
+}
+
+pub struct ExtendedKeyPair {
+	secret: ExtendedSecret,
+	public: ExtendedPublic,
+}
+
+impl ExtendedKeyPair {
+	pub fn new(secret: Secret) -> Self {
+		let extended_secret = ExtendedSecret::new(secret);
+		let extended_public = ExtendedPublic::from_secret(&extended_secret)
+			.expect("Valid `Secret` always produces valid public; qed");
+		ExtendedKeyPair {
+			secret: extended_secret,
+			public: extended_public,
+		}
+	}
+
+	pub fn with_code(secret: Secret, public: Public, chain_code: H256) -> Self {
+		ExtendedKeyPair {
+			secret: ExtendedSecret::with_code(secret, chain_code.clone()),
+			public: ExtendedPublic::new(public, chain_code),
+		}
+	}
+
+	pub fn with_secret(secret: Secret, chain_code: H256) -> Self {
+		let extended_secret = ExtendedSecret::with_code(secret, chain_code);
+		let extended_public = ExtendedPublic::from_secret(&extended_secret)
+			.expect("Valid `Secret` always produces valid public; qed");
+		ExtendedKeyPair {
+			secret: extended_secret,
+			public: extended_public,
+		}
+	}
+
+	pub fn with_seed(seed: &[u8]) -> Result<ExtendedKeyPair, DerivationError> {
+		let (master_key, chain_code) = derivation::seed_pair(seed);
+		Ok(ExtendedKeyPair::with_secret(
+			Secret::from_unsafe_slice(master_key.as_bytes()).map_err(|_| DerivationError::InvalidSeed)?,
+			chain_code,
+		))
+	}
+
+	pub fn secret(&self) -> &ExtendedSecret {
+		&self.secret
+	}
+
+	pub fn public(&self) -> &ExtendedPublic {
+		&self.public
+	}
+
+	pub fn derive<T>(&self, index: Derivation<T>) -> Result<Self, DerivationError> where T: Label {
+		let derived = self.secret.derive(index);
+
+		Ok(ExtendedKeyPair {
+			public: ExtendedPublic::from_secret(&derived)?,
+			secret: derived,
+		})
+	}
+}
+
+// Derivation functions for private and public keys
+// Work is based on BIP0032
+// https://github.com/bitcoin/bips/blob/master/bip-0032.mediawiki
+mod derivation {
+	use parity_crypto::hmac;
+	use ethereum_types::{BigEndianHash, U256, U512, H512, H256};
+	use secp256k1::key::{SecretKey, PublicKey};
+	use SECP256K1;
+	use keccak;
+	use math::curve_order;
+	use super::{Label, Derivation};
+	use std::convert::TryInto;
+
+	#[derive(Debug)]
+	pub enum Error {
+		InvalidHardenedUse,
+		InvalidPoint,
+		MissingIndex,
+		InvalidSeed,
+	}
+
+	// Deterministic derivation of the key using secp256k1 elliptic curve.
+	// Derivation can be either hardened or not.
+	// For hardened derivation, pass u32 index at least 2^31 or custom Derivation::Hard(T) enum
+	//
+	// Can panic if passed `private_key` is not a valid secp256k1 private key
+	// (outside of (0..curve_order()]) field
+	pub fn private<T>(private_key: H256, chain_code: H256, index: Derivation<T>) -> (H256, H256) where T: Label {
+		match index {
+			Derivation::Soft(index) => private_soft(private_key, chain_code, index),
+			Derivation::Hard(index) => private_hard(private_key, chain_code, index),
+		}
+	}
+
+	fn hmac_pair(data: &[u8], private_key: H256, chain_code: H256) -> (H256, H256) {
+		let private: U256 = private_key.into_uint();
+
+		// produces 512-bit derived hmac (I)
+		let skey = hmac::SigKey::sha512(chain_code.as_bytes());
+		let i_512 = hmac::sign(&skey, &data[..]);
+
+		// left most 256 bits are later added to original private key
+		let hmac_key: U256 = H256::from_slice(&i_512[0..32]).into_uint();
+		// right most 256 bits are new chain code for later derivations
+		let next_chain_code = H256::from_slice(&i_512[32..64]);
+
+		let child_key = BigEndianHash::from_uint(&private_add(hmac_key, private));
+		(child_key, next_chain_code)
+	}
+
+	// Can panic if passed `private_key` is not a valid secp256k1 private key
+	// (outside of (0..curve_order()]) field
+	fn private_soft<T>(private_key: H256, chain_code: H256, index: T) -> (H256, H256) where T: Label {
+		let mut data = vec![0u8; 33 + T::len()];
+
+		let sec_private = SecretKey::from_slice(&SECP256K1, private_key.as_bytes())
+			.expect("Caller should provide valid private key");
+		let sec_public = PublicKey::from_secret_key(&SECP256K1, &sec_private)
+			.expect("Caller should provide valid private key");
+		let public_serialized = sec_public.serialize_vec(&SECP256K1, true);
+
+		// curve point (compressed public key) --  index
+		//             0.33                    --  33..end
+		data[0..33].copy_from_slice(&public_serialized);
+		index.store(&mut data[33..]);
+
+		hmac_pair(&data, private_key, chain_code)
+	}
+
+	// Deterministic derivation of the key using secp256k1 elliptic curve
+	// This is hardened derivation and does not allow to associate
+	// corresponding public keys of the original and derived private keys
+	fn private_hard<T>(private_key: H256, chain_code: H256, index: T) -> (H256, H256) where T: Label {
+		let mut data: Vec<u8> = vec![0u8; 33 + T::len()];
+		let private: U256 = private_key.into_uint();
+
+		// 0x00 (padding) -- private_key --  index
+		//  0             --    1..33    -- 33..end
+		private.to_big_endian(&mut data[1..33]);
+		index.store(&mut data[33..(33 + T::len())]);
+
+		hmac_pair(&data, private_key, chain_code)
+	}
+
+	fn private_add(k1: U256, k2: U256) -> U256 {
+		let sum = U512::from(k1) + U512::from(k2);
+		modulo(sum, curve_order())
+	}
+
+	// todo: surely can be optimized
+	fn modulo(u1: U512, u2: U256) -> U256 {
+		let m = u1 % U512::from(u2);
+		m.try_into().expect("U512 modulo U256 should fit into U256; qed")
+	}
+
+	pub fn public<T>(public_key: H512, chain_code: H256, derivation: Derivation<T>) -> Result<(H512, H256), Error> where T: Label {
+		let index = match derivation {
+			Derivation::Soft(index) => index,
+			Derivation::Hard(_) => { return Err(Error::InvalidHardenedUse); }
+		};
+
+		let mut public_sec_raw = [0u8; 65];
+		public_sec_raw[0] = 4;
+		public_sec_raw[1..65].copy_from_slice(public_key.as_bytes());
+		let public_sec = PublicKey::from_slice(&SECP256K1, &public_sec_raw).map_err(|_| Error::InvalidPoint)?;
+		let public_serialized = public_sec.serialize_vec(&SECP256K1, true);
+
+		let mut data = vec![0u8; 33 + T::len()];
+		// curve point (compressed public key) --  index
+		//             0.33                    --  33..end
+		data[0..33].copy_from_slice(&public_serialized);
+		index.store(&mut data[33..(33 + T::len())]);
+
+		// HMAC512SHA produces [derived private(256); new chain code(256)]
+		let skey = hmac::SigKey::sha512(chain_code.as_bytes());
+		let i_512 = hmac::sign(&skey, &data[..]);
+
+		let new_private = H256::from_slice(&i_512[0..32]);
+		let new_chain_code = H256::from_slice(&i_512[32..64]);
+
+		// Generated private key can (extremely rarely) be out of secp256k1 key field
+		if curve_order() <= new_private.into_uint() { return Err(Error::MissingIndex); }
+		let new_private_sec = SecretKey::from_slice(&SECP256K1, new_private.as_bytes())
+			.expect("Private key belongs to the field [0..CURVE_ORDER) (checked above); So initializing can never fail; qed");
+		let mut new_public = PublicKey::from_secret_key(&SECP256K1, &new_private_sec)
+			.expect("Valid private key produces valid public key");
+
+		// Adding two points on the elliptic curves (combining two public keys)
+		new_public.add_assign(&SECP256K1, &public_sec)
+			.expect("Addition of two valid points produce valid point");
+
+		let serialized = new_public.serialize_vec(&SECP256K1, false);
+
+		Ok((
+			H512::from_slice(&serialized[1..65]),
+			new_chain_code,
+		))
+	}
+
+	fn sha3(slc: &[u8]) -> H256 {
+		keccak::Keccak256::keccak256(slc).into()
+	}
+
+	pub fn chain_code(secret: H256) -> H256 {
+		// 10,000 rounds of sha3
+		let mut running_sha3 = sha3(secret.as_bytes());
+		for _ in 0..99999 { running_sha3 = sha3(running_sha3.as_bytes()); }
+		running_sha3
+	}
+
+	pub fn point(secret: H256) -> Result<H512, Error> {
+		let sec = SecretKey::from_slice(&SECP256K1, secret.as_bytes())
+			.map_err(|_| Error::InvalidPoint)?;
+		let public_sec = PublicKey::from_secret_key(&SECP256K1, &sec)
+			.map_err(|_| Error::InvalidPoint)?;
+		let serialized = public_sec.serialize_vec(&SECP256K1, false);
+		Ok(H512::from_slice(&serialized[1..65]))
+	}
+
+	pub fn seed_pair(seed: &[u8]) -> (H256, H256) {
+		let skey = hmac::SigKey::sha512(b"Bitcoin seed");
+		let i_512 = hmac::sign(&skey, seed);
+
+		let master_key = H256::from_slice(&i_512[0..32]);
+		let chain_code = H256::from_slice(&i_512[32..64]);
+
+		(master_key, chain_code)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use super::{ExtendedSecret, ExtendedPublic, ExtendedKeyPair};
+	use secret::Secret;
+	use std::str::FromStr;
+	use ethereum_types::{H128, H256, H512};
+	use super::{derivation, Derivation};
+
+	fn master_chain_basic() -> (H256, H256) {
+		let seed = H128::from_str("000102030405060708090a0b0c0d0e0f")
+			.expect("Seed should be valid H128")
+			.as_bytes()
+			.to_vec();
+
+		derivation::seed_pair(&*seed)
+	}
+
+	fn test_extended<F>(f: F, test_private: H256) where F: Fn(ExtendedSecret) -> ExtendedSecret {
+		let (private_seed, chain_code) = master_chain_basic();
+		let extended_secret = ExtendedSecret::with_code(Secret::from(private_seed.0), chain_code);
+		let derived = f(extended_secret);
+		assert_eq!(**derived.as_raw(), test_private);
+	}
+
+	#[test]
+	fn smoky() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::zero());
+
+		// hardened
+		assert_eq!(&**extended_secret.as_raw(), &*secret);
+		assert_eq!(
+			**extended_secret.derive(2147483648.into()).as_raw(),
+			H256::from_str("0927453daed47839608e414a3738dfad10aed17c459bbd9ab53f89b026c834b6").unwrap(),
+		);
+		assert_eq!(
+			**extended_secret.derive(2147483649.into()).as_raw(),
+			H256::from_str("44238b6a29c6dcbe9b401364141ba11e2198c289a5fed243a1c11af35c19dc0f").unwrap(),
+		);
+
+		// normal
+		assert_eq!(**extended_secret.derive(0.into()).as_raw(), H256::from_str("bf6a74e3f7b36fc4c96a1e12f31abc817f9f5904f5a8fc27713163d1f0b713f6").unwrap());
+		assert_eq!(**extended_secret.derive(1.into()).as_raw(), H256::from_str("bd4fca9eb1f9c201e9448c1eecd66e302d68d4d313ce895b8c134f512205c1bc").unwrap());
+		assert_eq!(**extended_secret.derive(2.into()).as_raw(), H256::from_str("86932b542d6cab4d9c65490c7ef502d89ecc0e2a5f4852157649e3251e2a3268").unwrap());
+
+		let extended_public = ExtendedPublic::from_secret(&extended_secret).expect("Extended public should be created");
+		let derived_public = extended_public.derive(0.into()).expect("First derivation of public should succeed");
+		assert_eq!(
+			*derived_public.public(),
+			H512::from_str("f7b3244c96688f92372bfd4def26dc4151529747bab9f188a4ad34e141d47bd66522ff048bc6f19a0a4429b04318b1a8796c000265b4fa200dae5f6dda92dd94").unwrap(),
+		);
+
+		let keypair = ExtendedKeyPair::with_secret(
+			Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap(),
+			H256::from_low_u64_be(64),
+		);
+		assert_eq!(
+			**keypair.derive(2147483648u32.into()).expect("Derivation of keypair should succeed").secret().as_raw(),
+			H256::from_str("edef54414c03196557cf73774bc97a645c9a1df2164ed34f0c2a78d1375a930c").unwrap(),
+		);
+	}
+
+	#[test]
+	fn h256_soft_match() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let derivation_secret = H256::from_str("51eaf04f9dbbc1417dc97e789edd0c37ecda88bac490434e367ea81b71b7b015").unwrap();
+
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::zero());
+		let extended_public = ExtendedPublic::from_secret(&extended_secret).expect("Extended public should be created");
+
+		let derived_secret0 = extended_secret.derive(Derivation::Soft(derivation_secret));
+		let derived_public0 = extended_public.derive(Derivation::Soft(derivation_secret)).expect("First derivation of public should succeed");
+
+		let public_from_secret0 = ExtendedPublic::from_secret(&derived_secret0).expect("Extended public should be created");
+
+		assert_eq!(public_from_secret0.public(), derived_public0.public());
+	}
+
+	#[test]
+	fn h256_hard() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let derivation_secret = H256::from_str("51eaf04f9dbbc1417dc97e789edd0c37ecda88bac490434e367ea81b71b7b015").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::from_low_u64_be(1));
+
+		assert_eq!(
+			**extended_secret.derive(Derivation::Hard(derivation_secret)).as_raw(),
+			H256::from_str("2bc2d696fb744d77ff813b4a1ef0ad64e1e5188b622c54ba917acc5ebc7c5486").unwrap(),
+		);
+	}
+
+	#[test]
+	fn match_() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), H256::from_low_u64_be(1));
+		let extended_public = ExtendedPublic::from_secret(&extended_secret).expect("Extended public should be created");
+
+		let derived_secret0 = extended_secret.derive(0.into());
+		let derived_public0 = extended_public.derive(0.into()).expect("First derivation of public should succeed");
+
+		let public_from_secret0 = ExtendedPublic::from_secret(&derived_secret0).expect("Extended public should be created");
+
+		assert_eq!(public_from_secret0.public(), derived_public0.public());
+	}
+
+	#[test]
+	fn test_seeds() {
+		let seed = H128::from_str("000102030405060708090a0b0c0d0e0f")
+			.expect("Seed should be valid H128")
+			.as_bytes()
+			.to_vec();
+
+		// private key from bitcoin test vector
+		// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
+		let test_private = H256::from_str("e8f32e723decf4051aefac8e2c93c9c5b214313817cdb01a1494b917c8436b35")
+			.expect("Private should be decoded ok");
+
+		let (private_seed, _) = derivation::seed_pair(&*seed);
+
+		assert_eq!(private_seed, test_private);
+	}
+
+	#[test]
+	fn test_vector_1() {
+		// xprv9uHRZZhk6KAJC1avXpDAp4MDc3sQKNxDiPvvkX8Br5ngLNv1TxvUxt4cV1rGL5hj6KCesnDYUhd7oWgT11eZG7XnxHrnYeSvkzY7d2bhkJ7
+		// H(0)
+		test_extended(
+			|secret| secret.derive(2147483648.into()),
+			H256::from_str("edb2e14f9ee77d26dd93b4ecede8d16ed408ce149b6cd80b0715a2d911a0afea")
+				.expect("Private should be decoded ok")
+		);
+	}
+
+	#[test]
+	fn test_vector_2() {
+		// xprv9wTYmMFdV23N2TdNG573QoEsfRrWKQgWeibmLntzniatZvR9BmLnvSxqu53Kw1UmYPxLgboyZQaXwTCg8MSY3H2EU4pWcQDnRnrVA1xe8fs
+		// H(0)/1
+		test_extended(
+			|secret| secret.derive(2147483648.into()).derive(1.into()),
+			H256::from_str("3c6cb8d0f6a264c91ea8b5030fadaa8e538b020f0a387421a12de9319dc93368")
+				.expect("Private should be decoded ok")
+		);
+	}
+}
--- a/accounts/ethkey/src/keccak.rs
+++ b/accounts/ethkey/src/keccak.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -14,23 +14,18 @@
 // 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.
+use tiny_keccak::Keccak;

-mod engine;
-pub mod signer;
+pub trait Keccak256<T> {
+	fn keccak256(&self) -> T where T: Sized;
+}

-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;
+impl Keccak256<[u8; 32]> for [u8] {
+	fn keccak256(&self) -> [u8; 32] {
+		let mut keccak = Keccak::new_keccak256();
+		let mut result = [0u8; 32];
+		keccak.update(self);
+		keccak.finalize(&mut result);
+		result
+	}
+}
--- a/accounts/ethkey/src/keypair.rs
+++ b/accounts/ethkey/src/keypair.rs
@@ -0,0 +1,114 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::fmt;
+use secp256k1::key;
+use super::{Secret, Public, Address, SECP256K1, Error};
+use parity_crypto::Keccak256 as _;
+
+pub fn public_to_address(public: &Public) -> Address {
+	let hash = public.keccak256();
+	let mut result = Address::zero();
+	result.as_bytes_mut().copy_from_slice(&hash[12..]);
+	result
+}
+
+#[derive(Debug, Clone, PartialEq)]
+/// secp256k1 key pair
+pub struct KeyPair {
+	secret: Secret,
+	public: Public,
+}
+
+impl fmt::Display for KeyPair {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		writeln!(f, "secret:  {:x}", self.secret)?;
+		writeln!(f, "public:  {:x}", self.public)?;
+		write!(f, "address: {:x}", self.address())
+	}
+}
+
+impl KeyPair {
+	/// Create a pair from secret key
+	pub fn from_secret(secret: Secret) -> Result<KeyPair, Error> {
+		let context = &SECP256K1;
+		let s: key::SecretKey = key::SecretKey::from_slice(context, &secret[..])?;
+		let pub_key = key::PublicKey::from_secret_key(context, &s)?;
+		let serialized = pub_key.serialize_vec(context, false);
+
+		let mut public = Public::default();
+		public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
+
+		let keypair = KeyPair {
+			secret: secret,
+			public: public,
+		};
+
+		Ok(keypair)
+	}
+
+	pub fn from_secret_slice(slice: &[u8]) -> Result<KeyPair, Error> {
+		Self::from_secret(Secret::from_unsafe_slice(slice)?)
+	}
+
+	pub fn from_keypair(sec: key::SecretKey, publ: key::PublicKey) -> Self {
+		let context = &SECP256K1;
+		let serialized = publ.serialize_vec(context, false);
+		let secret = Secret::from(sec);
+		let mut public = Public::default();
+		public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
+
+		KeyPair {
+			secret: secret,
+			public: public,
+		}
+	}
+
+	pub fn secret(&self) -> &Secret {
+		&self.secret
+	}
+
+	pub fn public(&self) -> &Public {
+		&self.public
+	}
+
+	pub fn address(&self) -> Address {
+		public_to_address(&self.public)
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use {KeyPair, Secret};
+
+	#[test]
+	fn from_secret() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let _ = KeyPair::from_secret(secret).unwrap();
+	}
+
+	#[test]
+	fn keypair_display() {
+		let expected =
+"secret:  a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65
+public:  8ce0db0b0359ffc5866ba61903cc2518c3675ef2cf380a7e54bde7ea20e6fa1ab45b7617346cd11b7610001ee6ae5b0155c41cad9527cbcdff44ec67848943a4
+address: 5b073e9233944b5e729e46d618f0d8edf3d9c34a".to_owned();
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let kp = KeyPair::from_secret(secret).unwrap();
+		assert_eq!(format!("{}", kp), expected);
+	}
+}
--- a/accounts/ethkey/src/lib.rs
+++ b/accounts/ethkey/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -18,9 +18,19 @@

 extern crate edit_distance;
 extern crate parity_crypto;
+extern crate ethereum_types;
 extern crate parity_wordlist;
+#[macro_use]
+extern crate quick_error;
+extern crate rand;
+extern crate rustc_hex;
+extern crate secp256k1;
 extern crate serde;
+extern crate tiny_keccak;
+extern crate zeroize;

+#[macro_use]
+extern crate lazy_static;
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -28,13 +38,50 @@ extern crate serde_derive;

 mod brain;
 mod brain_prefix;
+mod error;
+mod keypair;
+mod keccak;
 mod password;
 mod prefix;
+mod random;
+mod signature;
+mod secret;
+mod extended;

 pub mod brain_recover;
+pub mod crypto;
+pub mod math;

 pub use self::parity_wordlist::Error as WordlistError;
 pub use self::brain::Brain;
 pub use self::brain_prefix::BrainPrefix;
+pub use self::error::Error;
+pub use self::keypair::{KeyPair, public_to_address};
+pub use self::math::public_is_valid;
 pub use self::password::Password;
-pub use self::prefix::Prefix;
+pub use self::prefix::Prefix;
+pub use self::random::Random;
+pub use self::signature::{sign, verify_public, verify_address, recover, Signature};
+pub use self::secret::Secret;
+pub use self::extended::{ExtendedPublic, ExtendedSecret, ExtendedKeyPair, DerivationError, Derivation};
+
+use ethereum_types::H256;
+
+pub use ethereum_types::{Address, Public};
+pub type Message = H256;
+
+lazy_static! {
+	pub static ref SECP256K1: secp256k1::Secp256k1 = secp256k1::Secp256k1::new();
+}
+
+/// Uninstantiatable error type for infallible generators.
+#[derive(Debug)]
+pub enum Void {}
+
+/// Generates new keypair.
+pub trait Generator {
+	type Error;
+
+	/// Should be called to generate new keypair.
+	fn generate(&mut self) -> Result<KeyPair, Self::Error>;
+}
--- a/accounts/ethkey/src/math.rs
+++ b/accounts/ethkey/src/math.rs
@@ -0,0 +1,129 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use super::{SECP256K1, Public, Secret, Error};
+use secp256k1::key;
+use secp256k1::constants::{GENERATOR_X, GENERATOR_Y, CURVE_ORDER};
+use ethereum_types::{BigEndianHash as _, U256, H256};
+
+/// Whether the public key is valid.
+pub fn public_is_valid(public: &Public) -> bool {
+	to_secp256k1_public(public).ok()
+		.map_or(false, |p| p.is_valid())
+}
+
+/// Inplace multiply public key by secret key (EC point * scalar)
+pub fn public_mul_secret(public: &mut Public, secret: &Secret) -> Result<(), Error> {
+	let key_secret = secret.to_secp256k1_secret()?;
+	let mut key_public = to_secp256k1_public(public)?;
+	key_public.mul_assign(&SECP256K1, &key_secret)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Inplace add one public key to another (EC point + EC point)
+pub fn public_add(public: &mut Public, other: &Public) -> Result<(), Error> {
+	let mut key_public = to_secp256k1_public(public)?;
+	let other_public = to_secp256k1_public(other)?;
+	key_public.add_assign(&SECP256K1, &other_public)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Inplace sub one public key from another (EC point - EC point)
+pub fn public_sub(public: &mut Public, other: &Public) -> Result<(), Error> {
+	let mut key_neg_other = to_secp256k1_public(other)?;
+	key_neg_other.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+	let mut key_public = to_secp256k1_public(public)?;
+	key_public.add_assign(&SECP256K1, &key_neg_other)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Replace public key with its negation (EC point = - EC point)
+pub fn public_negate(public: &mut Public) -> Result<(), Error> {
+	let mut key_public = to_secp256k1_public(public)?;
+	key_public.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+	set_public(public, &key_public);
+	Ok(())
+}
+
+/// Return base point of secp256k1
+pub fn generation_point() -> Public {
+	let mut public_sec_raw = [0u8; 65];
+	public_sec_raw[0] = 4;
+	public_sec_raw[1..33].copy_from_slice(&GENERATOR_X);
+	public_sec_raw[33..65].copy_from_slice(&GENERATOR_Y);
+
+	let public_key = key::PublicKey::from_slice(&SECP256K1, &public_sec_raw)
+		.expect("constructing using predefined constants; qed");
+	let mut public = Public::default();
+	set_public(&mut public, &public_key);
+	public
+}
+
+/// Return secp256k1 elliptic curve order
+pub fn curve_order() -> U256 {
+	H256::from_slice(&CURVE_ORDER).into_uint()
+}
+
+fn to_secp256k1_public(public: &Public) -> Result<key::PublicKey, Error> {
+	let public_data = {
+		let mut temp = [4u8; 65];
+		(&mut temp[1..65]).copy_from_slice(&public[0..64]);
+		temp
+	};
+
+	Ok(key::PublicKey::from_slice(&SECP256K1, &public_data)?)
+}
+
+fn set_public(public: &mut Public, key_public: &key::PublicKey) {
+	let key_public_serialized = key_public.serialize_vec(&SECP256K1, false);
+	public.as_bytes_mut().copy_from_slice(&key_public_serialized[1..65]);
+}
+
+#[cfg(test)]
+mod tests {
+	use super::super::{Random, Generator};
+	use super::{public_add, public_sub};
+
+	#[test]
+	fn public_addition_is_commutative() {
+		let public1 = Random.generate().unwrap().public().clone();
+		let public2 = Random.generate().unwrap().public().clone();
+
+		let mut left = public1.clone();
+		public_add(&mut left, &public2).unwrap();
+
+		let mut right = public2.clone();
+		public_add(&mut right, &public1).unwrap();
+
+		assert_eq!(left, right);
+	}
+
+	#[test]
+	fn public_addition_is_reversible_with_subtraction() {
+		let public1 = Random.generate().unwrap().public().clone();
+		let public2 = Random.generate().unwrap().public().clone();
+
+		let mut sum = public1.clone();
+		public_add(&mut sum, &public2).unwrap();
+		public_sub(&mut sum, &public2).unwrap();
+
+		assert_eq!(sum, public1);
+	}
+}
--- a/accounts/ethkey/src/password.rs
+++ b/accounts/ethkey/src/password.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethkey/src/prefix.rs
+++ b/accounts/ethkey/src/prefix.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -14,7 +14,7 @@
 // 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 parity_crypto::publickey::{Random, Generator, KeyPair, Error};
+use super::{Random, Generator, KeyPair, Error};

 /// Tries to find keypair with address starting with given prefix.
 pub struct Prefix {
@@ -48,8 +48,7 @@ impl Generator for Prefix {

 #[cfg(test)]
 mod tests {
-	use Prefix;
-	use parity_crypto::publickey::Generator;
+	use {Generator, Prefix};

 	#[test]
 	fn prefix_generator() {
--- a/accounts/ethkey/src/random.rs
+++ b/accounts/ethkey/src/random.rs
@@ -0,0 +1,44 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use rand::rngs::OsRng;
+use super::{Generator, KeyPair, SECP256K1};
+
+/// Randomly generates new keypair, instantiating the RNG each time.
+pub struct Random;
+
+impl Generator for Random {
+	type Error = ::std::io::Error;
+
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+		let mut rng = OsRng::new()?;
+		match rng.generate() {
+			Ok(pair) => Ok(pair),
+			Err(void) => match void {}, // LLVM unreachable
+		}
+	}
+}
+
+impl Generator for OsRng {
+	type Error = ::Void;
+
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
+		let (sec, publ) = SECP256K1.generate_keypair(self)
+			.expect("context always created with full capabilities; qed");
+
+		Ok(KeyPair::from_keypair(sec, publ))
+	}
+}
--- a/accounts/ethkey/src/secret.rs
+++ b/accounts/ethkey/src/secret.rs
@@ -0,0 +1,304 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::fmt;
+use std::ops::Deref;
+use std::str::FromStr;
+use rustc_hex::ToHex;
+use secp256k1::constants::{SECRET_KEY_SIZE as SECP256K1_SECRET_KEY_SIZE};
+use secp256k1::key;
+use ethereum_types::H256;
+use zeroize::Zeroize;
+use {Error, SECP256K1};
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct Secret {
+	inner: H256,
+}
+
+impl Drop for Secret {
+	fn drop(&mut self) {
+		self.inner.0.zeroize()
+	}
+}
+
+impl ToHex for Secret {
+	fn to_hex(&self) -> String {
+		format!("{:x}", self.inner)
+	}
+}
+
+impl fmt::LowerHex for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		self.inner.fmt(fmt)
+	}
+}
+
+impl fmt::Debug for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		self.inner.fmt(fmt)
+	}
+}
+
+impl fmt::Display for Secret {
+	fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
+		write!(fmt, "Secret: 0x{:x}{:x}..{:x}{:x}", self.inner[0], self.inner[1], self.inner[30], self.inner[31])
+	}
+}
+
+impl Secret {
+	/// Creates a `Secret` from the given slice, returning `None` if the slice length != 32.
+	pub fn from_slice(key: &[u8]) -> Option<Self> {
+		if key.len() != 32 {
+			return None
+		}
+		let mut h = H256::zero();
+		h.as_bytes_mut().copy_from_slice(&key[0..32]);
+		Some(Secret { inner: h })
+	}
+
+	/// Creates zero key, which is invalid for crypto operations, but valid for math operation.
+	pub fn zero() -> Self {
+		Secret { inner: H256::zero() }
+	}
+
+	/// Imports and validates the key.
+	pub fn from_unsafe_slice(key: &[u8]) -> Result<Self, Error> {
+		let secret = key::SecretKey::from_slice(&super::SECP256K1, key)?;
+		Ok(secret.into())
+	}
+
+	/// Checks validity of this key.
+	pub fn check_validity(&self) -> Result<(), Error> {
+		self.to_secp256k1_secret().map(|_| ())
+	}
+
+	/// Inplace add one secret key to another (scalar + scalar)
+	pub fn add(&mut self, other: &Secret) -> Result<(), Error> {
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (false, true) => Ok(()),
+			(true, false) => {
+				*self = other.clone();
+				Ok(())
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let other_secret = other.to_secp256k1_secret()?;
+				key_secret.add_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace subtract one secret key from another (scalar - scalar)
+	pub fn sub(&mut self, other: &Secret) -> Result<(), Error> {
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (false, true) => Ok(()),
+			(true, false) => {
+				*self = other.clone();
+				self.neg()
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let mut other_secret = other.to_secp256k1_secret()?;
+				other_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+				key_secret.add_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace decrease secret key (scalar - 1)
+	pub fn dec(&mut self) -> Result<(), Error> {
+		match self.is_zero() {
+			true => {
+				*self = key::MINUS_ONE_KEY.into();
+				Ok(())
+			},
+			false => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				key_secret.add_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace multiply one secret key to another (scalar * scalar)
+	pub fn mul(&mut self, other: &Secret) -> Result<(), Error> {
+		match (self.is_zero(), other.is_zero()) {
+			(true, true) | (true, false) => Ok(()),
+			(false, true) => {
+				*self = Self::zero();
+				Ok(())
+			},
+			(false, false) => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				let other_secret = other.to_secp256k1_secret()?;
+				key_secret.mul_assign(&SECP256K1, &other_secret)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace negate secret key (-scalar)
+	pub fn neg(&mut self) -> Result<(), Error> {
+		match self.is_zero() {
+			true => Ok(()),
+			false => {
+				let mut key_secret = self.to_secp256k1_secret()?;
+				key_secret.mul_assign(&SECP256K1, &key::MINUS_ONE_KEY)?;
+
+				*self = key_secret.into();
+				Ok(())
+			},
+		}
+	}
+
+	/// Inplace inverse secret key (1 / scalar)
+	pub fn inv(&mut self) -> Result<(), Error> {
+		let mut key_secret = self.to_secp256k1_secret()?;
+		key_secret.inv_assign(&SECP256K1)?;
+
+		*self = key_secret.into();
+		Ok(())
+	}
+
+	/// Compute power of secret key inplace (secret ^ pow).
+	/// This function is not intended to be used with large powers.
+	pub fn pow(&mut self, pow: usize) -> Result<(), Error> {
+		if self.is_zero() {
+			return Ok(());
+		}
+
+		match pow {
+			0 => *self = key::ONE_KEY.into(),
+			1 => (),
+			_ => {
+				let c = self.clone();
+				for _ in 1..pow {
+					self.mul(&c)?;
+				}
+			},
+		}
+
+		Ok(())
+	}
+
+	/// Create `secp256k1::key::SecretKey` based on this secret
+	pub fn to_secp256k1_secret(&self) -> Result<key::SecretKey, Error> {
+		Ok(key::SecretKey::from_slice(&SECP256K1, &self[..])?)
+	}
+}
+
+impl FromStr for Secret {
+	type Err = Error;
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		Ok(H256::from_str(s).map_err(|e| Error::Custom(format!("{:?}", e)))?.into())
+	}
+}
+
+impl From<[u8; 32]> for Secret {
+	fn from(k: [u8; 32]) -> Self {
+		Secret { inner: H256(k) }
+	}
+}
+
+impl From<H256> for Secret {
+	fn from(s: H256) -> Self {
+		s.0.into()
+	}
+}
+
+impl From<&'static str> for Secret {
+	fn from(s: &'static str) -> Self {
+		s.parse().expect(&format!("invalid string literal for {}: '{}'", stringify!(Self), s))
+	}
+}
+
+impl From<key::SecretKey> for Secret {
+	fn from(key: key::SecretKey) -> Self {
+		let mut a = [0; SECP256K1_SECRET_KEY_SIZE];
+		a.copy_from_slice(&key[0 .. SECP256K1_SECRET_KEY_SIZE]);
+		a.into()
+	}
+}
+
+impl Deref for Secret {
+	type Target = H256;
+
+	fn deref(&self) -> &Self::Target {
+		&self.inner
+	}
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use super::super::{Random, Generator};
+	use super::Secret;
+
+	#[test]
+	fn multiplicating_secret_inversion_with_secret_gives_one() {
+		let secret = Random.generate().unwrap().secret().clone();
+		let mut inversion = secret.clone();
+		inversion.inv().unwrap();
+		inversion.mul(&secret).unwrap();
+		assert_eq!(inversion, Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap());
+	}
+
+	#[test]
+	fn secret_inversion_is_reversible_with_inversion() {
+		let secret = Random.generate().unwrap().secret().clone();
+		let mut inversion = secret.clone();
+		inversion.inv().unwrap();
+		inversion.inv().unwrap();
+		assert_eq!(inversion, secret);
+	}
+
+	#[test]
+	fn secret_pow() {
+		let secret = Random.generate().unwrap().secret().clone();
+
+		let mut pow0 = secret.clone();
+		pow0.pow(0).unwrap();
+		assert_eq!(pow0, Secret::from_str("0000000000000000000000000000000000000000000000000000000000000001").unwrap());
+
+		let mut pow1 = secret.clone();
+		pow1.pow(1).unwrap();
+		assert_eq!(pow1, secret);
+
+		let mut pow2 = secret.clone();
+		pow2.pow(2).unwrap();
+		let mut pow2_expected = secret.clone();
+		pow2_expected.mul(&secret).unwrap();
+		assert_eq!(pow2, pow2_expected);
+
+		let mut pow3 = secret.clone();
+		pow3.pow(3).unwrap();
+		let mut pow3_expected = secret.clone();
+		pow3_expected.mul(&secret).unwrap();
+		pow3_expected.mul(&secret).unwrap();
+		assert_eq!(pow3, pow3_expected);
+	}
+}
--- a/accounts/ethkey/src/signature.rs
+++ b/accounts/ethkey/src/signature.rs
@@ -0,0 +1,314 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::ops::{Deref, DerefMut};
+use std::cmp::PartialEq;
+use std::fmt;
+use std::str::FromStr;
+use std::hash::{Hash, Hasher};
+use secp256k1::{Message as SecpMessage, RecoverableSignature, RecoveryId, Error as SecpError};
+use secp256k1::key::{SecretKey, PublicKey};
+use rustc_hex::{ToHex, FromHex};
+use ethereum_types::{H520, H256};
+use {Secret, Public, SECP256K1, Error, Message, public_to_address, Address};
+
+/// Signature encoded as RSV components
+#[repr(C)]
+pub struct Signature([u8; 65]);
+
+impl Signature {
+	/// Get a slice into the 'r' portion of the data.
+	pub fn r(&self) -> &[u8] {
+		&self.0[0..32]
+	}
+
+	/// Get a slice into the 's' portion of the data.
+	pub fn s(&self) -> &[u8] {
+		&self.0[32..64]
+	}
+
+	/// Get the recovery byte.
+	pub fn v(&self) -> u8 {
+		self.0[64]
+	}
+
+	/// Encode the signature into RSV array (V altered to be in "Electrum" notation).
+	pub fn into_electrum(mut self) -> [u8; 65] {
+		self.0[64] += 27;
+		self.0
+	}
+
+	/// Parse bytes as a signature encoded as RSV (V in "Electrum" notation).
+	/// May return empty (invalid) signature if given data has invalid length.
+	pub fn from_electrum(data: &[u8]) -> Self {
+		if data.len() != 65 || data[64] < 27 {
+			// fallback to empty (invalid) signature
+			return Signature::default();
+		}
+
+		let mut sig = [0u8; 65];
+		sig.copy_from_slice(data);
+		sig[64] -= 27;
+		Signature(sig)
+	}
+
+	/// Create a signature object from the sig.
+	pub fn from_rsv(r: &H256, s: &H256, v: u8) -> Self {
+		let mut sig = [0u8; 65];
+		sig[0..32].copy_from_slice(r.as_ref());
+		sig[32..64].copy_from_slice(s.as_ref());
+		sig[64] = v;
+		Signature(sig)
+	}
+
+	/// Check if this is a "low" signature.
+	pub fn is_low_s(&self) -> bool {
+		// "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0"
+		const MASK: H256 = H256([
+			0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+			0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF,
+			0x5D, 0x57, 0x6E, 0x73, 0x57, 0xA4, 0x50, 0x1D,
+			0xDF, 0xE9, 0x2F, 0x46, 0x68, 0x1B, 0x20, 0xA0,
+		]);
+		H256::from_slice(self.s()) <= MASK
+	}
+
+	/// Check if each component of the signature is in range.
+	pub fn is_valid(&self) -> bool {
+		// "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141"
+		const MASK: H256 = H256([
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xfe,
+			0xba, 0xae, 0xdc, 0xe6, 0xaf, 0x48, 0xa0, 0x3b,
+			0xbf, 0xd2, 0x5e, 0x8c, 0xd0, 0x36, 0x41, 0x41,
+		]);
+		const ONE: H256 = H256([
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01,
+		]);
+		let r = H256::from_slice(self.r());
+		let s = H256::from_slice(self.s());
+		self.v() <= 1 &&
+			r < MASK && r >= ONE &&
+			s < MASK && s >= ONE
+	}
+}
+
+// manual implementation large arrays don't have trait impls by default.
+// remove when integer generics exist
+impl PartialEq for Signature {
+	fn eq(&self, other: &Self) -> bool {
+		&self.0[..] == &other.0[..]
+	}
+}
+
+// manual implementation required in Rust 1.13+, see `std::cmp::AssertParamIsEq`.
+impl Eq for Signature { }
+
+// also manual for the same reason, but the pretty printing might be useful.
+impl fmt::Debug for Signature {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		f.debug_struct("Signature")
+			.field("r", &self.0[0..32].to_hex())
+			.field("s", &self.0[32..64].to_hex())
+			.field("v", &self.0[64..65].to_hex())
+		.finish()
+	}
+}
+
+impl fmt::Display for Signature {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		write!(f, "{}", self.to_hex())
+	}
+}
+
+impl FromStr for Signature {
+	type Err = Error;
+
+	fn from_str(s: &str) -> Result<Self, Self::Err> {
+		match s.from_hex() {
+			Ok(ref hex) if hex.len() == 65 => {
+				let mut data = [0; 65];
+				data.copy_from_slice(&hex[0..65]);
+				Ok(Signature(data))
+			},
+			_ => Err(Error::InvalidSignature)
+		}
+	}
+}
+
+impl Default for Signature {
+	fn default() -> Self {
+		Signature([0; 65])
+	}
+}
+
+impl Hash for Signature {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+    	H520::from(self.0).hash(state);
+    }
+}
+
+impl Clone for Signature {
+    fn clone(&self) -> Self {
+		Signature(self.0)
+    }
+}
+
+impl From<[u8; 65]> for Signature {
+	fn from(s: [u8; 65]) -> Self {
+		Signature(s)
+	}
+}
+
+impl Into<[u8; 65]> for Signature {
+	fn into(self) -> [u8; 65] {
+		self.0
+	}
+}
+
+impl From<Signature> for H520 {
+	fn from(s: Signature) -> Self {
+		H520::from(s.0)
+	}
+}
+
+impl From<H520> for Signature {
+	fn from(bytes: H520) -> Self {
+		Signature(bytes.into())
+	}
+}
+
+impl Deref for Signature {
+	type Target = [u8; 65];
+
+	fn deref(&self) -> &Self::Target {
+		&self.0
+	}
+}
+
+impl DerefMut for Signature {
+	fn deref_mut(&mut self) -> &mut Self::Target {
+		&mut self.0
+	}
+}
+
+pub fn sign(secret: &Secret, message: &Message) -> Result<Signature, Error> {
+	let context = &SECP256K1;
+	let sec = SecretKey::from_slice(context, secret.as_ref())?;
+	let s = context.sign_recoverable(&SecpMessage::from_slice(&message[..])?, &sec)?;
+	let (rec_id, data) = s.serialize_compact(context);
+	let mut data_arr = [0; 65];
+
+	// no need to check if s is low, it always is
+	data_arr[0..64].copy_from_slice(&data[0..64]);
+	data_arr[64] = rec_id.to_i32() as u8;
+	Ok(Signature(data_arr))
+}
+
+pub fn verify_public(public: &Public, signature: &Signature, message: &Message) -> Result<bool, Error> {
+	let context = &SECP256K1;
+	let rsig = RecoverableSignature::from_compact(context, &signature[0..64], RecoveryId::from_i32(signature[64] as i32)?)?;
+	let sig = rsig.to_standard(context);
+
+	let pdata: [u8; 65] = {
+		let mut temp = [4u8; 65];
+		temp[1..65].copy_from_slice(public.as_bytes());
+		temp
+	};
+
+	let publ = PublicKey::from_slice(context, &pdata)?;
+	match context.verify(&SecpMessage::from_slice(&message[..])?, &sig, &publ) {
+		Ok(_) => Ok(true),
+		Err(SecpError::IncorrectSignature) => Ok(false),
+		Err(x) => Err(Error::from(x))
+	}
+}
+
+pub fn verify_address(address: &Address, signature: &Signature, message: &Message) -> Result<bool, Error> {
+	let public = recover(signature, message)?;
+	let recovered_address = public_to_address(&public);
+	Ok(address == &recovered_address)
+}
+
+pub fn recover(signature: &Signature, message: &Message) -> Result<Public, Error> {
+	let context = &SECP256K1;
+	let rsig = RecoverableSignature::from_compact(context, &signature[0..64], RecoveryId::from_i32(signature[64] as i32)?)?;
+	let pubkey = context.recover(&SecpMessage::from_slice(&message[..])?, &rsig)?;
+	let serialized = pubkey.serialize_vec(context, false);
+
+	let mut public = Public::default();
+	public.as_bytes_mut().copy_from_slice(&serialized[1..65]);
+	Ok(public)
+}
+
+#[cfg(test)]
+mod tests {
+	use std::str::FromStr;
+	use {Generator, Random, Message};
+	use super::{sign, verify_public, verify_address, recover, Signature};
+
+	#[test]
+	fn vrs_conversion() {
+		// given
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+
+		// when
+		let vrs = signature.clone().into_electrum();
+		let from_vrs = Signature::from_electrum(&vrs);
+
+		// then
+		assert_eq!(signature, from_vrs);
+	}
+
+	#[test]
+	fn signature_to_and_from_str() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		let string = format!("{}", signature);
+		let deserialized = Signature::from_str(&string).unwrap();
+		assert_eq!(signature, deserialized);
+	}
+
+	#[test]
+	fn sign_and_recover_public() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		assert_eq!(keypair.public(), &recover(&signature, &message).unwrap());
+	}
+
+	#[test]
+	fn sign_and_verify_public() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
+	}
+
+	#[test]
+	fn sign_and_verify_address() {
+		let keypair = Random.generate().unwrap();
+		let message = Message::default();
+		let signature = sign(keypair.secret(), &message).unwrap();
+		assert!(verify_address(&keypair.address(), &signature, &message).unwrap());
+	}
+}
--- a/accounts/ethstore/Cargo.toml
+++ b/accounts/ethstore/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 [dependencies]
 log = "0.4"
 libc = "0.2"
-rand = "0.7"
+rand = "0.6"
 ethkey = { path = "../ethkey" }
 serde = "1.0"
 serde_json = "1.0"
@@ -16,9 +16,9 @@ rustc-hex = "1.0"
 tiny-keccak = "1.4"
 time = "0.1.34"
 itertools = "0.5"
-parking_lot = "0.9"
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
-ethereum-types = "0.8.0"
+parking_lot = "0.7"
+parity-crypto = "0.4.0"
+ethereum-types = "0.6.0"
 dir = { path = "../../util/dir" }
 smallvec = "0.6"
 parity-wordlist = "1.0"
--- a/accounts/ethstore/README.md
+++ b/accounts/ethstore/README.md
@@ -6,7 +6,7 @@ Parity Ethereum key management.

 ```
 Parity Ethereum key management tool.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.

 Usage:
    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
@@ -337,4 +337,4 @@ _This project is a part of the Parity Ethereum toolchain._
 - [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
 - [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethstore) - Parity Ethereum key management.
 - [ethkey](https://github.com/paritytech/parity-ethereum/blob/master/accounts/ethkey) - Parity Ethereum keys generator.
- [whisper](https://github.com/paritytech/whisper) - Implementation of Whisper-v2 PoC.
+- [whisper](https://github.com/paritytech/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
--- a/accounts/ethstore/cli/Cargo.toml
+++ b/accounts/ethstore/cli/Cargo.toml
@@ -11,10 +11,8 @@ num_cpus = "1.6"
 rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.9"
+parking_lot = "0.7"
 ethstore = { path = "../" }
-ethkey = { path = "../../ethkey" }
-parity-crypto = { version = "0.4.2", features = ["publickey"] }
 dir = { path = '../../../util/dir' }
 panic_hook = { path = "../../../util/panic-hook" }

--- a/accounts/ethstore/cli/src/crack.rs
+++ b/accounts/ethstore/cli/src/crack.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -19,8 +19,7 @@ use std::sync::Arc;
 use std::collections::VecDeque;
 use parking_lot::Mutex;

-use ethstore::{PresaleWallet, Error};
-use ethkey::Password;
+use ethstore::{ethkey::Password, PresaleWallet, Error};
 use num_cpus;

 pub fn run(passwords: VecDeque<Password>, wallet_path: &str) -> Result<(), Error> {
--- a/accounts/ethstore/cli/src/main.rs
+++ b/accounts/ethstore/cli/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -17,11 +17,9 @@
 extern crate dir;
 extern crate docopt;
 extern crate ethstore;
-extern crate ethkey;
 extern crate num_cpus;
 extern crate panic_hook;
 extern crate parking_lot;
-extern crate parity_crypto;
 extern crate rustc_hex;
 extern crate serde;

@@ -36,15 +34,14 @@ use std::{env, process, fs, fmt};

 use docopt::Docopt;
 use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
-use ethkey::Password;
-use parity_crypto::publickey::Address;
+use ethstore::ethkey::{Address, Password};
 use ethstore::{EthStore, SimpleSecretStore, SecretStore, import_accounts, PresaleWallet, SecretVaultRef, StoreAccountRef};

 mod crack;

 pub const USAGE: &'static str = r#"
 Parity Ethereum key management tool.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+  Copyright 2015-2019 Parity Technologies (UK) Ltd.

 Usage:
    ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
@@ -166,7 +163,7 @@ fn main() {
 	}
 }

-fn key_dir(location: &str, password: Option<Password>) -> Result<Box<dyn KeyDirectory>, Error> {
+fn key_dir(location: &str, password: Option<Password>) -> Result<Box<KeyDirectory>, Error> {
 	let dir: RootDiskDirectory = match location {
 		"geth" => RootDiskDirectory::create(dir::geth(false))?,
 		"geth-test" => RootDiskDirectory::create(dir::geth(true))?,
--- a/accounts/ethstore/cli/tests/cli.rs
+++ b/accounts/ethstore/cli/tests/cli.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/account/cipher.rs
+++ b/accounts/ethstore/src/account/cipher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/account/crypto.rs
+++ b/accounts/ethstore/src/account/crypto.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -15,8 +15,7 @@
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.

 use std::str;
-use crypto::publickey::Secret;
-use ethkey::Password;
+use ethkey::{Password, Secret};
 use {json, Error, crypto};
 use crypto::Keccak256;
 use random::Random;
@@ -121,7 +120,7 @@ impl Crypto {
 		}

 		let secret = self.do_decrypt(password, 32)?;
-		Ok(Secret::import_key(&secret)?)
+		Ok(Secret::from_unsafe_slice(&secret)?)
 	}

 	/// Try to decrypt and return result as is
@@ -159,7 +158,7 @@ impl Crypto {

 #[cfg(test)]
 mod tests {
-	use crypto::publickey::{Generator, Random};
+	use ethkey::{Generator, Random};
 	use super::{Crypto, Error};

 	#[test]
--- a/accounts/ethstore/src/account/kdf.rs
+++ b/accounts/ethstore/src/account/kdf.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/account/mod.rs
+++ b/accounts/ethstore/src/account/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/account/safe_account.rs
+++ b/accounts/ethstore/src/account/safe_account.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -14,9 +14,8 @@
 // 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 crypto::publickey::{KeyPair, sign, Address, Signature, Message, Public, Secret};
-use ethkey::Password;
-use crypto::publickey::ecdh::agree;
+use ethkey::{self, KeyPair, sign, Address, Password, Signature, Message, Public, Secret};
+use ethkey::crypto::ecdh::agree;
 use {json, Error};
 use account::Version;
 use crypto;
@@ -162,7 +161,7 @@ impl SafeAccount {
 	/// Decrypt a message.
 	pub fn decrypt(&self, password: &Password, shared_mac: &[u8], message: &[u8]) -> Result<Vec<u8>, Error> {
 		let secret = self.crypto.secret(password)?;
-		crypto::publickey::ecies::decrypt(&secret, shared_mac, message).map_err(From::from)
+		ethkey::crypto::ecies::decrypt(&secret, shared_mac, message).map_err(From::from)
 	}

 	/// Agree on shared key.
@@ -200,7 +199,7 @@ impl SafeAccount {

 #[cfg(test)]
 mod tests {
-	use crypto::publickey::{Generator, Random, verify_public, Message};
+	use ethkey::{Generator, Random, verify_public, Message};
 	use super::SafeAccount;

 	#[test]
--- a/accounts/ethstore/src/account/version.rs
+++ b/accounts/ethstore/src/account/version.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/accounts_dir/disk.rs
+++ b/accounts/ethstore/src/accounts_dir/disk.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -284,7 +284,7 @@ impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {

 	fn path(&self) -> Option<&PathBuf> { Some(&self.path) }

-	fn as_vault_provider(&self) -> Option<&dyn VaultKeyDirectoryProvider> {
+	fn as_vault_provider(&self) -> Option<&VaultKeyDirectoryProvider> {
 		Some(self)
 	}

@@ -294,12 +294,12 @@ impl<T> KeyDirectory for DiskDirectory<T> where T: KeyFileManager {
 }

 impl<T> VaultKeyDirectoryProvider for DiskDirectory<T> where T: KeyFileManager {
-	fn create(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error> {
+	fn create(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error> {
 		let vault_dir = VaultDiskDirectory::create(&self.path, name, key)?;
 		Ok(Box::new(vault_dir))
 	}

-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error> {
+	fn open(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error> {
 		let vault_dir = VaultDiskDirectory::at(&self.path, name, key)?;
 		Ok(Box::new(vault_dir))
 	}
@@ -356,7 +356,7 @@ mod test {
 	use std::{env, fs};
 	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
 	use account::SafeAccount;
-	use crypto::publickey::{Random, Generator};
+	use ethkey::{Random, Generator};
 	use self::tempdir::TempDir;

 	#[test]
--- a/accounts/ethstore/src/accounts_dir/memory.rs
+++ b/accounts/ethstore/src/accounts_dir/memory.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -17,7 +17,7 @@
 use std::collections::HashMap;
 use parking_lot::RwLock;
 use itertools;
-use crypto::publickey::Address;
+use ethkey::Address;

 use {SafeAccount, Error};
 use super::KeyDirectory;
--- a/accounts/ethstore/src/accounts_dir/mod.rs
+++ b/accounts/ethstore/src/accounts_dir/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -57,7 +57,7 @@ pub trait KeyDirectory: Send + Sync {
 	/// Get directory filesystem path, if available
 	fn path(&self) -> Option<&PathBuf> { None }
 	/// Return vault provider, if available
-	fn as_vault_provider(&self) -> Option<&dyn VaultKeyDirectoryProvider> { None }
+	fn as_vault_provider(&self) -> Option<&VaultKeyDirectoryProvider> { None }
 	/// Unique representation of directory account collection
 	fn unique_repr(&self) -> Result<u64, Error>;
 }
@@ -65,9 +65,9 @@ pub trait KeyDirectory: Send + Sync {
 /// Vaults provider
 pub trait VaultKeyDirectoryProvider {
 	/// Create new vault with given key
-	fn create(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error>;
+	fn create(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error>;
 	/// Open existing vault with given key
-	fn open(&self, name: &str, key: VaultKey) -> Result<Box<dyn VaultKeyDirectory>, Error>;
+	fn open(&self, name: &str, key: VaultKey) -> Result<Box<VaultKeyDirectory>, Error>;
 	/// List all vaults
 	fn list_vaults(&self) -> Result<Vec<String>, Error>;
 	/// Get vault meta
@@ -77,7 +77,7 @@ pub trait VaultKeyDirectoryProvider {
 /// Vault directory
 pub trait VaultKeyDirectory: KeyDirectory {
 	/// Cast to `KeyDirectory`
-	fn as_key_directory(&self) -> &dyn KeyDirectory;
+	fn as_key_directory(&self) -> &KeyDirectory;
 	/// Vault name
 	fn name(&self) -> &str;
 	/// Get vault key
--- a/accounts/ethstore/src/accounts_dir/vault.rs
+++ b/accounts/ethstore/src/accounts_dir/vault.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -119,7 +119,7 @@ impl VaultDiskDirectory {
 }

 impl VaultKeyDirectory for VaultDiskDirectory {
-	fn as_key_directory(&self) -> &dyn KeyDirectory {
+	fn as_key_directory(&self) -> &KeyDirectory {
 		self
 	}

--- a/accounts/ethstore/src/error.rs
+++ b/accounts/ethstore/src/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -16,8 +16,9 @@

 use std::fmt;
 use std::io::Error as IoError;
+use ethkey::{self, Error as EthKeyError};
 use crypto::{self, Error as EthCryptoError};
-use crypto::publickey::{Error as EthPublicKeyCryptoError, DerivationError};
+use ethkey::DerivationError;

 /// Account-related errors.
 #[derive(Debug)]
@@ -46,10 +47,12 @@ pub enum Error {
 	VaultNotFound,
 	/// Account creation failed.
 	CreationFailed,
+	/// `EthKey` error
+	EthKey(EthKeyError),
+	/// `ethkey::crypto::Error`
+	EthKeyCrypto(ethkey::crypto::Error),
 	/// `EthCrypto` error
 	EthCrypto(EthCryptoError),
-	/// `EthPublicKeyCryptoError` error
-	EthPublicKeyCrypto(EthPublicKeyCryptoError),
 	/// Derivation error
 	Derivation(DerivationError),
 	/// Custom error
@@ -71,8 +74,9 @@ impl fmt::Display for Error {
 			Error::InvalidVaultName => "Invalid vault name".into(),
 			Error::VaultNotFound => "Vault not found".into(),
 			Error::CreationFailed => "Account creation failed".into(),
+			Error::EthKey(ref err) => err.to_string(),
+			Error::EthKeyCrypto(ref err) => err.to_string(),
 			Error::EthCrypto(ref err) => err.to_string(),
-			Error::EthPublicKeyCrypto(ref err) => err.to_string(),
 			Error::Derivation(ref err) => format!("Derivation error: {:?}", err),
 			Error::Custom(ref s) => s.clone(),
 		};
@@ -87,9 +91,15 @@ impl From<IoError> for Error {
 	}
 }

-impl From<EthPublicKeyCryptoError> for Error {
-	fn from(err: EthPublicKeyCryptoError) -> Self {
-		Error::EthPublicKeyCrypto(err)
+impl From<EthKeyError> for Error {
+	fn from(err: EthKeyError) -> Self {
+		Error::EthKey(err)
+	}
+}
+
+impl From<ethkey::crypto::Error> for Error {
+	fn from(err: ethkey::crypto::Error) -> Self {
+		Error::EthKeyCrypto(err)
 	}
 }

--- a/accounts/ethstore/src/ethkey.rs
+++ b/accounts/ethstore/src/ethkey.rs
@@ -0,0 +1,41 @@
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
+
+// Parity Ethereum is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Parity Ethereum is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+
+//! ethkey reexport to make documentation look pretty.
+pub use _ethkey::*;
+use json;
+
+impl Into<json::H160> for Address {
+	fn into(self) -> json::H160 {
+		let a: [u8; 20] = self.into();
+		From::from(a)
+	}
+}
+
+impl From<json::H160> for Address {
+	fn from(json: json::H160) -> Self {
+		let a: [u8; 20] = json.into();
+		From::from(a)
+	}
+}
+
+impl<'a> From<&'a json::H160> for Address {
+	fn from(json: &'a json::H160) -> Self {
+		let mut a = [0u8; 20];
+		a.copy_from_slice(json);
+		From::from(a)
+	}
+}
--- a/accounts/ethstore/src/ethstore.rs
+++ b/accounts/ethstore/src/ethstore.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -22,8 +22,7 @@ use std::time::{Instant, Duration};

 use crypto::KEY_ITERATIONS;
 use random::Random;
-use crypto::publickey::{Signature, Address, Message, Secret, Public, KeyPair, ExtendedKeyPair};
-use ethkey::Password;
+use ethkey::{self, Signature, Password, Address, Message, Secret, Public, KeyPair, ExtendedKeyPair};
 use accounts_dir::{KeyDirectory, VaultKeyDirectory, VaultKey, SetKeyError};
 use account::SafeAccount;
 use presale::PresaleWallet;
@@ -37,12 +36,12 @@ pub struct EthStore {

 impl EthStore {
 	/// Open a new accounts store with given key directory backend.
-	pub fn open(directory: Box<dyn KeyDirectory>) -> Result<Self, Error> {
+	pub fn open(directory: Box<KeyDirectory>) -> Result<Self, Error> {
 		Self::open_with_iterations(directory, KEY_ITERATIONS as u32)
 	}

 	/// Open a new account store with given key directory backend and custom number of iterations.
-	pub fn open_with_iterations(directory: Box<dyn KeyDirectory>, iterations: u32) -> Result<Self, Error> {
+	pub fn open_with_iterations(directory: Box<KeyDirectory>, iterations: u32) -> Result<Self, Error> {
 		Ok(EthStore {
 			store: EthMultiStore::open_with_iterations(directory, iterations)?,
 		})
@@ -185,7 +184,7 @@ impl SecretStore for EthStore {
 		Ok(account.check_password(password))
 	}

-	fn copy_account(&self, new_store: &dyn SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &Password, new_password: &Password) -> Result<(), Error> {
+	fn copy_account(&self, new_store: &SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &Password, new_password: &Password) -> Result<(), Error> {
 		let account = self.get(account)?;
 		let secret = account.crypto.secret(password)?;
 		new_store.insert_account(new_vault, secret, new_password)?;
@@ -257,11 +256,11 @@ impl SecretStore for EthStore {

 /// Similar to `EthStore` but may store many accounts (with different passwords) for the same `Address`
 pub struct EthMultiStore {
-	dir: Box<dyn KeyDirectory>,
+	dir: Box<KeyDirectory>,
 	iterations: u32,
 	// order lock: cache, then vaults
 	cache: RwLock<BTreeMap<StoreAccountRef, Vec<SafeAccount>>>,
-	vaults: Mutex<HashMap<String, Box<dyn VaultKeyDirectory>>>,
+	vaults: Mutex<HashMap<String, Box<VaultKeyDirectory>>>,
 	timestamp: Mutex<Timestamp>,
 }

@@ -273,12 +272,12 @@ struct Timestamp {

 impl EthMultiStore {
 	/// Open new multi-accounts store with given key directory backend.
-	pub fn open(directory: Box<dyn KeyDirectory>) -> Result<Self, Error> {
+	pub fn open(directory: Box<KeyDirectory>) -> Result<Self, Error> {
 		Self::open_with_iterations(directory, KEY_ITERATIONS as u32)
 	}

 	/// Open new multi-accounts store with given key directory backend and custom number of iterations for new keys.
-	pub fn open_with_iterations(directory: Box<dyn KeyDirectory>, iterations: u32) -> Result<Self, Error> {
+	pub fn open_with_iterations(directory: Box<KeyDirectory>, iterations: u32) -> Result<Self, Error> {
 		let store = EthMultiStore {
 			dir: directory,
 			vaults: Mutex::new(HashMap::new()),
@@ -443,13 +442,13 @@ impl EthMultiStore {
 			Derivation::Hierarchical(path) => {
 				for path_item in path {
 					extended = extended.derive(
-						if path_item.soft { crypto::publickey::Derivation::Soft(path_item.index) }
-						else { crypto::publickey::Derivation::Hard(path_item.index) }
+						if path_item.soft { ethkey::Derivation::Soft(path_item.index) }
+						else { ethkey::Derivation::Hard(path_item.index) }
 					)?;
 				}
 			},
-			Derivation::SoftHash(h256) => { extended = extended.derive(crypto::publickey::Derivation::Soft(h256))?; }
-			Derivation::HardHash(h256) => { extended = extended.derive(crypto::publickey::Derivation::Hard(h256))?; }
+			Derivation::SoftHash(h256) => { extended = extended.derive(ethkey::Derivation::Soft(h256))?; }
+			Derivation::HardHash(h256) => { extended = extended.derive(ethkey::Derivation::Hard(h256))?; }
 		}
 		Ok(extended)
 	}
@@ -480,7 +479,7 @@ impl SimpleSecretStore for EthMultiStore {
 		let accounts = self.get_matching(&account_ref, password)?;
 		for account in accounts {
 			let extended = self.generate(account.crypto.secret(password)?, derivation)?;
-			return Ok(crypto::publickey::public_to_address(extended.public().public()));
+			return Ok(ethkey::public_to_address(extended.public().public()));
 		}
 		Err(Error::InvalidPassword)
 	}
@@ -492,7 +491,7 @@ impl SimpleSecretStore for EthMultiStore {
 		for account in accounts {
 			let extended = self.generate(account.crypto.secret(password)?, derivation)?;
 			let secret = extended.secret().as_raw();
-			return Ok(crypto::publickey::sign(&secret, message)?)
+			return Ok(ethkey::sign(&secret, message)?)
 		}
 		Err(Error::InvalidPassword)
 	}
@@ -691,7 +690,7 @@ mod tests {
 	extern crate tempdir;

 	use accounts_dir::{KeyDirectory, MemoryDirectory, RootDiskDirectory};
-	use crypto::publickey::{Random, Generator, KeyPair};
+	use ethkey::{Random, Generator, KeyPair};
 	use secret_store::{SimpleSecretStore, SecretStore, SecretVaultRef, StoreAccountRef, Derivation};
 	use super::{EthStore, EthMultiStore};
 	use self::tempdir::TempDir;
@@ -710,7 +709,7 @@ mod tests {
 	}

 	struct RootDiskDirectoryGuard {
-		pub key_dir: Option<Box<dyn KeyDirectory>>,
+		pub key_dir: Option<Box<KeyDirectory>>,
 		_path: TempDir,
 	}

--- a/accounts/ethstore/src/import.rs
+++ b/accounts/ethstore/src/import.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -18,13 +18,13 @@ use std::collections::HashSet;
 use std::path::Path;
 use std::fs;

-use crypto::publickey::Address;
+use ethkey::Address;
 use accounts_dir::{KeyDirectory, RootDiskDirectory, DiskKeyFileManager, KeyFileManager};
 use dir;
 use Error;

 /// Import an account from a file.
-pub fn import_account(path: &Path, dst: &dyn KeyDirectory) -> Result<Address, Error> {
+pub fn import_account(path: &Path, dst: &KeyDirectory) -> Result<Address, Error> {
 	let key_manager = DiskKeyFileManager::default();
 	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
 	let filename = path.file_name().and_then(|n| n.to_str()).map(|f| f.to_owned());
@@ -40,7 +40,7 @@ pub fn import_account(path: &Path, dst: &dyn KeyDirectory) -> Result<Address, Er
 }

 /// Import all accounts from one directory to the other.
-pub fn import_accounts(src: &dyn KeyDirectory, dst: &dyn KeyDirectory) -> Result<Vec<Address>, Error> {
+pub fn import_accounts(src: &KeyDirectory, dst: &KeyDirectory) -> Result<Vec<Address>, Error> {
 	let accounts = src.load()?;
 	let existing_accounts = dst.load()?.into_iter()
 		.map(|a| a.address)
@@ -64,7 +64,7 @@ pub fn read_geth_accounts(testnet: bool) -> Vec<Address> {
 }

 /// Import specific `desired` accounts from the Geth keystore into `dst`.
-pub fn import_geth_accounts(dst: &dyn KeyDirectory, desired: HashSet<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
+pub fn import_geth_accounts(dst: &KeyDirectory, desired: HashSet<Address>, testnet: bool) -> Result<Vec<Address>, Error> {
 	let src = RootDiskDirectory::at(dir::geth(testnet));
 	let accounts = src.load()?;
 	let existing_accounts = dst.load()?.into_iter().map(|a| a.address).collect::<HashSet<_>>();
--- a/accounts/ethstore/src/json/bytes.rs
+++ b/accounts/ethstore/src/json/bytes.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/cipher.rs
+++ b/accounts/ethstore/src/json/cipher.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/crypto.rs
+++ b/accounts/ethstore/src/json/crypto.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/error.rs
+++ b/accounts/ethstore/src/json/error.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/hash.rs
+++ b/accounts/ethstore/src/json/hash.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/id.rs
+++ b/accounts/ethstore/src/json/id.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@ impl<'a> Into<String> for &'a Uuid {
 		let d3 = &self.0[6..8];
 		let d4 = &self.0[8..10];
 		let d5 = &self.0[10..16];
-		[d1, d2, d3, d4, d5].iter().map(|d| d.to_hex()).collect::<Vec<String>>().join("-")
+		[d1, d2, d3, d4, d5].into_iter().map(|d| d.to_hex()).collect::<Vec<String>>().join("-")
 	}
 }

--- a/accounts/ethstore/src/json/kdf.rs
+++ b/accounts/ethstore/src/json/kdf.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/key_file.rs
+++ b/accounts/ethstore/src/json/key_file.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/mod.rs
+++ b/accounts/ethstore/src/json/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/presale.rs
+++ b/accounts/ethstore/src/json/presale.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/vault_file.rs
+++ b/accounts/ethstore/src/json/vault_file.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/vault_key_file.rs
+++ b/accounts/ethstore/src/json/vault_key_file.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/json/version.rs
+++ b/accounts/ethstore/src/json/version.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/src/lib.rs
+++ b/accounts/ethstore/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -33,7 +33,7 @@ extern crate tempdir;

 extern crate parity_crypto as crypto;
 extern crate ethereum_types;
-extern crate ethkey as ethkey;
+extern crate ethkey as _ethkey;
 extern crate parity_wordlist;

 #[macro_use]
@@ -46,6 +46,7 @@ extern crate serde_derive;
 extern crate matches;

 pub mod accounts_dir;
+pub mod ethkey;

 mod account;
 mod json;
@@ -71,30 +72,4 @@ pub use self::random::random_string;
 pub use self::parity_wordlist::random_phrase;

 /// An opaque wrapper for secret.
-pub struct OpaqueSecret(crypto::publickey::Secret);
-
-// Additional converters for Address
-use crypto::publickey::Address;
-
-impl Into<json::H160> for Address {
-	fn into(self) -> json::H160 {
-		let a: [u8; 20] = self.into();
-		From::from(a)
-	}
-}
-
-impl From<json::H160> for Address {
-	fn from(json: json::H160) -> Self {
-		let a: [u8; 20] = json.into();
-		From::from(a)
-	}
-}
-
-impl<'a> From<&'a json::H160> for Address {
-	fn from(json: &'a json::H160) -> Self {
-		let mut a = [0u8; 20];
-		a.copy_from_slice(json);
-		From::from(a)
-	}
-}
-
+pub struct OpaqueSecret(::ethkey::Secret);
--- a/accounts/ethstore/src/presale.rs
+++ b/accounts/ethstore/src/presale.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -17,8 +17,7 @@
 use std::fs;
 use std::path::Path;
 use json;
-use crypto::publickey::{Address, Secret, KeyPair};
-use ethkey::Password;
+use ethkey::{Address, Secret, KeyPair, Password};
 use crypto::{Keccak256, pbkdf2};
 use {crypto, Error};

@@ -66,7 +65,7 @@ impl PresaleWallet {
 			.map_err(|_| Error::InvalidPassword)?;
 		let unpadded = &key[..len];

-		let secret = Secret::import_key(&unpadded.keccak256())?;
+		let secret = Secret::from_unsafe_slice(&unpadded.keccak256())?;
 		if let Ok(kp) = KeyPair::from_secret(secret) {
 			if kp.address() == self.address {
 				return Ok(kp)
--- a/accounts/ethstore/src/random.rs
+++ b/accounts/ethstore/src/random.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -23,7 +23,7 @@ pub trait Random {
 impl Random for [u8; 16] {
 	fn random() -> Self {
 		let mut result = [0u8; 16];
-		let mut rng = OsRng;
+		let mut rng = OsRng::new().unwrap();
 		rng.fill_bytes(&mut result);
 		result
 	}
@@ -32,7 +32,7 @@ impl Random for [u8; 16] {
 impl Random for [u8; 32] {
 	fn random() -> Self {
 		let mut result = [0u8; 32];
-		let mut rng = OsRng;
+		let mut rng = OsRng::new().unwrap();
 		rng.fill_bytes(&mut result);
 		result
 	}
@@ -40,6 +40,6 @@ impl Random for [u8; 32] {

 /// Generate a random string of given length.
 pub fn random_string(length: usize) -> String {
-	let rng = OsRng;
+	let mut rng = OsRng::new().expect("Not able to operate without random source.");
 	rng.sample_iter(&Alphanumeric).take(length).collect()
 }
--- a/accounts/ethstore/src/secret_store.rs
+++ b/accounts/ethstore/src/secret_store.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -17,8 +17,7 @@
 use std::hash::{Hash, Hasher};
 use std::path::PathBuf;
 use std::cmp::Ordering;
-use crypto::publickey::{Address, Message, Signature, Secret, Public};
-use ethkey::Password;
+use ethkey::{Address, Message, Signature, Secret, Password, Public};
 use Error;
 use json::{Uuid, OpaqueKeyFile};
 use ethereum_types::H256;
@@ -111,7 +110,7 @@ pub trait SecretStore: SimpleSecretStore {

 	/// Signs a message with raw secret.
 	fn sign_with_secret(&self, secret: &OpaqueSecret, message: &Message) -> Result<Signature, Error> {
-		Ok(crypto::publickey::sign(&secret.0, message)?)
+		Ok(::ethkey::sign(&secret.0, message)?)
 	}

 	/// Imports presale wallet
@@ -119,7 +118,7 @@ pub trait SecretStore: SimpleSecretStore {
 	/// Imports existing JSON wallet
 	fn import_wallet(&self, vault: SecretVaultRef, json: &[u8], password: &Password, gen_id: bool) -> Result<StoreAccountRef, Error>;
 	/// Copies account between stores and vaults.
-	fn copy_account(&self, new_store: &dyn SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &Password, new_password: &Password) -> Result<(), Error>;
+	fn copy_account(&self, new_store: &SimpleSecretStore, new_vault: SecretVaultRef, account: &StoreAccountRef, password: &Password, new_password: &Password) -> Result<(), Error>;
 	/// Checks if password matches given account.
 	fn test_password(&self, account: &StoreAccountRef, password: &Password) -> Result<bool, Error>;

--- a/accounts/ethstore/tests/api.rs
+++ b/accounts/ethstore/tests/api.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -17,12 +17,11 @@
 extern crate rand;
 extern crate ethstore;
 extern crate ethereum_types;
-extern crate parity_crypto;

 mod util;

 use ethstore::{EthStore, SimpleSecretStore, SecretVaultRef, StoreAccountRef};
-use parity_crypto::publickey::{Random, Generator, Secret, KeyPair, verify_address};
+use ethstore::ethkey::{Random, Generator, Secret, KeyPair, verify_address};
 use ethstore::accounts_dir::RootDiskDirectory;
 use util::TransientDir;
 use ethereum_types::Address;
--- a/accounts/ethstore/tests/util/mod.rs
+++ b/accounts/ethstore/tests/util/mod.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/accounts/ethstore/tests/util/transient_dir.rs
+++ b/accounts/ethstore/tests/util/transient_dir.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -21,7 +21,7 @@ use ethstore::accounts_dir::{KeyDirectory, RootDiskDirectory};
 use ethstore::{Error, SafeAccount};

 pub fn random_dir() -> PathBuf {
-	let mut rng = OsRng;
+	let mut rng = OsRng::new().unwrap();
 	let mut dir = env::temp_dir();
 	dir.push(format!("{:x}-{:x}", rng.next_u64(), rng.next_u64()));
 	dir
--- a/accounts/src/account_data.rs
+++ b/accounts/src/account_data.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -21,8 +21,7 @@ use std::{
 	time::Instant,
 };

-use parity_crypto::publickey::Address;
-use ethkey::Password;
+use ethkey::{Address, Password};
 use serde_derive::{Serialize, Deserialize};
 use serde_json;

--- a/accounts/src/error.rs
+++ b/accounts/src/error.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
--- a/accounts/src/lib.rs
+++ b/accounts/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -28,8 +28,7 @@ use self::stores::AddressBook;
 use std::collections::HashMap;
 use std::time::{Instant, Duration};

-use ethkey::Password;
-use parity_crypto::publickey::{Address, Message, Public, Secret, Random, Generator, Signature};
+use ethkey::{Address, Message, Public, Secret, Password, Random, Generator};
 use ethstore::accounts_dir::MemoryDirectory;
 use ethstore::{
 	SimpleSecretStore, SecretStore, EthStore, EthMultiStore,
@@ -38,6 +37,7 @@ use ethstore::{
 use log::warn;
 use parking_lot::RwLock;

+pub use ethkey::Signature;
 pub use ethstore::{Derivation, IndexDerivation, KeyFile, Error};

 pub use self::account_data::AccountMeta;
@@ -64,7 +64,7 @@ pub struct AccountProvider {
 	/// Address book.
 	address_book: RwLock<AddressBook>,
 	/// Accounts on disk
-	sstore: Box<dyn SecretStore>,
+	sstore: Box<SecretStore>,
 	/// Accounts unlocked with rolling tokens
 	transient_sstore: EthMultiStore,
 	/// When unlocking account permanently we additionally keep a raw secret in memory
@@ -80,7 +80,7 @@ fn transient_sstore() -> EthMultiStore {

 impl AccountProvider {
 	/// Creates new account provider.
-	pub fn new(sstore: Box<dyn SecretStore>, settings: AccountProviderSettings) -> Self {
+	pub fn new(sstore: Box<SecretStore>, settings: AccountProviderSettings) -> Self {
 		if let Ok(accounts) = sstore.accounts() {
 			for account in accounts.into_iter().filter(|a| settings.blacklisted_accounts.contains(&a.address)) {
 				warn!("Local Account {} has a blacklisted (known to be weak) address and will be ignored",
@@ -503,7 +503,7 @@ impl AccountProvider {
 mod tests {
 	use super::{AccountProvider, Unlock};
 	use std::time::{Duration, Instant};
-	use parity_crypto::publickey::{Generator, Random, Address};
+	use ethkey::{Generator, Random, Address};
 	use ethstore::{StoreAccountRef, Derivation};
 	use ethereum_types::H256;

--- a/accounts/src/stores.rs
+++ b/accounts/src/stores.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -20,7 +20,7 @@ use std::{fs, fmt, hash, ops};
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};

-use parity_crypto::publickey::Address;
+use ethkey::Address;
 use log::{trace, warn};

 use crate::AccountMeta;
@@ -130,7 +130,7 @@ impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
 		trace!(target: "diskmap", "revert {:?}", self.path);
 		let _ = fs::File::open(self.path.clone())
 			.map_err(|e| trace!(target: "diskmap", "Couldn't open disk map: {}", e))
-			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map at: {:?} {}", self.path, e)))
+			.and_then(|f| read(f).map_err(|e| warn!(target: "diskmap", "Couldn't read disk map: {}", e)))
 			.and_then(|m| {
 				self.cache = m;
 				Ok(())
@@ -144,9 +144,9 @@ impl<K: hash::Hash + Eq, V> DiskMap<K, V> {
 		if self.transient { return; }
 		trace!(target: "diskmap", "save {:?}", self.path);
 		let _ = fs::File::create(self.path.clone())
-			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing at: {:?} {}", self.path, e))
+			.map_err(|e| warn!(target: "diskmap", "Couldn't open disk map for writing: {}", e))
 			.and_then(|mut f| {
-				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map at: {:?} {}", self.path, e))
+				write(&self.cache, &mut f).map_err(|e| warn!(target: "diskmap", "Couldn't write to disk map: {}", e))
 			});
 	}
 }
--- a/chainspec/src/main.rs
+++ b/chainspec/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/cli-signer/Cargo.toml
+++ b/cli-signer/Cargo.toml
@@ -7,7 +7,7 @@ version = "1.4.0"
 authors = ["Parity <admin@parity.io>"]

 [dependencies]
-ethereum-types = "0.8.0"
+ethereum-types = "0.6.0"
 futures = "0.1"
 rpassword = "1.0"
 parity-rpc = { path = "../rpc" }
--- a/cli-signer/rpc-client/Cargo.toml
+++ b/cli-signer/rpc-client/Cargo.toml
@@ -7,15 +7,15 @@ version = "1.4.0"
 authors = ["Parity <admin@parity.io>"]

 [dependencies]
-ethereum-types = "0.8.0"
+ethereum-types = "0.6.0"
 futures = "0.1"
 log = "0.4"
 serde = "1.0"
 serde_json = "1.0"
-url = "2.1.0"
+url = "1.2.0"
 matches = "0.1"
-parking_lot = "0.9"
-jsonrpc-core = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
+parking_lot = "0.7"
+jsonrpc-core = "12.0.0"
+jsonrpc-ws-server = "12.0.0"
 parity-rpc = { path = "../../rpc" }
-keccak-hash = "0.4.0"
+keccak-hash = "0.2.0"
--- a/cli-signer/rpc-client/src/client.rs
+++ b/cli-signer/rpc-client/src/client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/cli-signer/rpc-client/src/lib.rs
+++ b/cli-signer/rpc-client/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -36,7 +36,7 @@ extern crate log;
 extern crate matches;

 /// Boxed future response.
-pub type BoxFuture<T, E> = Box<dyn futures::Future<Item=T, Error=E> + Send>;
+pub type BoxFuture<T, E> = Box<futures::Future<Item=T, Error=E> + Send>;

 #[cfg(test)]
 mod tests {
--- a/cli-signer/rpc-client/src/signer_client.rs
+++ b/cli-signer/rpc-client/src/signer_client.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/cli-signer/src/lib.rs
+++ b/cli-signer/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- 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
@@ -5,18 +5,17 @@ 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.6.0"
+keccak-hash = "0.2.0"
 log = "0.4"
 memmap = "0.6"
-parking_lot = "0.9"
+parking_lot = "0.7"
 primal = "0.2.3"
-static_assertions = "0.3.3"

 [dev-dependencies]
-criterion = "0.3"
+criterion = "0.2"
 rustc-hex = "1.0"
 serde_json = "1.0"
 tempdir = "0.3"
@@ -28,9 +27,7 @@ bench = []
 [[bench]]
 name = "basic"
 harness = false
-required-features = ['bench']

 [[bench]]
 name = "progpow"
 harness = false
-required-features = ['bench']
--- a/ethash/benches/basic.rs
+++ b/ethash/benches/basic.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -17,53 +17,26 @@
 #[macro_use]
 extern crate criterion;
 extern crate ethash;
-extern crate common_types;

 use criterion::Criterion;
-use ethash::{NodeCacheBuilder, keccak};
-use common_types::engines::OptimizeFor;
+use ethash::{NodeCacheBuilder, OptimizeFor};

-const HASH: [u8; 32] = [
-	0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b,
-	0x5b, 0xf2, 0xbe, 0xe4, 0x0a, 0xb3, 0x35, 0x8a,
-	0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f, 0x5e, 0x59,
-	0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72,
-];
-const 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 HASH: [u8; 32] = [0xf5, 0x7e, 0x6f, 0x3a, 0xcf, 0xc0, 0xdd, 0x4b, 0x5b, 0xf2, 0xbe,
+	                    0xe4, 0x0a, 0xb3, 0x35, 0x8a, 0xa6, 0x87, 0x73, 0xa8, 0xd0, 0x9f,
+	                    0x5e, 0x59, 0x5e, 0xab, 0x55, 0x94, 0x05, 0x52, 0x7d, 0x72];
 const NONCE: u64 = 0xd7b3ac70a301a249;

-criterion_group! {
-	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_group!(
+	basic,
+	bench_light_compute_memmap,
+	bench_light_compute_memory,
+	bench_light_new_round_trip_memmap,
+	bench_light_new_round_trip_memory,
+	bench_light_from_file_round_trip_memory,
+	bench_light_from_file_round_trip_memmap
+);
 criterion_main!(basic);

-fn 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;

@@ -79,13 +52,13 @@ fn bench_light_compute_memory(b: &mut Criterion) {
 	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())));
+	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| light.compute(&HASH, NONCE, u64::max_value())));
 }

 fn bench_light_new_round_trip_memmap(b: &mut Criterion) {
 	use std::env;

-	b.bench_function("bench_light_new_round_trip_memmap", move |b| b.iter(|| {
+	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
 		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
 		let light = builder.light(&env::temp_dir(), 486382);
 		light.compute(&HASH, NONCE, u64::max_value());
@@ -95,7 +68,7 @@ fn bench_light_new_round_trip_memmap(b: &mut Criterion) {
 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(|| {
+	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
 		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
 		let light = builder.light(&env::temp_dir(), 486382);
 		light.compute(&HASH, NONCE, u64::max_value());
@@ -113,7 +86,7 @@ fn bench_light_from_file_round_trip_memory(b: &mut Criterion) {
 		dummy.to_file().unwrap();
 	}

-	b.bench_function("bench_light_from_file_round_trip_memory", move |b| b.iter(|| {
+	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
 		let builder = NodeCacheBuilder::new(OptimizeFor::Cpu, u64::max_value());
 		let light = builder.light_from_file(&dir, 486382).unwrap();
 		light.compute(&HASH, NONCE, u64::max_value());
@@ -132,21 +105,9 @@ fn bench_light_from_file_round_trip_memmap(b: &mut Criterion) {
 		dummy.to_file().unwrap();
 	}

-	b.bench_function("bench_light_from_file_round_trip_memmap", move |b| b.iter(|| {
+	b.bench_function("bench_light_compute_memmap", move |b| b.iter(|| {
 		let builder = NodeCacheBuilder::new(OptimizeFor::Memory, u64::max_value());
 		let light = builder.light_from_file(&dir, 486382).unwrap();
 		light.compute(&HASH, NONCE, u64::max_value());
 	}));
 }
-
-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
@@ -3,16 +3,14 @@ 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::{NodeCacheBuilder, OptimizeFor};
 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());
--- a/ethash/res/progpow_testvectors.json
+++ b/ethash/res/progpow_testvectors.json
@@ -3,84 +3,84 @@
    0,
    "0000000000000000000000000000000000000000000000000000000000000000",
    "0000000000000000",
-    "f4ac202715ded4136e72887c39e63a4738331c57fd9eb79f6ec421c281aa8743",
-    "b3bad9ca6f7c566cf0377d1f8cce29d6516a96562c122d924626281ec948ef02"
+    "faeb1be51075b03a4ff44b335067951ead07a3b078539ace76fd56fc410557a3",
+    "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b"
  ],
  [
    49,
-    "b3bad9ca6f7c566cf0377d1f8cce29d6516a96562c122d924626281ec948ef02",
+    "63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b",
    "0000000006ff2c47",
-    "7730596f128f675ef9a6bb7281f268e4077d302f2b9078da1ece4349248561dd",
-    "0b9ed0c11157f1365143e329a6e1cea4248d9d6cb44b9c6daf492c7a076654a4"
+    "c789c1180f890ec555ff42042913465481e8e6bc512cb981e1c1108dc3f2227d",
+    "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922"
  ],
  [
    50,
-    "0b9ed0c11157f1365143e329a6e1cea4248d9d6cb44b9c6daf492c7a076654a4",
+    "9e7248f20914913a73d80a70174c331b1d34f260535ac3631d770e656b5dd922",
    "00000000076e482e",
-    "829136d4a704eb8d06da773f1a90466e7b5ed12119c44526f045bbff4475d891",
-    "e2e881c5b893c2f1ef06b96a10cfcbcf7255b307f0818e7d30eb12b2edfc237b"
+    "c7340542c2a06b3a7dc7222635f7cd402abf8b528ae971ddac6bbe2b0c7cb518",
+    "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d"
  ],
  [
    99,
-    "e2e881c5b893c2f1ef06b96a10cfcbcf7255b307f0818e7d30eb12b2edfc237b",
+    "de37e1824c86d35d154cf65a88de6d9286aec4f7f10c3fc9f0fa1bcc2687188d",
    "000000003917afab",
-    "deb3d8b45bdc596c56aa37a5eba456f478c82e60e5c028ce95f2e654e4bb7b57",
-    "9bdc2ad2286eaa051d6ca1f5196d2dd1c9a039f1d7ce3e1c856b793deed01778"
+    "f5e60b2c5bfddd136167a30cbc3c8dbdbd15a512257dee7964e0bc6daa9f8ba7",
+    "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce"
  ],
  [
    29950,
-    "9bdc2ad2286eaa051d6ca1f5196d2dd1c9a039f1d7ce3e1c856b793deed01778",
+    "ac7b55e801511b77e11d52e9599206101550144525b5679f2dab19386f23dcce",
    "005d409dbc23a62a",
-    "c01e6d339cc687c77f653b81c74cb9de8b595554f2c5db671a7dde3846d2fa01",
-    "de0d693e597cf2fd70a4cfaa73f6baafc29e1eee695a81295b278c1116580b72"
+    "07393d15805eb08ee6fc6cb3ad4ad1010533bd0ff92d6006850246829f18fd6e",
+    "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5"
  ],
  [
    29999,
-    "de0d693e597cf2fd70a4cfaa73f6baafc29e1eee695a81295b278c1116580b72",
+    "e43d7e0bdc8a4a3f6e291a5ed790b9fa1a0948a2b9e33c844888690847de19f5",
    "005db5fa4c2a3d03",
-    "8b664cdbf396a7a185446c93dddd6611f5a736b11097381ae6bea45e802cec16",
-    "21ec5d1984a4fd4394b042aa96365085225d964727a45def245ceab326e28128"
+    "7551bddf977491da2f6cfc1679299544b23483e8f8ee0931c4c16a796558a0b8",
+    "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454"
  ],
  [
    30000,
-    "21ec5d1984a4fd4394b042aa96365085225d964727a45def245ceab326e28128",
+    "d34519f72c97cae8892c277776259db3320820cb5279a299d0ef1e155e5c6454",
    "005db8607994ff30",
-    "276951d89c1ed262bcac00df4fb9bf7af36991532744a2e287b0b758a56e15aa",
-    "dc070b76cc311cd82267f98936acbbbd3ec1c1ab25b55e2c885af6474e1e6841"
+    "f1c2c7c32266af9635462e6ce1c98ebe4e7e3ecab7a38aaabfbf2e731e0fbff4",
+    "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64"
  ],
  [
    30049,
-    "dc070b76cc311cd82267f98936acbbbd3ec1c1ab25b55e2c885af6474e1e6841",
+    "8b6ce5da0b06d18db7bd8492d9e5717f8b53e7e098d9fef7886d58a6e913ef64",
    "005e2e215a8ca2e7",
-    "6248ba0157d0f0592dacfe2963337948fffb37f67e7451a6862c1321d894cebe",
-    "6fdecf719e2547f585a6ee807d8237db8e9489f63d3f259ab5236451eaded433"
+    "57fe6a9fbf920b4e91deeb66cb0efa971e08229d1a160330e08da54af0689add",
+    "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047"
  ],
  [
    30050,
-    "6fdecf719e2547f585a6ee807d8237db8e9489f63d3f259ab5236451eaded433",
+    "c2c46173481b9ced61123d2e293b42ede5a1b323210eb2a684df0874ffe09047",
    "005e30899481055e",
-    "512d8f2bb0441fcfa1764c67e8dbed2afcbe9141de4bbebc5b51e0661dede550",
-    "cb1587a1c372642cbd9ce4c1ba2f433985d44c571a676a032bc1e8c1ad066e24"
+    "ba30c61cc5a2c74a5ecaf505965140a08f24a296d687e78720f0b48baf712f2d",
+    "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71"
  ],
  [
    30099,
-    "cb1587a1c372642cbd9ce4c1ba2f433985d44c571a676a032bc1e8c1ad066e24",
+    "ea42197eb2ba79c63cb5e655b8b1f612c5f08aae1a49ff236795a3516d87bc71",
    "005ea6aef136f88b",
-    "be0e7d6afa6edd483ccc304afa9bf0abaca5e0f037a4f05bf5550b9309d1d12c",
-    "78be18f20569a834d839dad48e0e51d6df6b6537575f0ad29898c7cf357f12cb"
+    "cfd5e46048cd133d40f261fe8704e51d3f497fc14203ac6a9ef6a0841780b1cd",
+    "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6"
  ],
  [
    59950,
-    "78be18f20569a834d839dad48e0e51d6df6b6537575f0ad29898c7cf357f12cb",
+    "49e15ba4bf501ce8fe8876101c808e24c69a859be15de554bf85dbc095491bd6",
    "02ebe0503bd7b1da",
-    "b85be51fce670aa437f28c02ea4fd7995fa8b6ac224e959b8dbfb5bdbc6f77ce",
-    "a68a620ba17e0cf2817bc4397cf4b85f5770983aa7b7931319a7f61bd6f905b1"
+    "21511fbaa31fb9f5fc4998a754e97b3083a866f4de86fa7500a633346f56d773",
+    "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf"
  ],
  [
    59999,
-    "a68a620ba17e0cf2817bc4397cf4b85f5770983aa7b7931319a7f61bd6f905b1",
+    "f5c50ba5c0d6210ddb16250ec3efda178de857b2b1703d8d5403bd0f848e19cf",
    "02edb6275bd221e3",
-    "ffe745a932c21c0704291bb416fe8bffec76621cd3434861885beab42cec1734",
-    "9e6667a151ac6f5186a05cb20877a2b3df02317046256a762cb8ec2d96aa34f0"
+    "653eda37d337e39d311d22be9bbd3458d3abee4e643bee4a7280a6d08106ef98",
+    "341562d10d4afb706ec2c8d5537cb0c810de02b4ebb0a0eea5ae335af6fb2e88"
  ]
 ]
--- a/ethash/src/cache.rs
+++ b/ethash/src/cache.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -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};

@@ -317,6 +327,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 +341,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,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ 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;
@@ -135,16 +135,22 @@ pub fn quick_get_difficulty(header_hash: &H256, nonce: u64, mix_hash: &H256, pro
 			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);
+			ptr::copy_nonoverlapping(mix_hash.as_ptr(), buf[64..].as_mut_ptr(), 32);

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

 			hash
@@ -199,11 +205,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 +227,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 +252,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 +277,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;
+			}
 		}
 	}

@@ -302,6 +321,7 @@ fn hash_compute(light: &Light, full_size: usize, header_hash: &H256, nonce: u64)
 	ProofOfWork { mix_hash: mix_hash, value: value }
 }

+// TODO: Use the `simd` crate
 pub 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();
@@ -315,8 +335,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]);
+			}
 		}
 	}

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

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/ethash/src/lib.rs
+++ b/ethash/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -14,7 +14,6 @@
 // You should have received a copy of the GNU General Public License
 // along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.

-extern crate common_types;
 extern crate either;
 extern crate ethereum_types;
 extern crate memmap;
@@ -22,9 +21,9 @@ extern crate parking_lot;
 extern crate primal;

 #[macro_use]
-extern crate log;
+extern crate crunchy;
 #[macro_use]
-extern crate static_assertions;
+extern crate log;

 #[cfg(test)]
 extern crate rustc_hex;
@@ -42,9 +41,6 @@ mod compute;

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

@@ -53,17 +49,14 @@ 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 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;
@@ -90,7 +83,7 @@ impl EthashManager {
 		EthashManager {
 			cache_dir: cache_dir.to_path_buf(),
 			nodecache_builder: NodeCacheBuilder::new(optimize_for.into().unwrap_or_default(), progpow_transition),
-			progpow_transition,
+			progpow_transition: progpow_transition,
 			cache: Mutex::new(LightCache {
 				recent_epoch: None,
 				recent: None,
--- a/ethash/src/progpow.rs
+++ b/ethash/src/progpow.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity.

 // Parity is free software: you can redistribute it and/or modify
@@ -29,9 +29,6 @@
 //!
 //! 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;
@@ -39,12 +36,12 @@ 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_CACHE: usize = 12;
+const PROGPOW_CNT_MATH: usize = 20;
 const PROGPOW_CNT_DAG: usize = ETHASH_ACCESSES;
 const PROGPOW_DAG_LOADS: usize = 4;
 const PROGPOW_MIX_BYTES: usize = 2 * ETHASH_MIX_BYTES;
-const PROGPOW_PERIOD_LENGTH: usize = 10; // blocks per progpow epoch (N)
+const PROGPOW_PERIOD_LENGTH: usize = 50; // blocks per progpow epoch (N)
 const PROGPOW_LANES: usize = 16;
 const PROGPOW_REGS: usize = 32;

@@ -422,8 +419,7 @@ pub fn generate_cdag(cache: &[Node]) -> CDag {
 mod test {
 	use tempdir::TempDir;

-	use common_types::engines::OptimizeFor;
-	use cache::NodeCacheBuilder;
+	use cache::{NodeCacheBuilder, OptimizeFor};
 	use keccak::H256;
 	use rustc_hex::FromHex;
 	use serde_json::{self, Value};
@@ -549,8 +545,8 @@ mod test {
 			&c_dag,
 		);

-		let expected_digest = FromHex::from_hex("b3bad9ca6f7c566cf0377d1f8cce29d6516a96562c122d924626281ec948ef02").unwrap();
-		let expected_result = FromHex::from_hex("f4ac202715ded4136e72887c39e63a4738331c57fd9eb79f6ec421c281aa8743").unwrap();
+		let expected_digest = FromHex::from_hex("63155f732f2bf556967f906155b510c917e48e99685ead76ea83f4eca03ab12b").unwrap();
+		let expected_result = FromHex::from_hex("faeb1be51075b03a4ff44b335067951ead07a3b078539ace76fd56fc410557a3").unwrap();

 		assert_eq!(
 			digest.to_vec(),
--- a/ethash/src/seed_compute.rs
+++ b/ethash/src/seed_compute.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
--- a/ethash/src/shared.rs
+++ b/ethash/src/shared.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -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
@@ -7,100 +7,94 @@ version = "1.12.0"
 authors = ["Parity Technologies <admin@parity.io>"]

 [dependencies]
-account-state = { path = "account-state" }
+account-db = { path = "account-db" }
 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" }
+bn = { git = "https://github.com/paritytech/bn", default-features = false }
+common-types = { path = "types" }
+crossbeam-utils = "0.6"
+derive_more = "0.14.0"
 env_logger = { version = "0.5", optional = true }
-ethash = { path = "../ethash", optional = true }
-ethjson = { path = "../json", optional = true }
+ethabi = "8.0"
+ethabi-contract = "8.0"
+ethabi-derive = "8.0"
+ethash = { path = "../ethash" }
 ethcore-blockchain = { path = "./blockchain" }
+ethcore-bloom-journal = { path = "../util/bloom" }
 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"
+ethereum-types = "0.6.0"
+ethjson = { path = "../json" }
+ethkey = { path = "../accounts/ethkey" }
 evm = { path = "evm" }
-executive-state = { path = "executive-state" }
 futures = "0.1"
-hash-db = "0.15.0"
+hash-db = "0.12.4"
+parity-util-mem = "0.1"
 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 }
+keccak-hash = "0.2.0"
+keccak-hasher = { path = "../util/keccak-hasher" }
+kvdb = "0.1"
+kvdb-memorydb = "0.1"
+kvdb-rocksdb = { version = "0.1.3", optional = true }
+lazy_static = "1.2.0"
+len-caching-lock = { path = "../util/len-caching-lock" }
 log = "0.4"
-macros = { path = "../util/macros", optional = true }
-machine = { path = "./machine" }
+lru-cache = "0.1"
+macros = { path = "../util/macros" }
 memory-cache = { path = "../util/memory-cache" }
+memory-db = "0.12.4"
+num = { version = "0.1", default-features = false, features = ["bigint"] }
+num_cpus = "1.2"
 parity-bytes = "0.1"
-parking_lot = "0.9"
-pod = { path = "pod", optional = true }
-trie-db = "0.18.0"
-parity-crypto = { version = "0.4.2", features = ["publickey"], optional = true }
+parity-crypto = "0.4.0"
+parity-snappy = "0.1"
+parking_lot = "0.7"
+pod-account = { path = "pod-account" }
+trie-db = "0.12.4"
 patricia-trie-ethereum = { path = "../util/patricia-trie-ethereum" }
-rand = "0.7"
-rand_xorshift = "0.2"
+rand = "0.6"
 rayon = "1.1"
-registrar = { path = "../util/registrar" }
 rlp = "0.4.0"
-rustc-hex = "2"
-scopeguard = "1.0.0"
+rlp_derive = { path = "../util/rlp-derive" }
+rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-snapshot = { path = "snapshot" }
-spec = { path = "spec" }
-state-db = { path = "state-db" }
+state-account = { path = "state-account" }
+stats = { path = "../util/stats" }
 tempdir = { version = "0.3", optional = true }
-trace = { path = "trace" }
+time-utils = { path = "../util/time-utils" }
 trace-time = "0.1"
-trie-vm-factories = { path = "trie-vm-factories" }
 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" }
+wasm = { path = "wasm" }
+rand_xorshift = "0.1.1"

 [dev-dependencies]
-account-db = { path = "account-db" }
 blooms-db = { path = "../util/blooms-db" }
-criterion = "0.3"
-engine = { path = "./engine", features = ["test-helpers"] }
+criterion = "0.2"
 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" }
+kvdb-rocksdb = "0.1.3"
 parity-runtime = { path = "../util/runtime" }
+rlp_compress = { path = "../util/rlp-compress" }
 serde_json = "1.0"
-stats = { path = "../util/stats" }
-pod = { path = "pod" }
 tempdir = "0.3"
-trie-standardmap = "0.15.0"
+trie-standardmap = "0.12.4"

 [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,22 +110,15 @@ 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 = ["env_logger", "test-helpers", "to-pod-full"]
+# Skip JSON consensus tests with pending issues.
+ci-skip-tests = []
 # Run memory/cpu heavy tests.
 test-heavy = []
 # 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"
- ]
+test-helpers = ["tempdir", "kvdb-rocksdb", "blooms-db"]
+# Enables slow 'to-pod-full' method for use in tests and evmbin.
+to-pod-full = []

 [[bench]]
 name = "builtin"
--- a/ethcore/account-db/Cargo.toml
+++ b/ethcore/account-db/Cargo.toml
@@ -1,15 +1,14 @@
 [package]
-name = "account-db"
 description = "DB backend wrapper for Account trie"
-authors = ["Parity Technologies <admin@parity.io>"]
-license = "GPL-3.0"
+name = "account-db"
 version = "0.1.0"
+authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2018"

 [dependencies]
-ethereum-types = "0.8.0"
-hash-db = "0.15.0"
-keccak-hash = "0.4.0"
+ethereum-types = "0.6"
+hash-db = "0.12.4"
+keccak-hash = "0.2.0"
 keccak-hasher = { path = "../../util/keccak-hasher" }
-kvdb = "0.3.1"
+kvdb = "0.1"
 rlp = "0.4"
--- a/ethcore/account-db/src/lib.rs
+++ b/ethcore/account-db/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -93,7 +93,7 @@ impl<'db> AsHashDB<KeccakHasher, DBValue> for AccountDB<'db> {
 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());
+			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.db.get(&combine_key(&self.address_hash, key), prefix)
 	}
@@ -139,7 +139,7 @@ impl<'db> AccountDBMut<'db> {
 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());
+			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.db.get(&combine_key(&self.address_hash, key), prefix)
 	}
@@ -157,7 +157,7 @@ impl<'db> HashDB<KeccakHasher, DBValue> for AccountDBMut<'db>{
 		}
 		let k = keccak(value);
 		let ak = combine_key(&self.address_hash, &k);
-		self.db.emplace(ak, prefix, value.to_vec());
+		self.db.emplace(ak, prefix, DBValue::from_slice(value));
 		k
 	}

@@ -193,7 +193,7 @@ impl<'db> AsHashDB<KeccakHasher, DBValue> for Wrapping<'db> {
 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());
+			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.0.get(key, prefix)
 	}
@@ -227,7 +227,7 @@ impl<'db> AsHashDB<KeccakHasher, DBValue> for WrappingMut<'db> {
 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());
+			return Some(DBValue::from_slice(&NULL_RLP));
 		}
 		self.0.get(key, prefix)
 	}
--- 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,4 +1,4 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
 // This file is part of Parity Ethereum.

 // Parity Ethereum is free software: you can redistribute it and/or modify
@@ -20,19 +20,17 @@ extern crate criterion;
 #[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 ethcore::builtin::Builtin;
+use ethcore::machine::Machine;
 use ethereum_types::H160;
-use machine::Machine;
-use machine::test_helpers::new_byzantium_test_machine;
+use ethcore::ethereum::new_byzantium_test_machine;
 use rustc_hex::FromHex;

 lazy_static! {
--- 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/Show More
+++ b/Show More