2.3.8 stable backports (#10507)

* version: bump stable

* Add additional request tests (#10503)

.cargo/config

@@ -1,30 +1,3 @@
-# NOTE: if you make changes here, remember to also update:
-#	scripts/test-linux.sh
-#	scripts/build-linux.sh
-#	scripts/build-windows.sh
-
-# Using 'cfg` is broken, see https://github.com/rust-lang/cargo/issues/6858
-#[target.'cfg(target_arch = "x86_64")']
-#rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-# …so instead we list all target triples (Tier 1 64-bit platforms)
-[target.x86_64-unknown-linux-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-pc-windows-gnu]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
 [target.x86_64-pc-windows-msvc]
-# Enables the aes-ni instructions for RustCrypto dependency.
-# Link the C runtime statically ; https://github.com/openethereum/openethereum/issues/6643
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3", "-Ctarget-feature=+crt-static"]
-
-[target.x86_64-apple-darwin]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
-
-[target.x86_64-unknown-linux-musl]
-# Enables the aes-ni instructions for RustCrypto dependency.
-rustflags = ["-Ctarget-feature=+aes,+sse2,+ssse3"]
+# Link the C runtime statically ; https://github.com/paritytech/parity-ethereum/issues/6643
+rustflags = ["-Ctarget-feature=+crt-static"]

.dockerignore

@@ -16,7 +16,7 @@ target
 # idea ide
 .idea
 
-# git folder is not ignored so vergen library can get the commit hash and date for the build
-#.git
+# git stuff
+.git
 
 ethcore/res/ethereum/tests

.github/CODE_OF_CONDUCT.md

@@ -2,11 +2,11 @@
 
 ## 1. Purpose
 
-A primary goal of OpenEthereum project is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
+A primary goal of Parity is to be inclusive to the largest number of contributors, with the most varied and diverse backgrounds possible. As such, we are committed to providing a friendly, safe and welcoming environment for all, regardless of gender, sexual orientation, ability, ethnicity, socioeconomic status, and religion (or lack thereof).
 
 This code of conduct outlines our expectations for all those who participate in our community, as well as the consequences for unacceptable behavior.
 
-We invite all those who participate in OpenEthereum to help us create safe and positive experiences for everyone.
+We invite all those who participate in Parity to help us create safe and positive experiences for everyone.
 
 ## 2. Open Source Citizenship
 

.github/CONTRIBUTING.md

@@ -10,11 +10,11 @@ See also frequently asked questions [tagged with `parity`](https://ethereum.stac
 
 Do **not** open an issue on Github if you think your discovered bug could be a **security-relevant vulnerability**. Please, read our [security policy](../SECURITY.md) instead.
 
-Otherwise, just create a [new issue](https://github.com/openethereum/openethereum/issues/new) in our repository and state:
+Otherwise, just create a [new issue](https://github.com/paritytech/parity-ethereum/issues/new) in our repository and state:
 
-- What's your OpenEthereum version?
+- What's your Parity Ethereum version?
 - What's your operating system and version?
-- How did you install OpenEthereum?
+- How did you install Parity Ethereum?
 - Is your node fully synchronized?
 - Did you try turning it off and on again?
 
@@ -22,45 +22,12 @@ Also, try to include **steps to reproduce** the issue and expand on the **actual
 
 ## Contribute!
 
-If you would like to contribute to OpenEthereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/openethereum/openethereum/compare).
+If you would like to contribute to Parity Ethereum, please **fork it**, fix bugs or implement features, and [propose a pull request](https://github.com/paritytech/parity-ethereum/compare).
 
-### Labels & Milestones
-
-We use [labels](https://github.com/openethereum/openethereum/labels) to manage PRs and issues and communicate the state of a PR. Please familiarize yourself with them. Furthermore we are organizing issues in [milestones](https://github.com/openethereum/openethereum/milestones). Best way to get started is to a pick a ticket from the current milestone tagged [`easy`](https://github.com/openethereum/openethereum/labels/Q2-easy%20%F0%9F%92%83) and get going, or [`mentor`](https://github.com/openethereum/openethereum/labels/Q1-mentor%20%F0%9F%95%BA) and get in contact with the mentor offering their support on that larger task.
-
-### Rules
-
-There are a few basic ground-rules for contributors (including the maintainer(s) of the project):
-
-* **No pushing directly to the master branch**.
-* **All modifications** must be made in a **pull-request** to solicit feedback from other contributors.
-* Pull-requests cannot be merged before CI runs green and two reviewers have given their approval.
-* Contributors should adhere to the [Parity Ethereum Style Guide](https://wiki.parity.io/Parity-Ethereum-Style-Guide).
-
-### Recommendations
-
-* **Non-master branch names** *should* be prefixed with a short name moniker, followed by the associated Github Issue ID (if any), and a brief description of the task using the format `<GITHUB_USERNAME>-<ISSUE_ID>-<BRIEF_DESCRIPTION>` (e.g. `gavin-123-readme`). The name moniker helps people to inquiry about their unfinished work, and the GitHub Issue ID helps your future self and other developers (particularly those who are onboarding) find out about and understand the original scope of the task, and where it fits into OpenEthereum [Projects](https://github.com/openethereum/openethereum/projects).
-* **Remove stale branches periodically**
-
-### Preparing Pull Requests
-
-* If your PR does not alter any logic (e.g. comments, dependencies, docs), then it may be tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22).
-
-* Once a PR is ready for review please add the [`pleasereview`](https://github.com/openethereum/openethereum/pulls?utf8=%E2%9C%93&q=is%3Aopen+is%3Apr+label%3A%22A0-pleasereview+%F0%9F%A4%93%22+) label.
-
-### Reviewing Pull Requests*:
-
-* At least two reviewers are required to review PRs (even for PRs tagged [`insubstantial`](https://github.com/openethereum/openethereum/pulls?q=is%3Aopen+is%3Apr+label%3A%22A2-insubstantial+%F0%9F%91%B6%22)).
-
-When doing a review, make sure to look for any:
-
-* Buggy behavior.
-* Undue maintenance burden.
-* Breaking with house coding style.
-* Pessimization (i.e. reduction of speed as measured in the projects benchmarks).
-* Breaking changes should be carefuly reviewed and tagged as such so they end up in the [changelog](../CHANGELOG.md).
-* Uselessness (i.e. it does not strictly add a feature or fix a known issue).
+Please, refer to the [Coding Guide](https://wiki.parity.io/Coding-guide) in our wiki for more details about hacking on Parity.
 
 ## License.
 
-By contributing to OpenEthereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+By contributing to Parity Ethereum, you agree that your contributions will be licensed under the [GPLv3 License](../LICENSE).
+
+Each contributor has to sign our Contributor License Agreement. The purpose of the CLA is to ensure that the guardian of a project's outputs has the necessary ownership or grants of rights over all contributions to allow them to distribute under the chosen license. You can read and sign our full Contributor License Agreement at [cla.parity.io](https://cla.parity.io) before submitting a pull request.

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,11 @@
 _Before filing a new issue, please **provide the following information**._
 
-_If you think that your issue is an exploitable security vulnerability, please mail your bugreport to security@parity.io instead; your submission might be eligible for our Bug Bounty._
-_You can find mode info on the reporting process in [SECURITY.md](https://github.com/openethereum/openethereum/blob/master/SECURITY.md)_
-
-
-- **OpenEthereum version**: 0.0.0
+- **Parity Ethereum version**: 0.0.0
 - **Operating system**: Windows / MacOS / Linux
 - **Installation**: homebrew / one-line installer / built from source
 - **Fully synchronized**: no / yes
-- **Network**: ethereum / ropsten / goerli / ...
+- **Network**: ethereum / ropsten / kovan / ...
 - **Restarted**: no / yes
 
 _Your issue description goes here below. Try to include **actual** vs. **expected behavior** and **steps to reproduce** the issue._
+

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,21 +0,0 @@
-Thank you for your Pull Request!
-
-Before you submitting, please check that:
-
-- [ ] You added a brief description of the PR, e.g.:
-  - What does it do?
-  - What important points reviewers should know?
-  - Is there something left for follow-up PRs?
-- [ ] You labeled the PR with appropriate labels if you have permissions to do so.
-- [ ] You mentioned a related issue if this PR related to it, e.g. `Fixes #228` or `Related #1337`.
-- [ ] You asked any particular reviewers to review. If you aren't sure, start with GH suggestions.
-- [ ] Your PR adheres [the style guide](https://wiki.parity.io/Coding-guide)
-  - In particular, mind the maximal line length.
-  - There is no commented code checked in unless necessary.
-  - Any panickers have a proof or removed.
-- [ ] You updated any rustdocs which may have changed
-
-After you've read this notice feel free to remove it.
-Thank you!
-
-✄ -----------------------------------------------------------------------------

.github/workflows/audit.yml

@@ -1,18 +0,0 @@
-name: Security audit
-on:
-  pull_request:
-    paths: Cargo.lock
-  schedule:
-    - cron: '0 0 * * *'
-jobs:
-  security_audit:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout sources
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 50
-      - name: Run cargo audit
-        uses: actions-rs/audit-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build-test.yml

@@ -1,103 +0,0 @@
-name:                           Build and Test Suite
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable
-jobs:
-  build-tests:
-    name:                       Test and Build
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-16.04
-          - macos-latest
-          - windows-latest
-        toolchain:
-          - stable
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-        with:
-          submodules:           true
-      # https://github.com/actions/cache/issues/133 
-      - name:                   Fixup the owner of ~/.cargo/
-        if:                     matrix.platform == 'ubuntu-16.04'
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache linux
-        if:                     matrix.platform == 'ubuntu-16.04'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache MacOS
-        if:                     matrix.platform == 'macos-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/Users/runner/Library/Caches/Mozilla.sccache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache Windows
-        if:                     matrix.platform == 'windows-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "C:\\Users\\runneradmin\\AppData\\Local\\Mozilla\\sccache\\cache"
-          key:                  ${{ runner.os }}-sccache-build-tests-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for ${{ matrix.platform }}
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Install LLVM for Windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    choco install llvm
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Build tests
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose --no-run
-      - name:                   Run tests for ${{ matrix.platform }}
-        if:                     matrix.platform == 'windows-latest'
-        continue-on-error: true #Skip step if Windows tests failure
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose
-      - name:                   Run tests for ${{ matrix.platform }}
-        if:                     matrix.platform != 'windows-latest'
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              test
-          args:                 --locked --all --release --features "json-tests" --verbose
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh

.github/workflows/build.yml

@@ -1,95 +0,0 @@
-name:                           Build Release Suite
-
-on:
-  push:
-    branches:
-      - stable
-    tags:
-      - v*
-
-jobs:
-  build:
-    name:                       Build Release
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-16.04
-          - macos-latest
-          - windows-latest
-        toolchain:
-          - stable
-    runs-on:                    ${{ matrix.platform }}
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-      # https://github.com/actions/cache/issues/133
-      - name:                   Fixup the owner of ~/.cargo/
-        if:                     matrix.platform == 'ubuntu-16.04'
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            ${{ matrix.toolchain }}
-          profile:              minimal
-          override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache linux
-        if:                     matrix.platform == 'ubuntu-16.04'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache MacOS
-        if:                     matrix.platform == 'macos-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/Users/runner/Library/Caches/Mozilla.sccache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache sccache Windows
-        if:                     matrix.platform == 'windows-latest'
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "C:\\Users\\runneradmin\\AppData\\Local\\Mozilla\\sccache\\cache"
-          key:                  ${{ runner.os }}-sccache-build-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for ${{ matrix.platform }}
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Install LLVM for Windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    choco install llvm
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Build OpenEthereum for windows
-        if:                     matrix.platform == 'windows-latest'
-        run:                    sh scripts/actions/build-windows.sh ${{matrix.platform}}
-      - name:                   Build OpenEthereum for ${{matrix.platform}}
-        if:                     matrix.platform != 'windows-latest'
-        run:                    sh scripts/actions/build-linux.sh ${{matrix.platform}}
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Download artifact
-        uses:                   actions/upload-artifact@v1
-        with:
-          name:                 ${{matrix.platform}}.artifacts.zip
-          path:                 artifacts/
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh

.github/workflows/check.yml

@@ -1,88 +0,0 @@
-name:                           Check
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - stable
-jobs:
-  check:
-    name:                       Check
-    runs-on:                    ubuntu-16.04
-    env:
-      SCCACHE_CACHE_SIZE:       "1G"
-      SCCACHE_IDLE_TIMEOUT:     0    
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-        with:
-          submodules:           true
-      # https://github.com/actions/cache/issues/133
-      - name:                   Fixup the owner of ~/.cargo/
-        run:                    sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name:                   Install stable toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            stable
-          profile:              minimal
-          override:             true
-      - name:                   Cache cargo registry
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/registry
-          key:                  ${{ runner.os }}-cargo-registry-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo index
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 ~/.cargo/git
-          key:                  ${{ runner.os }}-cargo-git-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Cache cargo build
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 target
-          key:                  ${{ runner.os }}-cargo-build-target-${{ hashFiles('**/Cargo.lock') }}
-      # Install sccache based on https://github.com/denoland/rusty_v8/blob/master/.github/workflows/ci.yml#L69
-      - name:                   Cache sccache
-        uses:                   actions/cache@v1.1.2
-        with:
-          path:                 "/home/runner/.cache/sccache"
-          key:                  ${{ runner.os }}-sccache-check-${{ hashFiles('**/Cargo.lock') }}
-      - name:                   Install sccache for Linux
-        shell:                  pwsh
-        run:                    pwsh scripts/actions/install-sccache.ps1 ${{ runner.os}}
-      - name:                   Sccache statistics
-        run:                    sccache --show-stats
-      - name:                   Run cargo check 1/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --no-default-features --verbose
-      - name:                   Run cargo check 2/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --manifest-path util/io/Cargo.toml --no-default-features --verbose
-      - name:                   Run cargo check 3/3
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --manifest-path util/io/Cargo.toml --features "mio" --verbose
-      - name:                   Run cargo check evmbin
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked -p evmbin --verbose
-      - name:                   Run cargo check benches
-        uses:                   actions-rs/cargo@v1
-        with:
-          command:              check
-          args:                 --locked --all --benches --verbose
-      - name:                   Run validate chainspecs
-        run:                    ./scripts/actions/validate-chainspecs.sh
-      - name:                   Stop sccache
-        if:                     always()
-        run:                    sccache --stop-server
-      - name:                   Prepare build directory for cache
-        shell: bash
-        run:                    bash scripts/actions/clean-target.sh

.github/workflows/deploy-docker.yml

@@ -1,30 +0,0 @@
-name:                           Docker Image Release
-
-on:
-  push:
-    branches:
-      - master
-    tags:
-      - v*
-
-jobs:
-  deploy-docker:
-    name:                       Build Release
-    runs-on:                    ubuntu-latest
-    steps:
-      - name:                   Checkout sources
-        uses:                   actions/checkout@master
-      - name:                   Install toolchain
-        uses:                   actions-rs/toolchain@v1
-        with:
-          toolchain:            stable
-          profile:              minimal
-          override:             true
-      - name:                   Deploy to docker hub
-        uses: elgohr/Publish-Docker-Github-Action@master
-        with:
-          name: openethereum/openethereum
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          dockerfile: scripts/docker/alpine/Dockerfile
-          tag_names: true

.gitignore

@@ -42,4 +42,4 @@ parity-clib-examples/cpp/build/
 
 .vscode
 rls/
-/openethereum.*
+/parity.*

.gitlab-ci.yml

@@ -0,0 +1,259 @@
+stages:
+  - test
+  - build
+  - publish
+  - optional
+
+image:                             parity/rust-parity-ethereum-build:xenial
+variables:
+  GIT_STRATEGY:                    fetch
+  GIT_SUBMODULE_STRATEGY:          recursive
+  CI_SERVER_NAME:                  "GitLab CI"
+  CARGO_TARGET:                    x86_64-unknown-linux-gnu
+
+.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
+
+.collect_artifacts:                &collect_artifacts
+  artifacts:
+    name:                          "${CI_JOB_NAME}_${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}"
+    when:                          on_success
+    expire_in:                     1 mos
+    paths:
+      - artifacts/
+
+.docker-cache-status:              &docker-cache-status
+  variables:
+    CARGO_HOME:                    "/cargo/${CI_JOB_NAME}"
+  before_script:
+    - SCCACHE_ERROR_LOG=/builds/parity/parity-ethereum/sccache_error.log RUST_LOG=sccache::server=debug sccache --start-server
+    - sccache -s
+  after_script:
+    - echo "All crate-types:"
+    - grep 'parse_arguments.*--crate-type' sccache_error.log | sed -re 's/.*"--crate-type", "([^"]+)".*/\1/' | sort | uniq -c
+    - echo "Non-cacheable reasons:"
+    - grep CannotCache sccache_error.log | sed -re 's/.*CannotCache\((.+)\).*/\1/' | sort | uniq -c
+  tags:
+    - linux-docker
+
+
+cargo-check 0 3:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - time cargo check --target $CARGO_TARGET --locked --no-default-features
+    - 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
+    - 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"
+    - sccache -s
+
+cargo-audit:
+  stage:                           test
+  <<:                              *docker-cache-status
+  script:
+    - cargo audit
+    - sccache -s
+
+validate-chainspecs:
+  stage:                           test
+  <<:                              *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
+    - sccache -s
+
+build-android:
+  stage:                           build
+  image:                           parity/rust-android:gitlab-ci
+  variables:
+    CARGO_TARGET:                  armv7-linux-androideabi
+  script:
+    - scripts/gitlab/build-linux.sh
+  tags:
+    - linux-docker
+  <<:                              *collect_artifacts
+
+build-linux:                       &build-linux
+  stage:                           build
+  only:                            *releaseable_branches
+  <<:                              *docker-cache-status
+  script:
+    - scripts/gitlab/build-linux.sh
+    - sccache -s
+  <<:                              *collect_artifacts
+
+build-linux-i386:
+  <<:                              *build-linux
+  image:                           parity/rust-parity-ethereum-build:i386
+  variables:
+    CARGO_TARGET:                  i686-unknown-linux-gnu
+
+build-linux-arm64:
+  <<:                              *build-linux
+  image:                           parity/rust-parity-ethereum-build:arm64
+  variables:
+    CARGO_TARGET:                  aarch64-unknown-linux-gnu
+
+build-linux-armhf:
+  <<:                              *build-linux
+  image:                           parity/rust-parity-ethereum-build:armhf
+  variables:
+    CARGO_TARGET:                  armv7-unknown-linux-gnueabihf
+
+build-darwin:
+  stage:                           build
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-apple-darwin
+    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
+    CC:                            gcc
+    CXX:                           g++
+  script:
+    - scripts/gitlab/build-linux.sh
+  tags:
+    - rust-osx
+  <<:                              *collect_artifacts
+
+build-windows:
+  stage:                           build
+  only:                            *releaseable_branches
+  variables:
+    CARGO_TARGET:                  x86_64-pc-windows-msvc
+    CARGO_HOME:                      "${CI_PROJECT_DIR}/.cargo"
+  script:
+    - sh scripts/gitlab/build-windows.sh
+  tags:
+    - rust-windows
+  <<:                              *collect_artifacts
+
+publish-docker:
+  stage:                           publish
+  only:                            *releaseable_branches
+  cache:                           {}
+  dependencies:
+    - build-linux
+  tags:
+    - shell
+  script:
+    - scripts/gitlab/publish-docker.sh parity
+
+publish-snap:                      &publish-snap
+  stage:                           publish
+  only:                            *releaseable_branches
+  image:                           snapcore/snapcraft
+  variables:
+    BUILD_ARCH:                    amd64
+  cache:                           {}
+  dependencies:
+    - build-linux
+  tags:
+    - linux-docker
+  script:
+    - scripts/gitlab/publish-snap.sh
+  <<:                              *collect_artifacts
+
+publish-snap-i386:
+  <<:                              *publish-snap
+  variables:
+    BUILD_ARCH:                    i386
+  dependencies:
+    - build-linux-i386
+
+publish-snap-arm64:
+  <<:                              *publish-snap
+  variables:
+    BUILD_ARCH:                    arm64
+  dependencies:
+    - build-linux-arm64
+
+publish-snap-armhf:
+  <<:                              *publish-snap
+  variables:
+    BUILD_ARCH:                    armhf
+  dependencies:
+    - build-linux-armhf
+
+publish-onchain:
+  stage:                           publish
+  only:                            *releaseable_branches
+  cache:                           {}
+  dependencies:
+    - build-linux
+    - build-darwin
+    - build-windows
+  script:
+    - scripts/gitlab/publish-onchain.sh
+  tags:
+    - linux-docker
+
+publish-awss3-release:
+  image:                           parity/awscli:latest
+  stage:                           publish
+  only:                            *releaseable_branches
+  <<:                              *no_git
+  cache:                           {}
+  dependencies:
+    - build-linux
+    - build-darwin
+    - build-windows
+  script:
+    - echo "__________Push binaries to AWS S3____________"
+    - case "${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}" in
+       (beta|stable|nightly)
+         export BUCKET=releases.parity.io/ethereum;
+         ;;
+       (*)
+         export BUCKET=builds-parity;
+         ;;
+     esac
+    - aws s3 sync ./artifacts s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}}/
+    - echo "__________Read from S3____________"
+    - aws s3 ls s3://${BUCKET}/${SCHEDULE_TAG:-${CI_COMMIT_REF_NAME}} --recursive --human-readable --summarize
+  tags:
+    - linux-docker
+
+publish-docs:
+  stage:                            publish
+  only:
+    - tags
+  except:
+    - nightly
+  cache:                            {}
+  script:
+    - scripts/gitlab/publish-docs.sh
+  tags:
+    - linux-docker
+

.gitmodules

@@ -4,4 +4,4 @@
 	branch = develop
 [submodule "ethcore/res/wasm-tests"]
 	path = ethcore/res/wasm-tests
-	url = https://github.com/openethereum/wasm-tests
+	url = https://github.com/paritytech/wasm-tests

CHANGELOG.md

@@ -1,123 +1,287 @@
-## OpenEthereum [v3.0.1](https://github.com/openethereum/openethereum/releases/tag/v3.0.1)
+## Parity-Ethereum [v2.2.5](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.5) (2018-12-14)
+Parity-Ethereum 2.2.5-beta is an important release that introduces Constantinople fork at block 7080000 on Mainnet. 
+This release also contains a fix for chains using AuRa + EmptySteps. Read carefully if this applies to you. 
+If you have a chain with`empty_steps` already running, some blocks most likely contain non-strict entries (unordered or duplicated empty steps). In this release`strict_empty_steps_transition` **is enabled by default at block 0** for any chain with `empty_steps`.
+If your network uses `empty_steps` you **must**:
+- plan a hard fork and change `strict_empty_steps_transition` to the desire fork block
+- update the clients of the whole network to 2.2.5-beta / 2.1.10-stable.
+If for some reason you don't want to do this please set`strict_empty_steps_transition` to `0xfffffffff` to disable it.
 
-- Add missing forks to fork ID (#11747)
+The full list of included changes: 
+- Backports for beta 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
+	- Bump beta to 2.2.5 ([#10047](https://github.com/paritytech/parity-ethereum/pull/10047))
+	- Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
+		- Prevent sending empty step message twice
+		- Prevent sending empty step and then block in the same step
+		- Don't accept double empty steps
+		- Do basic validation of self-sealed blocks
+	- Strict empty steps validation ([#10041](https://github.com/paritytech/parity-ethereum/pull/10041))
+		- Enables strict verification of empty steps - there can be no duplicates and empty steps should be ordered inside the seal.
+		- Note that authorities won't produce invalid seals after [#9939](https://github.com/paritytech/parity-ethereum/pull/9939), this PR just adds verification to the seal to prevent forging incorrect blocks and potentially causing consensus issues.
+		- This features is enabled by default so any AuRa + EmptySteps chain should set strict_empty_steps_transition fork block number in their spec and upgrade to v2.2.5-beta or v2.1.10-stable.
+	- ethcore: enable constantinople on ethereum ([#10031](https://github.com/paritytech/parity-ethereum/pull/10031))
+		- ethcore: change blockreward to 2e18 for foundation after constantinople
+		- ethcore: delay diff bomb by 2e6 blocks for foundation after constantinople
+		- ethcore: enable eip-{145,1014,1052,1283} for foundation after constantinople
+	- Change test miner max memory to malloc reports. ([#10024](https://github.com/paritytech/parity-ethereum/pull/10024))
+	- Fix: test corpus_inaccessible panic ([#10019](https://github.com/paritytech/parity-ethereum/pull/10019))
 
-## OpenEthereum [v3.0.0](https://github.com/openethereum/openethereum/releases/tag/v3.0.0)
+## Parity-Ethereum [v2.2.2](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.2) (2018-11-29)
 
-OpenEthereum v3.0.0 is the first release of OpenEthereum client as part of OpenEthereum project, divested from Parity Technologies.
+Parity-Ethereum 2.2.2-beta is an exciting release. Among others, it improves sync performance, peering stability, block propagation, and transaction propagation times. Also, a warp-sync no longer removes existing blocks from the database, but rather reuses locally available information to decrease sync times and reduces required bandwidth.
 
-This release marks the transition from Parity Technologies infrastructure and bootnodes to the one managed by OpenEthereum project.
+Before upgrading to 2.2.2, please also verify the validity of your chain specs. Parity Ethereum now denies unknown fields in the specification. To do this, use the chainspec tool:
 
-Parity-Ethereum v2.7 users can continue using their existing data folders. Command-line interface has also stayed identical.
-Unless specified otherwise, OpenEthereum v3.0.0 will detect if the user's database in the old Parity-Ethereum default path,
-and only if it's not found will write to the new default location.
+```
+cargo build --release -p chainspec
+./target/release/chainspec /path/to/spec.json
+```
 
-This release includes several major improvements to network and database stack:
-- Support for `eth/64` protocol and Node Discovery v4 `Ethereum Node Records` extension.
-- Accounts bloom is removed which should decrease the database size.
-
-**Due to database changes this is a one-way upgrade. Please back up your database if you plan to continue using Parity-Ethereum v2.7.2.**
-
-Note that this release drops support for IPFS and `eth/62` protocol. Additionally, it marks light client, private transactions and updater as deprecated features which may be removed in a future release.
+Last but not least, JSONRPC APIs which are not yet accepted as an EIP in the `eth`, `personal`, or `web3` namespace, are now considere experimental as their final specification might change in future. These APIs have to be manually enabled by explicitly running `--jsonrpc-experimental`.
 
 The full list of included changes:
-- Add deprecation warnings (#11682)
-- Add Curl to Docker image (#11687)
-- v3 release version strings and track stable (#11680)
-- Fix sccache server errors (#11675)
-- Don't delete old db after migration (#11662)
-- rename inject to drain_transaction_overlay (#11657)
-- Drain the transaction overlay (#11654)
-- vergen library seems to depend not only on the .git folder content but also on the git binary (#11651)
-- New default paths (#11641)
-- Update EWF's chains with Istanbul transition block numbers (#11482)
-- add openethereum supplementary bootnodes, those are not active right now, but will be in case the network needs more power (#11650)
-- Remove Parity bootnodes (#11644)
-- Remove accounts bloom (#11589)
-- Deploy docker images on master (#11640)
-- Fix some compiler warnings (#11632)
-- Add support for non-fork side of Phoenix (#11627)
-- validate mainnet specs against all forks (#11625)
-- Fix ecrecover builtin (#11623)
-- Update .gitmodules (#11628)
-- ethcore/res: activate ecip-1088 phoenix on classic (#11598)
-- Upgrade parity-common deps to latest (#11620)
-- Fix Goerli syncing (#11604)
-- deps: switch to upstream ctrlc (#11617)
-- Deduplicating crate dependencies (part 3 of n) (#11614)
-- Deduplicating crate dependencies (part 2 of n, `slab`) (#11613)
-- Actually save ENR on creation and modification (#11602)
-- Activate POSDAO on xDai chain and update bootnodes (#11610)
-- Activate on-chain randomness in POA Core (#11609)
-- Deduplicating crate dependencies (part 1 of n) (#11606)
-- Update enodes for POA Sokol (#11611)
-- Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608)
-- Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583)
-- `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605)
-- Use serde_json to export hardcoded sync (#11601)
-- Node Discovery v4 ENR Extension (EIP-868) (#11540)
-- Fix compile warnings (#11595)
-- Update version to 3.0.0-alpha.1 (#11592)
-- ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584)
-- Update on push tags (#11590)
-- Replace deprecated tempdir dependency with tempfile (#11588)
-- Fix project name, links, rename the binaries (#11580)
-- Update Cargo.lock (#11573)
-- ci: workaround for the cache bug on Linux (#11568)
-- Increase the default pruning parameters (#11558)
-- Add Docker build and push to github actions (#11555)
-- Update README (#11578)
-- informant: display I/O stats (#11523)
-- [devp2p discovery]: remove `deprecated_echo_hash` (#11564)
-- [secretstore] create db_version file when database doesn't exist (#11570)
-- Remove Parity's Security Policy (#11565)
-- ethcore/res: enable ecip-1088 phoenix upgrade for kotti and mordor testnets (#11529)
-- Misc docs and renames …and one less clone (#11556)
-- [secretstore]: don't sign message with only zeroes (#11561)
-- [devp2p discovery]: cleanup (#11547)
-- Code cleanup in the sync module (#11552)
-- initial cleanup (#11542)
-- Warn if genesis constructor revert (#11550)
-- ethcore: cleanup after #11531 (#11546)
-- license update (#11543)
-- Less cloning when importing blocks (#11531)
-- Github Actions (#11528)
-- Fix Alpine Dockerfile (#11538)
-- Remove AuxiliaryData/AuxiliaryRequest (#11533)
-- [journaldb]: cleanup (#11534)
-- Remove references to parity-ethereum (#11525)
-- Drop IPFS support (#11532)
-- chain-supplier: fix warning reporting for GetNodeData request (#11530)
-- Faster kill_garbage (#11514)
-- [EngineSigner]: don't sign message with only zeroes (#11524)
-- fix compilation warnings (#11522)
-- [ethcore cleanup]: various unrelated fixes from `#11493` (#11507)
-- Add benchmark for transaction execution (#11509)
-- Add Smart Contract License v1.0
-- Misc fixes (#11510)
-- [dependencies]: unify `rustc-hex` (#11506)
-- Activate on-chain randomness in POA Sokol (#11505)
-- Grab bag of cleanup (#11504)
-- Implement eth/64 (EIP-2364) and drop support for eth/62 (#11472)
-- [dependencies]: remove `util/macros` (#11501)
-- OpenEthereum bootnodes are added (#11499)
-- [ci benches]: use `all-features` (#11496)
-- [verification]: make test-build compile standalone (#11495)
-- complete null-signatures removal (#11491)
-- Include the seal when populating the header for a new block (#11475)
-- fix compilation warnings (#11492)
-- cargo update -p cmake (#11490)
-- update to published rlp-derive (#11489)
-- Switch usage of Secret Store to the external lib (#11487)
-- Switch from the internal runtime lib to external one from crates.io (#11480)
-- Update params.rs (#11474)
-- weak_counts has been stabilized (#11476)
-- sync: remove broken eth_protocol_version method (#11473)
-- Use parity-crypto updated to use upstream rust-secp256k1 (#11406)
-- Cleanup some code in Aura (#11466)
-- upgrade some of the dependencies (#11467)
-- Some more release track changes to README.md (#11465)
-- Update simple one-line installer due to switching to a single stable release track (#11463)
-- update Dockerfile (#11461)
-- Implement EIP-2124 (#11456)
-- [eth classic chainspec]: remove `balance = 1` (#11459)
+
+- Backports For beta 2.2.2 ([#9976](https://github.com/paritytech/parity-ethereum/pull/9976))
+  - Version: bump beta to 2.2.2
+  - Add experimental RPCs flag ([#9928](https://github.com/paritytech/parity-ethereum/pull/9928))
+  - Keep existing blocks when restoring a Snapshot ([#8643](https://github.com/paritytech/parity-ethereum/pull/8643))
+    - Rename db_restore => client
+    - First step: make it compile!
+    - Second step: working implementation!
+    - Refactoring
+    - Fix tests
+    - Migrate ancient blocks interacting backward
+    - Early return in block migration if snapshot is aborted
+    - Remove RwLock getter (PR Grumble I)
+    - Remove dependency on `Client`: only used Traits
+    - Add test for recovering aborted snapshot recovery
+    - Add test for migrating old blocks
+    - Release RwLock earlier
+    - Revert Cargo.lock
+    - Update _update ancient block_ logic: set local in `commit`
+    - Update typo in ethcore/src/snapshot/service.rs
+  - Adjust requests costs for light client ([#9925](https://github.com/paritytech/parity-ethereum/pull/9925))
+    - Pip Table Cost relative to average peers instead of max peers
+    - Add tracing in PIP new_cost_table
+    - Update stat peer_count
+    - Use number of leeching peers for Light serve costs
+    - Fix test::light_params_load_share_depends_on_max_peers (wrong type)
+    - Remove (now) useless test
+    - Remove `load_share` from LightParams.Config
+    - Add LEECHER_COUNT_FACTOR
+    - Pr Grumble: u64 to u32 for f64 casting
+    - Prevent u32 overflow for avg_peer_count
+    - Add tests for LightSync::Statistics
+  - Fix empty steps ([#9939](https://github.com/paritytech/parity-ethereum/pull/9939))
+    - Don't send empty step twice or empty step then block.
+    - Perform basic validation of locally sealed blocks.
+    - Don't include empty step twice.
+  - Prevent silent errors in daemon mode, closes [#9367](https://github.com/paritytech/parity-ethereum/issues/9367) ([#9946](https://github.com/paritytech/parity-ethereum/pull/9946))
+  - Fix a deadlock ([#9952](https://github.com/paritytech/parity-ethereum/pull/9952))
+    - Update informant:
+      - Decimal in Mgas/s
+      - Print every 5s (not randomly between 5s and 10s)
+    - Fix dead-lock in `blockchain.rs`
+    - Update locks ordering
+  - Fix light client informant while syncing ([#9932](https://github.com/paritytech/parity-ethereum/pull/9932))
+    - Add `is_idle` to LightSync to check importing status
+    - Use SyncStateWrapper to make sure is_idle gets updates
+    - Update is_major_import to use verified queue size as well
+    - Add comment for `is_idle`
+    - Add Debug to `SyncStateWrapper`
+    - `fn get` -> `fn into_inner`
+  -  Ci: rearrange pipeline by logic ([#9970](https://github.com/paritytech/parity-ethereum/pull/9970))
+    - Ci: rearrange pipeline by logic
+    - Ci: rename docs script
+  - Fix docker build ([#9971](https://github.com/paritytech/parity-ethereum/pull/9971))
+  - Deny unknown fields for chainspec ([#9972](https://github.com/paritytech/parity-ethereum/pull/9972))
+    - Add deny_unknown_fields to chainspec
+    - Add tests and fix existing one
+    - Remove serde_ignored dependency for chainspec
+    - Fix rpc test eth chain spec
+    - Fix starting_nonce_test spec
+  - Improve block and transaction propagation ([#9954](https://github.com/paritytech/parity-ethereum/pull/9954))
+    - Refactor sync to add priority tasks.
+    - Send priority tasks notifications.
+    - Propagate blocks, optimize transactions.
+    - Implement transaction propagation. Use sync_channel.
+    - Tone down info.
+    - Prevent deadlock by not waiting forever for sync lock.
+    - Fix lock order.
+    - Don't use sync_channel to prevent deadlocks.
+    - Fix tests.
+  - Fix unstable peers and slowness in sync ([#9967](https://github.com/paritytech/parity-ethereum/pull/9967))
+    - Don't sync all peers after each response
+    - Update formating
+    - Fix tests: add `continue_sync` to `Sync_step`
+    - Update ethcore/sync/src/chain/mod.rs
+    - Fix rpc middlewares
+  - Fix Cargo.lock
+  - Json: resolve merge in spec
+  - Rpc: fix starting_nonce_test
+  - Ci: allow nightl job to fail
+
+## Parity-Ethereum [v2.2.1](https://github.com/paritytech/parity-ethereum/releases/tag/v2.2.1) (2018-11-15)
+
+Parity-Ethereum 2.2.1-beta is the first v2.2 release, and might introduce features that break previous work flows, among others:
+
+- Prevent zero network ID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763)) and drop support for Olympic testnet ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801)): The Olympic test net is dead for years and never used a chain ID but network ID zero. Parity Ethereum is now preventing the network ID to be zero, thus Olympic support is dropped. Make sure to chose positive non-zero network IDs in future.
+- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239)): adds a CLI argument `--snapshot-threads` which specifies the number of threads. This helps improving the performance of full nodes that wish to provide warp-snapshots for the network. The gain in performance comes with a slight drawback in increased snapshot size.
+- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439)): Parity Ethereum imports blocks in rounds. If at the end of any round, the queue is not empty, we consider it to be _importing_ and won't notify pubsub. On large re-orgs (10+ blocks), this is possible. The default `max_round_blocks_to_import` is increased to 12 and configurable via the `--max-round-blocks-to-import` CLI flag. With unstable network conditions, it is advised to increase the number. This shouldn't have any noticeable performance impact unless the number is set to really large.
+- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564)): the default values for gas floor target are `8_000_000` and gas cap `10_000_000`, similar to Geth 1.8.15+.
+- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725)): we now produce portable binaries, but it may incur some performance degradation. For ultimate performance it's now better to compile Parity Ethereum from source with `PORTABLE=OFF` environment variable.
+- RPC: `parity_allTransactionHashes` ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745)): Get all pending transactions from the queue with the high performant `parity_allTransactionHashes` RPC method.
+- Support `eth_chainId` RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783)): implements EIP-695 to get the chainID via RPC.
+- AuRa: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692)): The AuRa engine was updated to emit ancestry actions to finalize blocks. The full client stores block finality in the database, the engine builds finality from an ancestry of `ExtendedHeader`; `is_epoch_end` was updated to take a vec of recently finalized headers; `is_epoch_end_light` was added which maintains the previous interface and is used by the light client since the client itself doesn't track finality.
+
+The full list of included changes:
+
+- Backport to parity 2.2.1 beta ([#9905](https://github.com/paritytech/parity-ethereum/pull/9905))
+  - Bump version to 2.2.1
+  - Fix: Intermittent failing CI due to addr in use ([#9885](https://github.com/paritytech/parity-ethereum/pull/9885))
+  - Fix Parity not closing on Ctrl-C ([#9886](https://github.com/paritytech/parity-ethereum/pull/9886))
+  - Fix json tracer overflow ([#9873](https://github.com/paritytech/parity-ethereum/pull/9873))
+  - Fix docker script ([#9854](https://github.com/paritytech/parity-ethereum/pull/9854))
+  - Add hardcoded headers for light client ([#9907](https://github.com/paritytech/parity-ethereum/pull/9907))
+  - Gitlab-ci: make android release build succeed ([#9743](https://github.com/paritytech/parity-ethereum/pull/9743))
+  - Allow to seal work on latest block ([#9876](https://github.com/paritytech/parity-ethereum/pull/9876))
+  - Remove rust-toolchain file ([#9906](https://github.com/paritytech/parity-ethereum/pull/9906))
+  - Light-fetch: Differentiate between out-of-gas/manual throw and use required gas from response on failure ([#9824](https://github.com/paritytech/parity-ethereum/pull/9824))
+  - Eip-712 implementation ([#9631](https://github.com/paritytech/parity-ethereum/pull/9631))
+  - Eip-191 implementation ([#9701](https://github.com/paritytech/parity-ethereum/pull/9701))
+  - Simplify cargo audit ([#9918](https://github.com/paritytech/parity-ethereum/pull/9918))
+  - Fix performance issue importing Kovan blocks ([#9914](https://github.com/paritytech/parity-ethereum/pull/9914))
+  - Ci: nuke the gitlab caches ([#9855](https://github.com/paritytech/parity-ethereum/pull/9855))
+- Backports to parity beta 2.2.0 ([#9820](https://github.com/paritytech/parity-ethereum/pull/9820))
+  - Ci: remove failing tests for android, windows, and macos ([#9788](https://github.com/paritytech/parity-ethereum/pull/9788))
+  - Implement NoProof for json tests and update tests reference ([#9814](https://github.com/paritytech/parity-ethereum/pull/9814))
+  - Move state root verification before gas used ([#9841](https://github.com/paritytech/parity-ethereum/pull/9841))
+  - Classic.json Bootnode Update ([#9828](https://github.com/paritytech/parity-ethereum/pull/9828))
+- Rpc: parity_allTransactionHashes ([#9745](https://github.com/paritytech/parity-ethereum/pull/9745))
+- Revert "prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))" ([#9815](https://github.com/paritytech/parity-ethereum/pull/9815))
+- Allow zero chain id in EIP155 signing process ([#9792](https://github.com/paritytech/parity-ethereum/pull/9792))
+- Add readiness check for docker container ([#9804](https://github.com/paritytech/parity-ethereum/pull/9804))
+- Insert dev account before unlocking ([#9813](https://github.com/paritytech/parity-ethereum/pull/9813))
+- Removed "rustup" & added new runner tag ([#9731](https://github.com/paritytech/parity-ethereum/pull/9731))
+- Expose config max-round-blocks-to-import ([#9439](https://github.com/paritytech/parity-ethereum/pull/9439))
+- Aura: finalize blocks ([#9692](https://github.com/paritytech/parity-ethereum/pull/9692))
+- Sync: retry different peer after empty subchain heads response ([#9753](https://github.com/paritytech/parity-ethereum/pull/9753))
+- Fix(light-rpc/parity) : Remove unused client ([#9802](https://github.com/paritytech/parity-ethereum/pull/9802))
+- Drops support for olympic testnet, closes [#9800](https://github.com/paritytech/parity-ethereum/issues/9800) ([#9801](https://github.com/paritytech/parity-ethereum/pull/9801))
+- Replace `tokio_core` with `tokio` (`ring` -> 0.13) ([#9657](https://github.com/paritytech/parity-ethereum/pull/9657))
+- Support eth_chainId RPC method ([#9783](https://github.com/paritytech/parity-ethereum/pull/9783))
+- Ethcore: bump ropsten forkblock checkpoint ([#9775](https://github.com/paritytech/parity-ethereum/pull/9775))
+- Docs: changelogs for 2.0.8 and 2.1.3 ([#9758](https://github.com/paritytech/parity-ethereum/pull/9758))
+- Prevent zero networkID ([#9763](https://github.com/paritytech/parity-ethereum/pull/9763))
+- Skip seal fields count check when --no-seal-check is used ([#9757](https://github.com/paritytech/parity-ethereum/pull/9757))
+- Aura: fix panic on extra_info with unsealed block ([#9755](https://github.com/paritytech/parity-ethereum/pull/9755))
+- Docs: update changelogs ([#9742](https://github.com/paritytech/parity-ethereum/pull/9742))
+- Removed extra assert in generation_session_is_removed_when_succeeded ([#9738](https://github.com/paritytech/parity-ethereum/pull/9738))
+- Make checkpoint_storage_at use plain loop instead of recursion ([#9734](https://github.com/paritytech/parity-ethereum/pull/9734))
+- Use signed 256-bit integer for sstore gas refund substate ([#9746](https://github.com/paritytech/parity-ethereum/pull/9746))
+- Heads ref not present for branches beta and stable ([#9741](https://github.com/paritytech/parity-ethereum/pull/9741))
+- Add Callisto support ([#9534](https://github.com/paritytech/parity-ethereum/pull/9534))
+- Add --force to cargo audit install script ([#9735](https://github.com/paritytech/parity-ethereum/pull/9735))
+- Remove unused expired value from Handshake ([#9732](https://github.com/paritytech/parity-ethereum/pull/9732))
+- Add hardcoded headers ([#9730](https://github.com/paritytech/parity-ethereum/pull/9730))
+- Produce portable binaries ([#9725](https://github.com/paritytech/parity-ethereum/pull/9725))
+- Gitlab ci: releasable_branches: change variables condition to schedule ([#9729](https://github.com/paritytech/parity-ethereum/pull/9729))
+- Update a few parity-common dependencies ([#9663](https://github.com/paritytech/parity-ethereum/pull/9663))
+- Hf in POA Core (2018-10-22) ([#9724](https://github.com/paritytech/parity-ethereum/pull/9724))
+- Schedule nightly builds ([#9717](https://github.com/paritytech/parity-ethereum/pull/9717))
+- Fix ancient blocks sync ([#9531](https://github.com/paritytech/parity-ethereum/pull/9531))
+- Ci: Skip docs job for nightly ([#9693](https://github.com/paritytech/parity-ethereum/pull/9693))
+- Fix (light/provider) : Make `read_only executions` read-only ([#9591](https://github.com/paritytech/parity-ethereum/pull/9591))
+- Ethcore: fix detection of major import ([#9552](https://github.com/paritytech/parity-ethereum/pull/9552))
+- Return 0 on error ([#9705](https://github.com/paritytech/parity-ethereum/pull/9705))
+- Ethcore: delay ropsten hardfork ([#9704](https://github.com/paritytech/parity-ethereum/pull/9704))
+- Make instantSeal engine backwards compatible, closes [#9696](https://github.com/paritytech/parity-ethereum/issues/9696) ([#9700](https://github.com/paritytech/parity-ethereum/pull/9700))
+- Implement CREATE2 gas changes and fix some potential overflowing ([#9694](https://github.com/paritytech/parity-ethereum/pull/9694))
+- Don't hash the init_code of CREATE. ([#9688](https://github.com/paritytech/parity-ethereum/pull/9688))
+- Ethcore: minor optimization of modexp by using LR exponentiation ([#9697](https://github.com/paritytech/parity-ethereum/pull/9697))
+- Removed redundant clone before each block import ([#9683](https://github.com/paritytech/parity-ethereum/pull/9683))
+- Add Foundation Bootnodes ([#9666](https://github.com/paritytech/parity-ethereum/pull/9666))
+- Docker: run as parity user ([#9689](https://github.com/paritytech/parity-ethereum/pull/9689))
+- Ethcore: mcip3 block reward contract ([#9605](https://github.com/paritytech/parity-ethereum/pull/9605))
+- Verify block syncing responses against requests ([#9670](https://github.com/paritytech/parity-ethereum/pull/9670))
+- Add a new RPC `parity_submitWorkDetail` similar `eth_submitWork` but return block hash ([#9404](https://github.com/paritytech/parity-ethereum/pull/9404))
+- Resumable EVM and heap-allocated callstack ([#9360](https://github.com/paritytech/parity-ethereum/pull/9360))
+- Update parity-wordlist library ([#9682](https://github.com/paritytech/parity-ethereum/pull/9682))
+- Ci: Remove unnecessary pipes ([#9681](https://github.com/paritytech/parity-ethereum/pull/9681))
+- Test.sh: use cargo --target for platforms other than linux, win or mac ([#9650](https://github.com/paritytech/parity-ethereum/pull/9650))
+- Ci: fix push script ([#9679](https://github.com/paritytech/parity-ethereum/pull/9679))
+- Hardfork the testnets ([#9562](https://github.com/paritytech/parity-ethereum/pull/9562))
+- Calculate sha3 instead of sha256 for push-release. ([#9673](https://github.com/paritytech/parity-ethereum/pull/9673))
+- Ethcore-io retries failed work steal ([#9651](https://github.com/paritytech/parity-ethereum/pull/9651))
+- Fix(light_fetch): avoid race with BlockNumber::Latest ([#9665](https://github.com/paritytech/parity-ethereum/pull/9665))
+- Test fix for windows cache name... ([#9658](https://github.com/paritytech/parity-ethereum/pull/9658))
+- Refactor(fetch) : light use only one `DNS` thread ([#9647](https://github.com/paritytech/parity-ethereum/pull/9647))
+- Ethereum libfuzzer integration small change ([#9547](https://github.com/paritytech/parity-ethereum/pull/9547))
+- Cli: remove reference to --no-ui in --unlock flag help ([#9616](https://github.com/paritytech/parity-ethereum/pull/9616))
+- Remove master from releasable branches ([#9655](https://github.com/paritytech/parity-ethereum/pull/9655))
+- Ethcore/VerificationQueue don't spawn up extra `worker-threads` when explictly specified not to ([#9620](https://github.com/paritytech/parity-ethereum/pull/9620))
+- Rpc: parity_getBlockReceipts ([#9527](https://github.com/paritytech/parity-ethereum/pull/9527))
+- Remove unused dependencies ([#9589](https://github.com/paritytech/parity-ethereum/pull/9589))
+- Ignore key_server_cluster randomly failing tests ([#9639](https://github.com/paritytech/parity-ethereum/pull/9639))
+- Ethcore: handle vm exception when estimating gas ([#9615](https://github.com/paritytech/parity-ethereum/pull/9615))
+- Fix bad-block reporting no reason ([#9638](https://github.com/paritytech/parity-ethereum/pull/9638))
+- Use static call and apparent value transfer for block reward contract code ([#9603](https://github.com/paritytech/parity-ethereum/pull/9603))
+- Hf in POA Sokol (2018-09-19) ([#9607](https://github.com/paritytech/parity-ethereum/pull/9607))
+- Bump smallvec to 0.6 in ethcore-light, ethstore and whisper ([#9588](https://github.com/paritytech/parity-ethereum/pull/9588))
+- Add constantinople conf to EvmTestClient. ([#9570](https://github.com/paritytech/parity-ethereum/pull/9570))
+- Fix(network): don't disconnect reserved peers ([#9608](https://github.com/paritytech/parity-ethereum/pull/9608))
+- Fix failing node-table tests on mac os, closes [#9632](https://github.com/paritytech/parity-ethereum/issues/9632) ([#9633](https://github.com/paritytech/parity-ethereum/pull/9633))
+- Update ropsten.json ([#9602](https://github.com/paritytech/parity-ethereum/pull/9602))
+- Simplify ethcore errors by removing BlockImportError ([#9593](https://github.com/paritytech/parity-ethereum/pull/9593))
+- Fix windows compilation, replaces [#9561](https://github.com/paritytech/parity-ethereum/issues/9561) ([#9621](https://github.com/paritytech/parity-ethereum/pull/9621))
+- Master: rpc-docs set github token ([#9610](https://github.com/paritytech/parity-ethereum/pull/9610))
+- Docs: add changelogs for 1.11.10, 1.11.11, 2.0.3, 2.0.4, 2.0.5, 2.0.6, 2.1.0, and 2.1.1 ([#9554](https://github.com/paritytech/parity-ethereum/pull/9554))
+- Docs(rpc): annotate tag with the provided message ([#9601](https://github.com/paritytech/parity-ethereum/pull/9601))
+- Ci: fix regex roll_eyes ([#9597](https://github.com/paritytech/parity-ethereum/pull/9597))
+- Remove snapcraft clean ([#9585](https://github.com/paritytech/parity-ethereum/pull/9585))
+- Add snapcraft package image (master) ([#9584](https://github.com/paritytech/parity-ethereum/pull/9584))
+- Docs(rpc): push the branch along with tags ([#9578](https://github.com/paritytech/parity-ethereum/pull/9578))
+- Fix typo for jsonrpc-threads flag ([#9574](https://github.com/paritytech/parity-ethereum/pull/9574))
+- Fix informant compile ([#9571](https://github.com/paritytech/parity-ethereum/pull/9571))
+- Added ropsten bootnodes ([#9569](https://github.com/paritytech/parity-ethereum/pull/9569))
+- Increase Gas-floor-target and Gas Cap ([#9564](https://github.com/paritytech/parity-ethereum/pull/9564))
+- While working on the platform tests make them non-breaking ([#9563](https://github.com/paritytech/parity-ethereum/pull/9563))
+- Improve P2P discovery ([#9526](https://github.com/paritytech/parity-ethereum/pull/9526))
+- Move dockerfile for android build container to scripts repo ([#9560](https://github.com/paritytech/parity-ethereum/pull/9560))
+- Simultaneous platform tests WIP ([#9557](https://github.com/paritytech/parity-ethereum/pull/9557))
+- Update ethabi-derive, serde, serde_json, serde_derive, syn && quote ([#9553](https://github.com/paritytech/parity-ethereum/pull/9553))
+- Ci: fix rpc docs generation 2 ([#9550](https://github.com/paritytech/parity-ethereum/pull/9550))
+- Ci: always run build pipelines for win, mac, linux, and android ([#9537](https://github.com/paritytech/parity-ethereum/pull/9537))
+- Multithreaded snapshot creation ([#9239](https://github.com/paritytech/parity-ethereum/pull/9239))
+- New ethabi ([#9511](https://github.com/paritytech/parity-ethereum/pull/9511))
+- Remove initial token for WS. ([#9545](https://github.com/paritytech/parity-ethereum/pull/9545))
+- Net_version caches network_id to avoid redundant aquire of sync readlock ([#9544](https://github.com/paritytech/parity-ethereum/pull/9544))
+- Correct before_script for nightly build versions ([#9543](https://github.com/paritytech/parity-ethereum/pull/9543))
+- Deps: bump kvdb-rocksdb to 0.1.4 ([#9539](https://github.com/paritytech/parity-ethereum/pull/9539))
+- State: test when contract creation fails, old storage values should re-appear ([#9532](https://github.com/paritytech/parity-ethereum/pull/9532))
+- Allow dropping light client RPC query with no results ([#9318](https://github.com/paritytech/parity-ethereum/pull/9318))
+- Bump master to 2.2.0 ([#9517](https://github.com/paritytech/parity-ethereum/pull/9517))
+- Enable all Constantinople hard fork changes in constantinople_test.json ([#9505](https://github.com/paritytech/parity-ethereum/pull/9505))
+- [Light] Validate `account balance` before importing transactions ([#9417](https://github.com/paritytech/parity-ethereum/pull/9417))
+- In create memory calculation is the same for create2 because the additional parameter was popped before. ([#9522](https://github.com/paritytech/parity-ethereum/pull/9522))
+- Update patricia trie to 0.2.2 ([#9525](https://github.com/paritytech/parity-ethereum/pull/9525))
+- Replace hardcoded JSON with serde json! macro ([#9489](https://github.com/paritytech/parity-ethereum/pull/9489))
+- Fix typo in version string ([#9516](https://github.com/paritytech/parity-ethereum/pull/9516))
+
+## Previous releases
+
+- [CHANGELOG-2.1](docs/CHANGELOG-2.1.md) (_stable_)
+- [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)

Cargo.toml

@@ -1,31 +1,40 @@
 [package]
-description = "OpenEthereum"
-name = "openethereum"
+description = "Parity Ethereum client"
+name = "parity-ethereum"
 # NOTE Make sure to update util/version/Cargo.toml as well
-version = "3.0.1"
+version = "2.3.8"
 license = "GPL-3.0"
-authors = [
-	"OpenEthereum developers",
-	"Parity Technologies <admin@parity.io>"
-]
+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 = { version = "3.1.4", features = ["termination"] }
-dir = { path = "util/dir" }
+log = "0.4"
+rustc-hex = "1.0"
 docopt = "1.0"
-engine = { path = "ethcore/engine" }
-ethabi = { version = "12.0", 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.10"
+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 = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
 ethcore = { path = "ethcore", features = ["parity"] }
-ethcore-accounts = { path = "accounts", optional = true }
+parity-bytes = "0.1"
+common-types = { path = "ethcore/types" }
 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" }
@@ -35,50 +44,32 @@ ethcore-network = { path = "util/network" }
 ethcore-private-tx = { path = "ethcore/private-tx" }
 ethcore-service = { path = "ethcore/service" }
 ethcore-sync = { path = "ethcore/sync" }
-ethereum-types = "0.9.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.5.0"
-kvdb = "0.5.0"
-kvdb-rocksdb = "0.7.0"
-log = "0.4"
-migration-rocksdb = { path = "util/migration-rocksdb" }
+ethereum-types = "0.4"
 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.6.1", features = ["publickey"] }
-parity-daemonize = "0.3"
+ethkey = { path = "accounts/ethkey" }
+rlp = { version = "0.3.0", features = ["ethereum"] }
+cli-signer= { path = "cli-signer" }
 parity-hash-fetch = { path = "updater/hash-fetch" }
+parity-ipfs-api = { path = "ipfs" }
 parity-local-store = { path = "miner/local-store" }
-parity-path = "0.1"
+parity-runtime = { path = "util/runtime" }
 parity-rpc = { path = "rpc" }
-parity-runtime = "0.1.1"
-parity-secretstore = { git = "https://github.com/paritytech/secret-store", branch = "v1.x", optional = true }
 parity-updater = { path = "updater" }
-parity-util-mem = { version = "0.6.0", features = ["jemalloc-global"] }
 parity-version = { path = "util/version" }
-parking_lot = "0.10.0"
-regex = "1.0"
+parity-whisper = { path = "whisper" }
+parity-path = "0.1"
+dir = { path = "util/dir" }
+panic_hook = { path = "util/panic-hook" }
+keccak-hash = "0.1"
+migration-rocksdb = { path = "util/migration-rocksdb" }
+kvdb = "0.1"
+kvdb-rocksdb = "0.1.3"
+journaldb = { path = "util/journaldb" }
+
+ethcore-secretstore = { path = "secret-store", optional = true }
+
 registrar = { path = "util/registrar" }
-rlp = "0.4.5"
-rpassword = "1.0"
-rustc-hex = "2.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.11.0"
-toml = "0.5.6"
-verification = { path = "ethcore/verification" }
 
 [build-dependencies]
 rustc_version = "0.2"
@@ -86,24 +77,33 @@ rustc_version = "0.2"
 [dev-dependencies]
 pretty_assertions = "0.1"
 ipnetwork = "0.12.6"
-tempfile = "3.1"
+tempdir = "0.3"
 fake-fetch = { path = "util/fake-fetch" }
 
+[target.'cfg(not(windows))'.dependencies]
+daemonize = "0.3"
+
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.8", features = ["winsock2", "winuser", "shellapi"] }
+winapi = { version = "0.3.4", features = ["winsock2", "winuser", "shellapi"] }
 
 [features]
-default = ["accounts"]
-accounts = ["ethcore-accounts", "parity-rpc/accounts"]
 miner-debug = ["ethcore/miner-debug"]
 json-tests = ["ethcore/json-tests"]
+ci-skip-issue = ["ethcore/ci-skip-issue"]
 test-heavy = ["ethcore/test-heavy"]
 evm-debug = ["ethcore/evm-debug"]
 evm-debug-tests = ["ethcore/evm-debug-tests"]
 slow-blocks = ["ethcore/slow-blocks"]
-secretstore = ["parity-secretstore", "accounts", "ethabi", "ethcore-call-contract"]
+secretstore = ["ethcore-secretstore"]
 final = ["parity-version/final"]
 deadlock_detection = ["parking_lot/deadlock_detection"]
+# to create a memory profile (requires nightly rust), use e.g.
+# `heaptrack /path/to/parity <parity params>`,
+# to visualize a memory profile, use `heaptrack_gui`
+# or
+# `valgrind --tool=massif /path/to/parity <parity params>`
+# and `massif-visualizer` for visualization
+memory_profiling = []
 # hardcode version number 1.3.7 of parity to force an update
 # in order to manually test that parity fall-over to the local version
 # in case of invalid or deprecated command line arguments are entered
@@ -114,11 +114,12 @@ path = "parity/lib.rs"
 
 [[bin]]
 path = "parity/main.rs"
-name = "openethereum"
+name = "parity"
+
+[profile.dev]
 
 [profile.release]
 debug = false
-lto = true
 
 [workspace]
 # This should only list projects that are not
@@ -130,4 +131,14 @@ 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"
 ]
+
+[patch.crates-io]
+heapsize = { git = "https://github.com/cheme/heapsize.git", branch = "ec-macfix" }

README.md

@@ -1,38 +1,13 @@
-# OpenEthereum
+![Parity Ethereum](docs/logo-parity-ethereum.svg)
 
-Fast and feature-rich multi-network Ethereum client.
+<h2 align="center">The Fastest and most Advanced Ethereum Client.</h2>
 
-[» Download the latest release «](https://github.com/openethereum/openethereum/releases/latest)
+<p align="center"><strong><a href="https://github.com/paritytech/parity-ethereum/releases/latest">» Download the latest release «</a></strong></p>
 
-[![GPL licensed][license-badge]][license-url]
-[![Build Status][ci-badge]][ci-url]
-[![Discord chat][chat-badge]][chat-url]
+<p align="center"><a href="https://gitlab.parity.io/parity/parity-ethereum/commits/master" target="_blank"><img src="https://gitlab.parity.io/parity/parity-ethereum/badges/master/build.svg" /></a>
+<a href="https://www.gnu.org/licenses/gpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/license-GPL%20v3-green.svg" /></a></p>
 
-[license-badge]: https://img.shields.io/badge/license-GPL_v3-green.svg
-[license-url]: LICENSE
-[ci-badge]: https://github.com/openethereum/openethereum/workflows/Build%20and%20Test%20Suite/badge.svg
-[ci-url]: https://github.com/openethereum/openethereum/actions
-[chat-badge]: https://img.shields.io/discord/669192218728202270.svg?logo=discord
-[chat-url]: https://discord.io/openethereum
-
-## Table of Contents
-
-1. [Description](#chapter-001)
-2. [Technical Overview](#chapter-002)
-3. [Building](#chapter-003)<br>
-  3.1 [Building Dependencies](#chapter-0031)<br>
-  3.2 [Building from Source Code](#chapter-0032)<br>
-  3.3 [Starting OpenEthereum](#chapter-0034)
-4. [Testing](#chapter-004)
-5. [Documentation](#chapter-005)
-6. [Toolchain](#chapter-006)
-7. [Contributing](#chapter-008)
-8. [License](#chapter-009)
-
-
-## 1. Description <a id="chapter-001"></a>
-
-**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. OpenEthereum provides the core infrastructure essential for speedy and reliable services.
+**Built for mission-critical use**: Miners, service providers, and exchanges need fast synchronisation and maximum uptime. Parity Ethereum provides the core infrastructure essential for speedy and reliable services.
 
 - Clean, modular codebase for easy customisation
 - Advanced CLI-based client
@@ -40,21 +15,19 @@ Fast and feature-rich multi-network Ethereum client.
 - Synchronise in hours, not days with Warp Sync
 - Modular for light integration into your service or product
 
-## 2. Technical Overview <a id="chapter-002"></a>
+## Technical Overview
 
-OpenEthereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing OpenEthereum using the **Rust programming language**. OpenEthereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
+Parity Ethereum's goal is to be the fastest, lightest, and most secure Ethereum client. We are developing Parity Ethereum using the sophisticated and cutting-edge **Rust programming language**. Parity Ethereum is licensed under the GPLv3 and can be used for all your Ethereum needs.
 
-By default, OpenEthereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
+By default, Parity Ethereum runs a JSON-RPC HTTP server on port `:8545` and a Web-Sockets server on port `:8546`. This is fully configurable and supports a number of APIs.
 
-If you run into problems while using OpenEthereum, check out the [old wiki for documentation](https://wiki.parity.io/), feel free to [file an issue in this repository](https://github.com/openethereum/openethereum/issues/new), or hop on our [Discord](https://discord.io/openethereum) chat room to ask a question. We are glad to help!
+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).
 
-You can download OpenEthereum's latest release at [the releases page](https://github.com/openethereum/openethereum/releases) or follow the instructions below to build from source. Read the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
+Parity Ethereum's current beta-release is 2.1. You can download it at [the releases page](https://github.com/paritytech/parity-ethereum/releases) or follow the instructions below to build from source. Please, mind the [CHANGELOG.md](CHANGELOG.md) for a list of all changes between different versions.
 
-## 3. Building <a id="chapter-003"></a>
+## Build Dependencies
 
-### 3.1 Build Dependencies <a id="chapter-0031"></a>
-
-OpenEthereum requires **latest stable Rust version** to build.
+Parity Ethereum requires **latest stable Rust version** to build.
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/). If you don't already have `rustup`, you can install it like this:
 
@@ -63,7 +36,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
   $ curl https://sh.rustup.rs -sSf | sh
   ```
 
-  OpenEthereum also requires `clang` (>= 9.0), `clang++`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
+  Parity Ethereum also requires `gcc`, `g++`, `libudev-dev`, `pkg-config`, `file`, `make`, and `cmake` packages to be installed.
 
 - OSX:
   ```bash
@@ -72,7 +45,7 @@ We recommend installing Rust through [rustup](https://www.rustup.rs/). If you do
 
   `clang` is required. It comes with Xcode command line tools or can be installed with homebrew.
 
-- Windows:
+- Windows
   Make sure you have Visual Studio 2015 with C++ support installed. Next, download and run the `rustup` installer from
   https://static.rust-lang.org/rustup/dist/x86_64-pc-windows-msvc/rustup-init.exe, start "VS2015 x64 Native Tools Command Prompt", and use the following command to install and set up the `msvc` toolchain:
   ```bash
@@ -83,14 +56,14 @@ Once you have `rustup` installed, then you need to install:
 * [Perl](https://www.perl.org)
 * [Yasm](https://yasm.tortall.net)
 
-Make sure that these binaries are in your `PATH`. After that, you should be able to build OpenEthereum from source.
+Make sure that these binaries are in your `PATH`. After that, you should be able to build Parity Ethereum from source.
 
-### 3.2 Build from Source Code <a id="chapter-0032"></a>
+## Build from Source Code
 
 ```bash
-# download OpenEthereum code
-$ git clone https://github.com/openethereum/openethereum
-$ cd openethereum
+# download Parity Ethereum code
+$ git clone https://github.com/paritytech/parity-ethereum
+$ cd parity-ethereum
 
 # build in release mode
 $ cargo build --release --features final
@@ -110,213 +83,73 @@ Note, when compiling a crate and you receive errors, it's in most cases your out
 $ cargo clean
 ```
 
-This always compiles the latest nightly builds. If you want to build stable, do a
+This always compiles the latest nightly builds. If you want to build stable or beta, do a
 
 ```bash
 $ git checkout stable
 ```
 
-### 3.3 Starting OpenEthereum <a id="chapter-0034"></a>
-
-#### Manually
-
-To start OpenEthereum manually, just run
+or
 
 ```bash
-$ ./target/release/openethereum
+$ git checkout beta
 ```
 
-so OpenEthereum begins syncing the Ethereum blockchain.
+## Simple One-Line Installer for Mac and Linux
 
-#### Using `systemd` service file
+```bash
+bash <(curl https://get.parity.io -L)
+```
 
-To start OpenEthereum as a regular user using `systemd` init:
+The one-line installer always defaults to the latest beta release. To install a stable release, run:
 
-1. Copy `./scripts/openethereum.service` to your
+```bash
+bash <(curl https://get.parity.io -L) -r stable
+```
+
+## Start Parity Ethereum
+
+### Manually
+
+To start Parity Ethereum manually, just run
+
+```bash
+$ ./target/release/parity
+```
+
+so Parity Ethereum begins syncing the Ethereum blockchain.
+
+### Using `systemd` service file
+
+To start Parity Ethereum as a regular user using `systemd` init:
+
+1. Copy `./scripts/parity.service` to your
 `systemd` user directory (usually `~/.config/systemd/user`).
-2. Copy release to bin folder, write `sudo install ./target/release/openethereum /usr/bin/openethereum`
-3. To configure OpenEthereum, see [our old wiki](https://paritytech.github.io/wiki/Configuring-Parity) for details.
+2. To configure Parity Ethereum, write a `/etc/parity/config.toml` config file, see [Configuring Parity Ethereum](https://paritytech.github.io/wiki/Configuring-Parity) for details.
 
-## 4. Testing <a id="chapter-004"></a>
+## Parity Ethereum toolchain
 
-Download the required test files: `git submodule update --init --recursive`. You can run tests with the following commands:
+In addition to the Parity Ethereum client, there are additional tools in this repository available:
 
-* **All** packages
-  ```
-  cargo test --all
-  ```
+- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
+- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
+- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/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/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.
 
-* Specific package
-  ```
-  cargo test --package <spec>
-  ```
+## Join the chat!
 
-Replace `<spec>` with one of the packages from the [package list](#package-list) (e.g. `cargo test --package evmbin`).
+Questions? Get in touch with us on Gitter:
+[![Gitter: Parity](https://img.shields.io/badge/gitter-parity-4AB495.svg)](https://gitter.im/paritytech/parity)
+[![Gitter: Parity.js](https://img.shields.io/badge/gitter-parity.js-4AB495.svg)](https://gitter.im/paritytech/parity.js)
+[![Gitter: Parity/Miners](https://img.shields.io/badge/gitter-parity/miners-4AB495.svg)](https://gitter.im/paritytech/parity/miners)
+[![Gitter: Parity-PoA](https://img.shields.io/badge/gitter-parity--poa-4AB495.svg)](https://gitter.im/paritytech/parity-poa)
 
-You can show your logs in the test output by passing `--nocapture` (i.e. `cargo test --package evmbin -- --nocapture`)
+Alternatively, join our community on Matrix:
+[![Riot: +Parity](https://img.shields.io/badge/riot-%2Bparity%3Amatrix.parity.io-orange.svg)](https://riot.im/app/#/group/+parity:matrix.parity.io)
 
-## 5. Documentation <a id="chapter-005"></a>
+## Documentation
 
-Be sure to [check out our old wiki](https://wiki.parity.io) for more information.
+Official website: https://parity.io
 
-### Viewing documentation for OpenEthereum packages
-
-You can generate documentation for OpenEthereum Rust packages that automatically opens in your web browser using [rustdoc with Cargo](https://doc.rust-lang.org/rustdoc/what-is-rustdoc.html#using-rustdoc-with-cargo) (of the The Rustdoc Book), by running the the following commands:
-
-* **All** packages
-  ```
-  cargo doc --document-private-items --open
-  ```
-
-* Specific package
-  ```
-  cargo doc --package <spec> -- --document-private-items --open
-  ```
-
-Use`--document-private-items` to also view private documentation and `--no-deps` to exclude building documentation for dependencies.
-
-Replacing `<spec>` with one of the following from the details section below (i.e. `cargo doc --package openethereum --open`):
-
-<a id="package-list"></a>
-**Package List**
-<details><p>
-
-* OpenEthereum Client Application
-  ```bash
-  openethereum
-  ```
-* OpenEthereum Account Management, Key Management Tool, and Keys Generator
-  ```bash
-  ethcore-accounts, ethkey-cli, ethstore, ethstore-cli
-  ```
-* OpenEthereum Chain Specification
-  ```bash
-  chainspec
-  ```
-* OpenEthereum CLI Signer Tool & RPC Client
-  ```bash
-  cli-signer parity-rpc-client
-  ```
-* OpenEthereum Ethash & ProgPoW Implementations
-  ```bash
-  ethash
-  ```
-* EthCore Library
-  ```bash
-  ethcore
-  ```
-  * OpenEthereum Blockchain Database, Test Generator, Configuration,
-Caching, Importing Blocks, and Block Information
-    ```bash
-    ethcore-blockchain
-    ```
-  * OpenEthereum Contract Calls and Blockchain Service & Registry Information
-    ```bash
-    ethcore-call-contract
-    ```
-  * OpenEthereum Database Access & Utilities, Database Cache Manager
-    ```bash
-    ethcore-db
-    ```
-  * OpenEthereum Virtual Machine (EVM) Rust Implementation
-    ```bash
-    evm
-    ```
-  * OpenEthereum Light Client Implementation
-    ```bash
-    ethcore-light
-    ```
-  * Smart Contract based Node Filter, Manage Permissions of Network Connections
-    ```bash
-    node-filter
-    ```
-  * Private Transactions
-    ```bash
-    ethcore-private-tx
-    ```
-  * OpenEthereum Client & Network Service Creation & Registration with the I/O Subsystem
-    ```bash
-    ethcore-service
-    ```
-  * OpenEthereum Blockchain Synchronization
-    ```bash
-    ethcore-sync
-    ```
-  * OpenEthereum Common Types
-    ```bash
-    common-types
-    ```
-  * OpenEthereum Virtual Machines (VM) Support Library
-    ```bash
-    vm
-    ```
-  * OpenEthereum WASM Interpreter
-    ```bash
-    wasm
-    ```
-  * OpenEthereum WASM Test Runner
-    ```bash
-    pwasm-run-test
-    ```
-  * OpenEthereum EVM Implementation
-    ```bash
-    evmbin
-    ```
-  * OpenEthereum JSON Deserialization
-    ```bash
-    ethjson
-    ```
-  * OpenEthereum State Machine Generalization for Consensus Engines
-    ```bash
-    parity-machine
-    ```
-* OpenEthereum Miner Interface
-  ```bash
-  ethcore-miner parity-local-store price-info ethcore-stratum using_queue
-  ```
-* OpenEthereum Logger Implementation
-  ```bash
-  ethcore-logger
-  ```
-* OpenEthereum JSON-RPC Servers
-  ```bash
-  parity-rpc
-  ```
-* OpenEthereum Updater Service
-  ```bash
-  parity-updater parity-hash-fetch
-  ```
-* OpenEthereum Core Libraries (`util`)
-  ```bash
-  accounts-bloom blooms-db dir eip-712 fake-fetch fastmap fetch ethcore-io
-  journaldb keccak-hasher len-caching-lock memory-cache memzero
-  migration-rocksdb ethcore-network ethcore-network-devp2p panic_hook
-  patricia-trie-ethereum registrar rlp_compress stats
-  time-utils triehash-ethereum unexpected parity-version
-  ```
-
-</p></details>
-
-## 6. Toolchain <a id="chapter-006"></a>
-
-In addition to the OpenEthereum client, there are additional tools in this repository available:
-
-- [evmbin](./evmbin) - OpenEthereum EVM Implementation.
-- [ethstore](./accounts/ethstore) - OpenEthereum Key Management.
-- [ethkey](./accounts/ethkey) - OpenEthereum Keys Generator.
-
-The following tools are available in a separate repository:
-- [ethabi](https://github.com/openethereum/ethabi) - OpenEthereum Encoding of Function Calls. [Docs here](https://crates.io/crates/ethabi)
-- [whisper](https://github.com/openethereum/whisper) - OpenEthereum Whisper-v2 PoC Implementation.
-
-## 7. Contributing <a id="chapter-007"></a>
-
-An introduction has been provided in the ["So You Want to be a Core Developer" presentation slides by Hernando Castano](http://tiny.cc/contrib-to-parity-eth). Additional guidelines are provided in [CONTRIBUTING](./.github/CONTRIBUTING.md).
-
-### Contributor Code of Conduct
-
-[CODE_OF_CONDUCT](./.github/CODE_OF_CONDUCT.md)
-
-## 8. License <a id="chapter-008"></a>
-
-[LICENSE](./LICENSE)
+Be sure to [check out our wiki](https://wiki.parity.io) for more information.

SECURITY.md

@@ -0,0 +1,80 @@
+# Security Policy
+
+Parity Technologies is committed to resolving security vulnerabilities in our software quickly and carefully. We take the necessary steps to minimize risk, provide timely information, and deliver vulnerability fixes and mitigations required to address security issues.
+
+## Reporting a Vulnerability
+
+Security vulnerabilities in Parity software should be reported by email to security@parity.io. If you think your report might be eligible for the Parity Bug Bounty Program, your email should be send to bugbounty@parity.io. 
+
+Your report should include the following:
+
+- your name
+- description of the vulnerability
+- attack scenario (if any)
+- components
+- reproduction
+- other details
+
+Try to include as much information in your report as you can, including a description of the vulnerability, its potential impact, and steps for reproducing it. Be sure to use a descriptive subject line.
+
+You'll receive a response to your email within two business days indicating the next steps in handling your report. We encourage finders to use encrypted communication channels to protect the confidentiality of vulnerability reports. You can encrypt your report using our public key. This key is [on MIT's key server](https://pgp.mit.edu/pks/lookup?op=get&search=0x5D0F03018D07DE73) server and reproduced below.
+
+After the initial reply to your report, our team will endeavor to keep you informed of the progress being made towards a fix. These updates will be sent at least every five business days. 
+
+Thank you for taking the time to responsibly disclose any vulnerabilities you find.
+
+## Responsible Investigation and Reporting
+
+Responsible investigation and reporting includes, but isn't limited to, the following:
+
+- Don't violate the privacy of other users, destroy data, etc.
+- Don’t defraud or harm Parity Technologies Ltd or its users during your research; you should make a good faith effort to not interrupt or degrade our services.
+- Don't target our physical security measures, or attempt to use social engineering, spam, distributed denial of service (DDOS) attacks, etc.
+- Initially report the bug only to us and not to anyone else.
+- Give us a reasonable amount of time to fix the bug before disclosing it to anyone else, and give us adequate written warning before disclosing it to anyone else.
+- In general, please investigate and report bugs in a way that makes a reasonable, good faith effort not to be disruptive or harmful to us or our users. Otherwise your actions might be interpreted as an attack rather than an effort to be helpful.
+
+## Bug Bounty Program
+
+Our Bug Bounty Program allows us to recognise and reward members of the Parity community for helping us find and address significant bugs, in accordance with the terms of the Parity Bug Bounty Program. A detailed description on eligibility, rewards, legal information and terms & conditions for contributors can be found on [our website](https://paritytech.io/bug-bounty.html). 
+
+
+
+
+
+
+## Plaintext PGP Key
+
+```
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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-----
+```

SMART_CONTRACT_LICENSE

@@ -1,49 +0,0 @@
-SMART CONTRACT LICENSE v1.0
-
-
-Anyone may run, modify, publicly perform, distribute and redistribute this
-software, and create derivative works based on it in each case in compliance
-with the permissions granted by the document (“Permissions Document”) whose
-**KECCAK256 HASH** equals the value found in the PUBLICLY READABLE VARIABLE
-named permissionsDocumentHash  on the **ETHEREUM MAINNET** **SMART CONTRACT
-ACCOUNT** with the following ADDRESS 0x5a88CA36Fd58Efde3b955758285E8e3347D1eAe3
-which is deemed incorporated into this license by reference. In case of any
-conflicts between this license and the Permissions Document, this license shall
-prevail.
-
-
-Where:
-- KECCAK256 HASH is the cryptographic hash algorithm that may take any document,
-expressed as a series of bytes, and convert it to a single value which may be
-expressed as a number from 0 to `2**256`;
-- ETHEREUM MAINNET is the peer-to-peer blockchain network and shared account
-ledger initiated and recognised by the Ethereum Foundation as "Ethereum";
-- SMART CONTRACT ACCOUNT is a single account to be found on the ETHEREUM MAINNET
-identified by an ADDRESS and which represents the combination of a computer
-programme and some associated values;
-- ADDRESS is a number between 0 and `2**160`, which is the primary means of
-identifying a single account on the ETHEREUM MAINNET;
-- PUBLICLY READABLE VARIABLE is an item in a smart contract storage, publicly
-accessible via the smart contract’s ABI using a getter function matching its
-name.
-
-This license supplements and does not replace any other license pertaining to
-this software.
-
-No permissions are granted if no **KECCAK256 HASH** appears in the *ETHEREUM
-MAINNET** **SMART CONTRACT ACCOUNT**.
-
-This license takes effect as a bare licence, and has the effect of granting
-rights to each licensee (which may be subject to conditions), BUT IMPOSES NO
-OBLIGATIONS OR LIABILITY ON ANY LICENSOR, ANY OWNER OF RIGHTS IN THE SOFTWARE,
-OR ANY PERSON INVOLVED IN THE DESIGN, DEVELOPMENT AND CODING OF THE SOFTWARE
-(“GRANTOR”).
-
-Each Grantor shall, to the maximum extent permitted by law, have no liability
-for direct, indirect, special, incidental, consequential, exemplary, punitive or
-other damages of any character including, without limitation, procurement of
-substitute software or services, loss of use, data or profits, or business
-interruption, however caused and on any theory of contract, warranty, tort
-(including negligence), product liability or otherwise, arising in any way in
-relation to the supply, licensing or operation of the software, even if advised
-of the possibility of such damages.

accounts/Cargo.toml

@@ -1,21 +0,0 @@
-[package]
-description = "OpenEthereum Account Management"
-license = "GPL-3.0"
-name = "ethcore-accounts"
-version = "0.1.0"
-authors = ["Parity Technologies <admin@parity.io>"]
-edition = "2018"
-
-[dependencies]
-ethkey = { path = "ethkey" }
-ethstore = { path = "ethstore" }
-log = "0.4"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parking_lot = "0.10.0"
-serde = "1.0"
-serde_derive = "1.0"
-serde_json = "1.0"
-
-[dev-dependencies]
-ethereum-types = "0.9.0"
-tempfile = "3.1"

accounts/ethkey/Cargo.toml

@@ -1,13 +1,21 @@
 [package]
-description = "OpenEthereum Keys Generator"
 name = "ethkey"
-version = "0.4.0"
+version = "0.3.0"
 authors = ["Parity Technologies <admin@parity.io>"]
 
 [dependencies]
+byteorder = "1.0"
 edit-distance = "2.0"
+parity-crypto = "0.2"
+eth-secp256k1 = { git = "https://github.com/paritytech/rust-secp256k1" }
+ethereum-types = "0.4"
+lazy_static = "1.0"
 log = "0.4"
+memzero = { path = "../../util/memzero" }
+parity-wordlist = "1.2"
+quick-error = "1.2.2"
+rand = "0.4"
+rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist = "1.3.1"
+tiny-keccak = "1.4"

accounts/ethkey/README.md

@@ -1,12 +1,12 @@
 ## ethkey-cli
 
-OpenEthereum keys generator.
+Parity Ethereum keys generator.
 
 ### Usage
 
 ```
-OpenEthereum Keys Generator.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+Parity Ethereum keys generator.
+  Copyright 2015-2018 Parity Technologies (UK) Ltd.
 
 Usage:
     ethkey info <secret-or-phrase> [options]
@@ -211,11 +211,11 @@ public:  4e19a5fdae82596e1485c69b687c9cc52b5078e5b0668ef3ce8543cd90e712cb00df822
 address: 00cf3711cbd3a1512570639280758118ba0b2bcb
 ```
 
-## OpenEthereum toolchain
-_This project is a part of the OpenEthereum toolchain._
+## Parity Ethereum toolchain
+_This project is a part of the Parity Ethereum toolchain._
 
-- [evmbin](https://github.com/openethereum/openethereum/blob/master/evmbin/) - EVM implementation for OpenEthereum.
-- [ethabi](https://github.com/OpenEthereum/ethabi) - OpenEthereum function calls encoding.
-- [ethstore](https://github.com/openethereum/openethereum/blob/master/accounts/ethstore) - OpenEthereum key management.
-- [ethkey](https://github.com/openethereum/openethereum/blob/master/accounts/ethkey) - OpenEthereum keys generator.
-- [whisper](https://github.com/OpenEthereum/whisper) - Implementation of Whisper-v2 PoC.
+- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
+- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
+- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/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/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

accounts/ethkey/cli/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-description = "OpenEthereum Keys Generator CLI"
 name = "ethkey-cli"
 version = "0.1.0"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -9,9 +8,8 @@ docopt = "1.0"
 env_logger = "0.5"
 ethkey = { path = "../" }
 panic_hook = { path = "../../../util/panic-hook" }
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-parity-wordlist= "1.3.1"
-rustc-hex = "2.1.0"
+parity-wordlist="1.2"
+rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
 threadpool = "1.7"

accounts/ethkey/cli/src/main.rs

@@ -1,25 +1,24 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 extern crate docopt;
 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#"
-OpenEthereum keys generator.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+Parity Ethereum keys generator.
+  Copyright 2015-2018 Parity Technologies (UK) Ltd.
 
 Usage:
     ethkey info <secret-or-phrase> [options]
@@ -199,10 +197,10 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 		let result = if args.flag_brain {
 			let phrase = args.arg_secret_or_phrase;
 			let phrase_info = validate_phrase(&phrase);
-			let keypair = Brain::new(phrase).generate();
+			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))
@@ -215,10 +213,10 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 				let phrase = format!("recovery phrase: {}", brain.phrase());
 				(keypair, Some(phrase))
 			} else {
-				(Random.generate(), None)
+				(Random.generate()?, None)
 			}
 		} else if args.cmd_prefix {
-			let prefix: Vec<_> = args.arg_prefix.from_hex()?;
+			let prefix = args.arg_prefix.from_hex()?;
 			let brain = args.flag_brain;
 			in_threads(move || {
 				let iterations = 1024;
@@ -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)?;
@@ -271,7 +269,7 @@ fn execute<S, I>(command: I) -> Result<String, Error> where I: IntoIterator<Item
 				while let Some(phrase) = it.next() {
 					i += 1;
 
-					let keypair = Brain::new(phrase.clone()).generate();
+					let keypair = Brain::new(phrase.clone()).generate().unwrap();
 					if keypair.address() == address {
 						return Ok(Some((phrase, keypair)))
 					}

accounts/ethkey/src/brain.rs

@@ -1,21 +1,21 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use parity_crypto::publickey::{KeyPair, Generator, Secret};
-use parity_crypto::Keccak256;
+use keccak::Keccak256;
+use super::{KeyPair, Generator, Secret};
 use parity_wordlist;
 
 /// Simple brainwallet.
@@ -32,7 +32,9 @@ impl Brain {
 }
 
 impl Generator for Brain {
-	fn generate(&mut self) -> KeyPair {
+    type Error = ::Void;
+
+	fn generate(&mut self) -> Result<KeyPair, Self::Error> {
 		let seed = self.0.clone();
 		let mut secret = seed.into_bytes().keccak256();
 
@@ -43,12 +45,12 @@ 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 {
 							trace!("Testing: {}, got: {:?}", self.0, pair.address());
-							return pair
+							return Ok(pair)
 						}
 					}
 				},
@@ -59,14 +61,13 @@ impl Generator for Brain {
 
 #[cfg(test)]
 mod tests {
-	use Brain;
-	use parity_crypto::publickey::Generator;
+	use {Brain, Generator};
 
 	#[test]
 	fn test_brain() {
 		let words = "this is sparta!".to_owned();
-		let first_keypair = Brain::new(words.clone()).generate();
-		let second_keypair = Brain::new(words.clone()).generate();
+		let first_keypair = Brain::new(words.clone()).generate().unwrap();
+		let second_keypair = Brain::new(words.clone()).generate().unwrap();
 		assert_eq!(first_keypair.secret(), second_keypair.secret());
 	}
 }

accounts/ethkey/src/brain_prefix.rs

@@ -1,21 +1,20 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// 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.
@@ -39,12 +38,16 @@ impl BrainPrefix {
 	pub fn phrase(&self) -> &str {
 		&self.last_phrase
 	}
+}
 
-	pub fn generate(&mut self) -> Result<KeyPair, Error> {
+impl Generator for BrainPrefix {
+	type Error = Error;
+
+	fn generate(&mut self) -> Result<KeyPair, Error> {
 		for _ in 0..self.iterations {
 			let phrase = wordlist::random_phrase(self.no_of_words);
-			let keypair = Brain::new(phrase.clone()).generate();
-			if keypair.address().as_ref().starts_with(&self.prefix) {
+			let keypair = Brain::new(phrase.clone()).generate().unwrap();
+			if keypair.address().starts_with(&self.prefix) {
 				self.last_phrase = phrase;
 				return Ok(keypair)
 			}
@@ -56,12 +59,12 @@ impl BrainPrefix {
 
 #[cfg(test)]
 mod tests {
-	use BrainPrefix;
+	use {Generator, BrainPrefix};
 
 	#[test]
 	fn prefix_generator() {
 		let prefix = vec![0x00u8];
 		let keypair = BrainPrefix::new(prefix.clone(), usize::max_value(), 12).generate().unwrap();
-		assert!(keypair.address().as_bytes().starts_with(&prefix));
+		assert!(keypair.address().starts_with(&prefix));
 	}
 }

accounts/ethkey/src/brain_recover.rs

@@ -1,26 +1,25 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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.
@@ -33,7 +32,7 @@ pub fn brain_recover(
 ) -> Option<String> {
 	let it = PhrasesIterator::from_known_phrase(known_phrase, expected_words);
 	for phrase in it {
-		let keypair = Brain::new(phrase.clone()).generate();
+		let keypair = Brain::new(phrase.clone()).generate().expect("Brain wallets are infallible; qed");
 		trace!("Testing: {}, got: {:?}", phrase, keypair.address());
 		if &keypair.address() == address {
 			return Some(phrase);

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)?;
+		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());
+			let iv = H128::random();
+			msgd[64..80].copy_from_slice(&iv);
+			{
+				let cipher = &mut msgd[(64 + 16)..(64 + 16 + plain.len())];
+				aes::encrypt_128_ctr(ekey, &iv, 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);
+			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[..]);
+	}
+}

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)
+	}
+}

accounts/ethkey/src/extended.rs

@@ -0,0 +1,501 @@
+// 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]) {
+		use byteorder::{BigEndian, ByteOrder};
+
+		BigEndian::write_u32(&mut target[0..4], *self);
+	}
+}
+
+/// 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]) {
+		self.copy_to(&mut target[0..32]);
+	}
+}
+
+/// 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).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::{U256, U512, H512, H256};
+	use secp256k1::key::{SecretKey, PublicKey};
+	use SECP256K1;
+	use keccak;
+	use math::curve_order;
+	use super::{Label, Derivation};
+
+	#[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();
+
+		// produces 512-bit derived hmac (I)
+		let skey = hmac::SigKey::sha512(&*chain_code);
+		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();
+		// right most 256 bits are new chain code for later derivations
+		let next_chain_code = H256::from(&i_512[32..64]);
+
+		let child_key = private_add(hmac_key, private).into();
+		(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)
+			.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();
+
+		// 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 dv = u1 / U512::from(u2);
+		let md = u1 - (dv * U512::from(u2));
+		md.into()
+	}
+
+	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);
+		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);
+		let i_512 = hmac::sign(&skey, &data[..]);
+
+		let new_private = H256::from(&i_512[0..32]);
+		let new_chain_code = H256::from(&i_512[32..64]);
+
+		// Generated private key can (extremely rarely) be out of secp256k1 key field
+		if curve_order() <= new_private.clone().into() { return Err(Error::MissingIndex); }
+		let new_private_sec = SecretKey::from_slice(&SECP256K1, &*new_private)
+			.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(&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);
+		for _ in 0..99999 { running_sha3 = sha3(&*running_sha3); }
+		running_sha3
+	}
+
+	pub fn point(secret: H256) -> Result<H512, Error> {
+		let sec = SecretKey::from_slice(&SECP256K1, &*secret)
+			.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(&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};
+	use super::{derivation, Derivation};
+
+	fn master_chain_basic() -> (H256, H256) {
+		let seed = H128::from_str("000102030405060708090a0b0c0d0e0f")
+			.expect("Seed should be valid H128")
+			.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(), 0u64.into());
+
+		// hardened
+		assert_eq!(&**extended_secret.as_raw(), &*secret);
+		assert_eq!(&**extended_secret.derive(2147483648.into()).as_raw(), &"0927453daed47839608e414a3738dfad10aed17c459bbd9ab53f89b026c834b6".into());
+		assert_eq!(&**extended_secret.derive(2147483649.into()).as_raw(), &"44238b6a29c6dcbe9b401364141ba11e2198c289a5fed243a1c11af35c19dc0f".into());
+
+		// normal
+		assert_eq!(&**extended_secret.derive(0.into()).as_raw(), &"bf6a74e3f7b36fc4c96a1e12f31abc817f9f5904f5a8fc27713163d1f0b713f6".into());
+		assert_eq!(&**extended_secret.derive(1.into()).as_raw(), &"bd4fca9eb1f9c201e9448c1eecd66e302d68d4d313ce895b8c134f512205c1bc".into());
+		assert_eq!(&**extended_secret.derive(2.into()).as_raw(), &"86932b542d6cab4d9c65490c7ef502d89ecc0e2a5f4852157649e3251e2a3268".into());
+
+		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(), &"f7b3244c96688f92372bfd4def26dc4151529747bab9f188a4ad34e141d47bd66522ff048bc6f19a0a4429b04318b1a8796c000265b4fa200dae5f6dda92dd94".into());
+
+		let keypair = ExtendedKeyPair::with_secret(
+			Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap(),
+			064.into(),
+		);
+		assert_eq!(&**keypair.derive(2147483648u32.into()).expect("Derivation of keypair should succeed").secret().as_raw(), &"edef54414c03196557cf73774bc97a645c9a1df2164ed34f0c2a78d1375a930c".into());
+	}
+
+	#[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(), 0u64.into());
+		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(), 1u64.into());
+
+		assert_eq!(&**extended_secret.derive(Derivation::Hard(derivation_secret)).as_raw(), &"2bc2d696fb744d77ff813b4a1ef0ad64e1e5188b622c54ba917acc5ebc7c5486".into());
+	}
+
+	#[test]
+	fn match_() {
+		let secret = Secret::from_str("a100df7a048e50ed308ea696dc600215098141cb391e9527329df289f9383f65").unwrap();
+		let extended_secret = ExtendedSecret::with_code(secret.clone(), 1.into());
+		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")
+			.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")
+		);
+	}
+}

accounts/ethkey/src/keccak.rs

@@ -0,0 +1,31 @@
+// 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 tiny_keccak::Keccak;
+
+pub trait Keccak256<T> {
+	fn keccak256(&self) -> T where T: Sized;
+}
+
+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
+	}
+}

accounts/ethkey/src/keypair.rs

@@ -0,0 +1,115 @@
+// 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 rustc_hex::ToHex;
+use keccak::Keccak256;
+use super::{Secret, Public, Address, SECP256K1, Error};
+
+pub fn public_to_address(public: &Public) -> Address {
+	let hash = public.keccak256();
+	let mut result = Address::default();
+	result.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:  {}", self.secret.to_hex())?;
+		writeln!(f, "public:  {}", self.public.to_hex())?;
+		write!(f, "address: {}", self.address().to_hex())
+	}
+}
+
+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.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.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);
+	}
+}

accounts/ethkey/src/lib.rs

@@ -1,26 +1,37 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 // #![warn(missing_docs)]
 
+extern crate byteorder;
 extern crate edit_distance;
 extern crate parity_crypto;
+extern crate ethereum_types;
+extern crate memzero;
 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;
 
+#[macro_use]
+extern crate lazy_static;
 #[macro_use]
 extern crate log;
 #[macro_use]
@@ -28,13 +39,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::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>;
+}

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::{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()
+}
+
+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.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);
+	}
+}

accounts/ethkey/src/password.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{fmt, ptr};
 

accounts/ethkey/src/prefix.rs

@@ -1,20 +1,20 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// 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 {
@@ -24,13 +24,20 @@ pub struct Prefix {
 
 impl Prefix {
 	pub fn new(prefix: Vec<u8>, iterations: usize) -> Self {
-		Prefix { prefix, iterations }
+		Prefix {
+			prefix: prefix,
+			iterations: iterations,
+		}
 	}
+}
 
-	pub fn generate(&mut self) -> Result<KeyPair, Error> {
+impl Generator for Prefix {
+	type Error = Error;
+
+	fn generate(&mut self) -> Result<KeyPair, Error> {
 		for _ in 0..self.iterations {
-			let keypair = Random.generate();
-			if keypair.address().as_ref().starts_with(&self.prefix) {
+			let keypair = Random.generate()?;
+			if keypair.address().starts_with(&self.prefix) {
 				return Ok(keypair)
 			}
 		}
@@ -41,12 +48,12 @@ impl Prefix {
 
 #[cfg(test)]
 mod tests {
-	use Prefix;
+	use {Generator, Prefix};
 
 	#[test]
 	fn prefix_generator() {
 		let prefix = vec![0xffu8];
 		let keypair = Prefix::new(prefix.clone(), usize::max_value()).generate().unwrap();
-		assert!(keypair.address().as_bytes().starts_with(&prefix));
+		assert!(keypair.address().starts_with(&prefix));
 	}
 }

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::os::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))
+	}
+}

accounts/ethkey/src/secret.rs

@@ -0,0 +1,298 @@
+// 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 memzero::Memzero;
+use {Error, SECP256K1};
+
+#[derive(Clone, PartialEq, Eq)]
+pub struct Secret {
+	inner: Memzero<H256>,
+}
+
+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::default();
+		h.copy_from_slice(&key[0..32]);
+		Some(Secret { inner: Memzero::from(h) })
+	}
+
+	/// Creates zero key, which is invalid for crypto operations, but valid for math operation.
+	pub fn zero() -> Self {
+		Secret { inner: Memzero::from(H256::default()) }
+	}
+
+	/// 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: Memzero::from(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);
+	}
+}

accounts/ethkey/src/signature.rs

@@ -0,0 +1,294 @@
+// 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);
+		sig[32..64].copy_from_slice(&s);
+		sig[64] = v;
+		Signature(sig)
+	}
+
+	/// Check if this is a "low" signature.
+	pub fn is_low_s(&self) -> bool {
+		H256::from_slice(self.s()) <= "7FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5D576E7357A4501DDFE92F46681B20A0".into()
+	}
+
+	/// Check if each component of the signature is in range.
+	pub fn is_valid(&self) -> bool {
+		self.v() <= 1 &&
+			H256::from_slice(self.r()) < "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141".into() &&
+			H256::from_slice(self.r()) >= 1.into() &&
+			H256::from_slice(self.s()) < "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141".into() &&
+			H256::from_slice(self.s()) >= 1.into()
+	}
+}
+
+// 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)?;
+	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);
+		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.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());
+	}
+}

accounts/ethstore/Cargo.toml

@@ -1,28 +1,27 @@
 [package]
-description = "OpenEthereum Key Management"
 name = "ethstore"
 version = "0.2.1"
 authors = ["Parity Technologies <admin@parity.io>"]
-repository = "https://github.com/openethereum/openethereum"
 
 [dependencies]
 log = "0.4"
 libc = "0.2"
-rand = "0.7.3"
+rand = "0.4"
 ethkey = { path = "../ethkey" }
 serde = "1.0"
 serde_json = "1.0"
 serde_derive = "1.0"
-rustc-hex = "2.1.0"
-tiny-keccak = "2.0.2"
+rustc-hex = "1.0"
+tiny-keccak = "1.4"
 time = "0.1.34"
-parking_lot = "0.10.0"
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
-ethereum-types = "0.9.0"
+itertools = "0.5"
+parking_lot = "0.7"
+parity-crypto = "0.2"
+ethereum-types = "0.4"
 dir = { path = "../../util/dir" }
-smallvec = "1.2.0"
-parity-wordlist = "1.3.1"
-tempfile = "3.1"
+smallvec = "0.6"
+parity-wordlist = "1.0"
+tempdir = "0.3"
 
 [dev-dependencies]
 matches = "0.1"

accounts/ethstore/README.md

@@ -1,12 +1,12 @@
 ## ethstore-cli
 
-OpenEthereum key management.
+Parity Ethereum key management.
 
 ### Usage
 
 ```
-OpenEthereum key management tool.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+Parity Ethereum key management tool.
+  Copyright 2015-2018 Parity Technologies (UK) Ltd.
 
 Usage:
     ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
@@ -330,11 +330,11 @@ ethstore move-from-vault 00e63fdb87ceb815ec96ae185b8f7381a0b4a5ea vault1 vault1_
 OK
 ```
 
-## OpenEthereum toolchain
-_This project is a part of the OpenEthereum toolchain._
+## Parity Ethereum toolchain
+_This project is a part of the Parity Ethereum toolchain._
 
-- [evmbin](https://github.com/openethereum/openethereum/blob/master/evmbin/) - EVM implementation for OpenEthereum.
-- [ethabi](https://github.com/OpenEthereum/ethabi) - OpenEthereum function calls encoding.
-- [ethstore](https://github.com/openethereum/openethereum/blob/master/accounts/ethstore) - OpenEthereum key management.
-- [ethkey](https://github.com/openethereum/openethereum/blob/master/accounts/ethkey) - OpenEthereum keys generator.
-- [whisper](https://github.com/OpenEthereum/whisper) - Implementation of Whisper-v2 PoC.
+- [evmbin](https://github.com/paritytech/parity-ethereum/blob/master/evmbin/) - EVM implementation for Parity Ethereum.
+- [ethabi](https://github.com/paritytech/ethabi) - Parity Ethereum function calls encoding.
+- [ethstore](https://github.com/paritytech/parity-ethereum/blob/master/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/parity-ethereum/blob/master/whisper/) - Implementation of Whisper-v2 PoC.

accounts/ethstore/cli/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-description = "OpenEthereum Key Management CLI"
 name = "ethstore-cli"
 version = "0.1.1"
 authors = ["Parity Technologies <admin@parity.io>"]
@@ -8,13 +7,11 @@ authors = ["Parity Technologies <admin@parity.io>"]
 docopt = "1.0"
 env_logger = "0.5"
 num_cpus = "1.6"
-rustc-hex = "2.1.0"
+rustc-hex = "1.0"
 serde = "1.0"
 serde_derive = "1.0"
-parking_lot = "0.10.0"
+parking_lot = "0.7"
 ethstore = { path = "../" }
-ethkey = { path = "../../ethkey" }
-parity-crypto = { version = "0.6.1", features = ["publickey"] }
 dir = { path = '../../../util/dir' }
 panic_hook = { path = "../../../util/panic-hook" }
 
@@ -24,4 +21,4 @@ path = "src/main.rs"
 doc = false
 
 [dev-dependencies]
-tempfile = "3.1"
+tempdir = "0.3.5"

accounts/ethstore/cli/src/crack.rs

@@ -1,26 +1,25 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{cmp, thread};
 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> {

accounts/ethstore/cli/src/main.rs

@@ -1,27 +1,25 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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#"
-OpenEthereum key management tool.
-  Copyright 2015-2020 Parity Technologies (UK) Ltd.
+Parity Ethereum key management tool.
+  Copyright 2015-2018 Parity Technologies (UK) Ltd.
 
 Usage:
     ethstore insert <secret> <password> [--dir DIR] [--vault VAULT] [--vault-pwd VAULTPWD]
@@ -166,15 +163,13 @@ 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))?,
 		path if path.starts_with("parity") => {
 			let chain = path.split('-').nth(1).unwrap_or("ethereum");
-			let mut path = dir::default_data_pathbuf();
-			path.push("keys");
-			path.push(chain);
+			let path = dir::parity(chain);
 			RootDiskDirectory::create(path)?
 		},
 		path => RootDiskDirectory::create(path)?,

accounts/ethstore/cli/tests/cli.rs

@@ -1,22 +1,22 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate tempfile;
+extern crate tempdir;
 use std::process::Command;
-use tempfile::Builder;
+use tempdir::TempDir;
 use std::fs::File;
 use std::io::Write;
 
@@ -37,7 +37,7 @@ fn cli_cmd() {
 		.output()
 		.unwrap();
 
-	let dir = Builder::new().prefix("test-vault").tempdir().unwrap();
+	let dir = TempDir::new("test-vault").unwrap();
 
 	let mut passwd = File::create(dir.path().join("test-password")).unwrap();
 	writeln!(passwd, "password").unwrap();

accounts/ethstore/src/account/cipher.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use json;
 

accounts/ethstore/src/account/crypto.rs

@@ -1,22 +1,21 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// 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;
@@ -75,7 +74,7 @@ impl From<Crypto> for String {
 impl Crypto {
 	/// Encrypt account secret
 	pub fn with_secret(secret: &Secret, password: &Password, iterations: u32) -> Result<Self, crypto::Error> {
-		Crypto::with_plain(secret.as_ref(), password, iterations)
+		Crypto::with_plain(&*secret, password, iterations)
 	}
 
 	/// Encrypt custom plain data
@@ -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,12 +158,12 @@ impl Crypto {
 
 #[cfg(test)]
 mod tests {
-	use crypto::publickey::{Generator, Random};
+	use ethkey::{Generator, Random};
 	use super::{Crypto, Error};
 
 	#[test]
 	fn crypto_with_secret_create() {
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let passwd = "this is sparta".into();
 		let crypto = Crypto::with_secret(keypair.secret(), &passwd, 10240).unwrap();
 		let secret = crypto.secret(&passwd).unwrap();
@@ -173,7 +172,7 @@ mod tests {
 
 	#[test]
 	fn crypto_with_secret_invalid_password() {
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let crypto = Crypto::with_secret(keypair.secret(), &"this is sparta".into(), 10240).unwrap();
 		assert_matches!(crypto.secret(&"this is sparta!".into()), Err(Error::InvalidPassword))
 	}

accounts/ethstore/src/account/kdf.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use json;
 

accounts/ethstore/src/account/mod.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 mod cipher;
 mod crypto;

accounts/ethstore/src/account/safe_account.rs

@@ -1,22 +1,21 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// 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,14 +199,14 @@ impl SafeAccount {
 
 #[cfg(test)]
 mod tests {
-	use crypto::publickey::{Generator, Random, verify_public};
+	use ethkey::{Generator, Random, verify_public, Message};
 	use super::SafeAccount;
 
 	#[test]
 	fn sign_and_verify_public() {
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let password = "hello world".into();
-		let message = [1u8; 32].into();
+		let message = Message::default();
 		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 10240, "Test".to_owned(), "{}".to_owned());
 		let signature = account.unwrap().sign(&password, &message).unwrap();
 		assert!(verify_public(keypair.public(), &signature, &message).unwrap());
@@ -215,11 +214,11 @@ mod tests {
 
 	#[test]
 	fn change_password() {
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let first_password = "hello world".into();
 		let sec_password = "this is sparta".into();
 		let i = 10240;
-		let message = [1u8; 32].into();
+		let message = Message::default();
 		let account = SafeAccount::create(&keypair, [0u8; 16], &first_password, i, "Test".to_owned(), "{}".to_owned()).unwrap();
 		let new_account = account.change_password(&first_password, &sec_password, i).unwrap();
 		assert!(account.sign(&first_password, &message).is_ok());

accounts/ethstore/src/account/version.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use json;
 

accounts/ethstore/src/accounts_dir/disk.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{fs, io};
 use std::io::Write;
@@ -61,6 +61,7 @@ pub fn find_unique_filename_using_random_suffix(parent_path: &Path, original_fil
 /// Create a new file and restrict permissions to owner only. It errors if the file already exists.
 #[cfg(unix)]
 pub fn create_new_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
+	use libc;
 	use std::os::unix::fs::OpenOptionsExt;
 
 	fs::OpenOptions::new()
@@ -82,6 +83,7 @@ pub fn create_new_file_with_permissions_to_owner(file_path: &Path) -> io::Result
 /// Create a new file and restrict permissions to owner only. It replaces the existing file if it already exists.
 #[cfg(unix)]
 pub fn replace_file_with_permissions_to_owner(file_path: &Path) -> io::Result<fs::File> {
+	use libc;
 	use std::os::unix::fs::PermissionsExt;
 
 	let file = fs::File::create(file_path)?;
@@ -284,7 +286,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 +296,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))
 	}
@@ -351,20 +353,20 @@ fn account_filename(account: &SafeAccount) -> String {
 
 #[cfg(test)]
 mod test {
-	extern crate tempfile;
+	extern crate tempdir;
 
 	use std::{env, fs};
 	use super::{KeyDirectory, RootDiskDirectory, VaultKey};
 	use account::SafeAccount;
-	use crypto::publickey::{Random, Generator};
-	use self::tempfile::TempDir;
+	use ethkey::{Random, Generator};
+	use self::tempdir::TempDir;
 
 	#[test]
 	fn should_create_new_account() {
 		// given
 		let mut dir = env::temp_dir();
 		dir.push("ethstore_should_create_new_account");
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let password = "hello world".into();
 		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
 
@@ -385,7 +387,7 @@ mod test {
 		// given
 		let mut dir = env::temp_dir();
 		dir.push("ethstore_should_handle_duplicate_filenames");
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let password = "hello world".into();
 		let directory = RootDiskDirectory::create(dir.clone()).unwrap();
 
@@ -448,7 +450,7 @@ mod test {
 	#[test]
 	fn should_list_vaults() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let directory = RootDiskDirectory::create(&temp_path).unwrap();
 		let vault_provider = directory.as_vault_provider().unwrap();
 		vault_provider.create("vault1", VaultKey::new(&"password1".into(), 1)).unwrap();
@@ -463,7 +465,7 @@ mod test {
 
 	#[test]
 	fn hash_of_files() {
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let directory = RootDiskDirectory::create(&temp_path).unwrap();
 
 		let hash = directory.files_hash().expect("Files hash should be calculated ok");
@@ -472,7 +474,7 @@ mod test {
 			15130871412783076140
 		);
 
-		let keypair = Random.generate();
+		let keypair = Random.generate().unwrap();
 		let password = "test pass".into();
 		let account = SafeAccount::create(&keypair, [0u8; 16], &password, 1024, "Test".to_owned(), "{}".to_owned());
 		directory.insert(account.unwrap()).expect("Account should be inserted ok");

accounts/ethstore/src/accounts_dir/memory.rs

@@ -1,22 +1,23 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::HashMap;
 use parking_lot::RwLock;
-use crypto::publickey::Address;
+use itertools;
+use ethkey::Address;
 
 use {SafeAccount, Error};
 use super::KeyDirectory;
@@ -29,7 +30,7 @@ pub struct MemoryDirectory {
 
 impl KeyDirectory for MemoryDirectory {
 	fn load(&self) -> Result<Vec<SafeAccount>, Error> {
-		Ok(self.accounts.read().values().cloned().flatten().collect())
+		Ok(itertools::Itertools::flatten(self.accounts.read().values().cloned()).collect())
 	}
 
 	fn update(&self, account: SafeAccount) -> Result<SafeAccount, Error> {
@@ -67,7 +68,7 @@ impl KeyDirectory for MemoryDirectory {
 	fn unique_repr(&self) -> Result<u64, Error> {
 		let mut val = 0u64;
 		let accounts = self.accounts.read();
-		for acc in accounts.keys() { val = val ^ acc.to_low_u64_be() }
+		for acc in accounts.keys() { val = val ^ acc.low_u64() }
 		Ok(val)
 	}
 }

accounts/ethstore/src/accounts_dir/mod.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Accounts Directory
 
@@ -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

accounts/ethstore/src/accounts_dir/vault.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{fs, io};
 use std::path::{PathBuf, Path};
@@ -119,7 +119,7 @@ impl VaultDiskDirectory {
 }
 
 impl VaultKeyDirectory for VaultDiskDirectory {
-	fn as_key_directory(&self) -> &dyn KeyDirectory {
+	fn as_key_directory(&self) -> &KeyDirectory {
 		self
 	}
 
@@ -278,14 +278,14 @@ fn read_vault_file<P>(vault_dir_path: P, key: Option<&VaultKey>) -> Result<Strin
 
 #[cfg(test)]
 mod test {
-	extern crate tempfile;
+	extern crate tempdir;
 
 	use std::fs;
 	use std::io::Write;
 	use std::path::PathBuf;
 	use super::VaultKey;
 	use super::{VAULT_FILE_NAME, check_vault_name, make_vault_dir_path, create_vault_file, read_vault_file, VaultDiskDirectory};
-	use self::tempfile::TempDir;
+	use self::tempdir::TempDir;
 
 	#[test]
 	fn check_vault_name_succeeds() {
@@ -324,7 +324,7 @@ mod test {
 	#[test]
 	fn create_vault_file_succeeds() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let key = VaultKey::new(&"password".into(), 1024);
 		let mut vault_dir: PathBuf = temp_path.path().into();
 		vault_dir.push("vault");
@@ -343,7 +343,7 @@ mod test {
 	#[test]
 	fn read_vault_file_succeeds() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let key = VaultKey::new(&"password".into(), 1024);
 		let vault_file_contents = r#"{"crypto":{"cipher":"aes-128-ctr","cipherparams":{"iv":"758696c8dc6378ab9b25bb42790da2f5"},"ciphertext":"54eb50683717d41caaeb12ea969f2c159daada5907383f26f327606a37dc7168","kdf":"pbkdf2","kdfparams":{"c":1024,"dklen":32,"prf":"hmac-sha256","salt":"3c320fa566a1a7963ac8df68a19548d27c8f40bf92ef87c84594dcd5bbc402b6"},"mac":"9e5c2314c2a0781962db85611417c614bd6756666b6b1e93840f5b6ed895f003"}}"#;
 		let dir: PathBuf = temp_path.path().into();
@@ -364,7 +364,7 @@ mod test {
 	#[test]
 	fn read_vault_file_fails() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let key = VaultKey::new(&"password1".into(), 1024);
 		let dir: PathBuf = temp_path.path().into();
 		let mut vault_file_path: PathBuf = dir.clone();
@@ -393,7 +393,7 @@ mod test {
 	#[test]
 	fn vault_directory_can_be_created() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let key = VaultKey::new(&"password".into(), 1024);
 		let dir: PathBuf = temp_path.path().into();
 
@@ -413,7 +413,7 @@ mod test {
 	#[test]
 	fn vault_directory_cannot_be_created_if_already_exists() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let key = VaultKey::new(&"password".into(), 1024);
 		let dir: PathBuf = temp_path.path().into();
 		let mut vault_dir = dir.clone();
@@ -430,7 +430,7 @@ mod test {
 	#[test]
 	fn vault_directory_cannot_be_opened_if_not_exists() {
 		// given
-		let temp_path = TempDir::new().unwrap();
+		let temp_path = TempDir::new("").unwrap();
 		let key = VaultKey::new(&"password".into(), 1024);
 		let dir: PathBuf = temp_path.path().into();
 

accounts/ethstore/src/error.rs

@@ -1,23 +1,24 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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)
 	}
 }
 

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)
+	}
+}

accounts/ethstore/src/ethstore.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::collections::{BTreeMap, HashMap};
 use std::mem;
@@ -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)
 	}
@@ -688,17 +687,17 @@ impl SimpleSecretStore for EthMultiStore {
 
 #[cfg(test)]
 mod tests {
-	extern crate tempfile;
+	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::tempfile::TempDir;
+	use self::tempdir::TempDir;
 	use ethereum_types::H256;
 
 	fn keypair() -> KeyPair {
-		Random.generate()
+		Random.generate().unwrap()
 	}
 
 	fn store() -> EthStore {
@@ -710,13 +709,13 @@ mod tests {
 	}
 
 	struct RootDiskDirectoryGuard {
-		pub key_dir: Option<Box<dyn KeyDirectory>>,
+		pub key_dir: Option<Box<KeyDirectory>>,
 		_path: TempDir,
 	}
 
 	impl RootDiskDirectoryGuard {
 		pub fn new() -> Self {
-			let temp_path = TempDir::new().unwrap();
+			let temp_path = TempDir::new("").unwrap();
 			let disk_dir = Box::new(RootDiskDirectory::create(temp_path.path()).unwrap());
 
 			RootDiskDirectoryGuard {
@@ -820,7 +819,6 @@ mod tests {
 		let passwd2 = "xzy".into();
 		let multi_store = multi_store();
 		let keypair = keypair();
-		let message = [1u8; 32].into();
 		let address = store.insert_account(SecretVaultRef::Root, keypair.secret().clone(), &passwd1).unwrap();
 		assert_eq!(multi_store.accounts().unwrap().len(), 0);
 
@@ -829,7 +827,7 @@ mod tests {
 
 		// then
 		assert!(store.test_password(&address, &passwd1).unwrap(), "First password should work for store.");
-		assert!(multi_store.sign(&address, &passwd2, &message).is_ok(), "Second password should work for second store.");
+		assert!(multi_store.sign(&address, &passwd2, &Default::default()).is_ok(), "Second password should work for second store.");
 		assert_eq!(multi_store.accounts().unwrap().len(), 1);
 	}
 
@@ -1086,16 +1084,15 @@ mod tests {
 			SecretVaultRef::Root,
 			&address,
 			&"test".into(),
-			Derivation::HardHash(H256::zero()),
+			Derivation::HardHash(H256::from(0)),
 		).unwrap();
 
 		// there should be 2 accounts in the store
 		let accounts = store.accounts().unwrap();
 		assert_eq!(accounts.len(), 2);
 
-		let message = [1u8; 32].into();
 		// and we can sign with the derived contract
-		assert!(store.sign(&derived, &"test".into(), &message).is_ok(), "Second password should work for second store.");
+		assert!(store.sign(&derived, &"test".into(), &Default::default()).is_ok(), "Second password should work for second store.");
 	}
 
 	#[test]

accounts/ethstore/src/import.rs

@@ -1,30 +1,30 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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<_>>();

accounts/ethstore/src/json/bytes.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{ops, str};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -43,7 +43,7 @@ impl<'a> Deserialize<'a> for Bytes {
 impl Serialize for Bytes {
 	fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
 	where S: Serializer {
-		serializer.serialize_str(&self.0.to_hex::<String>())
+		serializer.serialize_str(&self.0.to_hex())
 	}
 }
 

accounts/ethstore/src/json/cipher.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
 use serde::{Serialize, Serializer, Deserialize, Deserializer};

accounts/ethstore/src/json/crypto.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{fmt, str};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
@@ -41,7 +41,7 @@ impl str::FromStr for Crypto {
 
 impl From<Crypto> for String {
 	fn from(c: Crypto) -> Self {
-		serde_json::to_string(&c).expect("Serialization cannot fail, because all crypto keys are strings")
+		serde_json::to_string(&c).expect("serialization cannot fail, cause all crypto keys are strings")
 	}
 }
 

accounts/ethstore/src/json/error.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
 

accounts/ethstore/src/json/hash.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::{ops, fmt, str};
 use rustc_hex::{FromHex, ToHex};
@@ -49,9 +49,8 @@ macro_rules! impl_hash {
 
 		impl Serialize for $name {
 			fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-			where S: Serializer
-			{
-				serializer.serialize_str(&self.0.to_hex::<String>())
+			where S: Serializer {
+				serializer.serialize_str(&self.0.to_hex())
 			}
 		}
 
@@ -84,7 +83,7 @@ macro_rules! impl_hash {
 			type Err = Error;
 
 			fn from_str(value: &str) -> Result<Self, Self::Err> {
-				match value.from_hex::<Vec<u8>>() {
+				match value.from_hex() {
 					Ok(ref hex) if hex.len() == $size => {
 						let mut hash = [0u8; $size];
 						hash.clone_from_slice(hex);

accounts/ethstore/src/json/id.rs

@@ -1,21 +1,20 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Universaly unique identifier.
-
 use std::{fmt, str};
 use rustc_hex::{ToHex, FromHex};
 use serde::{Deserialize, Serialize, Deserializer, Serializer};
@@ -39,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("-")
 	}
 }
 
@@ -63,7 +62,7 @@ impl fmt::Display for Uuid {
 }
 
 fn copy_into(from: &str, into: &mut [u8]) -> Result<(), Error> {
-	let from: Vec<u8> = from.from_hex().map_err(|_| Error::InvalidUuid)?;
+	let from = from.from_hex().map_err(|_| Error::InvalidUuid)?;
 
 	if from.len() != into.len() {
 		return Err(Error::InvalidUuid);

accounts/ethstore/src/json/kdf.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
 use serde::{Serialize, Serializer, Deserialize, Deserializer};

accounts/ethstore/src/json/key_file.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
 use std::io::{Read, Write};

accounts/ethstore/src/json/mod.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Contract interface specification.
 

accounts/ethstore/src/json/presale.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::io::Read;
 use serde_json;

accounts/ethstore/src/json/vault_file.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::io::{Read, Write};
 use serde_json;

accounts/ethstore/src/json/vault_key_file.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::io::{Read, Write};
 use serde::de::Error;

accounts/ethstore/src/json/version.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt;
 use serde::{Serialize, Serializer, Deserialize, Deserializer};

accounts/ethstore/src/lib.rs

@@ -1,24 +1,25 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 //! Ethereum key-management.
 
 #![warn(missing_docs)]
 
 extern crate dir;
+extern crate itertools;
 extern crate libc;
 extern crate parking_lot;
 extern crate rand;
@@ -28,11 +29,11 @@ extern crate serde_json;
 extern crate smallvec;
 extern crate time;
 extern crate tiny_keccak;
-extern crate tempfile;
+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]
@@ -45,6 +46,7 @@ extern crate serde_derive;
 extern crate matches;
 
 pub mod accounts_dir;
+pub mod ethkey;
 
 mod account;
 mod json;
@@ -70,29 +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);

accounts/ethstore/src/presale.rs

@@ -1,24 +1,23 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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)

accounts/ethstore/src/random.rs

@@ -1,20 +1,20 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-use rand::{Rng, RngCore, rngs::OsRng, distributions::Alphanumeric};
+use rand::{Rng, OsRng};
 
 pub trait Random {
 	fn random() -> Self where Self: Sized;
@@ -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;
-	rng.sample_iter(&Alphanumeric).take(length).collect()
+	let mut rng = OsRng::new().expect("Not able to operate without random source.");
+	rng.gen_ascii_chars().take(length).collect()
 }

accounts/ethstore/src/secret_store.rs

@@ -1,24 +1,23 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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>;
 

accounts/ethstore/tests/api.rs

@@ -1,32 +1,28 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 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;
-use std::str::FromStr;
 
 #[test]
 fn secret_store_create() {
@@ -42,7 +38,7 @@ fn secret_store_open_not_existing() {
 }
 
 fn random_secret() -> Secret {
-	Random.generate().secret().clone()
+	Random.generate().unwrap().secret().clone()
 }
 
 #[test]
@@ -62,10 +58,9 @@ fn secret_store_sign() {
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
 	let accounts = store.accounts().unwrap();
-	let message = [1u8; 32].into();
 	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_ok());
-	assert!(store.sign(&accounts[0], &"1".into(), &message).is_err());
+	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
+	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_err());
 }
 
 #[test]
@@ -74,12 +69,11 @@ fn secret_store_change_password() {
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert!(store.insert_account(SecretVaultRef::Root, random_secret(), &"".into()).is_ok());
 	let accounts = store.accounts().unwrap();
-	let message = [1u8; 32].into();
 	assert_eq!(accounts.len(), 1);
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_ok());
+	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_ok());
 	assert!(store.change_password(&accounts[0], &"".into(), &"1".into()).is_ok());
-	assert!(store.sign(&accounts[0], &"".into(), &message).is_err());
-	assert!(store.sign(&accounts[0], &"1".into(), &message).is_ok());
+	assert!(store.sign(&accounts[0], &"".into(), &Default::default()).is_err());
+	assert!(store.sign(&accounts[0], &"1".into(), &Default::default()).is_ok());
 }
 
 #[test]
@@ -97,7 +91,7 @@ fn secret_store_remove_account() {
 fn test_path() -> &'static str {
 	match ::std::fs::metadata("ethstore") {
 		Ok(_) => "ethstore/tests/res/geth_keystore",
-		Err(_) => "tests/res/geth_keystore",
+ 		Err(_) => "tests/res/geth_keystore",
 	}
 }
 
@@ -120,9 +114,9 @@ fn secret_store_laod_geth_files() {
 	let dir = RootDiskDirectory::at(test_path());
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root(Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap()),
-		StoreAccountRef::root(Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap()),
-		StoreAccountRef::root(Address::from_str("63121b431a52f8043c16fcf0d1df9cb7b5f66649").unwrap()),
+		StoreAccountRef::root("3f49624084b67849c7b4e805c5988c21a430f9d9".into()),
+		StoreAccountRef::root("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into()),
+		StoreAccountRef::root("63121b431a52f8043c16fcf0d1df9cb7b5f66649".into()),
 	]);
 }
 
@@ -131,8 +125,8 @@ fn secret_store_load_pat_files() {
 	let dir = RootDiskDirectory::at(pat_path());
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	assert_eq!(store.accounts().unwrap(), vec![
-		StoreAccountRef::root(Address::from_str("3f49624084b67849c7b4e805c5988c21a430f9d9").unwrap()),
-		StoreAccountRef::root(Address::from_str("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf").unwrap()),
+		StoreAccountRef::root("3f49624084b67849c7b4e805c5988c21a430f9d9".into()),
+		StoreAccountRef::root("5ba4dcf897e97c2bdf8315b9ef26c13c085988cf".into()),
 	]);
 }
 
@@ -146,11 +140,11 @@ fn test_decrypting_files_with_short_ciphertext() {
 	let store = EthStore::open(Box::new(dir)).unwrap();
 	let accounts = store.accounts().unwrap();
 	assert_eq!(accounts, vec![
-		StoreAccountRef::root(Address::from_str("31e9d1e6d844bd3a536800ef8d8be6a9975db509").unwrap()),
-		StoreAccountRef::root(Address::from_str("d1e64e5480bfaf733ba7d48712decb8227797a4e").unwrap()),
+		StoreAccountRef::root("31e9d1e6d844bd3a536800ef8d8be6a9975db509".into()),
+		StoreAccountRef::root("d1e64e5480bfaf733ba7d48712decb8227797a4e".into()),
 	]);
 
-	let message = [1u8; 32].into();
+	let message = Default::default();
 
 	let s1 = store.sign(&accounts[0], &"foo".into(), &message).unwrap();
 	let s2 = store.sign(&accounts[1], &"foo".into(), &message).unwrap();

accounts/ethstore/tests/util/mod.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 mod transient_dir;
 

accounts/ethstore/tests/util/transient_dir.rs

@@ -1,27 +1,27 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::path::PathBuf;
 use std::{env, fs};
-use rand::{RngCore, rngs::OsRng};
+use rand::{Rng, OsRng};
 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

accounts/fake-hardware-wallet/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+description = "Fake hardware-wallet, for OS' that don't support libusb"
+name = "fake-hardware-wallet"
+version = "0.0.1"
+license = "GPL-3.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+ethereum-types = "0.4"
+ethkey = { path = "../../accounts/ethkey" }

accounts/fake-hardware-wallet/src/lib.rs

@@ -0,0 +1,101 @@
+// 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/>.
+
+//! Dummy module for platforms that does not provide support for hardware wallets (libusb)
+
+extern crate ethereum_types;
+extern crate ethkey;
+
+use std::fmt;
+use ethereum_types::U256;
+use ethkey::{Address, Signature};
+
+pub struct WalletInfo {
+	pub address: Address,
+	pub name: String,
+	pub manufacturer: String,
+}
+
+#[derive(Debug)]
+/// `ErrorType` for devices with no `hardware wallet`
+pub enum Error {
+	NoWallet,
+	KeyNotFound,
+}
+
+pub struct TransactionInfo {
+	/// Nonce
+	pub nonce: U256,
+	/// Gas price
+	pub gas_price: U256,
+	/// Gas limit
+	pub gas_limit: U256,
+	/// Receiver
+	pub to: Option<Address>,
+	/// Value
+	pub value: U256,
+	/// Data
+	pub data: Vec<u8>,
+	/// Chain ID
+	pub chain_id: Option<u64>,
+}
+
+pub enum KeyPath {
+	/// Ethereum.
+	Ethereum,
+	/// Ethereum classic.
+	EthereumClassic,
+}
+
+/// `HardwareWalletManager` for devices with no `hardware wallet`
+pub struct HardwareWalletManager;
+
+impl HardwareWalletManager {
+	pub fn new() -> Result<Self, Error> {
+		Err(Error::NoWallet)
+	}
+
+	pub fn set_key_path(&self, _key_path: KeyPath) {}
+
+	pub fn wallet_info(&self, _: &Address) -> Option<WalletInfo> { 
+		None 
+	}
+
+	pub fn list_wallets(&self) -> Vec<WalletInfo> {
+		Vec::with_capacity(0)
+	}
+
+	pub fn list_locked_wallets(&self) -> Result<Vec<String>, Error> {
+		Err(Error::NoWallet)
+	}
+
+	pub fn pin_matrix_ack(&self, _: &str, _: &str) -> Result<bool, Error> { 
+		Err(Error::NoWallet)
+	}
+	
+	pub fn sign_transaction(&self, _address: &Address, _transaction: &TransactionInfo, _rlp_transaction: &[u8]) -> Result<Signature, Error> { 
+		Err(Error::NoWallet) }
+	
+	pub fn sign_message(&self, _address: &Address, _msg: &[u8]) -> Result<Signature, Error> {
+		Err(Error::NoWallet)
+	}
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { 
+		write!(f, "No hardware wallet!!") 
+	}
+}

accounts/hw/Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+description = "Hardware wallet support."
+homepage = "http://parity.io"
+license = "GPL-3.0"
+name = "hardware-wallet"
+version = "1.12.0"
+authors = ["Parity Technologies <admin@parity.io>"]
+
+[dependencies]
+log = "0.4"
+parking_lot = "0.7"
+protobuf = "1.4"
+hidapi = { git = "https://github.com/paritytech/hidapi-rs" }
+libusb = { git = "https://github.com/paritytech/libusb-rs" }
+trezor-sys = { git = "https://github.com/paritytech/trezor-sys" }
+ethkey = { path = "../ethkey" }
+ethereum-types = "0.4"
+semver = "0.9"
+
+[dev-dependencies]
+rustc-hex = "1.0"

accounts/hw/src/lib.rs

@@ -0,0 +1,402 @@
+// 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/>.
+
+//! Hardware wallet management.
+
+#![warn(missing_docs)]
+#![warn(warnings)]
+
+extern crate ethereum_types;
+extern crate ethkey;
+extern crate hidapi;
+extern crate libusb;
+extern crate parking_lot;
+extern crate protobuf;
+extern crate semver;
+extern crate trezor_sys;
+
+#[macro_use] extern crate log;
+#[cfg(test)] extern crate rustc_hex;
+
+mod ledger;
+mod trezor;
+
+use std::sync::{Arc, atomic, atomic::AtomicBool, Weak};
+use std::{fmt, time::Duration};
+use std::thread;
+
+use ethereum_types::U256;
+use ethkey::{Address, Signature};
+use parking_lot::Mutex;
+
+const HID_GLOBAL_USAGE_PAGE: u16 = 0xFF00;
+const HID_USB_DEVICE_CLASS: u8 = 0;
+const MAX_POLLING_DURATION: Duration = Duration::from_millis(500);
+const USB_EVENT_POLLING_INTERVAL: Duration = Duration::from_millis(500);
+
+/// `HardwareWallet` device
+#[derive(Debug)]
+pub struct Device {
+	path: String,
+	info: WalletInfo,
+}
+
+/// `Wallet` trait
+pub trait Wallet<'a> {
+	/// Error
+	type Error;
+	/// Transaction data format
+	type Transaction;
+
+	/// Sign transaction data with wallet managing `address`.
+	fn sign_transaction(&self, address: &Address, transaction: Self::Transaction) -> Result<Signature, Self::Error>;
+
+	/// Set key derivation path for a chain.
+	fn set_key_path(&self, key_path: KeyPath);
+
+	/// Re-populate device list
+	/// Note, this assumes all devices are iterated over and updated
+	fn update_devices(&self, device_direction: DeviceDirection) -> Result<usize, Self::Error>;
+
+	/// Read device info
+	fn read_device(&self, usb: &hidapi::HidApi, dev_info: &hidapi::HidDeviceInfo) -> Result<Device, Self::Error>;
+
+	/// List connected and acknowledged wallets
+	fn list_devices(&self) -> Vec<WalletInfo>;
+
+	/// List locked wallets
+	/// This may be moved if it is the wrong assumption, for example this is not supported by Ledger
+	/// Then this method return a empty vector
+	fn list_locked_devices(&self) -> Vec<String>;
+
+	/// Get wallet info.
+	fn get_wallet(&self, address: &Address) -> Option<WalletInfo>;
+
+	/// Generate ethereum address for a Wallet
+	fn get_address(&self, device: &hidapi::HidDevice) -> Result<Option<Address>, Self::Error>;
+
+	/// Open a device using `device path`
+	/// Note, f - is a closure that borrows HidResult<HidDevice>
+	/// HidDevice is in turn a type alias for a `c_void function pointer`
+	/// For further information see:
+	///		* <https://github.com/paritytech/hidapi-rs>
+	///		* <https://github.com/rust-lang/libc>
+	fn open_path<R, F>(&self, f: F) -> Result<R, Self::Error>
+		where F: Fn() -> Result<R, &'static str>;
+}
+
+/// Hardware wallet error.
+#[derive(Debug)]
+pub enum Error {
+	/// Ledger device error.
+	LedgerDevice(ledger::Error),
+	/// Trezor device error
+	TrezorDevice(trezor::Error),
+	/// USB error.
+	Usb(libusb::Error),
+	/// HID error
+	Hid(String),
+	/// Hardware wallet not found for specified key.
+	KeyNotFound,
+}
+
+/// This is the transaction info we need to supply to Trezor message. It's more
+/// or less a duplicate of `ethcore::transaction::Transaction`, but we can't
+/// import ethcore here as that would be a circular dependency.
+pub struct TransactionInfo {
+	/// Nonce
+	pub nonce: U256,
+	/// Gas price
+	pub gas_price: U256,
+	/// Gas limit
+	pub gas_limit: U256,
+	/// Receiver
+	pub to: Option<Address>,
+	/// Value
+	pub value: U256,
+	/// Data
+	pub data: Vec<u8>,
+	/// Chain ID
+	pub chain_id: Option<u64>,
+}
+
+/// Hardware wallet information.
+#[derive(Debug, Clone)]
+pub struct WalletInfo {
+	/// Wallet device name.
+	pub name: String,
+	/// Wallet device manufacturer.
+	pub manufacturer: String,
+	/// Wallet device serial number.
+	pub serial: String,
+	/// Ethereum address.
+	pub address: Address,
+}
+
+/// Key derivation paths used on hardware wallets.
+#[derive(Debug, Clone, Copy)]
+pub enum KeyPath {
+	/// Ethereum.
+	Ethereum,
+	/// Ethereum classic.
+	EthereumClassic,
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			Error::KeyNotFound => write!(f, "Key not found for given address."),
+			Error::LedgerDevice(ref e) => write!(f, "{}", e),
+			Error::TrezorDevice(ref e) => write!(f, "{}", e),
+			Error::Usb(ref e) => write!(f, "{}", e),
+			Error::Hid(ref e) => write!(f, "{}", e),
+		}
+	}
+}
+
+impl From<ledger::Error> for Error {
+	fn from(err: ledger::Error) -> Self {
+		match err {
+			ledger::Error::KeyNotFound => Error::KeyNotFound,
+			_ => Error::LedgerDevice(err),
+		}
+	}
+}
+
+impl From<trezor::Error> for Error {
+	fn from(err: trezor::Error) -> Self {
+		match err {
+			trezor::Error::KeyNotFound => Error::KeyNotFound,
+			_ => Error::TrezorDevice(err),
+		}
+	}
+}
+
+impl From<libusb::Error> for Error {
+	fn from(err: libusb::Error) -> Self {
+		Error::Usb(err)
+	}
+}
+
+/// Specifies the direction of the `HardwareWallet` i.e, whether it arrived or left
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum DeviceDirection {
+	/// Device arrived
+	Arrived,
+	/// Device left
+	Left,
+}
+
+impl fmt::Display for DeviceDirection {
+	fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+		match self {
+			DeviceDirection::Arrived => write!(f, "arrived"),
+			DeviceDirection::Left => write!(f, "left"),
+		}
+	}
+}
+
+/// Hardware wallet management interface.
+pub struct HardwareWalletManager {
+	exiting: Arc<AtomicBool>,
+	ledger: Arc<ledger::Manager>,
+	trezor: Arc<trezor::Manager>,
+}
+
+impl HardwareWalletManager {
+	/// Hardware wallet constructor
+	pub fn new() -> Result<Self, Error> {
+		let exiting = Arc::new(AtomicBool::new(false));
+		let hidapi = Arc::new(Mutex::new(hidapi::HidApi::new().map_err(|e| Error::Hid(e.to_string().clone()))?));
+		let ledger = ledger::Manager::new(hidapi.clone());
+		let trezor = trezor::Manager::new(hidapi.clone());
+		let usb_context = Arc::new(libusb::Context::new()?);
+
+		let l = ledger.clone();
+		let t = trezor.clone();
+		let exit = exiting.clone();
+
+		// Subscribe to all vendor IDs (VIDs) and product IDs (PIDs)
+		// This means that the `HardwareWalletManager` is responsible to validate the detected device
+		usb_context.register_callback(
+			None, None, Some(HID_USB_DEVICE_CLASS),
+			Box::new(EventHandler::new(
+				Arc::downgrade(&ledger),
+				Arc::downgrade(&trezor)
+			))
+		)?;
+
+		// Hardware event subscriber thread
+		thread::Builder::new()
+			.name("hw_wallet_manager".to_string())
+			.spawn(move || {
+				if let Err(e) = l.update_devices(DeviceDirection::Arrived) {
+					debug!(target: "hw", "Ledger couldn't connect at startup, error: {}", e);
+				}
+				if let Err(e) = t.update_devices(DeviceDirection::Arrived) {
+					debug!(target: "hw", "Trezor couldn't connect at startup, error: {}", e);
+				}
+
+				while !exit.load(atomic::Ordering::Acquire) {
+					if let Err(e) = usb_context.handle_events(Some(USB_EVENT_POLLING_INTERVAL)) {
+						debug!(target: "hw", "HardwareWalletManager event handler error: {}", e);
+					}
+				}
+			})
+			.ok();
+
+		Ok(Self {
+			exiting,
+			trezor,
+			ledger,
+		})
+	}
+
+	/// Select key derivation path for a chain.
+	/// Currently, only one hard-coded keypath is supported
+	/// It is managed by `ethcore/account_provider`
+	pub fn set_key_path(&self, key_path: KeyPath) {
+		self.ledger.set_key_path(key_path);
+		self.trezor.set_key_path(key_path);
+	}
+
+	/// List connected wallets. This only returns wallets that are ready to be used.
+	pub fn list_wallets(&self) -> Vec<WalletInfo> {
+		let mut wallets = Vec::new();
+		wallets.extend(self.ledger.list_devices());
+		wallets.extend(self.trezor.list_devices());
+		wallets
+	}
+
+	/// Return a list of paths to locked hardware wallets
+	/// This is only applicable to Trezor because Ledger only appears as
+	/// a device when it is unlocked
+	pub fn list_locked_wallets(&self) -> Result<Vec<String>, Error> {
+		Ok(self.trezor.list_locked_devices())
+	}
+
+	/// Get connected wallet info.
+	pub fn wallet_info(&self, address: &Address) -> Option<WalletInfo> {
+		if let Some(info) = self.ledger.get_wallet(address) {
+			Some(info)
+		} else {
+			self.trezor.get_wallet(address)
+		}
+	}
+
+	/// Sign a message with the wallet (only supported by Ledger)
+	pub fn sign_message(&self, address: &Address, msg: &[u8]) -> Result<Signature, Error> {
+		if self.ledger.get_wallet(address).is_some() {
+			Ok(self.ledger.sign_message(address, msg)?)
+		} else if self.trezor.get_wallet(address).is_some() {
+			Err(Error::TrezorDevice(trezor::Error::NoSigningMessage))
+		} else {
+			Err(Error::KeyNotFound)
+		}
+	}
+
+	/// Sign transaction data with wallet managing `address`.
+	pub fn sign_transaction(&self, address: &Address, t_info: &TransactionInfo, encoded_transaction: &[u8]) -> Result<Signature, Error> {
+		if self.ledger.get_wallet(address).is_some() {
+			Ok(self.ledger.sign_transaction(address, encoded_transaction)?)
+		} else if self.trezor.get_wallet(address).is_some() {
+			Ok(self.trezor.sign_transaction(address, t_info)?)
+		} else {
+			Err(Error::KeyNotFound)
+		}
+	}
+
+	/// Send a pin to a device at a certain path to unlock it
+	/// This is only applicable to Trezor because Ledger only appears as
+	/// a device when it is unlocked
+	pub fn pin_matrix_ack(&self, path: &str, pin: &str) -> Result<bool, Error> {
+		self.trezor.pin_matrix_ack(path, pin).map_err(Error::TrezorDevice)
+	}
+}
+
+impl Drop for HardwareWalletManager {
+	fn drop(&mut self) {
+		// Indicate to the USB Hotplug handler that it
+		// shall terminate but don't wait for it to terminate.
+		// If it doesn't terminate for some reason USB Hotplug events will be handled
+		// even if the HardwareWalletManger has been dropped
+		self.exiting.store(true, atomic::Ordering::Release);
+	}
+}
+
+/// Hardware wallet event handler
+///
+/// Note, that this runs to completion and race-conditions can't occur but it can
+/// stop other events for being processed with an infinite loop or similar
+struct EventHandler {
+	ledger: Weak<ledger::Manager>,
+	trezor: Weak<trezor::Manager>,
+}
+
+impl EventHandler {
+	/// Trezor event handler constructor
+	pub fn new(ledger: Weak<ledger::Manager>, trezor: Weak<trezor::Manager>) -> Self {
+		Self { ledger, trezor }
+	}
+
+	fn extract_device_info(device: &libusb::Device) -> Result<(u16, u16), Error> {
+		let desc = device.device_descriptor()?;
+		Ok((desc.vendor_id(), desc.product_id()))
+	}
+}
+
+impl libusb::Hotplug for EventHandler {
+	fn device_arrived(&mut self, device: libusb::Device) {
+		// Upgrade reference to an Arc
+		if let (Some(ledger), Some(trezor)) = (self.ledger.upgrade(), self.trezor.upgrade()) {
+			// Version ID and Product ID are available
+			if let Ok((vid, pid)) = Self::extract_device_info(&device) {
+				if trezor::is_valid_trezor(vid, pid) {
+					if !trezor::try_connect_polling(&trezor, &MAX_POLLING_DURATION, DeviceDirection::Arrived) {
+						trace!(target: "hw", "Trezor device was detected but connection failed");
+					}
+				} else if ledger::is_valid_ledger(vid, pid) {
+					if !ledger::try_connect_polling(&ledger, &MAX_POLLING_DURATION, DeviceDirection::Arrived) {
+						trace!(target: "hw", "Ledger device was detected but connection failed");
+					}
+				}
+			}
+		}
+	}
+
+	fn device_left(&mut self, device: libusb::Device) {
+		// Upgrade reference to an Arc
+		if let (Some(ledger), Some(trezor)) = (self.ledger.upgrade(), self.trezor.upgrade()) {
+			// Version ID and Product ID are available
+			if let Ok((vid, pid)) = Self::extract_device_info(&device) {
+				if trezor::is_valid_trezor(vid, pid) {
+					if !trezor::try_connect_polling(&trezor, &MAX_POLLING_DURATION, DeviceDirection::Left) {
+						trace!(target: "hw", "Trezor device was detected but disconnection failed");
+					}
+				} else if ledger::is_valid_ledger(vid, pid) {
+					if !ledger::try_connect_polling(&ledger, &MAX_POLLING_DURATION, DeviceDirection::Left) {
+						trace!(target: "hw", "Ledger device was detected but disconnection failed");
+					}
+				}
+			}
+		}
+	}
+}
+
+/// Helper to determine if a device is a valid HID
+pub fn is_valid_hid_device(usage_page: u16, interface_number: i32) -> bool {
+	usage_page == HID_GLOBAL_USAGE_PAGE || interface_number == HID_USB_DEVICE_CLASS as i32
+}

accounts/hw/src/trezor.rs

@@ -0,0 +1,463 @@
+// 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/>.
+
+//! Trezor hardware wallet module. Supports Trezor v1.
+//! See <http://doc.satoshilabs.com/trezor-tech/api-protobuf.html>
+//! and <https://github.com/trezor/trezor-common/blob/master/protob/protocol.md>
+//! for protocol details.
+
+use std::cmp::{min, max};
+use std::sync::Arc;
+use std::time::{Duration, Instant};
+use std::fmt;
+
+use ethereum_types::{U256, H256, Address};
+use ethkey::Signature;
+use hidapi;
+use libusb;
+use parking_lot::{Mutex, RwLock};
+use protobuf::{self, Message, ProtobufEnum};
+use super::{DeviceDirection, WalletInfo, TransactionInfo, KeyPath, Wallet, Device, is_valid_hid_device};
+use trezor_sys::messages::{EthereumAddress, PinMatrixAck, MessageType, EthereumTxRequest, EthereumSignTx, EthereumGetAddress, EthereumTxAck, ButtonAck};
+
+/// Trezor v1 vendor ID
+const TREZOR_VID: u16 = 0x534c;
+/// Trezor product IDs
+const TREZOR_PIDS: [u16; 1] = [0x0001];
+
+const ETH_DERIVATION_PATH: [u32; 5] = [0x8000_002C, 0x8000_003C, 0x8000_0000, 0, 0]; // m/44'/60'/0'/0/0
+const ETC_DERIVATION_PATH: [u32; 5] = [0x8000_002C, 0x8000_003D, 0x8000_0000, 0, 0]; // m/44'/61'/0'/0/0
+
+/// Hardware wallet error.
+#[derive(Debug)]
+pub enum Error {
+	/// Ethereum wallet protocol error.
+	Protocol(&'static str),
+	/// Hidapi error.
+	Usb(hidapi::HidError),
+	/// Libusb error
+	LibUsb(libusb::Error),
+	/// Device with request key is not available.
+	KeyNotFound,
+	/// Signing has been cancelled by user.
+	UserCancel,
+	/// The Message Type given in the trezor RPC call is not something we recognize
+	BadMessageType,
+	/// Trying to read from a closed device at the given path
+	LockedDevice(String),
+	/// Signing messages are not supported by Trezor
+	NoSigningMessage,
+	/// No device arrived
+	NoDeviceArrived,
+	/// No device left
+	NoDeviceLeft,
+	/// Invalid PID or VID
+	InvalidDevice,
+}
+
+impl fmt::Display for Error {
+	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
+		match *self {
+			Error::Protocol(ref s) => write!(f, "Trezor protocol error: {}", s),
+			Error::Usb(ref e) => write!(f, "USB communication error: {}", e),
+			Error::LibUsb(ref e) => write!(f, "LibUSB communication error: {}", e),
+			Error::KeyNotFound => write!(f, "Key not found"),
+			Error::UserCancel => write!(f, "Operation has been cancelled"),
+			Error::BadMessageType => write!(f, "Bad Message Type in RPC call"),
+			Error::LockedDevice(ref s) => write!(f, "Device is locked, needs PIN to perform operations: {}", s),
+			Error::NoSigningMessage=> write!(f, "Signing messages are not supported by Trezor"),
+			Error::NoDeviceArrived => write!(f, "No device arrived"),
+			Error::NoDeviceLeft => write!(f, "No device left"),
+			Error::InvalidDevice => write!(f, "Device with non-supported product ID or vendor ID was detected"),
+		}
+	}
+}
+
+impl From<hidapi::HidError> for Error {
+	fn from(err: hidapi::HidError) -> Self {
+		Error::Usb(err)
+	}
+}
+
+impl From<libusb::Error> for Error {
+	fn from(err: libusb::Error) -> Self {
+		Error::LibUsb(err)
+	}
+}
+
+impl From<protobuf::ProtobufError> for Error {
+	fn from(_: protobuf::ProtobufError) -> Self {
+		Error::Protocol(&"Could not read response from Trezor Device")
+	}
+}
+
+/// Trezor device manager
+pub struct Manager {
+	usb: Arc<Mutex<hidapi::HidApi>>,
+	devices: RwLock<Vec<Device>>,
+	locked_devices: RwLock<Vec<String>>,
+	key_path: RwLock<KeyPath>,
+}
+
+/// HID Version used for the Trezor device
+enum HidVersion {
+	V1,
+	V2,
+}
+
+impl Manager {
+	/// Create a new instance.
+	pub fn new(usb: Arc<Mutex<hidapi::HidApi>>) -> Arc<Self> {
+		Arc::new(Self {
+			usb,
+			devices: RwLock::new(Vec::new()),
+			locked_devices: RwLock::new(Vec::new()),
+			key_path: RwLock::new(KeyPath::Ethereum),
+		})
+	}
+
+	pub fn pin_matrix_ack(&self, device_path: &str, pin: &str) -> Result<bool, Error> {
+		let unlocked = {
+			let usb = self.usb.lock();
+			let device = self.open_path(|| usb.open_path(&device_path))?;
+			let t = MessageType::MessageType_PinMatrixAck;
+			let mut m = PinMatrixAck::new();
+			m.set_pin(pin.to_string());
+			self.send_device_message(&device, t, &m)?;
+			let (resp_type, _) = self.read_device_response(&device)?;
+			match resp_type {
+				// Getting an Address back means it's unlocked, this is undocumented behavior
+				MessageType::MessageType_EthereumAddress => Ok(true),
+				// Getting anything else means we didn't unlock it
+				_ => Ok(false),
+
+			}
+		};
+		self.update_devices(DeviceDirection::Arrived)?;
+		unlocked
+	}
+
+	fn u256_to_be_vec(&self, val: &U256) -> Vec<u8> {
+		let mut buf = [0_u8; 32];
+		val.to_big_endian(&mut buf);
+		buf.iter().skip_while(|x| **x == 0).cloned().collect()
+	}
+
+	fn signing_loop(&self, handle: &hidapi::HidDevice, chain_id: &Option<u64>, data: &[u8]) -> Result<Signature, Error> {
+		let (resp_type, bytes) = self.read_device_response(&handle)?;
+		match resp_type {
+			MessageType::MessageType_Cancel => Err(Error::UserCancel),
+			MessageType::MessageType_ButtonRequest => {
+				self.send_device_message(handle, MessageType::MessageType_ButtonAck, &ButtonAck::new())?;
+				// Signing loop goes back to the top and reading blocks
+				// for up to 5 minutes waiting for response from the device
+				// if the user doesn't click any button within 5 minutes you
+				// get a signing error and the device sort of locks up on the signing screen
+				self.signing_loop(handle, chain_id, data)
+			}
+			MessageType::MessageType_EthereumTxRequest => {
+				let resp: EthereumTxRequest = protobuf::core::parse_from_bytes(&bytes)?;
+				if resp.has_data_length() {
+					let mut msg = EthereumTxAck::new();
+					let len = resp.get_data_length() as usize;
+					msg.set_data_chunk(data[..len].to_vec());
+					self.send_device_message(handle, MessageType::MessageType_EthereumTxAck, &msg)?;
+					self.signing_loop(handle, chain_id, &data[len..])
+				} else {
+					let v = resp.get_signature_v();
+					let r = H256::from_slice(resp.get_signature_r());
+					let s = H256::from_slice(resp.get_signature_s());
+					if let Some(c_id) = *chain_id {
+						// If there is a chain_id supplied, Trezor will return a v
+						// part of the signature that is already adjusted for EIP-155,
+						// so v' = v + 2 * chain_id + 35, but code further down the
+						// pipeline will already do this transformation, so remove it here
+						let adjustment = 35 + 2 * c_id as u32;
+						Ok(Signature::from_rsv(&r, &s, (max(v, adjustment) - adjustment) as u8))
+					} else {
+						// If there isn't a chain_id, v will be returned as v + 27
+						let adjusted_v = if v < 27 { v } else { v - 27 };
+						Ok(Signature::from_rsv(&r, &s, adjusted_v as u8))
+					}
+				}
+			}
+			MessageType::MessageType_Failure => Err(Error::Protocol("Last message sent to Trezor failed")),
+			_ => Err(Error::Protocol("Unexpected response from Trezor device.")),
+		}
+	}
+
+	fn send_device_message(&self, device: &hidapi::HidDevice, msg_type: MessageType, msg: &Message) -> Result<usize, Error> {
+		let msg_id = msg_type as u16;
+		let mut message = msg.write_to_bytes()?;
+		let msg_size = message.len();
+		let mut data = Vec::new();
+		let hid_version = self.probe_hid_version(device)?;
+		// Magic constants
+		data.push(b'#');
+		data.push(b'#');
+		// Convert msg_id to BE and split into bytes
+		data.push(((msg_id >> 8) & 0xFF) as u8);
+		data.push((msg_id & 0xFF) as u8);
+		// Convert msg_size to BE and split into bytes
+		data.push(((msg_size >> 24) & 0xFF) as u8);
+		data.push(((msg_size >> 16) & 0xFF) as u8);
+		data.push(((msg_size >> 8) & 0xFF) as u8);
+		data.push((msg_size & 0xFF) as u8);
+		data.append(&mut message);
+		while data.len() % 63 > 0 {
+			data.push(0);
+		}
+		let mut total_written = 0;
+		for chunk in data.chunks(63) {
+			let mut padded_chunk = match hid_version {
+				HidVersion::V1 => vec![b'?'],
+				HidVersion::V2 => vec![0, b'?'],
+			};
+			padded_chunk.extend_from_slice(&chunk);
+			total_written += device.write(&padded_chunk)?;
+		}
+		Ok(total_written)
+	}
+
+	fn probe_hid_version(&self, device: &hidapi::HidDevice) -> Result<HidVersion, Error> {
+		let mut buf2 = [0xFF_u8; 65];
+		buf2[0] = 0;
+		buf2[1] = 63;
+		let mut buf1 = [0xFF_u8; 64];
+		buf1[0] = 63;
+		if device.write(&buf2)? == 65 {
+			Ok(HidVersion::V2)
+		} else if device.write(&buf1)? == 64 {
+			Ok(HidVersion::V1)
+		} else {
+			Err(Error::Usb("Unable to determine HID Version"))
+		}
+	}
+
+	fn read_device_response(&self, device: &hidapi::HidDevice) -> Result<(MessageType, Vec<u8>), Error> {
+		let protocol_err = Error::Protocol(&"Unexpected wire response from Trezor Device");
+		let mut buf = vec![0; 64];
+
+		let first_chunk = device.read_timeout(&mut buf, 300_000)?;
+		if first_chunk < 9 || buf[0] != b'?' || buf[1] != b'#' || buf[2] != b'#' {
+			return Err(protocol_err);
+		}
+		let msg_type = MessageType::from_i32(((buf[3] as i32 & 0xFF) << 8) + (buf[4] as i32 & 0xFF)).ok_or(protocol_err)?;
+		let msg_size = ((buf[5] as u32 & 0xFF) << 24) + ((buf[6] as u32 & 0xFF) << 16) + ((buf[7] as u32 & 0xFF) << 8) + (buf[8] as u32 & 0xFF);
+		let mut data = Vec::new();
+		data.extend_from_slice(&buf[9..]);
+		while data.len() < (msg_size as usize) {
+			device.read_timeout(&mut buf, 10_000)?;
+			data.extend_from_slice(&buf[1..]);
+		}
+		Ok((msg_type, data[..msg_size as usize].to_vec()))
+	}
+}
+
+impl<'a> Wallet<'a> for Manager {
+	type Error = Error;
+	type Transaction = &'a TransactionInfo;
+
+	fn sign_transaction(&self, address: &Address, t_info: Self::Transaction) ->
+		Result<Signature, Error> {
+		let usb = self.usb.lock();
+		let devices = self.devices.read();
+		let device = devices.iter().find(|d| &d.info.address == address).ok_or(Error::KeyNotFound)?;
+		let handle = self.open_path(|| usb.open_path(&device.path))?;
+		let msg_type = MessageType::MessageType_EthereumSignTx;
+		let mut message = EthereumSignTx::new();
+		match *self.key_path.read() {
+			KeyPath::Ethereum => message.set_address_n(ETH_DERIVATION_PATH.to_vec()),
+			KeyPath::EthereumClassic => message.set_address_n(ETC_DERIVATION_PATH.to_vec()),
+		}
+		message.set_nonce(self.u256_to_be_vec(&t_info.nonce));
+		message.set_gas_limit(self.u256_to_be_vec(&t_info.gas_limit));
+		message.set_gas_price(self.u256_to_be_vec(&t_info.gas_price));
+		message.set_value(self.u256_to_be_vec(&t_info.value));
+
+		if let Some(addr) = t_info.to {
+			message.set_to(addr.to_vec())
+		}
+		let first_chunk_length = min(t_info.data.len(), 1024);
+		let chunk = &t_info.data[0..first_chunk_length];
+		message.set_data_initial_chunk(chunk.to_vec());
+		message.set_data_length(t_info.data.len() as u32);
+		if let Some(c_id) = t_info.chain_id {
+			message.set_chain_id(c_id as u32);
+		}
+
+		self.send_device_message(&handle, msg_type, &message)?;
+
+		self.signing_loop(&handle, &t_info.chain_id, &t_info.data[first_chunk_length..])
+	}
+
+	fn set_key_path(&self, key_path: KeyPath) {
+		*self.key_path.write() = key_path;
+	}
+
+	fn update_devices(&self, device_direction: DeviceDirection) -> Result<usize, Error> {
+		let mut usb = self.usb.lock();
+		usb.refresh_devices();
+		let devices = usb.devices();
+		let num_prev_devices = self.devices.read().len();
+
+		let detected_devices = devices.iter()
+			.filter(|&d| is_valid_trezor(d.vendor_id, d.product_id) &&
+					is_valid_hid_device(d.usage_page, d.interface_number)
+			)
+			.fold(Vec::new(), |mut v, d| {
+				match self.read_device(&usb, &d) {
+					Ok(info) => {
+						trace!(target: "hw", "Found device: {:?}", info);
+						v.push(info);
+					}
+					Err(e) => trace!(target: "hw", "Error reading device info: {}", e),
+				};
+				v
+			});
+
+		let num_curr_devices = detected_devices.len();
+		*self.devices.write() = detected_devices;
+
+		match device_direction {
+			DeviceDirection::Arrived => {
+				if num_curr_devices > num_prev_devices {
+					Ok(num_curr_devices - num_prev_devices)
+				} else {
+					Err(Error::NoDeviceArrived)
+				}
+			}
+			DeviceDirection::Left => {
+				if num_prev_devices > num_curr_devices {
+					Ok(num_prev_devices - num_curr_devices)
+				} else {
+					Err(Error::NoDeviceLeft)
+				}
+			}
+		}
+	}
+
+	fn read_device(&self, usb: &hidapi::HidApi, dev_info: &hidapi::HidDeviceInfo) -> Result<Device, Error> {
+		let handle = self.open_path(|| usb.open_path(&dev_info.path))?;
+		let manufacturer = dev_info.manufacturer_string.clone().unwrap_or_else(|| "Unknown".to_owned());
+		let name = dev_info.product_string.clone().unwrap_or_else(|| "Unknown".to_owned());
+		let serial = dev_info.serial_number.clone().unwrap_or_else(|| "Unknown".to_owned());
+		match self.get_address(&handle) {
+			Ok(Some(addr)) => {
+				Ok(Device {
+					path: dev_info.path.clone(),
+					info: WalletInfo {
+						name,
+						manufacturer,
+						serial,
+						address: addr,
+					},
+				})
+			}
+			Ok(None) => Err(Error::LockedDevice(dev_info.path.clone())),
+			Err(e) => Err(e),
+		}
+	}
+
+	fn list_devices(&self) -> Vec<WalletInfo> {
+		self.devices.read().iter().map(|d| d.info.clone()).collect()
+	}
+
+	fn list_locked_devices(&self) -> Vec<String> {
+		(*self.locked_devices.read()).clone()
+	}
+
+	fn get_wallet(&self, address: &Address) -> Option<WalletInfo> {
+		self.devices.read().iter().find(|d| &d.info.address == address).map(|d| d.info.clone())
+	}
+
+	fn get_address(&self, device: &hidapi::HidDevice) -> Result<Option<Address>, Error> {
+		let typ = MessageType::MessageType_EthereumGetAddress;
+		let mut message = EthereumGetAddress::new();
+		match *self.key_path.read() {
+			KeyPath::Ethereum => message.set_address_n(ETH_DERIVATION_PATH.to_vec()),
+			KeyPath::EthereumClassic => message.set_address_n(ETC_DERIVATION_PATH.to_vec()),
+		}
+		message.set_show_display(false);
+		self.send_device_message(&device, typ, &message)?;
+
+		let (resp_type, bytes) = self.read_device_response(&device)?;
+		match resp_type {
+			MessageType::MessageType_EthereumAddress => {
+				let response: EthereumAddress = protobuf::core::parse_from_bytes(&bytes)?;
+				Ok(Some(From::from(response.get_address())))
+			}
+			_ => Ok(None),
+		}
+	}
+
+	fn open_path<R, F>(&self, f: F) -> Result<R, Error>
+		where F: Fn() -> Result<R, &'static str>
+	{
+		f().map_err(Into::into)
+	}
+}
+
+/// Poll the device in maximum `max_polling_duration` if it doesn't succeed
+pub fn try_connect_polling(trezor: &Manager, duration: &Duration, dir: DeviceDirection) -> bool {
+	let start_time = Instant::now();
+	while start_time.elapsed() <= *duration {
+		if let Ok(num_devices) = trezor.update_devices(dir) {
+			trace!(target: "hw", "{} Trezor devices {}", num_devices, dir);
+			return true
+		}
+	}
+	false
+}
+
+/// Check if the detected device is a Trezor device by checking both the product ID and the vendor ID
+pub fn is_valid_trezor(vid: u16, pid: u16) -> bool {
+	vid == TREZOR_VID && TREZOR_PIDS.contains(&pid)
+}
+
+#[test]
+#[ignore]
+/// This test can't be run without an actual trezor device connected
+/// (and unlocked) attached to the machine that's running the test
+fn test_signature() {
+	use ethereum_types::Address;
+	use MAX_POLLING_DURATION;
+	use super::HardwareWalletManager;
+
+	let manager = HardwareWalletManager::new().unwrap();
+
+	assert_eq!(try_connect_polling(&manager.trezor, &MAX_POLLING_DURATION, DeviceDirection::Arrived), true);
+
+	let addr: Address = manager.list_wallets()
+		.iter()
+		.filter(|d| d.name == "TREZOR".to_string() && d.manufacturer == "SatoshiLabs".to_string())
+		.nth(0)
+		.map(|d| d.address)
+		.unwrap();
+
+	let t_info = TransactionInfo {
+		nonce: U256::from(1),
+		gas_price: U256::from(100),
+		gas_limit: U256::from(21_000),
+		to: Some(Address::from(1337)),
+		chain_id: Some(1),
+		value: U256::from(1_000_000),
+		data: (&[1u8; 3000]).to_vec(),
+	};
+
+	let signature = manager.trezor.sign_transaction(&addr, &t_info);
+	assert!(signature.is_ok());
+}

accounts/src/account_data.rs

@@ -1,73 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open 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.
-
-// Open 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-//! Account Metadata
-
-use std::{
-	collections::HashMap,
-	time::Instant,
-};
-
-use parity_crypto::publickey::Address;
-use ethkey::Password;
-use serde_derive::{Serialize, Deserialize};
-use serde_json;
-
-/// Type of unlock.
-#[derive(Clone, PartialEq)]
-pub enum Unlock {
-	/// If account is unlocked temporarily, it should be locked after first usage.
-	OneTime,
-	/// Account unlocked permanently can always sign message.
-	/// Use with caution.
-	Perm,
-	/// Account unlocked with a timeout
-	Timed(Instant),
-}
-
-/// Data associated with account.
-#[derive(Clone)]
-pub struct AccountData {
-	pub unlock: Unlock,
-	pub password: Password,
-}
-
-/// Collected account metadata
-#[derive(Default, Clone, Debug, PartialEq, Serialize, Deserialize)]
-pub struct AccountMeta {
-	/// The name of the account.
-	pub name: String,
-	/// The rest of the metadata of the account.
-	pub meta: String,
-	/// The 128-bit Uuid of the account, if it has one (brain-wallets don't).
-	pub uuid: Option<String>,
-}
-
-impl AccountMeta {
-	/// Read a hash map of Address -> AccountMeta
-	pub fn read<R>(reader: R) -> Result<HashMap<Address, Self>, serde_json::Error> where
-		R: ::std::io::Read,
-	{
-		serde_json::from_reader(reader)
-	}
-
-	/// Write a hash map of Address -> AccountMeta
-	pub fn write<W>(m: &HashMap<Address, Self>, writer: &mut W) -> Result<(), serde_json::Error> where
-		W: ::std::io::Write,
-	{
-		serde_json::to_writer(writer, m)
-	}
-}

accounts/src/error.rs

@@ -1,46 +0,0 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
-
-// Open 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.
-
-// Open 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
-
-use std::fmt;
-
-use ethstore::{Error as SSError};
-
-/// Signing error
-#[derive(Debug)]
-pub enum SignError {
-	/// Account is not unlocked
-	NotUnlocked,
-	/// Account does not exist.
-	NotFound,
-	/// Low-level error from store
-	SStore(SSError),
-}
-
-impl fmt::Display for SignError {
-	fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
-		match *self {
-			SignError::NotUnlocked => write!(f, "Account is locked"),
-			SignError::NotFound => write!(f, "Account does not exist"),
-			SignError::SStore(ref e) => write!(f, "{}", e),
-		}
-	}
-}
-
-impl From<SSError> for SignError {
-	fn from(e: SSError) -> Self {
-		SignError::SStore(e)
-	}
-}

chainspec/Cargo.toml

@@ -1,5 +1,4 @@
 [package]
-description = "OpenEthereum Chain Specification"
 name = "chainspec"
 version = "0.1.0"
 authors = ["Marek Kotewicz <marek@parity.io>"]

chainspec/src/main.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 extern crate serde_json;
 extern crate ethjson;

cli-signer/Cargo.toml

@@ -1,13 +1,12 @@
 [package]
-description = "OpenEthereum CLI Signer Tool"
-repository = "https://github.com/openethereum/openethereum"
+authors = ["Parity <admin@parity.io>"]
+description = "Parity Cli Tool"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "cli-signer"
 version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
 
 [dependencies]
-ethereum-types = "0.9.0"
 futures = "0.1"
 rpassword = "1.0"
 parity-rpc = { path = "../rpc" }

cli-signer/rpc-client/Cargo.toml

@@ -1,21 +1,20 @@
 [package]
-description = "OpenEthereum RPC Client"
-repository = "https://github.com/openethereum/openethereum"
+authors = ["Parity <admin@parity.io>"]
+description = "Parity Rpc Client"
+homepage = "http://parity.io"
 license = "GPL-3.0"
 name = "parity-rpc-client"
 version = "1.4.0"
-authors = ["Parity <admin@parity.io>"]
 
 [dependencies]
-ethereum-types = "0.9.0"
 futures = "0.1"
 log = "0.4"
 serde = "1.0"
 serde_json = "1.0"
-url = "2.1.1"
+url = "1.2.0"
 matches = "0.1"
-parking_lot = "0.10.0"
-jsonrpc-core = "14.0.3"
-jsonrpc-ws-server = "14.0.3"
+parking_lot = "0.7"
+jsonrpc-core = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
+jsonrpc-ws-server = { git = "https://github.com/paritytech/jsonrpc.git", branch = "parity-2.2" }
 parity-rpc = { path = "../../rpc" }
-keccak-hash = "0.5.0"
+keccak-hash = "0.1"

cli-signer/rpc-client/src/client.rs

@@ -1,18 +1,18 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use std::fmt::{Debug, Formatter, Error as FmtError};
 use std::io::{BufReader, BufRead};

cli-signer/rpc-client/src/lib.rs

@@ -1,23 +1,22 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 pub mod client;
 pub mod signer_client;
 
-extern crate ethereum_types;
 extern crate futures;
 extern crate jsonrpc_core;
 extern crate jsonrpc_ws_server as ws;
@@ -36,7 +35,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 {

cli-signer/rpc-client/src/signer_client.rs

@@ -1,22 +1,21 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
 use client::{Rpc, RpcError};
-use ethereum_types::U256;
-use rpc::signer::{ConfirmationRequest, TransactionModification, TransactionCondition};
+use rpc::signer::{ConfirmationRequest, TransactionModification, U256, TransactionCondition};
 use serde;
 use serde_json::{Value as JsonValue, to_value};
 use std::path::PathBuf;

cli-signer/src/lib.rs

@@ -1,28 +1,26 @@
-// Copyright 2015-2020 Parity Technologies (UK) Ltd.
-// This file is part of Open Ethereum.
+// Copyright 2015-2019 Parity Technologies (UK) Ltd.
+// This file is part of Parity Ethereum.
 
-// Open Ethereum is free software: you can redistribute it and/or modify
+// 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.
 
-// Open Ethereum is distributed in the hope that it will be useful,
+// 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 Open Ethereum.  If not, see <http://www.gnu.org/licenses/>.
+// along with Parity Ethereum.  If not, see <http://www.gnu.org/licenses/>.
 
-extern crate ethereum_types;
 extern crate futures;
 extern crate rpassword;
 
 extern crate parity_rpc as rpc;
 extern crate parity_rpc_client as client;
 
-use ethereum_types::U256;
-use rpc::signer::ConfirmationRequest;
+use rpc::signer::{U256, ConfirmationRequest};
 use client::signer_client::SignerRpc;
 use std::io::{Write, BufRead, BufReader, stdout, stdin};
 use std::path::PathBuf;

docs/CHANGELOG-0.9.md

@@ -1,228 +1,228 @@
 Note: Parity 0.9 reached End-of-Life on 2016-05-02 (EOL).
 
-## Parity [beta-0.9.1](https://github.com/openethereum/openethereum/releases/tag/beta-0.9.1) (2016-02-16)
+## Parity [beta-0.9.1](https://github.com/paritytech/parity/releases/tag/beta-0.9.1) (2016-02-16)
 
 Homestead transition block changed to 1100000.
 
-- Beta patch to 0.9.1 [#445](https://github.com/openethereum/openethereum/pull/445)
-- Delay homestead transition [#430](https://github.com/openethereum/openethereum/pull/430)
-- (BETA) https link in the installer (?) [#392](https://github.com/openethereum/openethereum/pull/392)
-- beta: Check for handshake expiration before attempting replace [#377](https://github.com/openethereum/openethereum/pull/377)
+- Beta patch to 0.9.1 [#445](https://github.com/paritytech/parity/pull/445)
+- Delay homestead transition [#430](https://github.com/paritytech/parity/pull/430)
+- (BETA) https link in the installer (?) [#392](https://github.com/paritytech/parity/pull/392)
+- beta: Check for handshake expiration before attempting replace [#377](https://github.com/paritytech/parity/pull/377)
 
-## Parity [beta-0.9](https://github.com/openethereum/openethereum/releases/tag/beta-0.9) (2016-02-08)
+## Parity [beta-0.9](https://github.com/paritytech/parity/releases/tag/beta-0.9) (2016-02-08)
 
 First Parity Beta 0.9 released.
 
-- Panic on missing counters; Client cleanup [#368](https://github.com/openethereum/openethereum/pull/368)
-- Update README for new PPAs. [#369](https://github.com/openethereum/openethereum/pull/369)
-- block_queue::clear should be more thorough [#365](https://github.com/openethereum/openethereum/pull/365)
-- Fixed an issue with forked counters [#363](https://github.com/openethereum/openethereum/pull/363)
-- Install parity [#362](https://github.com/openethereum/openethereum/pull/362)
-- DB directory versioning [#358](https://github.com/openethereum/openethereum/pull/358)
-- Raise FD limit for MacOS [#357](https://github.com/openethereum/openethereum/pull/357)
-- Travis slack integration. [#356](https://github.com/openethereum/openethereum/pull/356)
-- SignedTransaction structure [#350](https://github.com/openethereum/openethereum/pull/350)
-- License [#354](https://github.com/openethereum/openethereum/pull/354)
-- Performance optimizations [#353](https://github.com/openethereum/openethereum/pull/353)
-- Gitter in README. [#355](https://github.com/openethereum/openethereum/pull/355)
-- test efforts, receipt requests [#352](https://github.com/openethereum/openethereum/pull/352)
-- sync tests setup & local module coverage [#348](https://github.com/openethereum/openethereum/pull/348)
-- install parity script [#347](https://github.com/openethereum/openethereum/pull/347)
-- evmjit homestead merge [#342](https://github.com/openethereum/openethereum/pull/342)
-- Fixed sync stalling on fork [#343](https://github.com/openethereum/openethereum/pull/343)
-- Remerge 264 [#334](https://github.com/openethereum/openethereum/pull/334)
-- Ethsync tests bfix [#339](https://github.com/openethereum/openethereum/pull/339)
-- Fix default options. [#335](https://github.com/openethereum/openethereum/pull/335)
-- sync queue limit hotfix [#338](https://github.com/openethereum/openethereum/pull/338)
-- Network tests, separate local coverage for utils [#333](https://github.com/openethereum/openethereum/pull/333)
-- fix parity version so netstats can parse it [#332](https://github.com/openethereum/openethereum/pull/332)
-- reveal surprise [#331](https://github.com/openethereum/openethereum/pull/331)
-- Revert removal of `new_code`. [#330](https://github.com/openethereum/openethereum/pull/330)
-- Network mod tests first part [#329](https://github.com/openethereum/openethereum/pull/329)
-- Look ma no `dead_code` [#323](https://github.com/openethereum/openethereum/pull/323)
-- Fixing JIT, Updating hook to run `ethcore` tests. [#326](https://github.com/openethereum/openethereum/pull/326)
-- Final docs [#327](https://github.com/openethereum/openethereum/pull/327)
-- update install-deps.sh [#316](https://github.com/openethereum/openethereum/pull/316)
-- Finish all my docs. Fix previous test compilation. [#320](https://github.com/openethereum/openethereum/pull/320)
-- Additional evm tests (extops, call, jumps) and some docs [#317](https://github.com/openethereum/openethereum/pull/317)
-- More documentation. [#318](https://github.com/openethereum/openethereum/pull/318)
-- Additional documentation. [#315](https://github.com/openethereum/openethereum/pull/315)
-- unused functions cleanup [#310](https://github.com/openethereum/openethereum/pull/310)
-- update ethcore.github.io documentation automatically [#311](https://github.com/openethereum/openethereum/pull/311)
-- Another try with travis ci credentials [#314](https://github.com/openethereum/openethereum/pull/314)
-- Document some stuff. [#309](https://github.com/openethereum/openethereum/pull/309)
-- Check block parent on import; Peer timeouts [#303](https://github.com/openethereum/openethereum/pull/303)
-- Increasing coverage for evm. [#306](https://github.com/openethereum/openethereum/pull/306)
-- ethcore docs [#301](https://github.com/openethereum/openethereum/pull/301)
-- Replacing secure token for deployment [#305](https://github.com/openethereum/openethereum/pull/305)
-- doc.sh [#299](https://github.com/openethereum/openethereum/pull/299)
-- Building beta-* and stable-* tags [#302](https://github.com/openethereum/openethereum/pull/302)
-- Deploying artifacts for tags (release/beta) [#300](https://github.com/openethereum/openethereum/pull/300)
-- cov.sh to show coverage locally [#298](https://github.com/openethereum/openethereum/pull/298)
-- benchmark fixes [#297](https://github.com/openethereum/openethereum/pull/297)
-- Include JSONRPC CLI options. [#296](https://github.com/openethereum/openethereum/pull/296)
-- travis.yml fixes [#293](https://github.com/openethereum/openethereum/pull/293)
-- Improve version string. [#295](https://github.com/openethereum/openethereum/pull/295)
-- Fixed block queue test [#294](https://github.com/openethereum/openethereum/pull/294)
-- Util docs [#292](https://github.com/openethereum/openethereum/pull/292)
-- fixed building docs [#289](https://github.com/openethereum/openethereum/pull/289)
-- update travis to build PRs only against master [#290](https://github.com/openethereum/openethereum/pull/290)
-- Coverage effort [#272](https://github.com/openethereum/openethereum/pull/272)
-- updated docker containers [#288](https://github.com/openethereum/openethereum/pull/288)
-- rpc module fixes [#287](https://github.com/openethereum/openethereum/pull/287)
-- Test for Receipt RLP. [#282](https://github.com/openethereum/openethereum/pull/282)
-- Building from source guide [#284](https://github.com/openethereum/openethereum/pull/284)
-- Fixed neted empty list RLP encoding [#283](https://github.com/openethereum/openethereum/pull/283)
-- Fix CALLDATACOPY (and bonus CODECOPY, too!). [#279](https://github.com/openethereum/openethereum/pull/279)
-- added travis && coveralls badge to README.md [#280](https://github.com/openethereum/openethereum/pull/280)
-- coveralls coverage [#277](https://github.com/openethereum/openethereum/pull/277)
-- Travis [in progress] [#257](https://github.com/openethereum/openethereum/pull/257)
-- Travis on reorganized repo [#276](https://github.com/openethereum/openethereum/pull/276)
-- umbrella project [#275](https://github.com/openethereum/openethereum/pull/275)
-- Ethash disk cache [#273](https://github.com/openethereum/openethereum/pull/273)
-- Parity executable name and version [#274](https://github.com/openethereum/openethereum/pull/274)
-- Dockerfile [#195](https://github.com/openethereum/openethereum/pull/195)
-- Garbage collection test fix [#267](https://github.com/openethereum/openethereum/pull/267)
-- Fix stCallCreateCallCodeTest, add more tests [#271](https://github.com/openethereum/openethereum/pull/271)
-- Moved sync out of ethcore crate; Added block validation [#265](https://github.com/openethereum/openethereum/pull/265)
-- RLP encoder refactoring [#252](https://github.com/openethereum/openethereum/pull/252)
-- Chain sync tests and minor refactoring [#264](https://github.com/openethereum/openethereum/pull/264)
-- Common log init function [#263](https://github.com/openethereum/openethereum/pull/263)
-- changed max vm depth from 128 to 64, change homestead block to 1_000_000 [#262](https://github.com/openethereum/openethereum/pull/262)
-- fixed blockchain tests crash on log init [#261](https://github.com/openethereum/openethereum/pull/261)
-- Blockchain tests and some helpers for guarding temp directory [#256](https://github.com/openethereum/openethereum/pull/256)
-- Fix logging and random tests. [#260](https://github.com/openethereum/openethereum/pull/260)
-- Fix difficulty calculation algo. [#259](https://github.com/openethereum/openethereum/pull/259)
-- fix submodule version [#258](https://github.com/openethereum/openethereum/pull/258)
-- temp dir spawn refactoring [#246](https://github.com/openethereum/openethereum/pull/246)
-- fixed tests submodule branch [#254](https://github.com/openethereum/openethereum/pull/254)
-- rpc net methods returns real peer count && protocol version [#253](https://github.com/openethereum/openethereum/pull/253)
-- Add homestead & random tests. [#245](https://github.com/openethereum/openethereum/pull/245)
-- Fixing suicide with self-refund to be consistent with CPP. [#247](https://github.com/openethereum/openethereum/pull/247)
-- stubs for rpc methods [#251](https://github.com/openethereum/openethereum/pull/251)
-- clippy, missing docs, renaming etc. [#244](https://github.com/openethereum/openethereum/pull/244)
-- impl missing methods in tests [#243](https://github.com/openethereum/openethereum/pull/243)
-- General tests and some helpers [#239](https://github.com/openethereum/openethereum/pull/239)
-- Note additional tests are fixed, fix doc test. [#242](https://github.com/openethereum/openethereum/pull/242)
-- jsonrpc http server [#193](https://github.com/openethereum/openethereum/pull/193)
-- Ethash nonce is H64 not a u64 [#240](https://github.com/openethereum/openethereum/pull/240)
-- Fix import for bcMultiChainTest [#236](https://github.com/openethereum/openethereum/pull/236)
-- Client basic tests [#232](https://github.com/openethereum/openethereum/pull/232)
-- Fix ensure_db_good() and flush_queue(), block refactoring, check block format, be strict. [#231](https://github.com/openethereum/openethereum/pull/231)
-- Rlp [#207](https://github.com/openethereum/openethereum/pull/207)
-- Schedule documentation [#219](https://github.com/openethereum/openethereum/pull/219)
-- U256<->H256 Conversion [#206](https://github.com/openethereum/openethereum/pull/206)
-- Spawning new thread when we are reaching stack limit [#217](https://github.com/openethereum/openethereum/pull/217)
-- Blockchain tests [#211](https://github.com/openethereum/openethereum/pull/211)
-- fixed failing sync test [#218](https://github.com/openethereum/openethereum/pull/218)
-- Removing println [#216](https://github.com/openethereum/openethereum/pull/216)
-- Cleaning readme [#212](https://github.com/openethereum/openethereum/pull/212)
-- Fixing delegatecall [#196](https://github.com/openethereum/openethereum/pull/196)
-- Autogenerate the Args from the docopt macro. [#205](https://github.com/openethereum/openethereum/pull/205)
-- Networking fixes [#202](https://github.com/openethereum/openethereum/pull/202)
-- Argument parsing from CLI [#204](https://github.com/openethereum/openethereum/pull/204)
-- Removed wildcard from clippy version [#203](https://github.com/openethereum/openethereum/pull/203)
-- Fixed tests and tweaked sync progress report [#201](https://github.com/openethereum/openethereum/pull/201)
-- Heavy tests [#199](https://github.com/openethereum/openethereum/pull/199)
-- Mutithreaded IO [#198](https://github.com/openethereum/openethereum/pull/198)
-- Populating last_hashes [#197](https://github.com/openethereum/openethereum/pull/197)
-- Fixing clippy stuff [#170](https://github.com/openethereum/openethereum/pull/170)
-- basic .travis.yml [#194](https://github.com/openethereum/openethereum/pull/194)
-- Generating coverage reports. [#190](https://github.com/openethereum/openethereum/pull/190)
-- Adding doc requests comments [#192](https://github.com/openethereum/openethereum/pull/192)
-- moved src/bin/client.rs -> src/bin/client/main.rs [#185](https://github.com/openethereum/openethereum/pull/185)
-- removed overflowing_shr [#188](https://github.com/openethereum/openethereum/pull/188)
-- fixed wrapping ops on latest nightly [#187](https://github.com/openethereum/openethereum/pull/187)
-- Pruned state DB [#176](https://github.com/openethereum/openethereum/pull/176)
-- Memory management for cache [#180](https://github.com/openethereum/openethereum/pull/180)
-- Implement signs having low-s. [#183](https://github.com/openethereum/openethereum/pull/183)
-- Introduce sha3 crate and use it in ethash [#178](https://github.com/openethereum/openethereum/pull/178)
-- Multithreaded block queue [#173](https://github.com/openethereum/openethereum/pull/173)
-- Iterator for NibbleSlice and TrieDB. [#171](https://github.com/openethereum/openethereum/pull/171)
-- Handling all possible overflows [#145](https://github.com/openethereum/openethereum/pull/145)
-- Global secp256k1 context [#164](https://github.com/openethereum/openethereum/pull/164)
-- Ethash [#152](https://github.com/openethereum/openethereum/pull/152)
-- Move util into here [#153](https://github.com/openethereum/openethereum/pull/153)
-- EVM Interpreter [#103](https://github.com/openethereum/openethereum/pull/103)
-- Homestead transition support, maybe. [#141](https://github.com/openethereum/openethereum/pull/141)
-- externalities refactor [#131](https://github.com/openethereum/openethereum/pull/131)
-- More open files. [#140](https://github.com/openethereum/openethereum/pull/140)
-- Single array for logs output. [#133](https://github.com/openethereum/openethereum/pull/133)
-- Client app event handler [#132](https://github.com/openethereum/openethereum/pull/132)
-- Various consensus fixes. [#130](https://github.com/openethereum/openethereum/pull/130)
-- callcode builtins tests pass [#127](https://github.com/openethereum/openethereum/pull/127)
-- Client state syncing [#119](https://github.com/openethereum/openethereum/pull/119)
-- Split externalities from executive. [#126](https://github.com/openethereum/openethereum/pull/126)
-- executive error on not enoguh base gas [#124](https://github.com/openethereum/openethereum/pull/124)
-- Gav [#125](https://github.com/openethereum/openethereum/pull/125)
-- builtin sets excepted to true [#123](https://github.com/openethereum/openethereum/pull/123)
-- More state tests. [#122](https://github.com/openethereum/openethereum/pull/122)
-- updated to rocksdb wrapper version 0.3 [#121](https://github.com/openethereum/openethereum/pull/121)
-- out_of_gas -> excepted [#120](https://github.com/openethereum/openethereum/pull/120)
-- Parametrizing evm::Factory [#111](https://github.com/openethereum/openethereum/pull/111)
-- stLogs tests passing [#118](https://github.com/openethereum/openethereum/pull/118)
-- Fix executive. [#117](https://github.com/openethereum/openethereum/pull/117)
-- Fixes for marek's shooting from the hip. [#116](https://github.com/openethereum/openethereum/pull/116)
-- Executive revert fix [#115](https://github.com/openethereum/openethereum/pull/115)
-- Fix storage/account and add butress test. [#114](https://github.com/openethereum/openethereum/pull/114)
-- Refactored Pod & Diff types into separate files, JSON infrastructure revamp. [#113](https://github.com/openethereum/openethereum/pull/113)
-- Fix storage stuff and introduce per-item dirty-tracking. [#112](https://github.com/openethereum/openethereum/pull/112)
-- Check logs in state tests. [#109](https://github.com/openethereum/openethereum/pull/109)
-- executive gas calculation fixes [#108](https://github.com/openethereum/openethereum/pull/108)
-- proper gas calculation in executive [#107](https://github.com/openethereum/openethereum/pull/107)
-- Fixing MaxDepth param for executive [#105](https://github.com/openethereum/openethereum/pull/105)
-- Fix determination of state roots. [#106](https://github.com/openethereum/openethereum/pull/106)
-- transact substracts tx_gas [#104](https://github.com/openethereum/openethereum/pull/104)
-- Pretty-print and fix for state. [#102](https://github.com/openethereum/openethereum/pull/102)
-- Tier step price. [#101](https://github.com/openethereum/openethereum/pull/101)
-- Refactor Diff datastructures. [#100](https://github.com/openethereum/openethereum/pull/100)
-- externalities use u256 instead of u64 for gas calculation [#99](https://github.com/openethereum/openethereum/pull/99)
-- Executive tests [#97](https://github.com/openethereum/openethereum/pull/97)
-- State conensus tests now print mismatching diff on fail. [#98](https://github.com/openethereum/openethereum/pull/98)
-- State testing framework. First test is failing. [#96](https://github.com/openethereum/openethereum/pull/96)
-- executive tests [#95](https://github.com/openethereum/openethereum/pull/95)
-- Use U512s for ether cost calculation, complete transaction API [#94](https://github.com/openethereum/openethereum/pull/94)
-- Utils for consensus test decoding and better layout. [#93](https://github.com/openethereum/openethereum/pull/93)
-- executive fixes + tests [#89](https://github.com/openethereum/openethereum/pull/89)
-- All transaction tests pass. Nicer testing framework. [#92](https://github.com/openethereum/openethereum/pull/92)
-- Block verification tests; BlockProvider blockchain trait for testing [#88](https://github.com/openethereum/openethereum/pull/88)
-- State::exists, docs and tests. [#87](https://github.com/openethereum/openethereum/pull/87)
-- Add tests module, add two more transaction tests. [#86](https://github.com/openethereum/openethereum/pull/86)
-- bring back removed tests, removed build warnings [#82](https://github.com/openethereum/openethereum/pull/82)
-- Nicer transaction validation API. Nicer OutOfBounds API in general. [#85](https://github.com/openethereum/openethereum/pull/85)
-- Transaction fixes and consensus tests (all passing) [#84](https://github.com/openethereum/openethereum/pull/84)
-- fixed getting block info in evmjit + tests [#81](https://github.com/openethereum/openethereum/pull/81)
-- evm tests cleanup [#80](https://github.com/openethereum/openethereum/pull/80)
-- renamed VmFactory -> Factory [#77](https://github.com/openethereum/openethereum/pull/77)
-- fixed rust-evmjit description of improper_ctypes usage [#76](https://github.com/openethereum/openethereum/pull/76)
-- jit feature enabled by default [#75](https://github.com/openethereum/openethereum/pull/75)
-- evm [#52](https://github.com/openethereum/openethereum/pull/52)
-- state clone [#74](https://github.com/openethereum/openethereum/pull/74)
-- Block Verification (no tests yet) [#72](https://github.com/openethereum/openethereum/pull/72)
-- Improvements to LogEntry and Transaction [#73](https://github.com/openethereum/openethereum/pull/73)
-- Use getter in header in preparation for a Header trait; additional testing in enact_block(). [#64](https://github.com/openethereum/openethereum/pull/64)
-- BlockChain sync and Client app [#55](https://github.com/openethereum/openethereum/pull/55)
-- Block enactment (including test) [#63](https://github.com/openethereum/openethereum/pull/63)
-- Block complete. Needs tests. [#62](https://github.com/openethereum/openethereum/pull/62)
-- More on OpenBlock::close; State::kill_account added [#61](https://github.com/openethereum/openethereum/pull/61)
-- Remove genesis module, add more chain specs and separate out ethereum-specific stuff [#60](https://github.com/openethereum/openethereum/pull/60)
-- State::new_contract, camelCase engine params, missing param [#59](https://github.com/openethereum/openethereum/pull/59)
-- Use reorganisation [#58](https://github.com/openethereum/openethereum/pull/58)
-- Initial Ethash/Block skeleton implementations. [#57](https://github.com/openethereum/openethereum/pull/57)
-- Spec with tested Morden genesis decoder and builtins. [#54](https://github.com/openethereum/openethereum/pull/54)
-- Move all chain parameters into `engine_params` [#50](https://github.com/openethereum/openethereum/pull/50)
-- jit ffi improvements [please review] [#51](https://github.com/openethereum/openethereum/pull/51)
-- blockchain [please review] [#34](https://github.com/openethereum/openethereum/pull/34)
-- Move information from networkparams.rs into spec.rs [#48](https://github.com/openethereum/openethereum/pull/48)
-- Move bulking out in Engine/Params. [#47](https://github.com/openethereum/openethereum/pull/47)
-- Removed need for mutation in State. [#46](https://github.com/openethereum/openethereum/pull/46)
-- State::code and State::storage_at + tests. [#45](https://github.com/openethereum/openethereum/pull/45)
-- State functions for balance and nonce operations [#44](https://github.com/openethereum/openethereum/pull/44)
-- Account::storage_at, Account::ensure_cached and tests. [#43](https://github.com/openethereum/openethereum/pull/43)
-- Additional tests. [#42](https://github.com/openethereum/openethereum/pull/42)
-- seal todo done [#41](https://github.com/openethereum/openethereum/pull/41)
-- missing rustc_serialize crate && rlp `as_list` function [#40](https://github.com/openethereum/openethereum/pull/40)
-- More methods in Account, documentation and tests. [#39](https://github.com/openethereum/openethereum/pull/39)
-- Minor reworking of Account. [#38](https://github.com/openethereum/openethereum/pull/38)
-- Add Account and State classes. [#37](https://github.com/openethereum/openethereum/pull/37)
-- Revert regressions [#36](https://github.com/openethereum/openethereum/pull/36)
+- Panic on missing counters; Client cleanup [#368](https://github.com/paritytech/parity/pull/368)
+- Update README for new PPAs. [#369](https://github.com/paritytech/parity/pull/369)
+- block_queue::clear should be more thorough [#365](https://github.com/paritytech/parity/pull/365)
+- Fixed an issue with forked counters [#363](https://github.com/paritytech/parity/pull/363)
+- Install parity [#362](https://github.com/paritytech/parity/pull/362)
+- DB directory versioning [#358](https://github.com/paritytech/parity/pull/358)
+- Raise FD limit for MacOS [#357](https://github.com/paritytech/parity/pull/357)
+- Travis slack integration. [#356](https://github.com/paritytech/parity/pull/356)
+- SignedTransaction structure [#350](https://github.com/paritytech/parity/pull/350)
+- License [#354](https://github.com/paritytech/parity/pull/354)
+- Performance optimizations [#353](https://github.com/paritytech/parity/pull/353)
+- Gitter in README. [#355](https://github.com/paritytech/parity/pull/355)
+- test efforts, receipt requests [#352](https://github.com/paritytech/parity/pull/352)
+- sync tests setup & local module coverage [#348](https://github.com/paritytech/parity/pull/348)
+- install parity script [#347](https://github.com/paritytech/parity/pull/347)
+- evmjit homestead merge [#342](https://github.com/paritytech/parity/pull/342)
+- Fixed sync stalling on fork [#343](https://github.com/paritytech/parity/pull/343)
+- Remerge 264 [#334](https://github.com/paritytech/parity/pull/334)
+- Ethsync tests bfix [#339](https://github.com/paritytech/parity/pull/339)
+- Fix default options. [#335](https://github.com/paritytech/parity/pull/335)
+- sync queue limit hotfix [#338](https://github.com/paritytech/parity/pull/338)
+- Network tests, separate local coverage for utils [#333](https://github.com/paritytech/parity/pull/333)
+- fix parity version so netstats can parse it [#332](https://github.com/paritytech/parity/pull/332)
+- reveal surprise [#331](https://github.com/paritytech/parity/pull/331)
+- Revert removal of `new_code`. [#330](https://github.com/paritytech/parity/pull/330)
+- Network mod tests first part [#329](https://github.com/paritytech/parity/pull/329)
+- Look ma no `dead_code` [#323](https://github.com/paritytech/parity/pull/323)
+- Fixing JIT, Updating hook to run `ethcore` tests. [#326](https://github.com/paritytech/parity/pull/326)
+- Final docs [#327](https://github.com/paritytech/parity/pull/327)
+- update install-deps.sh [#316](https://github.com/paritytech/parity/pull/316)
+- Finish all my docs. Fix previous test compilation. [#320](https://github.com/paritytech/parity/pull/320)
+- Additional evm tests (extops, call, jumps) and some docs [#317](https://github.com/paritytech/parity/pull/317)
+- More documentation. [#318](https://github.com/paritytech/parity/pull/318)
+- Additional documentation. [#315](https://github.com/paritytech/parity/pull/315)
+- unused functions cleanup [#310](https://github.com/paritytech/parity/pull/310)
+- update ethcore.github.io documentation automatically [#311](https://github.com/paritytech/parity/pull/311)
+- Another try with travis ci credentials [#314](https://github.com/paritytech/parity/pull/314)
+- Document some stuff. [#309](https://github.com/paritytech/parity/pull/309)
+- Check block parent on import; Peer timeouts [#303](https://github.com/paritytech/parity/pull/303)
+- Increasing coverage for evm. [#306](https://github.com/paritytech/parity/pull/306)
+- ethcore docs [#301](https://github.com/paritytech/parity/pull/301)
+- Replacing secure token for deployment [#305](https://github.com/paritytech/parity/pull/305)
+- doc.sh [#299](https://github.com/paritytech/parity/pull/299)
+- Building beta-* and stable-* tags [#302](https://github.com/paritytech/parity/pull/302)
+- Deploying artifacts for tags (release/beta) [#300](https://github.com/paritytech/parity/pull/300)
+- cov.sh to show coverage locally [#298](https://github.com/paritytech/parity/pull/298)
+- benchmark fixes [#297](https://github.com/paritytech/parity/pull/297)
+- Include JSONRPC CLI options. [#296](https://github.com/paritytech/parity/pull/296)
+- travis.yml fixes [#293](https://github.com/paritytech/parity/pull/293)
+- Improve version string. [#295](https://github.com/paritytech/parity/pull/295)
+- Fixed block queue test [#294](https://github.com/paritytech/parity/pull/294)
+- Util docs [#292](https://github.com/paritytech/parity/pull/292)
+- fixed building docs [#289](https://github.com/paritytech/parity/pull/289)
+- update travis to build PRs only against master [#290](https://github.com/paritytech/parity/pull/290)
+- Coverage effort [#272](https://github.com/paritytech/parity/pull/272)
+- updated docker containers [#288](https://github.com/paritytech/parity/pull/288)
+- rpc module fixes [#287](https://github.com/paritytech/parity/pull/287)
+- Test for Receipt RLP. [#282](https://github.com/paritytech/parity/pull/282)
+- Building from source guide [#284](https://github.com/paritytech/parity/pull/284)
+- Fixed neted empty list RLP encoding [#283](https://github.com/paritytech/parity/pull/283)
+- Fix CALLDATACOPY (and bonus CODECOPY, too!). [#279](https://github.com/paritytech/parity/pull/279)
+- added travis && coveralls badge to README.md [#280](https://github.com/paritytech/parity/pull/280)
+- coveralls coverage [#277](https://github.com/paritytech/parity/pull/277)
+- Travis [in progress] [#257](https://github.com/paritytech/parity/pull/257)
+- Travis on reorganized repo [#276](https://github.com/paritytech/parity/pull/276)
+- umbrella project [#275](https://github.com/paritytech/parity/pull/275)
+- Ethash disk cache [#273](https://github.com/paritytech/parity/pull/273)
+- Parity executable name and version [#274](https://github.com/paritytech/parity/pull/274)
+- Dockerfile [#195](https://github.com/paritytech/parity/pull/195)
+- Garbage collection test fix [#267](https://github.com/paritytech/parity/pull/267)
+- Fix stCallCreateCallCodeTest, add more tests [#271](https://github.com/paritytech/parity/pull/271)
+- Moved sync out of ethcore crate; Added block validation [#265](https://github.com/paritytech/parity/pull/265)
+- RLP encoder refactoring [#252](https://github.com/paritytech/parity/pull/252)
+- Chain sync tests and minor refactoring [#264](https://github.com/paritytech/parity/pull/264)
+- Common log init function [#263](https://github.com/paritytech/parity/pull/263)
+- changed max vm depth from 128 to 64, change homestead block to 1_000_000 [#262](https://github.com/paritytech/parity/pull/262)
+- fixed blockchain tests crash on log init [#261](https://github.com/paritytech/parity/pull/261)
+- Blockchain tests and some helpers for guarding temp directory [#256](https://github.com/paritytech/parity/pull/256)
+- Fix logging and random tests. [#260](https://github.com/paritytech/parity/pull/260)
+- Fix difficulty calculation algo. [#259](https://github.com/paritytech/parity/pull/259)
+- fix submodule version [#258](https://github.com/paritytech/parity/pull/258)
+- temp dir spawn refactoring [#246](https://github.com/paritytech/parity/pull/246)
+- fixed tests submodule branch [#254](https://github.com/paritytech/parity/pull/254)
+- rpc net methods returns real peer count && protocol version [#253](https://github.com/paritytech/parity/pull/253)
+- Add homestead & random tests. [#245](https://github.com/paritytech/parity/pull/245)
+- Fixing suicide with self-refund to be consistent with CPP. [#247](https://github.com/paritytech/parity/pull/247)
+- stubs for rpc methods [#251](https://github.com/paritytech/parity/pull/251)
+- clippy, missing docs, renaming etc. [#244](https://github.com/paritytech/parity/pull/244)
+- impl missing methods in tests [#243](https://github.com/paritytech/parity/pull/243)
+- General tests and some helpers [#239](https://github.com/paritytech/parity/pull/239)
+- Note additional tests are fixed, fix doc test. [#242](https://github.com/paritytech/parity/pull/242)
+- jsonrpc http server [#193](https://github.com/paritytech/parity/pull/193)
+- Ethash nonce is H64 not a u64 [#240](https://github.com/paritytech/parity/pull/240)
+- Fix import for bcMultiChainTest [#236](https://github.com/paritytech/parity/pull/236)
+- Client basic tests [#232](https://github.com/paritytech/parity/pull/232)
+- Fix ensure_db_good() and flush_queue(), block refactoring, check block format, be strict. [#231](https://github.com/paritytech/parity/pull/231)
+- Rlp [#207](https://github.com/paritytech/parity/pull/207)
+- Schedule documentation [#219](https://github.com/paritytech/parity/pull/219)
+- U256<->H256 Conversion [#206](https://github.com/paritytech/parity/pull/206)
+- Spawning new thread when we are reaching stack limit [#217](https://github.com/paritytech/parity/pull/217)
+- Blockchain tests [#211](https://github.com/paritytech/parity/pull/211)
+- fixed failing sync test [#218](https://github.com/paritytech/parity/pull/218)
+- Removing println [#216](https://github.com/paritytech/parity/pull/216)
+- Cleaning readme [#212](https://github.com/paritytech/parity/pull/212)
+- Fixing delegatecall [#196](https://github.com/paritytech/parity/pull/196)
+- Autogenerate the Args from the docopt macro. [#205](https://github.com/paritytech/parity/pull/205)
+- Networking fixes [#202](https://github.com/paritytech/parity/pull/202)
+- Argument parsing from CLI [#204](https://github.com/paritytech/parity/pull/204)
+- Removed wildcard from clippy version [#203](https://github.com/paritytech/parity/pull/203)
+- Fixed tests and tweaked sync progress report [#201](https://github.com/paritytech/parity/pull/201)
+- Heavy tests [#199](https://github.com/paritytech/parity/pull/199)
+- Mutithreaded IO [#198](https://github.com/paritytech/parity/pull/198)
+- Populating last_hashes [#197](https://github.com/paritytech/parity/pull/197)
+- Fixing clippy stuff [#170](https://github.com/paritytech/parity/pull/170)
+- basic .travis.yml [#194](https://github.com/paritytech/parity/pull/194)
+- Generating coverage reports. [#190](https://github.com/paritytech/parity/pull/190)
+- Adding doc requests comments [#192](https://github.com/paritytech/parity/pull/192)
+- moved src/bin/client.rs -> src/bin/client/main.rs [#185](https://github.com/paritytech/parity/pull/185)
+- removed overflowing_shr [#188](https://github.com/paritytech/parity/pull/188)
+- fixed wrapping ops on latest nightly [#187](https://github.com/paritytech/parity/pull/187)
+- Pruned state DB [#176](https://github.com/paritytech/parity/pull/176)
+- Memory management for cache [#180](https://github.com/paritytech/parity/pull/180)
+- Implement signs having low-s. [#183](https://github.com/paritytech/parity/pull/183)
+- Introduce sha3 crate and use it in ethash [#178](https://github.com/paritytech/parity/pull/178)
+- Multithreaded block queue [#173](https://github.com/paritytech/parity/pull/173)
+- Iterator for NibbleSlice and TrieDB. [#171](https://github.com/paritytech/parity/pull/171)
+- Handling all possible overflows [#145](https://github.com/paritytech/parity/pull/145)
+- Global secp256k1 context [#164](https://github.com/paritytech/parity/pull/164)
+- Ethash [#152](https://github.com/paritytech/parity/pull/152)
+- Move util into here [#153](https://github.com/paritytech/parity/pull/153)
+- EVM Interpreter [#103](https://github.com/paritytech/parity/pull/103)
+- Homestead transition support, maybe. [#141](https://github.com/paritytech/parity/pull/141)
+- externalities refactor [#131](https://github.com/paritytech/parity/pull/131)
+- More open files. [#140](https://github.com/paritytech/parity/pull/140)
+- Single array for logs output. [#133](https://github.com/paritytech/parity/pull/133)
+- Client app event handler [#132](https://github.com/paritytech/parity/pull/132)
+- Various consensus fixes. [#130](https://github.com/paritytech/parity/pull/130)
+- callcode builtins tests pass [#127](https://github.com/paritytech/parity/pull/127)
+- Client state syncing [#119](https://github.com/paritytech/parity/pull/119)
+- Split externalities from executive. [#126](https://github.com/paritytech/parity/pull/126)
+- executive error on not enoguh base gas [#124](https://github.com/paritytech/parity/pull/124)
+- Gav [#125](https://github.com/paritytech/parity/pull/125)
+- builtin sets excepted to true [#123](https://github.com/paritytech/parity/pull/123)
+- More state tests. [#122](https://github.com/paritytech/parity/pull/122)
+- updated to rocksdb wrapper version 0.3 [#121](https://github.com/paritytech/parity/pull/121)
+- out_of_gas -> excepted [#120](https://github.com/paritytech/parity/pull/120)
+- Parametrizing evm::Factory [#111](https://github.com/paritytech/parity/pull/111)
+- stLogs tests passing [#118](https://github.com/paritytech/parity/pull/118)
+- Fix executive. [#117](https://github.com/paritytech/parity/pull/117)
+- Fixes for marek's shooting from the hip. [#116](https://github.com/paritytech/parity/pull/116)
+- Executive revert fix [#115](https://github.com/paritytech/parity/pull/115)
+- Fix storage/account and add butress test. [#114](https://github.com/paritytech/parity/pull/114)
+- Refactored Pod & Diff types into separate files, JSON infrastructure revamp. [#113](https://github.com/paritytech/parity/pull/113)
+- Fix storage stuff and introduce per-item dirty-tracking. [#112](https://github.com/paritytech/parity/pull/112)
+- Check logs in state tests. [#109](https://github.com/paritytech/parity/pull/109)
+- executive gas calculation fixes [#108](https://github.com/paritytech/parity/pull/108)
+- proper gas calculation in executive [#107](https://github.com/paritytech/parity/pull/107)
+- Fixing MaxDepth param for executive [#105](https://github.com/paritytech/parity/pull/105)
+- Fix determination of state roots. [#106](https://github.com/paritytech/parity/pull/106)
+- transact substracts tx_gas [#104](https://github.com/paritytech/parity/pull/104)
+- Pretty-print and fix for state. [#102](https://github.com/paritytech/parity/pull/102)
+- Tier step price. [#101](https://github.com/paritytech/parity/pull/101)
+- Refactor Diff datastructures. [#100](https://github.com/paritytech/parity/pull/100)
+- externalities use u256 instead of u64 for gas calculation [#99](https://github.com/paritytech/parity/pull/99)
+- Executive tests [#97](https://github.com/paritytech/parity/pull/97)
+- State conensus tests now print mismatching diff on fail. [#98](https://github.com/paritytech/parity/pull/98)
+- State testing framework. First test is failing. [#96](https://github.com/paritytech/parity/pull/96)
+- executive tests [#95](https://github.com/paritytech/parity/pull/95)
+- Use U512s for ether cost calculation, complete transaction API [#94](https://github.com/paritytech/parity/pull/94)
+- Utils for consensus test decoding and better layout. [#93](https://github.com/paritytech/parity/pull/93)
+- executive fixes + tests [#89](https://github.com/paritytech/parity/pull/89)
+- All transaction tests pass. Nicer testing framework. [#92](https://github.com/paritytech/parity/pull/92)
+- Block verification tests; BlockProvider blockchain trait for testing [#88](https://github.com/paritytech/parity/pull/88)
+- State::exists, docs and tests. [#87](https://github.com/paritytech/parity/pull/87)
+- Add tests module, add two more transaction tests. [#86](https://github.com/paritytech/parity/pull/86)
+- bring back removed tests, removed build warnings [#82](https://github.com/paritytech/parity/pull/82)
+- Nicer transaction validation API. Nicer OutOfBounds API in general. [#85](https://github.com/paritytech/parity/pull/85)
+- Transaction fixes and consensus tests (all passing) [#84](https://github.com/paritytech/parity/pull/84)
+- fixed getting block info in evmjit + tests [#81](https://github.com/paritytech/parity/pull/81)
+- evm tests cleanup [#80](https://github.com/paritytech/parity/pull/80)
+- renamed VmFactory -> Factory [#77](https://github.com/paritytech/parity/pull/77)
+- fixed rust-evmjit description of improper_ctypes usage [#76](https://github.com/paritytech/parity/pull/76)
+- jit feature enabled by default [#75](https://github.com/paritytech/parity/pull/75)
+- evm [#52](https://github.com/paritytech/parity/pull/52)
+- state clone [#74](https://github.com/paritytech/parity/pull/74)
+- Block Verification (no tests yet) [#72](https://github.com/paritytech/parity/pull/72)
+- Improvements to LogEntry and Transaction [#73](https://github.com/paritytech/parity/pull/73)
+- Use getter in header in preparation for a Header trait; additional testing in enact_block(). [#64](https://github.com/paritytech/parity/pull/64)
+- BlockChain sync and Client app [#55](https://github.com/paritytech/parity/pull/55)
+- Block enactment (including test) [#63](https://github.com/paritytech/parity/pull/63)
+- Block complete. Needs tests. [#62](https://github.com/paritytech/parity/pull/62)
+- More on OpenBlock::close; State::kill_account added [#61](https://github.com/paritytech/parity/pull/61)
+- Remove genesis module, add more chain specs and separate out ethereum-specific stuff [#60](https://github.com/paritytech/parity/pull/60)
+- State::new_contract, camelCase engine params, missing param [#59](https://github.com/paritytech/parity/pull/59)
+- Use reorganisation [#58](https://github.com/paritytech/parity/pull/58)
+- Initial Ethash/Block skeleton implementations. [#57](https://github.com/paritytech/parity/pull/57)
+- Spec with tested Morden genesis decoder and builtins. [#54](https://github.com/paritytech/parity/pull/54)
+- Move all chain parameters into `engine_params` [#50](https://github.com/paritytech/parity/pull/50)
+- jit ffi improvements [please review] [#51](https://github.com/paritytech/parity/pull/51)
+- blockchain [please review] [#34](https://github.com/paritytech/parity/pull/34)
+- Move information from networkparams.rs into spec.rs [#48](https://github.com/paritytech/parity/pull/48)
+- Move bulking out in Engine/Params. [#47](https://github.com/paritytech/parity/pull/47)
+- Removed need for mutation in State. [#46](https://github.com/paritytech/parity/pull/46)
+- State::code and State::storage_at + tests. [#45](https://github.com/paritytech/parity/pull/45)
+- State functions for balance and nonce operations [#44](https://github.com/paritytech/parity/pull/44)
+- Account::storage_at, Account::ensure_cached and tests. [#43](https://github.com/paritytech/parity/pull/43)
+- Additional tests. [#42](https://github.com/paritytech/parity/pull/42)
+- seal todo done [#41](https://github.com/paritytech/parity/pull/41)
+- missing rustc_serialize crate && rlp `as_list` function [#40](https://github.com/paritytech/parity/pull/40)
+- More methods in Account, documentation and tests. [#39](https://github.com/paritytech/parity/pull/39)
+- Minor reworking of Account. [#38](https://github.com/paritytech/parity/pull/38)
+- Add Account and State classes. [#37](https://github.com/paritytech/parity/pull/37)
+- Revert regressions [#36](https://github.com/paritytech/parity/pull/36)

docs/CHANGELOG-1.0.md

@@ -1,29 +1,29 @@
 Note: Parity 1.0 reached End-of-Life on 2016-06-24 (EOL).
 
-## Parity [v1.0.2](https://github.com/openethereum/openethereum/releases/tag/v1.0.2) (2016-04-11)
+## Parity [v1.0.2](https://github.com/paritytech/parity/releases/tag/v1.0.2) (2016-04-11)
 
 Parity 1.0.2 release improves Json RPC compatibility and fixes a number of stability issues.
 
-- Flush password prompt [#1031](https://github.com/openethereum/openethereum/pull/1031)
-- [beta] dependencies update [#949](https://github.com/openethereum/openethereum/pull/949)
-- Master to beta v1.0.2 [#922](https://github.com/openethereum/openethereum/pull/922)
-- Master to beta 1.0.2 [#908](https://github.com/openethereum/openethereum/pull/908)
+- Flush password prompt [#1031](https://github.com/paritytech/parity/pull/1031)
+- [beta] dependencies update [#949](https://github.com/paritytech/parity/pull/949)
+- Master to beta v1.0.2 [#922](https://github.com/paritytech/parity/pull/922)
+- Master to beta 1.0.2 [#908](https://github.com/paritytech/parity/pull/908)
 
-## Parity [v1.0.1](https://github.com/openethereum/openethereum/releases/tag/v1.0.1) (2016-03-28)
+## Parity [v1.0.1](https://github.com/paritytech/parity/releases/tag/v1.0.1) (2016-03-28)
 
 Parity 1.0.1 update fixes a number of issues with Json RPC, transaction propagation and syncing.
 
-- Imporved sync error handling [#905](https://github.com/openethereum/openethereum/pull/905)
-- Publish locally-made transactions to peers. [#851](https://github.com/openethereum/openethereum/pull/851)
-- Merge fixes from master to beta [#845](https://github.com/openethereum/openethereum/pull/845)
-- Full sync restart on bad block [#844](https://github.com/openethereum/openethereum/pull/844)
-- Make BlockNumber optional, fix eth_call [#828](https://github.com/openethereum/openethereum/pull/828)
-- Web3sha3 beta [#826](https://github.com/openethereum/openethereum/pull/826)
-- Use network id for the web3_net_version return. [#821](https://github.com/openethereum/openethereum/pull/821)
-- Fix mining from spinning [#806](https://github.com/openethereum/openethereum/pull/806)
-- Merge master to beta [#796](https://github.com/openethereum/openethereum/pull/796)
+- Imporved sync error handling [#905](https://github.com/paritytech/parity/pull/905)
+- Publish locally-made transactions to peers. [#851](https://github.com/paritytech/parity/pull/851)
+- Merge fixes from master to beta [#845](https://github.com/paritytech/parity/pull/845)
+- Full sync restart on bad block [#844](https://github.com/paritytech/parity/pull/844)
+- Make BlockNumber optional, fix eth_call [#828](https://github.com/paritytech/parity/pull/828)
+- Web3sha3 beta [#826](https://github.com/paritytech/parity/pull/826)
+- Use network id for the web3_net_version return. [#821](https://github.com/paritytech/parity/pull/821)
+- Fix mining from spinning [#806](https://github.com/paritytech/parity/pull/806)
+- Merge master to beta [#796](https://github.com/paritytech/parity/pull/796)
 
-## Parity [v1.0.0](https://github.com/openethereum/openethereum/releases/tag/v1.0.0) (2016-03-24)
+## Parity [v1.0.0](https://github.com/paritytech/parity/releases/tag/v1.0.0) (2016-03-24)
 
 Parity 1.0.0 release adds the following features:
 
@@ -41,277 +41,277 @@ Parity 1.0.0 release adds the following features:
 
 Note that in this release the state database is in archive (full) mode by default. Run with one of the `--pruning` options to enable pruning.
 
-- First part of multi-mining support [#804](https://github.com/openethereum/openethereum/pull/804)
-- Fixing future-current transactions clash [#802](https://github.com/openethereum/openethereum/pull/802)
-- Increase threads to num_cpus & fix author reporting [#800](https://github.com/openethereum/openethereum/pull/800)
-- another batch of rpc improvements [#798](https://github.com/openethereum/openethereum/pull/798)
-- Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. [#794](https://github.com/openethereum/openethereum/pull/794)
-- complete getting started steps for OS X [#793](https://github.com/openethereum/openethereum/pull/793)
-- Auto detect available port (with fixed test) [#788](https://github.com/openethereum/openethereum/pull/788)
-- eth_getTransactionReceipt [#792](https://github.com/openethereum/openethereum/pull/792)
-- Comprehensive tests for tracing transactions [#791](https://github.com/openethereum/openethereum/pull/791)
-- Disable preparing work package if miners don't ask for it. [#771](https://github.com/openethereum/openethereum/pull/771)
-- Listen on all interfaces for JSONRPC by default. [#786](https://github.com/openethereum/openethereum/pull/786)
-- eth_call [#783](https://github.com/openethereum/openethereum/pull/783)
-- Revert "Auto detect available port" [#789](https://github.com/openethereum/openethereum/pull/789)
-- added output to execution result [#777](https://github.com/openethereum/openethereum/pull/777)
-- Auto detect available port [#782](https://github.com/openethereum/openethereum/pull/782)
-- Allow 0x prefix for --author. [#785](https://github.com/openethereum/openethereum/pull/785)
-- updated dependencies, moved rpctest to its own submodule [#784](https://github.com/openethereum/openethereum/pull/784)
-- use ethjson module to load chain json tests [#778](https://github.com/openethereum/openethereum/pull/778)
-- Tracing implemented. [#772](https://github.com/openethereum/openethereum/pull/772)
-- test ethjson module on travis [#780](https://github.com/openethereum/openethereum/pull/780)
-- batch of rpc fixes [#775](https://github.com/openethereum/openethereum/pull/775)
-- rpctest executable [#757](https://github.com/openethereum/openethereum/pull/757)
-- Refactoring error transaction_queue error handling and `update_sealing` method. [#753](https://github.com/openethereum/openethereum/pull/753)
-- Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue [#760](https://github.com/openethereum/openethereum/pull/760)
-- Removing transactions that failed to be pushed to block. [#752](https://github.com/openethereum/openethereum/pull/752)
-- Updating clippy [#766](https://github.com/openethereum/openethereum/pull/766)
-- Attempting to add all transactions to mined block [#754](https://github.com/openethereum/openethereum/pull/754)
-- Prettier version w/o git dir; Use rustc compile time version [#761](https://github.com/openethereum/openethereum/pull/761)
-- Stop adding transactions to queue while not fully synced [#751](https://github.com/openethereum/openethereum/pull/751)
-- Verify sender's balance before importing transaction to queue [#746](https://github.com/openethereum/openethereum/pull/746)
-- Returning number of transactions pending in block not queue [#750](https://github.com/openethereum/openethereum/pull/750)
-- Speeding up build [#733](https://github.com/openethereum/openethereum/pull/733)
-- adding check for a sync when giving work to miner [#742](https://github.com/openethereum/openethereum/pull/742)
-- json deserialization module [#745](https://github.com/openethereum/openethereum/pull/745)
-- Update install-parity.sh [#749](https://github.com/openethereum/openethereum/pull/749)
-- Restart sync on getting old unknown header [#747](https://github.com/openethereum/openethereum/pull/747)
-- Missing return for #737 [#744](https://github.com/openethereum/openethereum/pull/744)
-- Enact block with uncles test [#741](https://github.com/openethereum/openethereum/pull/741)
-- Fix outdated libc version on dependency [#740](https://github.com/openethereum/openethereum/pull/740)
-- Fixing possible race in transaction queue [#735](https://github.com/openethereum/openethereum/pull/735)
-- Sync fixed again [#737](https://github.com/openethereum/openethereum/pull/737)
-- Don't change best block until extras is committed. [#734](https://github.com/openethereum/openethereum/pull/734)
-- stable only until travis speedup [#736](https://github.com/openethereum/openethereum/pull/736)
-- Optimizing uint operations (architecture independent) [#629](https://github.com/openethereum/openethereum/pull/629)
-- Add RLP, not a data item. [#725](https://github.com/openethereum/openethereum/pull/725)
-- PV63 receipts response [#687](https://github.com/openethereum/openethereum/pull/687)
-- another batch of rpc tests [#723](https://github.com/openethereum/openethereum/pull/723)
-- dockerfiles update [#726](https://github.com/openethereum/openethereum/pull/726)
-- Lock reports to avoid out of order badness. [#721](https://github.com/openethereum/openethereum/pull/721)
-- Fixed handshake leak [#722](https://github.com/openethereum/openethereum/pull/722)
-- Allow configuration of target gas limit. [#719](https://github.com/openethereum/openethereum/pull/719)
-- Version 1.1 in master [#714](https://github.com/openethereum/openethereum/pull/714)
-- Silence UDP warnings [#720](https://github.com/openethereum/openethereum/pull/720)
-- Rpc personal tests [#715](https://github.com/openethereum/openethereum/pull/715)
-- Fixing warnings [#704](https://github.com/openethereum/openethereum/pull/704)
-- docopts cleanups [#713](https://github.com/openethereum/openethereum/pull/713)
-- Removed rocksdb build dependency [#717](https://github.com/openethereum/openethereum/pull/717)
-- Fixed splitting Neighbours packet [#710](https://github.com/openethereum/openethereum/pull/710)
-- management of account expiration & memory [#701](https://github.com/openethereum/openethereum/pull/701)
-- Remove EarlyMerge from user docs. [#708](https://github.com/openethereum/openethereum/pull/708)
-- Fixes and traces for refcountdb. [#705](https://github.com/openethereum/openethereum/pull/705)
-- Check for NULL_RLP in AccountDB [#706](https://github.com/openethereum/openethereum/pull/706)
-- ethminer as crate [#700](https://github.com/openethereum/openethereum/pull/700)
-- Old ref-counted DB code [#692](https://github.com/openethereum/openethereum/pull/692)
-- next batch of rpc tests and fixes [#699](https://github.com/openethereum/openethereum/pull/699)
-- implemented eth_geStorageAt rpc method, added more tests for rpc [#695](https://github.com/openethereum/openethereum/pull/695)
-- Fix JournalDB era marker [#690](https://github.com/openethereum/openethereum/pull/690)
-- More sync fixes [#685](https://github.com/openethereum/openethereum/pull/685)
-- mark some key tests as heavy [#694](https://github.com/openethereum/openethereum/pull/694)
-- Limit incoming connections [#693](https://github.com/openethereum/openethereum/pull/693)
-- Updating clippy [#688](https://github.com/openethereum/openethereum/pull/688)
-- eth_accounts, eth_getBalance rpc functions && tests [#691](https://github.com/openethereum/openethereum/pull/691)
-- state query for archive jdb [#683](https://github.com/openethereum/openethereum/pull/683)
-- Fix for option 1 of JournalDB [#658](https://github.com/openethereum/openethereum/pull/658)
-- Rename into something that is a little more descriptive. [#689](https://github.com/openethereum/openethereum/pull/689)
-- JournalDB with in-memory overlay (option2) [#634](https://github.com/openethereum/openethereum/pull/634)
-- additional (failing) SecretStore test [#682](https://github.com/openethereum/openethereum/pull/682)
-- Updating clippy & fixing warnings. [#670](https://github.com/openethereum/openethereum/pull/670)
-- rpc web3 tests [#681](https://github.com/openethereum/openethereum/pull/681)
-- Making personal json-rpc configurable via cli [#677](https://github.com/openethereum/openethereum/pull/677)
-- RPC Pending Transactions Filter [#661](https://github.com/openethereum/openethereum/pull/661)
-- Rearrange journaldb infrastructure to make more extensible [#678](https://github.com/openethereum/openethereum/pull/678)
-- JournalDB -> Box<JournalDB>, and it's a trait. [#673](https://github.com/openethereum/openethereum/pull/673)
-- fix warning for transaction_queue.add usage [#676](https://github.com/openethereum/openethereum/pull/676)
-- Adding std::mem back (only for asm) [#680](https://github.com/openethereum/openethereum/pull/680)
-- update readme to exclude beta step (stable is ok) [#679](https://github.com/openethereum/openethereum/pull/679)
-- fixed U256 and transaction request deserialization [#675](https://github.com/openethereum/openethereum/pull/675)
-- More geth compatibility. [#666](https://github.com/openethereum/openethereum/pull/666)
-- Removing running clippy by default on nightly. [#671](https://github.com/openethereum/openethereum/pull/671)
-- rpc net submodule tests [#667](https://github.com/openethereum/openethereum/pull/667)
-- Client module overhaul [#665](https://github.com/openethereum/openethereum/pull/665)
-- Rpc transaction signing [#587](https://github.com/openethereum/openethereum/pull/587)
-- Transaction queue exposed via JSON rpc. [#652](https://github.com/openethereum/openethereum/pull/652)
-- Remove unneeded locking [#499](https://github.com/openethereum/openethereum/pull/499)
-- extend sync status interface to sync provider [#664](https://github.com/openethereum/openethereum/pull/664)
-- --archive is default. --pruning is option. [#663](https://github.com/openethereum/openethereum/pull/663)
-- jsonrpc uses client and sync interfaces [#641](https://github.com/openethereum/openethereum/pull/641)
-- Expose transaction insertion in sync lib [#609](https://github.com/openethereum/openethereum/pull/609)
-- Removing get prefix from poll_info [#660](https://github.com/openethereum/openethereum/pull/660)
-- Tx queue update height bug [#657](https://github.com/openethereum/openethereum/pull/657)
-- Tx_queue_docs -> To master [#651](https://github.com/openethereum/openethereum/pull/651)
-- blockchain import_route [#645](https://github.com/openethereum/openethereum/pull/645)
-- Stop workers before stopping event loop [#655](https://github.com/openethereum/openethereum/pull/655)
-- Validate sender before importing to queue [#650](https://github.com/openethereum/openethereum/pull/650)
-- Gas price threshold for transactions [#640](https://github.com/openethereum/openethereum/pull/640)
-- `dev` feature enabled when compiling without `--release` [#627](https://github.com/openethereum/openethereum/pull/627)
-- Don't call mark_as_bad needlessly [#648](https://github.com/openethereum/openethereum/pull/648)
-- Fixed sync handling large forks [#647](https://github.com/openethereum/openethereum/pull/647)
-- Additional documentation for transaction queue [#631](https://github.com/openethereum/openethereum/pull/631)
-- Transaction Queue Integration [#607](https://github.com/openethereum/openethereum/pull/607)
-- Keys cli [#639](https://github.com/openethereum/openethereum/pull/639)
-- fix build warning [#643](https://github.com/openethereum/openethereum/pull/643)
-- updated jsonrpc-core and http-server libs [#642](https://github.com/openethereum/openethereum/pull/642)
-- jsonrpc panics gracefully shutdown client [#638](https://github.com/openethereum/openethereum/pull/638)
-- Fixing CLI parameters [#633](https://github.com/openethereum/openethereum/pull/633)
-- Normal CLI options with geth. [#628](https://github.com/openethereum/openethereum/pull/628)
-- Do not remove the peer immediatelly on send error [#626](https://github.com/openethereum/openethereum/pull/626)
-- Jsonrpc block behind [#622](https://github.com/openethereum/openethereum/pull/622)
-- Remove println!s. [#624](https://github.com/openethereum/openethereum/pull/624)
-- JournalDB option 1 fix [#613](https://github.com/openethereum/openethereum/pull/613)
-- Network tracing cleanup [#611](https://github.com/openethereum/openethereum/pull/611)
-- Revert "Transaction Queue integration" [#602](https://github.com/openethereum/openethereum/pull/602)
-- fix benches compilation [#601](https://github.com/openethereum/openethereum/pull/601)
-- Transaction Queue integration [#595](https://github.com/openethereum/openethereum/pull/595)
-- verifier trait improvements [#597](https://github.com/openethereum/openethereum/pull/597)
-- build on rust stable [#600](https://github.com/openethereum/openethereum/pull/600)
-- Geth import silent if no geth [#599](https://github.com/openethereum/openethereum/pull/599)
-- Additional journaldb logging and assert [#593](https://github.com/openethereum/openethereum/pull/593)
-- Uncle inclusion in block authoring. [#578](https://github.com/openethereum/openethereum/pull/578)
-- Fixed potential deadlock on startup [#592](https://github.com/openethereum/openethereum/pull/592)
-- Fixing an overflow panic [#591](https://github.com/openethereum/openethereum/pull/591)
-- Fixed one more case of sync stalling [#590](https://github.com/openethereum/openethereum/pull/590)
-- JournalDB can now operate in "archive" mode [#589](https://github.com/openethereum/openethereum/pull/589)
-- Secret store integration with client [#586](https://github.com/openethereum/openethereum/pull/586)
-- fix build on nightly rust [#588](https://github.com/openethereum/openethereum/pull/588)
-- deserialization for uint generic [#585](https://github.com/openethereum/openethereum/pull/585)
-- TransactionsQueue implementation [#559](https://github.com/openethereum/openethereum/pull/559)
-- JSON-RPC personal service (follows #582) [#583](https://github.com/openethereum/openethereum/pull/583)
-- making key directory thread-safe [#582](https://github.com/openethereum/openethereum/pull/582)
-- verifier trait [#581](https://github.com/openethereum/openethereum/pull/581)
-- shrink_to_fit after removing hashes. [#580](https://github.com/openethereum/openethereum/pull/580)
-- support for rpc polling [#504](https://github.com/openethereum/openethereum/pull/504)
-- limit serde codegen only to rpc types submodule [#569](https://github.com/openethereum/openethereum/pull/569)
-- fork test for Issue test/568 [#573](https://github.com/openethereum/openethereum/pull/573)
-- Fixing clippy warnings = small refactoring of `request_blocks` [#560](https://github.com/openethereum/openethereum/pull/560)
-- Improved journaldb logging [#571](https://github.com/openethereum/openethereum/pull/571)
-- Additional check to ancient enactments. [#570](https://github.com/openethereum/openethereum/pull/570)
-- chainfilter shouldnt exclude to_block from results [#564](https://github.com/openethereum/openethereum/pull/564)
-- Fix coverage test run [#567](https://github.com/openethereum/openethereum/pull/567)
-- Mining [#547](https://github.com/openethereum/openethereum/pull/547)
-- fix uint warnings [#565](https://github.com/openethereum/openethereum/pull/565)
-- Finished blockchain generator. [#562](https://github.com/openethereum/openethereum/pull/562)
-- fixed broken master [#563](https://github.com/openethereum/openethereum/pull/563)
-- uint to separate crate [#544](https://github.com/openethereum/openethereum/pull/544)
-- improved test chain generator [#554](https://github.com/openethereum/openethereum/pull/554)
-- Fixing spelling in propagade->propagate [#558](https://github.com/openethereum/openethereum/pull/558)
-- Changing RefCell to Cell in transaction. [#557](https://github.com/openethereum/openethereum/pull/557)
-- Fix for morden consensus. [#556](https://github.com/openethereum/openethereum/pull/556)
-- blockchain generator [#550](https://github.com/openethereum/openethereum/pull/550)
-- Sparse Table Implementation (Row, Col) -> Val [#545](https://github.com/openethereum/openethereum/pull/545)
-- fixup install script [#548](https://github.com/openethereum/openethereum/pull/548)
-- Fixing clippy warnings [#546](https://github.com/openethereum/openethereum/pull/546)
-- ignore out directory [#543](https://github.com/openethereum/openethereum/pull/543)
-- u256 full multiplication [#539](https://github.com/openethereum/openethereum/pull/539)
-- Fix panic when downloading stales, update homestead transition [#537](https://github.com/openethereum/openethereum/pull/537)
-- changing x64 asm config [#534](https://github.com/openethereum/openethereum/pull/534)
-- uncomment state transition tests [#533](https://github.com/openethereum/openethereum/pull/533)
-- jsonrpc uses weak pointers to client [#532](https://github.com/openethereum/openethereum/pull/532)
-- Morden switch to Homestead rules at #494,000. [#531](https://github.com/openethereum/openethereum/pull/531)
-- Blockchain module cleanup [#524](https://github.com/openethereum/openethereum/pull/524)
-- Multiplication issue + very exhaustive tests for it [#528](https://github.com/openethereum/openethereum/pull/528)
-- EIP-8 [#498](https://github.com/openethereum/openethereum/pull/498)
-- Make "random" trie tests fully deterministic. [#527](https://github.com/openethereum/openethereum/pull/527)
-- udpated serde to version 0.7.0 [#526](https://github.com/openethereum/openethereum/pull/526)
-- Better memory management [#516](https://github.com/openethereum/openethereum/pull/516)
-- Typo [#523](https://github.com/openethereum/openethereum/pull/523)
-- U512 add/sub optimize [#521](https://github.com/openethereum/openethereum/pull/521)
-- Account management + geth keystore import (no utility crate added) [#509](https://github.com/openethereum/openethereum/pull/509)
-- Delayed UPnP initialization [#505](https://github.com/openethereum/openethereum/pull/505)
-- Fixing marking blocks as bad & SyncMessage bugs + small client refactoring. [#503](https://github.com/openethereum/openethereum/pull/503)
-- optimization of U256 [#515](https://github.com/openethereum/openethereum/pull/515)
-- Removed rocksdb from build scripts and instructions [#520](https://github.com/openethereum/openethereum/pull/520)
-- RocksDB abstraction layer + Hash index for state DB [#464](https://github.com/openethereum/openethereum/pull/464)
-- bloomfilter [#418](https://github.com/openethereum/openethereum/pull/418)
-- Fixed a race condition when connecting peer disconnects immediately [#519](https://github.com/openethereum/openethereum/pull/519)
-- ignore intellij idea project files as well [#518](https://github.com/openethereum/openethereum/pull/518)
-- updated version of unicase [#517](https://github.com/openethereum/openethereum/pull/517)
-- jsonrpc security, cors headers, fixed #359 [#493](https://github.com/openethereum/openethereum/pull/493)
-- Rust implementations to replace data tables (#161) [#482](https://github.com/openethereum/openethereum/pull/482)
-- fix issue with starting requested block number was not included itself [#512](https://github.com/openethereum/openethereum/pull/512)
-- fixed travis --org GH_TOKEN [#510](https://github.com/openethereum/openethereum/pull/510)
-- Improved log format [#506](https://github.com/openethereum/openethereum/pull/506)
-- Log address on failed connection attempt [#502](https://github.com/openethereum/openethereum/pull/502)
-- Bumping clippy and fixing warnings. [#501](https://github.com/openethereum/openethereum/pull/501)
-- Bumping versions. Fixes #496 [#500](https://github.com/openethereum/openethereum/pull/500)
-- Manage final user-input errors. [#494](https://github.com/openethereum/openethereum/pull/494)
-- Remove unneeded code, fix minor potential issue with length. [#495](https://github.com/openethereum/openethereum/pull/495)
-- Remove "unknown" from version string. [#488](https://github.com/openethereum/openethereum/pull/488)
-- Include git commit date & hash. [#486](https://github.com/openethereum/openethereum/pull/486)
-- Use proper version string. [#485](https://github.com/openethereum/openethereum/pull/485)
-- Networking fixes [#480](https://github.com/openethereum/openethereum/pull/480)
-- Fix potential deadlock on node table update [#484](https://github.com/openethereum/openethereum/pull/484)
-- Squash more warnings [#481](https://github.com/openethereum/openethereum/pull/481)
-- dev/test/build tools to separate crate [#477](https://github.com/openethereum/openethereum/pull/477)
-- Back to original slab crate [#479](https://github.com/openethereum/openethereum/pull/479)
-- Better user errors. [#476](https://github.com/openethereum/openethereum/pull/476)
-- UDP Discovery [#440](https://github.com/openethereum/openethereum/pull/440)
-- update readme with rust override [#475](https://github.com/openethereum/openethereum/pull/475)
-- fixed warnings on rust beta [#474](https://github.com/openethereum/openethereum/pull/474)
-- Secret store (part2 - encrypted key/value svc) [#449](https://github.com/openethereum/openethereum/pull/449)
-- Kill bad test. [#473](https://github.com/openethereum/openethereum/pull/473)
-- Make clippy an optional dependency [#422](https://github.com/openethereum/openethereum/pull/422)
-- parity compiling fine [#469](https://github.com/openethereum/openethereum/pull/469)
-- compiling ethcore on beta [#468](https://github.com/openethereum/openethereum/pull/468)
-- Utils compiling in beta [#467](https://github.com/openethereum/openethereum/pull/467)
-- Get rid of lru_cache dependency [#466](https://github.com/openethereum/openethereum/pull/466)
-- Add daemonization. [#459](https://github.com/openethereum/openethereum/pull/459)
-- Master upgrade [#448](https://github.com/openethereum/openethereum/pull/448)
-- Remove contributing stuff now that we have CLA bot. [#447](https://github.com/openethereum/openethereum/pull/447)
-- Add Morden bootnode. [#446](https://github.com/openethereum/openethereum/pull/446)
-- beta fixes to master [#441](https://github.com/openethereum/openethereum/pull/441)
-- Secret store (part1 - key management) [#423](https://github.com/openethereum/openethereum/pull/423)
-- Use 1100000 as the homestead transition, fix build instructions. [#438](https://github.com/openethereum/openethereum/pull/438)
-- More sync and propagation fixes [#420](https://github.com/openethereum/openethereum/pull/420)
-- back to cargo crates [#436](https://github.com/openethereum/openethereum/pull/436)
-- Fixing clippy warnings [#435](https://github.com/openethereum/openethereum/pull/435)
-- preserving root cargo lock [#434](https://github.com/openethereum/openethereum/pull/434)
-- Nightly fix [#432](https://github.com/openethereum/openethereum/pull/432)
-- nightly fixes [#431](https://github.com/openethereum/openethereum/pull/431)
-- Delay Homestead transition from 1,000,000. [#429](https://github.com/openethereum/openethereum/pull/429)
-- Nightly fix effort (still should fail) [#428](https://github.com/openethereum/openethereum/pull/428)
-- clippy version update, docopt-macro moving to fork [#425](https://github.com/openethereum/openethereum/pull/425)
-- Network/Sync fixes and optimizations [#416](https://github.com/openethereum/openethereum/pull/416)
-- Use latest era instead of end era as journal marker [#414](https://github.com/openethereum/openethereum/pull/414)
-- api changes [#402](https://github.com/openethereum/openethereum/pull/402)
-- Option for no init nodes. [#408](https://github.com/openethereum/openethereum/pull/408)
-- Fixed block_bodies not returning a list [#406](https://github.com/openethereum/openethereum/pull/406)
-- Fix test. [#405](https://github.com/openethereum/openethereum/pull/405)
-- Allow path to be configured. [#404](https://github.com/openethereum/openethereum/pull/404)
-- Upnp [#400](https://github.com/openethereum/openethereum/pull/400)
-- eth_syncing, fixed #397 [#398](https://github.com/openethereum/openethereum/pull/398)
-- Using modified version of ctrlc that catches SIGTERM [#399](https://github.com/openethereum/openethereum/pull/399)
-- Catching panics. [#396](https://github.com/openethereum/openethereum/pull/396)
-- jsonrpc [#391](https://github.com/openethereum/openethereum/pull/391)
-- Externalities tests (still clumsy) [#394](https://github.com/openethereum/openethereum/pull/394)
-- excluding test code itself from coverage [#395](https://github.com/openethereum/openethereum/pull/395)
-- Additional tweaks to options. [#390](https://github.com/openethereum/openethereum/pull/390)
-- --chain option for setting which network to go on. [#388](https://github.com/openethereum/openethereum/pull/388)
-- Ethash unit tests final [#387](https://github.com/openethereum/openethereum/pull/387)
-- jsonrpc [#374](https://github.com/openethereum/openethereum/pull/374)
-- Editorconfig file. [#384](https://github.com/openethereum/openethereum/pull/384)
-- Coverage effort [in progress] [#382](https://github.com/openethereum/openethereum/pull/382)
-- making root kcov runner simular to the one running on CI [#380](https://github.com/openethereum/openethereum/pull/380)
-- add gcc as a dependency to dockerfiles [#381](https://github.com/openethereum/openethereum/pull/381)
-- Check for handshake expiration before attempting connection replace [#375](https://github.com/openethereum/openethereum/pull/375)
-- Blocks propagation [#364](https://github.com/openethereum/openethereum/pull/364)
-- Network params. [#376](https://github.com/openethereum/openethereum/pull/376)
-- Add parity-node-zero to bootnodes. [#373](https://github.com/openethereum/openethereum/pull/373)
-- kcov uses travis_job_id instead of coveralls token [#370](https://github.com/openethereum/openethereum/pull/370)
-- Add parity-node-zero.ethcore.io to boot nodes. [#371](https://github.com/openethereum/openethereum/pull/371)
+- First part of multi-mining support [#804](https://github.com/paritytech/parity/pull/804)
+- Fixing future-current transactions clash [#802](https://github.com/paritytech/parity/pull/802)
+- Increase threads to num_cpus & fix author reporting [#800](https://github.com/paritytech/parity/pull/800)
+- another batch of rpc improvements [#798](https://github.com/paritytech/parity/pull/798)
+- Avoid tracing DELEGATECALL and CALLCODE. Plus tests for it. [#794](https://github.com/paritytech/parity/pull/794)
+- complete getting started steps for OS X [#793](https://github.com/paritytech/parity/pull/793)
+- Auto detect available port (with fixed test) [#788](https://github.com/paritytech/parity/pull/788)
+- eth_getTransactionReceipt [#792](https://github.com/paritytech/parity/pull/792)
+- Comprehensive tests for tracing transactions [#791](https://github.com/paritytech/parity/pull/791)
+- Disable preparing work package if miners don't ask for it. [#771](https://github.com/paritytech/parity/pull/771)
+- Listen on all interfaces for JSONRPC by default. [#786](https://github.com/paritytech/parity/pull/786)
+- eth_call [#783](https://github.com/paritytech/parity/pull/783)
+- Revert "Auto detect available port" [#789](https://github.com/paritytech/parity/pull/789)
+- added output to execution result [#777](https://github.com/paritytech/parity/pull/777)
+- Auto detect available port [#782](https://github.com/paritytech/parity/pull/782)
+- Allow 0x prefix for --author. [#785](https://github.com/paritytech/parity/pull/785)
+- updated dependencies, moved rpctest to its own submodule [#784](https://github.com/paritytech/parity/pull/784)
+- use ethjson module to load chain json tests [#778](https://github.com/paritytech/parity/pull/778)
+- Tracing implemented. [#772](https://github.com/paritytech/parity/pull/772)
+- test ethjson module on travis [#780](https://github.com/paritytech/parity/pull/780)
+- batch of rpc fixes [#775](https://github.com/paritytech/parity/pull/775)
+- rpctest executable [#757](https://github.com/paritytech/parity/pull/757)
+- Refactoring error transaction_queue error handling and `update_sealing` method. [#753](https://github.com/paritytech/parity/pull/753)
+- Avoid importing transactions with gas above 1.1*block_gas_limit to transaction queue [#760](https://github.com/paritytech/parity/pull/760)
+- Removing transactions that failed to be pushed to block. [#752](https://github.com/paritytech/parity/pull/752)
+- Updating clippy [#766](https://github.com/paritytech/parity/pull/766)
+- Attempting to add all transactions to mined block [#754](https://github.com/paritytech/parity/pull/754)
+- Prettier version w/o git dir; Use rustc compile time version [#761](https://github.com/paritytech/parity/pull/761)
+- Stop adding transactions to queue while not fully synced [#751](https://github.com/paritytech/parity/pull/751)
+- Verify sender's balance before importing transaction to queue [#746](https://github.com/paritytech/parity/pull/746)
+- Returning number of transactions pending in block not queue [#750](https://github.com/paritytech/parity/pull/750)
+- Speeding up build [#733](https://github.com/paritytech/parity/pull/733)
+- adding check for a sync when giving work to miner [#742](https://github.com/paritytech/parity/pull/742)
+- json deserialization module [#745](https://github.com/paritytech/parity/pull/745)
+- Update install-parity.sh [#749](https://github.com/paritytech/parity/pull/749)
+- Restart sync on getting old unknown header [#747](https://github.com/paritytech/parity/pull/747)
+- Missing return for #737 [#744](https://github.com/paritytech/parity/pull/744)
+- Enact block with uncles test [#741](https://github.com/paritytech/parity/pull/741)
+- Fix outdated libc version on dependency [#740](https://github.com/paritytech/parity/pull/740)
+- Fixing possible race in transaction queue [#735](https://github.com/paritytech/parity/pull/735)
+- Sync fixed again [#737](https://github.com/paritytech/parity/pull/737)
+- Don't change best block until extras is committed. [#734](https://github.com/paritytech/parity/pull/734)
+- stable only until travis speedup [#736](https://github.com/paritytech/parity/pull/736)
+- Optimizing uint operations (architecture independent) [#629](https://github.com/paritytech/parity/pull/629)
+- Add RLP, not a data item. [#725](https://github.com/paritytech/parity/pull/725)
+- PV63 receipts response [#687](https://github.com/paritytech/parity/pull/687)
+- another batch of rpc tests [#723](https://github.com/paritytech/parity/pull/723)
+- dockerfiles update [#726](https://github.com/paritytech/parity/pull/726)
+- Lock reports to avoid out of order badness. [#721](https://github.com/paritytech/parity/pull/721)
+- Fixed handshake leak [#722](https://github.com/paritytech/parity/pull/722)
+- Allow configuration of target gas limit. [#719](https://github.com/paritytech/parity/pull/719)
+- Version 1.1 in master [#714](https://github.com/paritytech/parity/pull/714)
+- Silence UDP warnings [#720](https://github.com/paritytech/parity/pull/720)
+- Rpc personal tests [#715](https://github.com/paritytech/parity/pull/715)
+- Fixing warnings [#704](https://github.com/paritytech/parity/pull/704)
+- docopts cleanups [#713](https://github.com/paritytech/parity/pull/713)
+- Removed rocksdb build dependency [#717](https://github.com/paritytech/parity/pull/717)
+- Fixed splitting Neighbours packet [#710](https://github.com/paritytech/parity/pull/710)
+- management of account expiration & memory [#701](https://github.com/paritytech/parity/pull/701)
+- Remove EarlyMerge from user docs. [#708](https://github.com/paritytech/parity/pull/708)
+- Fixes and traces for refcountdb. [#705](https://github.com/paritytech/parity/pull/705)
+- Check for NULL_RLP in AccountDB [#706](https://github.com/paritytech/parity/pull/706)
+- ethminer as crate [#700](https://github.com/paritytech/parity/pull/700)
+- Old ref-counted DB code [#692](https://github.com/paritytech/parity/pull/692)
+- next batch of rpc tests and fixes [#699](https://github.com/paritytech/parity/pull/699)
+- implemented eth_geStorageAt rpc method, added more tests for rpc [#695](https://github.com/paritytech/parity/pull/695)
+- Fix JournalDB era marker [#690](https://github.com/paritytech/parity/pull/690)
+- More sync fixes [#685](https://github.com/paritytech/parity/pull/685)
+- mark some key tests as heavy [#694](https://github.com/paritytech/parity/pull/694)
+- Limit incoming connections [#693](https://github.com/paritytech/parity/pull/693)
+- Updating clippy [#688](https://github.com/paritytech/parity/pull/688)
+- eth_accounts, eth_getBalance rpc functions && tests [#691](https://github.com/paritytech/parity/pull/691)
+- state query for archive jdb [#683](https://github.com/paritytech/parity/pull/683)
+- Fix for option 1 of JournalDB [#658](https://github.com/paritytech/parity/pull/658)
+- Rename into something that is a little more descriptive. [#689](https://github.com/paritytech/parity/pull/689)
+- JournalDB with in-memory overlay (option2) [#634](https://github.com/paritytech/parity/pull/634)
+- additional (failing) SecretStore test [#682](https://github.com/paritytech/parity/pull/682)
+- Updating clippy & fixing warnings. [#670](https://github.com/paritytech/parity/pull/670)
+- rpc web3 tests [#681](https://github.com/paritytech/parity/pull/681)
+- Making personal json-rpc configurable via cli [#677](https://github.com/paritytech/parity/pull/677)
+- RPC Pending Transactions Filter [#661](https://github.com/paritytech/parity/pull/661)
+- Rearrange journaldb infrastructure to make more extensible [#678](https://github.com/paritytech/parity/pull/678)
+- JournalDB -> Box<JournalDB>, and it's a trait. [#673](https://github.com/paritytech/parity/pull/673)
+- fix warning for transaction_queue.add usage [#676](https://github.com/paritytech/parity/pull/676)
+- Adding std::mem back (only for asm) [#680](https://github.com/paritytech/parity/pull/680)
+- update readme to exclude beta step (stable is ok) [#679](https://github.com/paritytech/parity/pull/679)
+- fixed U256 and transaction request deserialization [#675](https://github.com/paritytech/parity/pull/675)
+- More geth compatibility. [#666](https://github.com/paritytech/parity/pull/666)
+- Removing running clippy by default on nightly. [#671](https://github.com/paritytech/parity/pull/671)
+- rpc net submodule tests [#667](https://github.com/paritytech/parity/pull/667)
+- Client module overhaul [#665](https://github.com/paritytech/parity/pull/665)
+- Rpc transaction signing [#587](https://github.com/paritytech/parity/pull/587)
+- Transaction queue exposed via JSON rpc. [#652](https://github.com/paritytech/parity/pull/652)
+- Remove unneeded locking [#499](https://github.com/paritytech/parity/pull/499)
+- extend sync status interface to sync provider [#664](https://github.com/paritytech/parity/pull/664)
+- --archive is default. --pruning is option. [#663](https://github.com/paritytech/parity/pull/663)
+- jsonrpc uses client and sync interfaces [#641](https://github.com/paritytech/parity/pull/641)
+- Expose transaction insertion in sync lib [#609](https://github.com/paritytech/parity/pull/609)
+- Removing get prefix from poll_info [#660](https://github.com/paritytech/parity/pull/660)
+- Tx queue update height bug [#657](https://github.com/paritytech/parity/pull/657)
+- Tx_queue_docs -> To master [#651](https://github.com/paritytech/parity/pull/651)
+- blockchain import_route [#645](https://github.com/paritytech/parity/pull/645)
+- Stop workers before stopping event loop [#655](https://github.com/paritytech/parity/pull/655)
+- Validate sender before importing to queue [#650](https://github.com/paritytech/parity/pull/650)
+- Gas price threshold for transactions [#640](https://github.com/paritytech/parity/pull/640)
+- `dev` feature enabled when compiling without `--release` [#627](https://github.com/paritytech/parity/pull/627)
+- Don't call mark_as_bad needlessly [#648](https://github.com/paritytech/parity/pull/648)
+- Fixed sync handling large forks [#647](https://github.com/paritytech/parity/pull/647)
+- Additional documentation for transaction queue [#631](https://github.com/paritytech/parity/pull/631)
+- Transaction Queue Integration [#607](https://github.com/paritytech/parity/pull/607)
+- Keys cli [#639](https://github.com/paritytech/parity/pull/639)
+- fix build warning [#643](https://github.com/paritytech/parity/pull/643)
+- updated jsonrpc-core and http-server libs [#642](https://github.com/paritytech/parity/pull/642)
+- jsonrpc panics gracefully shutdown client [#638](https://github.com/paritytech/parity/pull/638)
+- Fixing CLI parameters [#633](https://github.com/paritytech/parity/pull/633)
+- Normal CLI options with geth. [#628](https://github.com/paritytech/parity/pull/628)
+- Do not remove the peer immediatelly on send error [#626](https://github.com/paritytech/parity/pull/626)
+- Jsonrpc block behind [#622](https://github.com/paritytech/parity/pull/622)
+- Remove println!s. [#624](https://github.com/paritytech/parity/pull/624)
+- JournalDB option 1 fix [#613](https://github.com/paritytech/parity/pull/613)
+- Network tracing cleanup [#611](https://github.com/paritytech/parity/pull/611)
+- Revert "Transaction Queue integration" [#602](https://github.com/paritytech/parity/pull/602)
+- fix benches compilation [#601](https://github.com/paritytech/parity/pull/601)
+- Transaction Queue integration [#595](https://github.com/paritytech/parity/pull/595)
+- verifier trait improvements [#597](https://github.com/paritytech/parity/pull/597)
+- build on rust stable [#600](https://github.com/paritytech/parity/pull/600)
+- Geth import silent if no geth [#599](https://github.com/paritytech/parity/pull/599)
+- Additional journaldb logging and assert [#593](https://github.com/paritytech/parity/pull/593)
+- Uncle inclusion in block authoring. [#578](https://github.com/paritytech/parity/pull/578)
+- Fixed potential deadlock on startup [#592](https://github.com/paritytech/parity/pull/592)
+- Fixing an overflow panic [#591](https://github.com/paritytech/parity/pull/591)
+- Fixed one more case of sync stalling [#590](https://github.com/paritytech/parity/pull/590)
+- JournalDB can now operate in "archive" mode [#589](https://github.com/paritytech/parity/pull/589)
+- Secret store integration with client [#586](https://github.com/paritytech/parity/pull/586)
+- fix build on nightly rust [#588](https://github.com/paritytech/parity/pull/588)
+- deserialization for uint generic [#585](https://github.com/paritytech/parity/pull/585)
+- TransactionsQueue implementation [#559](https://github.com/paritytech/parity/pull/559)
+- JSON-RPC personal service (follows #582) [#583](https://github.com/paritytech/parity/pull/583)
+- making key directory thread-safe [#582](https://github.com/paritytech/parity/pull/582)
+- verifier trait [#581](https://github.com/paritytech/parity/pull/581)
+- shrink_to_fit after removing hashes. [#580](https://github.com/paritytech/parity/pull/580)
+- support for rpc polling [#504](https://github.com/paritytech/parity/pull/504)
+- limit serde codegen only to rpc types submodule [#569](https://github.com/paritytech/parity/pull/569)
+- fork test for Issue test/568 [#573](https://github.com/paritytech/parity/pull/573)
+- Fixing clippy warnings = small refactoring of `request_blocks` [#560](https://github.com/paritytech/parity/pull/560)
+- Improved journaldb logging [#571](https://github.com/paritytech/parity/pull/571)
+- Additional check to ancient enactments. [#570](https://github.com/paritytech/parity/pull/570)
+- chainfilter shouldnt exclude to_block from results [#564](https://github.com/paritytech/parity/pull/564)
+- Fix coverage test run [#567](https://github.com/paritytech/parity/pull/567)
+- Mining [#547](https://github.com/paritytech/parity/pull/547)
+- fix uint warnings [#565](https://github.com/paritytech/parity/pull/565)
+- Finished blockchain generator. [#562](https://github.com/paritytech/parity/pull/562)
+- fixed broken master [#563](https://github.com/paritytech/parity/pull/563)
+- uint to separate crate [#544](https://github.com/paritytech/parity/pull/544)
+- improved test chain generator [#554](https://github.com/paritytech/parity/pull/554)
+- Fixing spelling in propagade->propagate [#558](https://github.com/paritytech/parity/pull/558)
+- Changing RefCell to Cell in transaction. [#557](https://github.com/paritytech/parity/pull/557)
+- Fix for morden consensus. [#556](https://github.com/paritytech/parity/pull/556)
+- blockchain generator [#550](https://github.com/paritytech/parity/pull/550)
+- Sparse Table Implementation (Row, Col) -> Val [#545](https://github.com/paritytech/parity/pull/545)
+- fixup install script [#548](https://github.com/paritytech/parity/pull/548)
+- Fixing clippy warnings [#546](https://github.com/paritytech/parity/pull/546)
+- ignore out directory [#543](https://github.com/paritytech/parity/pull/543)
+- u256 full multiplication [#539](https://github.com/paritytech/parity/pull/539)
+- Fix panic when downloading stales, update homestead transition [#537](https://github.com/paritytech/parity/pull/537)
+- changing x64 asm config [#534](https://github.com/paritytech/parity/pull/534)
+- uncomment state transition tests [#533](https://github.com/paritytech/parity/pull/533)
+- jsonrpc uses weak pointers to client [#532](https://github.com/paritytech/parity/pull/532)
+- Morden switch to Homestead rules at #494,000. [#531](https://github.com/paritytech/parity/pull/531)
+- Blockchain module cleanup [#524](https://github.com/paritytech/parity/pull/524)
+- Multiplication issue + very exhaustive tests for it [#528](https://github.com/paritytech/parity/pull/528)
+- EIP-8 [#498](https://github.com/paritytech/parity/pull/498)
+- Make "random" trie tests fully deterministic. [#527](https://github.com/paritytech/parity/pull/527)
+- udpated serde to version 0.7.0 [#526](https://github.com/paritytech/parity/pull/526)
+- Better memory management [#516](https://github.com/paritytech/parity/pull/516)
+- Typo [#523](https://github.com/paritytech/parity/pull/523)
+- U512 add/sub optimize [#521](https://github.com/paritytech/parity/pull/521)
+- Account management + geth keystore import (no utility crate added) [#509](https://github.com/paritytech/parity/pull/509)
+- Delayed UPnP initialization [#505](https://github.com/paritytech/parity/pull/505)
+- Fixing marking blocks as bad & SyncMessage bugs + small client refactoring. [#503](https://github.com/paritytech/parity/pull/503)
+- optimization of U256 [#515](https://github.com/paritytech/parity/pull/515)
+- Removed rocksdb from build scripts and instructions [#520](https://github.com/paritytech/parity/pull/520)
+- RocksDB abstraction layer + Hash index for state DB [#464](https://github.com/paritytech/parity/pull/464)
+- bloomfilter [#418](https://github.com/paritytech/parity/pull/418)
+- Fixed a race condition when connecting peer disconnects immediately [#519](https://github.com/paritytech/parity/pull/519)
+- ignore intellij idea project files as well [#518](https://github.com/paritytech/parity/pull/518)
+- updated version of unicase [#517](https://github.com/paritytech/parity/pull/517)
+- jsonrpc security, cors headers, fixed #359 [#493](https://github.com/paritytech/parity/pull/493)
+- Rust implementations to replace data tables (#161) [#482](https://github.com/paritytech/parity/pull/482)
+- fix issue with starting requested block number was not included itself [#512](https://github.com/paritytech/parity/pull/512)
+- fixed travis --org GH_TOKEN [#510](https://github.com/paritytech/parity/pull/510)
+- Improved log format [#506](https://github.com/paritytech/parity/pull/506)
+- Log address on failed connection attempt [#502](https://github.com/paritytech/parity/pull/502)
+- Bumping clippy and fixing warnings. [#501](https://github.com/paritytech/parity/pull/501)
+- Bumping versions. Fixes #496 [#500](https://github.com/paritytech/parity/pull/500)
+- Manage final user-input errors. [#494](https://github.com/paritytech/parity/pull/494)
+- Remove unneeded code, fix minor potential issue with length. [#495](https://github.com/paritytech/parity/pull/495)
+- Remove "unknown" from version string. [#488](https://github.com/paritytech/parity/pull/488)
+- Include git commit date & hash. [#486](https://github.com/paritytech/parity/pull/486)
+- Use proper version string. [#485](https://github.com/paritytech/parity/pull/485)
+- Networking fixes [#480](https://github.com/paritytech/parity/pull/480)
+- Fix potential deadlock on node table update [#484](https://github.com/paritytech/parity/pull/484)
+- Squash more warnings [#481](https://github.com/paritytech/parity/pull/481)
+- dev/test/build tools to separate crate [#477](https://github.com/paritytech/parity/pull/477)
+- Back to original slab crate [#479](https://github.com/paritytech/parity/pull/479)
+- Better user errors. [#476](https://github.com/paritytech/parity/pull/476)
+- UDP Discovery [#440](https://github.com/paritytech/parity/pull/440)
+- update readme with rust override [#475](https://github.com/paritytech/parity/pull/475)
+- fixed warnings on rust beta [#474](https://github.com/paritytech/parity/pull/474)
+- Secret store (part2 - encrypted key/value svc) [#449](https://github.com/paritytech/parity/pull/449)
+- Kill bad test. [#473](https://github.com/paritytech/parity/pull/473)
+- Make clippy an optional dependency [#422](https://github.com/paritytech/parity/pull/422)
+- parity compiling fine [#469](https://github.com/paritytech/parity/pull/469)
+- compiling ethcore on beta [#468](https://github.com/paritytech/parity/pull/468)
+- Utils compiling in beta [#467](https://github.com/paritytech/parity/pull/467)
+- Get rid of lru_cache dependency [#466](https://github.com/paritytech/parity/pull/466)
+- Add daemonization. [#459](https://github.com/paritytech/parity/pull/459)
+- Master upgrade [#448](https://github.com/paritytech/parity/pull/448)
+- Remove contributing stuff now that we have CLA bot. [#447](https://github.com/paritytech/parity/pull/447)
+- Add Morden bootnode. [#446](https://github.com/paritytech/parity/pull/446)
+- beta fixes to master [#441](https://github.com/paritytech/parity/pull/441)
+- Secret store (part1 - key management) [#423](https://github.com/paritytech/parity/pull/423)
+- Use 1100000 as the homestead transition, fix build instructions. [#438](https://github.com/paritytech/parity/pull/438)
+- More sync and propagation fixes [#420](https://github.com/paritytech/parity/pull/420)
+- back to cargo crates [#436](https://github.com/paritytech/parity/pull/436)
+- Fixing clippy warnings [#435](https://github.com/paritytech/parity/pull/435)
+- preserving root cargo lock [#434](https://github.com/paritytech/parity/pull/434)
+- Nightly fix [#432](https://github.com/paritytech/parity/pull/432)
+- nightly fixes [#431](https://github.com/paritytech/parity/pull/431)
+- Delay Homestead transition from 1,000,000. [#429](https://github.com/paritytech/parity/pull/429)
+- Nightly fix effort (still should fail) [#428](https://github.com/paritytech/parity/pull/428)
+- clippy version update, docopt-macro moving to fork [#425](https://github.com/paritytech/parity/pull/425)
+- Network/Sync fixes and optimizations [#416](https://github.com/paritytech/parity/pull/416)
+- Use latest era instead of end era as journal marker [#414](https://github.com/paritytech/parity/pull/414)
+- api changes [#402](https://github.com/paritytech/parity/pull/402)
+- Option for no init nodes. [#408](https://github.com/paritytech/parity/pull/408)
+- Fixed block_bodies not returning a list [#406](https://github.com/paritytech/parity/pull/406)
+- Fix test. [#405](https://github.com/paritytech/parity/pull/405)
+- Allow path to be configured. [#404](https://github.com/paritytech/parity/pull/404)
+- Upnp [#400](https://github.com/paritytech/parity/pull/400)
+- eth_syncing, fixed #397 [#398](https://github.com/paritytech/parity/pull/398)
+- Using modified version of ctrlc that catches SIGTERM [#399](https://github.com/paritytech/parity/pull/399)
+- Catching panics. [#396](https://github.com/paritytech/parity/pull/396)
+- jsonrpc [#391](https://github.com/paritytech/parity/pull/391)
+- Externalities tests (still clumsy) [#394](https://github.com/paritytech/parity/pull/394)
+- excluding test code itself from coverage [#395](https://github.com/paritytech/parity/pull/395)
+- Additional tweaks to options. [#390](https://github.com/paritytech/parity/pull/390)
+- --chain option for setting which network to go on. [#388](https://github.com/paritytech/parity/pull/388)
+- Ethash unit tests final [#387](https://github.com/paritytech/parity/pull/387)
+- jsonrpc [#374](https://github.com/paritytech/parity/pull/374)
+- Editorconfig file. [#384](https://github.com/paritytech/parity/pull/384)
+- Coverage effort [in progress] [#382](https://github.com/paritytech/parity/pull/382)
+- making root kcov runner simular to the one running on CI [#380](https://github.com/paritytech/parity/pull/380)
+- add gcc as a dependency to dockerfiles [#381](https://github.com/paritytech/parity/pull/381)
+- Check for handshake expiration before attempting connection replace [#375](https://github.com/paritytech/parity/pull/375)
+- Blocks propagation [#364](https://github.com/paritytech/parity/pull/364)
+- Network params. [#376](https://github.com/paritytech/parity/pull/376)
+- Add parity-node-zero to bootnodes. [#373](https://github.com/paritytech/parity/pull/373)
+- kcov uses travis_job_id instead of coveralls token [#370](https://github.com/paritytech/parity/pull/370)
+- Add parity-node-zero.ethcore.io to boot nodes. [#371](https://github.com/paritytech/parity/pull/371)
 
-## Parity [v1.0.0-rc1](https://github.com/openethereum/openethereum/releases/tag/v1.0.0-rc1) (2016-03-15)
+## Parity [v1.0.0-rc1](https://github.com/paritytech/parity/releases/tag/v1.0.0-rc1) (2016-03-15)
 
 First Parity 1.0.0 release candidate.
 
-- Version 1.0 in beta [#712](https://github.com/openethereum/openethereum/pull/712)
-- Fix test for beta [#617](https://github.com/openethereum/openethereum/pull/617)
-- JournalDB fix option 1 for beta [#614](https://github.com/openethereum/openethereum/pull/614)
-- Failing test. [#606](https://github.com/openethereum/openethereum/pull/606)
-- Fix transition points [#604](https://github.com/openethereum/openethereum/pull/604)
-- (BETA) Update README.md [#549](https://github.com/openethereum/openethereum/pull/549)
-- (BETA) instructions for beta release channel [#456](https://github.com/openethereum/openethereum/pull/456)
-- (BETA) fix nightly - remerge [#454](https://github.com/openethereum/openethereum/pull/454)
-- (BETA) fixing nightly version for beta [#452](https://github.com/openethereum/openethereum/pull/452)
+- Version 1.0 in beta [#712](https://github.com/paritytech/parity/pull/712)
+- Fix test for beta [#617](https://github.com/paritytech/parity/pull/617)
+- JournalDB fix option 1 for beta [#614](https://github.com/paritytech/parity/pull/614)
+- Failing test. [#606](https://github.com/paritytech/parity/pull/606)
+- Fix transition points [#604](https://github.com/paritytech/parity/pull/604)
+- (BETA) Update README.md [#549](https://github.com/paritytech/parity/pull/549)
+- (BETA) instructions for beta release channel [#456](https://github.com/paritytech/parity/pull/456)
+- (BETA) fix nightly - remerge [#454](https://github.com/paritytech/parity/pull/454)
+- (BETA) fixing nightly version for beta [#452](https://github.com/paritytech/parity/pull/452)

docs/CHANGELOG-1.1.md

@@ -1,6 +1,6 @@
 Note: Parity 1.1 reached End-of-Life on 2016-08-12 (EOL).
 
-## Parity [v1.1.0](https://github.com/openethereum/openethereum/releases/tag/v1.1.0) (2016-05-02)
+## Parity [v1.1.0](https://github.com/paritytech/parity/releases/tag/v1.1.0) (2016-05-02)
 
 Parity 1.1.0 introduces:
 
@@ -12,143 +12,143 @@ Parity 1.1.0 introduces:
 
 Full Changes:
 
-- Exposing default extra data via ethcore RPC [#1032](https://github.com/openethereum/openethereum/pull/1032)
-- Net etiquette [#1028](https://github.com/openethereum/openethereum/pull/1028)
-- Bumping clippy & fixing warnings [#1024](https://github.com/openethereum/openethereum/pull/1024)
-- Tracedb interface && cli [#997](https://github.com/openethereum/openethereum/pull/997)
-- Switching to geth-attach supporting version of rpc core and server [#1022](https://github.com/openethereum/openethereum/pull/1022)
-- Fixing status page displaying homestead  [#1020](https://github.com/openethereum/openethereum/pull/1020)
-- Core tracedb functionality. [#996](https://github.com/openethereum/openethereum/pull/996)
-- RPC method for supported modules [#1019](https://github.com/openethereum/openethereum/pull/1019)
-- Updating status page [#1015](https://github.com/openethereum/openethereum/pull/1015)
-- Disabling wallet [#1017](https://github.com/openethereum/openethereum/pull/1017)
-- More detailed fatal error reporting [#1016](https://github.com/openethereum/openethereum/pull/1016)
-- Support 'pending' block in RPC [#1007](https://github.com/openethereum/openethereum/pull/1007)
-- Enable pending block when there is local transaction pending. [#1005](https://github.com/openethereum/openethereum/pull/1005)
-- updating key files permissions on save [#1010](https://github.com/openethereum/openethereum/pull/1010)
-- IPC JSON RPC (for external interface) [#1009](https://github.com/openethereum/openethereum/pull/1009)
-- Fixing Firefox authorization issues [#1013](https://github.com/openethereum/openethereum/pull/1013)
-- cargo update [#1012](https://github.com/openethereum/openethereum/pull/1012)
-- Switching to rust-url@1.0.0 [#1011](https://github.com/openethereum/openethereum/pull/1011)
-- Exception handling in RPC & WebApps [#988](https://github.com/openethereum/openethereum/pull/988)
-- Fixed uint deserialization from hex [#1008](https://github.com/openethereum/openethereum/pull/1008)
-- Tweak timeout and packet size to handle slow networks better [#1004](https://github.com/openethereum/openethereum/pull/1004)
-- db key is generic and can be made smaller [#1006](https://github.com/openethereum/openethereum/pull/1006)
-- IPC with new serialization [#998](https://github.com/openethereum/openethereum/pull/998)
-- make jsonrpc api engine agnostic [#1001](https://github.com/openethereum/openethereum/pull/1001)
-- updated cargo.lock [#1002](https://github.com/openethereum/openethereum/pull/1002)
-- updated parity dependencies [#993](https://github.com/openethereum/openethereum/pull/993)
-- Auto (with codegen) binary serializer  [#980](https://github.com/openethereum/openethereum/pull/980)
-- Fixing transaction queue last_nonces update [#995](https://github.com/openethereum/openethereum/pull/995)
-- import route contains ommited blocks [#994](https://github.com/openethereum/openethereum/pull/994)
-- fixed encoding 0u8 [#992](https://github.com/openethereum/openethereum/pull/992)
-- Use latest netstats [#989](https://github.com/openethereum/openethereum/pull/989)
-- RPC shared external miner [#984](https://github.com/openethereum/openethereum/pull/984)
-- Additional RPC methods for settings [#983](https://github.com/openethereum/openethereum/pull/983)
-- Fixing transaction_queue deadlock [#985](https://github.com/openethereum/openethereum/pull/985)
-- Refactoring of `parity/main.rs` [#981](https://github.com/openethereum/openethereum/pull/981)
-- Fixing clippy warnings. [#982](https://github.com/openethereum/openethereum/pull/982)
-- Bumping status page [#977](https://github.com/openethereum/openethereum/pull/977)
-- querying extras separated to its own module [#972](https://github.com/openethereum/openethereum/pull/972)
-- Exposing application logs via RPC. [#976](https://github.com/openethereum/openethereum/pull/976)
-- Addressing binary serialization for db types [#966](https://github.com/openethereum/openethereum/pull/966)
-- removed redundant unwraps [#935](https://github.com/openethereum/openethereum/pull/935)
-- fixed transaction queue merge conflict [#975](https://github.com/openethereum/openethereum/pull/975)
-- Configurable limit for transaction queue (CLI & Ethcore-RPC) [#974](https://github.com/openethereum/openethereum/pull/974)
-- Enforce limit caused `last_nonce` to return incorrect values. [#973](https://github.com/openethereum/openethereum/pull/973)
-- Even more detailed errors for transaction queue [#969](https://github.com/openethereum/openethereum/pull/969)
-- temporary fix of panic in blockchain garbage collection [#970](https://github.com/openethereum/openethereum/pull/970)
-- IPC codegen - some minor fixes & enhancements [#967](https://github.com/openethereum/openethereum/pull/967)
-- Additional logging for transactions [#968](https://github.com/openethereum/openethereum/pull/968)
-- refactored blockchain extras keys building [#963](https://github.com/openethereum/openethereum/pull/963)
-- Using hyper-mio branch in webapps. [#957](https://github.com/openethereum/openethereum/pull/957)
-- Remove nanomsg from build-dependencies [#965](https://github.com/openethereum/openethereum/pull/965)
-- Fix build for --target=armv7-unknown-linux-gnueabihf [#964](https://github.com/openethereum/openethereum/pull/964)
-- IPC RPC codegen extra feature [#962](https://github.com/openethereum/openethereum/pull/962)
-- IPC RPC codegen for generic implementation [#961](https://github.com/openethereum/openethereum/pull/961)
-- using db_path directory when upgrading [#960](https://github.com/openethereum/openethereum/pull/960)
-- IPC hypervisor [#958](https://github.com/openethereum/openethereum/pull/958)
-- Removing a transaction from queue now removes all from this sender with lower nonces. [#950](https://github.com/openethereum/openethereum/pull/950)
-- bump status page version 0.1.7 [#955](https://github.com/openethereum/openethereum/pull/955)
-- Changing cors header to be optional [#956](https://github.com/openethereum/openethereum/pull/956)
-- Update ARM Dockerfile [#959](https://github.com/openethereum/openethereum/pull/959)
-- Sensible gas limits for eth_sendTransaction [#953](https://github.com/openethereum/openethereum/pull/953)
-- Fix upgrade script and make parity run when no .parity dir. [#954](https://github.com/openethereum/openethereum/pull/954)
-- Tracing and docs for --pruning=auto. [#952](https://github.com/openethereum/openethereum/pull/952)
-- IPC serialization for custom parameters [#946](https://github.com/openethereum/openethereum/pull/946)
-- default filter from block should be Latest, not Earliest [#948](https://github.com/openethereum/openethereum/pull/948)
-- README.md: removes sudo from multirust installation [#943](https://github.com/openethereum/openethereum/pull/943)
-- Disable long lines formatting + ethash example. [#939](https://github.com/openethereum/openethereum/pull/939)
-- Ethcore-specific RPC methods for altering miner parameters. [#934](https://github.com/openethereum/openethereum/pull/934)
-- Use ethcore nanomsg bindings [#941](https://github.com/openethereum/openethereum/pull/941)
-- Update IPC codegen to latest syntax libs [#938](https://github.com/openethereum/openethereum/pull/938)
-- IPC documentation [#937](https://github.com/openethereum/openethereum/pull/937)
-- Bumping clippy and fixing warnings. [#936](https://github.com/openethereum/openethereum/pull/936)
-- Pruning auto [#927](https://github.com/openethereum/openethereum/pull/927)
-- IPC persistent client link [#933](https://github.com/openethereum/openethereum/pull/933)
-- IPC persistent client link [#930](https://github.com/openethereum/openethereum/pull/930)
-- IPC handshake (negotiating protocol/api version) [#928](https://github.com/openethereum/openethereum/pull/928)
-- Upgrade logic between versions [#914](https://github.com/openethereum/openethereum/pull/914)
-- executive tracing cleanup [#903](https://github.com/openethereum/openethereum/pull/903)
-- Ethcore-specific RPC methods [#923](https://github.com/openethereum/openethereum/pull/923)
-- Parameter to allow user to force the sealing mechanism [#918](https://github.com/openethereum/openethereum/pull/918)
-- updated dependencies [#921](https://github.com/openethereum/openethereum/pull/921)
-- Fixed send transaction deadlock [#920](https://github.com/openethereum/openethereum/pull/920)
-- --unlock is comma-delimited. [#916](https://github.com/openethereum/openethereum/pull/916)
-- fixed eth_getLogs [#915](https://github.com/openethereum/openethereum/pull/915)
-- create provided custom dir for keys if none [#912](https://github.com/openethereum/openethereum/pull/912)
-- spec loading cleanup [#858](https://github.com/openethereum/openethereum/pull/858)
-- WebApps HTTP Basic Auth Support [#906](https://github.com/openethereum/openethereum/pull/906)
-- Removing match on constant [#888](https://github.com/openethereum/openethereum/pull/888)
-- Update auth.rs [#907](https://github.com/openethereum/openethereum/pull/907)
-- Enabling webapps compilation by default [#904](https://github.com/openethereum/openethereum/pull/904)
-- fixed #895 [#898](https://github.com/openethereum/openethereum/pull/898)
-- Support for compile-time included WebApplications. [#899](https://github.com/openethereum/openethereum/pull/899)
-- Propagate transaction queue [#894](https://github.com/openethereum/openethereum/pull/894)
-- Use new json RPC server [#901](https://github.com/openethereum/openethereum/pull/901)
-- Gracefully dying when trying to enable RPC and app is compiled without it. [#900](https://github.com/openethereum/openethereum/pull/900)
-- Additional logging and friendlier error messages [#893](https://github.com/openethereum/openethereum/pull/893)
-- Avoid signalling readiness when app is about to be closed. [#897](https://github.com/openethereum/openethereum/pull/897)
-- fixed #875 and added tests for eth_sendTransaction [#890](https://github.com/openethereum/openethereum/pull/890)
-- passing key path to all invocations [#891](https://github.com/openethereum/openethereum/pull/891)
-- Fixed eth_call nonce and gas handling [#892](https://github.com/openethereum/openethereum/pull/892)
-- ipc rpc with nano transport (simple duplex) [#886](https://github.com/openethereum/openethereum/pull/886)
-- Bumping clippy and fixing warnings [#889](https://github.com/openethereum/openethereum/pull/889)
-- More descriptive expectations to transaction queue consistency. [#878](https://github.com/openethereum/openethereum/pull/878)
-- uint bug - replace add with or [#879](https://github.com/openethereum/openethereum/pull/879)
-- Fixing typo in bigint [#877](https://github.com/openethereum/openethereum/pull/877)
-- update misleading cli help msg for author [#874](https://github.com/openethereum/openethereum/pull/874)
-- Find geth data store cross-platform. [#871](https://github.com/openethereum/openethereum/pull/871)
-- Import geth 1.4.0 keys [#872](https://github.com/openethereum/openethereum/pull/872)
-- Syntax helpers for IPC RPC (part 2) [#854](https://github.com/openethereum/openethereum/pull/854)
-- Fixed bootnode URL and error message [#870](https://github.com/openethereum/openethereum/pull/870)
-- replace popcnt with mov (861) [#867](https://github.com/openethereum/openethereum/pull/867)
-- weekly dependencies update [#865](https://github.com/openethereum/openethereum/pull/865)
-- Remove unused mut [#866](https://github.com/openethereum/openethereum/pull/866)
-- fixed #855 [#864](https://github.com/openethereum/openethereum/pull/864)
-- simplified trace from functions, removed clippy warnings [#862](https://github.com/openethereum/openethereum/pull/862)
-- Update deprecated HashDB methods in docs. [#857](https://github.com/openethereum/openethereum/pull/857)
-- refactored loading transaction json tests [#853](https://github.com/openethereum/openethereum/pull/853)
-- reorganised price info lookup [#852](https://github.com/openethereum/openethereum/pull/852)
-- Publish locally-made transactions to peers. [#850](https://github.com/openethereum/openethereum/pull/850)
-- Add generalbeck's token [#847](https://github.com/openethereum/openethereum/pull/847)
-- Fix response for mining. [#846](https://github.com/openethereum/openethereum/pull/846)
-- USD-based pricing of gas. [#843](https://github.com/openethereum/openethereum/pull/843)
-- Parity can accept older work packages [#811](https://github.com/openethereum/openethereum/pull/811)
-- Caching for computing seed hashes (#541) [#841](https://github.com/openethereum/openethereum/pull/841)
-- checking transaction queue for pending transaction [#838](https://github.com/openethereum/openethereum/pull/838)
-- refactored loading of state tests [#817](https://github.com/openethereum/openethereum/pull/817)
-- tests for deserialization of transaction from issue #835 [#837](https://github.com/openethereum/openethereum/pull/837)
-- unlocks with no expiration [on top of 833] [#834](https://github.com/openethereum/openethereum/pull/834)
-- Unlock accounts on CLI. [#833](https://github.com/openethereum/openethereum/pull/833)
-- Make BlockNumber optional, fix eth_call [#829](https://github.com/openethereum/openethereum/pull/829)
-- Test socket to common test code (ethcore-devtools) [#831](https://github.com/openethereum/openethereum/pull/831)
-- Use network id for the web3_net_version return. [#822](https://github.com/openethereum/openethereum/pull/822)
-- json-rpc web3_sha3 [#824](https://github.com/openethereum/openethereum/pull/824)
-- remove some unused files [#819](https://github.com/openethereum/openethereum/pull/819)
-- debug symbols for master/beta [#818](https://github.com/openethereum/openethereum/pull/818)
-- Syntax helpers for IPC RPC [#809](https://github.com/openethereum/openethereum/pull/809)
-- refactored loading of execution tests [#803](https://github.com/openethereum/openethereum/pull/803)
-- Rustfmt.toml [#805](https://github.com/openethereum/openethereum/pull/805)
-- install-partiy runs brew reinstall parity on osx [#810](https://github.com/openethereum/openethereum/pull/810)
-- Fix mining from spinning [#807](https://github.com/openethereum/openethereum/pull/807)
+- Exposing default extra data via ethcore RPC [#1032](https://github.com/paritytech/parity/pull/1032)
+- Net etiquette [#1028](https://github.com/paritytech/parity/pull/1028)
+- Bumping clippy & fixing warnings [#1024](https://github.com/paritytech/parity/pull/1024)
+- Tracedb interface && cli [#997](https://github.com/paritytech/parity/pull/997)
+- Switching to geth-attach supporting version of rpc core and server [#1022](https://github.com/paritytech/parity/pull/1022)
+- Fixing status page displaying homestead  [#1020](https://github.com/paritytech/parity/pull/1020)
+- Core tracedb functionality. [#996](https://github.com/paritytech/parity/pull/996)
+- RPC method for supported modules [#1019](https://github.com/paritytech/parity/pull/1019)
+- Updating status page [#1015](https://github.com/paritytech/parity/pull/1015)
+- Disabling wallet [#1017](https://github.com/paritytech/parity/pull/1017)
+- More detailed fatal error reporting [#1016](https://github.com/paritytech/parity/pull/1016)
+- Support 'pending' block in RPC [#1007](https://github.com/paritytech/parity/pull/1007)
+- Enable pending block when there is local transaction pending. [#1005](https://github.com/paritytech/parity/pull/1005)
+- updating key files permissions on save [#1010](https://github.com/paritytech/parity/pull/1010)
+- IPC JSON RPC (for external interface) [#1009](https://github.com/paritytech/parity/pull/1009)
+- Fixing Firefox authorization issues [#1013](https://github.com/paritytech/parity/pull/1013)
+- cargo update [#1012](https://github.com/paritytech/parity/pull/1012)
+- Switching to rust-url@1.0.0 [#1011](https://github.com/paritytech/parity/pull/1011)
+- Exception handling in RPC & WebApps [#988](https://github.com/paritytech/parity/pull/988)
+- Fixed uint deserialization from hex [#1008](https://github.com/paritytech/parity/pull/1008)
+- Tweak timeout and packet size to handle slow networks better [#1004](https://github.com/paritytech/parity/pull/1004)
+- db key is generic and can be made smaller [#1006](https://github.com/paritytech/parity/pull/1006)
+- IPC with new serialization [#998](https://github.com/paritytech/parity/pull/998)
+- make jsonrpc api engine agnostic [#1001](https://github.com/paritytech/parity/pull/1001)
+- updated cargo.lock [#1002](https://github.com/paritytech/parity/pull/1002)
+- updated parity dependencies [#993](https://github.com/paritytech/parity/pull/993)
+- Auto (with codegen) binary serializer  [#980](https://github.com/paritytech/parity/pull/980)
+- Fixing transaction queue last_nonces update [#995](https://github.com/paritytech/parity/pull/995)
+- import route contains ommited blocks [#994](https://github.com/paritytech/parity/pull/994)
+- fixed encoding 0u8 [#992](https://github.com/paritytech/parity/pull/992)
+- Use latest netstats [#989](https://github.com/paritytech/parity/pull/989)
+- RPC shared external miner [#984](https://github.com/paritytech/parity/pull/984)
+- Additional RPC methods for settings [#983](https://github.com/paritytech/parity/pull/983)
+- Fixing transaction_queue deadlock [#985](https://github.com/paritytech/parity/pull/985)
+- Refactoring of `parity/main.rs` [#981](https://github.com/paritytech/parity/pull/981)
+- Fixing clippy warnings. [#982](https://github.com/paritytech/parity/pull/982)
+- Bumping status page [#977](https://github.com/paritytech/parity/pull/977)
+- querying extras separated to its own module [#972](https://github.com/paritytech/parity/pull/972)
+- Exposing application logs via RPC. [#976](https://github.com/paritytech/parity/pull/976)
+- Addressing binary serialization for db types [#966](https://github.com/paritytech/parity/pull/966)
+- removed redundant unwraps [#935](https://github.com/paritytech/parity/pull/935)
+- fixed transaction queue merge conflict [#975](https://github.com/paritytech/parity/pull/975)
+- Configurable limit for transaction queue (CLI & Ethcore-RPC) [#974](https://github.com/paritytech/parity/pull/974)
+- Enforce limit caused `last_nonce` to return incorrect values. [#973](https://github.com/paritytech/parity/pull/973)
+- Even more detailed errors for transaction queue [#969](https://github.com/paritytech/parity/pull/969)
+- temporary fix of panic in blockchain garbage collection [#970](https://github.com/paritytech/parity/pull/970)
+- IPC codegen - some minor fixes & enhancements [#967](https://github.com/paritytech/parity/pull/967)
+- Additional logging for transactions [#968](https://github.com/paritytech/parity/pull/968)
+- refactored blockchain extras keys building [#963](https://github.com/paritytech/parity/pull/963)
+- Using hyper-mio branch in webapps. [#957](https://github.com/paritytech/parity/pull/957)
+- Remove nanomsg from build-dependencies [#965](https://github.com/paritytech/parity/pull/965)
+- Fix build for --target=armv7-unknown-linux-gnueabihf [#964](https://github.com/paritytech/parity/pull/964)
+- IPC RPC codegen extra feature [#962](https://github.com/paritytech/parity/pull/962)
+- IPC RPC codegen for generic implementation [#961](https://github.com/paritytech/parity/pull/961)
+- using db_path directory when upgrading [#960](https://github.com/paritytech/parity/pull/960)
+- IPC hypervisor [#958](https://github.com/paritytech/parity/pull/958)
+- Removing a transaction from queue now removes all from this sender with lower nonces. [#950](https://github.com/paritytech/parity/pull/950)
+- bump status page version 0.1.7 [#955](https://github.com/paritytech/parity/pull/955)
+- Changing cors header to be optional [#956](https://github.com/paritytech/parity/pull/956)
+- Update ARM Dockerfile [#959](https://github.com/paritytech/parity/pull/959)
+- Sensible gas limits for eth_sendTransaction [#953](https://github.com/paritytech/parity/pull/953)
+- Fix upgrade script and make parity run when no .parity dir. [#954](https://github.com/paritytech/parity/pull/954)
+- Tracing and docs for --pruning=auto. [#952](https://github.com/paritytech/parity/pull/952)
+- IPC serialization for custom parameters [#946](https://github.com/paritytech/parity/pull/946)
+- default filter from block should be Latest, not Earliest [#948](https://github.com/paritytech/parity/pull/948)
+- README.md: removes sudo from multirust installation [#943](https://github.com/paritytech/parity/pull/943)
+- Disable long lines formatting + ethash example. [#939](https://github.com/paritytech/parity/pull/939)
+- Ethcore-specific RPC methods for altering miner parameters. [#934](https://github.com/paritytech/parity/pull/934)
+- Use ethcore nanomsg bindings [#941](https://github.com/paritytech/parity/pull/941)
+- Update IPC codegen to latest syntax libs [#938](https://github.com/paritytech/parity/pull/938)
+- IPC documentation [#937](https://github.com/paritytech/parity/pull/937)
+- Bumping clippy and fixing warnings. [#936](https://github.com/paritytech/parity/pull/936)
+- Pruning auto [#927](https://github.com/paritytech/parity/pull/927)
+- IPC persistent client link [#933](https://github.com/paritytech/parity/pull/933)
+- IPC persistent client link [#930](https://github.com/paritytech/parity/pull/930)
+- IPC handshake (negotiating protocol/api version) [#928](https://github.com/paritytech/parity/pull/928)
+- Upgrade logic between versions [#914](https://github.com/paritytech/parity/pull/914)
+- executive tracing cleanup [#903](https://github.com/paritytech/parity/pull/903)
+- Ethcore-specific RPC methods [#923](https://github.com/paritytech/parity/pull/923)
+- Parameter to allow user to force the sealing mechanism [#918](https://github.com/paritytech/parity/pull/918)
+- updated dependencies [#921](https://github.com/paritytech/parity/pull/921)
+- Fixed send transaction deadlock [#920](https://github.com/paritytech/parity/pull/920)
+- --unlock is comma-delimited. [#916](https://github.com/paritytech/parity/pull/916)
+- fixed eth_getLogs [#915](https://github.com/paritytech/parity/pull/915)
+- create provided custom dir for keys if none [#912](https://github.com/paritytech/parity/pull/912)
+- spec loading cleanup [#858](https://github.com/paritytech/parity/pull/858)
+- WebApps HTTP Basic Auth Support [#906](https://github.com/paritytech/parity/pull/906)
+- Removing match on constant [#888](https://github.com/paritytech/parity/pull/888)
+- Update auth.rs [#907](https://github.com/paritytech/parity/pull/907)
+- Enabling webapps compilation by default [#904](https://github.com/paritytech/parity/pull/904)
+- fixed #895 [#898](https://github.com/paritytech/parity/pull/898)
+- Support for compile-time included WebApplications. [#899](https://github.com/paritytech/parity/pull/899)
+- Propagate transaction queue [#894](https://github.com/paritytech/parity/pull/894)
+- Use new json RPC server [#901](https://github.com/paritytech/parity/pull/901)
+- Gracefully dying when trying to enable RPC and app is compiled without it. [#900](https://github.com/paritytech/parity/pull/900)
+- Additional logging and friendlier error messages [#893](https://github.com/paritytech/parity/pull/893)
+- Avoid signalling readiness when app is about to be closed. [#897](https://github.com/paritytech/parity/pull/897)
+- fixed #875 and added tests for eth_sendTransaction [#890](https://github.com/paritytech/parity/pull/890)
+- passing key path to all invocations [#891](https://github.com/paritytech/parity/pull/891)
+- Fixed eth_call nonce and gas handling [#892](https://github.com/paritytech/parity/pull/892)
+- ipc rpc with nano transport (simple duplex) [#886](https://github.com/paritytech/parity/pull/886)
+- Bumping clippy and fixing warnings [#889](https://github.com/paritytech/parity/pull/889)
+- More descriptive expectations to transaction queue consistency. [#878](https://github.com/paritytech/parity/pull/878)
+- uint bug - replace add with or [#879](https://github.com/paritytech/parity/pull/879)
+- Fixing typo in bigint [#877](https://github.com/paritytech/parity/pull/877)
+- update misleading cli help msg for author [#874](https://github.com/paritytech/parity/pull/874)
+- Find geth data store cross-platform. [#871](https://github.com/paritytech/parity/pull/871)
+- Import geth 1.4.0 keys [#872](https://github.com/paritytech/parity/pull/872)
+- Syntax helpers for IPC RPC (part 2) [#854](https://github.com/paritytech/parity/pull/854)
+- Fixed bootnode URL and error message [#870](https://github.com/paritytech/parity/pull/870)
+- replace popcnt with mov (861) [#867](https://github.com/paritytech/parity/pull/867)
+- weekly dependencies update [#865](https://github.com/paritytech/parity/pull/865)
+- Remove unused mut [#866](https://github.com/paritytech/parity/pull/866)
+- fixed #855 [#864](https://github.com/paritytech/parity/pull/864)
+- simplified trace from functions, removed clippy warnings [#862](https://github.com/paritytech/parity/pull/862)
+- Update deprecated HashDB methods in docs. [#857](https://github.com/paritytech/parity/pull/857)
+- refactored loading transaction json tests [#853](https://github.com/paritytech/parity/pull/853)
+- reorganised price info lookup [#852](https://github.com/paritytech/parity/pull/852)
+- Publish locally-made transactions to peers. [#850](https://github.com/paritytech/parity/pull/850)
+- Add generalbeck's token [#847](https://github.com/paritytech/parity/pull/847)
+- Fix response for mining. [#846](https://github.com/paritytech/parity/pull/846)
+- USD-based pricing of gas. [#843](https://github.com/paritytech/parity/pull/843)
+- Parity can accept older work packages [#811](https://github.com/paritytech/parity/pull/811)
+- Caching for computing seed hashes (#541) [#841](https://github.com/paritytech/parity/pull/841)
+- checking transaction queue for pending transaction [#838](https://github.com/paritytech/parity/pull/838)
+- refactored loading of state tests [#817](https://github.com/paritytech/parity/pull/817)
+- tests for deserialization of transaction from issue #835 [#837](https://github.com/paritytech/parity/pull/837)
+- unlocks with no expiration [on top of 833] [#834](https://github.com/paritytech/parity/pull/834)
+- Unlock accounts on CLI. [#833](https://github.com/paritytech/parity/pull/833)
+- Make BlockNumber optional, fix eth_call [#829](https://github.com/paritytech/parity/pull/829)
+- Test socket to common test code (ethcore-devtools) [#831](https://github.com/paritytech/parity/pull/831)
+- Use network id for the web3_net_version return. [#822](https://github.com/paritytech/parity/pull/822)
+- json-rpc web3_sha3 [#824](https://github.com/paritytech/parity/pull/824)
+- remove some unused files [#819](https://github.com/paritytech/parity/pull/819)
+- debug symbols for master/beta [#818](https://github.com/paritytech/parity/pull/818)
+- Syntax helpers for IPC RPC [#809](https://github.com/paritytech/parity/pull/809)
+- refactored loading of execution tests [#803](https://github.com/paritytech/parity/pull/803)
+- Rustfmt.toml [#805](https://github.com/paritytech/parity/pull/805)
+- install-partiy runs brew reinstall parity on osx [#810](https://github.com/paritytech/parity/pull/810)
+- Fix mining from spinning [#807](https://github.com/paritytech/parity/pull/807)

docs/CHANGELOG-1.10.md

@@ -1,18 +1,18 @@
 Note: Parity 1.10 reached End-of-Life on 2018-07-18 (EOL).
 
-## Parity [v1.10.9](https://github.com/openethereum/openethereum/releases/tag/v1.10.9) (2018-07-07)
+## Parity [v1.10.9](https://github.com/paritytech/parity/releases/tag/v1.10.9) (2018-07-07)
 
 Parity 1.10.9 is a bug-fix release to improve performance and stability.
 
 The full list of included changes:
 
-- Stable: 1.10.9 backports ([#9016](https://github.com/openethereum/openethereum/pull/9016))
+- Stable: 1.10.9 backports ([#9016](https://github.com/paritytech/parity/pull/9016))
   - Parity-version: bump stable to 1.10.9
-  - Scripts: remove md5 checksums ([#8884](https://github.com/openethereum/openethereum/pull/8884))
-  - Add support for --chain tobalaba ([#8870](https://github.com/openethereum/openethereum/pull/8870))
+  - Scripts: remove md5 checksums ([#8884](https://github.com/paritytech/parity/pull/8884))
+  - Add support for --chain tobalaba ([#8870](https://github.com/paritytech/parity/pull/8870))
     - Add support for --chain tobalaba
-  - Only return error log for rustls ([#9025](https://github.com/openethereum/openethereum/pull/9025))
-  - Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/openethereum/openethereum/pull/8998))
+  - Only return error log for rustls ([#9025](https://github.com/paritytech/parity/pull/9025))
+  - Fixes for misbehavior reporting in AuthorityRound ([#8998](https://github.com/paritytech/parity/pull/8998))
     - Aura: only report after checking for repeated skipped primaries
     - Aura: refactor duplicate code for getting epoch validator set
     - Aura: verify_external: report on validator set contract instance
@@ -26,62 +26,62 @@ The full list of included changes:
     - Aura: let reporting fail on verify_block_basic
     - Aura: add comment about possible failure of reporting
 
-## Parity [v1.10.8](https://github.com/openethereum/openethereum/releases/tag/v1.10.8) (2018-06-29)
+## Parity [v1.10.8](https://github.com/paritytech/parity/releases/tag/v1.10.8) (2018-06-29)
 
 Parity 1.10.8 is a bug-fix release to improve performance and stability.
 
 The full list of included changes:
 
-- Backports ([#8986](https://github.com/openethereum/openethereum/pull/8986))
-  - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/openethereum/openethereum/pull/8984))
+- Backports ([#8986](https://github.com/paritytech/parity/pull/8986))
+  - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530 ([#8984](https://github.com/paritytech/parity/pull/8984))
     - Snap: downgrade rust to revision 1.26.2, ref snapcraft/+bug/1778530
     - Snap: use plugin rust
-  - Fix deadlock in blockchain. ([#8977](https://github.com/openethereum/openethereum/pull/8977))
+  - Fix deadlock in blockchain. ([#8977](https://github.com/paritytech/parity/pull/8977))
   - Remove js-glue from workspace
-- Bump stable to 1.10.8 ([#8951](https://github.com/openethereum/openethereum/pull/8951))
+- Bump stable to 1.10.8 ([#8951](https://github.com/paritytech/parity/pull/8951))
   - Parity-version: bump stable to 1.10.8
-  - Update ropsten.json ([#8926](https://github.com/openethereum/openethereum/pull/8926))
-  - Scripts: minor improvements ([#8930](https://github.com/openethereum/openethereum/pull/8930))
+  - Update ropsten.json ([#8926](https://github.com/paritytech/parity/pull/8926))
+  - Scripts: minor improvements ([#8930](https://github.com/paritytech/parity/pull/8930))
     - CI: enable 'latest' docker tag on master pipeline
     - CI: mark both beta and stable as stable snap.
     - CI: sign all windows binaries
     - Scripts: remove whisper target not available in stable
   - Scripts: fix gitlab strip binaries
-  - Scripts: fix docker build tag on latest using master ([#8952](https://github.com/openethereum/openethereum/pull/8952))
-  - Rpc: cap gas limit of local calls ([#8943](https://github.com/openethereum/openethereum/pull/8943))
+  - Scripts: fix docker build tag on latest using master ([#8952](https://github.com/paritytech/parity/pull/8952))
+  - Rpc: cap gas limit of local calls ([#8943](https://github.com/paritytech/parity/pull/8943))
 
-## Parity [v1.10.7](https://github.com/openethereum/openethereum/releases/tag/v1.10.7) (2018-06-20)
+## Parity [v1.10.7](https://github.com/paritytech/parity/releases/tag/v1.10.7) (2018-06-20)
 
 Parity 1.10.7 is a bug-fix release to improve performance and stability.
 
 The full list of included changes:
 
-- Backports ([#8919](https://github.com/openethereum/openethereum/pull/8919))
-  - Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/openethereum/openethereum/issues/8088) ([#8803](https://github.com/openethereum/openethereum/pull/8803))
-  - CI: Fix docker tags ([#8822](https://github.com/openethereum/openethereum/pull/8822))
+- Backports ([#8919](https://github.com/paritytech/parity/pull/8919))
+  - Fixed AuthorityRound deadlock on shutdown, closes [#8088](https://github.com/paritytech/parity/issues/8088) ([#8803](https://github.com/paritytech/parity/pull/8803))
+  - CI: Fix docker tags ([#8822](https://github.com/paritytech/parity/pull/8822))
     - Scripts: enable docker builds for beta and stable
     - Scripts: docker latest should be beta not master
     - Scripts: docker latest is master
-  - Fix concurrent access to signer queue ([#8854](https://github.com/openethereum/openethereum/pull/8854))
+  - Fix concurrent access to signer queue ([#8854](https://github.com/paritytech/parity/pull/8854))
     - Fix concurrent access to signer queue
     - Put request back to the queue if confirmation failed
     - Typo: fix docs and rename functions to be more specific
     - Change trace info "Transaction" -> "Request"
-  - Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/openethereum/openethereum/pull/8886))
+  - Add new ovh bootnodes and fix port for foundation bootnode 3.2 ([#8886](https://github.com/paritytech/parity/pull/8886))
     - Add new ovh bootnodes and fix port for foundation bootnode 3.2
     - Remove old bootnodes.
     - Remove duplicate 1118980bf48b0a3640bdba04e0fe78b1add18e1cd99bf22d53daac1fd9972ad650df52176e7c7d89d1114cfef2bc23a2959aa54998a46afcf7d91809f0855082
-  - Block 0 is valid in queries ([#8891](https://github.com/openethereum/openethereum/pull/8891))
-  - Update jsonrpc libs, fixed ipc leak, closes [#8774](https://github.com/openethereum/openethereum/issues/8774) ([#8876](https://github.com/openethereum/openethereum/pull/8876))
-  - Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/openethereum/openethereum/pull/8892))
-  - Minor fix in chain supplier and light provider ([#8906](https://github.com/openethereum/openethereum/pull/8906))
+  - Block 0 is valid in queries ([#8891](https://github.com/paritytech/parity/pull/8891))
+  - Update jsonrpc libs, fixed ipc leak, closes [#8774](https://github.com/paritytech/parity/issues/8774) ([#8876](https://github.com/paritytech/parity/pull/8876))
+  - Add ETC Cooperative-run load balanced parity node ([#8892](https://github.com/paritytech/parity/pull/8892))
+  - Minor fix in chain supplier and light provider ([#8906](https://github.com/paritytech/parity/pull/8906))
     - Fix chain supplier increment
     - Fix light provider block_headers
-- Parity-version: stable release 1.10.7 ([#8855](https://github.com/openethereum/openethereum/pull/8855))
-  - Cherry-pick network-specific release flag ([#8821](https://github.com/openethereum/openethereum/pull/8821))
+- Parity-version: stable release 1.10.7 ([#8855](https://github.com/paritytech/parity/pull/8855))
+  - Cherry-pick network-specific release flag ([#8821](https://github.com/paritytech/parity/pull/8821))
   - Parity-version: bump stable to 1.10.7
 
-## Parity [v1.10.6](https://github.com/openethereum/openethereum/releases/tag/v1.10.6) (2018-06-05)
+## Parity [v1.10.6](https://github.com/paritytech/parity/releases/tag/v1.10.6) (2018-06-05)
 
 Parity 1.10.6 is a security-relevant release. Please upgrade your nodes as soon as possible.
 
@@ -93,66 +93,66 @@ If you can not upgrade to 1.10+ yet, please use the following branches and build
 
 The full list of included changes:
 
-- Parity-version: bump stable to 1.10.6 ([#8805](https://github.com/openethereum/openethereum/pull/8805))
+- Parity-version: bump stable to 1.10.6 ([#8805](https://github.com/paritytech/parity/pull/8805))
   - Parity-version: bump stable to 1.10.6
-  - Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/openethereum/openethereum/pull/8802))
-- Update shell32-sys to fix windows build ([#8793](https://github.com/openethereum/openethereum/pull/8793))
-- Backports ([#8782](https://github.com/openethereum/openethereum/pull/8782))
-  - Fix light sync with initial validator-set contract ([#8528](https://github.com/openethereum/openethereum/pull/8528))
+  - Disallow unsigned transactions in case EIP-86 is disabled ([#8802](https://github.com/paritytech/parity/pull/8802))
+- Update shell32-sys to fix windows build ([#8793](https://github.com/paritytech/parity/pull/8793))
+- Backports ([#8782](https://github.com/paritytech/parity/pull/8782))
+  - Fix light sync with initial validator-set contract ([#8528](https://github.com/paritytech/parity/pull/8528))
     - Fix #8468
     - Use U256::max_value() instead
     - Fix again
     - Also change initial transaction gas
-  - Don't open Browser post-install on Mac ([#8641](https://github.com/openethereum/openethereum/pull/8641))
+  - Don't open Browser post-install on Mac ([#8641](https://github.com/paritytech/parity/pull/8641))
   - Prefix uint fmt with `0x` with alternate flag
-  - Set the request index to that of the current request ([#8683](https://github.com/openethereum/openethereum/pull/8683))
+  - Set the request index to that of the current request ([#8683](https://github.com/paritytech/parity/pull/8683))
     - Set the request index to that of the current request
-  - Node table sorting according to last contact data ([#8541](https://github.com/openethereum/openethereum/pull/8541))
+  - Node table sorting according to last contact data ([#8541](https://github.com/paritytech/parity/pull/8541))
     - Network-devp2p: sort nodes in node table using last contact data
     - Network-devp2p: rename node contact types in node table json output
     - Network-devp2p: fix node table tests
     - Network-devp2p: note node failure when failed to establish connection
     - Network-devp2p: handle UselessPeer error
     - Network-devp2p: note failure when marking node as useless
-  - Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/openethereum/openethereum/pull/8686))
-- Parity: bump stable version to 1.10.5 ([#8749](https://github.com/openethereum/openethereum/pull/8749))
+  - Network-devp2p: handle UselessPeer disconnect ([#8686](https://github.com/paritytech/parity/pull/8686))
+- Parity: bump stable version to 1.10.5 ([#8749](https://github.com/paritytech/parity/pull/8749))
   - Parity: bump stable version to 1.10.5
   - Fix failing doc tests running on non-code
 
-## Parity [v1.10.4](https://github.com/openethereum/openethereum/releases/tag/v1.10.4) (2018-05-15)
+## Parity [v1.10.4](https://github.com/paritytech/parity/releases/tag/v1.10.4) (2018-05-15)
 
 Parity 1.10.4 is a bug-fix release to improve performance and stability.
 
 The full list of included changes:
 
-- Backports ([#8623](https://github.com/openethereum/openethereum/pull/8623))
-  - Fix account list double 0x display ([#8596](https://github.com/openethereum/openethereum/pull/8596))
+- Backports ([#8623](https://github.com/paritytech/parity/pull/8623))
+  - Fix account list double 0x display ([#8596](https://github.com/paritytech/parity/pull/8596))
     - Remove unused self import
     - Fix account list double 0x display
-  - Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/openethereum/openethereum/pull/8486))
+  - Trace precompiled contracts when the transfer value is not zero ([#8486](https://github.com/paritytech/parity/pull/8486))
     - Trace precompiled contracts when the transfer value is not zero
     - Add tests for precompiled CALL tracing
     - Use byzantium test machine for the new test
     - Add notes in comments on why we don't trace all precompileds
     - Use is_transferred instead of transferred
-  - Gitlab test script fixes ([#8573](https://github.com/openethereum/openethereum/pull/8573))
+  - Gitlab test script fixes ([#8573](https://github.com/paritytech/parity/pull/8573))
     - Exclude /docs from modified files.
     - Ensure all references in the working tree are available
     - Remove duplicated line from test script
-- Bump stable to 1.10.4 ([#8626](https://github.com/openethereum/openethereum/pull/8626))
-- Allow stable snaps to be stable. ([#8582](https://github.com/openethereum/openethereum/pull/8582))
+- Bump stable to 1.10.4 ([#8626](https://github.com/paritytech/parity/pull/8626))
+- Allow stable snaps to be stable. ([#8582](https://github.com/paritytech/parity/pull/8582))
 
-## Parity [v1.10.3](https://github.com/openethereum/openethereum/releases/tag/v1.10.3) (2018-05-08)
+## Parity [v1.10.3](https://github.com/paritytech/parity/releases/tag/v1.10.3) (2018-05-08)
 
 Parity 1.10.3 marks the first stable release on the 1.10 track. Among others, it improves performance and stability.
 
 The full list of included changes:
 
-- Backports ([#8557](https://github.com/openethereum/openethereum/pull/8557))
-  - Update wasmi and pwasm-utils ([#8493](https://github.com/openethereum/openethereum/pull/8493))
+- Backports ([#8557](https://github.com/paritytech/parity/pull/8557))
+  - Update wasmi and pwasm-utils ([#8493](https://github.com/paritytech/parity/pull/8493))
     - Update wasmi to 0.2
     - Update pwasm-utils to 0.1.5
-  - Fetching logs by hash in blockchain database ([#8463](https://github.com/openethereum/openethereum/pull/8463))
+  - Fetching logs by hash in blockchain database ([#8463](https://github.com/paritytech/parity/pull/8463))
     - Fetch logs by hash in blockchain database
     - Fix tests
     - Add unit test for branch block logs fetching
@@ -165,7 +165,7 @@ The full list of included changes:
     - typo: pass value by reference
     - Use loop and wrap inside blocks to simplify the code
     - typo: missed a comment
-  - Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/openethereum/openethereum/pull/8491))
+  - Pass on storage keys tracing to handle the case when it is not modified ([#8491](https://github.com/paritytech/parity/pull/8491))
     - Pass on storage keys even if it is not modified
     - typo: account and storage query `to_pod_diff` builds both `touched_addresses` merge and storage keys merge.
     - Fix tests
@@ -175,86 +175,86 @@ The full list of included changes:
     - Address grumbles
     - typo: remove unwanted empty line
     - ensure_cached compiles with the original signature
-  - Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/openethereum/openethereum/pull/8520))
+  - Enable WebAssembly and Byzantium for Ellaism ([#8520](https://github.com/paritytech/parity/pull/8520))
     - Enable WebAssembly and Byzantium for Ellaism
     - Fix indentation
     - Remove empty lines
   - Fix compilation.
-- Stabilize 1.10.3 ([#8474](https://github.com/openethereum/openethereum/pull/8474))
+- Stabilize 1.10.3 ([#8474](https://github.com/paritytech/parity/pull/8474))
   - Stabelize 1.10
   - Bump stable to 1.10.3
   - Update Gitlab scripts
-  - Fix snap builds ([#8483](https://github.com/openethereum/openethereum/pull/8483))
-  - Fix docker build ([#8462](https://github.com/openethereum/openethereum/pull/8462))
+  - Fix snap builds ([#8483](https://github.com/paritytech/parity/pull/8483))
+  - Fix docker build ([#8462](https://github.com/paritytech/parity/pull/8462))
   - Use `master` as Docker's `latest` (`beta-release` is not used anymore)
 
-## Parity [v1.10.2](https://github.com/openethereum/openethereum/releases/tag/v1.10.2) (2018-04-24)
+## Parity [v1.10.2](https://github.com/paritytech/parity/releases/tag/v1.10.2) (2018-04-24)
 
 Parity 1.10.2 is a bug-fix release to improve performance and stability.
 
 The full list of included changes:
 
-- Update Parity beta to 1.10.2 + Backports ([#8455](https://github.com/openethereum/openethereum/pull/8455))
+- Update Parity beta to 1.10.2 + Backports ([#8455](https://github.com/paritytech/parity/pull/8455))
   - Update Parity beta to 1.10.2
-  - Allow 32-bit pipelines to fail ([#8454](https://github.com/openethereum/openethereum/pull/8454))
+  - Allow 32-bit pipelines to fail ([#8454](https://github.com/paritytech/parity/pull/8454))
     - Disable 32-bit targets for Gitlab
     - Rename Linux pipelines
-  - Update wasmi ([#8452](https://github.com/openethereum/openethereum/pull/8452))
+  - Update wasmi ([#8452](https://github.com/paritytech/parity/pull/8452))
   - Fix Cargo.lock
-- Backports ([#8450](https://github.com/openethereum/openethereum/pull/8450))
-  - Use forked app_dirs crate for reverted Windows dir behavior  ([#8438](https://github.com/openethereum/openethereum/pull/8438))
+- Backports ([#8450](https://github.com/paritytech/parity/pull/8450))
+  - Use forked app_dirs crate for reverted Windows dir behavior  ([#8438](https://github.com/paritytech/parity/pull/8438))
     - Remove unused app_dirs dependency in CLI
     - Use forked app_dirs crate for reverted Windows dir behavior
-  - Remove Tendermint extra_info due to seal inconsistencies ([#8367](https://github.com/openethereum/openethereum/pull/8367))
-  - Handle queue import errors a bit more gracefully ([#8385](https://github.com/openethereum/openethereum/pull/8385))
-  - Improve VM executor stack size estimation rules ([#8439](https://github.com/openethereum/openethereum/pull/8439))
+  - Remove Tendermint extra_info due to seal inconsistencies ([#8367](https://github.com/paritytech/parity/pull/8367))
+  - Handle queue import errors a bit more gracefully ([#8385](https://github.com/paritytech/parity/pull/8385))
+  - Improve VM executor stack size estimation rules ([#8439](https://github.com/paritytech/parity/pull/8439))
     - Improve VM executor stack size estimation rules
     - Typo: docs add "(Debug build)" comment
     - Fix an off by one typo and set minimal stack size
     - Use saturating_sub to avoid potential overflow
 
-## Parity [v1.10.1](https://github.com/openethereum/openethereum/releases/tag/v1.10.1) (2018-04-17)
+## Parity [v1.10.1](https://github.com/paritytech/parity/releases/tag/v1.10.1) (2018-04-17)
 
 Parity 1.10.1 is a bug-fix release to improve performance and stability. Among other changes, you can now use `--warp-barrier [BLOCK]` to specify a minimum block number to `--warp` to. This is useful in cases where clients restore to outdated snapshots far behind the latest chain head.
 
 The full list of included changes:
 
-- Bump beta to 1.10.1 ([#8350](https://github.com/openethereum/openethereum/pull/8350))
+- Bump beta to 1.10.1 ([#8350](https://github.com/paritytech/parity/pull/8350))
   - Bump beta to 1.10.1
   - Unflag critical release
-- Backports ([#8346](https://github.com/openethereum/openethereum/pull/8346))
-  - Warp-only sync with warp-barrier [blocknumber] flag. ([#8228](https://github.com/openethereum/openethereum/pull/8228))
+- Backports ([#8346](https://github.com/paritytech/parity/pull/8346))
+  - Warp-only sync with warp-barrier [blocknumber] flag. ([#8228](https://github.com/paritytech/parity/pull/8228))
     - Warp-only sync with warp-after [blocknumber] flag.
     - Fix tests.
     - Fix configuration tests.
     - Rename to warp barrier.
-  - Allow unsafe js eval on Parity Wallet. ([#8204](https://github.com/openethereum/openethereum/pull/8204))
-  - Update musicoin spec in line with gmc v2.6.2 ([#8242](https://github.com/openethereum/openethereum/pull/8242))
-  - Supress TemporaryInvalid verification failures. ([#8256](https://github.com/openethereum/openethereum/pull/8256))
-  - Include suicided accounts in state diff ([#8297](https://github.com/openethereum/openethereum/pull/8297))
+  - Allow unsafe js eval on Parity Wallet. ([#8204](https://github.com/paritytech/parity/pull/8204))
+  - Update musicoin spec in line with gmc v2.6.2 ([#8242](https://github.com/paritytech/parity/pull/8242))
+  - Supress TemporaryInvalid verification failures. ([#8256](https://github.com/paritytech/parity/pull/8256))
+  - Include suicided accounts in state diff ([#8297](https://github.com/paritytech/parity/pull/8297))
     - Include suicided accounts in state diff
     - Shorten form match -> if let
     - Test suicide trace diff in State
-  - Replace_home for password_files, reserved_peers and log_file ([#8324](https://github.com/openethereum/openethereum/pull/8324))
+  - Replace_home for password_files, reserved_peers and log_file ([#8324](https://github.com/paritytech/parity/pull/8324))
     - Replace_home for password_files, reserved_peers and log_file
     - Typo: arg_log_file is Option
     - Enable UI by default, but only display info page.
     - Fix test.
     - Fix naming and remove old todo.
     - Change "wallet" with "browser UI"
-- Change name Wallet -> UI ([#8164](https://github.com/openethereum/openethereum/pull/8164)) ([#8205](https://github.com/openethereum/openethereum/pull/8205))
+- Change name Wallet -> UI ([#8164](https://github.com/paritytech/parity/pull/8164)) ([#8205](https://github.com/paritytech/parity/pull/8205))
   - Change name Wallet -> UI
   - Make warning bold
-- Backport [#8099](https://github.com/openethereum/openethereum/pull/8099) ([#8132](https://github.com/openethereum/openethereum/pull/8132))
-- WASM libs ([#8220](https://github.com/openethereum/openethereum/pull/8220))
-  - Bump wasm libs ([#8171](https://github.com/openethereum/openethereum/pull/8171))
-  - Bump wasmi version ([#8209](https://github.com/openethereum/openethereum/pull/8209))
-- Update hyper to 0.11.24 ([#8203](https://github.com/openethereum/openethereum/pull/8203))
-- Updated jsonrpc to include latest backports (beta) ([#8181](https://github.com/openethereum/openethereum/pull/8181))
+- Backport [#8099](https://github.com/paritytech/parity/pull/8099) ([#8132](https://github.com/paritytech/parity/pull/8132))
+- WASM libs ([#8220](https://github.com/paritytech/parity/pull/8220))
+  - Bump wasm libs ([#8171](https://github.com/paritytech/parity/pull/8171))
+  - Bump wasmi version ([#8209](https://github.com/paritytech/parity/pull/8209))
+- Update hyper to 0.11.24 ([#8203](https://github.com/paritytech/parity/pull/8203))
+- Updated jsonrpc to include latest backports (beta) ([#8181](https://github.com/paritytech/parity/pull/8181))
   - Updated jsonrpc to include latest backports
   - Update dependencies.
 
-## Parity [v1.10.0](https://github.com/openethereum/openethereum/releases/tag/v1.10.0) (2018-03-22)
+## Parity [v1.10.0](https://github.com/paritytech/parity/releases/tag/v1.10.0) (2018-03-22)
 
 This is the Parity 1.10.0-beta release! Cool!
 
@@ -292,7 +292,7 @@ To enable empty step messages, set the `emptyStepsTransition` to your favorite b
 
 We removed the old database migrations from 2016. In case you upgrade Parity from a really, really old version, you will have to reset your database manually first with `parity <options> db kill`.
 
-We fixed  DELEGATECALL `from` and `to` fields, see [#7166](https://github.com/openethereum/openethereum/issues/7166).
+We fixed  DELEGATECALL `from` and `to` fields, see [#7166](https://github.com/paritytech/parity/issues/7166).
 
 We reduced the default USD per transaction value to 0.0001. Thanks, @MysticRyuujin!
 
@@ -302,60 +302,60 @@ The Musicoin chain is now enabled with Byzantium features starting at block `2_2
 
 The full list of included changes:
 
-- Re-enable signer, even with no UI. ([#8167](https://github.com/openethereum/openethereum/pull/8167)) ([#8168](https://github.com/openethereum/openethereum/pull/8168))
+- Re-enable signer, even with no UI. ([#8167](https://github.com/paritytech/parity/pull/8167)) ([#8168](https://github.com/paritytech/parity/pull/8168))
   - Re-enable signer, even with no UI.
   - Fix message.
-- Beta Backports ([#8136](https://github.com/openethereum/openethereum/pull/8136))
-  - Support parity protocol. ([#8035](https://github.com/openethereum/openethereum/pull/8035))
-  - updater: apply exponential backoff after download failure ([#8059](https://github.com/openethereum/openethereum/pull/8059))
+- Beta Backports ([#8136](https://github.com/paritytech/parity/pull/8136))
+  - Support parity protocol. ([#8035](https://github.com/paritytech/parity/pull/8035))
+  - updater: apply exponential backoff after download failure ([#8059](https://github.com/paritytech/parity/pull/8059))
     - updater: apply exponential backoff after download failure
     - updater: reset backoff on new release
-  - Max code size on Kovan ([#8067](https://github.com/openethereum/openethereum/pull/8067))
+  - Max code size on Kovan ([#8067](https://github.com/paritytech/parity/pull/8067))
     - Enable code size limit on kovan
     - Fix formatting.
-  - Limit incoming connections.  ([#8060](https://github.com/openethereum/openethereum/pull/8060))
+  - Limit incoming connections.  ([#8060](https://github.com/paritytech/parity/pull/8060))
     - Limit ingress connections
     - Optimized handshakes logging
-  - WASM libraries bump ([#7970](https://github.com/openethereum/openethereum/pull/7970))
+  - WASM libraries bump ([#7970](https://github.com/paritytech/parity/pull/7970))
     - update wasmi, parity-wasm, wasm-utils to latest version
     - Update to new wasmi & error handling
     - also utilize new stack limiter
     - fix typo
     - replace dependency url
     - Cargo.lock update
-  - add some dos protection ([#8084](https://github.com/openethereum/openethereum/pull/8084))
-  - revert removing blooms ([#8066](https://github.com/openethereum/openethereum/pull/8066))
-  - Revert "fix traces, removed bloomchain crate, closes [#7228](https://github.com/openethereum/openethereum/issues/7228), closes [#7167](https://github.com/openethereum/openethereum/issues/7167)"
-  - Revert "fixed broken logs ([#7934](https://github.com/openethereum/openethereum/pull/7934))"
+  - add some dos protection ([#8084](https://github.com/paritytech/parity/pull/8084))
+  - revert removing blooms ([#8066](https://github.com/paritytech/parity/pull/8066))
+  - Revert "fix traces, removed bloomchain crate, closes [#7228](https://github.com/paritytech/parity/issues/7228), closes [#7167](https://github.com/paritytech/parity/issues/7167)"
+  - Revert "fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))"
     - fixed broken logs
     - bring back old lock order
     - remove migration v13
     - revert CURRENT_VERSION to 12 in migration.rs
-  - more dos protection ([#8104](https://github.com/openethereum/openethereum/pull/8104))
-  - Const time comparison ([#8113](https://github.com/openethereum/openethereum/pull/8113))
+  - more dos protection ([#8104](https://github.com/paritytech/parity/pull/8104))
+  - Const time comparison ([#8113](https://github.com/paritytech/parity/pull/8113))
     - Use `subtle::slices_equal` for constant time comparison.
     - Also update the existing version of subtle in `ethcrypto` from 0.1 to 0.5
     - Test specifically for InvalidPassword error.
-  - fix trace filter returning returning unrelated reward calls, closes #8070 ([#8098](https://github.com/openethereum/openethereum/pull/8098))
-  - network: init discovery using healthy nodes ([#8061](https://github.com/openethereum/openethereum/pull/8061))
+  - fix trace filter returning returning unrelated reward calls, closes #8070 ([#8098](https://github.com/paritytech/parity/pull/8098))
+  - network: init discovery using healthy nodes ([#8061](https://github.com/paritytech/parity/pull/8061))
     - network: init discovery using healthy nodes
     - network: fix style grumble
     - network: fix typo
-  - Postpone Kovan hard fork ([#8137](https://github.com/openethereum/openethereum/pull/8137))
+  - Postpone Kovan hard fork ([#8137](https://github.com/paritytech/parity/pull/8137))
     - ethcore: postpone Kovan hard fork
     - util: update version fork metadata
-  - Disable UI by default. ([#8105](https://github.com/openethereum/openethereum/pull/8105))
-  - dapps: update parity-ui dependencies ([#8160](https://github.com/openethereum/openethereum/pull/8160))
-- Probe changes one step deeper ([#8134](https://github.com/openethereum/openethereum/pull/8134)) ([#8135](https://github.com/openethereum/openethereum/pull/8135))
-- Beta backports ([#8053](https://github.com/openethereum/openethereum/pull/8053))
-  - CI: Fix cargo cache ([#7968](https://github.com/openethereum/openethereum/pull/7968))
+  - Disable UI by default. ([#8105](https://github.com/paritytech/parity/pull/8105))
+  - dapps: update parity-ui dependencies ([#8160](https://github.com/paritytech/parity/pull/8160))
+- Probe changes one step deeper ([#8134](https://github.com/paritytech/parity/pull/8134)) ([#8135](https://github.com/paritytech/parity/pull/8135))
+- Beta backports ([#8053](https://github.com/paritytech/parity/pull/8053))
+  - CI: Fix cargo cache ([#7968](https://github.com/paritytech/parity/pull/7968))
     - Fix cache
     - Only clean locked cargo cache on windows
-  - fixed ethstore sign ([#8026](https://github.com/openethereum/openethereum/pull/8026))
-  - fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/openethereum/openethereum/pull/8031))
-  - fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/openethereum/openethereum/pull/8032))
-  - fix cache & snapcraft CI build ([#8052](https://github.com/openethereum/openethereum/pull/8052))
-  - Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/openethereum/openethereum/pull/7841))
+  - fixed ethstore sign ([#8026](https://github.com/paritytech/parity/pull/8026))
+  - fixed parsing ethash seals and verify_block_undordered ([#8031](https://github.com/paritytech/parity/pull/8031))
+  - fix for verify_block_basic crashing on invalid transaction rlp ([#8032](https://github.com/paritytech/parity/pull/8032))
+  - fix cache & snapcraft CI build ([#8052](https://github.com/paritytech/parity/pull/8052))
+  - Add MCIP-6 Byzyantium transition to Musicoin spec ([#7841](https://github.com/paritytech/parity/pull/7841))
     - Add test chain spec for musicoin byzantium testnet
     - Add MCIP-6 Byzyantium transition to Musicoin spec
     - Update mcip6_byz.json
@@ -363,96 +363,96 @@ The full list of included changes:
     - ethcore: update musicoin bootnodes
     - Update musicoin.json
     - More bootnodes.
-- Make 1.10 beta ([#8022](https://github.com/openethereum/openethereum/pull/8022))
+- Make 1.10 beta ([#8022](https://github.com/paritytech/parity/pull/8022))
   - Make 1.10 beta
   - Fix gitlab builds
-- SecretStore: secretstore_generateDocumentKey RPC ([#7864](https://github.com/openethereum/openethereum/pull/7864))
-- SecretStore: ECDSA session for cases when 2*t < N ([#7739](https://github.com/openethereum/openethereum/pull/7739))
-- bump tiny-keccak ([#8019](https://github.com/openethereum/openethereum/pull/8019))
-- Remove un-necessary comment ([#8014](https://github.com/openethereum/openethereum/pull/8014))
-- clean up account fmt::Debug ([#7983](https://github.com/openethereum/openethereum/pull/7983))
-- improve quality of vote_collector module ([#7984](https://github.com/openethereum/openethereum/pull/7984))
-- ExecutedBlock cleanup ([#7991](https://github.com/openethereum/openethereum/pull/7991))
-- Hardware-wallet/usb-subscribe-refactor ([#7860](https://github.com/openethereum/openethereum/pull/7860))
-- remove wildcard imports from views, make tests more idiomatic ([#7986](https://github.com/openethereum/openethereum/pull/7986))
-- moved PerfTimer to a separate crate - "trace-time" ([#7985](https://github.com/openethereum/openethereum/pull/7985))
-- clean up ethcore::spec module imports ([#7990](https://github.com/openethereum/openethereum/pull/7990))
-- rpc: don't include current block in new_block_filter ([#7982](https://github.com/openethereum/openethereum/pull/7982))
-- fix traces, removed bloomchain crate ([#7979](https://github.com/openethereum/openethereum/pull/7979))
-- simplify compression and move it out of rlp crate ([#7957](https://github.com/openethereum/openethereum/pull/7957))
-- removed old migrations ([#7974](https://github.com/openethereum/openethereum/pull/7974))
-- Reject too large packets in snapshot sync. ([#7977](https://github.com/openethereum/openethereum/pull/7977))
-- fixed broken logs ([#7934](https://github.com/openethereum/openethereum/pull/7934))
-- Increase max download limit to 128MB ([#7965](https://github.com/openethereum/openethereum/pull/7965))
-- Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/openethereum/openethereum/pull/7953))
-- Add changelog for 1.8.10 stable and 1.9.3 beta ([#7947](https://github.com/openethereum/openethereum/pull/7947))
-- kvdb-rocksdb: remove buffered operations when committing transaction ([#7950](https://github.com/openethereum/openethereum/pull/7950))
-- Bump WebSockets ([#7952](https://github.com/openethereum/openethereum/pull/7952))
-- removed redundant Bloom conversions ([#7932](https://github.com/openethereum/openethereum/pull/7932))
-- simplify RefInfo fmt ([#7929](https://github.com/openethereum/openethereum/pull/7929))
-- Kovan WASM fork code ([#7849](https://github.com/openethereum/openethereum/pull/7849))
-- bring back trie and triehash benches ([#7926](https://github.com/openethereum/openethereum/pull/7926))
-- removed redundant PodAccount::new method ([#7928](https://github.com/openethereum/openethereum/pull/7928))
-- removed dummy wrapper structure - LogGroupPosition ([#7922](https://github.com/openethereum/openethereum/pull/7922))
-- spec: Validate required divisor fields are not 0 ([#7933](https://github.com/openethereum/openethereum/pull/7933))
-- simplify Client::filter_traces method ([#7936](https://github.com/openethereum/openethereum/pull/7936))
-- gitlab cache ([#7921](https://github.com/openethereum/openethereum/pull/7921))
-- Fix a division by zero in light client RPC handler ([#7917](https://github.com/openethereum/openethereum/pull/7917))
-- triehash optimisations ([#7920](https://github.com/openethereum/openethereum/pull/7920))
-- removed redundant Blockchain::db method ([#7919](https://github.com/openethereum/openethereum/pull/7919))
-- removed redundant Blockchain::rewind method ([#7918](https://github.com/openethereum/openethereum/pull/7918))
-- Pending transactions subscription ([#7906](https://github.com/openethereum/openethereum/pull/7906))
-- removed redundant otry! macro from ethcore ([#7916](https://github.com/openethereum/openethereum/pull/7916))
-- Make block generator easier to use ([#7888](https://github.com/openethereum/openethereum/pull/7888))
-- ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/openethereum/openethereum/pull/7905))
-- Fix CSP for dapps that require eval. ([#7867](https://github.com/openethereum/openethereum/pull/7867))
-- Fix gitlab ([#7901](https://github.com/openethereum/openethereum/pull/7901))
-- Gitlb snap master patch ([#7900](https://github.com/openethereum/openethereum/pull/7900))
-- fix snap build master ([#7896](https://github.com/openethereum/openethereum/pull/7896))
-- Fix wallet import ([#7873](https://github.com/openethereum/openethereum/pull/7873))
-- Fix snapcraft nightly ([#7884](https://github.com/openethereum/openethereum/pull/7884))
-- Add a timeout for light client sync requests ([#7848](https://github.com/openethereum/openethereum/pull/7848))
-- SecretStore: fixed test ([#7878](https://github.com/openethereum/openethereum/pull/7878))
-- Fix checksums and auto-update push ([#7846](https://github.com/openethereum/openethereum/pull/7846))
-- Forward-port snap fixes ([#7831](https://github.com/openethereum/openethereum/pull/7831))
-- Update gitlab-test.sh ([#7883](https://github.com/openethereum/openethereum/pull/7883))
-- Fix installer binary names for macos and windows ([#7881](https://github.com/openethereum/openethereum/pull/7881))
-- Fix string typo: "develoopment" -> "development" ([#7874](https://github.com/openethereum/openethereum/pull/7874))
-- Update the instructions to install the stable snap ([#7876](https://github.com/openethereum/openethereum/pull/7876))
-- SecretStore: 'broadcast' decryption session ([#7843](https://github.com/openethereum/openethereum/pull/7843))
-- Flush keyfiles. Resolves #7632 ([#7868](https://github.com/openethereum/openethereum/pull/7868))
-- Read registry_address from given block ([#7866](https://github.com/openethereum/openethereum/pull/7866))
-- Clean up docs formatting for Wasm runtime ([#7869](https://github.com/openethereum/openethereum/pull/7869))
-- WASM: Disable internal memory ([#7842](https://github.com/openethereum/openethereum/pull/7842))
-- Update gitlab-build.sh ([#7855](https://github.com/openethereum/openethereum/pull/7855))
-- ethabi version 5 ([#7723](https://github.com/openethereum/openethereum/pull/7723))
-- Light client: randomize the peer we dispatch requests to ([#7844](https://github.com/openethereum/openethereum/pull/7844))
-- Store updater metadata in a single place ([#7832](https://github.com/openethereum/openethereum/pull/7832))
-- Add new EF ropstens nodes. ([#7824](https://github.com/openethereum/openethereum/pull/7824))
-- refactor stratum to remove retain cycle ([#7827](https://github.com/openethereum/openethereum/pull/7827))
-- Bump jsonrpc. ([#7828](https://github.com/openethereum/openethereum/pull/7828))
-- Add binary identifiers and sha256sum to builds ([#7830](https://github.com/openethereum/openethereum/pull/7830))
-- Update references to UI shell & wallet ([#7808](https://github.com/openethereum/openethereum/pull/7808))
-- Adjust storage update evm-style ([#7812](https://github.com/openethereum/openethereum/pull/7812))
-- Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/openethereum/openethereum/pull/7796))
-- SecretStore: ignore removed authorities when running auto-migration ([#7674](https://github.com/openethereum/openethereum/pull/7674))
-- Fix build ([#7807](https://github.com/openethereum/openethereum/pull/7807))
-- Move js & js-old code to github.com/parity-js ([#7685](https://github.com/openethereum/openethereum/pull/7685))
-- More changelogs :) ([#7782](https://github.com/openethereum/openethereum/pull/7782))
-- Actualized API set in help ([#7790](https://github.com/openethereum/openethereum/pull/7790))
-- Removed obsolete file ([#7788](https://github.com/openethereum/openethereum/pull/7788))
-- Update ropsten bootnodes ([#7776](https://github.com/openethereum/openethereum/pull/7776))
-- CHANGELOG for 1.9.1 and 1.8.8 ([#7775](https://github.com/openethereum/openethereum/pull/7775))
-- Enable byzantium features on non-ethash chains ([#7753](https://github.com/openethereum/openethereum/pull/7753))
-- Fix client not being dropped on shutdown ([#7695](https://github.com/openethereum/openethereum/pull/7695))
-- Filter-out nodes.json ([#7716](https://github.com/openethereum/openethereum/pull/7716))
-- Removes redundant parentheses ([#7721](https://github.com/openethereum/openethereum/pull/7721))
-- Transaction-pool fixes ([#7741](https://github.com/openethereum/openethereum/pull/7741))
-- More visible download link in README.md ([#7707](https://github.com/openethereum/openethereum/pull/7707))
-- Changelog for 1.9.0 ([#7664](https://github.com/openethereum/openethereum/pull/7664))
-- Add scroll when too many accounts ([#7677](https://github.com/openethereum/openethereum/pull/7677))
-- SecretStore: return HTTP 403 (access denied) if consensus is unreachable ([#7656](https://github.com/openethereum/openethereum/pull/7656))
-- Moved StopGaurd to it's own crate ([#7635](https://github.com/openethereum/openethereum/pull/7635))
+- SecretStore: secretstore_generateDocumentKey RPC ([#7864](https://github.com/paritytech/parity/pull/7864))
+- SecretStore: ECDSA session for cases when 2*t < N ([#7739](https://github.com/paritytech/parity/pull/7739))
+- bump tiny-keccak ([#8019](https://github.com/paritytech/parity/pull/8019))
+- Remove un-necessary comment ([#8014](https://github.com/paritytech/parity/pull/8014))
+- clean up account fmt::Debug ([#7983](https://github.com/paritytech/parity/pull/7983))
+- improve quality of vote_collector module ([#7984](https://github.com/paritytech/parity/pull/7984))
+- ExecutedBlock cleanup ([#7991](https://github.com/paritytech/parity/pull/7991))
+- Hardware-wallet/usb-subscribe-refactor ([#7860](https://github.com/paritytech/parity/pull/7860))
+- remove wildcard imports from views, make tests more idiomatic ([#7986](https://github.com/paritytech/parity/pull/7986))
+- moved PerfTimer to a separate crate - "trace-time" ([#7985](https://github.com/paritytech/parity/pull/7985))
+- clean up ethcore::spec module imports ([#7990](https://github.com/paritytech/parity/pull/7990))
+- rpc: don't include current block in new_block_filter ([#7982](https://github.com/paritytech/parity/pull/7982))
+- fix traces, removed bloomchain crate ([#7979](https://github.com/paritytech/parity/pull/7979))
+- simplify compression and move it out of rlp crate ([#7957](https://github.com/paritytech/parity/pull/7957))
+- removed old migrations ([#7974](https://github.com/paritytech/parity/pull/7974))
+- Reject too large packets in snapshot sync. ([#7977](https://github.com/paritytech/parity/pull/7977))
+- fixed broken logs ([#7934](https://github.com/paritytech/parity/pull/7934))
+- Increase max download limit to 128MB ([#7965](https://github.com/paritytech/parity/pull/7965))
+- Calculate proper keccak256/sha3 using parity. ([#7953](https://github.com/paritytech/parity/pull/7953))
+- Add changelog for 1.8.10 stable and 1.9.3 beta ([#7947](https://github.com/paritytech/parity/pull/7947))
+- kvdb-rocksdb: remove buffered operations when committing transaction ([#7950](https://github.com/paritytech/parity/pull/7950))
+- Bump WebSockets ([#7952](https://github.com/paritytech/parity/pull/7952))
+- removed redundant Bloom conversions ([#7932](https://github.com/paritytech/parity/pull/7932))
+- simplify RefInfo fmt ([#7929](https://github.com/paritytech/parity/pull/7929))
+- Kovan WASM fork code ([#7849](https://github.com/paritytech/parity/pull/7849))
+- bring back trie and triehash benches ([#7926](https://github.com/paritytech/parity/pull/7926))
+- removed redundant PodAccount::new method ([#7928](https://github.com/paritytech/parity/pull/7928))
+- removed dummy wrapper structure - LogGroupPosition ([#7922](https://github.com/paritytech/parity/pull/7922))
+- spec: Validate required divisor fields are not 0 ([#7933](https://github.com/paritytech/parity/pull/7933))
+- simplify Client::filter_traces method ([#7936](https://github.com/paritytech/parity/pull/7936))
+- gitlab cache ([#7921](https://github.com/paritytech/parity/pull/7921))
+- Fix a division by zero in light client RPC handler ([#7917](https://github.com/paritytech/parity/pull/7917))
+- triehash optimisations ([#7920](https://github.com/paritytech/parity/pull/7920))
+- removed redundant Blockchain::db method ([#7919](https://github.com/paritytech/parity/pull/7919))
+- removed redundant Blockchain::rewind method ([#7918](https://github.com/paritytech/parity/pull/7918))
+- Pending transactions subscription ([#7906](https://github.com/paritytech/parity/pull/7906))
+- removed redundant otry! macro from ethcore ([#7916](https://github.com/paritytech/parity/pull/7916))
+- Make block generator easier to use ([#7888](https://github.com/paritytech/parity/pull/7888))
+- ECIP 1041 - Remove Difficulty Bomb ([#7905](https://github.com/paritytech/parity/pull/7905))
+- Fix CSP for dapps that require eval. ([#7867](https://github.com/paritytech/parity/pull/7867))
+- Fix gitlab ([#7901](https://github.com/paritytech/parity/pull/7901))
+- Gitlb snap master patch ([#7900](https://github.com/paritytech/parity/pull/7900))
+- fix snap build master ([#7896](https://github.com/paritytech/parity/pull/7896))
+- Fix wallet import ([#7873](https://github.com/paritytech/parity/pull/7873))
+- Fix snapcraft nightly ([#7884](https://github.com/paritytech/parity/pull/7884))
+- Add a timeout for light client sync requests ([#7848](https://github.com/paritytech/parity/pull/7848))
+- SecretStore: fixed test ([#7878](https://github.com/paritytech/parity/pull/7878))
+- Fix checksums and auto-update push ([#7846](https://github.com/paritytech/parity/pull/7846))
+- Forward-port snap fixes ([#7831](https://github.com/paritytech/parity/pull/7831))
+- Update gitlab-test.sh ([#7883](https://github.com/paritytech/parity/pull/7883))
+- Fix installer binary names for macos and windows ([#7881](https://github.com/paritytech/parity/pull/7881))
+- Fix string typo: "develoopment" -> "development" ([#7874](https://github.com/paritytech/parity/pull/7874))
+- Update the instructions to install the stable snap ([#7876](https://github.com/paritytech/parity/pull/7876))
+- SecretStore: 'broadcast' decryption session ([#7843](https://github.com/paritytech/parity/pull/7843))
+- Flush keyfiles. Resolves #7632 ([#7868](https://github.com/paritytech/parity/pull/7868))
+- Read registry_address from given block ([#7866](https://github.com/paritytech/parity/pull/7866))
+- Clean up docs formatting for Wasm runtime ([#7869](https://github.com/paritytech/parity/pull/7869))
+- WASM: Disable internal memory ([#7842](https://github.com/paritytech/parity/pull/7842))
+- Update gitlab-build.sh ([#7855](https://github.com/paritytech/parity/pull/7855))
+- ethabi version 5 ([#7723](https://github.com/paritytech/parity/pull/7723))
+- Light client: randomize the peer we dispatch requests to ([#7844](https://github.com/paritytech/parity/pull/7844))
+- Store updater metadata in a single place ([#7832](https://github.com/paritytech/parity/pull/7832))
+- Add new EF ropstens nodes. ([#7824](https://github.com/paritytech/parity/pull/7824))
+- refactor stratum to remove retain cycle ([#7827](https://github.com/paritytech/parity/pull/7827))
+- Bump jsonrpc. ([#7828](https://github.com/paritytech/parity/pull/7828))
+- Add binary identifiers and sha256sum to builds ([#7830](https://github.com/paritytech/parity/pull/7830))
+- Update references to UI shell & wallet ([#7808](https://github.com/paritytech/parity/pull/7808))
+- Adjust storage update evm-style ([#7812](https://github.com/paritytech/parity/pull/7812))
+- Updated WASM Runtime & new interpreter (wasmi) ([#7796](https://github.com/paritytech/parity/pull/7796))
+- SecretStore: ignore removed authorities when running auto-migration ([#7674](https://github.com/paritytech/parity/pull/7674))
+- Fix build ([#7807](https://github.com/paritytech/parity/pull/7807))
+- Move js & js-old code to github.com/parity-js ([#7685](https://github.com/paritytech/parity/pull/7685))
+- More changelogs :) ([#7782](https://github.com/paritytech/parity/pull/7782))
+- Actualized API set in help ([#7790](https://github.com/paritytech/parity/pull/7790))
+- Removed obsolete file ([#7788](https://github.com/paritytech/parity/pull/7788))
+- Update ropsten bootnodes ([#7776](https://github.com/paritytech/parity/pull/7776))
+- CHANGELOG for 1.9.1 and 1.8.8 ([#7775](https://github.com/paritytech/parity/pull/7775))
+- Enable byzantium features on non-ethash chains ([#7753](https://github.com/paritytech/parity/pull/7753))
+- Fix client not being dropped on shutdown ([#7695](https://github.com/paritytech/parity/pull/7695))
+- Filter-out nodes.json ([#7716](https://github.com/paritytech/parity/pull/7716))
+- Removes redundant parentheses ([#7721](https://github.com/paritytech/parity/pull/7721))
+- Transaction-pool fixes ([#7741](https://github.com/paritytech/parity/pull/7741))
+- More visible download link in README.md ([#7707](https://github.com/paritytech/parity/pull/7707))
+- Changelog for 1.9.0 ([#7664](https://github.com/paritytech/parity/pull/7664))
+- Add scroll when too many accounts ([#7677](https://github.com/paritytech/parity/pull/7677))
+- SecretStore: return HTTP 403 (access denied) if consensus is unreachable ([#7656](https://github.com/paritytech/parity/pull/7656))
+- Moved StopGaurd to it's own crate ([#7635](https://github.com/paritytech/parity/pull/7635))
 
 ## Previous releases